isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-13 03:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

backends/x11: Store eraser and stylus tools separately

Browse Source 
Our hashtable stores tools by the serial but our stylus tool and eraser
tool share the same serial - they only differ by the tool type.

This results in only one tool being created and this tool re-used for
the other type tool. Fun side-effects of this are that the stylus ends
up using the eraser pressure curve (or vice versa).

Hack around this by bit-flipping the serial for the eraser to
make it distinct - this is the only place we need to wrorry .

Closes #1884

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3542>
This commit is contained in:
Peter Hutterer 2024-01-24 15:54:25 +10:00 committed by Marge Bot
parent b8914da0c8
commit ff38cf366d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/x11/meta-seat-x11.c
View File

@ -877,18 +877,30 @@ update_tool (MetaSeatX11 *seat_x11,
ClutterInputDeviceTool *tool = NULL; ClutterInputDeviceTool *tool = NULL;
ClutterInputDeviceToolType type; ClutterInputDeviceToolType type;
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
int lookup_serial;
if (serial_id != 0) if (serial_id != 0)
{ {
/* stylus and eraser share the same serial, so bitflip the eraser's
* serial to make them distinct in the hashtable */
if (clutter_input_device_get_device_type (device) == CLUTTER_ERASER_DEVICE)
{
lookup_serial = ~serial_id;
type = CLUTTER_INPUT_DEVICE_TOOL_ERASER;
}
else
{
lookup_serial = serial_id;
type = CLUTTER_INPUT_DEVICE_TOOL_PEN;
}
tool = g_hash_table_lookup (seat_x11->tools_by_serial, tool = g_hash_table_lookup (seat_x11->tools_by_serial,
GUINT_TO_POINTER (serial_id)); GUINT_TO_POINTER (lookup_serial));
if (!tool) if (!tool)
{ {
type = clutter_input_device_get_device_type (device) == CLUTTER_ERASER_DEVICE ?
CLUTTER_INPUT_DEVICE_TOOL_ERASER : CLUTTER_INPUT_DEVICE_TOOL_PEN;
tool = meta_input_device_tool_x11_new (serial_id, type); tool = meta_input_device_tool_x11_new (serial_id, type);
g_hash_table_insert (seat_x11->tools_by_serial, g_hash_table_insert (seat_x11->tools_by_serial,
GUINT_TO_POINTER (serial_id), GUINT_TO_POINTER (lookup_serial),
tool); tool);
} }
} }