brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Kill off the rest of colormaps

Browse Source 
I removed the XInstallColormap / XUninstallColormap but forgot
to remove the fields in MetaWindow and the code to set them.
This commit is contained in:
Jasper St. Pierre 2014-03-20 16:26:14 -04:00
parent 054c307353
commit 337db2a660
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/events.c
View File

@ -1620,8 +1620,6 @@ handle_other_xevent (MetaDisplay *display,
case SelectionNotify: case SelectionNotify:
break; break;
case ColormapNotify: case ColormapNotify:
if (window && !frame_was_receiver)
window->colormap = event->xcolormap.colormap;
break; break;
case ClientMessage: case ClientMessage:
if (window) if (window)

3
src/core/frame.c
View File

@ -35,8 +35,7 @@
ButtonPressMask | ButtonReleaseMask | \ ButtonPressMask | ButtonReleaseMask | \
PointerMotionMask | PointerMotionHintMask | \ PointerMotionMask | PointerMotionHintMask | \
EnterWindowMask | LeaveWindowMask | \ EnterWindowMask | LeaveWindowMask | \
FocusChangeMask | \ FocusChangeMask)
ColormapChangeMask)
void void
meta_window_ensure_frame (MetaWindow *window) meta_window_ensure_frame (MetaWindow *window)

1
src/core/window-private.h
View File

@ -103,7 +103,6 @@ struct _MetaWindow
MetaFrame *frame; MetaFrame *frame;
int depth; int depth;
Visual *xvisual; Visual *xvisual;
Colormap colormap;
char *desc; /* used in debug spew */ char *desc; /* used in debug spew */
char *title; char *title;

1
src/core/window.c
View File

@ -833,7 +833,6 @@ _meta_window_shared_new (MetaDisplay *display,
window->depth = attrs->depth; window->depth = attrs->depth;
window->xvisual = attrs->visual; window->xvisual = attrs->visual;
window->colormap = attrs->colormap;
window->title = NULL; window->title = NULL;
window->icon = NULL; window->icon = NULL;

2
src/x11/window-x11.c
View File

@ -2322,7 +2322,7 @@ meta_window_x11_new (MetaDisplay *display,
meta_error_trap_push_with_return (display); meta_error_trap_push_with_return (display);
event_mask = PropertyChangeMask | ColormapChangeMask; event_mask = PropertyChangeMask;
if (attrs.override_redirect) if (attrs.override_redirect)
event_mask |= StructureNotifyMask; event_mask |= StructureNotifyMask;