debug: avoid tilda symbol on open console

Author: s.kushnirenko

src/dev/imgui_qconsole.h

@@ -188,6 +188,7 @@ struct IMGUIInputLine
 
     /// Renders the contorl in whatever the surrounding IMGUI context is.  Returns true if new user input is available.
     bool render(int width);
+    bool reclaim_focus = false;
 };
 
 /// GUI Ostream pane with ANSI Color Code Support
@@ -235,6 +236,7 @@ class imgui_qconsole : public MultiStream
     int HistoryPos = -1; ///< index into the console history buffer, for when we press up/down arrow to scroll previous commands
 
     float fontScale = 1.2f; ///< text scale for the console widget window
+    bool skip_event = false;
 
     void clear(); ///< Clear the ostream
 
@@ -914,12 +916,12 @@ inline bool IMGUIInputLine::render(int width)
 {
     bool rval = false;
 
-    // Command-line
-    bool reclaim_focus = false;
-
     ImGui::SetNextWindowSize(ImVec2(width, 0));
-    if (ImGui::InputText("##Input", &InputBuf, input_text_flags, &TextEditCallbackStub, (void*)(&textCallbacks)))
-    {
+    if (reclaim_focus) {
+        ImGui::SetKeyboardFocusHere(0); // Auto focus previous widget
+        reclaim_focus = false;
+    }
+    if (ImGui::InputText("##Input", &InputBuf, input_text_flags, &TextEditCallbackStub, (void*)(&textCallbacks))) {
         reclaim_focus = true;
 
         char* s = InputBuf.data();
@@ -939,9 +941,7 @@ inline bool IMGUIInputLine::render(int width)
     }
 
     // Auto-focus on window apparition
-    ImGui::SetItemDefaultFocus();
-    if (reclaim_focus)
-        ImGui::SetKeyboardFocusHere(-1); // Auto focus previous widget
+    ImGui::SetItemDefaultFocus();     
 
     return rval;
 }

src/game/game.cpp

@@ -253,10 +253,6 @@ void game_draw_frame_warning() {
     warning_draw();
 }
 
-void game_toggle_debug_console() {
-    game.console = !game.console;
-}
-
 void game_handle_input_after() {
     OZZY_PROFILER_SECTION("Input/Frame/After");
     window_update_input_after();

src/game/game.h

@@ -17,7 +17,6 @@ void game_sound_frame();
 void game_handle_input_frame();
 void game_draw_frame_warning();
 void game_handle_input_after();
-void game_toggle_debug_console();
 void game_exit_editor();
 
 void game_exit();

src/scripts/building_info.js

@@ -132,7 +132,7 @@ building_physician = {
 
 building_conservatory = {
   animations : {
-    work : { pos : [82, 14], anim_id: IMG_MUSICIAN_SHOW_SN }
+    work : { pos : [82, 18], anim_id: IMG_MUSICIAN_SHOW_SN }
   },
   labor_category : LABOR_CATEGORY_ENTERTAINMENT,
 }

src/widget/debug_console.cpp

@@ -85,14 +85,30 @@ bool game_imgui_overlay_handle_event(void *e) {
         }
     }
 
+    if (event->type == SDL_TEXTINPUT && *event->text.text == '`') {
+        debug_console().skip_event = true;
+    }
+
     if (!game.console) {
         return false;
     }
 
+    if (debug_console().skip_event) {
+        debug_console().skip_event = false;
+        return false;
+    }
+
     ImGui_ImplSDL2_ProcessEvent(event);
     return false;
 }
 
+void game_toggle_debug_console() {
+    game.console = !game.console;
+    if (game.console) {
+        debug_console().is.reclaim_focus = true;
+    }
+}
+
 void bind_debug_command(pcstr cmd, std::function<void(std::istream &, std::ostream &)> f) {
     debug_console().con.bind_command(cmd, f);
 }

src/widget/debug_console.h

@@ -12,5 +12,6 @@ void game_imgui_overlay_destroy();
 void game_imgui_overlay_begin_frame();
 void game_imgui_overlay_draw();
 bool game_imgui_overlay_handle_event(void *event);
+void game_toggle_debug_console();
 void bind_debug_command(pcstr cmd, std::function<void(std::istream &, std::ostream &)> f);
 void bind_debug_console_var_int(pcstr var, int &ref);