[mutter] clutter: cleanup/remove core input X11 backend



commit f9e33a89fdc76d62ba76b623bce6c58de4e024c5
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Tue Feb 26 13:48:55 2019 +0100

    clutter: cleanup/remove core input X11 backend
    
    We don't use the core input X11 backend, remove it.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/459

 clutter/clutter/meson.build                        |   4 -
 clutter/clutter/x11/clutter-backend-x11.c          |  11 +-
 .../clutter/x11/clutter-device-manager-core-x11.c  | 555 ---------------------
 .../clutter/x11/clutter-device-manager-core-x11.h  |  70 ---
 .../clutter/x11/clutter-input-device-core-x11.c    |  78 ---
 .../clutter/x11/clutter-input-device-core-x11.h    |  44 --
 6 files changed, 1 insertion(+), 761 deletions(-)
---
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 034d42ef1..60ef92509 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -293,10 +293,8 @@ clutter_backend_private_headers = [
 if have_x11
   clutter_x11_sources = [
     'x11/clutter-backend-x11.c',
-    'x11/clutter-device-manager-core-x11.c',
     'x11/clutter-device-manager-xi2.c',
     'x11/clutter-event-x11.c',
-    'x11/clutter-input-device-core-x11.c',
     'x11/clutter-input-device-tool-xi2.c',
     'x11/clutter-input-device-xi2.c',
     'x11/clutter-keymap-x11.c',
@@ -319,9 +317,7 @@ if have_x11
 
   clutter_x11_private_headers = [
     'x11/clutter-backend-x11.h',
-    'x11/clutter-device-manager-core-x11.h',
     'x11/clutter-device-manager-xi2.h',
-    'x11/clutter-input-device-core-x11.h',
     'x11/clutter-input-device-tool-xi2.h',
     'x11/clutter-input-device-xi2.h',
     'x11/clutter-keymap-x11.h',
diff --git a/clutter/clutter/x11/clutter-backend-x11.c b/clutter/clutter/x11/clutter-backend-x11.c
index 242eb8dc9..0ddd0f836 100644
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 
 #include "clutter-backend-x11.h"
-#include "clutter-device-manager-core-x11.h"
 #include "clutter-device-manager-xi2.h"
 #include "clutter-settings-x11.h"
 #include "clutter-stage-x11.h"
@@ -265,13 +264,8 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
 
   if (backend_x11->device_manager == NULL)
     {
-      CLUTTER_NOTE (BACKEND, "Creating Core device manager");
+      g_critical ("XI2 extension is missing.");
       backend_x11->has_xinput = FALSE;
-      backend_x11->device_manager =
-        g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_X11,
-                      "backend", backend_x11,
-                      NULL);
-
       backend_x11->xi_minor = -1;
     }
 
@@ -480,9 +474,6 @@ _clutter_backend_x11_events_init (ClutterBackend *backend)
       backend_x11->event_source = source;
     }
 
-  /* create the device manager; we need this because we can effectively
-   * choose between core+XI1 and XI2 input events
-   */
   clutter_backend_x11_create_device_manager (backend_x11);
 
   /* register keymap; unless we create a generic Keymap object, I'm


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]