summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.H (renamed from src/drivers/SDL/Fl_SDL_Copy_Surface.cxx)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.cxx (renamed from src/drivers/SDL/Fl_SDL_Graphics_Driver.H)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.H (renamed from src/drivers/SDL/Fl_SDL_Graphics_Driver.cxx)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx (renamed from src/drivers/SDL/Fl_SDL_Image_Surface.cxx)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.H (renamed from src/drivers/SDL/Fl_SDL_Image_Surface.H)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.cxx (renamed from src/drivers/SDL/Fl_SDL_System_Driver.H)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.H (renamed from src/drivers/SDL/Fl_SDL_Screen_Driver.H)18
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx (renamed from src/drivers/SDL/Fl_SDL_Screen_Driver.cxx)21
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.H (renamed from src/drivers/SDL/Fl_SDL_System_Driver.cxx)0
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx1
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H (renamed from src/drivers/SDL/Fl_SDL_Window_Driver.H)16
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx (renamed from src/drivers/SDL/Fl_SDL_Window_Driver.cxx)12
-rw-r--r--src/drivers/SDL/Fl_SDL_Copy_Surface.H15
13 files changed, 36 insertions, 47 deletions
diff --git a/src/drivers/SDL/Fl_SDL_Copy_Surface.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.H
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_Copy_Surface.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.H
diff --git a/src/drivers/SDL/Fl_SDL_Graphics_Driver.H b/src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.cxx
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_Graphics_Driver.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.cxx
diff --git a/src/drivers/SDL/Fl_SDL_Graphics_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.H
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_Graphics_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.H
diff --git a/src/drivers/SDL/Fl_SDL_Image_Surface.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_Image_Surface.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
diff --git a/src/drivers/SDL/Fl_SDL_Image_Surface.H b/src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.H
index 05202afdd..05202afdd 100644
--- a/src/drivers/SDL/Fl_SDL_Image_Surface.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.H
diff --git a/src/drivers/SDL/Fl_SDL_System_Driver.H b/src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.cxx
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_System_Driver.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Image_Surface.cxx
diff --git a/src/drivers/SDL/Fl_SDL_Screen_Driver.H b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.H
index ef2c3b1da..6025685f0 100644
--- a/src/drivers/SDL/Fl_SDL_Screen_Driver.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_SDL_Screen_Driver.H 11017 2016-01-20 21:40:12Z matt $"
+// "$Id: Fl_PicoSDL_Screen_Driver.H 11017 2016-01-20 21:40:12Z matt $"
//
// Definition of SDL Screen interface based on Pico
// for the Fast Light Tool Kit (FLTK).
@@ -18,27 +18,27 @@
//
/**
- \file Fl_SDL_Screen_Driver.H
+ \file Fl_PicoSDL_Screen_Driver.H
\brief Definition of SDL Screen interface based on Pico.
*/
-#ifndef FL_SDL_SCREEN_DRIVER_H
-#define FL_SDL_SCREEN_DRIVER_H
+#ifndef FL_PICOSDL_SCREEN_DRIVER_H
+#define FL_PICOSDL_SCREEN_DRIVER_H
#include "../Pico/Fl_Pico_Screen_Driver.H"
-class FL_EXPORT Fl_SDL_Screen_Driver : public Fl_Pico_Screen_Driver
+class FL_EXPORT Fl_PicoSDL_Screen_Driver : public Fl_Pico_Screen_Driver
{
public:
- Fl_SDL_Screen_Driver();
- virtual ~Fl_SDL_Screen_Driver();
+ Fl_PicoSDL_Screen_Driver();
+ virtual ~Fl_PicoSDL_Screen_Driver();
virtual double wait(double time_to_wait);
};
-#endif // FL_SDL_SCREEN_DRIVER_H
+#endif // FL_PICOSDL_SCREEN_DRIVER_H
//
-// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $".
+// End of "$Id: Fl_PicoSDL_Screen_Driver.H 11017 2016-01-20 21:40:12Z matt $".
//
diff --git a/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
index d9d39eeae..f0bdf91e2 100644
--- a/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_SDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+// "$Id: Fl_PicoSDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
//
// Definition of SDL Screen interface based on Pico
//
@@ -18,7 +18,7 @@
#include "../../config_lib.h"
-#include "Fl_SDL_Screen_Driver.H"
+#include "Fl_PicoSDL_Screen_Driver.H"
#include <FL/Fl_Window_Driver.H>
@@ -29,20 +29,20 @@
Fl_Screen_Driver* Fl_Screen_Driver::newScreenDriver()
{
- return new Fl_SDL_Screen_Driver();
+ return new Fl_PicoSDL_Screen_Driver();
}
-Fl_SDL_Screen_Driver::Fl_SDL_Screen_Driver()
+Fl_PicoSDL_Screen_Driver::Fl_PicoSDL_Screen_Driver()
{
}
-Fl_SDL_Screen_Driver::~Fl_SDL_Screen_Driver()
+Fl_PicoSDL_Screen_Driver::~Fl_PicoSDL_Screen_Driver()
{
}
-double Fl_SDL_Screen_Driver::wait(double time_to_wait)
+double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait)
{
SDL_Event e;
if (SDL_PollEvent(&e)) {
@@ -58,6 +58,7 @@ double Fl_SDL_Screen_Driver::wait(double time_to_wait)
#include <FL/x.H>
#include <FL/Fl.H>
+#include <FL/Fl_Image_Surface.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Graphics_Driver.H>
@@ -128,9 +129,9 @@ Fl_X* Fl_X::make(Fl_Window *w)
x->w = w;
x->region = 0;
if (!w->force_position()) {
- x->xid = SDL_CreateWindow(w->label(), w->x(), w->y(), w->w(), w->h(), 0);
+ x->xid = SDL_CreateWindow(w->label(), SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w->w(), w->h(), 0);
} else {
- x->xid = SDL_CreateWindow(w->label(), 100, 100, w->w(), w->h(), 0);
+ x->xid = SDL_CreateWindow(w->label(), w->x(), w->y(), w->w(), w->h(), 0);
}
x->next = Fl_X::first;
Fl_X::first = x;
@@ -142,6 +143,8 @@ void Fl_Window::resize(int, int, int, int) { }
Fl_Window *Fl_Window::current_;
char fl_show_iconic;
Window fl_window;
+void Fl_Image_Surface::translate(int x, int y) { }
+void Fl_Image_Surface::untranslate() { }
/*
#define __APPLE__
@@ -188,6 +191,6 @@ Window fl_window;
//
-// End of "$Id: Fl_SDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
+// End of "$Id: Fl_PicoSDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
//
diff --git a/src/drivers/SDL/Fl_SDL_System_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.H
index 8b1378917..8b1378917 100644
--- a/src/drivers/SDL/Fl_SDL_System_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.H
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
@@ -0,0 +1 @@
+
diff --git a/src/drivers/SDL/Fl_SDL_Window_Driver.H b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H
index 740616a64..6246211a9 100644
--- a/src/drivers/SDL/Fl_SDL_Window_Driver.H
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_SDL_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $"
+// "$Id: Fl_PicoSDL_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $"
//
// Definition of SDL Window interface
// for the Fast Light Tool Kit (FLTK).
@@ -22,22 +22,22 @@
\brief Definition of SDL Window interface.
*/
-#ifndef FL_SDL_WINDOW_DRIVER_H
-#define FL_SDL_WINDOW_DRIVER_H
+#ifndef FL_PICOSDL_WINDOW_DRIVER_H
+#define FL_PICOSDL_WINDOW_DRIVER_H
#include "../Pico/Fl_Pico_Window_Driver.H"
-class FL_EXPORT Fl_SDL_Window_Driver : public Fl_Pico_Window_Driver
+class FL_EXPORT Fl_PicoSDL_Window_Driver : public Fl_Pico_Window_Driver
{
public:
- Fl_SDL_Window_Driver(Fl_Window *win);
- virtual ~Fl_SDL_Window_Driver();
+ Fl_PicoSDL_Window_Driver(Fl_Window *win);
+ virtual ~Fl_PicoSDL_Window_Driver();
};
-#endif // FL_SDL_WINDOW_DRIVER_H
+#endif // FL_PICOSDL_WINDOW_DRIVER_H
//
-// End of "$Id: Fl_SDL_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $".
+// End of "$Id: Fl_PicoSDL_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $".
//
diff --git a/src/drivers/SDL/Fl_SDL_Window_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx
index b251ad2c2..60b9bb383 100644
--- a/src/drivers/SDL/Fl_SDL_Window_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_SDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+// "$Id: Fl_PicoSDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
//
// Definition of SDL Window interface based on SDL
//
@@ -18,26 +18,26 @@
#include "../../config_lib.h"
-#include "Fl_SDL_Window_Driver.H"
+#include "Fl_PicoSDL_Window_Driver.H"
Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *win)
{
- return new Fl_SDL_Window_Driver(win);
+ return new Fl_PicoSDL_Window_Driver(win);
}
-Fl_SDL_Window_Driver::Fl_SDL_Window_Driver(Fl_Window *win)
+Fl_PicoSDL_Window_Driver::Fl_PicoSDL_Window_Driver(Fl_Window *win)
: Fl_Pico_Window_Driver(win)
{
}
-Fl_SDL_Window_Driver::~Fl_SDL_Window_Driver()
+Fl_PicoSDL_Window_Driver::~Fl_PicoSDL_Window_Driver()
{
}
//
-// End of "$Id: Fl_SDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
+// End of "$Id: Fl_PicoSDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
// \ No newline at end of file
diff --git a/src/drivers/SDL/Fl_SDL_Copy_Surface.H b/src/drivers/SDL/Fl_SDL_Copy_Surface.H
deleted file mode 100644
index 9b3742023..000000000
--- a/src/drivers/SDL/Fl_SDL_Copy_Surface.H
+++ /dev/null
@@ -1,15 +0,0 @@
-class Fl_Copy_Surface::Helper : public Fl_Widget_Surface { // class model
- friend class Fl_Copy_Surface;
-private:
- int width;
- int height;
- Helper(int w, int h) : Fl_Widget_Surface(NULL), width(w), height(h) {} // to implement
- ~Helper() {} // to implement
- void set_current(){} // to implement
- void translate(int x, int y) {} // to implement
- void untranslate() {} // to implement
- int w() {return width;}
- int h() {return height;}
- int printable_rect(int *w, int *h) {*w = width; *h = height; return 0;}
-};
-
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 17:20:07 +0000