Skip to content

Commit 1bf3fe8

Browse files
committed
Merge pull request #32 from chrisws/0_11_20
0 12 1
2 parents a29ae64 + 4ebe7c8 commit 1bf3fe8

File tree

31 files changed

+522
-514
lines changed

31 files changed

+522
-514
lines changed

ChangeLog

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
2015-11-01
2+
Fix debugger launch in linux build
3+
Fix editor display issue with keyword completion
4+
Fix editor case insensitive search
5+
Fix image drawing for large images
6+
Fix PAINT infinite loop
7+
Fix keyboard handling for non-us keymaps
8+
Fix Ctrl+Home editor keystroke handler
9+
Fix crash with online command if site is down
10+
Fix over scroll issue with line number widget
11+
Fix screen dump invalid file name for online files
12+
Fix file manager .bas file case sensitivity
13+
Fix editor markup on map fields that look like keywords
14+
Fix scanner inserting line-no bytecode for empty or comment lines
15+
Implemented editor F2 command to display online help
16+
Implemented calling IMAGE with another image variable
17+
118
2015-10-20
219
Fix LET when assigning a value to a MAP/ARRAY field
320

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
77
dnl Download the GNU Public License (GPL) from www.gnu.org
88
dnl
99

10-
AC_INIT([smallbasic], [0.12.0])
10+
AC_INIT([smallbasic], [0.12.1])
1111
AC_CONFIG_SRCDIR([configure.ac])
1212

1313
AC_CANONICAL_TARGET

debian/changelog

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,61 @@
1+
smallbasic (0.12.1) unstable; urgency=low
2+
* Various - see web site
3+
4+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 17 Nov 2015 09:45:25 +1000
5+
16
smallbasic (0.12.0) unstable; urgency=low
27
* Various - see web site
38

4-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 17 Sept 2015 09:45:25 +1000
9+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 17 Sep 2015 09:45:25 +1000
510

611
smallbasic (0.11.17) unstable; urgency=low
712
* Fix compiler ignoring unused assignment values
813
* Implement IMAGE
914

10-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 4 October 2014 09:45:25 +1000
15+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 4 Oct 2014 09:45:25 +1000
1116

1217
smallbasic (0.11.16) unstable; urgency=low
1318
* Add support for unary operators on array elements
1419
* Fix call FUNC with (arg1), (arg2)
1520
* Fix INKEY Backspace in FLTK
1621
* Fix FOR/NEXT using float increments
1722

18-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 13 Sept 2014 09:45:25 +1000
23+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 13 Sep 2014 09:45:25 +1000
1924

2025
smallbasic (0.11.15) unstable; urgency=low
2126
* RTE renamed THROW
2227

23-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 6 Sept 2014 09:45:25 +1000
28+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 6 Sep 2014 09:45:25 +1000
2429

2530
smallbasic (0.11.14) unstable; urgency=low
2631
* Added reference variable type
2732

28-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 30 August 2014 09:45:25 +1000
33+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 30 Aug 2014 09:45:25 +1000
2934

3035
smallbasic (0.11.13) unstable; urgency=low
3136
* Fixed UDS handling
3237

33-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sun, 24 August 2014 09:45:25 +1000
38+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sun, 24 Aug 2014 09:45:25 +1000
3439

3540
smallbasic (0.11.12) unstable; urgency=low
3641
* Fixed/implemented INCLUDE command
3742

38-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 11 August 2014 09:45:25 +1000
43+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 11 Aug 2014 09:45:25 +1000
3944

4045
smallbasic (0.11.11) unstable; urgency=low
4146
* Built using common code from the android project and SDL
4247

43-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 July 2014 09:45:25 +1000
48+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 Jul 2014 09:45:25 +1000
4449

4550
smallbasic (0.11.10) unstable; urgency=low
4651
* Built using common code from the android project and SDL
4752

48-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 July 2014 09:45:25 +1000
53+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 19 Jul 2014 09:45:25 +1000
4954

5055
smallbasic (0.10.8) unstable; urgency=low
5156
* Fix misc issues with const char* uncovered with new gcc
5257

53-
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 31 July 2010 09:45:25 +1000
58+
-- Chris Warren-Smith <cwarrensmith@gmail.com> Sat, 31 Jul 2010 09:45:25 +1000
5459

5560
smallbasic (0.10.7) unstable; urgency=low
5661
* Added defineKey and fixed delay problems with the inkey command

debian/rules

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ binary-arch: build install
7474
dh_compress
7575
dh_fixperms
7676
dh_installdeb
77+
dh_shlibdeps
7778
dh_gencontrol
7879
dh_md5sums
7980
dh_builddeb

