diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.H | 3 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.cxx | 59 |
2 files changed, 18 insertions, 44 deletions
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H index 66cfbd64e..642d6b72a 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.H +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -66,10 +66,11 @@ private: void combine_mask(); void shape_bitmap_(Fl_Image* b); void shape_alpha_(Fl_Image* img, int offset); + virtual void flush_double(int); public: Fl_X11_Window_Driver(Fl_Window*); - ~Fl_X11_Window_Driver(); + virtual ~Fl_X11_Window_Driver(); // --- window data virtual int decorated_w(); diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index f041184ae..0b35c8969 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -60,21 +60,21 @@ static int can_xdbe() } class Fl_Xdbe_Window_Driver : public Fl_X11_Window_Driver { + virtual void flush_double(int erase_overlay); public: Fl_Xdbe_Window_Driver(Fl_Window *win) : Fl_X11_Window_Driver(win) {} virtual void destroy_double_buffer(); - virtual void flush_double(); virtual ~Fl_Xdbe_Window_Driver() {} }; void Fl_Xdbe_Window_Driver::destroy_double_buffer() { - if (pWindow->as_overlay_window()) return Fl_X11_Window_Driver::destroy_double_buffer(); - Fl_X *i = Fl_X::i(pWindow); - XdbeDeallocateBackBufferName(fl_display, i->other_xid); - i->other_xid = 0; + Fl_X *i = Fl_X::i(pWindow); + XdbeDeallocateBackBufferName(fl_display, i->other_xid); + i->other_xid = 0; } -void Fl_Xdbe_Window_Driver::flush_double() + +void Fl_Xdbe_Window_Driver::flush_double(int erase_overlay) { if (!pWindow->shown()) return; pWindow->make_current(); // make sure fl_gc is non-zero @@ -85,13 +85,12 @@ void Fl_Xdbe_Window_Driver::flush_double() i->backbuffer_bad = 1; pWindow->clear_damage(FL_DAMAGE_ALL); } - if (i->backbuffer_bad) { + if (i->backbuffer_bad || erase_overlay) { // Make sure we do a complete redraw... if (i->region) {XDestroyRegion(i->region); i->region = 0;} pWindow->clear_damage(FL_DAMAGE_ALL); i->backbuffer_bad = 0; - } - + } // Redraw as needed... if (pWindow->damage()) { fl_clip_region(i->region); i->region = 0; @@ -99,7 +98,6 @@ void Fl_Xdbe_Window_Driver::flush_double() draw(); fl_window = i->xid; } - // Copy contents of back buffer to window... XdbeSwapInfo s; s.swap_window = fl_xid(pWindow); @@ -201,6 +199,11 @@ void Fl_X11_Window_Driver::draw_begin() void Fl_X11_Window_Driver::flush_double() { + flush_double(0); +} + +void Fl_X11_Window_Driver::flush_double(int erase_overlay) +{ if (!pWindow->shown()) return; pWindow->make_current(); // make sure fl_gc is non-zero Fl_X *i = Fl_X::i(pWindow); @@ -215,48 +218,18 @@ void Fl_X11_Window_Driver::flush_double() draw(); fl_window = i->xid; } + if (erase_overlay) fl_clip_region(0); int X,Y,W,H; fl_clip_box(0,0,pWindow->w(),pWindow->h(),X,Y,W,H); if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y); } -//TODO call flush_double in there void Fl_X11_Window_Driver::flush_overlay() { - Fl_Overlay_Window *oWindow = pWindow->as_overlay_window(); - - if (!pWindow->shown()) return; - pWindow->make_current(); // make sure fl_gc is non-zero - Fl_X *i = Fl_X::i(pWindow); - if (!i) return; // window not yet created - -#ifdef BOXX_BUGS - if (oWindow->overlay_ && oWindow->overlay_ != oWindow && oWindow->overlay_->shown()) { - // all drawing to windows hidden by overlay windows is ignored, fix this - XUnmapWindow(fl_display, fl_xid(oWindow->overlay_)); - flush_double(); - XMapWindow(fl_display, fl_xid(oWindow->overlay_)); - return; - } -#endif - int erase_overlay = (pWindow->damage()&FL_DAMAGE_OVERLAY); pWindow->clear_damage((uchar)(pWindow->damage()&~FL_DAMAGE_OVERLAY)); - - if (!i->other_xid) { - i->other_xid = fl_create_offscreen(pWindow->w(), pWindow->h()); - pWindow->clear_damage(FL_DAMAGE_ALL); - } - if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) { - fl_clip_region(i->region); i->region = 0; - fl_window = i->other_xid; - draw(); - fl_window = i->xid; - } - if (erase_overlay) fl_clip_region(0); - int X,Y,W,H; fl_clip_box(0,0,pWindow->w(),pWindow->h(),X,Y,W,H); - if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y); - + flush_double(erase_overlay); + Fl_Overlay_Window *oWindow = pWindow->as_overlay_window(); if (oWindow->overlay_ == oWindow) oWindow->draw_overlay(); } |