applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Unite GsdDeviceManager

Browse source 
Drop the subtypes, and keep a single udev-based GsdDeviceManager,
which will work on both backends, and should work on all platforms
we care about (?).
This commit is contained in:
Carlos Garnacho 2019-07-27 00:17:37 +02:00 • committed by Georges Basile Stavracas Neto
parent 9e5ccbd748
commit 3600cb5a40
7 changed files with 241 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -129,6 +129,7 @@ polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
pulse_dep = dependency('libpulse', version: pulse_req_version) pulse_dep = dependency('libpulse', version: pulse_req_version)
pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version) pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version)
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8') upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
gudev_dep = dependency('gudev-1.0')
x11_dep = dependency('x11') x11_dep = dependency('x11')
xi_dep = dependency('xi', version: '>= 1.2') xi_dep = dependency('xi', version: '>= 1.2')
@ -183,17 +184,6 @@ endif
config_h.set('HAVE_IBUS', enable_ibus, config_h.set('HAVE_IBUS', enable_ibus,
description: 'Defined if IBus support is enabled') description: 'Defined if IBus support is enabled')
# wayland
enable_wayland = get_option('wayland')
if enable_wayland
wayland_deps = [
dependency('gdk-wayland-3.0'),
dependency('gudev-1.0')
]
endif
config_h.set('HAVE_WAYLAND', enable_wayland,
description: 'Define to 1 if Wayland is enabled')
# thunderbolt # thunderbolt
config_h.set10('HAVE_FN_EXPLICIT_BZERO', config_h.set10('HAVE_FN_EXPLICIT_BZERO',
cc.has_function('explicit_bzero', prefix: '''#include <string.h>'''), cc.has_function('explicit_bzero', prefix: '''#include <string.h>'''),
@ -293,6 +283,5 @@ output += ' Cheese (Users panel webcam support) ........ ' + enable_cheese.t
output += ' IBus (Region panel IBus support) ........... ' + enable_ibus.to_string() + '\n' output += ' IBus (Region panel IBus support) ........... ' + enable_ibus.to_string() + '\n'
output += ' NetworkManager (Network panel) ............. ' + host_is_linux.to_string() + '\n' output += ' NetworkManager (Network panel) ............. ' + host_is_linux.to_string() + '\n'
output += ' Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n' output += ' Wacom (Wacom tablet panel) ................. ' + host_is_linux_not_s390.to_string() + '\n'
output += ' Wayland .................................... ' + enable_wayland.to_string() + '\n'
message(output) message(output)

256
panels/common/gsd-device-manager-udev.c
View file

@ -1,256 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2015 Red Hat
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Author: Carlos Garnacho <carlosg@gnome.org>
*/
#include "config.h"
#include <string.h>
#include <gudev/gudev.h>
#include <gdk/gdkwayland.h>
#include "gsd-device-manager-udev.h"
struct _GsdUdevDeviceManager
{
GsdDeviceManager parent_instance;
GHashTable *devices;
GUdevClient *udev_client;
};
G_DEFINE_TYPE (GsdUdevDeviceManager, gsd_udev_device_manager, GSD_TYPE_DEVICE_MANAGER)
/* Index matches GsdDeviceType */
const gchar *udev_ids[] = {
"ID_INPUT_MOUSE",
"ID_INPUT_KEYBOARD",
"ID_INPUT_TOUCHPAD",
"ID_INPUT_TABLET",
"ID_INPUT_TOUCHSCREEN",
"ID_INPUT_TABLET_PAD",
};
static GsdDeviceType
udev_device_get_device_type (GUdevDevice *device)
{
GsdDeviceType type = 0;
gint i;
for (i = 0; i < G_N_ELEMENTS (udev_ids); i++) {
if (g_udev_device_get_property_as_boolean (device, udev_ids[i]))
type |= (1 << i);
}
return type;
}
static gboolean
device_is_evdev (GUdevDevice *device)
{
const gchar *device_file;
device_file = g_udev_device_get_device_file (device);
if (!device_file || strstr (device_file, "/event") == NULL)
return FALSE;
return g_udev_device_get_property_as_boolean (device, "ID_INPUT");
}
static GsdDevice *
create_device (GUdevDevice *udev_device)
{
const gchar *vendor, *product, *name;
guint width, height;
g_autoptr(GUdevDevice) parent = NULL;
parent = g_udev_device_get_parent (udev_device);
g_assert (parent != NULL);
name = g_udev_device_get_sysfs_attr (parent, "name");
vendor = g_udev_device_get_property (udev_device, "ID_VENDOR_ID");
product = g_udev_device_get_property (udev_device, "ID_MODEL_ID");
if (!vendor || !product) {
vendor = g_udev_device_get_sysfs_attr (udev_device, "device/id/vendor");
product = g_udev_device_get_sysfs_attr (udev_device, "device/id/product");
}
width = g_udev_device_get_property_as_int (udev_device, "ID_INPUT_WIDTH_MM");
height = g_udev_device_get_property_as_int (udev_device, "ID_INPUT_HEIGHT_MM");
return g_object_new (GSD_TYPE_DEVICE,
"name", name,
"device-file", g_udev_device_get_device_file (udev_device),
"type", udev_device_get_device_type (udev_device),
"vendor-id", vendor,
"product-id", product,
"width", width,
"height", height,
NULL);
}
static void
add_device (GsdUdevDeviceManager *manager,
GUdevDevice *udev_device)
{
GUdevDevice *parent;
GsdDevice *device;
gchar *syspath;
parent = g_udev_device_get_parent (udev_device);
if (!parent)
return;
device = create_device (udev_device);
syspath = g_strdup (g_udev_device_get_sysfs_path (udev_device));
g_hash_table_insert (manager->devices, syspath, device);
g_signal_emit_by_name (manager, "device-added", device);
}
static void
remove_device (GsdUdevDeviceManager *manager,
GUdevDevice *udev_device)
{
GsdDevice *device;
gchar *syspath;
syspath = g_strdup (g_udev_device_get_sysfs_path (udev_device));
device = g_hash_table_lookup (manager->devices, syspath);
if (!device)
return;
g_hash_table_steal (manager->devices, syspath);
g_signal_emit_by_name (manager, "device-removed", device);
g_object_unref (device);
g_free (syspath);
}
static void
udev_event_cb (GUdevClient *client,
gchar *action,
GUdevDevice *device,
GsdUdevDeviceManager *manager)
{
if (!device_is_evdev (device))
return;
if (g_strcmp0 (action, "add") == 0) {
add_device (manager, device);
} else if (g_strcmp0 (action, "remove") == 0) {
remove_device (manager, device);
}
}
static void
gsd_udev_device_manager_init (GsdUdevDeviceManager *manager)
{
const gchar *subsystems[] = { "input", NULL };
g_autoptr(GList) devices = NULL;
GList *l;
manager->devices = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
manager->udev_client = g_udev_client_new (subsystems);
g_signal_connect (manager->udev_client, "uevent",
G_CALLBACK (udev_event_cb), manager);
devices = g_udev_client_query_by_subsystem (manager->udev_client,
subsystems[0]);
for (l = devices; l; l = l->next) {
g_autoptr(GUdevDevice) device = l->data;
if (device_is_evdev (device))
add_device (manager, device);
}
}
static void
gsd_udev_device_manager_finalize (GObject *object)
{
GsdUdevDeviceManager *manager = GSD_UDEV_DEVICE_MANAGER (object);
g_hash_table_destroy (manager->devices);
g_object_unref (manager->udev_client);
G_OBJECT_CLASS (gsd_udev_device_manager_parent_class)->finalize (object);
}
static GList *
gsd_udev_device_manager_list_devices (GsdDeviceManager *manager,
GsdDeviceType type)
{
GsdUdevDeviceManager *manager_udev = GSD_UDEV_DEVICE_MANAGER (manager);
GsdDeviceType device_type;
GList *devices = NULL;
GHashTableIter iter;
GsdDevice *device;
g_hash_table_iter_init (&iter, manager_udev->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
device_type = gsd_device_get_device_type (device);
if ((device_type & type) == type)
devices = g_list_prepend (devices, device);
}
return devices;
}
static GsdDevice *
gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
GdkDevice *gdk_device)
{
const gchar *node_path;
GHashTableIter iter;
GsdDevice *device;
node_path = gdk_wayland_device_get_node_path (gdk_device);
if (!node_path)
return NULL;
g_hash_table_iter_init (&iter, GSD_UDEV_DEVICE_MANAGER (manager)->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
if (g_strcmp0 (node_path,
gsd_device_get_device_file (device)) == 0) {
return device;
}
}
return NULL;
}
static void
gsd_udev_device_manager_class_init (GsdUdevDeviceManagerClass *klass)
{
GsdDeviceManagerClass *manager_class = GSD_DEVICE_MANAGER_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gsd_udev_device_manager_finalize;
manager_class->list_devices = gsd_udev_device_manager_list_devices;
manager_class->lookup_device = gsd_udev_device_manager_lookup_device;
}

31
panels/common/gsd-device-manager-udev.h
View file

@ -1,31 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2015 Red Hat
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Author: Carlos Garnacho <carlosg@gnome.org>
*/
#pragma once
#include "gsd-device-manager.h"
G_BEGIN_DECLS
#define GSD_TYPE_UDEV_DEVICE_MANAGER (gsd_udev_device_manager_get_type ())
G_DECLARE_FINAL_TYPE (GsdUdevDeviceManager, gsd_udev_device_manager, GSD, UDEV_DEVICE_MANAGER, GsdDeviceManager)
G_END_DECLS

215
panels/common/gsd-device-manager-x11.c
View file

@ -1,215 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2015 Red Hat
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Author: Carlos Garnacho <carlosg@gnome.org>
*/
#include "config.h"
#include <string.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include "gsd-input-helper.h"
#include "gsd-device-manager-x11.h"
struct _GsdX11DeviceManager
{
GsdDeviceManager parent_instance;
GdkDeviceManager *device_manager;
GHashTable *devices;
GHashTable *gdk_devices;
};
GsdDevice * gsd_x11_device_manager_lookup_gdk_device (GsdDeviceManager *manager,
GdkDevice *gdk_device);
G_DEFINE_TYPE (GsdX11DeviceManager, gsd_x11_device_manager, GSD_TYPE_DEVICE_MANAGER)
static GsdDeviceType
device_get_device_type (GdkDevice *gdk_device)
{
GdkInputSource source;
source = gdk_device_get_source (gdk_device);
switch (source) {
case GDK_SOURCE_MOUSE:
case GDK_SOURCE_TRACKPOINT:
return GSD_DEVICE_TYPE_MOUSE;
case GDK_SOURCE_PEN:
case GDK_SOURCE_ERASER:
case GDK_SOURCE_CURSOR:
if (strstr (gdk_device_get_name (gdk_device), "pad"))
return GSD_DEVICE_TYPE_TABLET | GSD_DEVICE_TYPE_PAD;
return GSD_DEVICE_TYPE_TABLET;
case GDK_SOURCE_KEYBOARD:
return GSD_DEVICE_TYPE_KEYBOARD;
case GDK_SOURCE_TOUCHSCREEN:
return GSD_DEVICE_TYPE_TOUCHSCREEN;
case GDK_SOURCE_TOUCHPAD:
return GSD_DEVICE_TYPE_TOUCHPAD;
case GDK_SOURCE_TABLET_PAD:
return GSD_DEVICE_TYPE_TABLET | GSD_DEVICE_TYPE_PAD;
}
g_warning ("Unhandled input source %d\n", source);
return 0;
}
static GsdDevice *
create_device (GdkDevice *gdk_device,
const gchar *device_file)
{
guint width, height;
GsdDevice *device;
gint id;
id = gdk_x11_device_get_id (gdk_device);
xdevice_get_dimensions (id, &width, &height);
device = g_object_new (GSD_TYPE_DEVICE,
"name", gdk_device_get_name (gdk_device),
"device-file", device_file,
"type", device_get_device_type (gdk_device),
"vendor-id", gdk_device_get_vendor_id (gdk_device),
"product-id", gdk_device_get_product_id (gdk_device),
"width", width,
"height", height,
NULL);
return device;
}
static void
add_device (GsdX11DeviceManager *manager,
GdkDevice *gdk_device)
{
gchar *device_file;
GsdDevice *device;
gint id;
if (gdk_device_get_device_type (gdk_device) == GDK_DEVICE_TYPE_MASTER)
return;
id = gdk_x11_device_get_id (gdk_device);
device_file = xdevice_get_device_node (id);
if (!device_file)
return;
device = g_hash_table_lookup (manager->devices, gdk_device);
if (device) {
g_signal_emit_by_name (manager, "device-changed", device);
} else {
device = create_device (gdk_device, device_file);
g_hash_table_insert (manager->devices, gdk_device, device);
g_signal_emit_by_name (manager, "device-added", device);
}
}
static void
remove_device (GsdX11DeviceManager *manager,
GdkDevice *gdk_device)
{
GsdDevice *device;
device = g_hash_table_lookup (manager->devices, gdk_device);
if (device) {
g_object_ref (device);
g_signal_emit_by_name (manager, "device-removed", device);
g_object_unref (device);
g_hash_table_remove (manager->devices, gdk_device);
}
}
static void
init_devices (GsdX11DeviceManager *manager,
GdkDeviceType device_type)
{
g_autoptr(GList) devices = NULL;
GList *l;
devices = gdk_device_manager_list_devices (manager->device_manager,
device_type);
for (l = devices; l; l = l->next)
add_device (manager, l->data);
}
static void
gsd_x11_device_manager_init (GsdX11DeviceManager *manager)
{
GdkDisplay *display;
manager->devices = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) g_object_unref);
display = gdk_display_get_default ();
manager->device_manager = gdk_display_get_device_manager (display);
g_signal_connect_swapped (manager->device_manager, "device-added",
G_CALLBACK (add_device), manager);
g_signal_connect_swapped (manager->device_manager, "device-removed",
G_CALLBACK (remove_device), manager);
init_devices (manager, GDK_DEVICE_TYPE_SLAVE);
init_devices (manager, GDK_DEVICE_TYPE_FLOATING);
}
static GList *
gsd_x11_device_manager_list_devices (GsdDeviceManager *manager,
GsdDeviceType type)
{
GsdX11DeviceManager *manager_x11 = GSD_X11_DEVICE_MANAGER (manager);
GsdDeviceType device_type;
GList *devices = NULL;
GHashTableIter iter;
GsdDevice *device;
g_hash_table_iter_init (&iter, manager_x11->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
device_type = gsd_device_get_device_type (device);
if ((device_type & type) == type)
devices = g_list_prepend (devices, device);
}
return devices;
}
static void
gsd_x11_device_manager_class_init (GsdX11DeviceManagerClass *klass)
{
GsdDeviceManagerClass *manager_class = GSD_DEVICE_MANAGER_CLASS (klass);
manager_class->list_devices = gsd_x11_device_manager_list_devices;
manager_class->lookup_device = gsd_x11_device_manager_lookup_gdk_device;
}
GsdDevice *
gsd_x11_device_manager_lookup_gdk_device (GsdDeviceManager *manager,
GdkDevice *gdk_device)
{
GsdX11DeviceManager *manager_x11 = GSD_X11_DEVICE_MANAGER (manager);
return g_hash_table_lookup (manager_x11->devices, gdk_device);
}

