Add mod1 (alt) support for key hooks
This commit is contained in:
parent
591b153dce
commit
f7bf7279c3
8
base.lua
8
base.lua
|
@ -109,10 +109,11 @@ local function activateKeyboard(data)
|
||||||
if (not (data._internal.private_data.enable_keyboard == false)) and data.visible == true then
|
if (not (data._internal.private_data.enable_keyboard == false)) and data.visible == true then
|
||||||
capi.keygrabber.run(function(mod, key, event)
|
capi.keygrabber.run(function(mod, key, event)
|
||||||
for k,v in pairs(data._internal.filter_hooks or {}) do --TODO modkeys
|
for k,v in pairs(data._internal.filter_hooks or {}) do --TODO modkeys
|
||||||
if k.key == "Mod4" and (key == "End" or key == "Super_L") then
|
if (k.key == "Mod4" or k.key == "Mod1") and (key == "End" or key == "Super_L" or key == "Alt_L") then
|
||||||
local found = false
|
local found = false
|
||||||
for k3,v3 in ipairs(mod) do
|
for k3,v3 in ipairs(mod) do
|
||||||
if v3 == "Mod4" and event == k.event then
|
for k4,v4 in ipairs({"Mod4","Mod1"})do
|
||||||
|
if v3 == v4 and event == k.event then
|
||||||
local retval,self = v(data,mod)
|
local retval,self = v(data,mod)
|
||||||
if self and type(self) == "table" then
|
if self and type(self) == "table" then
|
||||||
data = self
|
data = self
|
||||||
|
@ -120,6 +121,7 @@ local function activateKeyboard(data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
if k.key == key and k.event == event then
|
if k.key == key and k.event == event then
|
||||||
local retval, self = v(data,mod)
|
local retval, self = v(data,mod)
|
||||||
if self and type(self) == "table" then
|
if self and type(self) == "table" then
|
||||||
|
@ -140,7 +142,7 @@ local function activateKeyboard(data)
|
||||||
if data.sub_menu_on == module.event.BUTTON1 then
|
if data.sub_menu_on == module.event.BUTTON1 then
|
||||||
item_mod.execute_sub_menu(data,data._current_item)
|
item_mod.execute_sub_menu(data,data._current_item)
|
||||||
else
|
else
|
||||||
data._current_item.button1()
|
data._current_item.button1(data,data._current_item)
|
||||||
data.visible = false
|
data.visible = false
|
||||||
end
|
end
|
||||||
elseif key == 'Escape' or (key == 'Tab' and data.filter_string == "") then
|
elseif key == 'Escape' or (key == 'Tab' and data.filter_string == "") then
|
||||||
|
|
Loading…
Reference in New Issue