X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=5dd1bce9976e82a643bace905b438c501e36418d;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=9cc822aea8683ff98b41fdd606d8eca6d194ccbf;hpb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index 9cc822ae..5dd1bce9 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, + bool override_redirect) : 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(override_redirect); _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(bool override_redirect) { const ScreenInfo *scr_info = otk::OBDisplay::screenInfo(_screen); Window p_window = _parent ? _parent->window() : scr_info->rootWindow(); @@ -82,6 +83,11 @@ void OtkWidget::create(void) attrib_create.event_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | ExposureMask | StructureNotifyMask; + if (override_redirect) { + create_mask |= CWOverrideRedirect; + attrib_create.override_redirect = true; + } + if (_cursor) { create_mask |= CWCursor; attrib_create.cursor = _cursor; @@ -248,13 +254,12 @@ void OtkWidget::render(void) { if (!_texture) return; - printf("rendering %lx\n", _texture); - _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; @@ -388,7 +393,6 @@ void OtkWidget::adjustVert(void) void OtkWidget::update(void) { if (_dirty) { - printf("widget dirty, redrawing\n"); adjust(); render(); XClearWindow(OBDisplay::display, _window);