Made Pico/SDL setup compile and run some minimal code.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11274 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

11 files changed, 618 insertions, 2 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index de548cf13..b4a105db0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -397,7 +397,7 @@ if(USE_X11)
 endif(USE_X11)
 
 if (USE_SDL)
-   target_link_libraries(fltk ${SDL2_LIBRARIES})
+   target_link_libraries(fltk ${SDL2_LIBRARY})
 endif(USE_SDL)
 
 if(WIN32)
@@ -480,7 +480,7 @@ if(USE_X11)
 endif(USE_X11)
 
 if (USE_SDL)
-   target_link_libraries(fltk ${SDL2_LIBRARIES})
+   target_link_libraries(fltk ${SDL2_LIBRARY})
 endif(USE_SDL)
 
 if(WIN32)
diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx
index 7a2b9bca5..e61d74346 100644
--- a/src/Fl_Device.cxx
+++ b/src/Fl_Device.cxx
@@ -63,6 +63,11 @@ void Fl_Surface_Device::set_current(void)
 Fl_Surface_Device* Fl_Surface_Device::_surface; // the current target surface of graphics operations
 
 
+Fl_Surface_Device::~Fl_Surface_Device()
+{
+}
+
+
 /**  A constructor that sets the graphics driver used by the display */
 Fl_Display_Device::Fl_Display_Device(Fl_Graphics_Driver *graphics_driver) : Fl_Surface_Device(graphics_driver) {
   this->set_current();
diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx
index 207205c25..8f792565f 100644
--- a/src/Fl_Widget_Surface.cxx
+++ b/src/Fl_Widget_Surface.cxx
@@ -107,6 +107,10 @@ void Fl_Widget_Surface::traverse(Fl_Widget *widget)
   }
 }
 
+void Fl_Widget_Surface::translate(int x, int y)
+{
+}
+
 /**
  @brief Computes the page coordinates of the current origin of graphics functions.
  *
diff --git a/src/drivers/Pico/Fl_Pico_Screen_Driver.H b/src/drivers/Pico/Fl_Pico_Screen_Driver.H
index 8b1378917..5bd177361 100644
--- a/src/drivers/Pico/Fl_Pico_Screen_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_Screen_Driver.H
@@ -1 +1,65 @@
+//
+// "$Id: Fl_Pico_Screen_Driver.H 11017 2016-01-20 21:40:12Z matt $"
+//
+// Definition of Pico 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_Pico_Screen_Driver.H
+ \brief Definition of Pico Screen interface.
+ */
+
+#ifndef FL_PICO_SCREEN_DRIVER_H
+#define FL_PICO_SCREEN_DRIVER_H
+
+#include <FL/Fl_Screen_Driver.H>
+
+
+class FL_EXPORT Fl_Pico_Screen_Driver : public Fl_Screen_Driver
+{
+public:
+  Fl_Pico_Screen_Driver();
+  virtual ~Fl_Pico_Screen_Driver();
+  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 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();
+  // --- 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);
+  virtual void remove_timeout(Fl_Timeout_Handler cb, void *argp);
+};
+
+
+#endif // FL_PICO_SCREEN_DRIVER_H
+
+//
+// End of "$Id: Fl_Pico_Screen_Driver.H 11017 2016-01-20 21:40:12Z matt $".
+//
diff --git a/src/drivers/Pico/Fl_Pico_Screen_Driver.cxx b/src/drivers/Pico/Fl_Pico_Screen_Driver.cxx
index 8b1378917..463ff688a 100644
--- a/src/drivers/Pico/Fl_Pico_Screen_Driver.cxx
+++ b/src/drivers/Pico/Fl_Pico_Screen_Driver.cxx
@@ -1 +1,144 @@
+//
+// "$Id: Fl_Pico_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+//
+// Definition of SDL Screen interface based on Pico
+//
+// Copyright 1998-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
+//
 
