summaryrefslogtreecommitdiff
path: root/library/lua
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-08-22 18:18:19 +0400
committerAlexander Gavrilov2012-08-22 18:18:19 +0400
commit7987ea9a9877a4e9f44492210784c7e8d7f94bb9 (patch)
tree768bd5aacaba64be23592b0a93f99ec8dd733b3d /library/lua
parent6e8b68fb29c52f1782938bf7aa564a516079bf61 (diff)
downloaddfhack-7987ea9a9877a4e9f44492210784c7e8d7f94bb9.tar.gz
dfhack-7987ea9a9877a4e9f44492210784c7e8d7f94bb9.tar.bz2
dfhack-7987ea9a9877a4e9f44492210784c7e8d7f94bb9.tar.xz
Put some compatibility features into the base dfhack viewscreen.
Diffstat (limited to 'library/lua')
-rw-r--r--library/lua/gui.lua6
-rw-r--r--library/lua/gui/dwarfmode.lua9
2 files changed, 7 insertions, 8 deletions
diff --git a/library/lua/gui.lua b/library/lua/gui.lua
index 20d7526e..abe1047c 100644
--- a/library/lua/gui.lua
+++ b/library/lua/gui.lua
@@ -203,6 +203,8 @@ end
Screen = defclass(Screen, dfhack.screen)
+Screen.text_input_mode = false
+
function Screen:isShown()
return self._native ~= nil
end
@@ -219,7 +221,7 @@ function Screen:renderParent()
end
end
-function Screen:inputToParent(...)
+function Screen:sendInputToParent(...)
if self._native and self._native.parent then
simulateInput(self._native.parent, ...)
end
@@ -232,6 +234,8 @@ function Screen:show(below)
self:onAboutToShow(below)
if dscreen.show(self, below) then
self:onShown()
+ else
+ error('Could not show screen')
end
end
diff --git a/library/lua/gui/dwarfmode.lua b/library/lua/gui/dwarfmode.lua
index f38b975f..2d19b2f0 100644
--- a/library/lua/gui/dwarfmode.lua
+++ b/library/lua/gui/dwarfmode.lua
@@ -127,17 +127,12 @@ local move_keys = {
function DwarfOverlay:propagateMoveKeys(keys)
for _,v in ipairs(move_keys) do
if keys[v] then
- self:inputToParent(v)
- return
+ self:sendInputToParent(v)
+ return v
end
end
end
-function DwarfOverlay:onIdle()
- -- Dwarfmode constantly needs repainting
- dscreen.invalidate()
-end
-
function DwarfOverlay:onAboutToShow(below)
local screen = dfhack.gui.getCurViewscreen()
if below then screen = below.parent end