From ad22b3f0984b26a81df92f93668c1b339ec679f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 9 May 2018 18:01:11 +0200 Subject: [PATCH] backend/native: Remove unnecessary cursor renderer update It is already handled by the monitor-updated-internal signal handler in meta-cursor-renderer-native.c, which will always be called indirectly by resuming the monitor manager. While at it, remove a useless comment. https://gitlab.gnome.org/GNOME/mutter/issues/77 --- src/backends/native/meta-backend-native.c | 6 ------ src/backends/native/meta-cursor-renderer-native.c | 7 ------- src/backends/native/meta-cursor-renderer-native.h | 2 -- 3 files changed, 15 deletions(-) diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index a29f593ea..042d96ec6 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -645,8 +645,6 @@ void meta_backend_native_resume (MetaBackendNative *native) meta_backend_get_monitor_manager (backend); MetaMonitorManagerKms *monitor_manager_kms = META_MONITOR_MANAGER_KMS (monitor_manager); - MetaCursorRenderer *cursor_renderer; - MetaCursorRendererNative *cursor_renderer_native; ClutterActor *stage; MetaIdleMonitor *idle_monitor; @@ -658,10 +656,6 @@ void meta_backend_native_resume (MetaBackendNative *native) stage = meta_backend_get_stage (backend); clutter_actor_queue_redraw (stage); - cursor_renderer = meta_backend_get_cursor_renderer (backend); - cursor_renderer_native = META_CURSOR_RENDERER_NATIVE (cursor_renderer); - meta_cursor_renderer_native_force_update (cursor_renderer_native); - idle_monitor = meta_backend_get_idle_monitor (backend, 0); meta_idle_monitor_reset_idletime (idle_monitor); } diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index fcecea126..e151afce5 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -1108,7 +1108,6 @@ static void on_monitors_changed (MetaMonitorManager *monitors, MetaCursorRendererNative *native) { - /* Our tracking is all messed up, so force an update. */ force_update_hw_cursor (native); } @@ -1180,9 +1179,3 @@ static void meta_cursor_renderer_native_init (MetaCursorRendererNative *native) { } - -void -meta_cursor_renderer_native_force_update (MetaCursorRendererNative *native) -{ - force_update_hw_cursor (native); -} diff --git a/src/backends/native/meta-cursor-renderer-native.h b/src/backends/native/meta-cursor-renderer-native.h index 09203a5f7..fb4c8edc7 100644 --- a/src/backends/native/meta-cursor-renderer-native.h +++ b/src/backends/native/meta-cursor-renderer-native.h @@ -32,8 +32,6 @@ G_DECLARE_FINAL_TYPE (MetaCursorRendererNative, meta_cursor_renderer_native, META, CURSOR_RENDERER_NATIVE, MetaCursorRenderer) -void meta_cursor_renderer_native_force_update (MetaCursorRendererNative *renderer); - MetaCursorRendererNative * meta_cursor_renderer_native_new (MetaBackend *backend); #endif /* META_CURSOR_RENDERER_NATIVE_H */