[mutter/wayland] window: Remove support for colormaps



commit 054c307353de48af204cfbf6a8a1c4a98924a45a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Mar 20 16:22:56 2014 -0400

    window: Remove support for colormaps
    
    While the ICCCM mandates the use of this, it's not necessary under
    a composited environment from my understanding, and it's a flat
    out no-op under XWayland.
    
    Looking at the other rootless servers like Xwin/Xquartz, it seems
    that they contain code for colormap emulation, but they're actually
    never used -- a bug prevents the code from ever being called. Given
    that it's been this way since 2003, I'm going to hazard a guess that
    not many apps using colormaps. Kill them off.

 src/core/window.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 5d831ca..9c30162 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5676,11 +5676,6 @@ meta_window_set_focused_internal (MetaWindow *window,
       if (window->frame)
         meta_frame_queue_draw (window->frame);
 
-      meta_error_trap_push (window->display);
-      XInstallColormap (window->display->xdisplay,
-                        window->colormap);
-      meta_error_trap_pop (window->display);
-
       /* move into FOCUSED_WINDOW layer */
       meta_window_update_layer (window);
 
@@ -5719,11 +5714,6 @@ meta_window_set_focused_internal (MetaWindow *window,
       if (!window->attached_focus_window)
         meta_window_appears_focused_changed (window);
 
-      meta_error_trap_push (window->display);
-      XUninstallColormap (window->display->xdisplay,
-                          window->colormap);
-      meta_error_trap_pop (window->display);
-
       /* move out of FOCUSED_WINDOW layer */
       meta_window_update_layer (window);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]