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

gdk: Drop GDK_SOURCE_CURSOR

Browse Source 
Looking at the xf86-input-wacom driver code, this is not even a thing
anymore. Drop this device type, in modern days there's
GDK_DEVICE_TOOL_TYPE_MOUSE for this.
This commit is contained in:
Carlos Garnacho
2020-07-28 15:25:28 +02:00
parent 36689d1884
commit 3285f52dc8
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/gdkdevice.h
View File

@@ -40,7 +40,6 @@ typedef struct _GdkTimeCoord GdkTimeCoord;
* @GDK_SOURCE_MOUSE: the device is a mouse. (This will be reported for the core * @GDK_SOURCE_MOUSE: the device is a mouse. (This will be reported for the core
* pointer, even if it is something else, such as a trackball.) * pointer, even if it is something else, such as a trackball.)
* @GDK_SOURCE_PEN: the device is a stylus of a graphics tablet or similar device. * @GDK_SOURCE_PEN: the device is a stylus of a graphics tablet or similar device.
* @GDK_SOURCE_CURSOR: the device is a graphics tablet “puck” or similar device.
* @GDK_SOURCE_KEYBOARD: the device is a keyboard. * @GDK_SOURCE_KEYBOARD: the device is a keyboard.
* @GDK_SOURCE_TOUCHSCREEN: the device is a direct-input touch device, such * @GDK_SOURCE_TOUCHSCREEN: the device is a direct-input touch device, such
* as a touchscreen or tablet * as a touchscreen or tablet
@@ -56,7 +55,6 @@ typedef enum
{ {
GDK_SOURCE_MOUSE, GDK_SOURCE_MOUSE,
GDK_SOURCE_PEN, GDK_SOURCE_PEN,
GDK_SOURCE_CURSOR,
GDK_SOURCE_KEYBOARD, GDK_SOURCE_KEYBOARD,
GDK_SOURCE_TOUCHSCREEN, GDK_SOURCE_TOUCHSCREEN,
GDK_SOURCE_TOUCHPAD, GDK_SOURCE_TOUCHPAD,

1
gdk/gdkseatdefault.c
View File

@@ -228,7 +228,6 @@ device_get_capability (GdkDevice *device)
case GDK_SOURCE_TOUCHSCREEN: case GDK_SOURCE_TOUCHSCREEN:
return GDK_SEAT_CAPABILITY_TOUCH; return GDK_SEAT_CAPABILITY_TOUCH;
case GDK_SOURCE_PEN: case GDK_SOURCE_PEN:
case GDK_SOURCE_CURSOR:
return GDK_SEAT_CAPABILITY_TABLET_STYLUS; return GDK_SEAT_CAPABILITY_TABLET_STYLUS;
case GDK_SOURCE_TABLET_PAD: case GDK_SOURCE_TABLET_PAD:
return GDK_SEAT_CAPABILITY_TABLET_PAD; return GDK_SEAT_CAPABILITY_TABLET_PAD;

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

@@ -489,9 +489,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager,
tmp_name = g_ascii_strdown (dev->name, -1); tmp_name = g_ascii_strdown (dev->name, -1);
if (strstr (tmp_name, "cursor")) if (strstr (tmp_name, " pad"))
input_source = GDK_SOURCE_CURSOR;
else if (strstr (tmp_name, " pad"))
input_source = GDK_SOURCE_TABLET_PAD; input_source = GDK_SOURCE_TABLET_PAD;
else if (strstr (tmp_name, "wacom") || else if (strstr (tmp_name, "wacom") ||
strstr (tmp_name, "pen") || strstr (tmp_name, "pen") ||