COMMON: fix form regression

Author: chrisws

samples/distro-examples/apps/calc.bas

@@ -209,7 +209,7 @@ func showResult(result)
   rect out_x, out_y STEP w, h,  COLOR bgnd FILLED
   rect out_x - 1, out_y - 1 STEP w + 1, h + 1,  COLOR 2
 
-  local out_str = chr(27) + "[15 C" + result
+  local out_str = result
   local out_str_w = textwidth(result)
   local x = (out_x + w) - out_str_w - textwidth("0")
 

samples/distro-examples/examples/Circles_and_arcs.bas

@@ -1,4 +1,4 @@
-color 0,15
+color 1,2:cls
 circle ymax/4,ymax/4,ymax/8
 circle ymax/2,ymax/4,ymax/8 FILLED
 circle ymax/4,ymax/2,ymax/8,.75

samples/distro-examples/examples/Predefined_Variables.bas

@@ -1,6 +1,5 @@
 ? cat(1);"Predefined Variables";cat(0)
-? "OS VER =0x"; HEX$(osver)
-? "SB VER =0x"; HEX$(sbver)
+? "SB VER ="; sbver
 ? "PI     ="; pi
 ? "XMAX   ="; xmax
 ? "YMAX   ="; ymax

samples/distro-examples/graphics/Charts.bas

@@ -2,8 +2,9 @@
 ' CHART examples
 
 const VN=10
+const LINECHART=1
+const BARCHART=2
 dim v(1 to VN)
-
 randomize timer
 
 cls

samples/distro-examples/graphics/Simple_3D.bas

@@ -33,6 +33,7 @@ for i=1 to 15
 	calcPt
 	line sx,sy
 next
+showpage
 end
 
 '

src/platform/sdl/editor.cpp

@@ -19,6 +19,7 @@ using namespace strlib;
 String g_exportAddr;
 String g_exportToken;
 int cursorPos;
+bool returnToLine;
 
 void onlineHelp(Runtime *runtime, TextEditInput *widget) {
   char path[100];
@@ -109,7 +110,12 @@ void System::editSource(String loadPath) {
   editWidget->updateUI(NULL, NULL);
   editWidget->setLineNumbers();
   editWidget->setFocus(true);
-  editWidget->setCursorPos(cursorPos);
+
+  if (isBreak() && returnToLine) {
+    editWidget->setCursorRow(gsb_last_line);
+  } else {
+    editWidget->setCursorPos(cursorPos);
+  }
   cursorPos = 0;
 
   if (gsb_last_error && !isBack()) {
@@ -285,6 +291,12 @@ void System::editSource(String loadPath) {
         widget = helpWidget;
         showRecentFiles(helpWidget, loadPath);
         break;
+      case SB_KEY_ALT('.'):
+        returnToLine = !returnToLine;
+        _output->setStatus(returnToLine ?
+                           "Position the cursor to the last program line after BREAK" :
+                           "BREAK restores current cursor position");
+        break;
       case SB_KEY_ALT('1'):
       case SB_KEY_ALT('2'):
       case SB_KEY_ALT('3'):

src/ui/form.cpp

@@ -144,8 +144,10 @@ void cmd_form_do_events(var_s *self) {
                    focusInput->edit(event.key, sw, charWidth)) {
           dev_clrkb();
           out->setDirty();
-        } else if (event.key == SB_KEY_MK_PUSH || event.key == SB_KEY_MK_RELEASE ||
-                   SB_KEY_CTRL(SB_KEY_UP) || SB_KEY_CTRL(SB_KEY_DOWN)) {
+        } else if (event.key == SB_KEY_MK_PUSH ||
+                   event.key == SB_KEY_MK_RELEASE ||
+                   event.key == (int)SB_KEY_CTRL(SB_KEY_UP) ||
+                   event.key == (int)SB_KEY_CTRL(SB_KEY_DOWN)) {
           // no exit on mouse events
           dev_clrkb();
         } else {

src/ui/textedit.cpp

@@ -103,6 +103,7 @@ const char *helpText =
   "A-g goto line\n"
   "A-n trim line-endings\n"
   "A-t select theme\n"
+  "A-. break mode\n"
   "A-<n> recent file\n"
   "SHIFT-<arrow> select\n"
   "TAB indent line\n"