mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 16:10:41 -05:00
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.
This commit is contained in:
parent
054c307353
commit
337db2a660
@ -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)
|
||||
|
@ -35,8 +35,7 @@
|
||||
ButtonPressMask | ButtonReleaseMask | \
|
||||
PointerMotionMask | PointerMotionHintMask | \
|
||||
EnterWindowMask | LeaveWindowMask | \
|
||||
FocusChangeMask | \
|
||||
ColormapChangeMask)
|
||||
FocusChangeMask)
|
||||
|
||||
void
|
||||
meta_window_ensure_frame (MetaWindow *window)
|
||||
|
@ -103,7 +103,6 @@ struct _MetaWindow
|
||||
MetaFrame *frame;
|
||||
int depth;
|
||||
Visual *xvisual;
|
||||
Colormap colormap;
|
||||
char *desc; /* used in debug spew */
|
||||
char *title;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user