From 9c77129a28c4e3e4cda1199448c9dcdd69b2078c Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 1 Mar 2016 20:44:56 +0000 Subject: Allow running fluid -c without opening the X11 display. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11259 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H | 1 + src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index c8d12d880..ef225092d 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -42,6 +42,7 @@ public: Fl_Xlib_Graphics_Driver(void); virtual int has_feature(driver_feature mask) { return mask & NATIVE; } virtual void *gc() { return gc_; } + virtual void gc(void *value); char can_do_alpha_blending(); // --- bitmap stuff diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index adc1c9362..83103c7e4 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx @@ -50,15 +50,15 @@ Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver() GC Fl_Xlib_Graphics_Driver::gc_ = NULL; Fl_Xlib_Graphics_Driver::Fl_Xlib_Graphics_Driver(void) { - if (!gc_) { - fl_open_display(); - // the unique GC used by all X windows - gc_ = XCreateGC(fl_display, RootWindow(fl_display, fl_screen), 0, 0); - fl_gc = gc_; - } mask_bitmap_ = NULL; } +void Fl_Xlib_Graphics_Driver::gc(void *value) { + gc_ = (GC)value; + fl_gc = gc_; +} + + char Fl_Xlib_Graphics_Driver::can_do_alpha_blending() { return Fl_X::xrender_supported(); } -- cgit v1.2.3