[mutter] compositor: Don't bother selecting for events on the COW
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] compositor: Don't bother selecting for events on the COW
- Date: Tue, 15 Jul 2014 21:18:52 +0000 (UTC)
commit b11405570a2e172ce1a2d93a506ca9b0a1485bdf
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Jul 15 16:24:27 2014 -0400
compositor: Don't bother selecting for events on the COW
We already select all the events we need on the stage window instead.
src/compositor/compositor.c | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index b67b5fa..512364f 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -148,31 +148,6 @@ process_damage (MetaCompositor *compositor,
meta_window_actor_process_x11_damage (window_actor, event);
}
-static Window
-get_output_window (MetaCompositor *compositor)
-{
- MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ());
- Display *xdisplay = meta_backend_x11_get_xdisplay (backend);
- Window output;
- unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
- XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-
- output = compositor->display->screen->composite_overlay_window;
-
- XISetMask (mask.mask, XI_KeyPress);
- XISetMask (mask.mask, XI_KeyRelease);
- XISetMask (mask.mask, XI_ButtonPress);
- XISetMask (mask.mask, XI_ButtonRelease);
- XISetMask (mask.mask, XI_Enter);
- XISetMask (mask.mask, XI_Leave);
- XISetMask (mask.mask, XI_FocusIn);
- XISetMask (mask.mask, XI_FocusOut);
- XISetMask (mask.mask, XI_Motion);
- XISelectEvents (xdisplay, output, &mask, 1);
-
- return output;
-}
-
/* compat helper */
static MetaCompositor *
get_compositor_for_screen (MetaScreen *screen)
@@ -552,7 +527,8 @@ meta_compositor_manage (MetaCompositor *compositor)
}
else
{
- compositor->output = get_output_window (compositor);
+ compositor->output = screen->composite_overlay_window;
+
XReparentWindow (xdisplay, xwin, compositor->output, 0, 0);
meta_empty_stage_input_region (screen);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]