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

input: Split out pointer button sending from grab handler

Browse Source 
We'll use it elsewhere later.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Jonas Ådahl
2016-07-22 17:55:43 +08:00
parent f44942ea04
commit c02ac11bd6
1 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/input.c
+27 -16
View File
@@ -379,6 +379,32 @@ default_grab_pointer_motion(struct weston_pointer_grab *grab, uint32_t time,
weston_pointer_send_relative_motion(pointer, time, event); weston_pointer_send_relative_motion(pointer, time, event);
} }
static void
weston_pointer_send_button(struct weston_pointer *pointer,
uint32_t time, uint32_t button, uint32_t state_w)
{
struct wl_display *display = pointer->seat->compositor->wl_display;
struct wl_list *resource_list;
struct wl_resource *resource;
uint32_t serial;
if (!pointer->focus_client)
return;
resource_list = &pointer->focus_client->pointer_resources;
if (resource_list && !wl_list_empty(resource_list)) {
resource_list = &pointer->focus_client->pointer_resources;
serial = wl_display_next_serial(display);
wl_resource_for_each(resource, resource_list) {
wl_pointer_send_button(resource,
serial,
time,
button,
state_w);
}
}
}
static void static void
default_grab_pointer_button(struct weston_pointer_grab *grab, default_grab_pointer_button(struct weston_pointer_grab *grab,
uint32_t time, uint32_t button, uint32_t state_w) uint32_t time, uint32_t button, uint32_t state_w)
@@ -386,25 +412,10 @@ default_grab_pointer_button(struct weston_pointer_grab *grab,
struct weston_pointer *pointer = grab->pointer; struct weston_pointer *pointer = grab->pointer;
struct weston_compositor *compositor = pointer->seat->compositor; struct weston_compositor *compositor = pointer->seat->compositor;
struct weston_view *view; struct weston_view *view;
struct wl_resource *resource;
uint32_t serial;
enum wl_pointer_button_state state = state_w; enum wl_pointer_button_state state = state_w;
struct wl_display *display = compositor->wl_display;
wl_fixed_t sx, sy; wl_fixed_t sx, sy;
struct wl_list *resource_list = NULL;
if (pointer->focus_client) weston_pointer_send_button(pointer, time, button, state_w);
resource_list = &pointer->focus_client->pointer_resources;
if (resource_list && !wl_list_empty(resource_list)) {
resource_list = &pointer->focus_client->pointer_resources;
serial = wl_display_next_serial(display);
wl_resource_for_each(resource, resource_list)
wl_pointer_send_button(resource,
serial,
time,
button,
state_w);
}
if (pointer->button_count == 0 && if (pointer->button_count == 0 &&
state == WL_POINTER_BUTTON_STATE_RELEASED) { state == WL_POINTER_BUTTON_STATE_RELEASED) {