[Xfce4-commits] <xfce4-panel:xfce-4.8> Print colormap debugging with PANEL_DEBUG=display-layout.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to ea7d7b62e1672474c7beada68ffb2db3ebec262c (commit)
       from bea61c7821a2d9809f76dfec5361b6f75df63ea5 (commit)

commit ea7d7b62e1672474c7beada68ffb2db3ebec262c
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 13 14:38:53 2011 +0100

    Print colormap debugging with PANEL_DEBUG=display-layout.

 panel/panel-base-window.c |    5 ++---
 panel/panel-window.c      |   20 +++++++++++++++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 751e0c9..8b08ed5 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -223,9 +223,8 @@ panel_base_window_init (PanelBaseWindow *window)
     }
 
    panel_debug (PANEL_DEBUG_BASE_WINDOW,
-               "%p: rgba colormap=%s, compositing=%s", window,
-               PANEL_DEBUG_BOOL (colormap != NULL),
-               PANEL_DEBUG_BOOL (window->is_composited));
+               "%p: rgba colormap=%p, compositing=%s", window,
+               colormap, PANEL_DEBUG_BOOL (window->is_composited));
 }
 
 
diff --git a/panel/panel-window.c b/panel/panel-window.c
index 88d90c1..609f276 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1720,9 +1720,21 @@ panel_window_display_layout_debug (GtkWidget *widget)
   for (n = 0; n < n_screens; n++)
     {
       screen = gdk_display_get_screen (display, n);
-      g_string_append_printf (str, "screen-%d[%p]=[%d,%d] (", n, screen,
+      g_string_append_printf (str, "screen-%d[%p]=[%d,%d]", n, screen,
           gdk_screen_get_width (screen), gdk_screen_get_height (screen));
 
+      if (panel_debug_has_domain (PANEL_DEBUG_DISPLAY_LAYOUT))
+        {
+          g_string_append_printf (str, "{comp=%s, sys=%p:%p, rgba=%p:%p}",
+              PANEL_DEBUG_BOOL (gdk_screen_is_composited (screen)),
+              gdk_screen_get_system_colormap (screen),
+              gdk_screen_get_system_visual (screen),
+              gdk_screen_get_rgba_colormap (screen),
+              gdk_screen_get_rgba_visual (screen));
+        }
+
+      str = g_string_append (str, " (");
+
       n_monitors = gdk_screen_get_n_monitors (screen);
       for (m = 0; m < n_monitors; m++)
         {
@@ -1746,8 +1758,10 @@ panel_window_display_layout_debug (GtkWidget *widget)
     }
 
   panel_debug (PANEL_DEBUG_DISPLAY_LAYOUT,
-               "%p: display=%s, %s", widget,
-               gdk_display_get_name (display), str->str);
+               "%p: display=%s{comp=%s}, %s", widget,
+               gdk_display_get_name (display),
+               PANEL_DEBUG_BOOL (gdk_display_supports_composite (display)),
+               str->str);
 
   g_string_free (str, TRUE);
 }