+
+#include "../../config_lib.h"
+#include "Fl_Pico_Screen_Driver.H"
+
+
+Fl_Pico_Screen_Driver::Fl_Pico_Screen_Driver()
+{
+}
+
+
+Fl_Pico_Screen_Driver::~Fl_Pico_Screen_Driver()
+{
+}
+
+
+void Fl_Pico_Screen_Driver::init()
+{
+  // nothing to do yet
+}
+
+
+int Fl_Pico_Screen_Driver::x()
+{
+  return 0;
+}
+
+
+int Fl_Pico_Screen_Driver::y()
+{
+  return 0;
+}
+
+
+int Fl_Pico_Screen_Driver::w()
+{
+  return 800;
+}
+
+
+int Fl_Pico_Screen_Driver::h()
+{
+  return 600;
+}
+
+
+void Fl_Pico_Screen_Driver::screen_xywh(int &X, int &Y, int &W, int &H, int n)
+{
+  X = x();
+  Y = y();
+  W = w();
+  H = h();
+}
+
+
+void Fl_Pico_Screen_Driver::screen_dpi(float &h, float &v, int n)
+{
+  h = 75.0;
+  v = 75.0;
+}
+
+
+void Fl_Pico_Screen_Driver::screen_work_area(int &X, int &Y, int &W, int &H, int n)
+{
+  X = x();
+  Y = y();
+  W = w();
+  H = h();
+}
+
+
+void Fl_Pico_Screen_Driver::beep(int type)
+{
+}
+
+
+void Fl_Pico_Screen_Driver::flush()
+{
+}
+
+
+int Fl_Pico_Screen_Driver::ready()
+{
+  return 1;
+}
+
+
+void Fl_Pico_Screen_Driver::grab(Fl_Window* win)
+{
+}
+
+
+int Fl_Pico_Screen_Driver::parse_color(const char* p, uchar& r, uchar& g, uchar& b)
+{
+  return 0;
+}
+
+
+void Fl_Pico_Screen_Driver::get_system_colors()
+{
+}
+
+
+void Fl_Pico_Screen_Driver::add_timeout(double time, Fl_Timeout_Handler cb, void *argp)
+{
+}
+
+
+void Fl_Pico_Screen_Driver::repeat_timeout(double time, Fl_Timeout_Handler cb, void *argp)
+{
+}
+
+
+int Fl_Pico_Screen_Driver::has_timeout(Fl_Timeout_Handler cb, void *argp)
+{
+  return 0;
+}
+
+
+void Fl_Pico_Screen_Driver::remove_timeout(Fl_Timeout_Handler cb, void *argp)
+{
+}
+
+
+//
+// End of "$Id: Fl_Pico_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
+//
\ No newline at end of file
diff --git a/src/drivers/Pico/Fl_Pico_Window_Driver.H b/src/drivers/Pico/Fl_Pico_Window_Driver.H
index 8b1378917..14cf08b5c 100644
--- a/src/drivers/Pico/Fl_Pico_Window_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_Window_Driver.H
@@ -1 +1,43 @@
+//
+// "$Id: Fl_Pico_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $"
+//
+// Definition of Pico Window 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_Pico_Window_Driver.H
+ \brief Definition of Pico Window interface.
+ */
+
+#ifndef FL_PICO_WINDOW_DRIVER_H
+#define FL_PICO_WINDOW_DRIVER_H
+
+#include <FL/Fl_Window_Driver.H>
+
+
+class FL_EXPORT Fl_Pico_Window_Driver : public Fl_Window_Driver
+{
+public:
+  Fl_Pico_Window_Driver(Fl_Window *win);
+  virtual ~Fl_Pico_Window_Driver();
+};
+
+
+#endif // FL_PICO_WINDOW_DRIVER_H
+
+//
+// End of "$Id: Fl_Pico_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $".
+//
diff --git a/src/drivers/Pico/Fl_Pico_Window_Driver.cxx b/src/drivers/Pico/Fl_Pico_Window_Driver.cxx
index 8b1378917..d729083fa 100644
--- a/src/drivers/Pico/Fl_Pico_Window_Driver.cxx
+++ b/src/drivers/Pico/Fl_Pico_Window_Driver.cxx
@@ -1 +1,37 @@
+//
+// "$Id: Fl_Pico_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+//
+// Definition of SDL Window interface based on Pico
+//
+// Copyright 1998-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
+//
 
