1 files changed, 53 insertions, 6 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index fb0ad1d..e2dcf70 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -41,6 +41,10 @@
   #include <assert.h>
 #endif
 
+#if HAVE_XRENDER
+#include <X11/extensions/Xrender.h>
+#endif
+
 namespace FbTk {
 
 FbWindow::FbWindow():
@@ -75,7 +79,9 @@ FbWindow::FbWindow(int screen_num,
                    bool override_redirect,
                    bool save_unders,
                    unsigned int depth,
-                   int class_type):
+                   int class_type,
+                   Visual *visual,
+                   Colormap cmap):
     FbDrawable(),
     m_parent(0),
     m_screen_num(screen_num),
@@ -86,7 +92,7 @@ FbWindow::FbWindow(int screen_num,
 
     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,
@@ -101,8 +107,19 @@ FbWindow::FbWindow(const FbWindow &parent,
     m_lastbg_color_set(false), m_lastbg_color(0),
     m_lastbg_pm(0), m_renderer(0) {
 
+    Visual *visual = CopyFromParent;
+    Colormap cmap = CopyFromParent;
+
+    if (class_type == InputOutput) {
+        visual = DefaultVisual(display(), m_screen_num);
+        cmap = DefaultColormap(display(), m_screen_num);
+        if (depth == CopyFromParent) {
+            depth = DefaultDepth(display(), m_screen_num);
+        }
+    }
+
     create(parent.window(), x, y, width, height, eventmask,
-           override_redirect, save_unders, depth, class_type);
+           override_redirect, save_unders, depth, class_type, visual, cmap);
 
 
 }
@@ -238,7 +255,20 @@ void FbWindow::updateBackground(bool only_if_alpha) {
 }
 
 void FbWindow::setBorderColor(const FbTk::Color &border_color) {
-    XSetWindowBorder(display(), m_window, border_color.pixel());
+    unsigned long pixel = border_color.pixel();
+#if HAVE_XRENDER
+    XRenderPictFormat *format = XRenderFindVisualFormat(display(), visual());
+    if (depth() == 32 && format) {
+        /* TODO: Temporarily, until we have full ARGB color support, hack in the
+         * alpha channel of this pixel to be opaque
+         */
+        pixel |= ((0xffff * (format->direct.alphaMask + 1) >> 16)
+                  << format->direct.alpha);
+    }
+#endif
+    XSetWindowBorder(display(), m_window, pixel);
+
+    /* Important: Use the original color here, it is matched in FbWinFrame.cc */
     m_border_color = border_color.pixel();
 }
 
@@ -600,10 +630,19 @@ bool FbWindow::updateGeometry() {
             old_height != m_height);
 }
 
+Visual *FbWindow::visual() {
+    XWindowAttributes attr;
+    if (XGetWindowAttributes(display(), m_window, &attr)) {
+        return attr.visual;
+    }
+    return 0;
+}
+
 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,11 +662,19 @@ void FbWindow::create(Window parent, int x, int y,
         values.save_under = True;
     }
 
+    if (cmap != CopyFromParent) {
+        valmask |= CWColormap | CWBackPixel | CWBorderPixel;
+        values.colormap = cmap;
+        /* Why do we need to specify these for a 32-bit visual? */
+        values.background_pixel = XWhitePixel(display(), 0);
+        values.border_pixel = XBlackPixel(display(), 0);
+    }
+
     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