mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol: remove absolute coordinates from pointer

Browse source 
Remove the absolute coordinate fields from the pointer motion and
pointer_focus events. Clients are not supposed to see any global
coordinates.

Fix wayland-server code accordingly. wayland-client code is unaffected.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
This commit is contained in:
Pekka Paalanen 2012-02-14 11:00:12 +02:00 • committed by Kristian Høgsberg
parent 7243062f93
commit 5536031bfb
3 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
protocol/wayland.xml
View file

@ -594,14 +594,11 @@
<event name="motion"> <event name="motion">
<description summary="pointer motion event"> <description summary="pointer motion event">
Notification of pointer location change. x,y are the absolute Notification of pointer location change. The arguments surface_[xy]
location on the screen. surface_[xy] are the location are the location relative to the focused surface.
relative to the focused surface.
</description> </description>
<arg name="time" type="uint"/> <arg name="time" type="uint"/>
<arg name="x" type="int"/>
<arg name="y" type="int"/>
<arg name="surface_x" type="int"/> <arg name="surface_x" type="int"/>
<arg name="surface_y" type="int"/> <arg name="surface_y" type="int"/>
</event> </event>
@ -637,8 +634,6 @@
<arg name="time" type="uint"/> <arg name="time" type="uint"/>
<arg name="surface" type="object" interface="wl_surface"/> <arg name="surface" type="object" interface="wl_surface"/>
<arg name="x" type="int"/>
<arg name="y" type="int"/>
<arg name="surface_x" type="int"/> <arg name="surface_x" type="int"/>
<arg name="surface_y" type="int"/> <arg name="surface_y" type="int"/>
</event> </event>

12
src/wayland-server.c
View file

@ -421,21 +421,19 @@ default_grab_focus(struct wl_grab *grab, uint32_t time,
if (device->button_count > 0) if (device->button_count > 0)
return; return;
wl_input_device_set_pointer_focus(device, surface, time, wl_input_device_set_pointer_focus(device, surface, time, x, y);
device->x, device->y, x, y);
} }
static void static void
default_grab_motion(struct wl_grab *grab, default_grab_motion(struct wl_grab *grab,
uint32_t time, int32_t x, int32_t y) uint32_t time, int32_t x, int32_t y)
{ {
struct wl_input_device *device = grab->input_device;
struct wl_resource *resource; struct wl_resource *resource;
resource = grab->input_device->pointer_focus_resource; resource = grab->input_device->pointer_focus_resource;
if (resource) if (resource)
wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION, wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION,
time, device->x, device->y, x, y); time, x, y);
} }
static void static void
@ -453,7 +451,6 @@ default_grab_button(struct wl_grab *grab,
if (device->button_count == 0 && state == 0) if (device->button_count == 0 && state == 0)
wl_input_device_set_pointer_focus(device, wl_input_device_set_pointer_focus(device,
device->current, time, device->current, time,
device->x, device->y,
device->current_x, device->current_x,
device->current_y); device->current_y);
} }
@ -519,7 +516,6 @@ WL_EXPORT void
wl_input_device_set_pointer_focus(struct wl_input_device *device, wl_input_device_set_pointer_focus(struct wl_input_device *device,
struct wl_surface *surface, struct wl_surface *surface,
uint32_t time, uint32_t time,
int32_t x, int32_t y,
int32_t sx, int32_t sy) int32_t sx, int32_t sy)
{ {
struct wl_resource *resource; struct wl_resource *resource;
@ -532,7 +528,7 @@ wl_input_device_set_pointer_focus(struct wl_input_device *device,
device->pointer_focus->resource.client != surface->resource.client)) device->pointer_focus->resource.client != surface->resource.client))
wl_resource_post_event(device->pointer_focus_resource, wl_resource_post_event(device->pointer_focus_resource,
WL_INPUT_DEVICE_POINTER_FOCUS, WL_INPUT_DEVICE_POINTER_FOCUS,
time, NULL, 0, 0, 0, 0); time, NULL, 0, 0);
if (device->pointer_focus_resource) if (device->pointer_focus_resource)
wl_list_remove(&device->pointer_focus_listener.link); wl_list_remove(&device->pointer_focus_listener.link);
@ -540,7 +536,7 @@ wl_input_device_set_pointer_focus(struct wl_input_device *device,
if (resource) { if (resource) {
wl_resource_post_event(resource, wl_resource_post_event(resource,
WL_INPUT_DEVICE_POINTER_FOCUS, WL_INPUT_DEVICE_POINTER_FOCUS,
time, surface, x, y, sx, sy); time, surface, 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);
} }

1
src/wayland-server.h
View file

@ -269,7 +269,6 @@ void
wl_input_device_set_pointer_focus(struct wl_input_device *device, wl_input_device_set_pointer_focus(struct wl_input_device *device,
struct wl_surface *surface, struct wl_surface *surface,
uint32_t time, uint32_t time,
int32_t x, int32_t y,
int32_t sx, int32_t sy); int32_t sx, int32_t sy);
void void