callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: rename internal touch management functions

Browse Source 
These functions arent quite related to the device manager, so rename these
more conveniently.

https://bugzilla.gnome.org/show_bug.cgi?id=734374
This commit is contained in:
Carlos Garnacho
2014-08-13 20:59:20 +02:00
parent 8f2d8dfa3b
commit 12398c5d74
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gdk/wayland/gdkdevice-wayland.c
View File

@ -1305,9 +1305,9 @@ keyboard_handle_repeat_info (void *data,
} }
static GdkWaylandTouchData * static GdkWaylandTouchData *
_device_manager_add_touch (GdkWaylandDeviceData *device, gdk_wayland_device_add_touch (GdkWaylandDeviceData *device,
uint32_t id, uint32_t id,
struct wl_surface *surface) struct wl_surface *surface)
{ {
GdkWaylandTouchData *touch; GdkWaylandTouchData *touch;
@ -1322,15 +1322,15 @@ _device_manager_add_touch (GdkWaylandDeviceData *device,
} }
static GdkWaylandTouchData * static GdkWaylandTouchData *
_device_manager_get_touch (GdkWaylandDeviceData *device, gdk_wayland_device_get_touch (GdkWaylandDeviceData *device,
uint32_t id) uint32_t id)
{ {
return g_hash_table_lookup (device->touches, GUINT_TO_POINTER (id)); return g_hash_table_lookup (device->touches, GUINT_TO_POINTER (id));
} }
static void static void
_device_manager_remove_touch (GdkWaylandDeviceData *device, gdk_wayland_device_remove_touch (GdkWaylandDeviceData *device,
uint32_t id) uint32_t id)
{ {
g_hash_table_remove (device->touches, GUINT_TO_POINTER (id)); g_hash_table_remove (device->touches, GUINT_TO_POINTER (id));
} }
@ -1386,7 +1386,7 @@ touch_handle_down (void *data,
GdkWaylandTouchData *touch; GdkWaylandTouchData *touch;
GdkEvent *event; GdkEvent *event;
touch = _device_manager_add_touch (device, id, wl_surface); touch = gdk_wayland_device_add_touch (device, id, wl_surface);
touch->x = wl_fixed_to_double (x); touch->x = wl_fixed_to_double (x);
touch->y = wl_fixed_to_double (y); touch->y = wl_fixed_to_double (y);
@ -1409,14 +1409,14 @@ touch_handle_up (void *data,
GdkWaylandTouchData *touch; GdkWaylandTouchData *touch;
GdkEvent *event; GdkEvent *event;
touch = _device_manager_get_touch (device, id); touch = gdk_wayland_device_get_touch (device, id);
event = _create_touch_event (device, touch, GDK_TOUCH_END, time); event = _create_touch_event (device, touch, GDK_TOUCH_END, time);
GDK_NOTE (EVENTS, GDK_NOTE (EVENTS,
g_message ("touch end %f %f", event->touch.x, event->touch.y)); g_message ("touch end %f %f", event->touch.x, event->touch.y));
_gdk_wayland_display_deliver_event (device->display, event); _gdk_wayland_display_deliver_event (device->display, event);
_device_manager_remove_touch (device, id); gdk_wayland_device_remove_touch (device, id);
} }
static void static void
@ -1431,7 +1431,7 @@ touch_handle_motion (void *data,
GdkWaylandTouchData *touch; GdkWaylandTouchData *touch;
GdkEvent *event; GdkEvent *event;
touch = _device_manager_get_touch (device, id); touch = gdk_wayland_device_get_touch (device, id);
touch->x = wl_fixed_to_double (x); touch->x = wl_fixed_to_double (x);
touch->y = wl_fixed_to_double (y); touch->y = wl_fixed_to_double (y);