Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop

Conflicts:
	docs/changelog.txt

docs/changelog.txt

@@ -35,6 +35,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 ## Fixes
 - `buildingplan`: fixed an issue where planned constructions designated with DF's sizing keys (``umkh``) would sometimes be larger than requested
+- `command-prompt`: fixed issues where overlays created by running certain commands (e.g. `gui/liquids`, `gui/teleport`) would not update the parent screen correctly
 
 ## Lua
 - ``gui.Painter``: fixed error when calling ``viewport()`` method

library/include/modules/Screen.h

@@ -308,12 +308,15 @@ namespace DFHack
 
         //! Temporary hide a screen until destructor is called
         struct DFHACK_EXPORT Hide {
-            Hide(df::viewscreen* screen);
+            Hide(df::viewscreen* screen, int flags = 0);
             ~Hide();
+
+            static const int RESTORE_AT_TOP = 0x1;
         private:
             void extract(df::viewscreen*);
             void merge(df::viewscreen*);
-            df::viewscreen* screen_;
+            df::viewscreen* screen;
+            int flags;
         };
     }
 

library/modules/Screen.cpp

@@ -378,16 +378,16 @@ bool Screen::hasActiveScreens(Plugin *plugin)
 
 namespace DFHack { namespace Screen {
 
-Hide::Hide(df::viewscreen* screen) :
-    screen_{screen}
+Hide::Hide(df::viewscreen* screen, int flags) :
+    screen{screen}, flags{flags}
 {
-    extract(screen_);
+    extract(screen);
 }
 
 Hide::~Hide()
 {
-    if (screen_)
-        merge(screen_);
+    if (screen)
+        merge(screen);
 }
 
 void Hide::extract(df::viewscreen* a)
@@ -402,6 +402,13 @@ void Hide::extract(df::viewscreen* a)
 
 void Hide::merge(df::viewscreen* a)
 {
+    if (flags & RESTORE_AT_TOP) {
+        a->parent = NULL;
+        a->child = NULL;
+        Screen::show(std::unique_ptr<df::viewscreen>(a));
+        return;
+    }
+
     df::viewscreen* ap = a->parent;
     df::viewscreen* ac = a->parent->child;
 

plugins/command-prompt.cpp

@@ -201,7 +201,7 @@ void viewscreen_commandpromptst::submit()
     submitted = true;
     prompt_ostream out(this);
     {
-        Screen::Hide hide_guard(this);
+        Screen::Hide hide_guard(this, Screen::Hide::RESTORE_AT_TOP);
         Core::getInstance().runCommand(out, get_entry());
     }
     if(out.empty() && responses.empty())