[gnome-desktop] idle-monitor: Remove per-device monitor from tests
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] idle-monitor: Remove per-device monitor from tests
- Date: Tue, 27 Feb 2018 13:01:16 +0000 (UTC)
commit 4b94e2c0a7b5aa194a837f77f085a81fba65e0d1
Author: Bastien Nocera <hadess hadess net>
Date: Fri Feb 23 00:22:27 2018 +0100
idle-monitor: Remove per-device monitor from tests
It's not used anywhere in the stack now that mutter handles hiding the
cursor when touchscreens are used, and doesn't work under Wayland.
https://bugzilla.gnome.org/show_bug.cgi?id=793737
libgnome-desktop/test-idle-monitor.c | 111 +++-------------------------------
1 files changed, 9 insertions(+), 102 deletions(-)
---
diff --git a/libgnome-desktop/test-idle-monitor.c b/libgnome-desktop/test-idle-monitor.c
index 268a4c1..713f12c 100644
--- a/libgnome-desktop/test-idle-monitor.c
+++ b/libgnome-desktop/test-idle-monitor.c
@@ -1,46 +1,27 @@
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include "libgnome-desktop/gnome-idle-monitor.h"
-#define IDLE_TIME 1000 /* 1 second */
-
-GHashTable *monitors = NULL; /* key = device id, value = GnomeIdleMonitor */
+#define IDLE_TIME 1000 * 5 /* 5 seconds */
static void
active_watch_func (GnomeIdleMonitor *monitor,
guint id,
gpointer user_data)
{
- GdkDevice *device;
- int device_id;
-
- g_object_get (monitor, "device", &device, NULL);
- device_id = gdk_x11_device_get_id (device);
- g_message ("Active watch func called for device %s (id: %d, watch id %d)",
- gdk_device_get_name (device),
- device_id,
- id);
- g_object_unref (device);
+ g_message ("Active watch func called (watch id %d)", id);
}
static void
ensure_active_watch (GnomeIdleMonitor *monitor)
{
- GdkDevice *device;
guint watch_id;
- int device_id;
- g_object_get (monitor, "device", &device, NULL);
- device_id = gdk_x11_device_get_id (device);
watch_id = gnome_idle_monitor_add_user_active_watch (monitor,
active_watch_func,
NULL,
NULL);
- g_message ("Added active watch ID %d for device %s (%d)",
- watch_id,
- gdk_device_get_name (device),
- device_id);
+ g_message ("Added active watch ID %d", watch_id);
}
static void
@@ -48,102 +29,28 @@ idle_watch_func (GnomeIdleMonitor *monitor,
guint id,
gpointer user_data)
{
- GdkDevice *device;
- int device_id;
-
- g_object_get (monitor, "device", &device, NULL);
- device_id = gdk_x11_device_get_id (device);
- g_message ("Idle watch func called for device %s (id: %d, watch id %d)",
- gdk_device_get_name (device),
- device_id,
- id);
- g_object_unref (device);
-
+ g_message ("Idle watch func called (watch id %d)", id);
ensure_active_watch (monitor);
}
-static void
-device_added_cb (GdkDeviceManager *manager,
- GdkDevice *device,
- gpointer user_data)
+int main (int argc, char **argv)
{
GnomeIdleMonitor *monitor;
guint watch_id;
- int device_id;
- GError *error = NULL;
- device_id = gdk_x11_device_get_id (device);
- monitor = gnome_idle_monitor_new_for_device (device, &error);
- if (!monitor) {
- g_warning ("Per-device idletime monitor not available: %s", error->message);
- g_error_free (error);
- return;
- }
+ gtk_init (&argc, &argv);
+ monitor = gnome_idle_monitor_new ();
watch_id = gnome_idle_monitor_add_idle_watch (monitor,
IDLE_TIME,
idle_watch_func,
NULL,
NULL);
- g_message ("Added idle watch ID %d for device %s (%d)",
- watch_id,
- gdk_device_get_name (device),
- device_id);
+ g_message ("Added idle watch ID %d",
+ watch_id);
ensure_active_watch (monitor);
- g_hash_table_insert (monitors,
- GINT_TO_POINTER (device_id),
- monitor);
-}
-
-static void
-device_removed_cb (GdkDeviceManager *manager,
- GdkDevice *device,
- gpointer user_data)
-{
- g_hash_table_remove (monitors,
- GINT_TO_POINTER (gdk_x11_device_get_id (device)));
- g_message ("Removed watch for device %s (%d)",
- gdk_device_get_name (device),
- gdk_x11_device_get_id (device));
-}
-
-static void
-device_changed_cb (GdkDeviceManager *manager,
- GdkDevice *device,
- gpointer user_data)
-{
- if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_FLOATING)
- device_removed_cb (manager, device, NULL);
- else
- device_added_cb (manager, device, NULL);
-}
-
-int main (int argc, char **argv)
-{
- GdkDeviceManager *manager;
- GList *devices, *l;
-
- gtk_init (&argc, &argv);
-
- monitors = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL, g_object_unref);
-
- manager = gdk_display_get_device_manager (gdk_display_get_default ());
- g_signal_connect (manager, "device-added",
- G_CALLBACK (device_added_cb), NULL);
- g_signal_connect (manager, "device-removed",
- G_CALLBACK (device_removed_cb), NULL);
- g_signal_connect (manager, "device-changed",
- G_CALLBACK (device_changed_cb), NULL);
- devices = gdk_device_manager_list_devices (manager, GDK_DEVICE_TYPE_SLAVE);
- for (l = devices; l != NULL; l = l->next) {
- GdkDevice *device = l->data;
-
- device_added_cb (manager, device, NULL);
- }
-
gtk_main ();
return 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]