SDL: update editor find and replace

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2019-07-10 (0.12.15)
+	SDL: update editor find and replace
+
 2019-06-27 (0.12.15)
 	FLTK: file file save as
 	UI: fix reported crash in android printing null

src/platform/sdl/editor.cpp

@@ -89,6 +89,10 @@ struct StatusMessage {
     _col = editor->getCol();
   }
 
+  void setDirty(TextEditInput *editor) {
+    _dirty = !editor->isDirty();
+  }
+
   bool _dirty;
   int _row;
   int _col;
@@ -265,6 +269,8 @@ void System::editSource(String loadPath, bool restoreOnExit) {
         case SB_KEY_ESCAPE:
           widget = editWidget;
           helpWidget->hide();
+          helpWidget->cancelMode();
+          statusMessage.setDirty(editWidget);
           ((Runtime *)this)->debugStop();
           break;
         case SB_KEY_CTRL('s'):
@@ -442,8 +448,10 @@ void System::editSource(String loadPath, bool restoreOnExit) {
           g_macro[g_macro_size++] = event.key;
         }
         if (event.key == SB_KEY_ENTER) {
-          if (helpWidget->replaceMode()) {
+          if (helpWidget->replaceModeWith()) {
             _output->setStatus("Replace string with. Esc=Close");
+          } else if (helpWidget->replaceMode()) {
+            _output->setStatus("Replace string. Enter=replace, Space=skip, Esc=Close");
           } else if (helpWidget->lineEditMode() && helpWidget->getTextLength()) {
             switch (inputMode) {
             case kExportAddr:
@@ -472,13 +480,23 @@ void System::editSource(String loadPath, bool restoreOnExit) {
             statusMessage._dirty = !widget->isDirty();
             widget = editWidget;
             helpWidget->hide();
+            helpWidget->cancelMode();
           }
           redraw = true;
+        } else if (helpWidget->replaceDoneMode()) {
+          statusMessage._dirty = !widget->isDirty();
+          widget = editWidget;
+          helpWidget->hide();
+          helpWidget->cancelMode();
         }
 
         helpWidget->setFocus(widget == helpWidget);
         editWidget->setFocus(widget == editWidget);
-        redraw |= statusMessage.update(editWidget, _output);
+        if (helpWidget->searchMode()) {
+          redraw = true;
+        } else {
+          redraw |= statusMessage.update(editWidget, _output);
+        }
         if (redraw) {
           _output->redraw();
         }

src/ui/textedit.cpp

@@ -855,7 +855,7 @@ bool TextEditInput::edit(int key, int screenWidth, int charWidth) {
 bool TextEditInput::find(const char *word, bool next) {
   bool result = false;
   bool allUpper = true;
-  int len = strlen(word);
+  int len = word == NULL ? 0 : strlen(word);
   for (int i = 0; i < len; i++) {
     if (islower(word[i])) {
       allUpper = false;
@@ -1569,13 +1569,17 @@ char *TextEditInput::getWordBeforeCursor() {
   return result;
 }
 
-bool TextEditInput::replaceNext(const char *buffer) {
+bool TextEditInput::replaceNext(const char *buffer, bool skip) {
   bool changed = false;
   if (_state.select_start != _state.select_end &&
       _buf._buffer != NULL && buffer != NULL) {
     int start, end;
     char *selection = getSelection(&start, &end);
-    stb_textedit_paste(&_buf, &_state, buffer, strlen(buffer));
+    if (!skip) {
+      stb_textedit_paste(&_buf, &_state, buffer, strlen(buffer));
+    } else {
+      _state.cursor++;
+    }
     changed = find(selection, false);
     free(selection);
   }
@@ -1867,24 +1871,37 @@ bool TextEditHelpWidget::edit(int key, int screenWidth, int charWidth) {
     result = TextEditInput::edit(key, screenWidth, charWidth);
     _editor->find(_buf._buffer, key == SB_KEY_ENTER);
     break;
-  case kSearchReplace:
+  case kEnterReplace:
     result = TextEditInput::edit(key, screenWidth, charWidth);
     if (key == SB_KEY_ENTER) {
       _buf.clear();
-      _mode = kReplace;
+      _mode = kEnterReplaceWith;
     } else {
       _editor->find(_buf._buffer, false);
     }
     break;
-  case kReplace:
+  case kEnterReplaceWith:
     if (key == SB_KEY_ENTER) {
-      if (!_editor->replaceNext(_buf._buffer)) {
-        _mode = kReplaceDone;
-      }
+      _mode = kReplace;
     } else {
       result = TextEditInput::edit(key, screenWidth, charWidth);
     }
     break;
+  case kReplace:
+    switch (key) {
+    case SB_KEY_ENTER:
+      if (!_editor->replaceNext(_buf._buffer, false)) {
+        _mode = kReplaceDone;
+      }
+      break;
+    case ' ':
+      if (!_editor->replaceNext(_buf._buffer, true)) {
+        // skip to next
+        _mode = kReplaceDone;
+      }
+      break;
+    }
+    break;
   case kGotoLine:
     result = TextEditInput::edit(key, screenWidth, charWidth);
     if (key == SB_KEY_ENTER) {
@@ -2150,7 +2167,7 @@ void TextEditHelpWidget::createOutline() {
 
 void TextEditHelpWidget::createSearch(bool replace) {
   if (_mode != kSearch) {
-    reset(replace ? kSearchReplace : kSearch);
+    reset(replace ? kEnterReplace : kSearch);
   }
 
   char *text = _editor->getTextSelection(false);
@@ -2189,8 +2206,8 @@ void TextEditHelpWidget::createStackTrace(const char *error, int line, StackTrac
 void TextEditHelpWidget::paste(const char *text) {
   switch (_mode) {
   case kSearch:
-  case kSearchReplace:
-  case kReplace:
+  case kEnterReplace:
+  case kEnterReplaceWith:
   case kLineEdit:
     TextEditInput::paste(text);
     break;

src/ui/textedit.h

@@ -135,7 +135,7 @@ struct TextEditInput : public FormEditInput {
   void layout(int w, int h) { _width = w; _height = h; }
   const char *getNodeId();
   char *getWordBeforeCursor();
-  bool replaceNext(const char *text);
+  bool replaceNext(const char *text, bool skip);
   int  getCompletions(StringList *list, int max);
   void selectNavigate(bool up);
 
@@ -211,7 +211,8 @@ struct TextEditHelpWidget : public TextEditInput {
     kCompletion,
     kOutline,
     kSearch,
-    kSearchReplace,
+    kEnterReplace,
+    kEnterReplaceWith,
     kReplace,
     kReplaceDone,
     kGotoLine,
@@ -235,10 +236,13 @@ struct TextEditHelpWidget : public TextEditInput {
   bool isDrawTop() { return true; }
   void layout(int w, int h) { _x = w - _width; _height = h; }
   void reset(HelpMode mode);
+  void cancelMode() { _mode = kNone; }
   bool closeOnEnter() const;
+  bool searchMode() const { return _mode >= kSearch && _mode <= kReplaceDone; }
   bool lineEditMode() const { return _mode == kLineEdit; }
   bool messageMode() const { return _mode == kMessage; }
   bool replaceMode() const { return _mode == kReplace; }
+  bool replaceModeWith() const { return _mode == kEnterReplaceWith; }
   bool replaceDoneMode() const { return _mode == kReplaceDone; }
   bool selected(MAPoint2d pt, int scrollX, int scrollY, bool &redraw);
   void toggleKeyword();