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

Update to enter/leave events for pointer and keyboard

Browse Source
This commit is contained in:
Kristian Høgsberg 2012-02-23 09:59:05 -05:00
parent 88277d1422
commit 06d58b74af
2 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clients/window.c
View File

@ -1575,7 +1575,7 @@ input_remove_pointer_focus(struct input *input, uint32_t time)
}
static void
input_handle_pointer_focus(void *data,
input_handle_pointer_enter(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface,
int32_t sx, int32_t sy)
@ -1584,11 +1584,6 @@ input_handle_pointer_focus(void *data,
struct window *window;
struct widget *widget;
window = input->pointer_focus;
if (window && window->surface != surface)
input_remove_pointer_focus(input, time);
if (surface) {
input->pointer_focus = wl_surface_get_user_data(surface);
window = input->pointer_focus;
@ -1598,6 +1593,15 @@ input_handle_pointer_focus(void *data,
widget = widget_find_widget(window->widget, sx, sy);
input_set_focus_widget(input, widget, time, sx, sy);
}
static void
input_handle_pointer_leave(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface)
{
struct input *input = data;
input_remove_pointer_focus(input, time);
}
static void
@ -1617,7 +1621,7 @@ input_remove_keyboard_focus(struct input *input)
}
static void
input_handle_keyboard_focus(void *data,
input_handle_keyboard_enter(void *data,
struct wl_input_device *input_device,
uint32_t time,
struct wl_surface *surface,
@ -1628,9 +1632,6 @@ input_handle_keyboard_focus(void *data,
struct display *d = input->display;
uint32_t *k, *end;
input_remove_keyboard_focus(input);
if (surface)
input->keyboard_focus = wl_surface_get_user_data(surface);
end = keys->data + keys->size;
@ -1639,13 +1640,22 @@ input_handle_keyboard_focus(void *data,
input->modifiers |= d->xkb->map->modmap[*k];
window = input->keyboard_focus;
if (window) {
window->keyboard_device = input;
if (window->keyboard_focus_handler)
(*window->keyboard_focus_handler)(window,
window->keyboard_device,
window->user_data);
}
static void
input_handle_keyboard_leave(void *data,
struct wl_input_device *input_device,
uint32_t time,
struct wl_surface *surface)
{
struct input *input = data;
input_remove_keyboard_focus(input);
}
static void
@ -1686,8 +1696,10 @@ static const struct wl_input_device_listener input_device_listener = {
input_handle_motion,
input_handle_button,
input_handle_key,
input_handle_pointer_focus,
input_handle_keyboard_focus,
input_handle_pointer_enter,
input_handle_pointer_leave,
input_handle_keyboard_enter,
input_handle_keyboard_leave,
input_handle_touch_down,
input_handle_touch_up,
input_handle_touch_motion,

43
src/compositor-wayland.c
View File

@ -531,7 +531,7 @@ input_handle_key(void *data, struct wl_input_device *input_device,
}
static void
input_handle_pointer_focus(void *data,
input_handle_pointer_enter(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface,
int32_t sx, int32_t sy)
@ -540,19 +540,25 @@ input_handle_pointer_focus(void *data,
struct wayland_output *output;
struct wayland_compositor *c = input->compositor;
if (surface) {
output = wl_surface_get_user_data(surface);
notify_pointer_focus(c->base.input_device,
time, &output->base, sx, sy);
wl_input_device_attach(input->input_device, time, NULL, 0, 0);
} else {
notify_pointer_focus(c->base.input_device, time, NULL, 0, 0);
}
}
static void
input_handle_keyboard_focus(void *data,
input_handle_pointer_leave(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface)
{
struct wayland_input *input = data;
struct wayland_compositor *c = input->compositor;
notify_pointer_focus(c->base.input_device, time, NULL, 0, 0);
}
static void
input_handle_keyboard_enter(void *data,
struct wl_input_device *input_device,
uint32_t time,
struct wl_surface *surface,
@ -562,21 +568,30 @@ input_handle_keyboard_focus(void *data,
struct wayland_compositor *c = input->compositor;
struct wayland_output *output;
if (surface) {
output = wl_surface_get_user_data(surface);
notify_keyboard_focus(c->base.input_device,
time, &output->base, keys);
} else {
notify_keyboard_focus(c->base.input_device, time, NULL, NULL);
notify_keyboard_focus(c->base.input_device, time, &output->base, keys);
}
static void
input_handle_keyboard_leave(void *data,
struct wl_input_device *input_device,
uint32_t time,
struct wl_surface *surface)
{
struct wayland_input *input = data;
struct wayland_compositor *c = input->compositor;
notify_keyboard_focus(c->base.input_device, time, NULL, NULL);
}
static const struct wl_input_device_listener input_device_listener = {
input_handle_motion,
input_handle_button,
input_handle_key,
input_handle_pointer_focus,
input_handle_keyboard_focus,
input_handle_pointer_enter,
input_handle_pointer_leave,
input_handle_keyboard_enter,
input_handle_keyboard_leave,
};
static void