Merge pull request #29 from chrisws/0_11_20

0 11 20

Author: chrisws

ChangeLog

@@ -1,3 +1,13 @@
+2015-08-26
+	Editor fixes:
+	- now displays an i-beam/edit cursor
+	- highlighting for numbers and keywords
+	- F1 key for keywords surrounded by punctuation
+	- page scrolling with up/down arrow keys
+	- pressing tab at the bottom no longer jumps to the top
+	- display additional editor context menu items
+	Added a basic debugger
+
 2015-08-02
 	Fix display output before DELAY
 	Fix LET command problem found in 32bit linux

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.19])
+AC_INIT([smallbasic], [0.11.20])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

ide/android/assets/main.bas

@@ -56,7 +56,7 @@ sub do_about()
   print "(_ ._ _  _.|||_) /\ (_ |/ "
   print "__)| | |(_||||_)/--\__)|\_"
   print
-  print "Version 0.11.19"
+  print "Version 0.11.20"
   print
   print "Copyright (c) 2002-2015 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nic Christopoulos" + chr(10)

samples/distro-examples/games/sokoban.levels

@@ -1,4 +1,3 @@
-; $Id$
 ; Original sokoban levels
 ;
 
@@ -466,7 +465,7 @@
 
 
 ; 30
-      ###########  
+       ###########  
        #   #     # 
 #####  #     $ $ # 
 #   ##### $## # ## 

src/common/brun.c

@@ -746,7 +746,6 @@ void bc_loop(int isf) {
   bcip_t next_ip;
   int i;
   int proc_level = 0;
-  byte trace_flag = 0;
   byte code = 0;
 
   // setup event checker time = 50ms
@@ -815,8 +814,8 @@ void bc_loop(int isf) {
         continue;
       case kwTYPE_LINE:
         prog_line = code_getaddr();
-        if (trace_flag) {
-          dev_printf("<%d>", prog_line);
+        if (opt_trace_on) {
+          dev_trace_line(prog_line);
         }
         continue;
       case kwLET:
@@ -1031,10 +1030,10 @@ void bc_loop(int isf) {
         cmd_fseek();
         break;
       case kwTRON:
-        trace_flag = 1;
+        opt_trace_on = 1;
         continue;
       case kwTROFF:
-        trace_flag = 0;
+        opt_trace_on = 0;
         continue;
       case kwSTOP:
       case kwEND:
@@ -1088,8 +1087,8 @@ void bc_loop(int isf) {
         prog_ip++;
         if (code == kwTYPE_LINE) {
           prog_line = code_getaddr();
-          if (trace_flag) {
-            dev_printf("<%d>", prog_line);
+          if (opt_trace_on) {
+            dev_trace_line(prog_line);
           }
         }
       }

src/common/device.c

@@ -426,3 +426,9 @@ void v_create_form(var_p_t var) {}
 void v_create_window(var_p_t var) {}
 void dev_show_page() {}
 #endif
+
+#if !defined(_SDL)
+void dev_trace_line(int lineNo) {
+  dev_printf("<%d>", lineNo);
+}
+#endif

src/common/device.h

@@ -1036,6 +1036,13 @@ void dev_destroy_file_list(char_p_t *list, int count);
  */
 dword dev_get_millisecond_count();
 
+/**
+ * @ingroup dev_f
+ *
+ * Trace or debug at the given line number
+ */
+void dev_trace_line(int lineNo);
+
 #if defined(__cplusplus)
 }
 #endif

src/common/inet.h

@@ -18,6 +18,10 @@
 #include <errno.h>
 #include <sys/types.h>
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 typedef int socket_t;
 
 /**
@@ -120,11 +124,15 @@ void net_disconnect(socket_t s);
 /**
  * @ingroup net
  *
- * returns true if something is waitting in input-buffer
+ * returns true if something is waiting in input-buffer
  *
  * @param s the socket
- * @return non-zero if something is waitting in input-buffer; otherwise returns 0
+ * @return non-zero if something is waiting in input-buffer; otherwise returns 0
  */
 int net_peek(socket_t s);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif

src/common/pproc.h

@@ -31,6 +31,7 @@
 #define PV_FILE         1
 #define PV_LOG          2
 #define PV_STRING       3
+#define PV_NET          4
 
 #if defined(__cplusplus)
 extern "C" {

src/common/proc.c

@@ -10,6 +10,7 @@
 #include "common/sys.h"
 #include "common/pproc.h"
 #include "common/messages.h"
+#include "common/inet.h"
 #include <limits.h>
 
 /*
@@ -254,6 +255,9 @@ void pv_write(char *str, int method, int handle) {
     }
     strcat((char *) vp->v.p.ptr, str);
     break;
+  case PV_NET:
+    net_print((socket_t) handle, (const char *)str);
+    break;
   default:
     dev_print(str);
   }