brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cursor-tracker: Drop helper

Browse Source 
As the tracker can be retrieved from the backend anyway.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4131>
This commit is contained in:
Bilal Elmoussaoui 2024-12-11 11:54:00 +01:00
parent e06592d3df
commit 1152326ac0
6 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-backend-private.h
View File

@ -144,8 +144,6 @@ MetaIdleManager * meta_backend_get_idle_manager (MetaBackend *backend);
META_EXPORT_TEST
MetaColorManager * meta_backend_get_color_manager (MetaBackend *backend);
META_EXPORT_TEST
MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
MetaCursorRenderer * meta_backend_get_cursor_renderer_for_device (MetaBackend *backend,
ClutterInputDevice *device);
META_EXPORT_TEST

6
src/backends/meta-backend.c
View File

@ -1442,6 +1442,12 @@ meta_backend_get_orientation_manager (MetaBackend *backend)
return priv->orientation_manager;
}
/**
* meta_backend_get_cursor_tracker:
* @backend: a #MetaBackend
*
* Returns: (transfer none): The cursor tracker corresponding to @backend
*/
MetaCursorTracker *
meta_backend_get_cursor_tracker (MetaBackend *backend)
{

20
src/backends/meta-cursor-tracker.c
View File

@ -311,26 +311,6 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
G_TYPE_NONE, 0);
}
/**
* meta_cursor_tracker_get_for_display:
* @display: the #MetaDisplay
*
* Retrieves the cursor tracker object for @display.
*
* Returns: (transfer none): the cursor tracker object for @display.
*/
MetaCursorTracker *
meta_cursor_tracker_get_for_display (MetaDisplay *display)
{
MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context);
MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
g_assert (tracker);
return tracker;
}
static void
set_window_cursor (MetaCursorTracker *tracker,
gboolean has_cursor,

3
src/meta/meta-backend.h
View File

@ -99,3 +99,6 @@ MetaBackendCapabilities meta_backend_get_capabilities (MetaBackend *backend);
META_EXPORT
void meta_backend_renderdoc_capture (MetaBackend *backend);
META_EXPORT
MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);

3
src/meta/meta-cursor-tracker.h
View File

@ -36,9 +36,6 @@ G_DECLARE_DERIVABLE_TYPE (MetaCursorTracker,
META, CURSOR_TRACKER,
GObject)
META_EXPORT
MetaCursorTracker *meta_cursor_tracker_get_for_display (MetaDisplay *display);
META_EXPORT
void meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,
int *x,

4
src/x11/window-x11.c
View File

@ -3195,7 +3195,9 @@ meta_window_x11_property_notify (MetaWindow *window,
static int
query_pressed_buttons (MetaWindow *window)
{
MetaCursorTracker *tracker = meta_cursor_tracker_get_for_display (window->display);
MetaContext *context = meta_display_get_context (window->display);
MetaBackend *backend = meta_context_get_backend (context);
MetaCursorTracker *tracker = meta_backend_get_cursor_tracker (backend);
ClutterModifierType mods;
int button = 0;