summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2015-11-26 10:52:36 +1300
committerRobert Ancell <robert.ancell@canonical.com>2015-11-26 10:52:36 +1300
commit4433176405cb71b7df1e76009d617c5cb541e36a (patch)
treea84cb235999a3690ea79fd83b2e27851b77ccb6d /src
parent3fbda968c9740f8a58d1a7729b9cd6cc8d9aa212 (diff)
downloadlightdm-4433176405cb71b7df1e76009d617c5cb541e36a.tar.gz
Don't enable the hardware cursor in Unity System Compositor anymore. Unity 8 now correctly provides its own cursor and other shells should too
Diffstat (limited to 'src')
-rw-r--r--src/seat-xlocal.c2
-rw-r--r--src/unity-system-compositor.c12
-rw-r--r--src/unity-system-compositor.h2
3 files changed, 0 insertions, 16 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);