mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: fix event sending type mismatches

Browse source 
These were not bugs in practice, because the first (and only) field of
struct wl_surface is struct wl_resource.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-03-02 18:09:27 +02:00
parent 5ee70146c6
commit 70db367ccc
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/data-device.c
View file

@ -201,7 +201,7 @@ drag_grab_focus(struct wl_pointer_grab *grab, uint32_t time,
offer = wl_data_source_send_offer(device->drag_data_source, offer = wl_data_source_send_offer(device->drag_data_source,
resource); resource);
wl_data_device_send_enter(resource, time, surface, wl_data_device_send_enter(resource, time, &surface->resource,
x, y, offer); x, y, offer);
device->drag_focus = surface; device->drag_focus = surface;

10
src/wayland-server.c
View file

@ -581,14 +581,15 @@ wl_input_device_set_pointer_focus(struct wl_input_device *device,
if (device->pointer_focus_resource) { if (device->pointer_focus_resource) {
wl_input_device_send_pointer_leave( wl_input_device_send_pointer_leave(
device->pointer_focus_resource, device->pointer_focus_resource,
time, device->pointer_focus); time, &device->pointer_focus->resource);
wl_list_remove(&device->pointer_focus_listener.link); wl_list_remove(&device->pointer_focus_listener.link);
} }
resource = find_resource_for_surface(&device->resource_list, surface); resource = find_resource_for_surface(&device->resource_list, surface);
if (resource) { if (resource) {
wl_input_device_send_pointer_enter(resource, time, wl_input_device_send_pointer_enter(resource, time,
surface, sx, sy); &surface->resource,
sx, sy);
wl_list_insert(resource->destroy_listener_list.prev, wl_list_insert(resource->destroy_listener_list.prev,
&device->pointer_focus_listener.link); &device->pointer_focus_listener.link);
} }
@ -612,14 +613,15 @@ wl_input_device_set_keyboard_focus(struct wl_input_device *device,
if (device->keyboard_focus_resource) { if (device->keyboard_focus_resource) {
wl_input_device_send_keyboard_leave( wl_input_device_send_keyboard_leave(
device->keyboard_focus_resource, device->keyboard_focus_resource,
time, device->keyboard_focus); time, &device->keyboard_focus->resource);
wl_list_remove(&device->keyboard_focus_listener.link); wl_list_remove(&device->keyboard_focus_listener.link);
} }
resource = find_resource_for_surface(&device->resource_list, surface); resource = find_resource_for_surface(&device->resource_list, surface);
if (resource) { if (resource) {
wl_input_device_send_keyboard_enter(resource, time, wl_input_device_send_keyboard_enter(resource, time,
surface, &device->keys); &surface->resource,
&device->keys);
wl_list_insert(resource->destroy_listener_list.prev, wl_list_insert(resource->destroy_listener_list.prev,
&device->keyboard_focus_listener.link); &device->keyboard_focus_listener.link);
} }