[gnome-control-center] wacom: Add copy/paste GsdWacomDevice from g-s-d
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Add copy/paste GsdWacomDevice from g-s-d
- Date: Thu, 24 Nov 2011 19:15:46 +0000 (UTC)
commit d44d5939b4b2ad19c96dcf78f77799946a944cfb
Author: Bastien Nocera <hadess hadess net>
Date: Thu Nov 24 15:49:49 2011 +0000
wacom: Add copy/paste GsdWacomDevice from g-s-d
panels/wacom/Makefile.am | 4 +-
panels/wacom/gsd-wacom-device.c | 483 +++++++++++++++++++++++++++++++++++++++
panels/wacom/gsd-wacom-device.h | 99 ++++++++
3 files changed, 585 insertions(+), 1 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index 87b4edf..137da56 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -19,7 +19,9 @@ libwacom_properties_la_SOURCES = \
cc-wacom-panel.c \
cc-wacom-panel.h \
cc-wacom-page.c \
- cc-wacom-page.h
+ cc-wacom-page.h \
+ gsd-wacom-device.c \
+ gsd-wacom-device.h
libwacom_properties_la_LIBADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS)
libwacom_properties_la_LDFLAGS = $(PANEL_LDFLAGS)
diff --git a/panels/wacom/gsd-wacom-device.c b/panels/wacom/gsd-wacom-device.c
new file mode 100644
index 0000000..2b321b8
--- /dev/null
+++ b/panels/wacom/gsd-wacom-device.c
@@ -0,0 +1,483 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * 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: Bastien Nocera <hadess hadess net>
+ *
+ */
+
+#include "config.h"
+
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+
+#include <X11/extensions/XInput.h>
+
+#include <gnome-settings-daemon/gsd-enums.h>
+#include "gsd-wacom-device.h"
+
+#define GSD_WACOM_STYLUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusPrivate))
+
+struct GsdWacomStylusPrivate
+{
+ GsdWacomDevice *device;
+ char *name;
+ GSettings *settings;
+};
+
+static void gsd_wacom_stylus_class_init (GsdWacomStylusClass *klass);
+static void gsd_wacom_stylus_init (GsdWacomStylus *wacom_stylus);
+static void gsd_wacom_stylus_finalize (GObject *object);
+
+G_DEFINE_TYPE (GsdWacomStylus, gsd_wacom_stylus, G_TYPE_OBJECT)
+
+static void
+gsd_wacom_stylus_class_init (GsdWacomStylusClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = gsd_wacom_stylus_finalize;
+
+ g_type_class_add_private (klass, sizeof (GsdWacomStylusPrivate));
+}
+
+static void
+gsd_wacom_stylus_init (GsdWacomStylus *stylus)
+{
+ stylus->priv = GSD_WACOM_STYLUS_GET_PRIVATE (stylus);
+}
+
+static void
+gsd_wacom_stylus_finalize (GObject *object)
+{
+ GsdWacomStylus *stylus;
+ GsdWacomStylusPrivate *p;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GSD_IS_WACOM_STYLUS (object));
+
+ stylus = GSD_WACOM_STYLUS (object);
+
+ g_return_if_fail (stylus->priv != NULL);
+
+ p = stylus->priv;
+
+ if (p->settings != NULL) {
+ g_object_unref (p->settings);
+ p->settings = NULL;
+ }
+
+ g_free (p->name);
+ p->name = NULL;
+
+ G_OBJECT_CLASS (gsd_wacom_stylus_parent_class)->finalize (object);
+}
+
+static GsdWacomStylus *
+gsd_wacom_stylus_new (GsdWacomDevice *device,
+ GSettings *settings,
+ const char *name)
+{
+ GsdWacomStylus *stylus;
+
+ g_return_val_if_fail (G_IS_SETTINGS (settings), NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ stylus = GSD_WACOM_STYLUS (g_object_new (GSD_TYPE_WACOM_STYLUS,
+ NULL));
+ stylus->priv->device = device;
+ stylus->priv->name = g_strdup (name);
+ stylus->priv->settings = settings;
+
+ return stylus;
+}
+
+GSettings *
+gsd_wacom_stylus_get_settings (GsdWacomStylus *stylus)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_STYLUS (stylus), NULL);
+
+ return stylus->priv->settings;
+}
+
+const char *
+gsd_wacom_stylus_get_name (GsdWacomStylus *stylus)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_STYLUS (stylus), NULL);
+
+ return stylus->priv->name;
+}
+
+GsdWacomDevice *
+gsd_wacom_stylus_get_device (GsdWacomStylus *stylus)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_STYLUS (stylus), NULL);
+
+ return stylus->priv->device;
+}
+
+#define GSD_WACOM_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_WACOM_DEVICE, GsdWacomDevicePrivate))
+
+/* we support two types of settings:
+ * Tablet-wide settings: applied to each tool on the tablet. e.g. rotation
+ * Tool-specific settings: applied to one tool only.
+ */
+#define SETTINGS_WACOM_DIR "org.gnome.settings-daemon.peripherals.wacom"
+#define SETTINGS_STYLUS_DIR "stylus"
+#define SETTINGS_ERASER_DIR "eraser"
+
+struct GsdWacomDevicePrivate
+{
+ GdkDevice *gdk_device;
+ GsdWacomDeviceType type;
+ char *name;
+ char *tool_name;
+ gboolean reversible;
+ gboolean is_screen_tablet;
+ GList *styli;
+ GSettings *wacom_settings;
+};
+
+enum {
+ PROP_0,
+ PROP_GDK_DEVICE
+};
+
+static void gsd_wacom_device_class_init (GsdWacomDeviceClass *klass);
+static void gsd_wacom_device_init (GsdWacomDevice *wacom_device);
+static void gsd_wacom_device_finalize (GObject *object);
+
+G_DEFINE_TYPE (GsdWacomDevice, gsd_wacom_device, G_TYPE_OBJECT)
+
+static GsdWacomDeviceType
+get_device_type (XDeviceInfo *dev)
+{
+ GsdWacomDeviceType ret;
+ static Atom stylus, cursor, eraser, pad, prop;
+ XDevice *device;
+ Atom realtype;
+ int realformat;
+ unsigned long nitems, bytes_after;
+ unsigned char *data = NULL;
+ int rc;
+
+ ret = WACOM_TYPE_INVALID;
+
+ if ((dev->use == IsXPointer) || (dev->use == IsXKeyboard))
+ return ret;
+
+ if (!stylus)
+ stylus = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "STYLUS", False);
+ if (!eraser)
+ eraser = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "ERASER", False);
+ if (!cursor)
+ cursor = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "CURSOR", False);
+ if (!pad)
+ pad = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "PAD", False);
+ if (!prop)
+ prop = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "Wacom Tool Type", False);
+
+ if (dev->type == stylus)
+ ret = WACOM_TYPE_STYLUS;
+ if (dev->type == eraser)
+ ret = WACOM_TYPE_ERASER;
+ if (dev->type == cursor)
+ ret = WACOM_TYPE_CURSOR;
+ if (dev->type == pad)
+ ret = WACOM_TYPE_PAD;
+
+ if (ret == WACOM_TYPE_INVALID)
+ return ret;
+
+ /* There is currently no good way of detecting the driver for a device
+ * other than checking for a driver-specific property.
+ * Wacom Tool Type exists on all tools
+ */
+ gdk_error_trap_push ();
+ device = XOpenDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), dev->id);
+ if (gdk_error_trap_pop () || (device == NULL))
+ return ret;
+
+ gdk_error_trap_push ();
+
+ rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ device, prop, 0, 1, False,
+ XA_ATOM, &realtype, &realformat, &nitems,
+ &bytes_after, &data);
+ if (gdk_error_trap_pop () || rc != Success || realtype == None) {
+ XCloseDevice (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), device);
+ ret = WACOM_TYPE_INVALID;
+ }
+
+ XFree (data);
+
+ return ret;
+}
+
+static char *
+get_device_name (XDeviceInfo *dev)
+{
+ const char *space;
+
+ space = g_strrstr (dev->name, " ");
+ if (space == NULL)
+ return g_strdup (dev->name);
+ return g_strndup (dev->name, space - dev->name);
+}
+
+static GObject *
+gsd_wacom_device_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_properties)
+{
+ GsdWacomDevice *device;
+ XDeviceInfo *device_info;
+ int n_devices, id;
+ guint i;
+
+ device = GSD_WACOM_DEVICE (G_OBJECT_CLASS (gsd_wacom_device_parent_class)->constructor (type,
+ n_construct_properties,
+ construct_properties));
+
+ if (device->priv->gdk_device == NULL)
+ return G_OBJECT (device);
+
+ g_object_get (device->priv->gdk_device, "device-id", &id, NULL);
+
+ device_info = XListInputDevices (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &n_devices);
+ if (device_info == NULL)
+ goto end;
+
+ for (i = 0; i < n_devices; i++) {
+ if (device_info[i].id == id) {
+ device->priv->type = get_device_type (&device_info[i]);
+ device->priv->name = get_device_name (&device_info[i]);
+ device->priv->tool_name = g_strdup (device_info[i].name);
+ break;
+ }
+ }
+
+ XFreeDeviceList (device_info);
+
+ if (device->priv->type == WACOM_TYPE_INVALID)
+ goto end;
+
+ /* FIXME
+ * Those should have their own unique path based on a unique property */
+ device->priv->wacom_settings = g_settings_new (SETTINGS_WACOM_DIR);
+
+ /* FIXME
+ * This needs to come from real data */
+ device->priv->reversible = FALSE;
+ device->priv->is_screen_tablet = FALSE;
+
+ if (device->priv->type == WACOM_TYPE_STYLUS ||
+ device->priv->type == WACOM_TYPE_ERASER) {
+ GsdWacomStylus *stylus;
+ GSettings *settings;
+
+ if (device->priv->type == WACOM_TYPE_STYLUS)
+ settings = g_settings_new (SETTINGS_WACOM_DIR "." SETTINGS_STYLUS_DIR);
+ else
+ settings = g_settings_new (SETTINGS_WACOM_DIR "." SETTINGS_ERASER_DIR);
+
+ stylus = gsd_wacom_stylus_new (device, settings, _("Stylus"));
+ device->priv->styli = g_list_append (NULL, stylus);
+ }
+
+end:
+ return G_OBJECT (device);
+}
+
+static void
+gsd_wacom_device_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GsdWacomDevice *device;
+
+ device = GSD_WACOM_DEVICE (object);
+
+ switch (prop_id) {
+ case PROP_GDK_DEVICE:
+ device->priv->gdk_device = g_value_get_pointer (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gsd_wacom_device_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GsdWacomDevice *device;
+
+ device = GSD_WACOM_DEVICE (object);
+
+ switch (prop_id) {
+ case PROP_GDK_DEVICE:
+ g_value_set_pointer (value, device->priv->gdk_device);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gsd_wacom_device_class_init (GsdWacomDeviceClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructor = gsd_wacom_device_constructor;
+ object_class->finalize = gsd_wacom_device_finalize;
+ object_class->set_property = gsd_wacom_device_set_property;
+ object_class->get_property = gsd_wacom_device_get_property;
+
+ g_type_class_add_private (klass, sizeof (GsdWacomDevicePrivate));
+
+ g_object_class_install_property (object_class, PROP_GDK_DEVICE,
+ g_param_spec_pointer ("gdk-device", "gdk-device", "gdk-device",
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+static void
+gsd_wacom_device_init (GsdWacomDevice *device)
+{
+ device->priv = GSD_WACOM_DEVICE_GET_PRIVATE (device);
+ device->priv->type = WACOM_TYPE_INVALID;
+}
+
+static void
+gsd_wacom_device_finalize (GObject *object)
+{
+ GsdWacomDevice *device;
+ GsdWacomDevicePrivate *p;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GSD_IS_WACOM_DEVICE (object));
+
+ device = GSD_WACOM_DEVICE (object);
+
+ g_return_if_fail (device->priv != NULL);
+
+ p = device->priv;
+
+ if (p->wacom_settings != NULL) {
+ g_object_unref (p->wacom_settings);
+ p->wacom_settings = NULL;
+ }
+
+ g_free (p->name);
+ p->name = NULL;
+
+ g_free (p->tool_name);
+ p->tool_name = NULL;
+
+ G_OBJECT_CLASS (gsd_wacom_device_parent_class)->finalize (object);
+}
+
+GsdWacomDevice *
+gsd_wacom_device_new (GdkDevice *device)
+{
+ return GSD_WACOM_DEVICE (g_object_new (GSD_TYPE_WACOM_DEVICE,
+ "gdk-device", device,
+ NULL));
+}
+
+GList *
+gsd_wacom_device_list_styli (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+ return g_list_copy (device->priv->styli);
+}
+
+const char *
+gsd_wacom_device_get_name (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+ return device->priv->name;
+}
+
+const char *
+gsd_wacom_device_get_tool_name (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+ return device->priv->tool_name;
+}
+
+gboolean
+gsd_wacom_device_reversible (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), FALSE);
+
+ return device->priv->reversible;
+}
+
+gboolean
+gsd_wacom_device_is_screen_tablet (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), FALSE);
+
+ return device->priv->is_screen_tablet;
+}
+
+GSettings *
+gsd_wacom_device_get_settings (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), NULL);
+
+ return device->priv->wacom_settings;
+}
+
+GsdWacomDeviceType
+gsd_wacom_device_get_device_type (GsdWacomDevice *device)
+{
+ g_return_val_if_fail (GSD_IS_WACOM_DEVICE (device), WACOM_TYPE_INVALID);
+
+ return device->priv->type;
+}
+
+const char *
+gsd_wacom_device_type_to_string (GsdWacomDeviceType type)
+{
+ switch (type) {
+ case WACOM_TYPE_INVALID:
+ return "Invalid";
+ case WACOM_TYPE_STYLUS:
+ return "Stylus";
+ case WACOM_TYPE_ERASER:
+ return "Eraser";
+ case WACOM_TYPE_CURSOR:
+ return "Cursor";
+ case WACOM_TYPE_PAD:
+ return "Pad";
+ default:
+ return "Unknown type";
+ }
+}
diff --git a/panels/wacom/gsd-wacom-device.h b/panels/wacom/gsd-wacom-device.h
new file mode 100644
index 0000000..adc8891
--- /dev/null
+++ b/panels/wacom/gsd-wacom-device.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * 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: Bastien Nocera <hadess hadess net>
+ *
+ */
+
+#ifndef __GSD_WACOM_DEVICE_MANAGER_H
+#define __GSD_WACOM_DEVICE_MANAGER_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GSD_TYPE_WACOM_DEVICE (gsd_wacom_device_get_type ())
+#define GSD_WACOM_DEVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_WACOM_DEVICE, GsdWacomDevice))
+#define GSD_WACOM_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_WACOM_DEVICE, GsdWacomDeviceClass))
+#define GSD_IS_WACOM_DEVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_WACOM_DEVICE))
+#define GSD_IS_WACOM_DEVICE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_WACOM_DEVICE))
+#define GSD_WACOM_DEVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_WACOM_DEVICE, GsdWacomDeviceClass))
+
+typedef struct GsdWacomDevicePrivate GsdWacomDevicePrivate;
+
+typedef struct
+{
+ GObject parent;
+ GsdWacomDevicePrivate *priv;
+} GsdWacomDevice;
+
+typedef struct
+{
+ GObjectClass parent_class;
+} GsdWacomDeviceClass;
+
+#define GSD_TYPE_WACOM_STYLUS (gsd_wacom_stylus_get_type ())
+#define GSD_WACOM_STYLUS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylus))
+#define GSD_WACOM_STYLUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusClass))
+#define GSD_IS_WACOM_STYLUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_WACOM_STYLUS))
+#define GSD_IS_WACOM_STYLUS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_WACOM_STYLUS))
+#define GSD_WACOM_STYLUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_WACOM_STYLUS, GsdWacomStylusClass))
+
+typedef struct GsdWacomStylusPrivate GsdWacomStylusPrivate;
+
+typedef struct
+{
+ GObject parent;
+ GsdWacomStylusPrivate *priv;
+} GsdWacomStylus;
+
+typedef struct
+{
+ GObjectClass parent_class;
+} GsdWacomStylusClass;
+
+GType gsd_wacom_stylus_get_type (void);
+GSettings * gsd_wacom_stylus_get_settings (GsdWacomStylus *stylus);
+const char * gsd_wacom_stylus_get_name (GsdWacomStylus *stylus);
+GsdWacomDevice * gsd_wacom_stylus_get_device (GsdWacomStylus *stylus);
+
+/* Device types to apply a setting to */
+typedef enum {
+ WACOM_TYPE_INVALID = 0,
+ WACOM_TYPE_STYLUS = (1 << 1),
+ WACOM_TYPE_ERASER = (1 << 2),
+ WACOM_TYPE_CURSOR = (1 << 3),
+ WACOM_TYPE_PAD = (1 << 4),
+ WACOM_TYPE_ALL = WACOM_TYPE_STYLUS | WACOM_TYPE_ERASER | WACOM_TYPE_CURSOR | WACOM_TYPE_PAD
+} GsdWacomDeviceType;
+
+GType gsd_wacom_device_get_type (void);
+
+GsdWacomDevice * gsd_wacom_device_new (GdkDevice *device);
+GList * gsd_wacom_device_list_styli (GsdWacomDevice *device);
+const char * gsd_wacom_device_get_name (GsdWacomDevice *device);
+const char * gsd_wacom_device_get_tool_name (GsdWacomDevice *device);
+gboolean gsd_wacom_device_reversible (GsdWacomDevice *device);
+gboolean gsd_wacom_device_is_screen_tablet (GsdWacomDevice *device);
+GSettings * gsd_wacom_device_get_settings (GsdWacomDevice *device);
+
+GsdWacomDeviceType gsd_wacom_device_get_device_type (GsdWacomDevice *device);
+const char * gsd_wacom_device_type_to_string (GsdWacomDeviceType type);
+
+G_END_DECLS
+
+#endif /* __GSD_WACOM_DEVICE_MANAGER_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]