gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for issue #254: remove hardware overlay support - cont'd.

Browse Source
This commit is contained in:
ManoloFLTK 2021-11-26 15:28:43 +01:00
parent 25eed24172
commit 390fa9caa7
4 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -144,7 +144,6 @@ set (CPPFILES
fl_open_uri.cxx
fl_oval_box.cxx
fl_overlay.cxx
fl_overlay_visual.cxx
fl_plastic.cxx
fl_read_image.cxx
fl_rect.cxx

2
src/Makefile
View File

@ -146,7 +146,6 @@ CPPFILES = \
fl_open_uri.cxx \
fl_oval_box.cxx \
fl_overlay.cxx \
fl_overlay_visual.cxx \
fl_plastic.cxx \
fl_read_image.cxx \
fl_rect.cxx \
@ -676,7 +675,6 @@ Fl_Image.o: ../FL/mac.H ../FL/win32.H
fl_line_style.o: ../FL/mac.H ../FL/win32.H
Fl_Menu_Window.o: ../FL/mac.H ../FL/win32.H
fl_overlay.o: ../FL/mac.H ../FL/win32.H
fl_overlay_visual.o: ../FL/mac.H ../FL/win32.H
Fl_Overlay_Window.o: ../FL/mac.H ../FL/win32.H
Fl_own_colormap.o: ../FL/mac.H ../FL/win32.H
Fl_Pixmap.o: ../FL/mac.H ../FL/win32.H

36
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
View File

@ -31,14 +31,6 @@
#include <X11/Xft/Xft.h>
#include <X11/Xft/XftCompat.h>
#define USE_OVERLAY 0
#if USE_OVERLAY
// Currently Xft does not work with colormapped visuals, so this probably
// does not work unless you have a true-color overlay.
extern Colormap fl_overlay_colormap;
extern XVisualInfo* fl_overlay_visual;
#endif
Fl_XFont_On_Demand fl_xfont = 0;
@ -50,10 +42,6 @@ static void fl_xft_font(Fl_Xlib_Graphics_Driver *driver, Fl_Font fnum, Fl_Fontsi
XftDraw* Fl_Xlib_Graphics_Driver::draw_ = 0;
Window Fl_Xlib_Graphics_Driver::draw_window = (Window)0;
#if USE_OVERLAY
static XftDraw* draw_overlay;
static Window draw_overlay_window;
#endif
#if ! USE_PANGO
@ -794,16 +782,6 @@ void Fl_Xlib_Graphics_Driver::draw_unscaled(const char *str, int n, int x, int y
int y1 = y + floor(offset_y_) ;
if (y1 < clip_min() || y1 > clip_max()) return;
#if USE_OVERLAY
XftDraw*& draw_ = fl_overlay ? draw_overlay : ::draw_;
if (fl_overlay) {
if (!draw_)
draw_ = XftDrawCreate(fl_display, draw_overlay_window = fl_window,
fl_overlay_visual->visual, fl_overlay_colormap);
else //if (draw_overlay_window != fl_window)
XftDrawChange(draw_, draw_overlay_window = fl_window);
} else
#endif
if (!draw_)
draw_ = XftDrawCreate(fl_display, draw_window = fl_window,
fl_visual->visual, fl_colormap);
@ -840,16 +818,6 @@ void Fl_Xlib_Graphics_Driver::draw_unscaled(int angle, const char *str, int n, i
}
void Fl_Xlib_Graphics_Driver::drawUCS4(const void *str, int n, int x, int y) {
#if USE_OVERLAY
XftDraw*& draw_ = fl_overlay ? draw_overlay : ::draw_;
if (fl_overlay) {
if (!draw_)
draw_ = XftDrawCreate(fl_display, draw_overlay_window = fl_window,
fl_overlay_visual->visual, fl_overlay_colormap);
else //if (draw_overlay_window != fl_window)
XftDrawChange(draw_, draw_overlay_window = fl_window);
} else
#endif
if (!draw_)
draw_ = XftDrawCreate(fl_display, draw_window = fl_window,
fl_visual->visual, fl_colormap);
@ -1022,10 +990,6 @@ Fl_Xlib_Font_Descriptor::~Fl_Xlib_Font_Descriptor() {
void Fl_Xlib_Graphics_Driver::destroy_xft_draw(Window id) {
if (id == draw_window)
XftDrawChange(draw_, draw_window = fl_message_window);
#if USE_OVERLAY
if (id == draw_overlay_window)
XftDrawChange(draw_overlay, draw_overlay_window = fl_message_window);
#endif
}
void *fl_xftfont = 0; // always 0 under Pango

1
src/makedepend
View File

@ -2422,7 +2422,6 @@ fl_overlay.o: ../FL/Fl_Widget.H
fl_overlay.o: ../FL/platform.H
fl_overlay.o: ../FL/platform_types.h
fl_overlay.o: Fl_Screen_Driver.H
fl_overlay_visual.o: ../config.h
Fl_Overlay_Window.o: ../FL/abi-version.h
Fl_Overlay_Window.o: ../FL/Enumerations.H
Fl_Overlay_Window.o: ../FL/Fl.H