From c9a9a381888cd2f9ce4e5914dbccccdf308b4a20 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Mon, 14 Aug 2023 04:36:14 +0200
Subject: [PATCH] dialog:: cleaned string dialog

---
 archimedean.cpp |  8 +++++---
 dialogs.cpp     | 36 +++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/archimedean.cpp b/archimedean.cpp
index 2fc2fa17..7bd52a59 100644
--- a/archimedean.cpp
+++ b/archimedean.cpp
@@ -1349,6 +1349,8 @@ function<void()> setcanvas(char c) {
     };
   }
 
+dialog::string_dialog se;
+
 EX void show() {
   if(lastsample < isize(samples)) {
     string s = samples[lastsample].first;
@@ -1374,7 +1376,7 @@ EX void show() {
   dialog::init(XLAT("Archimedean tilings"));
   
   if(symbol_editing) {
-    dialog::addSelItem("edit", dialog::view_edited_string(), '/');
+    dialog::addSelItem("edit", se.view_edited_string(), '/');
     dialog::add_action([] () { 
       symbol_editing = false;
       if(!edited.errors) enable(edited);
@@ -1405,7 +1407,7 @@ EX void show() {
     dialog::add_action([] () { 
       symbol_editing = true;
       edited = current;
-      dialog::start_editing(edited.symbol);
+      se.start_editing(edited.symbol);
       edited.parse();
       });
     dialog::addBreak(100);
@@ -1508,7 +1510,7 @@ EX void show() {
   keyhandler = [] (int sym, int uni) {
     if(symbol_editing && sym == SDLK_RETURN) sym = uni = '/';
     dialog::handleNavigation(sym, uni);
-    if(symbol_editing && dialog::handle_edit_string(sym, uni)) {
+    if(symbol_editing && se.handle_edit_string(sym, uni)) {
       edited.parse(edited.symbol);
       return;
       }
diff --git a/dialogs.cpp b/dialogs.cpp
index b4bae614..f41826e6 100644
--- a/dialogs.cpp
+++ b/dialogs.cpp
@@ -1717,10 +1717,23 @@ EX namespace dialog {
     dialog::v.push_back(make_pair(s, color));
     }
   
-  int editpos = 0;
-  EX string *edited_string;
+  EX string editchecker(int sym, int uni) {
+      if(uni >= 32 && uni < 127) return string("") + char(uni);
+      return "";
+      }
 
-  EX string view_edited_string() {
+  #if HDR
+  struct string_dialog : extdialog {
+    int editpos = 0;
+    string *edited_string;
+    string view_edited_string();
+    void draw();
+    void start_editing(string& s);
+    bool handle_edit_string(int sym, int uni, function<string(int, int)> checker = editchecker);
+    };
+  #endif
+  
+  string string_dialog::view_edited_string() {
     string cs = *edited_string;
     if(editpos < 0) editpos = 0;
     if(editpos > isize(cs)) editpos = isize(cs);
@@ -1728,17 +1741,12 @@ EX namespace dialog {
     return cs;
     }    
   
-  EX void start_editing(string& s) {
+  void string_dialog::start_editing(string& s) {
     edited_string = &s;
     editpos = isize(s);
     }
   
-  EX string editchecker(int sym, int uni) {
-    if(uni >= 32 && uni < 127) return string("") + char(uni);
-    return "";
-    }
-
-  EX bool handle_edit_string(int sym, int uni, function<string(int, int)> checker IS(editchecker)) {
+  bool string_dialog::handle_edit_string(int sym, int uni, function<string(int, int)> checker) {
     auto& es = *edited_string;
     string u2;
     if(DKEY == SDLK_LEFT) editpos--;
@@ -1747,21 +1755,19 @@ EX namespace dialog {
       if(editpos == 0) return true;
       es.replace(editpos-1, 1, "");
       editpos--;
+      if(reaction) reaction();
       }
     else if((u2 = checker(sym, uni)) != "") {
       for(char c: u2) {
         es.insert(editpos, 1, c);
         editpos ++;
         }
+      if(reaction) reaction();
       }
     else return false;
     return true;
     }
 
-  struct string_dialog : extdialog {
-    void draw();
-    };
-  
   void string_dialog::draw() {
     cmode = sm::NUMBER | dialogflags;
     gamescreen();
@@ -1789,10 +1795,10 @@ EX namespace dialog {
     }
 
   EX void edit_string(string& s, string title, string help) {
-    start_editing(s);
     string_dialog ne;
     ne.title = title;
     ne.help = help;
+    ne.start_editing(s);
     pushScreen(ne);
     }