Merge pull request #21 from chrisws/0_11_17a

COMMON: Improved performance. Updated FORM, IMAGE, INKEY, TIMER commands

Author: chrisws

ChangeLog

@@ -1,3 +1,27 @@
+2015-01-25
+	Added timer func support
+	Improved syntax error messages
+	Remove dependence on malloc_usable_size
+	Pass TRUE as an argument to PAUSE to wait for an event
+
+2015-01-18
+	Anti-aliased line drawing
+	Improved INPUT with clipboard handling
+	Improved graphics display performance
+
+2014-12-03
+	File-open now uses .bas DIR to locate files
+
+2014-11-06
+	Added WINDOW system object to control the ansiwidget
+	Added sound support to SDL port
+
+2014-10-28
+	Update INKEY to return ALT, CTRL, ALT+CTRL key information
+
+2014-10-20
+	Refactor FORM handling to use system object
+
 2014-09-28
 	Refactor image handling to use system object
 

README

@@ -4,27 +4,22 @@ SmallBASIC is a fast and easy to learn BASIC language interpreter ideal for ever
 
 1. Setup .bashrc:
 
-export PATH=$PATH:~/android-sdk/adt-bundle-linux-x86_64-20131030/sdk/platform-tools
-export ANDROID_SDK_ROOT=~/android-sdk/adt-bundle-linux-x86_64-20140321/sdk
+export PATH=$PATH:~/android-sdk/depot_tools:~/android-sdk/android-sdk-linux/platform-tools/
+export ANDROID_SDK_ROOT=~/android-sdk/android-sdk-linux
 export TARGET_DEVICE=arm
 export PLATFORM_PREFIX=~/android-sdk/android-ext/
 export PATH=${PLATFORM_PREFIX}/bin:${PATH}
-export NDK=~/android-sdk/android-ndk-r9d
-export NDK_PLATFORM=android-9
+export NDK=~/android-sdk/android-ndk-r10d
+export NDK_PLATFORM=android-19
 export ANDROID_LOG_TAGS="DEBUG:I smallbasic:I AndroidRuntime:E *:S"
 
-2. Build PNG + FreeType:
+2. Build FreeType:
 
 First, prepare the cross-compiler from the NDK:
   $NDK_PATH/build/tools/make-standalone-toolchain.sh \
-      --platform=$NDK_PLATFORM --install-dir=$PLATFORM_PREFIX
+      --platform=$NDK_PLATFORM --install-dir=$PLATFORM_PREFIX --arch=arm
 
 Then use it to cross-compile the tools:
-  cd libpng-1.6.12/
-  CFLAGS="-std=gnu99" ./configure --host=arm-linux-androideabi --prefix=/png
-  make
-  make install DESTDIR=$(pwd)
-
   cd freetype-2.5.3/
   CFLAGS="-std=gnu99" ./configure --host=arm-linux-androideabi --prefix=/freetype --without-zlib --without-png --without-harfbuzz
   make
@@ -180,11 +175,15 @@ RANLIB		= /cygdrive/c/cygwin/bin/ranlib
 
 == Building the SDL version
 
-Optionally install guichan - see http://guichan.sourceforge.net/wiki/index.php
-
  $ ./configure --enable-sdl
  $ make
 
+ On windows, install tools:
+ http://www.gtk.org/download/win32.php
+
+ $ ./configure --host=i686-w64-mingw32 --enable-sdl
+ $ make
+
 == Building the non-graphical console version (cygwin or linux)
  $ ./configure && make
 

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.11.16])
+AC_INIT([smallbasic], [0.11.17])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -55,13 +55,14 @@ function checkForWindows() {
      *mingw* | pw32* | cygwin*)
      win32="yes"
      AC_CHECK_TOOL(WINDRES, windres, :)
+     ;;
+     *darwin*)
+     ;;
+     *)
+     dnl backlinking support for modules
+     LDFLAGS="${LDFLAGS} -export-dynamic"
    esac
    AM_CONDITIONAL(WITH_WIN32, test x"$win32" = "xyes")
