diff options
| author | Manolo Gouy <Manolo> | 2016-02-26 16:12:43 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-02-26 16:12:43 +0000 |
| commit | 6287426b65e297bb27ab31aa9fba53b92a048451 (patch) | |
| tree | 6c6fd8fdde76bbbccad955ca09b294f653b2da91 /src/drivers/X11 | |
| parent | df18e581af1f96e37668df753305e55511d3e941 (diff) | |
Rename all remaining src/drivers/XXX.h to XXX.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11226 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/X11')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.h | 78 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.H | 58 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_Window_Driver.cxx | 2 |
4 files changed, 60 insertions, 80 deletions
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index 9afe4dda3..6cf07e380 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -18,7 +18,7 @@ #include "../../config_lib.h" -#include "Fl_X11_Screen_Driver.h" +#include "Fl_X11_Screen_Driver.H" #include <FL/Fl.H> #include <FL/x.H> #include <FL/fl_ask.H> diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.h b/src/drivers/X11/Fl_X11_Screen_Driver.h deleted file mode 100644 index dc62e246a..000000000 --- a/src/drivers/X11/Fl_X11_Screen_Driver.h +++ /dev/null @@ -1,78 +0,0 @@ -// -// "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $" -// -// Definition of X11 Screen interface -// for the Fast Light Tool Kit (FLTK). -// -// Copyright 2010-2016 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 -// - -/** - \file Fl_X11_Screen_Driver.h - \brief Definition of X11 Screen interface - */ - -#ifndef FL_X11_SCREEN_DRIVER_H -#define FL_X11_SCREEN_DRIVER_H - -#include <FL/Fl_Screen_Driver.H> - - -class Fl_Window; - - -class FL_EXPORT Fl_X11_Screen_Driver : public Fl_Screen_Driver -{ -protected: - typedef struct { - short x_org; - short y_org; - short width; - short height; - } FLScreenInfo; - FLScreenInfo screens[MAX_SCREENS]; - float dpi[MAX_SCREENS][2]; - -public: - // --- display management - virtual void display(const char *disp); - virtual int visual(int flags); - // --- screen configuration - void init_workarea(); - virtual void init(); - virtual int x(); - virtual int y(); - virtual int w(); - virtual int h(); - virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); - virtual void screen_dpi(float &h, float &v, int n=0); - virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); - // --- audible output - virtual void beep(int type); - // --- global events - virtual void flush(); - virtual double wait(double time_to_wait); - virtual int ready(); - virtual void grab(Fl_Window* win); - // --- global colors - virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b); - virtual void get_system_colors(); - virtual const char *get_system_scheme(); -}; - - -#endif // FL_X11_SCREEN_DRIVER_H - -// -// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $". -// diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H new file mode 100644 index 000000000..36c5b67cb --- /dev/null +++ b/src/drivers/X11/Fl_X11_Window_Driver.H @@ -0,0 +1,58 @@ +// +// "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $" +// +// Definition of X11 window driver +// for the Fast Light Tool Kit (FLTK). +// +// Copyright 2010-2016 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 +// + +/** + \file Fl_X11_Window_Driver.H + \brief Definition of X11 window driver. + */ + +#ifndef FL_X11_WINDOW_DRIVER_H +#define FL_X11_WINDOW_DRIVER_H + +#include <FL/Fl_Window_Driver.H> + +/* + Move everything here that manages the native window interface. + + There is one window driver for each Fl_Window. Window drivers manage window + actions such as resizing, events, decoration, fullscreen modes, etc. . All + drawing and rendering is managed by the Surface device and the associated + graphics driver. + + - window specific event handling + - window types and styles, depth, etc. + - decorations + + ? where do we handle the interface between OpenGL/DirectX and Cocoa/WIN32/Glx? + */ + +class FL_EXPORT Fl_X11_Window_Driver : public Fl_Window_Driver +{ +public: + Fl_X11_Window_Driver(Fl_Window*); + virtual void take_focus(); +}; + + + +#endif // FL_X11_WINDOW_DRIVER_H + +// +// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $". +// diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index e145d99c6..0da90b246 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -18,7 +18,7 @@ #include "../../config_lib.h" -#include "Fl_X11_Window_Driver.h" +#include "Fl_X11_Window_Driver.H" Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *w) |
