sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Revert "backends: Use also a native cursor renderer for tablets"

Browse source 
With commit c985753442 the support for
multiple hardware cursors broke, but those were never properly supported
anyway as we usually assume there's only one hardware cursor around.

With the introduction of the KMS thread in the future, we'll only have
one KMS cursor that gets updated directly from the input thread. So
apart from the fact that it never really makes sense to have two cursors
visible, in this new model having multiple cursors won't work anyway.

So make the cursor we show for stylii a software cursor again.
Eventually the plan is to make the input device that's driving the KMS
cursor interchangeable, so that we can always use hardware cursors.

This reverts commit 165b7369c8.

Fixes https://gitlab.gnome.org/GNOME/mutter/-/issues/1645

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1758>
This commit is contained in:
Jonas Dreßler 2021-03-08 13:55:01 +01:00 • committed by Marge Bot
parent 393a85971c
commit 301198a9b8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/backends/native/meta-seat-native.c
View file

@ -61,7 +61,7 @@ meta_seat_native_handle_event_post (ClutterSeat *seat,
if (event_type == CLUTTER_PROXIMITY_IN)
{
MetaCursorRendererNative *cursor_renderer_native;
MetaCursorRenderer *cursor_renderer;
if (!seat_native->tablet_cursors)
{
@ -69,10 +69,9 @@ meta_seat_native_handle_event_post (ClutterSeat *seat,
g_object_unref);
}
cursor_renderer_native =
meta_cursor_renderer_native_new (meta_get_backend (), device);
cursor_renderer = meta_cursor_renderer_new (meta_get_backend (), device);
g_hash_table_insert (seat_native->tablet_cursors,
device, cursor_renderer_native);
device, cursor_renderer);
return TRUE;
}
else if (event_type == CLUTTER_PROXIMITY_OUT)