+
+#include "../../config_lib.h"
+#include "Fl_Pico_Window_Driver.H"
+
+
+Fl_Pico_Window_Driver::Fl_Pico_Window_Driver(Fl_Window *win)
+: Fl_Window_Driver(win)
+{
+}
+
+
+Fl_Pico_Window_Driver::~Fl_Pico_Window_Driver()
+{
+}
+
+
+//
+// End of "$Id: Fl_Pico_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_Screen_Driver.H b/src/drivers/SDL/Fl_SDL_Screen_Driver.H
index 8b1378917..ef2c3b1da 100644
--- a/src/drivers/SDL/Fl_SDL_Screen_Driver.H
+++ b/src/drivers/SDL/Fl_SDL_Screen_Driver.H
@@ -1 +1,44 @@
+//
+// "$Id: Fl_SDL_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).
+//
+// 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_SDL_Screen_Driver.H
+ \brief Definition of SDL Screen interface based on Pico.
+ */
+
+#ifndef FL_SDL_SCREEN_DRIVER_H
+#define FL_SDL_SCREEN_DRIVER_H
+
+#include "../Pico/Fl_Pico_Screen_Driver.H"
+
+
+class FL_EXPORT Fl_SDL_Screen_Driver : public Fl_Pico_Screen_Driver
+{
+public:
+  Fl_SDL_Screen_Driver();
+  virtual ~Fl_SDL_Screen_Driver();
+  virtual double wait(double time_to_wait);
+};
+
+
+#endif // FL_SDL_SCREEN_DRIVER_H
+
+//
+// End of "$Id: quartz.H 11017 2016-01-20 21:40:12Z matt $".
+//
diff --git a/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx b/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx
index 8b1378917..feed9458e 100644
--- a/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx
+++ b/src/drivers/SDL/Fl_SDL_Screen_Driver.cxx
@@ -1 +1,196 @@
+//
+// "$Id: Fl_SDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+//
+// Definition of SDL Screen interface based on Pico
+//
+// Copyright 1998-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
+//
+
+
+#include "../../config_lib.h"
+#include "Fl_SDL_Screen_Driver.H"
+
+#include <FL/Fl_Window_Driver.H>
+
+#define __APPLE__
+#include <SDL2/SDL.h>
+#undef __APPLE__
+
+
+Fl_Screen_Driver* Fl_Screen_Driver::newScreenDriver()
+{
+  return new Fl_SDL_Screen_Driver();
+}
+
+
+Fl_SDL_Screen_Driver::Fl_SDL_Screen_Driver()
+{
+}
+
+Fl_SDL_Screen_Driver::~Fl_SDL_Screen_Driver()
+{
+}
+
+
+double Fl_SDL_Screen_Driver::wait(double time_to_wait)
+{
+  SDL_Event e;
+  if (SDL_PollEvent(&e)) {
+    if (e.type == SDL_QUIT) {
+      exit(0);
+      // TODO: do something
+    }
+  }
+  return 0.0;
+}
+
+
+
+#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>
+
+/*
+ * The following code should not be here! 
+ * All this must be refactored into the driver system!
+ */
+
+/*
+
+ The following symbols are not found if we naively compile the core modules and
+ no specific platform implementations. This list is a hint at all the functions
+ and methods that probably need to be refactored into the driver system.
+
+ Undefined symbols for architecture x86_64:
+ */
+
+void fl_set_spot(int, int, int, int, int, int, Fl_Window*) { }
+void fl_reset_spot() { }
+const char *fl_filename_name(char const*) { return 0; }
+void fl_clipboard_notify_change() { }
+
+//Fl_Screen_Driver *Fl_Screen_Driver::newScreenDriver() { return 0; }
+Fl_Graphics_Driver *Fl_Graphics_Driver::newMainGraphicsDriver() { return 0; }
+void Fl_Graphics_Driver::global_gc() { }
+int Fl::dnd() { return 0; }
+void Fl::copy(char const*, int, int, char const*) { }
+void Fl::paste(Fl_Widget&, int, char const*) { }
+void Fl::get_mouse(int&, int&) { }
+void Fl::set_color(unsigned int, unsigned int) { }
+int Fl_X::set_cursor(Fl_Cursor) { return 0; }
+int Fl_X::set_cursor(Fl_RGB_Image const*, int, int) { return 0; }
+void Fl_X::set_default_icons(Fl_RGB_Image const**, int) { }
+void Fl_X::flush() { }
+void Fl_X::set_icons() { }
+void Fl_Window::size_range_() { }
+void Fl_Window::fullscreen_x() { }
+void Fl_Window::make_current() { }
+void Fl_Window::fullscreen_off_x(int, int, int, int) { }
+
+Window fl_xid(const Fl_Window* w)
+{
+  Fl_X *temp = Fl_X::i(w);
+  return temp ? temp->xid : 0;
+}
+
+void Fl_Window::show() {
+  if (!shown()) {
+    Fl_X::make(this);
+  }
+}
+
+Fl_X* Fl_X::make(Fl_Window *w)
+{
+  Fl_Group::current(0);
+  if (w->parent() && !Fl_X::i(w->window())) {
+    w->set_visible();
+    return 0L;
+  }
+  Window parent;
+  if (w->parent()) {
+    parent = fl_xid(w->window());
+  } else {
+    parent = 0;
+  }
+  Fl_Window_Driver *x = Fl_Window_Driver::newWindowDriver(w);
+  x->other_xid = 0;
+  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);
+  } else {
+    x->xid = SDL_CreateWindow(w->label(), 100, 100, w->w(), w->h(), 0);
+  }
+  x->next = Fl_X::first;
+  Fl_X::first = x;
+  return x;
+}
+
+void Fl_Window::label(char const*, char const*) { }
+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__
+ #include <SDL2/SDL.h>
+ #undef __APPLE__
+ 
+ SDL_Window *win = NULL;
+ SDL_Renderer *renderer = NULL;
+ SDL_Texture *bitmapTex = NULL;
+ SDL_Surface *bitmapSurface = NULL;
+ int posX = 100, posY = 100, width = 320, height = 240;
+
+ SDL_Init(SDL_INIT_VIDEO);
+
+ win = SDL_CreateWindow("Hello World", posX, posY, width, height, 0);
+
+ renderer = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED);
+
+ bitmapSurface = SDL_LoadBMP("img/hello.bmp");
+ bitmapTex = SDL_CreateTextureFromSurface(renderer, bitmapSurface);
+ SDL_FreeSurface(bitmapSurface);
+
+ while (1) {
+ SDL_Event e;
+ if (SDL_PollEvent(&e)) {
+ if (e.type == SDL_QUIT) {
+ break;
+ }
+ }
+
+ SDL_RenderClear(renderer);
+ SDL_RenderCopy(renderer, bitmapTex, NULL, NULL);
+ SDL_RenderPresent(renderer);
+ }
+
+ SDL_DestroyTexture(bitmapTex);
+ SDL_DestroyRenderer(renderer);
+ SDL_DestroyWindow(win);
+
+ SDL_Quit();
+
+ return 0;
+*/
+
+
+//
+// End of "$Id: Fl_SDL_Screen_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
+//
 