documentation/build_kwp.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,15 @@ int main(int argc, char *argv[]) {
240240
fprintf(stdout, " const char *package;\n");
241241
fprintf(stdout, " const char *keyword;\n");
242242
fprintf(stdout, " const char *signature;\n");
243+
fprintf(stdout, " const char *nodeId;\n");
243244
fprintf(stdout, " const char *help;\n");
244245
fprintf(stdout, "} keyword_help[] = {\n");
245246

246247
int max_keyword_len = 0;
247248
List_each(HelpItem *, it, helpItems) {
248249
HelpItem *item = (*it);
249-
fprintf(stdout, "{\"%s\",\"%s\",\"%s\",\"%s\"},\n", item->package,
250-
item->keyword, item->signature, item->help);
250+
fprintf(stdout, "{\"%s\",\"%s\",\"%s\",\"%s\",\"%s\"},\n", item->package,
251+
item->keyword, item->signature, item->id, item->help);
251252
int len = strlen(item->keyword);
252253
if (len > max_keyword_len) {
253254
max_keyword_len = len;

documentation/sbasic_ref.csv

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ Console,command,PLAY,534,"PLAY string","Play musical notes."
3232
Console,command,PRINT,535,"PRINT [USING [format];] [expr|str [,|; [expr|str]] ...","Display text or the value of an expression."
3333
Console,command,SOUND,536,"SOUND freq, dur_ms [, vol] [BG]","Plays a sound."
3434
Console,function,CAT,538,"CAT (x)","Returns a console code. 0 = reset, 1 = bold, -1 bold-off, 2 = underline, -2 = underline-off, 3 = reverse, -3 = reverse-off."
35-
Console,function,INKEY,539,"INKEY","Returns the last key-code in keyboard buffer, or an empty string if there are no keys. Special key-codes like the function-keys (PC) or the hardware-buttons (PalmOS) are returned as 2-byte string."
35+
Console,function,INKEY,539,"INKEY","Returns the last key-code in keyboard buffer, or an empty string if there are no keys. Special key-codes like the function-keys are returned as 2-byte string."
3636
Console,function,TAB,540,"TAB (n)","Moves cursor position to the nth column."
37-
Console,function,DEFINEKEY,1015,"DEFINEKEY k,sub","Binds a keystoke to a user defined function"
37+
Console,function,DEFINEKEY,1015,"DEFINEKEY k,sub","Binds a keystroke to a user defined function"
3838
Data,command,DELETE,542,"DELETE a, idx [, count]","Deletes 'count' elements at position 'idx' of array 'a'."
3939
Data,command,EMPTY,543,"EMPTY (x)","Returns true if x is: a zero length array, an empty string, an integer or real with the value 0."
4040
Data,command,INSERT,544,"INSERT a, idx, val [, val [, ...]]]","Inserts the values to the specified array at the position idx."
@@ -66,7 +66,7 @@ Data,statement,RESTORE,572,"RESTORE label","Specifies the position of the next d
6666
Date,command,DATEDMY,573,"DATEDMY dmy| julian_date, BYREF d, BYREF m, BYREF y","Returns the day, month and the year as integers."
6767
Date,command,TIMEHMS,574,"TIMEHMS hms| timer, BYREF h, BYREF m, BYREF s","Converts a time-value to hours, minutes and seconds integer values."
6868
Date,function,DATE,575,"DATE","Returns the current date as string ""DD/MM/YYYY""."
69-
Date,function,DATEFMT,576,"DATEFMT (format, dmy| (d,m,y)| julian_date)","Returns formated date string."
69+
Date,function,DATEFMT,576,"DATEFMT (format, dmy| (d,m,y)| julian_date)","Returns formatted date string."
7070
Date,function,JULIAN,577,"JULIAN (dmy| (d,m,y))","Returns the Julian date. (dates must be greater than 1/1/100 AD)."
7171
Date,function,TIME,578,"TIME","Returns the current time as string ""HH:MM:SS""."
7272
Date,function,WEEKDAY,579,"WEEKDAY (dmy| (d,m,y)| julian_date)","Returns the day of the week (0 = Sunday)."
@@ -75,18 +75,18 @@ Data,command,APPEND,581,"APPEND a, val [, val [, ...]]","Inserts the values at t
7575
File,command,BLOAD,582,"BLOAD filename[, address]","Loads a specified memory image file into memory."
7676
File,command,BPUTC,583,"BPUTC #fileN; byte","Writes a byte on file or device. (Binary mode)."
7777
File,command,BSAVE,584,"BSAVE filename, address, length","Copies a specified portion of memory to a specified file."
78-
File,command,CHDIR,585,"CHDIR dir","Changes the current working directory. Not supported on PalmOS version."
78+
File,command,CHDIR,585,"CHDIR dir","Changes the current working directory."
7979
File,command,CHMOD,586,"CHMOD file, mode","Change permissions of a file. See also ACCESS."
8080
File,command,CLOSE,587,"CLOSE #fileN","Close a file or device."
8181
File,command,COPY,588,"COPY ""file"", ""newfile""","Makes a copy of specified file to the 'newfile'."
8282
File,command,DIRWALK,589,"DIRWALK directory [, wildcards] [USE ...]","Walk through the specified directories. The user-defined function must returns zero to stop the process."
8383
File,command,INPUT,590,"INPUT #fileN; var1 [,delim] [, var2 [,delim]] ...","Reads data from file."
8484
File,command,KILL,591,"KILL ""file""","Deletes the specified file."
8585
File,command,LOCK,592,"LOCK","Lock a record or an area (not yet implemented)."
86-
File,command,MKDIR,593,"MKDIR dir","Create a directory. Not supported on PalmOS version."
86+
File,command,MKDIR,593,"MKDIR dir","Create a directory."
8787
File,command,OPEN,594,"OPEN file [FOR {INPUT|OUTPUT|APPEND}] AS #fileN","Makes a file or device available for sequential input, sequential output."
8888
File,command,RENAME,595,"RENAME ""file"", ""newname""","Renames the specified file."
89-
File,command,RMDIR,596,"RMDIR dir","Removes a directory. Not supported on PalmOS version."
89+
File,command,RMDIR,596,"RMDIR dir","Removes a directory."
9090
File,command,SEEK,597,"SEEK #fileN; pos","Sets file position for the next read/write."
9191
File,command,TLOAD,598,"TLOAD file, BYREF var [, type]","Loads a text file into array variable. Each text-line is an array element. type 0 = load into array (default), 1 = load into string."
9292
File,command,TSAVE,599,"TSAVE file, var","Writes an array to a text file. Each array element is a text-line."
@@ -107,14 +107,14 @@ Graphics,command,CIRCLE,613,"CIRCLE [STEP] x,y,r [,aspect [, color]] [COLOR colo
107107
Graphics,command,COLOR,614,"COLOR foreground-color [, background-color]","Specifies the foreground and background colors."
108108
Graphics,command,DRAW,615,"DRAW ""commands""","Draw lines as specified by the given directional commands. "
109109
Graphics,command,DRAWPOLY,616,"DRAWPOLY array [,x-origin,y-origin [, scalef [, color]]] [COLOR color] [FILLED]","Draws a polyline. "
110-
Graphics,command,IMAGE,617,"IMAGE #handle, index, x, y [,sx,sy [,w,h]]","Display a graphical image."
110+
Graphics,command,IMAGE,617,"IMAGE [#handle | fileName | http://path-to-file.png | image-var | array of pixmap data]","Creates a graphical image object providing access to the following sub-commands: show([x,y [,zindex [,opacity]]]), hide, save([x,y [,w,h]])"
111111
Graphics,command,LINE,618,"LINE [STEP] x,y [,|STEP x2,y2] [, color| COLOR color]","Draws a line."
112112
Graphics,command,PAINT,619,"PAINT [STEP] x, y [,fill-color [,border-color]]","Fills an enclosed area on the graphics screen with a specific color. x,y = Screen coordinate (column, row) within the area that is to be filled."
113113
Graphics,command,PLOT,620,"PLOT xmin, xmax USE f(x)","Graph of f(x)."
114114
Graphics,command,PSET,621,"PSET [STEP] x,y [, color| COLOR color]","Draw a pixel."
115115
Graphics,command,RECT,622,"RECT [STEP] x,y [,|STEP x2,y2] [, color| COLOR color] [FILLED]","Draws a rectangular parallelogram."
116116
Graphics,command,VIEW,623,"VIEW [x1,y1,x2,y2 [,color [,border-color]]]","Defines a viewport. The viewport defined by VIEW is disabled by a VIEW command with no parameters."
117-
Graphics,command,WINDOW,624,"WINDOW [x1,y1,x2,y2]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates."
117+
Graphics,command,WINDOW,624,"WINDOW [left,bottom,right,top]","The WINDOW command allows you to redefine the corners of the display screen as a pair of ""world"" coordinates. WINDOW is also overloaded as a function, returning a system object providing access to the following sub-commands: graphicsScreen1, graphicsScreen2, textScreen, alert, ask, menu, message, showKeypad, insetTextScreen"
118118
Graphics,function,PEN,627,"PEN (0..14)","Returns the PEN/MOUSE data."
119119
Graphics,function,POINT,628,"POINT (x [, y])","Returns the color of the pixel at x,y."
120120
Graphics,function,RGB,629,"RGB (r, g, b)","Returns the RGB color codes for the specified values. Takes values 0..255 for each of the color."

ide/android/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="net.sourceforge.smallbasic"
44
android:installLocation="preferExternal"
5-
android:versionCode="15"
6-
android:versionName="0.12.0">
5+
android:versionCode="16"
6+
android:versionName="0.12.1">
77
<!-- This is the platform API where NativeActivity was introduced. -->
88
<uses-sdk android:minSdkVersion="9"/>
99

ide/android/assets/main.bas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sub do_about()
5555
print "(_ ._ _ _.|||_) /\ (_ |/ "
5656
print "__)| | |(_||||_)/--\__)|\_"
5757
print
58-
print "Version 0.12.0"
58+
print "Version 0.12.1"
5959
print
6060
print "Copyright (c) 2002-2015 Chris Warren-Smith"
6161
print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)
@@ -183,7 +183,7 @@ sub listFiles(byref frm, path, byref basList, byref dirList)
183183
name = ent
184184
if (isdir(path + name)) then
185185
dirList << name
186-
else if (right(ent, 4) == ".bas") then
186+
else if (lower(right(ent, 4)) == ".bas") then
187187
basList << name
188188
endif
189189
next ent

0 commit comments

Comments
 (0)