MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3845 from myk002/myk_restore_mouse_state 

restore mouse state after sending input to parent
develop
Myk 2023-10-05 13:57:22 -07:00 committed by GitHub
parent 0b4c5dc51f 8a0956bc83
commit 766b5eb12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/lua/gui.lua
Unescape Escape View File

@ -14,9 +14,15 @@ CLEAR_PEN = to_pen{tile=dfhack.internal.getAddress('init') and df.global.init.te
TRANSPARENT_PEN = to_pen{tile=0, ch=0} TRANSPARENT_PEN = to_pen{tile=0, ch=0}
KEEP_LOWER_PEN = to_pen{ch=32, fg=0, bg=0, keep_lower=true} KEEP_LOWER_PEN = to_pen{ch=32, fg=0, bg=0, keep_lower=true}
local function set_and_get_undo(field, is_set)
local prev_value = df.global.enabler[field]
df.global.enabler[field] = is_set and 1 or 0
return function() df.global.enabler[field] = prev_value end
end
local MOUSE_KEYS = { local MOUSE_KEYS = {
_MOUSE_L = function(is_set) df.global.enabler.mouse_lbut = is_set and 1 or 0 end, _MOUSE_L = curry(set_and_get_undo, 'mouse_lbut'),
_MOUSE_R = function(is_set) df.global.enabler.mouse_rbut = is_set and 1 or 0 end, _MOUSE_R = curry(set_and_get_undo, 'mouse_rbut'),
_MOUSE_M = true, _MOUSE_M = true,
_MOUSE_L_DOWN = true, _MOUSE_L_DOWN = true,
_MOUSE_R_DOWN = true, _MOUSE_R_DOWN = true,
@ -61,12 +67,16 @@ function simulateInput(screen,...)
end end
end end
end end
local undo_fns = {}
for mk, fn in pairs(MOUSE_KEYS) do for mk, fn in pairs(MOUSE_KEYS) do
if type(fn) == 'function' then if type(fn) == 'function' then
fn(enabled_mouse_keys[mk]) table.insert(undo_fns, fn(enabled_mouse_keys[mk]))
end end
end end
dscreen._doSimulateInput(screen, keys) dscreen._doSimulateInput(screen, keys)
for _, undo_fn in ipairs(undo_fns) do
undo_fn()
end
end end
function mkdims_xy(x1,y1,x2,y2) function mkdims_xy(x1,y1,x2,y2)