[mutter/wip/carlosg/clutter-seat: 1/6] clutter: Drop ClutterDeviceManager
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/clutter-seat: 1/6] clutter: Drop ClutterDeviceManager
- Date: Thu, 30 Jan 2020 15:44:38 +0000 (UTC)
commit a4b17e1bddf12c81d5507c83e26ffdf392204f27
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri Oct 4 23:01:54 2019 +0200
clutter: Drop ClutterDeviceManager
This is mostly replaced by ClutterSeat, which offers a per-seat instead
of a global device abstraction.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/852
clutter/clutter/clutter-backend-private.h | 4 -
clutter/clutter/clutter-backend.c | 14 -
clutter/clutter/clutter-device-manager-private.h | 299 ---------------
clutter/clutter/clutter-device-manager.c | 426 ----------------------
clutter/clutter/clutter-device-manager.h | 86 -----
clutter/clutter/clutter-input-device-private.h | 255 +++++++++++++
clutter/clutter/clutter-input-device.c | 25 +-
clutter/clutter/clutter-input-device.h | 29 ++
clutter/clutter/clutter-input-method.c | 2 +-
clutter/clutter/clutter-input-pointer-a11y.c | 3 +-
clutter/clutter/clutter-main.c | 2 +-
clutter/clutter/clutter-mutter.h | 2 +-
clutter/clutter/clutter-stage.c | 2 +-
clutter/clutter/clutter.h | 1 -
clutter/clutter/egl/clutter-backend-eglnative.h | 5 +-
clutter/clutter/meson.build | 4 +-
clutter/clutter/x11/clutter-backend-x11.c | 1 -
clutter/clutter/x11/clutter-backend-x11.h | 2 -
src/backends/native/meta-clutter-backend-native.c | 13 -
src/backends/native/meta-device-manager-native.c | 210 -----------
src/backends/native/meta-device-manager-native.h | 57 ---
src/backends/x11/meta-clutter-backend-x11.c | 18 -
src/backends/x11/meta-device-manager-x11.c | 225 ------------
src/backends/x11/meta-device-manager-x11.h | 49 ---
src/meson.build | 4 -
25 files changed, 292 insertions(+), 1446 deletions(-)
---
diff --git a/clutter/clutter/clutter-backend-private.h b/clutter/clutter/clutter-backend-private.h
index a97bf9e85..c7c54f85b 100644
--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -23,7 +23,6 @@
#define __CLUTTER_BACKEND_PRIVATE_H__
#include <clutter/clutter-backend.h>
-#include <clutter/clutter-device-manager.h>
#include <clutter/clutter-seat.h>
#include <clutter/clutter-stage-window.h>
@@ -47,8 +46,6 @@ struct _ClutterBackend
CoglOnscreen *dummy_onscreen;
- ClutterDeviceManager *device_manager;
-
cairo_font_options_t *font_options;
gchar *font_name;
@@ -87,7 +84,6 @@ struct _ClutterBackendClass
GError **error);
gboolean (* create_context) (ClutterBackend *backend,
GError **error);
- ClutterDeviceManager *(* get_device_manager) (ClutterBackend *backend);
gboolean (* translate_event) (ClutterBackend *backend,
gpointer native,
diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index eed889708..3cc4ca297 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -51,7 +51,6 @@
#include "clutter-stage-manager-private.h"
#include "clutter-stage-private.h"
#include "clutter-stage-window.h"
-#include "clutter-device-manager-private.h"
#ifdef CLUTTER_HAS_WAYLAND_COMPOSITOR_SUPPORT
#include "wayland/clutter-wayland-compositor.h"
@@ -528,18 +527,6 @@ clutter_backend_real_init_events (ClutterBackend *backend)
g_error ("Unknown input backend");
}
-static ClutterDeviceManager *
-clutter_backend_real_get_device_manager (ClutterBackend *backend)
-{
- if (G_UNLIKELY (backend->device_manager == NULL))
- {
- g_critical ("No device manager available, expect broken input");
- return NULL;
- }
-
- return backend->device_manager;
-}
-
static void
clutter_backend_class_init (ClutterBackendClass *klass)
{
@@ -603,7 +590,6 @@ clutter_backend_class_init (ClutterBackendClass *klass)
klass->font_changed = clutter_backend_real_font_changed;
klass->init_events = clutter_backend_real_init_events;
- klass->get_device_manager = clutter_backend_real_get_device_manager;
klass->create_context = clutter_backend_real_create_context;
klass->get_features = clutter_backend_real_get_features;
}
diff --git a/clutter/clutter/clutter-input-device-private.h b/clutter/clutter/clutter-input-device-private.h
new file mode 100644
index 000000000..dc55abd34
--- /dev/null
+++ b/clutter/clutter/clutter-input-device-private.h
@@ -0,0 +1,255 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright © 2009, 2010, 2011 Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuele Bassi <ebassi linux intel com>
+ */
+
+#ifndef CLUTTER_INPUT_DEVICE_PRIVATE_H
+#define CLUTTER_INPUT_DEVICE_PRIVATE_H
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
+#include <clutter/clutter-input-device.h>
+
+G_BEGIN_DECLS
+
+typedef struct _ClutterAxisInfo
+{
+ ClutterInputAxis axis;
+
+ double min_axis;
+ double max_axis;
+
+ double min_value;
+ double max_value;
+
+ double resolution;
+} ClutterAxisInfo;
+
+typedef struct _ClutterKeyInfo
+{
+ guint keyval;
+ ClutterModifierType modifiers;
+} ClutterKeyInfo;
+
+typedef struct _ClutterScrollInfo
+{
+ guint axis_id;
+ ClutterScrollDirection direction;
+ double increment;
+
+ double last_value;
+ guint last_value_valid : 1;
+} ClutterScrollInfo;
+
+typedef struct _ClutterTouchInfo
+{
+ ClutterEventSequence *sequence;
+ ClutterActor *actor;
+
+ float current_x;
+ float current_y;
+} ClutterTouchInfo;
+
+typedef struct _ClutterPtrA11yData
+{
+ int n_btn_pressed;
+ float current_x;
+ float current_y;
+
+ float dwell_x;
+ float dwell_y;
+ gboolean dwell_drag_started;
+ gboolean dwell_gesture_started;
+ guint dwell_timer;
+ guint dwell_position_timer;
+
+ guint secondary_click_timer;
+ gboolean secondary_click_triggered;
+} ClutterPtrA11yData;
+
+struct _ClutterInputDevice
+{
+ GObject parent_instance;
+
+ int id;
+
+ ClutterInputDeviceType device_type;
+ ClutterInputMode device_mode;
+
+ char *device_name;
+
+ ClutterSeat *seat;
+
+ ClutterBackend *backend;
+
+ /* the associated device */
+ ClutterInputDevice *associated;
+
+ GList *slaves;
+
+ /* the actor underneath the pointer */
+ ClutterActor *cursor_actor;
+ GHashTable *inv_touch_sequence_actors;
+
+ /* the actor that has a grab in place for the device */
+ ClutterActor *pointer_grab_actor;
+ ClutterActor *keyboard_grab_actor;
+ GHashTable *sequence_grab_actors;
+ GHashTable *inv_sequence_grab_actors;
+
+ /* the current click count */
+ int click_count;
+
+ /* the stage the device is on */
+ ClutterStage *stage;
+
+ /* the current state */
+ float current_x;
+ float current_y;
+ uint32_t current_time;
+ int current_button_number;
+ ClutterModifierType current_state;
+
+ /* the current touch points states */
+ GHashTable *touch_sequences_info;
+
+ /* the previous state, used for click count generation */
+ int previous_x;
+ int previous_y;
+ uint32_t previous_time;
+ int previous_button_number;
+ ClutterModifierType previous_state;
+
+ GArray *axes;
+
+ guint n_keys;
+ GArray *keys;
+
+ GArray *scroll_info;
+
+ char *vendor_id;
+ char *product_id;
+ char *node_path;
+
+ GPtrArray *tools;
+
+ int n_rings;
+ int n_strips;
+ int n_mode_groups;
+
+ ClutterInputDeviceMapping mapping_mode;
+
+ guint has_cursor : 1;
+ guint is_enabled : 1;
+
+ /* Accessiblity */
+ ClutterVirtualInputDevice *accessibility_virtual_device;
+ ClutterPtrA11yData *ptr_a11y_data;
+};
+
+CLUTTER_EXPORT
+void _clutter_input_device_set_associated_device (ClutterInputDevice *device,
+ ClutterInputDevice *associated);
+CLUTTER_EXPORT
+void _clutter_input_device_add_slave (ClutterInputDevice *master,
+ ClutterInputDevice *slave);
+CLUTTER_EXPORT
+void _clutter_input_device_remove_slave (ClutterInputDevice *master,
+ ClutterInputDevice *slave);
+CLUTTER_EXPORT
+void clutter_input_device_update_from_tool (ClutterInputDevice *device,
+ ClutterInputDeviceTool *tool);
+CLUTTER_EXPORT
+ClutterStage * _clutter_input_device_get_stage (ClutterInputDevice *device);
+CLUTTER_EXPORT
+void _clutter_input_device_set_stage (ClutterInputDevice *device,
+ ClutterStage *stage);
+CLUTTER_EXPORT
+void _clutter_input_device_set_coords (ClutterInputDevice *device,
+ ClutterEventSequence *sequence,
+ gfloat x,
+ gfloat y,
+ ClutterStage *stage);
+CLUTTER_EXPORT
+void _clutter_input_device_set_state (ClutterInputDevice *device,
+ ClutterModifierType state);
+CLUTTER_EXPORT
+void _clutter_input_device_set_time (ClutterInputDevice *device,
+ guint32 time_);
+void _clutter_input_device_set_actor (ClutterInputDevice *device,
+ ClutterEventSequence *sequence,
+ ClutterActor *actor,
+ gboolean emit_crossing);
+CLUTTER_EXPORT
+ClutterActor * clutter_input_device_update (ClutterInputDevice *device,
+ ClutterEventSequence *sequence,
+ gboolean emit_crossing);
+CLUTTER_EXPORT
+void _clutter_input_device_add_event_sequence (ClutterInputDevice *device,
+ ClutterEvent *event);
+CLUTTER_EXPORT
+void _clutter_input_device_remove_event_sequence (ClutterInputDevice *device,
+ ClutterEvent *event);
+CLUTTER_EXPORT
+void _clutter_input_device_set_n_keys (ClutterInputDevice *device,
+ guint n_keys);
+CLUTTER_EXPORT
+gboolean _clutter_input_device_translate_axis (ClutterInputDevice *device,
+ guint index_,
+ gdouble value,
+ gdouble *axis_value);
+CLUTTER_EXPORT
+guint _clutter_input_device_add_axis (ClutterInputDevice *device,
+ ClutterInputAxis axis,
+ gdouble minimum,
+ gdouble maximum,
+ gdouble resolution);
+
+CLUTTER_EXPORT
+void _clutter_input_device_reset_axes (ClutterInputDevice *device);
+
+CLUTTER_EXPORT
+void _clutter_input_device_add_scroll_info (ClutterInputDevice *device,
+ guint index_,
+ ClutterScrollDirection direction,
+ gdouble increment);
+CLUTTER_EXPORT
+gboolean _clutter_input_device_get_scroll_delta (ClutterInputDevice *device,
+ guint index_,
+ gdouble value,
+ ClutterScrollDirection *direction_p,
+ gdouble *delta_p);
+CLUTTER_EXPORT
+void _clutter_input_device_reset_scroll_info (ClutterInputDevice *device);
+
+CLUTTER_EXPORT
+void clutter_input_device_add_tool (ClutterInputDevice *device,
+ ClutterInputDeviceTool *tool);
+
+CLUTTER_EXPORT
+ClutterInputDeviceTool *
+ clutter_input_device_lookup_tool (ClutterInputDevice *device,
+ guint64 serial,
+ ClutterInputDeviceToolType type);
+
+#endif /* CLUTTER_INPUT_DEVICE_PRIVATE_H */
diff --git a/clutter/clutter/clutter-input-device.c b/clutter/clutter/clutter-input-device.c
index c12332a0d..ff498b66c 100644
--- a/clutter/clutter/clutter-input-device.c
+++ b/clutter/clutter/clutter-input-device.c
@@ -37,12 +37,12 @@
#include "clutter-actor-private.h"
#include "clutter-debug.h"
-#include "clutter-device-manager-private.h"
#include "clutter-enum-types.h"
#include "clutter-event-private.h"
#include "clutter-marshal.h"
#include "clutter-private.h"
#include "clutter-stage-private.h"
+#include "clutter-input-device-private.h"
#include "clutter-input-device-tool.h"
#include <math.h>
@@ -57,7 +57,6 @@ enum
PROP_NAME,
PROP_DEVICE_TYPE,
- PROP_DEVICE_MANAGER,
PROP_SEAT,
PROP_DEVICE_MODE,
@@ -171,10 +170,6 @@ clutter_input_device_set_property (GObject *gobject,
self->device_type = g_value_get_enum (value);
break;
- case PROP_DEVICE_MANAGER:
- self->device_manager = g_value_get_object (value);
- break;
-
case PROP_SEAT:
self->seat = g_value_get_object (value);
break;
@@ -251,10 +246,6 @@ clutter_input_device_get_property (GObject *gobject,
g_value_set_enum (value, self->device_type);
break;
- case PROP_DEVICE_MANAGER:
- g_value_set_object (value, self->device_manager);
- break;
-
case PROP_SEAT:
g_value_set_object (value, self->seat);
break;
@@ -369,20 +360,6 @@ clutter_input_device_class_init (ClutterInputDeviceClass *klass)
CLUTTER_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY);
- /**
- * ClutterInputDevice:device-manager:
- *
- * The #ClutterDeviceManager instance which owns the device
- *
- * Since: 1.6
- */
- obj_props[PROP_DEVICE_MANAGER] =
- g_param_spec_object ("device-manager",
- P_("Device Manager"),
- P_("The device manager instance"),
- CLUTTER_TYPE_DEVICE_MANAGER,
- CLUTTER_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
/**
* ClutterInputDevice:seat:
*
diff --git a/clutter/clutter/clutter-input-device.h b/clutter/clutter/clutter-input-device.h
index d2cfd2e78..68b74ced8 100644
--- a/clutter/clutter/clutter-input-device.h
+++ b/clutter/clutter/clutter-input-device.h
@@ -28,11 +28,40 @@
#error "Only <clutter/clutter.h> can be included directly."
#endif
+#include <clutter/clutter-backend.h>
#include <clutter/clutter-types.h>
#include <clutter/clutter-seat.h>
G_BEGIN_DECLS
+typedef void (*ClutterEmitInputDeviceEvent) (ClutterEvent *event,
+ ClutterInputDevice *device);
+
+struct _ClutterInputDeviceClass
+{
+ GObjectClass parent_class;
+
+ gboolean (* keycode_to_evdev) (ClutterInputDevice *device,
+ guint hardware_keycode,
+ guint *evdev_keycode);
+ void (* update_from_tool) (ClutterInputDevice *device,
+ ClutterInputDeviceTool *tool);
+
+ gboolean (* is_mode_switch_button) (ClutterInputDevice *device,
+ guint group,
+ guint button);
+ gint (* get_group_n_modes) (ClutterInputDevice *device,
+ gint group);
+
+ gboolean (* is_grouped) (ClutterInputDevice *device,
+ ClutterInputDevice *other_device);
+
+ /* Keyboard accessbility */
+ void (* process_kbd_a11y_event) (ClutterEvent *event,
+ ClutterInputDevice *device,
+ ClutterEmitInputDeviceEvent emit_event_func);
+};
+
#define CLUTTER_TYPE_INPUT_DEVICE (clutter_input_device_get_type ())
#define CLUTTER_INPUT_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
CLUTTER_TYPE_INPUT_DEVICE, ClutterInputDevice))
#define CLUTTER_IS_INPUT_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
CLUTTER_TYPE_INPUT_DEVICE))
diff --git a/clutter/clutter/clutter-input-method.c b/clutter/clutter/clutter-input-method.c
index 89d765101..4bf1b0ec8 100644
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -22,10 +22,10 @@
#include "clutter-build-config.h"
#include "clutter-private.h"
+#include "clutter/clutter-input-device-private.h"
#include "clutter/clutter-input-method.h"
#include "clutter/clutter-input-method-private.h"
#include "clutter/clutter-input-focus-private.h"
-#include "clutter/clutter-device-manager-private.h"
typedef struct _ClutterInputMethodPrivate ClutterInputMethodPrivate;
diff --git a/clutter/clutter/clutter-input-pointer-a11y.c b/clutter/clutter/clutter-input-pointer-a11y.c
index 9f2fc52b1..b57ee81c0 100644
--- a/clutter/clutter/clutter-input-pointer-a11y.c
+++ b/clutter/clutter/clutter-input-pointer-a11y.c
@@ -25,10 +25,9 @@
#include "clutter-build-config.h"
-#include "clutter-device-manager.h"
-#include "clutter-device-manager-private.h"
#include "clutter-enum-types.h"
#include "clutter-input-device.h"
+#include "clutter-input-device-private.h"
#include "clutter-input-pointer-a11y-private.h"
#include "clutter-main.h"
#include "clutter-virtual-input-device.h"
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 8711a31f4..beeac4310 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -55,9 +55,9 @@
#include "clutter-backend-private.h"
#include "clutter-config.h"
#include "clutter-debug.h"
-#include "clutter-device-manager-private.h"
#include "clutter-event-private.h"
#include "clutter-feature.h"
+#include "clutter-input-device-private.h"
#include "clutter-input-pointer-a11y-private.h"
#include "clutter-graphene.h"
#include "clutter-main.h"
diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h
index ca600da94..2e3af31f1 100644
--- a/clutter/clutter/clutter-mutter.h
+++ b/clutter/clutter/clutter-mutter.h
@@ -26,8 +26,8 @@
#define __CLUTTER_H_INSIDE__
#include "clutter-backend.h"
-#include "clutter-device-manager-private.h"
#include "clutter-event-private.h"
+#include "clutter-input-device-private.h"
#include "clutter-input-pointer-a11y-private.h"
#include "clutter-macros.h"
#include "clutter-private.h"
diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
index ab22275b7..04d619a59 100644
--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -60,10 +60,10 @@
#include "clutter-color.h"
#include "clutter-container.h"
#include "clutter-debug.h"
-#include "clutter-device-manager-private.h"
#include "clutter-enum-types.h"
#include "clutter-event-private.h"
#include "clutter-id-pool.h"
+#include "clutter-input-device-private.h"
#include "clutter-main.h"
#include "clutter-marshal.h"
#include "clutter-master-clock.h"
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 81210819d..9dd69c3d3 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -56,7 +56,6 @@
#include "clutter-content.h"
#include "clutter-deform-effect.h"
#include "clutter-desaturate-effect.h"
-#include "clutter-device-manager.h"
#include "clutter-drag-action.h"
#include "clutter-drop-action.h"
#include "clutter-effect.h"
diff --git a/clutter/clutter/egl/clutter-backend-eglnative.h b/clutter/clutter/egl/clutter-backend-eglnative.h
index 3a87ddb3d..cc63f89b3 100644
--- a/clutter/clutter/egl/clutter-backend-eglnative.h
+++ b/clutter/clutter/egl/clutter-backend-eglnative.h
@@ -27,11 +27,11 @@
#define __CLUTTER_BACKEND_EGL_NATIVE_H__
#include <glib-object.h>
+#include <gio/gio.h>
#include <cogl/cogl.h>
#include <cogl/cogl-egl.h>
#include <clutter/clutter-event.h>
#include <clutter/clutter-backend.h>
-#include <clutter/clutter-device-manager.h>
#include "clutter-backend-private.h"
@@ -53,9 +53,6 @@ struct _ClutterBackendEglNative
{
ClutterBackend parent_instance;
- /* device manager (ie evdev) */
- ClutterDeviceManager *device_manager;
-
/* event source */
GSource *event_source;
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 256c1ca5f..4891b03d2 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -30,7 +30,6 @@ clutter_headers = [
'clutter-deform-effect.h',
'clutter-deprecated.h',
'clutter-desaturate-effect.h',
- 'clutter-device-manager.h',
'clutter-drag-action.h',
'clutter-drop-action.h',
'clutter-effect.h',
@@ -119,7 +118,6 @@ clutter_sources = [
'clutter-content.c',
'clutter-deform-effect.c',
'clutter-desaturate-effect.c',
- 'clutter-device-manager.c',
'clutter-drag-action.c',
'clutter-drop-action.c',
'clutter-effect.c',
@@ -192,7 +190,6 @@ clutter_private_headers = [
'clutter-constraint-private.h',
'clutter-content-private.h',
'clutter-debug.h',
- 'clutter-device-manager-private.h',
'clutter-easing.h',
'clutter-effect-private.h',
'clutter-event-private.h',
@@ -200,6 +197,7 @@ clutter_private_headers = [
'clutter-graphene.h',
'clutter-gesture-action-private.h',
'clutter-id-pool.h',
+ 'clutter-input-device-private.h',
'clutter-input-focus-private.h',
'clutter-input-method-private.h',
'clutter-input-pointer-a11y-private.h',
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index b990e5658..697334b9a 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -47,7 +47,6 @@
#include "clutter-backend.h"
#include "clutter-debug.h"
-#include "clutter-device-manager-private.h"
#include "clutter-event-private.h"
#include "clutter-main.h"
#include "clutter-private.h"
diff --git a/clutter/clutter/x11/clutter-backend-x11.h b/clutter/clutter/x11/clutter-backend-x11.h
index 029911fad..d08c5409d 100644
--- a/clutter/clutter/x11/clutter-backend-x11.h
+++ b/clutter/clutter/x11/clutter-backend-x11.h
@@ -86,8 +86,6 @@ struct _ClutterBackendX11
Time last_event_time;
- ClutterDeviceManager *device_manager;
-
XSettingsClient *xsettings;
Window xsettings_xwin;
};
diff --git a/src/backends/native/meta-clutter-backend-native.c
b/src/backends/native/meta-clutter-backend-native.c
index f00c00918..ff3ae1a38 100644
--- a/src/backends/native/meta-clutter-backend-native.c
+++ b/src/backends/native/meta-clutter-backend-native.c
@@ -44,7 +44,6 @@
#include "backends/meta-backend-private.h"
#include "backends/meta-renderer.h"
-#include "backends/native/meta-device-manager-native.h"
#include "backends/native/meta-seat-native.h"
#include "backends/native/meta-stage-native.h"
#include "clutter/clutter.h"
@@ -57,7 +56,6 @@ struct _MetaClutterBackendNative
MetaSeatNative *main_seat;
MetaStageNative *stage_native;
- MetaDeviceManagerNative *device_manager;
};
static gchar *evdev_seat_id;
@@ -101,14 +99,6 @@ meta_clutter_backend_native_create_stage (ClutterBackend *backend,
return CLUTTER_STAGE_WINDOW (clutter_backend_native->stage_native);
}
-static ClutterDeviceManager *
-meta_clutter_backend_native_get_device_manager (ClutterBackend *backend)
-{
- MetaClutterBackendNative *backend_native = META_CLUTTER_BACKEND_NATIVE (backend);
-
- return CLUTTER_DEVICE_MANAGER (backend_native->device_manager);
-}
-
static void
meta_clutter_backend_native_init_events (ClutterBackend *backend)
{
@@ -119,8 +109,6 @@ meta_clutter_backend_native_init_events (ClutterBackend *backend)
"backend", backend,
"seat-id", seat_id,
NULL);
- backend_native->device_manager =
- meta_device_manager_native_new (backend, backend_native->main_seat);
}
static ClutterSeat *
@@ -143,7 +131,6 @@ meta_clutter_backend_native_class_init (MetaClutterBackendNativeClass *klass)
clutter_backend_class->get_renderer = meta_clutter_backend_native_get_renderer;
clutter_backend_class->create_stage = meta_clutter_backend_native_create_stage;
- clutter_backend_class->get_device_manager = meta_clutter_backend_native_get_device_manager;
clutter_backend_class->init_events = meta_clutter_backend_native_init_events;
clutter_backend_class->get_default_seat = meta_clutter_backend_native_get_default_seat;
}
diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c
index 7a24de416..d2f6136c9 100644
--- a/src/backends/x11/meta-clutter-backend-x11.c
+++ b/src/backends/x11/meta-clutter-backend-x11.c
@@ -29,7 +29,6 @@
#include "backends/meta-backend-private.h"
#include "backends/meta-renderer.h"
#include "backends/x11/meta-clutter-backend-x11.h"
-#include "backends/x11/meta-device-manager-x11.h"
#include "backends/x11/meta-keymap-x11.h"
#include "backends/x11/meta-seat-x11.h"
#include "backends/x11/meta-xkb-a11y-x11.h"
@@ -42,7 +41,6 @@
struct _MetaClutterBackendX11
{
ClutterBackendX11 parent;
- MetaDeviceManagerX11 *device_manager;
MetaSeatX11 *core_seat;
};
@@ -79,14 +77,6 @@ meta_clutter_backend_x11_create_stage (ClutterBackend *backend,
return stage;
}
-static ClutterDeviceManager *
-meta_clutter_backend_x11_get_device_manager (ClutterBackend *backend)
-{
- MetaClutterBackendX11 *backend_x11 = META_CLUTTER_BACKEND_X11 (backend);
-
- return CLUTTER_DEVICE_MANAGER (backend_x11->device_manager);
-}
-
static gboolean
meta_clutter_backend_x11_translate_event (ClutterBackend *backend,
gpointer native,
@@ -133,13 +123,6 @@ meta_clutter_backend_x11_init_events (ClutterBackend *backend)
meta_seat_x11_new (event_base,
META_VIRTUAL_CORE_POINTER_ID,
META_VIRTUAL_CORE_KEYBOARD_ID);
-
- g_debug ("Creating XI2 device manager");
- backend_x11->device_manager =
- g_object_new (META_TYPE_DEVICE_MANAGER_X11,
- "backend", backend_x11,
- "seat", backend_x11->core_seat,
- NULL);
}
}
@@ -167,7 +150,6 @@ meta_clutter_backend_x11_class_init (MetaClutterBackendX11Class *klass)
clutter_backend_class->get_renderer = meta_clutter_backend_x11_get_renderer;
clutter_backend_class->create_stage = meta_clutter_backend_x11_create_stage;
- clutter_backend_class->get_device_manager = meta_clutter_backend_x11_get_device_manager;
clutter_backend_class->translate_event = meta_clutter_backend_x11_translate_event;
clutter_backend_class->init_events = meta_clutter_backend_x11_init_events;
clutter_backend_class->get_default_seat = meta_clutter_backend_x11_get_default_seat;
diff --git a/src/meson.build b/src/meson.build
index ad0cfd7e4..e44366944 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -244,8 +244,6 @@ mutter_sources = [
'backends/x11/meta-crtc-xrandr.h',
'backends/x11/meta-cursor-renderer-x11.c',
'backends/x11/meta-cursor-renderer-x11.h',
- 'backends/x11/meta-device-manager-x11.c',
- 'backends/x11/meta-device-manager-x11.h',
'backends/x11/meta-event-x11.c',
'backends/x11/meta-event-x11.h',
'backends/x11/meta-gpu-xrandr.c',
@@ -605,8 +603,6 @@ if have_native_backend
'backends/native/meta-crtc-kms.h',
'backends/native/meta-cursor-renderer-native.c',
'backends/native/meta-cursor-renderer-native.h',
- 'backends/native/meta-device-manager-native.c',
- 'backends/native/meta-device-manager-native.h',
'backends/native/meta-drm-buffer-dumb.c',
'backends/native/meta-drm-buffer-dumb.h',
'backends/native/meta-drm-buffer-gbm.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
