Merge pull request #181 from chrisws/12_26

12 26

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
-2023-01-20 (12.26)
+2023-02-19 (12.26)
 	SDL: Fixed an issue with window resizing #144
+	COMMON: Fixed "make dist" so it can produce a package with all internal dependencies
 
 2023-01-20 (12.26)
 	COMMON: Fixed DIM lower bound

src/platform/android/app/src/main/assets/main.bas

@@ -16,6 +16,7 @@ const colNav2  = theme.text6
 const menu_gap = -(char_w / 2)
 const is_android = instr(sbver, "Android") != 0
 const is_sdl = instr(sbver, "SDL") != 0
+const path_sep = iff(instr(sbver, "Win_") != 0, "\\", "/")
 const onlineUrl = "http://smallbasic.github.io/samples/index.bas"
 const idxEdit = 6
 const idxFiles = 7
@@ -321,7 +322,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
   local date_col = colNav
 
   sub fix_path
-    if (right(path, 1) != "/") then path += "/"
+    if (right(path, 1) != path_sep) then path += path_sep
   end
 
   fix_path
@@ -679,17 +680,19 @@ sub main
   sub go_back
     local backPath, index
     backPath = ""
-    index = iff(isstring(path), rinstr(path, "/"), 0)
+    index = iff(isstring(path), rinstr(path, path_sep), 0)
     if (index > 0 && index == len(path)) then
-      index = rinstr(left(path, index - 1), "/")
-    fi
+      index = rinstr(left(path, index - 1), path_sep)
+    endif
     if (index == 1) then
       index++
-    fi
+    endif
     if (index > 0)
       backPath = left(path, index - 1)
+    else if (mid(path, 2, 1) == ":") then
+      backPath = path
     else
-      backPath = "/"
+      backPath = path_sep
     endif
     path = backPath
   end

src/ui/textedit.cpp

@@ -358,13 +358,22 @@ EditBuffer::EditBuffer(TextEditInput *in, const char *text) :
     _buffer = (char *)malloc(_size);
     memcpy(_buffer, text, _len);
     _buffer[_len] = '\0';
+    convertTabs();
   }
 }
 
 EditBuffer::~EditBuffer() {
   clear();
 }
 
+void EditBuffer::convertTabs() {
+  for (int i = 0; i < _len; i++) {
+    if (_buffer[i] == '\t') {
+      _buffer[i] = ' ';
+    }
+  }
+}
+
 void EditBuffer::clear() {
   free(_buffer);
   _buffer = nullptr;
@@ -409,6 +418,9 @@ char EditBuffer::getChar(int pos) const {
   } else {
     result = '\0';
   }
+  if (result == '\r') {
+    result = '\n';
+  }
   return result;
 }
 
@@ -428,6 +440,7 @@ int EditBuffer::insertChars(int pos, const char *text, int num) {
   _len += num;
   _buffer[_len] = '\0';
   _in->setDirty(true);
+  convertTabs();
   if (num > 1) {
     _lines += countNewlines(text, num);
   } else if (text[0] == '\n') {
@@ -729,8 +742,7 @@ void TextEditInput::dragPage(int y, bool &redraw) {
   }
 }
 
-void TextEditInput::drawText(int x, int y, const char *str,
-                             int length, SyntaxState &state) {
+void TextEditInput::drawText(int x, int y, const char *str, int length, SyntaxState &state) {
   int i = 0;
   int offs = 0;
   SyntaxState nextState = state;
@@ -1603,10 +1615,10 @@ int TextEditInput::getIndent(char *spaces, int len, int pos) {
 
 int TextEditInput::getLineChars(StbTexteditRow *row, int pos) const {
   int numChars = row->num_chars;
-  if (numChars > 0 && _buf._buffer[pos + row->num_chars - 1] == '\r') {
+  if (numChars > 0 && _buf._buffer[pos + numChars - 1] == '\n') {
     numChars--;
   }
-  if (numChars > 0 && _buf._buffer[pos + row->num_chars - 1] == '\n') {
+  if (numChars > 0 && _buf._buffer[pos + numChars - 1] == '\r') {
     numChars--;
   }
   return numChars;

src/ui/textedit.h

@@ -50,6 +50,7 @@ struct EditBuffer {
   void append(const char *text, int len) { insertChars(_len, text, len); }
   void append(const char *text) { insertChars(_len, text, strlen(text)); }
   void clear();
+  void convertTabs();
   int  countNewlines(const char *text, int num);
   int  deleteChars(int pos, int num);
   char getChar(int pos) const;