diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-03-20 16:26:14 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-03-20 16:27:22 -0400 |
| commit | 337db2a660b4cf8f2d7325f95a8ff2e6ee7dc7b5 (patch) | |
| tree | 5d328e19bce5e5da39dd1f670b6d68dfa050243c | |
| parent | 054c307353de48af204cfbf6a8a1c4a98924a45a (diff) | |
| download | mutter-337db2a660b4cf8f2d7325f95a8ff2e6ee7dc7b5.tar.gz | |
window: Kill off the rest of colormaps
I removed the XInstallColormap / XUninstallColormap but forgot
to remove the fields in MetaWindow and the code to set them.
| -rw-r--r-- | src/core/events.c | 2 | ||||
| -rw-r--r-- | src/core/frame.c | 3 | ||||
| -rw-r--r-- | src/core/window-private.h | 1 | ||||
| -rw-r--r-- | src/core/window.c | 1 | ||||
| -rw-r--r-- | src/x11/window-x11.c | 2 |
5 files changed, 2 insertions, 7 deletions
diff --git a/src/core/events.c b/src/core/events.c index 43015ad2d..342503664 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -1620,8 +1620,6 @@ handle_other_xevent (MetaDisplay *display, case SelectionNotify: break; case ColormapNotify: - if (window && !frame_was_receiver) - window->colormap = event->xcolormap.colormap; break; case ClientMessage: if (window) diff --git a/src/core/frame.c b/src/core/frame.c index e54e86210..350493c59 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -35,8 +35,7 @@ ButtonPressMask | ButtonReleaseMask | \ PointerMotionMask | PointerMotionHintMask | \ EnterWindowMask | LeaveWindowMask | \ - FocusChangeMask | \ - ColormapChangeMask) + FocusChangeMask) void meta_window_ensure_frame (MetaWindow *window) diff --git a/src/core/window-private.h b/src/core/window-private.h index 97b052cbb..ebda724b9 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -103,7 +103,6 @@ struct _MetaWindow MetaFrame *frame; int depth; Visual *xvisual; - Colormap colormap; char *desc; /* used in debug spew */ char *title; diff --git a/src/core/window.c b/src/core/window.c index 9c30162ce..1f9796443 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -833,7 +833,6 @@ _meta_window_shared_new (MetaDisplay *display, window->depth = attrs->depth; window->xvisual = attrs->visual; - window->colormap = attrs->colormap; window->title = NULL; window->icon = NULL; diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 54b25fc00..339f4ac18 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -2322,7 +2322,7 @@ meta_window_x11_new (MetaDisplay *display, meta_error_trap_push_with_return (display); - event_mask = PropertyChangeMask | ColormapChangeMask; + event_mask = PropertyChangeMask; if (attrs.override_redirect) event_mask |= StructureNotifyMask; |