AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

x11: Update seat capabilities

Browse Source 
The default seat implementation was never returning capabilities,
which is broken. It is visible too, since the inspector shows seat
information now.
This commit is contained in:
Matthias Clasen 2016-02-25 06:18:41 -05:00
parent 84ba01d713
commit e12663378c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/gdkseatdefault.c
View File

@ -28,6 +28,7 @@ struct _GdkSeatDefaultPrivate
GdkDevice *master_keyboard; GdkDevice *master_keyboard;
GList *slave_pointers; GList *slave_pointers;
GList *slave_keyboards; GList *slave_keyboards;
GdkSeatCapabilities capabilities;
}; };
#define KEYBOARD_EVENTS (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | \ #define KEYBOARD_EVENTS (GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | \
@ -86,8 +87,11 @@ gdk_seat_dispose (GObject *object)
static GdkSeatCapabilities static GdkSeatCapabilities
gdk_seat_default_get_capabilities (GdkSeat *seat) gdk_seat_default_get_capabilities (GdkSeat *seat)
{ {
/* FIXME */ GdkSeatDefaultPrivate *priv;
return GDK_SEAT_CAPABILITY_NONE;
priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat));
return priv->capabilities;
} }
static GdkGrabStatus static GdkGrabStatus
@ -314,6 +318,8 @@ gdk_seat_default_add_slave (GdkSeatDefault *seat,
return; return;
} }
priv->capabilities |= capability;
gdk_seat_device_added (GDK_SEAT (seat), device); gdk_seat_device_added (GDK_SEAT (seat), device);
} }
@ -322,6 +328,7 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
GdkDevice *device) GdkDevice *device)
{ {
GdkSeatDefaultPrivate *priv; GdkSeatDefaultPrivate *priv;
GList *l;
g_return_if_fail (GDK_IS_SEAT_DEFAULT (seat)); g_return_if_fail (GDK_IS_SEAT_DEFAULT (seat));
g_return_if_fail (GDK_IS_DEVICE (device)); g_return_if_fail (GDK_IS_DEVICE (device));
@ -331,11 +338,20 @@ gdk_seat_default_remove_slave (GdkSeatDefault *seat,
if (g_list_find (priv->slave_pointers, device)) if (g_list_find (priv->slave_pointers, device))
{ {
priv->slave_pointers = g_list_remove (priv->slave_pointers, device); priv->slave_pointers = g_list_remove (priv->slave_pointers, device);
priv->capabilities &= ~(GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_TOUCH);
for (l = priv->slave_pointers; l; l = l->next)
priv->capabilities |= device_get_capability (GDK_DEVICE (l->data));
gdk_seat_device_removed (GDK_SEAT (seat), device); gdk_seat_device_removed (GDK_SEAT (seat), device);
} }
else if (g_list_find (priv->slave_keyboards, device)) else if (g_list_find (priv->slave_keyboards, device))
{ {
priv->slave_keyboards = g_list_remove (priv->slave_keyboards, device); priv->slave_keyboards = g_list_remove (priv->slave_keyboards, device);
if (priv->slave_keyboards == NULL)
priv->capabilities &= ~GDK_SEAT_CAPABILITY_KEYBOARD;
gdk_seat_device_removed (GDK_SEAT (seat), device); gdk_seat_device_removed (GDK_SEAT (seat), device);
} }
} }