brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "backend-x11: Take the touch grab on the stage window"

Browse Source 
This reverts commit 3b85e4b2b9.

This breaks touch support; reverting would break wayland
(is what this patch tried to fix; we should find a better solution
that works on both).
This commit is contained in:
Adel Gadllah 2014-07-17 17:18:08 +02:00
parent 3a57f843d5
commit 029673d0ee
5 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backends/meta-backend-private.h
View File

@ -50,7 +50,6 @@ struct _MetaBackendClass
GObjectClass parent_class; GObjectClass parent_class;
void (* post_init) (MetaBackend *backend); void (* post_init) (MetaBackend *backend);
void (* compositor_created) (MetaBackend *backend);
MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend, MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
int device_id); int device_id);

12
src/backends/meta-backend.c
View File

@ -79,11 +79,6 @@ meta_backend_real_post_init (MetaBackend *backend)
priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend); priv->cursor_renderer = META_BACKEND_GET_CLASS (backend)->create_cursor_renderer (backend);
} }
static void
meta_backend_real_compositor_created (MetaBackend *backend)
{
}
static MetaCursorRenderer * static MetaCursorRenderer *
meta_backend_real_create_cursor_renderer (MetaBackend *backend) meta_backend_real_create_cursor_renderer (MetaBackend *backend)
{ {
@ -119,7 +114,6 @@ meta_backend_class_init (MetaBackendClass *klass)
klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer; klass->create_cursor_renderer = meta_backend_real_create_cursor_renderer;
klass->grab_device = meta_backend_real_grab_device; klass->grab_device = meta_backend_real_grab_device;
klass->ungrab_device = meta_backend_real_ungrab_device; klass->ungrab_device = meta_backend_real_ungrab_device;
klass->compositor_created = meta_backend_real_compositor_created;
} }
static void static void
@ -151,12 +145,6 @@ meta_backend_post_init (MetaBackend *backend)
META_BACKEND_GET_CLASS (backend)->post_init (backend); META_BACKEND_GET_CLASS (backend)->post_init (backend);
} }
void
meta_backend_compositor_created (MetaBackend *backend)
{
META_BACKEND_GET_CLASS (backend)->compositor_created (backend);
}
MetaIdleMonitor * MetaIdleMonitor *
meta_backend_get_idle_monitor (MetaBackend *backend, meta_backend_get_idle_monitor (MetaBackend *backend,
int device_id) int device_id)

2
src/backends/meta-backend.h
View File

@ -38,8 +38,6 @@ GType meta_backend_get_type (void);
MetaBackend * meta_get_backend (void); MetaBackend * meta_get_backend (void);
void meta_backend_compositor_created (MetaBackend *backend);
MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend, MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
int device_id); int device_id);
MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend); MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);

11
src/backends/x11/meta-backend-x11.c
View File

@ -266,7 +266,7 @@ take_touch_grab (MetaBackend *backend)
XISetMask (mask.mask, XI_TouchEnd); XISetMask (mask.mask, XI_TouchEnd);
XIGrabTouchBegin (priv->xdisplay, META_VIRTUAL_CORE_POINTER_ID, XIGrabTouchBegin (priv->xdisplay, META_VIRTUAL_CORE_POINTER_ID,
meta_backend_x11_get_xwindow (x11), DefaultRootWindow (priv->xdisplay),
False, &mask, 1, &mods); False, &mask, 1, &mods);
} }
@ -307,13 +307,9 @@ meta_backend_x11_post_init (MetaBackend *backend)
meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n"); meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n");
} }
META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
}
static void
meta_backend_x11_compositor_created (MetaBackend *backend)
{
take_touch_grab (backend); take_touch_grab (backend);
META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend);
} }
static MetaIdleMonitor * static MetaIdleMonitor *
@ -412,7 +408,6 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass)
MetaBackendClass *backend_class = META_BACKEND_CLASS (klass); MetaBackendClass *backend_class = META_BACKEND_CLASS (klass);
backend_class->post_init = meta_backend_x11_post_init; backend_class->post_init = meta_backend_x11_post_init;
backend_class->compositor_created = meta_backend_x11_compositor_created;
backend_class->create_idle_monitor = meta_backend_x11_create_idle_monitor; backend_class->create_idle_monitor = meta_backend_x11_create_idle_monitor;
backend_class->create_monitor_manager = meta_backend_x11_create_monitor_manager; backend_class->create_monitor_manager = meta_backend_x11_create_monitor_manager;
backend_class->create_cursor_renderer = meta_backend_x11_create_cursor_renderer; backend_class->create_cursor_renderer = meta_backend_x11_create_cursor_renderer;

2
src/core/display.c
View File

@ -877,8 +877,6 @@ meta_display_open (void)
enable_compositor (display); enable_compositor (display);
meta_backend_compositor_created (meta_get_backend ());
meta_screen_create_guard_window (screen); meta_screen_create_guard_window (screen);
/* Set up touch support */ /* Set up touch support */