1 files changed, 32 insertions, 5 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 2ef24fa..e1b27cd 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -72,9 +72,11 @@ FbWindow::FbWindow(int screen_num,
                    int x, int y,
                    unsigned int width, unsigned int height,
                    long eventmask,
+                                   Visual *visual,
+                                   Colormap cmap,
+                   unsigned int depth,
                    bool override_redirect,
                    bool save_unders,
-                   unsigned int depth,
                    int class_type):
     FbDrawable(),
     m_parent(0),
@@ -84,9 +86,18 @@ FbWindow::FbWindow(int screen_num,
     m_lastbg_color(0),
     m_lastbg_pm(0), m_renderer(0) {
 
+        XWindowAttributes a;
+        if (XGetWindowAttributes(display(), RootWindow(display(), screen_num), &a)) {
+                printf("Creating screen window.  RootWindow visual is 0x%02x, requested visual is 0x%02x\n",
+                                (unsigned int)XVisualIDFromVisual(a.visual),
+                                visual == CopyFromParent ? 0xff : (unsigned int)XVisualIDFromVisual(visual));
+        } else {
+                printf("Creating screen window.  RootWindow visual is unknown, requested visual is 0x%02x\n",
+                                visual == CopyFromParent ? 0xff : (unsigned int)XVisualIDFromVisual(visual));
+        }
     create(RootWindow(display(), screen_num),
            x, y, width, height, eventmask,
-           override_redirect, save_unders, depth, class_type);
+           override_redirect, save_unders, depth, class_type, visual, cmap);
 };
 
 FbWindow::FbWindow(const FbWindow &parent,
@@ -102,7 +113,7 @@ FbWindow::FbWindow(const FbWindow &parent,
     m_lastbg_pm(0), m_renderer(0) {
 
     create(parent.window(), x, y, width, height, eventmask,
-           override_redirect, save_unders, depth, class_type);
+           override_redirect, save_unders, depth, class_type, CopyFromParent);
 
 
 };
@@ -603,7 +614,8 @@ bool FbWindow::updateGeometry() {
 void FbWindow::create(Window parent, int x, int y,
                       unsigned int width, unsigned int height,
                       long eventmask, bool override_redirect,
-                      bool save_unders, unsigned int depth, int class_type) {
+                      bool save_unders, unsigned int depth, int class_type,
+                                          Visual *visual, Colormap cmap) {
 
 
     m_border_width = 0;
@@ -623,13 +635,28 @@ void FbWindow::create(Window parent, int x, int y,
         values.save_under = True;
     }
 
+        if (cmap) {
+                valmask |= CWColormap | CWBackPixel | CWBorderPixel;
+                values.colormap = cmap;
+                /* For some reason, with a 32-bit visual, we need to set these */
+                values.background_pixel = XWhitePixel(display(), 0);
+                values.border_pixel = XBlackPixel(display(), 0);
+        }
+
+        if (depth > 0 || cmap || visual)
+                printf("Creating window... depth %d, cmap %p, visual 0x%02x (%p)\n",
+                                depth, (void*)cmap, 
+                                visual == CopyFromParent ? 0xff : (unsigned int)XVisualIDFromVisual(visual),
+                                visual);
     m_window = XCreateWindow(display(), parent, x, y, width, height,
                              0, // border width
                              depth, // depth
                              class_type, // class
-                             CopyFromParent, // visual
+                             visual, // visual
                              valmask, // create mask
                              &values); // create atrribs
+        if (depth > 0 || cmap || visual)
+                printf("  Complete\n");
 
     assert(m_window);