diff options
Diffstat (limited to 'src')
35 files changed, 266 insertions, 63 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index b7ca2ebb7..dd940d071 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -20,7 +20,7 @@ #include <FL/Fl.H> #include <FL/platform.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include "Fl_Window_Driver.H" #include <FL/Fl_System_Driver.H> #include <FL/Fl_Window.H> diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index f0ff9dc8b..473f022f3 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -611,7 +611,7 @@ char Fl_Cocoa_Gl_Window_Driver::swap_type() {return COPY;} #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H" #include <FL/platform.H> #include <FL/Fl_Graphics_Driver.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w) { @@ -703,7 +703,7 @@ void* Fl_WinAPI_Gl_Window_Driver::GetProcAddress(const char *procName) { #if defined(FL_CFG_GFX_XLIB) #include <FL/platform.H> #include "Fl_Gl_Choice.H" -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include "Fl_Window_Driver.H" Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w) diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index 744a0d003..4a3b39711 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/src/Fl_Graphics_Driver.cxx @@ -25,7 +25,7 @@ #include <FL/Fl.H> #include "config_lib.h" #include <FL/Fl_Graphics_Driver.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_Image.H> #include <FL/fl_draw.H> #include <FL/Fl_Image_Surface.H> diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 832c3bfd3..67c64cd01 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -28,7 +28,7 @@ #include <FL/platform.H> #include <FL/Fl_Window.H> #include <FL/Fl_System_Driver.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_Input.H> #include <FL/fl_draw.H> #include <FL/fl_ask.H> diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx index 68feb4e55..1ffc3c402 100644 --- a/src/Fl_Input_.cxx +++ b/src/Fl_Input_.cxx @@ -19,7 +19,7 @@ #include <FL/Fl.H> #include <FL/Fl_Input_.H> #include <FL/Fl_Window.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/fl_draw.H> #include <FL/fl_ask.H> #include <math.h> diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index d38b5ef56..6c4a70959 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -23,7 +23,7 @@ #include <FL/Fl_SVG_Image.H> #include <FL/fl_utf8.h> #include <FL/fl_draw.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <stdio.h> #include <stdlib.h> #if defined(HAVE_LIBZ) diff --git a/src/Fl_Screen_Driver.H b/src/Fl_Screen_Driver.H new file mode 100644 index 000000000..ab78a4745 --- /dev/null +++ b/src/Fl_Screen_Driver.H @@ -0,0 +1,203 @@ +// +// "$Id$" +// +// All screen related calls in a driver style class. +// +// Copyright 1998-2018 by Bill Spitzak and others. +// +// This library is free software. Distribution and use rights are outlined in +// the file "COPYING" which should have been included with this file. If this +// file is missing or damaged, see the license at: +// +// http://www.fltk.org/COPYING.php +// +// Please report all bugs and problems on the following page: +// +// http://www.fltk.org/str.php +// + +/** + \cond DriverDev + \addtogroup DriverDeveloper + \{ + */ + +#ifndef FL_SCREEN_DRIVER_H +#define FL_SCREEN_DRIVER_H + +#include <FL/fl_types.h> +#include <FL/Fl.H> // for Fl_Timeout_Handler +#include <FL/Fl_Text_Editor.H> + + +// TODO: add text composition? +// TODO: add Fl::display +// TODO: add copy/paste, drag/drop? +// TODO: get key/get mouse? +// TODO: system colors/colormaps +// TODO: system menu? +// TODO: native filechooser +// TODO: native message boxes +// TODO: read screen to image +// TODO: application shortcuts + +class Fl_Window; +class Fl_RGB_Image; +class Fl_Group; +class Fl_Input; + +/** + A base class describing the interface between FLTK and screen-related operations. + + This class is only for internal use by the FLTK library. + + Each supported platform implements several of the virtual methods of this class. + */ +class FL_EXPORT Fl_Screen_Driver { + +protected: + Fl_Screen_Driver(); + virtual ~Fl_Screen_Driver(); + + static const int MAX_SCREENS = 16; + + int num_screens; + static float fl_intersection(int x1, int y1, int w1, int h1, + int x2, int y2, int w2, int h2); + +public: + static char bg_set; + static char bg2_set; + static char fg_set; + +public: + virtual float scale(int n) {return 1;} + virtual void scale(int n, float f) { } + static Fl_Screen_Driver *newScreenDriver(); + // --- display management + virtual void display(const char *disp); + virtual int visual(int flags); + // --- screen configuration + virtual void init() {} + virtual int x() { return 0; } + virtual int y() { return 0; } + virtual int w() { return 800; } // default, override in driver! + virtual int h() { return 600; } // default, override in driver! + virtual int screen_count(); + void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my); + virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n) { X=0; Y=0; W=800; H=600; } + void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh); + virtual int screen_num(int x, int y); + virtual int screen_num(int x, int y, int w, int h); + virtual void screen_dpi(float &h, float &v, int n=0) { h=72; v=72; } // override in driver! + void screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my); + virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n) { screen_xywh(X, Y, W, H, n); } + // --- audible output + virtual void beep(int type) { } + // --- global events + virtual void flush() { } // must override + virtual double wait(double time_to_wait) { return 0.0; } // must override + virtual int ready() { return 0; } // must override + virtual void grab(Fl_Window* win) { } + // --- global colors + /* the default implementation of parse_color() may be enough */ + virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b); + virtual void get_system_colors() { } + virtual const char *get_system_scheme(); + // --- global timers + virtual void add_timeout(double time, Fl_Timeout_Handler cb, void *argp) { } + virtual void repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp) { } + virtual int has_timeout(Fl_Timeout_Handler cb, void *argp) { return 0; } + virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp) { } + + static int secret_input_character; + /* Implement to indicate whether complex text input may involve marked text. + When it does, has_marked_text returns non zero and reset_marked_text() and + insertion_point_location() must also be implemented. + */ + virtual int has_marked_text() { return 0; } + virtual void reset_marked_text() {} + virtual void insertion_point_location(int x, int y, int height) {} + // implement so text-editing widgets support dead keys + virtual int compose(int &del) {del = 0; return 0;} + // default implementation may be enough + virtual void compose_reset(); + // implement to support drag-n-drop. use_selection = 1 means the GUI is welcome to display + // the selected text during the D&D operation + virtual int dnd(int use_selection = 0) {return 0;} + // null means no platform-specific key bindings for Fl_Text_Editor + Fl_Text_Editor::Key_Binding *text_editor_extra_key_bindings; + // default implementation may be enough + virtual int text_display_can_leak() { return 0; } + + // if no keyboard is connected on a touch or pen device, the system on-screen keyboard is requested + virtual void request_keyboard() { } + // we no longer need the on-screen keyboard; it's up to the system to hide it + virtual void release_keyboard() { } + + // read raw image from a window or an offscreen buffer + /* Member function read_win_rectangle() supports the public function + fl_read_image() which captures pixel data either from + the current window or from an offscreen buffer. + + With fl_read_image() and for capture from a window, the returned pixel array + also contains data from any embedded sub-window. + + In the case of read_win_rectangle() and for capture from a window, only data + from the current window is collected. + + A platform may also use its read_win_rectangle() implementation to capture + window decorations (e.g., title bar). In that case, it is called by + Fl_XXX_Window_Driver::capture_titlebar_and_borders(). + */ + virtual Fl_RGB_Image *read_win_rectangle(int X, int Y, int w, int h) {return NULL;} + static void write_image_inside(Fl_RGB_Image *to, Fl_RGB_Image *from, int to_x, int to_y); + static Fl_RGB_Image *traverse_to_gl_subwindows(Fl_Group *g, int x, int y, int w, int h, + Fl_RGB_Image *full_img); + // optional platform-specific key handling for Fl_Input widget + // the default implementation may be enough + virtual int input_widget_handle_key(int key, unsigned mods, unsigned shift, Fl_Input *input); + // implement to support Fl::get_mouse() + virtual int get_mouse(int &x, int &y) {return 0;} + // optional methods to enable/disable input methods for complex scripts + virtual void enable_im() {} + virtual void disable_im() {} + // calls open_display_platform() and then does platform-independent work + void open_display(); + // implement to open access to the display + virtual void open_display_platform() {} + // optional method to close display access + virtual void close_display() {} + // compute dimensions of an Fl_Offscreen + virtual void offscreen_size(Fl_Offscreen off, int &width, int &height) {} + + void rescale_all_windows_from_screen(int screen, float f); + static void transient_scale_display(float f, int nscreen); + static int scale_handler(int event); + virtual void init_workarea() {} + virtual float desktop_scale_factor() {return 1;} + float use_startup_scale_factor(); + enum APP_SCALING_CAPABILITY { + NO_APP_SCALING = 0, ///< The platform does not support rescaling. + SYSTEMWIDE_APP_SCALING, ///< The platform supports rescaling with the same factor for all screens. + PER_SCREEN_APP_SCALING ///< The platform supports rescaling with one factor for each screen. + }; + /** Returns the platform's support for rescaling the application with ctrl-/+/-/0/ keys. + */ + virtual APP_SCALING_CAPABILITY rescalable() { return NO_APP_SCALING; } + /* Number of pixels per drawing unit for the display. + The default implementation may be enough. */ + virtual float retina_factor() { return 1; } +}; + + +#endif // !FL_SCREEN_DRIVER_H + +/** + \} + \endcond + */ + +// +// End of "$Id$". +// diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx index 713732395..d04db7094 100644 --- a/src/Fl_Screen_Driver.cxx +++ b/src/Fl_Screen_Driver.cxx @@ -22,7 +22,7 @@ \{ */ -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_Image.H> #include <FL/Fl.H> #include <FL/platform.H> // for fl_window diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 0091e892e..cc0c10c98 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -31,7 +31,7 @@ #include <FL/Fl_Text_Buffer.H> #include <FL/Fl_Text_Display.H> #include <FL/Fl_Window.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #undef min #undef max diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx index 5c03b4282..bf1728377 100644 --- a/src/Fl_Text_Editor.cxx +++ b/src/Fl_Text_Editor.cxx @@ -24,7 +24,7 @@ #include <FL/Fl.H> #include <FL/Fl_Window.H> #include <FL/Fl_Text_Editor.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/fl_ask.H> /* Keyboard Control Matrix diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx index 431ef73b6..91a5dcfb1 100644 --- a/src/Fl_Widget_Surface.cxx +++ b/src/Fl_Widget_Surface.cxx @@ -21,7 +21,7 @@ #include <FL/Fl.H> #include <FL/platform.H> #include "Fl_Window_Driver.H" -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" /** The constructor. diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 0da6cd4a3..220d265c4 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -38,7 +38,7 @@ extern "C" { #include <FL/Fl.H> #include <FL/platform.H> #include "Fl_Window_Driver.H" -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_Window.H> #include <FL/Fl_Tooltip.H> #include <FL/Fl_Printer.H> diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index 6d4aa9032..b494f3623 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -22,7 +22,7 @@ Utility functions to support text input. */ #include <FL/Fl.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #ifndef FL_DOXYGEN int Fl::compose_state = 0; diff --git a/src/Fl_display.cxx b/src/Fl_display.cxx index 50c9af808..ea622299f 100644 --- a/src/Fl_display.cxx +++ b/src/Fl_display.cxx @@ -20,7 +20,7 @@ // Using setenv makes programs that are exec'd use the same display. #include <FL/Fl.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" /** \brief Sets the X display to use for all windows. diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index bd36c9a4b..fbb9f5915 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -17,7 +17,7 @@ // #include <FL/Fl.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_System_Driver.H> #include <FL/fl_draw.H> #include <FL/platform.H> diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx index f7fc8c904..752ccb08c 100644 --- a/src/Fl_grab.cxx +++ b/src/Fl_grab.cxx @@ -17,7 +17,7 @@ // #include <FL/Fl.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" //////////////////////////////////////////////////////////////// // "Grab" is done while menu systems are up. This has several effects: diff --git a/src/Fl_visual.cxx b/src/Fl_visual.cxx index eaa0f776b..778befcba 100644 --- a/src/Fl_visual.cxx +++ b/src/Fl_visual.cxx @@ -19,7 +19,7 @@ // Set the default visual according to passed switches: #include <FL/Fl.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" /** \fn Fl::visual(int flags) Selects a visual so that your graphics are drawn correctly. This is diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 662713da2..c2549a144 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -55,7 +55,7 @@ void fl_cleanup_dc_list(void); #include <FL/Fl.H> #include <FL/platform.H> #include "Fl_Window_Driver.H" -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H" #include "drivers/WinAPI/Fl_WinAPI_System_Driver.H" diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 85b526358..8230d8bba 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -19,7 +19,7 @@ #include <FL/Fl_Paged_Device.H> #include <FL/Fl_Printer.H> #include "../../Fl_Window_Driver.H" -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" #include "../Quartz/Fl_Quartz_Graphics_Driver.H" #include "../Darwin/Fl_Darwin_System_Driver.H" #include "Fl_Cocoa_Window_Driver.H" diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index 79d5632e8..579081e1f 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -25,7 +25,7 @@ #ifndef FL_COCOA_SCREEN_DRIVER_H #define FL_COCOA_SCREEN_DRIVER_H -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" /* Move everything here that manages the native screen interface. diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 962b9ada5..078800e75 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -22,7 +22,7 @@ #include <FL/Fl.H> #include <FL/platform.H> #include <FL/fl_draw.H> -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" /* * By linking this module, the following static method will instantiate the diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index 27a1f4cc5..302fc7348 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -93,7 +93,7 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, #else -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" #include "../../Fl_Window_Driver.H" Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h) /* captures a rectangle of a Fl_Gl_Window window, and returns it as a RGB image diff --git a/src/drivers/Pico/Fl_Pico_Screen_Driver.H b/src/drivers/Pico/Fl_Pico_Screen_Driver.H index 4d092f6dc..5c4126668 100644 --- a/src/drivers/Pico/Fl_Pico_Screen_Driver.H +++ b/src/drivers/Pico/Fl_Pico_Screen_Driver.H @@ -25,7 +25,7 @@ #ifndef FL_PICO_SCREEN_DRIVER_H #define FL_PICO_SCREEN_DRIVER_H -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" class FL_EXPORT Fl_Pico_Screen_Driver : public Fl_Screen_Driver diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index 6fe3d49e1..1a1f19b7e 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -25,7 +25,7 @@ #ifndef FL_WINAPI_SCREEN_DRIVER_H #define FL_WINAPI_SCREEN_DRIVER_H -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" #include <windows.h> class Fl_Window; diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H index 78a0510a5..83aecd708 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.H +++ b/src/drivers/X11/Fl_X11_Screen_Driver.H @@ -25,7 +25,7 @@ #ifndef FL_X11_SCREEN_DRIVER_H #define FL_X11_SCREEN_DRIVER_H -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" class Fl_Window; diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index fc64ee645..cef1c9201 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -22,7 +22,7 @@ #include "Fl_X11_Screen_Driver.H" #include "../Xlib/Fl_Xlib_Graphics_Driver.H" -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" #include <FL/Fl_Overlay_Window.H> #include <FL/Fl_Menu_Window.H> #include <FL/Fl_Tooltip.H> diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx index 65284514a..1c9e9e6cb 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx @@ -53,7 +53,7 @@ # include <FL/fl_draw.H> # include <FL/platform.H> # include <FL/Fl_Image_Surface.H> -# include <FL/Fl_Screen_Driver.H> +# include "../../Fl_Screen_Driver.H" # include "../../Fl_XColor.H" # include "../../flstring.h" #if HAVE_XRENDER diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index a31dc8d5f..d27fb03f3 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -18,7 +18,7 @@ #include "Fl_Xlib_Graphics_Driver.H" #include <FL/Fl_Image_Surface.H> -#include <FL/Fl_Screen_Driver.H> +#include "../../Fl_Screen_Driver.H" class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver { virtual void end_current_(); diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx index 0eeb33660..205efee24 100644 --- a/src/fl_ask.cxx +++ b/src/fl_ask.cxx @@ -41,7 +41,7 @@ #include <FL/Fl_Input.H> #include <FL/Fl_Secret_Input.H> #include <FL/platform.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/fl_draw.H> static Fl_Window *message_form; diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx index 267fa58ae..6adfce286 100644 --- a/src/fl_overlay.cxx +++ b/src/fl_overlay.cxx @@ -35,7 +35,7 @@ static int px,py,pw,ph; #ifndef USE_XOR #include <stdlib.h> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <FL/Fl_RGB_Image.H> static Fl_RGB_Image *s_bgN = 0, *s_bgS = 0, *s_bgE = 0, *s_bgW = 0; diff --git a/src/fl_read_image.cxx b/src/fl_read_image.cxx index 061ccc446..522d085c3 100644 --- a/src/fl_read_image.cxx +++ b/src/fl_read_image.cxx @@ -18,7 +18,7 @@ #include <FL/Fl.H> #include <FL/platform.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" /** Reads an RGB(A) image from the current window or off-screen buffer. diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx index d3569c8f1..41a42ad33 100644 --- a/src/fl_set_font.cxx +++ b/src/fl_set_font.cxx @@ -22,7 +22,7 @@ #include <FL/Fl.H> #include <FL/platform.H> #include <FL/fl_draw.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include "flstring.h" #include <stdlib.h> diff --git a/src/glut_compatibility.cxx b/src/glut_compatibility.cxx index 8cb268a7d..38312f5d5 100644 --- a/src/glut_compatibility.cxx +++ b/src/glut_compatibility.cxx @@ -29,7 +29,7 @@ #include "flstring.h" #if HAVE_GL # include <FL/Fl_Gl_Window_Driver.H> -# include <FL/Fl_Screen_Driver.H> +# include "Fl_Screen_Driver.H" # include <FL/glut.H> # define MAXWINDOWS 32 diff --git a/src/makedepend b/src/makedepend index b7e409ec8..704e95297 100644 --- a/src/makedepend +++ b/src/makedepend @@ -4,7 +4,7 @@ Fl.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H Fl.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H Fl.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h Fl.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H -Fl.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H +Fl.o: Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H Fl.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H Fl.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H @@ -190,7 +190,7 @@ Fl_Graphics_Driver.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H Fl_Graphics_Driver.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H Fl_Graphics_Driver.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Bitmap.H Fl_Graphics_Driver.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H -Fl_Graphics_Driver.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h +Fl_Graphics_Driver.o: Fl_Screen_Driver.H ../FL/fl_types.h Fl_Graphics_Driver.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Graphics_Driver.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Group.H Fl_Graphics_Driver.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H @@ -241,7 +241,7 @@ Fl_Input.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H Fl_Input.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window.H Fl_Input.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_Input.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_System_Driver.H -Fl_Input.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/Fl_Screen_Driver.H +Fl_Input.o: ../FL/filename.H ../FL/Fl_Preferences.H Fl_Screen_Driver.H Fl_Input.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H Fl_Input.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H Fl_Input.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H @@ -256,7 +256,7 @@ Fl_Input_.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_Input_.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_Input_.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Input_.H Fl_Input_.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Input_.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Screen_Driver.H +Fl_Input_.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H Fl_Screen_Driver.H Fl_Input_.o: ../FL/fl_types.h ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Input_.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H Fl_Input_.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H @@ -407,7 +407,7 @@ Fl_Round_Button.o: ../FL/Enumerations.H ../FL/abi-version.h Fl_Round_Button.o: ../FL/Fl_Round_Button.H ../FL/Fl_Light_Button.H Fl_Round_Button.o: ../FL/Fl_Button.H ../FL/Fl_Radio_Round_Button.H Fl_Round_Button.o: ../FL/Fl_Round_Button.H -Fl_Screen_Driver.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl.H +Fl_Screen_Driver.o: Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl.H Fl_Screen_Driver.o: ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h Fl_Screen_Driver.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H Fl_Screen_Driver.o: ../FL/abi-version.h ../FL/Fl_Text_Editor.H @@ -514,7 +514,7 @@ Fl_Text_Display.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H Fl_Text_Display.o: ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H Fl_Text_Display.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H Fl_Text_Display.o: ../FL/Fl_Window.H ../FL/Fl_Group.H -Fl_Text_Display.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H +Fl_Text_Display.o: Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H Fl_Text_Display.o: ../FL/Fl_Text_Display.H Fl_Text_Editor.o: flstring.h ../FL/Fl_Export.H ../config.h ../FL/Fl.H Fl_Text_Editor.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H @@ -527,7 +527,7 @@ Fl_Text_Editor.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H Fl_Text_Editor.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H Fl_Text_Editor.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H -Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Screen_Driver.H +Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H Fl_Screen_Driver.H Fl_Text_Editor.o: ../FL/fl_types.h ../FL/fl_ask.H Fl_Tile.o: ../FL/Fl_Tile.H ../FL/Fl_Group.H ../FL/Fl_Widget.H Fl_Tile.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Export.H @@ -610,7 +610,7 @@ Fl_Widget_Surface.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H Fl_Widget_Surface.o: ../FL/fl_draw.H ../FL/platform.H ../FL/fl_types.h Fl_Widget_Surface.o: ../FL/Enumerations.H Fl_Window_Driver.H Fl_Widget_Surface.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H -Fl_Widget_Surface.o: ../FL/Fl_Window.H ../FL/Fl_Screen_Driver.H +Fl_Widget_Surface.o: ../FL/Fl_Window.H Fl_Screen_Driver.H Fl_Widget_Surface.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_Widget_Surface.o: ../FL/fl_draw.H ../FL/Fl_Graphics_Driver.H Fl_Widget_Surface.o: ../FL/Fl_Image.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H @@ -689,7 +689,7 @@ Fl_arg.o: ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h ../config.h Fl_compose.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_compose.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_compose.o: ../FL/Enumerations.H ../FL/abi-version.h -Fl_compose.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h +Fl_compose.o: Fl_Screen_Driver.H ../FL/fl_types.h Fl_compose.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H Fl_compose.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H Fl_compose.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H @@ -700,7 +700,7 @@ Fl_compose.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H Fl_display.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_display.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_display.o: ../FL/Enumerations.H ../FL/abi-version.h -Fl_display.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h +Fl_display.o: Fl_Screen_Driver.H ../FL/fl_types.h Fl_display.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H Fl_display.o: ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H Fl_display.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H @@ -711,7 +711,7 @@ Fl_display.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H Fl_get_system_colors.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_get_system_colors.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_get_system_colors.o: ../FL/Enumerations.H ../FL/abi-version.h -Fl_get_system_colors.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h +Fl_get_system_colors.o: Fl_Screen_Driver.H ../FL/fl_types.h Fl_get_system_colors.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_get_system_colors.o: ../FL/fl_draw.H ../FL/Enumerations.H Fl_get_system_colors.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H @@ -728,7 +728,7 @@ Fl_get_system_colors.o: flstring.h ../config.h ../FL/Fl_Tiled_Image.H Fl_get_system_colors.o: tile.xpm Fl_grab.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_grab.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h -Fl_grab.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Screen_Driver.H +Fl_grab.o: ../FL/Enumerations.H ../FL/abi-version.h Fl_Screen_Driver.H Fl_grab.o: ../FL/fl_types.h ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H Fl_grab.o: ../FL/fl_draw.H ../FL/Enumerations.H ../FL/Fl_Graphics_Driver.H Fl_grab.o: ../FL/Fl_Device.H ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H @@ -751,7 +751,7 @@ Fl_own_colormap.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_visual.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h Fl_visual.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h Fl_visual.o: ../FL/Enumerations.H ../FL/abi-version.h -Fl_visual.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl_Text_Editor.H +Fl_visual.o: Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl_Text_Editor.H Fl_visual.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H Fl_visual.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H Fl_visual.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Widget.H @@ -793,7 +793,7 @@ fl_ask.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H fl_ask.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H fl_ask.o: ../FL/Fl_Image.H ../FL/Fl_Input.H ../FL/Fl_Input_.H fl_ask.o: ../FL/Fl_Secret_Input.H ../FL/Fl_Input.H ../FL/platform.H -fl_ask.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Screen_Driver.H +fl_ask.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Screen_Driver.H fl_ask.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_ask.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H fl_ask.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H @@ -891,7 +891,7 @@ fl_oval_box.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_oval_box.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/fl_draw.H fl_overlay.o: ../FL/platform.H ../FL/Fl_Export.H ../FL/platform_types.h fl_overlay.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H -fl_overlay.o: ../FL/Fl_Screen_Driver.H ../FL/Fl.H ../FL/fl_utf8.h +fl_overlay.o: Fl_Screen_Driver.H ../FL/Fl.H ../FL/fl_utf8.h fl_overlay.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H fl_overlay.o: ../FL/abi-version.h ../FL/Fl_Text_Editor.H fl_overlay.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H @@ -909,7 +909,7 @@ fl_read_image.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_read_image.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_read_image.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H fl_read_image.o: ../FL/fl_types.h ../FL/Enumerations.H -fl_read_image.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H +fl_read_image.o: Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H fl_read_image.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_read_image.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H fl_read_image.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H @@ -934,7 +934,7 @@ fl_set_font.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h fl_set_font.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h fl_set_font.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H fl_set_font.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/fl_draw.H -fl_set_font.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H +fl_set_font.o: Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H fl_set_font.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_set_font.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H fl_set_font.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Widget.H @@ -977,7 +977,7 @@ fl_vertex.o: ../FL/fl_utf8.h ../FL/math.h screen_xywh.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h screen_xywh.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h screen_xywh.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H -screen_xywh.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Screen_Driver.H +screen_xywh.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Screen_Driver.H screen_xywh.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H screen_xywh.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H screen_xywh.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Widget.H @@ -1117,7 +1117,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Export.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/X11/Fl_X11_Screen_Driver.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Screen_Driver.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_Screen_Driver.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl.H ../FL/fl_utf8.h drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Editor.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Display.H @@ -1235,7 +1235,7 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Image.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Pixmap.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H -drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Screen_Driver.H +drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: Fl_Screen_Driver.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Text_Editor.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Text_Display.H drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/fl_draw.H ../FL/Fl_Group.H @@ -1269,7 +1269,7 @@ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Widget_Surface.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Window.H ../FL/Fl.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Group.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Shared_Image.H -drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Screen_Driver.H +drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: Fl_Screen_Driver.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Text_Editor.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Text_Display.H drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_draw.H ../FL/Fl_Group.H @@ -1292,7 +1292,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Double_Window.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Window.H ../FL/platform.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H drivers/X11/Fl_X11_Window_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H -drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Screen_Driver.H +drivers/X11/Fl_X11_Window_Driver.o: Fl_Screen_Driver.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Editor.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Graphics_Driver.H @@ -1309,7 +1309,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_draw.H ../FL/fl_ask.H drivers/X11/Fl_X11_Screen_Driver.o: config_lib.h ../config.h drivers/X11/Fl_X11_Screen_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H -drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h +drivers/X11/Fl_X11_Screen_Driver.o: Fl_Screen_Driver.H ../FL/fl_types.h drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl.H ../FL/Fl_Export.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/platform_types.h ../FL/fl_utf8.h drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Export.H ../FL/fl_types.h @@ -1410,7 +1410,7 @@ Fl_x.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H ../FL/fl_draw.H Fl_x.o: ../FL/Fl_Paged_Device.H ../FL/Fl_Widget_Surface.H ../FL/Fl_Device.H Fl_x.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Shared_Image.H Fl_x.o: ../FL/fl_ask.H ../FL/filename.H flstring.h -Fl_x.o: drivers/X11/Fl_X11_Screen_Driver.H ../FL/Fl_Screen_Driver.H +Fl_x.o: drivers/X11/Fl_X11_Screen_Driver.H Fl_Screen_Driver.H Fl_x.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H Fl_x.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H Fl_x.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H @@ -1424,7 +1424,7 @@ fl_dnd_x.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Window.H fl_dnd_x.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H fl_dnd_x.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/platform.H ../FL/fl_types.h fl_dnd_x.o: ../FL/Enumerations.H flstring.h ../config.h -fl_dnd_x.o: drivers/X11/Fl_X11_Screen_Driver.H ../FL/Fl_Screen_Driver.H +fl_dnd_x.o: drivers/X11/Fl_X11_Screen_Driver.H Fl_Screen_Driver.H fl_dnd_x.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H fl_dnd_x.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H fl_dnd_x.o: ../FL/Fl_Preferences.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H @@ -1672,7 +1672,7 @@ Fl_Gl_Window.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H Fl_Gl_Window.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/fl_utf8.h Fl_Gl_Window.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H ../FL/platform.H Fl_Gl_Window.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Gl_Choice.H -Fl_Gl_Window.o: ../FL/Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H +Fl_Gl_Window.o: Fl_Screen_Driver.H ../FL/Fl_Text_Editor.H Fl_Gl_Window.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Fl_Group.H Fl_Gl_Window.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H Fl_Gl_Window.o: ../FL/Fl_Text_Buffer.H @@ -1716,7 +1716,7 @@ gl_start.o: ../FL/Fl_Gl_Window_Driver.H ../FL/platform.H ../FL/fl_types.h gl_start.o: ../FL/Enumerations.H Fl_Gl_Choice.H glut_compatibility.o: flstring.h ../FL/Fl_Export.H ../config.h glut_compatibility.o: ../FL/Fl_Gl_Window_Driver.H ../FL/Fl_Gl_Window.H -glut_compatibility.o: ../FL/Fl_Window.H ../FL/Fl_Screen_Driver.H +glut_compatibility.o: ../FL/Fl_Window.H Fl_Screen_Driver.H glut_compatibility.o: ../FL/fl_types.h ../FL/Fl.H ../FL/platform_types.h glut_compatibility.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h glut_compatibility.o: ../FL/Enumerations.H ../FL/abi-version.h @@ -1752,7 +1752,7 @@ drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Pixmap.H drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_RGB_Image.H drivers/OpenGL/Fl_OpenGL_Display_Device.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H -drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Screen_Driver.H +drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Screen_Driver.H drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_types.h ../FL/Fl.H drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Export.H ../FL/fl_utf8.h drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Text_Editor.H @@ -1961,7 +1961,7 @@ Fl_SVG_Image.o: ../config.h ../FL/Fl_SVG_Image.H ../FL/Fl_Image.H Fl_SVG_Image.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Export.H Fl_SVG_Image.o: ../FL/fl_types.h ../FL/platform_types.h ../FL/Fl_Widget.H Fl_SVG_Image.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/fl_draw.H -Fl_SVG_Image.o: ../FL/Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl.H +Fl_SVG_Image.o: Fl_Screen_Driver.H ../FL/fl_types.h ../FL/Fl.H Fl_SVG_Image.o: ../FL/Fl_Export.H ../FL/fl_utf8.h ../FL/Fl_Text_Editor.H Fl_SVG_Image.o: ../FL/Fl_Text_Display.H ../FL/fl_draw.H ../FL/Enumerations.H Fl_SVG_Image.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H diff --git a/src/screen_xywh.cxx b/src/screen_xywh.cxx index 607f6df52..468e1064b 100644 --- a/src/screen_xywh.cxx +++ b/src/screen_xywh.cxx @@ -18,7 +18,7 @@ #include <FL/Fl.H> #include <FL/platform.H> -#include <FL/Fl_Screen_Driver.H> +#include "Fl_Screen_Driver.H" #include <config.h> |