X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=231dee06ce6ef23e47ba9d4c2371f8885946dba1;hb=1fd2c6c2b6a043927f26eceb61e02e01832b6cde;hp=e085bc9fa79579190199255e6113dad851cd25ce;hpb=2ae2b257d39ea62640c2590f794e4275c6db1cd4;p=chaz%2Fopenbox

diff --git a/otk/widget.cc b/otk/widget.cc
index e085bc9f..231dee06 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -34,7 +34,8 @@ OtkWidget::OtkWidget(OtkWidget *parent, Direction direction)
 }
 
 OtkWidget::OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
-                     Direction direction, Cursor cursor, int bevel_width)
+                     Direction direction, Cursor cursor, int bevel_width,
+                     unsigned long create_mask)
   : OtkEventHandler(),
     _dirty(false),_focused(false),
     _parent(0), _style(style), _direction(direction), _cursor(cursor),
@@ -47,7 +48,7 @@ OtkWidget::OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
 {
   assert(event_dispatcher);
   assert(style);
-  create();
+  create(create_mask);
   _event_dispatcher->registerHandler(_window, this);
   setStyle(_style); // let the widget initialize stuff
 }
@@ -67,7 +68,7 @@ OtkWidget::~OtkWidget()
   XDestroyWindow(otk::OBDisplay::display, _window);
 }
 
-void OtkWidget::create(void)
+void OtkWidget::create(unsigned long mask)
 {
   const ScreenInfo *scr_info = otk::OBDisplay::screenInfo(_screen);
   Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
@@ -75,13 +76,16 @@ void OtkWidget::create(void)
   _rect.setRect(0, 0, 1, 1); // just some initial values
 
   XSetWindowAttributes attrib_create;
-  unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
+  unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask |
+                              mask;
 
   attrib_create.background_pixmap = None;
   attrib_create.colormap = scr_info->colormap();
+  attrib_create.override_redirect = true; // not used by default
   attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask |
     ButtonMotionMask | ExposureMask | StructureNotifyMask;
 
+
   if (_cursor) {
     create_mask |= CWCursor;
     attrib_create.cursor = _cursor;
@@ -250,9 +254,10 @@ void OtkWidget::render(void)
 
   _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
 
-  if (_bg_pixmap)
+  if (_bg_pixmap) {
     XSetWindowBackgroundPixmap(otk::OBDisplay::display, _window, _bg_pixmap);
-  else {
+    _bg_pixel = None;
+  } else {
     unsigned int pix = _texture->color().pixel();
     if (pix != _bg_pixel) {
       _bg_pixel = pix;
@@ -386,8 +391,7 @@ void OtkWidget::adjustVert(void)
 void OtkWidget::update(void)
 {
   if (_dirty) {
-    if (!_unmanaged)
-      adjust();
+    adjust();
     render();
     XClearWindow(OBDisplay::display, _window);
   }