FLTK: fix build

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2015-07-18
+	Added IDE editor sdl/android
+
 2015-06-07
 	Fixed PRINT 1/1000 and other floating point rounding issues
 	Fixed problem with 59 char INPUT prompt

src/platform/fltk/MainWindow.cxx

@@ -280,7 +280,7 @@ bool MainWindow::basicMain(EditorWidget *editWidget,
       editWidget->readonly(true);
       editWidget->runState(rs_run);
       breakToLine = editWidget->isBreakToLine();
-      opt_ide = editWidget->isHideIDE()? IDE_NONE : IDE_LINKED;
+      opt_ide = editWidget->isHideIDE()? IDE_NONE : IDE_INTERNAL;
     }
   }
 
@@ -1024,7 +1024,7 @@ void run_mode_startup(void *data) {
       exit(0);
     }
     editWidget->editor->take_focus();
-    opt_ide = IDE_LINKED;
+    opt_ide = IDE_INTERNAL;
   }
 }
 
@@ -1036,7 +1036,7 @@ bool initialise(int argc, char **argv) {
   opt_quiet = 1;
   opt_verbose = 0;
   opt_nosave = 1;
-  opt_ide = IDE_LINKED;
+  opt_ide = IDE_INTERNAL;
   opt_pref_bpp = 0;
   opt_interactive = 1;
   opt_file_permitted = 1;

src/platform/fltk/Makefile.am

@@ -29,6 +29,7 @@ sbasici_SOURCES =                 \
   ../../ui/inputs.cpp             \
   ../../ui/image.cpp              \
   ../../ui/strlib.cpp             \
+  ../../ui/textedit.cpp           \
   display.cxx display.h           \
   HelpWidget.cxx HelpWidget.h     \
   TtyWidget.cxx TtyWidget.h       \

src/platform/fltk/dev_fltk.cxx

@@ -460,6 +460,26 @@ C_LINKAGE_END
 
 //--FORM------------------------------------------------------------------------
 
+void System::alert(const char *title, const char *message) {
+  fltk::alert(message);
+}
+
+int System::ask(const char *title, const char *prompt, bool cancel) {
+  if (cancel) {
+    return fltk::choice(prompt, "Yes", "No", "Cancel");
+  } else {
+    return fltk::choice(prompt, "Yes", "No");
+  }
+}
+
+void System::setClipboardText(const char *text) {
+  fltk::copy(text, strlen(text), true);
+}
+
+char *System::getClipboardText() {
+  return NULL;
+}
+
 bool System::isRunning() {
   return wnd->isRunning();
 }

src/platform/fltk/system.h

@@ -10,6 +10,10 @@
 #define FLTK_SYSTEM_H
 
 struct System {
+  void alert(const char *title, const char *message);
+  int ask(const char *title, const char *prompt, bool cancel=true);
+  void setClipboardText(const char *text);
+  char *getClipboardText();
   bool isBreak();
   bool isRunning();
   void setLoadPath(const char *url);

src/ui/graphics.cpp

@@ -66,6 +66,17 @@ inline pixel_t RGB888_to_RGBA8888(unsigned c) {
   #define GET_FROM_RGB888(c) (c)
 #endif
 
+#define GET_LINE(y) \
+  pixel_t *line; \
+  if (_cacheY == y) { \
+    line = _cacheLine; \
+  } else { \
+    line = _drawTarget->getLine(y); \
+    _cacheLine = line; \
+    _cacheY = posY; \
+  }
+
+
 // fractional part of x
 inline double fpart(double x) {
   double result;
@@ -136,7 +147,9 @@ Graphics::Graphics() :
   _drawTarget(NULL),
   _font(NULL),
   _w(0),
-  _h(0) {
+  _h(0),
+  _cacheY(-1),
+  _cacheLine(NULL) {
   graphics = this;
 }
 
@@ -243,7 +256,7 @@ void Graphics::drawPixel(int posX, int posY) {
       && posY >= _drawTarget->y()
       && posX < _drawTarget->w()
       && posY < _drawTarget->h()) {
-    pixel_t *line = _drawTarget->getLine(posY);
+    GET_LINE(posY);
     line[posX] = _drawColor;
   }
 }

src/ui/graphics.h

@@ -75,6 +75,8 @@ struct Graphics {
   Font *_font;
   pixel_t _drawColor;
   int _w, _h;
+  int _cacheY;
+  pixel_t *_cacheLine;
 };
 
 }