-
-   dnl backlinking support for modules
-   if test $win32 = no; then
-     LDFLAGS="${LDFLAGS} -export-dynamic"
-   fi
 }
 
 function checkDebugMode() {
@@ -138,7 +139,7 @@ function buildFLTK() {
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
    esac
 
-   FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk2-config --cxxflags` -Wall -Wunused -fno-exceptions"
+   FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk2-config --cxxflags` -fno-exceptions"
    PACKAGE_LIBS="${PACKAGE_LIBS} `fltk2-config --ldflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build
@@ -163,17 +164,12 @@ function buildFLTK() {
    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(USE_TERM_IO, 0, [Does not use terminal-io functions.])
    AC_DEFINE(USE_CLIB, 1, [Implements clibmgr.])
    AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
-   AC_DEFINE(IMPL_DEV_GETS, 1, [Driver implements dev_gets()])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
    AC_DEFINE(IMPL_DEV_ENV, 1, [Driver implements dev_env funcs])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
    AC_DEFINE(OS_PREC64, 1, [64 bit variables])
-   AC_DEFINE(DRV_BEEP, 1, [Use the driver based beep function])
-   AC_DEFINE(IMPL_OSD_SOUND, 1, [Driver implements osd_sound()])
 
    BUILD_SUBDIRS="src/common src/platform/fltk"
    AC_SUBST(BUILD_SUBDIRS)
@@ -200,39 +196,47 @@ function buildSDL() {
      AC_MSG_ERROR([libfreetype6-dev not installed: configure failed.])
    fi
 
-   AC_MSG_CHECKING(for SDL_image)
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-     #include "SDL2/SDL_image.h"
-     ]], [[]])],
-    [AC_MSG_RESULT([yes])],
-    [AC_MSG_ERROR([libsdl2-image-dev not installed: configure failed])])
+   case "${host_os}" in
+     *mingw* | cygwin*)
+     dnl avoid using MSCRT versions of printf for long double
+     PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
 