32
panels/common/gsd-device-manager-x11.h
View file

@ -1,32 +0,0 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
*
* Copyright (C) 2015 Red Hat
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Author: Carlos Garnacho <carlosg@gnome.org>
*/
#pragma once
#include <gdk/gdk.h>
#include "gsd-device-manager.h"
G_BEGIN_DECLS
#define GSD_TYPE_X11_DEVICE_MANAGER (gsd_x11_device_manager_get_type ())
G_DECLARE_FINAL_TYPE (GsdX11DeviceManager, gsd_x11_device_manager, GSD, X11_DEVICE_MANAGER, GsdDeviceManager)
G_END_DECLS

252
panels/common/gsd-device-manager.c
View file

@ -22,11 +22,19 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <gudev/gudev.h>
#include "gsd-device-manager-x11.h" #include "gsd-device-manager.h"
#include "gsd-device-manager-udev.h"
#include "gsd-common-enums.h" #include "gsd-common-enums.h"
#include "gnome-settings-bus.h" #include "gnome-settings-bus.h"
#include "gsd-input-helper.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#ifdef GDK_WINDOWING_WAYLAND
#include <gdk/gdkwayland.h>
#endif
typedef struct typedef struct
{ {
@ -41,6 +49,13 @@ typedef struct
G_DEFINE_TYPE_WITH_PRIVATE (GsdDevice, gsd_device, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_PRIVATE (GsdDevice, gsd_device, G_TYPE_OBJECT)
typedef struct
{
GObject parent_instance;
GHashTable *devices;
GUdevClient *udev_client;
} GsdDeviceManagerPrivate;
enum { enum {
PROP_NAME = 1, PROP_NAME = 1,
PROP_DEVICE_FILE, PROP_DEVICE_FILE,
@ -58,9 +73,19 @@ enum {
N_SIGNALS N_SIGNALS
}; };
/* Index matches GsdDeviceType */
const gchar *udev_ids[] = {
"ID_INPUT_MOUSE",
"ID_INPUT_KEYBOARD",
"ID_INPUT_TOUCHPAD",
"ID_INPUT_TABLET",
"ID_INPUT_TOUCHSCREEN",
"ID_INPUT_TABLET_PAD",
};
static guint signals[N_SIGNALS] = { 0 }; static guint signals[N_SIGNALS] = { 0 };
G_DEFINE_TYPE (GsdDeviceManager, gsd_device_manager, G_TYPE_OBJECT) G_DEFINE_TYPE_WITH_PRIVATE (GsdDeviceManager, gsd_device_manager, G_TYPE_OBJECT)
static void static void
gsd_device_init (GsdDevice *device) gsd_device_init (GsdDevice *device)
@ -225,9 +250,83 @@ gsd_device_class_init (GsdDeviceClass *klass)
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
} }
static void
gsd_device_manager_finalize (GObject *object)
{
GsdDeviceManager *manager = GSD_DEVICE_MANAGER (object);
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
g_hash_table_destroy (priv->devices);
g_object_unref (priv->udev_client);
G_OBJECT_CLASS (gsd_device_manager_parent_class)->finalize (object);
}
static GList *
gsd_device_manager_real_list_devices (GsdDeviceManager *manager,
GsdDeviceType type)
{
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
GsdDeviceType device_type;
GList *devices = NULL;
GHashTableIter iter;
GsdDevice *device;
g_hash_table_iter_init (&iter, priv->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
device_type = gsd_device_get_device_type (device);
if ((device_type & type) == type)
devices = g_list_prepend (devices, device);
}
return devices;
}
static GsdDevice *
gsd_device_manager_real_lookup_device (GsdDeviceManager *manager,
GdkDevice *gdk_device)
{
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
GdkDisplay *display = gdk_device_get_display (gdk_device);
const gchar *node_path = NULL;
GHashTableIter iter;
GsdDevice *device;
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (display))
node_path = xdevice_get_device_node (gdk_x11_device_get_id (gdk_device));
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (display))
node_path = g_strdup (gdk_wayland_device_get_node_path (gdk_device));
#endif
if (!node_path)
return NULL;
g_hash_table_iter_init (&iter, priv->devices);
while (g_hash_table_iter_next (&iter, NULL, (gpointer *) &device)) {
if (g_strcmp0 (node_path,
gsd_device_get_device_file (device)) == 0) {
return device;
}
}
return NULL;
}
static void static void
gsd_device_manager_class_init (GsdDeviceManagerClass *klass) gsd_device_manager_class_init (GsdDeviceManagerClass *klass)
{ {
GsdDeviceManagerClass *manager_class = GSD_DEVICE_MANAGER_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = gsd_device_manager_finalize;
manager_class->list_devices = gsd_device_manager_real_list_devices;
manager_class->lookup_device = gsd_device_manager_real_lookup_device;
signals[DEVICE_ADDED] = signals[DEVICE_ADDED] =
g_signal_new ("device-added", g_signal_new ("device-added",
GSD_TYPE_DEVICE_MANAGER, GSD_TYPE_DEVICE_MANAGER,
@ -256,9 +355,144 @@ gsd_device_manager_class_init (GsdDeviceManagerClass *klass)
GSD_TYPE_DEVICE | G_SIGNAL_TYPE_STATIC_SCOPE); GSD_TYPE_DEVICE | G_SIGNAL_TYPE_STATIC_SCOPE);
} }
static GsdDeviceType
udev_device_get_device_type (GUdevDevice *device)
{
GsdDeviceType type = 0;
gint i;
for (i = 0; i < G_N_ELEMENTS (udev_ids); i++) {
if (g_udev_device_get_property_as_boolean (device, udev_ids[i]))
type |= (1 << i);
}
return type;
}
static gboolean
device_is_evdev (GUdevDevice *device)
{
const gchar *device_file;
device_file = g_udev_device_get_device_file (device);
if (!device_file || strstr (device_file, "/event") == NULL)
return FALSE;
return g_udev_device_get_property_as_boolean (device, "ID_INPUT");
}
static GsdDevice *
create_device (GUdevDevice *udev_device)
{
const gchar *vendor, *product, *name;
guint width, height;
g_autoptr(GUdevDevice) parent = NULL;
parent = g_udev_device_get_parent (udev_device);
g_assert (parent != NULL);
name = g_udev_device_get_sysfs_attr (parent, "name");
vendor = g_udev_device_get_property (udev_device, "ID_VENDOR_ID");
product = g_udev_device_get_property (udev_device, "ID_MODEL_ID");
if (!vendor || !product) {
vendor = g_udev_device_get_sysfs_attr (udev_device, "device/id/vendor");
product = g_udev_device_get_sysfs_attr (udev_device, "device/id/product");
}
width = g_udev_device_get_property_as_int (udev_device, "ID_INPUT_WIDTH_MM");
height = g_udev_device_get_property_as_int (udev_device, "ID_INPUT_HEIGHT_MM");
return g_object_new (GSD_TYPE_DEVICE,
"name", name,
"device-file", g_udev_device_get_device_file (udev_device),
"type", udev_device_get_device_type (udev_device),
"vendor-id", vendor,
"product-id", product,
"width", width,
"height", height,
NULL);
}
static void
add_device (GsdDeviceManager *manager,
GUdevDevice *udev_device)
{
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
GUdevDevice *parent;
GsdDevice *device;
parent = g_udev_device_get_parent (udev_device);
if (!parent)
return;
device = create_device (udev_device);
g_hash_table_insert (priv->devices, g_object_ref (udev_device), device);
g_signal_emit_by_name (manager, "device-added", device);
}
static void
remove_device (GsdDeviceManager *manager,
GUdevDevice *udev_device)
{
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
GsdDevice *device;
device = g_hash_table_lookup (priv->devices, udev_device);
if (!device)
return;
g_hash_table_steal (priv->devices, udev_device);
g_signal_emit_by_name (manager, "device-removed", device);
g_object_unref (device);
g_object_unref (udev_device);
}
static void
udev_event_cb (GUdevClient *client,
gchar *action,
GUdevDevice *device,
GsdDeviceManager *manager)
{
if (!device_is_evdev (device))
return;
if (g_strcmp0 (action, "add") == 0) {
add_device (manager, device);
} else if (g_strcmp0 (action, "remove") == 0) {
remove_device (manager, device);
}
}
static void static void
gsd_device_manager_init (GsdDeviceManager *manager) gsd_device_manager_init (GsdDeviceManager *manager)
{ {
GsdDeviceManagerPrivate *priv = gsd_device_manager_get_instance_private (manager);
const gchar *subsystems[] = { "input", NULL };
g_autoptr(GList) devices = NULL;
GList *l;
priv->devices = g_hash_table_new_full (NULL, NULL,
(GDestroyNotify) g_object_unref,
(GDestroyNotify) g_object_unref);
priv->udev_client = g_udev_client_new (subsystems);
g_signal_connect (priv->udev_client, "uevent",
G_CALLBACK (udev_event_cb), manager);
devices = g_udev_client_query_by_subsystem (priv->udev_client,
subsystems[0]);
for (l = devices; l; l = l->next) {
g_autoptr(GUdevDevice) device = l->data;
if (device_is_evdev (device))
add_device (manager, device);
}
} }
GsdDeviceManager * GsdDeviceManager *
@ -273,16 +507,8 @@ gsd_device_manager_get (void)
manager = g_object_get_data (G_OBJECT (screen), "gsd-device-manager-data"); manager = g_object_get_data (G_OBJECT (screen), "gsd-device-manager-data");
if (!manager) { if (!manager) {
#ifdef HAVE_WAYLAND manager = g_object_new (GSD_TYPE_DEVICE_MANAGER,
if (gnome_settings_is_wayland ()) { NULL);
manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER,
NULL);
} else
#endif /* HAVE_WAYLAND */
{
manager = g_object_new (GSD_TYPE_X11_DEVICE_MANAGER,
NULL);
}
g_object_set_data_full (G_OBJECT (screen), "gsd-device-manager-data", g_object_set_data_full (G_OBJECT (screen), "gsd-device-manager-data",
manager, (GDestroyNotify) g_object_unref); manager, (GDestroyNotify) g_object_unref);

13
panels/common/meson.build
View file

@ -76,28 +76,17 @@ liblanguage_dep = declare_dependency(
gsd_headers = [ gsd_headers = [
'gsd-device-manager.h', 'gsd-device-manager.h',
'gsd-device-manager-udev.h',
'gsd-device-manager-x11.h',
'gsd-input-helper.h' 'gsd-input-helper.h'
] ]
gsd_sources_udev = ['gsd-device-manager-udev.c']
gsd_sources = [ gsd_sources = [
'gsd-device-manager.c', 'gsd-device-manager.c',
'gsd-device-manager-x11.c',
'gsd-input-helper.c' 'gsd-input-helper.c'
] ]
sources = common_sources + files(gsd_sources) sources = common_sources + files(gsd_sources)
deps = common_deps deps = common_deps + [ gudev_dep ]
if enable_wayland
sources += files(gsd_sources_udev)
deps += wayland_deps
endif
libdevice = static_library( libdevice = static_library(
'device', 'device',