UI: fix TextEditInput use as form widget

Author: chrisw-s

src/platform/sdl/runtime.cpp

@@ -37,8 +37,6 @@
 #define PAUSE_DEBUG_LAUNCH 750
 #define PAUSE_DEBUG_STEP 50
 #define MAIN_BAS "__main_bas__"
-#define AMPLITUDE 22000
-#define FREQUENCY 44100
 #define OPTIONS_BOX_WIDTH_EXTRA 1
 #define OPTIONS_BOX_BG 0xd2d1d0
 #define OPTIONS_BOX_FG 0x3e3f3e

src/ui/inputs.cpp

@@ -486,6 +486,14 @@ void FormEditInput::setFocus(bool focus) {
   }
 }
 
+void FormEditInput::clicked(int x, int y, bool pressed) {
+  if (pressed && g_system->isRunning()) {
+    dev_clrkb();
+    setFocus(true);
+    focusEdit = this;
+  }
+}
+
 //
 // FormLineInput
 //
@@ -515,11 +523,9 @@ FormLineInput::~FormLineInput() {
 }
 
 void FormLineInput::clicked(int x, int y, bool pressed) {
+  FormEditInput::clicked(x, y, pressed);
   if (pressed && g_system->isRunning()) {
     AnsiWidget *out = g_system->getOutput();
-    dev_clrkb();
-    setFocus(true);
-    focusEdit = this;
     int charWidth = out->getCharWidth();
     int selected = (x - _x) / charWidth;
     int len = strlen(_buffer);

src/ui/inputs.h

@@ -213,6 +213,7 @@ struct FormEditInput : public FormInput {
   virtual const char *completeKeyword(int index) = 0;
   virtual int getCompletions(StringList *list, int max) = 0;
 
+  void clicked(int x, int y, bool pressed);
   void setFocus(bool focus);
   int  getControlKey(int key);
   bool getControlMode() const { return _controlMode; }

src/ui/textedit.cpp

@@ -1072,6 +1072,7 @@ void TextEditInput::setCursorRow(int row) {
 }
 
 void TextEditInput::clicked(int x, int y, bool pressed) {
+  FormEditInput::clicked(x, y, pressed);
   if (x < _marginWidth) {
     _ptY = -1;
   } else if (pressed) {
@@ -1080,7 +1081,7 @@ void TextEditInput::clicked(int x, int y, bool pressed) {
       _state.select_start = wordStart();
       _state.select_end = wordEnd();
     } else  {
-      stb_textedit_click(&_buf, &_state, x - _marginWidth, y + (_scroll * _charHeight));
+      stb_textedit_click(&_buf, &_state, (x - _x) - _marginWidth, (y - _y) + (_scroll * _charHeight));
     }
     _pressTick = tick;
   }
@@ -1106,17 +1107,17 @@ bool TextEditInput::updateUI(var_p_t form, var_p_t field) {
 }
 
 bool TextEditInput::selected(MAPoint2d pt, int scrollX, int scrollY, bool &redraw) {
-  bool focus = hasFocus();
-  if (focus) {
+  bool result = FormEditInput::selected(pt, scrollX, scrollY, redraw);
+  if (hasFocus()) {
     if (pt.x < _marginWidth) {
       dragPage(pt.y, redraw);
     } else {
-      stb_textedit_drag(&_buf, &_state, pt.x - _marginWidth,
-                        pt.y + scrollY + (_scroll * _charHeight));
+      stb_textedit_drag(&_buf, &_state, (pt.x - _x) - _marginWidth,
+                        (pt.y - _y) + scrollY + (_scroll * _charHeight));
       redraw = true;
     }
   }
-  return focus;
+  return result;
 }
 
 void TextEditInput::selectNavigate(bool up) {
@@ -2043,8 +2044,8 @@ void TextEditHelpWidget::completeWord(int pos) {
 void TextEditHelpWidget::clicked(int x, int y, bool pressed) {
   _ptY = -1;
   if (pressed) {
-    stb_textedit_click(&_buf, &_state, 0, y + (_scroll * _charHeight));
-    if (_mode == kHelpKeyword && x - _x <= _charWidth * 3) {
+    stb_textedit_click(&_buf, &_state, 0, (y - _y) + (_scroll * _charHeight));
+    if (_mode == kHelpKeyword && (x - _x) <= _charWidth * 3) {
       toggleKeyword();
     }
   }