-   # Check fontconfig configuration
-   PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
-   AC_SUBST(FONTCONFIG_CFLAGS)
-   AC_SUBST(FONTCONFIG_LIBS)
+     dnl do not depend on cygwin.dll under cygwin build
+     PACKAGE_CFLAGS="-I`cygpath -m /usr/local/include` ${PACKAGE_CFLAGS} -mms-bitfields"
+     PACKAGE_LIBS="-L`cygpath -m /usr/local/lib` ${PACKAGE_LIBS} -lwsock32 -static-libgcc -static-libstdc++"
+     AC_DEFINE(_Win32, 1, [Windows build])
+     AC_DEFINE(__addr_t_defined, 1, [Avoid conflict in cygwin/types.h])
+     FONTCONFIG_CFLAGS=""
+     FONTCONFIG_LIBS=""
+     ;;
+
+     *)
+     # Unix - Check fontconfig configuration
+     PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.2)
+     AC_SUBST(FONTCONFIG_CFLAGS)
+     AC_SUBST(FONTCONFIG_LIBS)
+
+     dnl backlinking support for modules
+     PACKAGE_LIBS="${PACKAGE_LIBS} -ldl"
+   esac
 
    PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags`"
-   PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS} `sdl2-config --libs` `freetype-config --libs` -ldl"
+   PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS} `sdl2-config --libs` `freetype-config --libs`"
 
    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(USE_TERM_IO, 0, [Does not use terminal-io functions.])
    AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_DEV_GETS, 1, [Driver implements dev_gets()])
    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_OSD_SOUND, 1, [Driver implements osd_sound()])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-   AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
    AC_DEFINE(OS_PREC64, 1, [64 bit variables])
-   AC_DEFINE(DRV_BEEP, 1, [Use the driver based beep function])
 
    BUILD_SUBDIRS="src/common src/platform/sdl"
    AC_SUBST(BUILD_SUBDIRS)
    (cd ide/android/assets && xxd -i main.bas > ../../../src/platform/sdl/main_bas.h)
+   (cd ide/android/res/drawable-hdpi && xxd -i ic_launcher.png > ../../../../src/platform/sdl/icon.h)
 }
 
 function buildTizen() {
@@ -243,16 +247,10 @@ function buildTizen() {
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_TIZEN, 1, [Defined for Tizen build.])
    AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
-   AC_DEFINE(HAVE_SEARCH_H, 1, [Found GNU search.h])
-   AC_DEFINE(HAVE_TDESTROY, 1, [Found GNU search.h])
    AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_DEV_GETS, 1, [Driver implements dev_gets()])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
-   AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
-   AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
    AC_DEFINE(CPU_BIGENDIAN, 1, [Tizen uses big-endian])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-   AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
 
    BUILD_SUBDIRS="src/platform/tizen/common"
    AC_SUBST(BUILD_SUBDIRS)
@@ -265,15 +263,11 @@ function buildAndroid() {
 
    AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
    AC_DEFINE(_ANDROID, 1, [Defined for Android build.])
-   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
    AC_DEFINE(DEV_EVENTS_OSD, 1, [dev_events() implemented using osd_events().])
-   AC_DEFINE(IMPL_DEV_GETS, 1, [Driver implements dev_gets()])
+   AC_DEFINE(IMPL_DEV_READ, 1, [Implement dev_read()])
    AC_DEFINE(IMPL_DEV_DELAY, 1, [Driver implements dev_delay()])
-   AC_DEFINE(IMPL_IMAGE, 1, [Driver implements image commands])
-   AC_DEFINE(HAVE_MALLOC_USABLE_SIZE, 0, [Newlib version causes mosync stack panic])
-   AC_DEFINE(CPU_BIGENDIAN, 1, [Android uses big-endian])
    AC_DEFINE(IMPL_LOG_WRITE, 1, [Driver implements lwrite()])
-   AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
+   AC_DEFINE(CPU_BIGENDIAN, 1, [Android uses big-endian])
 
    BUILD_SUBDIRS="src/platform/android"
    AC_SUBST(BUILD_SUBDIRS)
@@ -290,6 +284,7 @@ function buildConsole() {
    esac
 
    AM_CONDITIONAL(WITH_CYGWIN_CONSOLE, test $win32 = yes)
+   AC_DEFINE(BUILD_CONSOLE, 1, [Building a console based system.])
 
    if test $win32 = yes; then
       dnl test whether to build using mingw
@@ -305,39 +300,32 @@ function buildConsole() {
       if test x$have_cygwin = xyes; then
          dnl preconfigured values for cygwin console build (depends on cygwin.dll)
          TARGET="Building Cygwin console version."
-         AC_CHECK_HEADER(ncurses/termcap.h, [], [AC_MSG_ERROR("install libncurses-dev")])
          AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-         AC_DEFINE(USE_TERM_IO, 1, [Uses terminal-io functions.])
          AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
          AC_DEFINE(_CygWin, 1, [Building a minimal dev_null based command-line version.])
          AC_DEFINE(__CYGWIN__, 1, [as above])
          AC_DEFINE(OS_PREC64, 1, [64 bit variables])
          AC_DEFINE(INET_UNSUP, 1, [inet not supported.])
-         PACKAGE_LIBS="${PACKAGE_LIBS} -lm -lgcc -lncurses"
-         BUILD_SUBDIRS="src/common src/platform/cygwin"
+         PACKAGE_LIBS="${PACKAGE_LIBS} -lm -lgcc"
+         BUILD_SUBDIRS="src/common src/platform/unix"
       else
          dnl preconfigured values for cygwin mingw console build
          TARGET="Building Cygwin MinGW console version."
          AC_DEFINE(__MINGW32__, 1, [as above])
          AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-         AC_DEFINE(USE_TERM_IO, 0, [Does not use terminal-io functions.])
-         AC_DEFINE(IMPL_EMPTY_TERM_EVENTS, 1, [Implement a dummy term_events()])
-         PACKAGE_LIBS="${PACKAGE_LIBS} -mconsole -lmingw32"
-         BUILD_SUBDIRS="src/common src/platform/mingw"
+         PACKAGE_LIBS="${PACKAGE_LIBS} -mconsole -lmingw32 -lwsock32"
+         BUILD_SUBDIRS="src/common src/platform/unix"
       fi
       AC_DEFINE(_Win32, 1, [Windows build])
       AC_DEFINE(__addr_t_defined, 1, [Avoid conflict in cygwin/types.h])
    else
       dnl preconfigured values for unix console build
       TARGET="Building Unix console version."
       AC_DEFINE(_UnixOS, 1, [Building under Unix like systems.])
-      AC_DEFINE(USE_TERM_IO, 1, [Uses terminal-io functions.])
+      AC_DEFINE(USE_TERM_IO, 0, [Uses terminal-io functions.])
       AC_DEFINE(DEV_EVENTS_OSD, 0, [dev_events() implemented using osd_events().])
-      AC_DEFINE(DRV_SOUND, 1, [Driver implements functions in drvsound.h])
-      AC_DEFINE(UNIX_MEMMGR, 1, [Unix memory manager])
       AC_DEFINE(OS_PREC64, 1, [64 bit variables])
-      AC_CHECK_HEADER(readline/readline.h, [], [AC_MSG_ERROR("install libreadline-dev")])
-      PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread -lncurses -lreadline"
+      PACKAGE_LIBS="${PACKAGE_LIBS} -lm -ldl -lpthread"
       BUILD_SUBDIRS="src/common src/platform/unix"
       TEST_DIR="src/platform/unix"
       AC_SUBST(TEST_DIR)
@@ -352,17 +340,10 @@ function buildDist() {
    BUILD_SUBDIRS="src/common src/platform/gtk/src src/platform/gtk/data src/platform/gtk/icons"
    BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/fltk"
    BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/sdl"
-   BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/cygwin"
    BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/unix"
-   BUILD_SUBDIRS="${BUILD_SUBDIRS} src/platform/mingw"
    AC_SUBST(BUILD_SUBDIRS)
 }
 
-OS_NAME=`uname -a`
-
-AC_DEFINE_UNQUOTED(OS_NAME, "${OS_NAME}", [SB system variable])
-AC_DEFINE(HAVE_C_MALLOC, 1, [allocate memory with regular malloc calls])
-
 if test x$ac_build_dist = xyes; then
    buildDist
 elif test x$ac_build_fltk = xyes; then
@@ -381,6 +362,8 @@ checkPCRE
 checkDebugMode
 checkForWindows
 
+PACKAGE_CFLAGS="${PACKAGE_CFLAGS} -Wall -Wno-unused-result"
+
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
@@ -389,8 +372,6 @@ Makefile
 src/common/Makefile
 src/platform/fltk/Makefile
 src/platform/sdl/Makefile
-src/platform/cygwin/Makefile
-src/platform/mingw/Makefile
 src/platform/unix/Makefile
 src/platform/tizen/common/Makefile
 src/platform/android/Makefile

debian/changelog

@@ -1,3 +1,9 @@
+smallbasic (0.11.17) unstable; urgency=low
+  * Fix compiler ignoring unused assignment values
+  * Implement  IMAGE
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sat, 4 October 2014 09:45:25 +1000
+
 smallbasic (0.11.16) unstable; urgency=low
   * Add support for unary operators on array elements
   * Fix call FUNC with (arg1), (arg2)

ide/android/.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

ide/android/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SmallBASIC</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

ide/android/AndroidManifest.xml

@@ -3,7 +3,7 @@
           package="net.sourceforge.smallbasic"
           android:installLocation="preferExternal"
           android:versionCode="14"
-          android:versionName="0.11.12">
+          android:versionName="0.11.17">
   <!-- This is the platform API where NativeActivity was introduced. -->
   <uses-sdk android:minSdkVersion="9"/>
 
@@ -20,7 +20,7 @@
          This will take care of integrating with our NDK code. -->
     <activity android:name="net.sourceforge.smallbasic.MainActivity"
               android:label="@string/app_name"
-              android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+              android:theme="@style/SBTheme"
               android:configChanges="orientation|keyboardHidden">
       <!-- Tell NativeActivity the name of or .so -->
       <meta-data android:name="android.app.lib_name"