From 63f1a10e339f16ce15a98bf81240e01720c8875c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 24 Apr 2014 16:26:17 -0400 Subject: [PATCH] compositor: Don't select for weird events on the COW/stage Talking it over with Owen, we weren't sure why this was here. At one point, we were creating a foreign stage window, so potentially Clutter didn't select for its own events, but now we're using a standard stage window, so this seems weird. Why we did it on the COW, nobody knows. Maybe copy/paste bugginess? --- src/compositor/compositor.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 35193d989..12ebbb542 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -154,8 +154,6 @@ get_output_window (MetaCompositor *compositor) MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ()); Display *xdisplay = meta_backend_x11_get_xdisplay (backend); Window output; - XWindowAttributes attr; - long event_mask; unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits }; @@ -174,12 +172,6 @@ get_output_window (MetaCompositor *compositor) XISetMask (mask.mask, XI_Motion); XISelectEvents (xdisplay, output, &mask, 1); - event_mask = ExposureMask | PropertyChangeMask; - if (XGetWindowAttributes (xdisplay, output, &attr)) - event_mask |= attr.your_event_mask; - - XSelectInput (xdisplay, output, event_mask); - return output; } @@ -515,10 +507,8 @@ meta_compositor_manage (MetaCompositor *compositor) { MetaBackendX11 *backend = META_BACKEND_X11 (meta_get_backend ()); Display *backend_xdisplay = meta_backend_x11_get_xdisplay (backend); - long event_mask; unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 }; XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits }; - XWindowAttributes attr; meta_core_add_old_event_mask (backend_xdisplay, xwin, &mask); @@ -535,12 +525,6 @@ meta_compositor_manage (MetaCompositor *compositor) XIClearMask (mask.mask, XI_TouchEnd); XIClearMask (mask.mask, XI_TouchUpdate); XISelectEvents (backend_xdisplay, xwin, &mask, 1); - - event_mask = ExposureMask | PropertyChangeMask | StructureNotifyMask; - if (XGetWindowAttributes (backend_xdisplay, xwin, &attr)) - event_mask |= attr.your_event_mask; - - XSelectInput (backend_xdisplay, xwin, event_mask); } }