Fl::visual(FL_DOUBLE|FL_RGB8)
-
Hardware double buffering and full color.
This returns true if the system has the capabilities by default or
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 4d30cc2e3..a57316207 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2489,9 +2489,6 @@ Fl_X* Fl_X::set_xid(Fl_Window* win, Window winxid) {
xp->next = Fl_X::first;
xp->region = 0;
Fl_Window_Driver::driver(win)->wait_for_expose_value = 1;
-#ifdef USE_XDBE
- Fl_X11_Window_Driver::driver(win)->backbuffer_bad = 1;
-#endif
Fl_X::first = xp;
if (win->modal()) {Fl::modal_ = win; fl_fix_focus();}
return xp;
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 4fd36edb6..ed8c54dfa 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -35,10 +35,6 @@
# include
#endif
-#if USE_XDBE
-#include
-#endif
-
# include
# ifdef __sgi
# include
@@ -145,23 +141,6 @@ static int test_visual(XVisualInfo& v, int flags) {
#else
// simpler if we can't use colormapped visuals at all:
if (v.c_class != StaticColor && v.c_class != TrueColor) return 0;
-#endif
-#if USE_XDBE
- if (flags & FL_DOUBLE) {
- static XdbeScreenVisualInfo *xdbejunk;
- if (!xdbejunk) {
- int event_base, error_base;
- if (!XdbeQueryExtension(fl_display, &event_base, &error_base)) return 0;
- Drawable root = RootWindow(fl_display,fl_screen);
- int numscreens = 1;
- xdbejunk = XdbeGetVisualInfo(fl_display,&root,&numscreens);
- if (!xdbejunk) return 0;
- }
- for (int j = 0; ; j++) {
- if (j >= xdbejunk->count) return 0;
- if (xdbejunk->visinfo[j].visual == v.visualid) break;
- }
- }
#endif
return 1;
}
@@ -169,9 +148,7 @@ static int test_visual(XVisualInfo& v, int flags) {
int Fl_X11_Screen_Driver::visual(int flags)
{
-#if USE_XDBE == 0
if (flags & FL_DOUBLE) return 0;
-#endif
open_display();
// always use default if possible:
if (test_visual(*fl_visual, flags)) return 1;
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 098808c72..08e7514bd 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -24,7 +24,7 @@
#define FL_X11_WINDOW_DRIVER_H
#include "../../Fl_Window_Driver.H"
-#include // for USE_XDBE
+#include
#include // for Cursor
class Fl_Bitmap;
@@ -80,10 +80,6 @@ private:
void flush_double(int erase_overlay);
void sendxjunk();
void activate_window();
-#ifdef USE_XDBE
- char backbuffer_bad;
- void flush_double_dbe(int erase_overlay);
-#endif
public:
Fl_X11_Window_Driver(Fl_Window*);
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 5dea0fb29..b0db15194 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -44,74 +44,9 @@ extern unsigned long fl_transparent_pixel;
Window fl_window;
-#if USE_XDBE
-#include
-
-// whether the Xdbe extension is usable.
-// DO NOT call this if the window is not mapped, because we do not want fluid to open the display.
-static int can_xdbe()
-{
- static int tried = 0;
- static int use_xdbe = 0;
- if (!tried) {
- tried = 1;
- int event_base, error_base;
- if (!XdbeQueryExtension(fl_display, &event_base, &error_base)) return 0;
- Drawable root = RootWindow(fl_display,fl_screen);
- int numscreens = 1;
- XdbeScreenVisualInfo *a = XdbeGetVisualInfo(fl_display,&root,&numscreens);
- if (!a) return 0;
- for (int j = 0; j < a->count; j++) {
- if (a->visinfo[j].visual == fl_visual->visualid) {
- use_xdbe = 1; break;
- }
- }
- XdbeFreeVisualInfo(a);
- }
- return use_xdbe;
-}
-
-
-void Fl_X11_Window_Driver::flush_double_dbe(int erase_overlay)
-{
- pWindow->make_current(); // make sure fl_gc is non-zero
- Fl_X *i = Fl_X::i(pWindow);
- if (!other_xid) {
- other_xid = XdbeAllocateBackBufferName(fl_display, fl_xid(pWindow), XdbeCopied);
- backbuffer_bad = 1;
- pWindow->clear_damage(FL_DAMAGE_ALL);
- }
- if (backbuffer_bad || erase_overlay) {
- // Make sure we do a complete redraw...
- if (i->region) {Fl_Graphics_Driver::default_driver().XDestroyRegion(i->region); i->region = 0;}
- pWindow->clear_damage(FL_DAMAGE_ALL);
- backbuffer_bad = 0;
- }
- // Redraw as needed...
- if (pWindow->damage()) {
- fl_clip_region(i->region); i->region = 0;
- fl_window = other_xid;
- draw();
- fl_window = i->xid;
- }
- // Copy contents of back buffer to window...
- XdbeSwapInfo s;
- s.swap_window = fl_xid(pWindow);
- s.swap_action = XdbeCopied;
- XdbeSwapBuffers(fl_display, &s, 1);
-}
-
-#endif // USE_XDBE
-
void Fl_X11_Window_Driver::destroy_double_buffer() {
-#if USE_XDBE
- if (can_xdbe()) {
- XdbeDeallocateBackBufferName(fl_display, other_xid);
- }
- else
-#endif // USE_XDBE
- fl_delete_offscreen(other_xid);
+ fl_delete_offscreen(other_xid);
other_xid = 0;
}
@@ -219,10 +154,7 @@ void Fl_X11_Window_Driver::draw_begin()
void Fl_X11_Window_Driver::flush_double()
{
if (!shown()) return;
-#if USE_XDBE
- if (can_xdbe()) flush_double_dbe(0); else
-#endif
- flush_double(0);
+ flush_double(0);
}
void Fl_X11_Window_Driver::flush_double(int erase_overlay)
@@ -251,9 +183,6 @@ void Fl_X11_Window_Driver::flush_overlay()
if (!shown()) return;
int erase_overlay = (pWindow->damage()&FL_DAMAGE_OVERLAY) | (overlay() == pWindow);
pWindow->clear_damage((uchar)(pWindow->damage()&~FL_DAMAGE_OVERLAY));
-#if USE_XDBE
- if (can_xdbe()) flush_double_dbe(erase_overlay); else
-#endif
flush_double(erase_overlay);
Fl_Overlay_Window *oWindow = pWindow->as_overlay_window();
if (overlay() == oWindow) oWindow->draw_overlay();
diff --git a/test/doublebuffer.cxx b/test/doublebuffer.cxx
index 805a6e4b6..98ffbd880 100644
--- a/test/doublebuffer.cxx
+++ b/test/doublebuffer.cxx
@@ -84,7 +84,7 @@ public:
int main(int argc, char **argv) {
if (!Fl::visual(FL_DOUBLE))
- printf("Xdbe not supported, faking double buffer with pixmaps.\n");
+ printf("Xdbe not used, handling double buffer with pixmaps.\n");
Fl_Window w01(420,420,"Fl_Single_Window"); w01.box(FL_FLAT_BOX);
single_blink_window w1(10,10,400,400,"Fl_Single_Window");
w1.box(FL_FLAT_BOX); w1.color(FL_BLACK); //w1.position(100,200);
diff --git a/test/list_visuals.cxx b/test/list_visuals.cxx
index 8d66c3012..77dce30d3 100644
--- a/test/list_visuals.cxx
+++ b/test/list_visuals.cxx
@@ -77,10 +77,6 @@ typedef struct _OverlayInfo {
#include
#endif
-#if HAVE_XDBE
-#include
-#endif
-
static void print_mask(XVisualInfo* p) {
int n = 0;
int what = 0;
@@ -144,22 +140,6 @@ void list_visuals() {
}
#endif
-#if HAVE_XDBE
- int event_base, error_base;
- int numdouble = 0;
- XdbeVisualInfo *dbe = 0;
- if (XdbeQueryExtension(fl_display, &event_base, &error_base)) {
- Drawable root = RootWindow(fl_display,fl_screen);
- int numscreens = 1;
- XdbeScreenVisualInfo *a = XdbeGetVisualInfo(fl_display,&root,&numscreens);
- if (!a) printf("error getting double buffer visuals\n");
- else {
- dbe = a->visinfo;
- numdouble = a->count;
- }
- }
-#endif
-
for (int i=0; ivisualid)
- printf(" doublebuf(perflevel %d)",dbe[j].perflevel);
-#endif
-
if (p->visualid==XVisualIDFromVisual(DefaultVisual(fl_display,fl_screen)))
printf(" (default visual)");