diff --git a/src/drivers/SDL/Fl_SDL_Window_Driver.H b/src/drivers/SDL/Fl_SDL_Window_Driver.H
index 8b1378917..740616a64 100644
--- a/src/drivers/SDL/Fl_SDL_Window_Driver.H
+++ b/src/drivers/SDL/Fl_SDL_Window_Driver.H
@@ -1 +1,43 @@
+//
+// "$Id: Fl_SDL_Window_Driver.H 11017 2016-01-20 21:40:12Z matt $"
+//
+// Definition of SDL Window 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_SDL_Window_Driver.H
+ \brief Definition of SDL Window interface.
+ */
+
+#ifndef FL_SDL_WINDOW_DRIVER_H
+#define FL_SDL_WINDOW_DRIVER_H
+
+#include "../Pico/Fl_Pico_Window_Driver.H"
+
+
+class FL_EXPORT Fl_SDL_Window_Driver : public Fl_Pico_Window_Driver
+{
+public:
+  Fl_SDL_Window_Driver(Fl_Window *win);
+  virtual ~Fl_SDL_Window_Driver();
+};
+
+
+#endif // FL_SDL_WINDOW_DRIVER_H
+
+//
+// End of "$Id: Fl_SDL_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/SDL/Fl_SDL_Window_Driver.cxx
index 8b1378917..b251ad2c2 100644
--- a/src/drivers/SDL/Fl_SDL_Window_Driver.cxx
+++ b/src/drivers/SDL/Fl_SDL_Window_Driver.cxx
@@ -1 +1,43 @@
+//
+// "$Id: Fl_SDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $"
+//
+// Definition of SDL Window interface based on SDL
+//
+// Copyright 1998-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
+//
 
+
+#include "../../config_lib.h"
+#include "Fl_SDL_Window_Driver.H"
+
+
+Fl_Window_Driver *Fl_Window_Driver::newWindowDriver(Fl_Window *win)
+{
+  return new Fl_SDL_Window_Driver(win);
+}
+
+
+Fl_SDL_Window_Driver::Fl_SDL_Window_Driver(Fl_Window *win)
+: Fl_Pico_Window_Driver(win)
+{
+}
+
+
+Fl_SDL_Window_Driver::~Fl_SDL_Window_Driver()
+{
+}
+
+
+//
+// End of "$Id: Fl_SDL_Window_Driver.cxx 11253 2016-03-01 00:54:21Z matt $".
+//
\ No newline at end of file