forked from AuroraMiddleware/gtk
x11: don't add unknown tools to our list
Generic tools (Bamboo, built-in tablets) always have the same serial number assigned by the wacom driver. This includes the touch tool when the wacom driver handles the touch evdev node (common where users require the wacom gestures to work). When the first device is the touch device, a tool is created with that serial. All future tools now return the touch tool on lookup since they all share the same serial number. Worse, this happens *across* devices, so the pen event node gets assigned the touch tool because they all have the same serial. Since we don't actually care about the touch as a tool, let's skip any unknown tool. This captures pads as well.
This commit is contained in:
parent
f173d1bc5c
commit
c6dd92294d
@ -1122,8 +1122,11 @@ handle_property_change (GdkX11DeviceManagerXI2 *device_manager,
|
|||||||
GdkDeviceToolType tool_type;
|
GdkDeviceToolType tool_type;
|
||||||
|
|
||||||
tool_type = device_get_tool_type (device);
|
tool_type = device_get_tool_type (device);
|
||||||
tool = gdk_device_tool_new (serial_id, tool_id, tool_type, 0);
|
if (tool_type != GDK_DEVICE_TOOL_TYPE_UNKNOWN)
|
||||||
gdk_seat_default_add_tool (GDK_SEAT_DEFAULT (seat), tool);
|
{
|
||||||
|
tool = gdk_device_tool_new (serial_id, tool_id, tool_type, 0);
|
||||||
|
gdk_seat_default_add_tool (GDK_SEAT_DEFAULT (seat), tool);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user