[gnome-settings-daemon/wip/settings-relocation: 4/12] power: Restrict disabling of touchscreens/tablets to X11

[Carlos Garnacho <carlosg src gnome org>]

commit c2b6967f19dfe5226b812a3368905e755dea49dc
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Dec 17 14:10:48 2014 +0100

    power: Restrict disabling of touchscreens/tablets to X11
    
    This should be eventually done by the compositor. In the mean time, restrict
    it to X11, and remove the GsdDeviceMapper usage, as it's not strictly
    necessary.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=742593

 plugins/power/gsd-power-manager.c |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 13c34f3..1732598 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -921,18 +921,27 @@ action_hibernate (GsdPowerManager *manager)
 static void
 screen_devices_disable (GsdPowerManager *manager)
 {
-        GsdDeviceMapper *mapper;
         GdkDeviceManager *device_manager;
         GList *devices, *l, *to_change;
 
-        mapper = gsd_device_mapper_get ();
+        /* This will be managed by the compositor eventually on X11 too:
+         * https://bugzilla.gnome.org/show_bug.cgi?id=742598
+         */
+        if (gnome_settings_is_wayland ())
+                return;
+
         device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
         devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE);
         to_change = NULL;
         for (l = devices; l != NULL; l = l->next ) {
                 GdkDevice *device = l->data;
+                GdkInputSource source;
 
-                if (gsd_device_mapper_get_device_output (mapper, device) != NULL) {
+                source = gdk_device_get_source (device);
+
+                if (source == GDK_SOURCE_PEN ||
+                    source == GDK_SOURCE_ERASER ||
+                    source == GDK_SOURCE_TOUCHSCREEN) {
                         int device_id;
 
                         g_object_get (device, "device-id", &device_id, NULL);
@@ -953,6 +962,9 @@ screen_devices_enable (GsdPowerManager *manager)
 {
         GList *l;
 
+        if (gnome_settings_is_wayland ())
+                return;
+
         for (l = manager->priv->disabled_devices; l != NULL; l = l->next)
                 set_device_enabled (GPOINTER_TO_INT (l->data), TRUE);