FLTK: port to fltk 1.x

Author: chrisws

Makefile.am

@@ -20,7 +20,7 @@ fuzz-test:
 	(cd src/platform/console && make fuzz-test)
 
 cppcheck:
-	(cppcheck --quiet --enable=all src/common src/ui src/platform/android/jni src/platform/sdl)
+	(cppcheck --quiet --enable=all src/common src/ui src/platform/android/jni src/platform/sdl src/platform/fltk)
 
 covcheck:
 	(make clean -s && \

configure.ac

@@ -1,7 +1,7 @@
 dnl
 dnl Configure script for SmallBASIC
 dnl
-dnl Copyright(C) 2001-2018 Chris Warren-Smith.
+dnl Copyright(C) 2001-2019 Chris Warren-Smith.
 dnl
 dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
@@ -39,6 +39,11 @@ AC_ARG_ENABLE(web,
   [ac_build_web="yes"],
   [ac_build_web="no"])
 
+AC_ARG_ENABLE(fltk,
+  AS_HELP_STRING([--enable-fltk],[build fltk version(default=no)]),
+  [ac_build_fltk="yes"],
+  [ac_build_fltk="no"])
+
 AC_ARG_ENABLE(dist,
   AS_HELP_STRING([--enable-dist],[prepare to run make dist(default=no)]),
   [ac_build_dist="yes"],
@@ -211,15 +216,13 @@ function buildSDL() {
    dnl preconfigured values for SDL build
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
-   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
+   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
 
    BUILD_SUBDIRS="src/common src/platform/sdl"
    AC_SUBST(BUILD_SUBDIRS)
    (cd src/platform/android/app/src/main/assets && xxd -i main.bas > ../../../../../../../src/platform/sdl/main_bas.h)
-   (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
 function buildAndroid() {
@@ -238,8 +241,6 @@ function buildAndroid() {
 
    TEST_DIR="src/platform/android"
    AC_SUBST(TEST_DIR)
-
-   (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
 function buildConsole() {
@@ -299,8 +300,6 @@ function buildConsole() {
    fi
 
    AC_SUBST(BUILD_SUBDIRS)
-
-   (cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
 }
 
 function buildWeb() {
@@ -326,16 +325,74 @@ function buildWeb() {
    AC_SUBST(BUILD_SUBDIRS)
 }
 
+function buildFLTK() {
+   TARGET="Building FLTK version."
+
+   dnl Checks for FLTK 1.x
+   AC_CHECK_PROG(have_fltk, fltk-config, [yes], [no])
+
+   AC_CHECK_PROG(have_xxd, xxd, [yes], [no])
+   if test "${have_xxd}" = "no" ; then
+     AC_MSG_ERROR([xxd command not installed: configure failed.])
+   fi
+
+   dnl avoid using MSCRT versions of printf for long double
+   case "${host_os}" in
+     *mingw* | cygwin*)
+     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
+   esac
+
+   FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
+   FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
+   PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
+
+   dnl do not depend on cygwin.dll under cygwin build
+   case "${host_os}" in
+     *mingw* | cygwin*)
+     FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} -lwsock32 -lws2_32 -static-libgcc -static-libstdc++"
+     AC_DEFINE(_Win32, 1, [Windows build])
+     ;;
+
+     *)
+     (cd images && xxd -i sb-desktop-128x128.png > ../src/platform/fltk/icon.h)
+     xxd
+   esac
+
+   defaultConditionals
+
+   dnl preconfigured values for FLTK build
+   AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
+   AC_DEFINE(_FLTK, 1, [Defined for FLTK build.])
+   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
+   AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
+   AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
+
+   BUILD_SUBDIRS="src/common src/platform/fltk"
+   AC_SUBST(BUILD_SUBDIRS)
+   AC_SUBST(FLTK_CXXFLAGS)
+
+   desktopentrydir='$(datarootdir)'/applications
+   AC_SUBST(desktopentrydir)
+
+   dnl generate kwp.h
+   (cd src/platform/fltk && g++ -o build_kwp build_kwp.cxx && ./build_kwp)
+}
+
 if test x$ac_build_sdl = xyes; then
    buildSDL
 elif test x$ac_build_android = xyes; then
    buildAndroid
 elif test x$ac_build_web = xyes; then
    buildWeb
+elif test x$ac_build_fltk = xyes; then
+   buildFLTK
 else
    buildConsole
 fi
 
+(cd documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)
+
 checkPCRE
 checkTermios
 checkDebugMode
@@ -368,6 +425,7 @@ src/platform/android/Makefile
 src/platform/console/Makefile
 src/platform/sdl/Makefile
 src/platform/web/Makefile
+src/platform/fltk/Makefile
 ])
 AC_OUTPUT
 

debian/changelog

@@ -6,7 +6,7 @@ smallbasic (0.12.15) unstable; urgency=low
 smallbasic (0.12.14) unstable; urgency=low
   * Various see web site
 
- -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 15 Sept 2018 09:45:25 +1000
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 15 Sep 2018 09:45:25 +1000
 
 smallbasic (0.12.13) unstable; urgency=low
   * Various see web site

src/common/hashmap.h

@@ -5,7 +5,7 @@
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
 //
-// Copyright(C) 2007-2016 Chris Warren-Smith.
+// Copyright(C) 2007-2019 Chris Warren-Smith.
 
 #ifndef _HASHMAP_H_
 #define _HASHMAP_H_
@@ -16,12 +16,12 @@
  * Callback structure for hashmap_foreach
  */
 typedef struct hashmap_cb {
+  var_p_t var;
+  var_p_t parent;
+  char *buffer;
   int count;
   int index;
   int start;
-  char *buffer;
-  var_p_t var;
-  var_p_t parent;
 } hashmap_cb;
 
 typedef int (*hashmap_foreach_func)(hashmap_cb *cb, var_p_t k, var_p_t v);

src/common/sberr.c

@@ -94,7 +94,7 @@ void sc_raise(const char *format, ...) {
  * run-time error
  */
 void rt_raise(const char *format, ...) {
-  if (!gsb_last_error && !prog_error && prog_source) {
+  if (!gsb_last_error && ctask && !prog_error && prog_source) {
     prog_error = errRuntime;
 
     va_list args;

src/common/scan.h

@@ -16,6 +16,8 @@
 
 #include "common/sys.h"
 
+#define KEYWORD_PADDING 4
+
 #if defined(__cplusplus)
 extern "C" {
 #endif
@@ -83,7 +85,7 @@ struct proc_keyword_s {
  * External procedure (Modules)
  */
 typedef struct {
-  char name[SB_KEYWORD_SIZE + 1]; /**< keyword name */
+  char name[SB_KEYWORD_SIZE + KEYWORD_PADDING]; /**< keyword name */
   int  lib_id; /**< library id */
   bid_t pcode; /**< keyword code */
   int symbol_index; /**< symbol index on symbol-table */
@@ -96,7 +98,7 @@ typedef struct {
  * External functions (Modules)
  */
 typedef struct {
-  char name[SB_KEYWORD_SIZE + 1]; /**< keyword name */
+  char name[SB_KEYWORD_SIZE + KEYWORD_PADDING]; /**< keyword name */
   int lib_id; /**< library id */
   bid_t fcode; /**< keyword code */
   int symbol_index; /**< symbol index on symbol-table */
@@ -126,7 +128,7 @@ typedef struct comp_var_s comp_var_t;
  * compiler's label node
  */
 struct comp_label_s {
-  char name[SB_KEYWORD_SIZE + 1]; /**< label name    @ingroup scan */
+  char name[SB_KEYWORD_SIZE + KEYWORD_PADDING]; /**< label name    @ingroup scan */
   bcip_t ip; /**< address in BC @ingroup scan */
   bid_t block_id; /**< block_id (FOR-NEXT,IF-FI,etc) used for GOTOs @ingroup scan */
   bcip_t dp; /**< data pointer @ingroup scan */
@@ -165,7 +167,7 @@ typedef struct comp_proc_s comp_udp_t;
  * compiler's pass-2 stack node
  */
 struct comp_pass_node_s {
-  char sec[SB_KEYWORD_SIZE + 1]; /**< section-name (PalmOS) @ingroup scan */
+  char sec[SB_KEYWORD_SIZE + KEYWORD_PADDING]; /**< section-name (PalmOS) @ingroup scan */
   bcip_t pos; /**< address in BC         @ingroup scan */
   int line; /**< source code line number @ingroup scan */
   bid_t block_id; /**< block ID          @ingroup scan */

src/common/sys.h

@@ -69,6 +69,8 @@ extern "C" {
  #define SB_STR_VER VERSION " SDL " SB_VERSYS SB_BIT_SZ BUILD_DATE
 #elif defined (_ANDROID)
   #define SB_STR_VER VERSION " Android " BUILD_DATE
+#elif defined (_FLTK)
+  #define SB_STR_VER VERSION " FLTK " BUILD_DATE
 #else
   #define SB_STR_VER VERSION " Console " SB_VERSYS SB_BIT_SZ BUILD_DATE
 #endif

src/common/var.c

@@ -790,3 +790,8 @@ void v_input2var(const char *str, var_t *var) {
   }
 }
 
+void v_create_func(var_p_t map, const char *name, method cb) {
+  var_p_t v_func = map_add_var(map, name, 0);
+  v_func->type = V_FUNC;
+  v_func->v.fn.cb = cb;
+}

src/include/var.h

@@ -467,6 +467,13 @@ int v_strlen(const var_t *v);
  */
 #define v_is_type(v, t) (v != NULL && v->type == t)
 
+/**
+ * @ingroup var
+ *
+ * setup a method on the map using the given name
+ */
+void v_create_func(var_p_t map, const char *name, method cb);
+
 #if defined(__cplusplus)
 }
 #endif

src/platform/console/image.cpp

@@ -70,12 +70,6 @@ ImageBuffer::~ImageBuffer() {
   _image = NULL;
 }
 
-void create_function(var_p_t map, const char *name, method cb) {
-  var_p_t v_func = map_add_var(map, name, 0);
-  v_func->type = V_FUNC;
-  v_func->v.fn.cb = cb;
-}
-
 dev_file_t *get_file() {
   dev_file_t *result = NULL;
   code_skipnext();
@@ -434,10 +428,10 @@ void create_image(var_p_t var, ImageBuffer *image) {
     var_p_t value = map_add_var(var, IMG_NAME, 0);
     v_setstr(value, image->_filename);
   }
-  create_function(var, "clip", cmd_image_clip);
-  create_function(var, "filter", cmd_image_filter);
-  create_function(var, "paste", cmd_image_paste);
-  create_function(var, "save", cmd_image_save);
+  v_create_func(var, "clip", cmd_image_clip);
+  v_create_func(var, "filter", cmd_image_filter);
+  v_create_func(var, "paste", cmd_image_paste);
+  v_create_func(var, "save", cmd_image_save);
 }
 
 //