[gnome-settings-daemon] mouse: remove locate-pointer

[Carlos Garnacho <carlosg src gnome org>]

commit 6dff93a0dfa80db3f481eed5d6ed689bf469aa1b
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Thu Feb 21 11:41:47 2019 +0100

    mouse: remove locate-pointer
    
    The current implementation in gnome-settings-daemon relies on X11
    and cannot work on Wayland.
    
    Remove the locate-pointer functionality and the relevant helper from
    gnome-settings-daemon to move to the Wayland compositor instead, i.e.
    mutter/gnome-shell.
    
    Also, move the gsettings key for "locate-pointer" to "org.gnome.desktop.
    interface".
    
    https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/86
    https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/merge_requests/19
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/453
    https://gitlab.gnome.org/GNOME/gnome-shell/issues/981

 .gitignore                                         |   1 -
 data/gnome-settings-daemon.convert                 |   1 -
 ...nome.settings-daemon.peripherals.gschema.xml.in |   4 -
 plugins/mouse/gsd-locate-pointer.c                 | 512 -------------
 plugins/mouse/gsd-locate-pointer.h                 |  24 -
 plugins/mouse/gsd-mouse-manager.c                  |  40 -
 plugins/mouse/gsd-timeline.c                       | 841 ---------------------
 plugins/mouse/gsd-timeline.h                       | 110 ---
 plugins/mouse/meson.build                          |  15 -
 9 files changed, 1548 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 33cb6901..b88553da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,7 +87,6 @@ plugins/smartcard/org.gnome.ScreenSaver.c
 plugins/smartcard/org.gnome.ScreenSaver.h
 plugins/smartcard/org.gnome.SessionManager.c
 plugins/smartcard/org.gnome.SessionManager.h
-plugins/mouse/gsd-locate-pointer
 plugins/mouse/gsd-test-mouse
 plugins/power/gsd-backlight-helper
 plugins/power/gsd-power-enums-update
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 8ca4630e..f04d24c1 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -30,7 +30,6 @@ volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
 www = /apps/gnome_settings_daemon/keybindings/www
 
 [org.gnome.settings-daemon.peripherals.mouse]
-locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
 double-click = /desktop/gnome/peripherals/mouse/double_click
 drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
 
diff --git a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in 
b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
index f1785ed5..def30967 100644
--- a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
+++ b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in
@@ -47,10 +47,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.mouse" 
path="/org/gnome/settings-daemon/peripherals/mouse/">
-    <key name="locate-pointer" type="b">
-      <default>false</default>
-      <summary>Highlights the current location of the pointer when the Control key is pressed and 
released.</summary>
-    </key>
     <key name="double-click" type="i">
       <default>400</default>
       <summary>Double click time</summary>
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 701f4af5..1148fa95 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -38,7 +38,6 @@
 #define GSETTINGS_TOUCHPAD_SCHEMA  "org.gnome.desktop.peripherals.touchpad"
 
 /* Mouse settings */
-#define KEY_LOCATE_POINTER               "locate-pointer"
 #define KEY_DWELL_CLICK_ENABLED          "dwell-click-enabled"
 #define KEY_SECONDARY_CLICK_ENABLED      "secondary-click-enabled"
 
@@ -52,8 +51,6 @@ struct _GsdMouseManager
         GSettings *mouse_settings;
         GSettings *gsd_mouse_settings;
         gboolean mousetweaks_daemon_running;
-        gboolean locate_pointer_spawned;
-        GPid locate_pointer_pid;
 };
 
 static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
@@ -74,38 +71,6 @@ gsd_mouse_manager_class_init (GsdMouseManagerClass *klass)
         object_class->finalize = gsd_mouse_manager_finalize;
 }
 
-static void
-set_locate_pointer (GsdMouseManager *manager,
-                    gboolean         state)
-{
-        if (state) {
-                GError *error = NULL;
-                char *args[2];
-
-                if (manager->locate_pointer_spawned)
-                        return;
-
-                args[0] = LIBEXECDIR "/gsd-locate-pointer";
-                args[1] = NULL;
-
-                g_spawn_async (NULL, args, NULL,
-                               0, NULL, NULL,
-                               &manager->locate_pointer_pid, &error);
-
-                manager->locate_pointer_spawned = (error == NULL);
-
-                if (error) {
-                        g_settings_set_boolean (manager->gsd_mouse_settings, KEY_LOCATE_POINTER, FALSE);
-                        g_error_free (error);
-                }
-
-        } else if (manager->locate_pointer_spawned) {
-                kill (manager->locate_pointer_pid, SIGHUP);
-                g_spawn_close_pid (manager->locate_pointer_pid);
-                manager->locate_pointer_spawned = FALSE;
-        }
-}
-
 static void
 set_mousetweaks_daemon (GsdMouseManager *manager,
                         gboolean         dwell_click_enabled,
@@ -151,8 +116,6 @@ mouse_callback (GSettings       *settings,
                 set_mousetweaks_daemon (manager,
                                         g_settings_get_boolean (settings, KEY_DWELL_CLICK_ENABLED),
                                         g_settings_get_boolean (settings, KEY_SECONDARY_CLICK_ENABLED));
-        } else if (g_str_equal (key, KEY_LOCATE_POINTER)) {
-                set_locate_pointer (manager, g_settings_get_boolean (settings, KEY_LOCATE_POINTER));
         }
 }
 
@@ -179,7 +142,6 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
                           G_CALLBACK (mouse_callback), manager);
 #endif
 
-        set_locate_pointer (manager, g_settings_get_boolean (manager->gsd_mouse_settings, 
KEY_LOCATE_POINTER));
         set_mousetweaks_daemon (manager,
                                 g_settings_get_boolean (manager->mouse_a11y_settings, 
KEY_DWELL_CLICK_ENABLED),
                                 g_settings_get_boolean (manager->mouse_a11y_settings, 
KEY_SECONDARY_CLICK_ENABLED));
@@ -224,8 +186,6 @@ gsd_mouse_manager_stop (GsdMouseManager *manager)
         g_clear_object (&manager->mouse_settings);
         g_clear_object (&manager->touchpad_settings);
         g_clear_object (&manager->gsd_mouse_settings);
-
-        set_locate_pointer (manager, FALSE);
 }
 
 static void
diff --git a/plugins/mouse/meson.build b/plugins/mouse/meson.build
index 9de6a1a8..92623d56 100644
--- a/plugins/mouse/meson.build
+++ b/plugins/mouse/meson.build
@@ -23,23 +23,8 @@ executable(
   install_dir: gsd_libexecdir
 )
 
-sources = files(
-  'gsd-locate-pointer.c',
-  'gsd-timeline.c'
-)
-
 deps = [
   gtk_dep,
   m_dep,
   x11_dep
 ]
-
-executable(
-  'gsd-locate-pointer',
-  sources,
-  include_directories: top_inc,
-  dependencies: deps,
-  install: true,
-  install_rpath: gsd_pkglibdir,
-  install_dir: gsd_libexecdir
-)