UI: display markers

Author: chrisws

src/platform/sdl/main.cpp

@@ -219,7 +219,7 @@ void setupAppPath(const char *path) {
     char cwd[OS_PATHNAME_SIZE + 1];
     cwd[0] = '\0';
     getcwd(cwd, sizeof(cwd) - 1);
-    strcat(g_appPath, cwd);
+    strcpy(g_appPath, cwd);
     strcat(g_appPath, "/");
     strcat(g_appPath, path);
   }

src/platform/sdl/runtime.cpp

@@ -177,6 +177,12 @@ void Runtime::debugStart(TextEditInput *editWidget, const char *file) {
       net_print(g_debugee, "l\n");
       size = net_input(g_debugee, buf, sizeof(buf), "\n");
       if (size > 0) {
+        int *marker = editWidget->getMarkers();
+        for (int i = 0; i < MAX_MARKERS; i++) {
+          if (marker[i] != -1) {
+            net_printf(g_debugee, "b %d\n", marker[i]);
+          }
+        }
         editWidget->gotoLine(buf);
         appLog("Debug session ready");
       }

src/ui/editor.cpp

@@ -94,7 +94,6 @@ void System::editSource(strlib::String &loadPath) {
       switch (event.key) {
       case SB_KEY_F(2):
       case SB_KEY_F(3):
-      case SB_KEY_F(4):
       case SB_KEY_F(8):
       case SB_KEY_F(10):
       case SB_KEY_F(11):

src/ui/textedit.cpp

@@ -31,25 +31,25 @@ int g_themeId = 0;
 const int theme1[] = {
   0xc8cedb, 0xa7aebc, 0x484f5f, 0xa7aebc, 0xa7aebc, 0x00bb00,
   0x272b33, 0x3d4350, 0x2b3039, 0x3875ed, 0x373b88, 0x2b313a,
-  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd
+  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd, 0x0083f8
 };
 
 const int theme2[] = {
   0xc8cedb, 0x002b36, 0x3d4350, 0xa7aebc, 0xa7aebc, 0x00bb00,
   0x002b36, 0x657b83, 0x073642, 0x9f7d18, 0x2b313a, 0x073642,
-  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd
+  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd, 0x0083f8
 };
 
 const int theme3[] = {
   0xc8cedb, 0xd7decc, 0x484f5f, 0xa7aebc, 0xa7aebc, 0x00bb00,
   0x001b33, 0x0088ff, 0x000d1a, 0x0051b1, 0x373b88, 0x022444,
-  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd
+  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd, 0x0083f8
 };
 
 const int theme4[] = {
   0xc8cedb, 0xa7aebc, 0x484f5f, 0xa7aebc, 0xa7aebc, 0x00bb00,
   0x2e3436, 0x888a85, 0x000000, 0x4d483b, 0x000000, 0x2b313a,
-  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd
+  0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd, 0x0083f8
 };
 
 const int* themes[] = {
@@ -81,6 +81,7 @@ const char *helpText =
   "SHIFT-<arrow> select\n"
   "TAB indent line\n"
   "F1,A-h keyword help\n"
+  "F4 toggle marker\n"
   "F5 debug\n"
   "F9, C-r run\n";
 
@@ -119,7 +120,8 @@ EditTheme::EditTheme(int fg, int bg) :
   _syntax_text(fg),
   _syntax_command(fg),
   _syntax_statement(fg),
-  _syntax_digit(fg) {
+  _syntax_digit(fg),
+  _row_marker(fg) {
 }
 
 void EditTheme::selectTheme(const int theme[]) {
@@ -139,6 +141,7 @@ void EditTheme::selectTheme(const int theme[]) {
   _syntax_command = theme[13];
   _syntax_statement = theme[14];
   _syntax_digit = theme[15];
+  _row_marker = theme[16];
 }
 
 //
@@ -255,6 +258,7 @@ TextEditInput::TextEditInput(const char *text, int chW, int chH,
   _matchingBrace(-1),
   _dirty(false) {
   stb_textedit_initialize_state(&_state, false);
+  memset(_lineMarker, -1, sizeof(_lineMarker));
 }
 
 TextEditInput::~TextEditInput() {
@@ -535,6 +539,9 @@ bool TextEditInput::edit(int key, int screenWidth, int charWidth) {
   case SB_KEY_TAB:
     editTab();
     break;
+  case SB_KEY_F(4):
+    toggleMarker();
+    break;
   case SB_KEY_SHIFT(SB_KEY_PGUP):
   case SB_KEY_PGUP:
     pageNavigate(false, key == (int)SB_KEY_SHIFT(SB_KEY_PGUP));
@@ -799,7 +806,15 @@ void TextEditInput::cycleTheme() {
 
 void TextEditInput::drawLineNumber(int x, int y, int row, bool selected) {
   if (_marginWidth > 0) {
-    if (selected) {
+    bool markerRow = false;
+    for (int i = 0; i < MAX_MARKERS && !markerRow; i++) {
+      if (row == _lineMarker[i]) {
+        markerRow = true;
+      }
+    }
+    if (markerRow) {
+      maSetColor(_theme->_row_marker);
+    } else if (selected) {
       maSetColor(_theme->_number_selection_background);
       maFillRect(x, y, _marginWidth, _charHeight);
       maSetColor(_theme->_number_selection_color);
@@ -1257,6 +1272,29 @@ void TextEditInput::setColor(SyntaxState &state) {
   }
 }
 
+void TextEditInput::toggleMarker() {
+  _cursorRow = getCursorRow();
+  bool found = false;
+  for (int i = 0; i < MAX_MARKERS && !found; i++) {
+    if (_cursorRow == _lineMarker[i]) {
+      _lineMarker[i] = -1;
+      found = true;
+    }
+  }
+  if (!found) {
+    for (int i = 0; i < MAX_MARKERS && !found; i++) {
+      if (_lineMarker[i] == -1) {
+        _lineMarker[i] = _cursorRow;
+        found = true;
+        break;
+      }
+    }
+  }
+  if (!found) {
+    _lineMarker[0] = _cursorRow;
+  }
+}
+
 void TextEditInput::updateScroll() {
   int pageRows = _height / _charHeight;
   if (_cursorRow + 1 < pageRows) {

src/ui/textedit.h

@@ -12,6 +12,7 @@
 #define STB_TEXTEDIT_CHARTYPE char
 #define STB_TEXTEDIT_UNDOCHARCOUNT 2000
 #define MARGIN_CHARS 4
+#define MAX_MARKERS 10
 
 #include <config.h>
 #include <stdlib.h>
@@ -45,6 +46,7 @@ struct EditTheme {
   int _syntax_command;
   int _syntax_statement;
   int _syntax_digit;
+  int _row_marker;
 };
 
 struct EditBuffer {
@@ -77,6 +79,7 @@ struct TextEditInput : public FormEditInput {
   int  getCursorPos() const { return _state.cursor; }
   const char *getText() const { return _buf._buffer; }
   int  getTextLength() const { return _buf._len; }
+  int *getMarkers() { return _lineMarker; }
   void gotoLine(const char *buffer);
   void reload(const char *text);
   bool save(const char *filePath);
@@ -134,6 +137,7 @@ struct TextEditInput : public FormEditInput {
   void pageNavigate(bool pageDown, bool shift);
   void removeTrailingSpaces();
   void setColor(SyntaxState &state);
+  void toggleMarker();
   void updateScroll();
   int wordStart();
 
@@ -147,6 +151,7 @@ struct TextEditInput : public FormEditInput {
   int _cursorRow;
   int _indentLevel;
   int _matchingBrace;
+  int _lineMarker[MAX_MARKERS];
   bool _dirty;
 };