Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Use XInternAtom directly on poking device hardware IDs

Browse Source 
This way we don't cache the property if it wasn't previously there,
added by the driver itself. Bailing out is due there.
This commit is contained in:
Carlos Garnacho
2015-06-30 16:28:59 +02:00
parent 8e917093df
commit 6febc22918
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/x11/gdkdevicemanager-xi2.c
View File

@@ -345,13 +345,17 @@ get_device_ids (GdkDisplay *display,
gulong nitems, bytes_after;
guint32 *data;
int rc, format;
Atom type;
Atom prop, type;
gdk_x11_display_error_trap_push (display);
prop = XInternAtom (GDK_DISPLAY_XDISPLAY (display), "Device Product ID", True);
if (prop == None)
return 0;
rc = XIGetProperty (GDK_DISPLAY_XDISPLAY (display),
info->deviceid,
gdk_x11_get_xatom_by_name_for_display (display, "Device Product ID"),
info->deviceid, prop,
0, 2, False, XA_INTEGER, &type, &format, &nitems, &bytes_after,
(guchar **) &data);
gdk_x11_display_error_trap_pop_ignored (display);