Merge branch 'develop' into plugin_preservetombs

docs/changelog.txt

@@ -59,23 +59,24 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `autolabor`: now unconditionally re-enables vanilla work details when the fort or the plugin is unloaded
+- `autolabor`: ensure vanilla work details are reinstated when the fort or the plugin is unloaded
 - ``dfhack.TranslateName()``: fixed crash on certain invalid names, which affected `warn-starving`
 - EventManager: Unit death event no longer misfires on units leaving the map
 
 ## Misc Improvements
-- `dig`: `digtype` command now has options to choose between designating only visible tiles or hidden tiles, as well as "auto" dig mode. Z-level options adjusted to allow choosing z-levels above, below, or the same as the cursor.
+- `digtype`: designate only visible tiles by default, and use "auto" dig mode for following veins
+- `digtype`: added options for designating only current z-level, this z-level and above, and this z-level and below
 - `hotkeys`: make the DFHack logo brighten on hover in ascii mode to indicate that it is clickable
-- `hotkeys`: use vertical bars instead of "!" symbols for the DFHack logo to make it easier to read
+- `hotkeys`: use vertical bars instead of "!" symbols for the DFHack logo in ascii mode to make it easier to read
-- EventManager: guarded against potential iterator invalidation if one of the event listeners modified the global data structure being iterated over
+- EventManager: guard against potential iterator invalidation if one of the event listeners were to modify the global data structure being iterated over
-- EventManager: changed firing order of building created and building destroyed events to improve performance in the building location cache.
+- EventManager: for ``onBuildingCreatedDestroyed`` events, changed firing order of events so destroyed events come before created events
 
 ## Documentation
 
 ## API
 
 ## Lua
-- mouse key events are now aligned with internal DF semantics: ``_MOUSE_L`` indicates that the left mouse button has just been pressed and ``_MOUSE_L_DOWN`` indicates that the left mouse button is being held down.  similar for ``_MOUSE_R`` and ``_MOUSE_M``. 3rd party scripts may have to adjust.
+- mouse key events are now aligned with internal DF semantics: ``_MOUSE_L`` indicates that the left mouse button has just been pressed and ``_MOUSE_L_DOWN`` indicates that the left mouse button is being held down. similarly for ``_MOUSE_R`` and ``_MOUSE_M``. 3rd party scripts may have to adjust.
 
 ## Removed
 

library/lua/gui/dialogs.lua

@@ -67,7 +67,10 @@ function MessageBox:onInput(keys)
         gui.markMouseClicksHandled(keys)
         return true
     end
-    return self:inputToSubviews(keys)
+    if self:inputToSubviews(keys) then
+        gui.markMouseClicksHandled(keys)
+        return true
+    end
 end
 
 function showMessage(title, text, tcolor, on_close)
@@ -137,7 +140,10 @@ function InputBox:onInput(keys)
         gui.markMouseClicksHandled(keys)
         return true
     end
-    return self:inputToSubviews(keys)
+    if self:inputToSubviews(keys) then
+        gui.markMouseClicksHandled(keys)
+        return true
+    end
 end
 
 function showInputPrompt(title, text, tcolor, input, on_input, on_cancel, min_width)
@@ -239,7 +245,10 @@ function ListBox:onInput(keys)
         gui.markMouseClicksHandled(keys)
         return true
     end
-    return self:inputToSubviews(keys)
+    if self:inputToSubviews(keys) then
+        gui.markMouseClicksHandled(keys)
+        return true
+    end
 end
 
 function showListPrompt(title, text, tcolor, choices, on_select, on_cancel, min_width, filter)

library/xml

@@ -1 +1 @@
-Subproject commit dc1d5c80f03a68f6d58ff4f8dbbdf6855a7e9781
+Subproject commit b313b69adafef0bc3597df285504b729c44bea86

plugins/lua/orders.lua

@@ -100,7 +100,7 @@ function OrdersOverlay:init()
             widgets.HotkeyLabel{
                 frame={t=0, l=15},
                 label='recheck',
-                key='CUSTOM_CTRL_R',
+                key='CUSTOM_CTRL_K',
                 auto_width=true,
                 on_activate=do_recheck,
             },

scripts

@@ -1 +1 @@
-Subproject commit 57c859394936f9183d95426f75a5d3e9b305dd2a
+Subproject commit 8259d95e9ee9d88c88f32b22608d0d8c977aac18