Don't enable the hardware cursor in Unity System Compositor anymore. Unity 8 now correctly provides its own cursor and other shells should too

11 files changed, 7 insertions, 28 deletions

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index b930ba32..e019f647 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -241,8 +241,6 @@ create_unity_system_compositor (Seat *seat)
     unity_system_compositor_set_socket (compositor, socket_name);
     g_free (socket_name);
 
-    unity_system_compositor_set_enable_hardware_cursor (compositor, TRUE);
-
     return DISPLAY_SERVER (compositor);
 }
 
diff --git a/src/unity-system-compositor.c b/src/unity-system-compositor.c
index 069e11a8..a8b631b6 100644
--- a/src/unity-system-compositor.c
+++ b/src/unity-system-compositor.c
@@ -39,9 +39,6 @@ struct UnitySystemCompositorPrivate
     gint vt;
     gboolean have_vt_ref;
 
-    /* TRUE if should show hardware cursor */
-    gboolean enable_hardware_cursor;
-
     /* Pipes to communicate with compositor */
     int to_compositor_pipe[2];
     int from_compositor_pipe[2];
@@ -123,13 +120,6 @@ unity_system_compositor_set_vt (UnitySystemCompositor *compositor, gint vt)
 }
 
 void
-unity_system_compositor_set_enable_hardware_cursor (UnitySystemCompositor *compositor, gboolean enable_cursor)
-{
-    g_return_if_fail (compositor != NULL);
-    compositor->priv->enable_hardware_cursor = enable_cursor;
-}
-
-void
 unity_system_compositor_set_timeout (UnitySystemCompositor *compositor, gint timeout)
 {
     g_return_if_fail (compositor != NULL);
@@ -436,8 +426,6 @@ unity_system_compositor_start (DisplayServer *server)
     g_string_append_printf (command, " --from-dm-fd %d --to-dm-fd %d", compositor->priv->to_compositor_pipe[0], compositor->priv->from_compositor_pipe[1]);
     if (compositor->priv->vt > 0)
         g_string_append_printf (command, " --vt %d", compositor->priv->vt);
-    if (compositor->priv->enable_hardware_cursor)
-        g_string_append (command, " --enable-hardware-cursor=true");
     process_set_command (compositor->priv->process, command->str);
     g_string_free (command, TRUE);
 
diff --git a/src/unity-system-compositor.h b/src/unity-system-compositor.h
index cfd0d4d2..5bf453ad 100644
--- a/src/unity-system-compositor.h
+++ b/src/unity-system-compositor.h
@@ -48,8 +48,6 @@ const gchar *unity_system_compositor_get_socket (UnitySystemCompositor *composit
 
 void unity_system_compositor_set_vt (UnitySystemCompositor *compositor, gint vt);
 
-void unity_system_compositor_set_enable_hardware_cursor (UnitySystemCompositor *compositor, gboolean enable_cursor);
-
 void unity_system_compositor_set_timeout (UnitySystemCompositor *compositor, gint timeout);
 
 void unity_system_compositor_set_active_session (UnitySystemCompositor *compositor, const gchar *id);
diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index 072aafa7..766533d0 100644
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
diff --git a/tests/scripts/mir-container-session.conf b/tests/scripts/mir-container-session.conf
index 1e32d5ec..67cc4f46 100644
--- a/tests/scripts/mir-container-session.conf
+++ b/tests/scripts/mir-container-session.conf
@@ -30,7 +30,7 @@ user-session=mir-container
 #?*GREETER-X-0 START-SESSION
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=8 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=8 CONTAINER=TRUE
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=8 XDG_VTNR=8 CONTAINER=TRUE
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Switch to system compositor
diff --git a/tests/scripts/mir-greeter.conf b/tests/scripts/mir-greeter.conf
index 46abe355..05ec6f58 100644
--- a/tests/scripts/mir-greeter.conf
+++ b/tests/scripts/mir-greeter.conf
@@ -6,7 +6,7 @@
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts
diff --git a/tests/scripts/mir-script-hooks.conf b/tests/scripts/mir-script-hooks.conf
index 63dec803..0e24bfbb 100644
--- a/tests/scripts/mir-script-hooks.conf
+++ b/tests/scripts/mir-script-hooks.conf
@@ -15,7 +15,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Script hooks run
diff --git a/tests/scripts/mir-session-compositor-crash.conf b/tests/scripts/mir-session-compositor-crash.conf
index 1bdd0b4c..0486857f 100644
--- a/tests/scripts/mir-session-compositor-crash.conf
+++ b/tests/scripts/mir-session-compositor-crash.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
diff --git a/tests/scripts/mir-session-crash.conf b/tests/scripts/mir-session-crash.conf
index 369b3c33..7e55a087 100644
--- a/tests/scripts/mir-session-crash.conf
+++ b/tests/scripts/mir-session-crash.conf
@@ -10,7 +10,7 @@ user-session=mir
 #?RUNNER DAEMON-START
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=7
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=7 XDG_VTNR=7
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
index 6c192f3b..852a40fb 100644
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -30,7 +30,7 @@ user-session=mir
 #?*GREETER-X-0 START-SESSION
 
 # System compositor starts
-#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=8 ENABLE-HARDWARE-CURSOR=TRUE XDG_VTNR=8
+#?UNITY-SYSTEM-COMPOSITOR START FILE=/run/lightdm-mir-0 VT=8 XDG_VTNR=8
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Switch to system compositor
diff --git a/tests/src/unity-system-compositor.c b/tests/src/unity-system-compositor.c
index 15f68622..f138aaa3 100644
--- a/tests/src/unity-system-compositor.c
+++ b/tests/src/unity-system-compositor.c
@@ -147,7 +147,6 @@ main (int argc, char **argv)
     GString *status_text;
     gboolean test = FALSE, container = FALSE;
     int vt_number = -1;
-    gboolean enable_hardware_cursor = FALSE;
     const gchar *file = NULL;
 
 #if !defined(GLIB_VERSION_2_36)
@@ -180,8 +179,6 @@ main (int argc, char **argv)
             vt_number = atoi (argv[i+1]);
             i++;
         }
-        else if (strcmp (arg, "--enable-hardware-cursor=true") == 0)
-            enable_hardware_cursor = TRUE;
         else if (strcmp (arg, "--file") == 0)
         {
             file = argv[i+1];
@@ -202,8 +199,6 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " FILE=%s", file);
     if (vt_number >= 0)
         g_string_append_printf (status_text, " VT=%d", vt_number);
-    if (enable_hardware_cursor)
-        g_string_append (status_text, " ENABLE-HARDWARE-CURSOR=TRUE");
     if (g_getenv ("XDG_VTNR"))
         g_string_append_printf (status_text, " XDG_VTNR=%s", g_getenv ("XDG_VTNR"));
     if (test)