mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: Pass the appropriate pointer type to bindings instead of a seat

Browse Source 
Normally we need to check if a seat's [device_type]_count is > 0 before
we can use the associated pointer.  However, in a binding you're
guaranteed that the seat has a device of that type.  If we pass in
that type instead of the seat, it's obvious we don't have to test it.

The bindings can still get the seat pointer via whatever->seat if they
need it.

This is preparation for a follow up patch that prevents direct access
to seat->device_type pointers, and this will save us a few tests at
that point.

Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Derek Foreman
2015-07-15 13:00:36 -05:00
committed by Bryce Harrington
parent 0720ea36c8
commit 8ae2db5b0c
15 changed files with 116 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings.c
+10 -9
View File
@@ -298,7 +298,7 @@ weston_compositor_run_key_binding(struct weston_compositor *compositor,
if (b->key == key && b->modifier == seat->modifier_state) {
weston_key_binding_handler_t handler = b->handler;
focus = seat->keyboard->focus;
handler(seat, time, key, b->data);
handler(seat->keyboard, time, key, b->data);
/* If this was a key binding and it didn't
* install a keyboard grab, install one now to
@@ -337,7 +337,7 @@ weston_compositor_run_modifier_binding(struct weston_compositor *compositor,
return;
}
handler(seat, modifier, b->data);
handler(seat->keyboard, modifier, b->data);
}
}
@@ -359,7 +359,7 @@ weston_compositor_run_button_binding(struct weston_compositor *compositor,
wl_list_for_each_safe(b, tmp, &compositor->button_binding_list, link) {
if (b->button == button && b->modifier == seat->modifier_state) {
weston_button_binding_handler_t handler = b->handler;
handler(seat, time, button, b->data);
handler(seat->pointer, time, button, b->data);
}
}
}
@@ -377,7 +377,7 @@ weston_compositor_run_touch_binding(struct weston_compositor *compositor,
wl_list_for_each_safe(b, tmp, &compositor->touch_binding_list, link) {
if (b->modifier == seat->modifier_state) {
weston_touch_binding_handler_t handler = b->handler;
handler(seat, time, b->data);
handler(seat->touch, time, b->data);
}
}
}
@@ -397,7 +397,7 @@ weston_compositor_run_axis_binding(struct weston_compositor *compositor,
wl_list_for_each_safe(b, tmp, &compositor->axis_binding_list, link) {
if (b->axis == axis && b->modifier == seat->modifier_state) {
weston_axis_binding_handler_t handler = b->handler;
handler(seat, time, axis, value, b->data);
handler(seat->pointer, time, axis, value, b->data);
return 1;
}
}
@@ -421,7 +421,7 @@ weston_compositor_run_debug_binding(struct weston_compositor *compositor,
count++;
handler = binding->handler;
handler(seat, time, key, binding->data);
handler(seat->keyboard, time, key, binding->data);
}
return count;
@@ -540,7 +540,8 @@ struct weston_keyboard_grab_interface debug_binding_keyboard_grab = {
};
static void
debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
debug_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct debug_binding_grab *grab;
@@ -548,10 +549,10 @@ debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
if (!grab)
return;
grab->seat = seat;
grab->seat = keyboard->seat;
grab->key[0] = key;
grab->grab.interface = &debug_binding_keyboard_grab;
weston_keyboard_start_grab(seat->keyboard, &grab->grab);
weston_keyboard_start_grab(keyboard, &grab->grab);
}
/** Install the trigger binding for debug bindings.
src/compositor-drm.c
+9 -6
View File
@@ -2764,7 +2764,8 @@ session_notify(struct wl_listener *listener, void *data)
}
static void
switch_vt_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
switch_vt_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *compositor = data;
@@ -2828,7 +2829,8 @@ find_primary_gpu(struct drm_backend *b, const char *seat)
}
static void
planes_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
planes_binding(struct weston_keyboard *keyboard, uint32_t time, uint32_t key,
void *data)
{
struct drm_backend *b = data;
@@ -2908,7 +2910,7 @@ create_recorder(struct drm_backend *b, int width, int height,
}
static void
recorder_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
recorder_binding(struct weston_keyboard *keyboard, uint32_t time, uint32_t key,
void *data)
{
struct drm_backend *b = data;
@@ -2993,10 +2995,11 @@ switch_to_gl_renderer(struct drm_backend *b)
}
static void
renderer_switch_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
void *data)
renderer_switch_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct drm_backend *b = (struct drm_backend *)seat->compositor->backend;
struct drm_backend *b =
(struct drm_backend *) keyboard->seat->compositor;
switch_to_gl_renderer(b);
}
src/compositor-fbdev.c
+2 -1
View File
@@ -803,7 +803,8 @@ fbdev_restore(struct weston_compositor *compositor)
}
static void
switch_vt_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
switch_vt_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *compositor = data;
src/compositor-rpi.c
+2 -1
View File
@@ -448,7 +448,8 @@ rpi_restore(struct weston_compositor *compositor)
}
static void
switch_vt_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
switch_vt_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *compositor = data;
src/compositor-wayland.c
+3 -3
View File
@@ -1925,14 +1925,14 @@ create_cursor(struct wayland_backend *b, struct weston_config *config)
}
static void
fullscreen_binding(struct weston_seat *seat_base, uint32_t time, uint32_t key,
void *data)
fullscreen_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct wayland_backend *b = data;
struct wayland_input *input = NULL;
wl_list_for_each(input, &b->input_list, link)
if (&input->base == seat_base)
if (&input->base == keyboard->seat)
break;
if (!input || !input->output)
src/compositor.c
+1 -1
View File
@@ -4433,7 +4433,7 @@ weston_environment_get_fd(const char *env)
}
static void
timeline_key_binding_handler(struct weston_seat *seat, uint32_t time,
timeline_key_binding_handler(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *compositor = data;
src/compositor.h
+5 -5
View File
@@ -1149,7 +1149,7 @@ weston_compositor_pick_view(struct weston_compositor *compositor,
struct weston_binding;
typedef void (*weston_key_binding_handler_t)(struct weston_seat *seat,
typedef void (*weston_key_binding_handler_t)(struct weston_keyboard *keyboard,
uint32_t time, uint32_t key,
void *data);
struct weston_binding *
@@ -1159,7 +1159,7 @@ weston_compositor_add_key_binding(struct weston_compositor *compositor,
weston_key_binding_handler_t binding,
void *data);
typedef void (*weston_modifier_binding_handler_t)(struct weston_seat *seat,
typedef void (*weston_modifier_binding_handler_t)(struct weston_keyboard *keyboard,
enum weston_keyboard_modifier modifier,
void *data);
struct weston_binding *
@@ -1168,7 +1168,7 @@ weston_compositor_add_modifier_binding(struct weston_compositor *compositor,
weston_modifier_binding_handler_t binding,
void *data);
typedef void (*weston_button_binding_handler_t)(struct weston_seat *seat,
typedef void (*weston_button_binding_handler_t)(struct weston_pointer *pointer,
uint32_t time, uint32_t button,
void *data);
struct weston_binding *
@@ -1178,7 +1178,7 @@ weston_compositor_add_button_binding(struct weston_compositor *compositor,
weston_button_binding_handler_t binding,
void *data);
typedef void (*weston_touch_binding_handler_t)(struct weston_seat *seat,
typedef void (*weston_touch_binding_handler_t)(struct weston_touch *touch,
uint32_t time,
void *data);
struct weston_binding *
@@ -1187,7 +1187,7 @@ weston_compositor_add_touch_binding(struct weston_compositor *compositor,
weston_touch_binding_handler_t binding,
void *data);
typedef void (*weston_axis_binding_handler_t)(struct weston_seat *seat,
typedef void (*weston_axis_binding_handler_t)(struct weston_pointer *pointer,
uint32_t time, uint32_t axis,
wl_fixed_t value, void *data);
struct weston_binding *
src/gl-renderer.c
+4 -4
View File
@@ -2429,8 +2429,8 @@ compile_shaders(struct weston_compositor *ec)
}
static void
fragment_debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
void *data)
fragment_debug_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *ec = data;
struct gl_renderer *gr = get_renderer(ec);
@@ -2455,8 +2455,8 @@ fragment_debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
}
static void
fan_debug_repaint_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
void *data)
fan_debug_repaint_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *compositor = data;
struct gl_renderer *gr = get_renderer(compositor);
src/pixman-renderer.c
+1 -1
View File
@@ -804,7 +804,7 @@ pixman_renderer_surface_copy_content(struct weston_surface *surface,
}
static void
debug_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
debug_binding(struct weston_keyboard *keyboard, uint32_t time, uint32_t key,
void *data)
{
struct weston_compositor *ec = data;
src/screenshooter.c
+7 -7
View File
@@ -286,8 +286,8 @@ screenshooter_sigchld(struct weston_process *process, int status)
}
static void
screenshooter_binding(struct weston_seat *seat, uint32_t time, uint32_t key,
void *data)
screenshooter_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct screenshooter *shooter = data;
char *screenshooter_exe;
@@ -560,9 +560,10 @@ weston_recorder_destroy(struct weston_recorder *recorder)
}
static void
recorder_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *data)
recorder_binding(struct weston_keyboard *keyboard, uint32_t time,
uint32_t key, void *data)
{
struct weston_compositor *ec = seat->compositor;
struct weston_compositor *ec = keyboard->seat->compositor;
struct weston_output *output;
struct wl_listener *listener = NULL;
struct weston_recorder *recorder;
@@ -586,9 +587,8 @@ recorder_binding(struct weston_seat *seat, uint32_t time, uint32_t key, void *da
recorder->destroying = 1;
weston_output_schedule_repaint(recorder->output);
} else {
if (seat->keyboard && seat->keyboard->focus &&
seat->keyboard->focus->output)
output = seat->keyboard->focus->output;
if (keyboard->focus && keyboard->focus->output)
output = keyboard->focus->output;
else
output = container_of(ec->output_list.next,
struct weston_output, link);