Merge pull request #78 from chrisws/0_12_15

0 12 15

Author: chrisws

ChangeLog

@@ -1,3 +1,37 @@
+2019-06-22 (0.12.15)
+	FLTK: reactivated the FLTK port using FLTK v1.4
+
+2019-03-02 (0.12.15)
+	COMMON: Implemented - FOR character IN string
+
+2019-03-02 (0.12.15)
+	ANDROID: In editor, hide status when scrolled
+
+2019-02-26 (0.12.15)
+	ANDROID: Fix POINT returning transposed red + blue
+
+2019-02-23 (0.12.15)
+	ANDROID: Fix crash entering c,v in edit control mode
+
+2019-02-14 (0.12.15)
+	ANDROID: fix crash passing negative duration to SOUND command
+
+2019-02-11 (0.12.15)
+	UI: ALT+F4 from edit/run now returns to edit
+	UI: avoid flicker from with ALT+F4 -e edit startup
+
+2019-02-02 (0.12.15)
+	UI: Edit enter now continues prior line comment
+
+2019-01-21 (0.12.15.1)
+	ANDROID: fix setup screen colour display
+	ANDROID: show link to android page in about
+
+2019-01-19 (0.12.15)
+	UI: added kill-word editor command (alt+d)
+	UI: added select-word editor command (alt+w)
+	UI: find command primed from editor selection
+
 2018-12-28 (0.12.15)
 	Fix crash when using GOTO with a non-existent label
 	Fix crash in editor when double tapping empty document

Makefile.am

@@ -16,8 +16,11 @@ test:
 leak-test:
 	(cd src/platform/console && make leak-test)
 
+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 && \

README.md

@@ -4,7 +4,7 @@ SmallBASIC is a fast and easy to learn BASIC language interpreter ideal for ever
 
 Initial setup on linux
 ```
- $ sudo apt-get install git autotools-dev automake gcc g++ libsdl2-dev libfreetype6-dev libfontconfig1-dev
+ $ sudo apt-get install git autotools-dev automake gcc g++ libsdl2-dev libfreetype6-dev libfontconfig1-dev xxd
  $ git clone https://github.com/smallbasic/SmallBASIC.git
  $ cd SmallBASIC
  $ sh autogen.sh
@@ -117,6 +117,25 @@ Useful adb commands for debugging:
 adb shell dumpsys cpuinfo
 adb shell top -m 10
 
+### Building the FLTK version
+
+1. Install and build FLTK 1.4
+
+```
+$ cd ~/github
+$ git clone https://github.com/fltk/fltk.git
+$ sudo make install
+
+```
+
+2. Build
+
+```
+$ cd ~/github/SmallBASIC
+$ ./configure --enable-fltk
+$ make -s
+```
+
 ### .indent.pro settings
 ```
  -brf -nbap -br -brs -cdb -cdw -ce -cli0 -fca -i2 -l110 -lc110 -lp

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"],
@@ -156,6 +161,11 @@ function buildSDL() {
      AC_MSG_ERROR([libfreetype6-dev not installed: configure failed.])
    fi
 
+   AC_CHECK_PROG(have_xxd, xxd, [yes], [no])
+   if test "${have_xxd}" = "no" ; then
+     AC_MSG_ERROR([xxd command not installed: configure failed.])
+   fi
+
    case "${host_os}" in
      *mingw* | cygwin*)
      dnl avoid using MSCRT versions of printf for long double
@@ -206,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() {
@@ -233,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() {
@@ -294,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() {
@@ -321,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
@@ -363,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