isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

backend-x11: Take grabs on the stage window

Browse Source 
This means that grabs will be reported with respect to the
stage window, and that our event coordinates will be more
correct under nested.
This commit is contained in:
Jasper St. Pierre 2014-04-28 13:22:17 -04:00
parent 4e584c2cf0
commit 18730f2a5e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,15 +68,21 @@ handle_alarm_notify (MetaBackend *backend,
meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i], (XSyncAlarmNotifyEvent*) event); meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i], (XSyncAlarmNotifyEvent*) event);
} }
static void static Window
translate_device_event (MetaBackendX11 *x11, get_stage_window (MetaBackendX11 *x11)
XIDeviceEvent *device_event)
{ {
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaCompositor *compositor = display->compositor; MetaCompositor *compositor = display->compositor;
ClutterStage *stage = CLUTTER_STAGE (compositor->stage); ClutterStage *stage = CLUTTER_STAGE (compositor->stage);
device_event->event = clutter_x11_get_stage_window (stage); return clutter_x11_get_stage_window (stage);
}
static void
translate_device_event (MetaBackendX11 *x11,
XIDeviceEvent *device_event)
{
device_event->event = get_stage_window (x11);
device_event->event_x = device_event->root_x; device_event->event_x = device_event->root_x;
device_event->event_y = device_event->root_y; device_event->event_y = device_event->root_y;
} }
@ -311,7 +317,7 @@ meta_backend_x11_grab_device (MetaBackend *backend,
MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref); MetaCursor cursor = meta_cursor_reference_get_meta_cursor (cursor_ref);
ret = XIGrabDevice (priv->xdisplay, device_id, ret = XIGrabDevice (priv->xdisplay, device_id,
DefaultRootWindow (priv->xdisplay), get_stage_window (x11),
timestamp, timestamp,
meta_cursor_create_x_cursor (priv->xdisplay, cursor), meta_cursor_create_x_cursor (priv->xdisplay, cursor),
XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync, XIGrabModeAsync,