prompt: Fix hooks when number or caps lock are set

This commit is contained in:
Emmanuel Lepage Vallee 2016-06-19 00:23:46 -04:00
parent 31e2a19f65
commit a87d75246f
1 changed files with 12 additions and 2 deletions

View File

@ -22,6 +22,7 @@ local unpack = unpack or table.unpack -- luacheck: globals unpack (compatibility
local keygrabber = require("awful.keygrabber") local keygrabber = require("awful.keygrabber")
local util = require("awful.util") local util = require("awful.util")
local beautiful = require("beautiful") local beautiful = require("beautiful")
local akey = require("awful.key")
local prompt = {} local prompt = {}
@ -360,15 +361,24 @@ function prompt.run(args, textbox, exe_callback, completion_callback,
end end
end end
local filtered_modifiers = {}
-- User defined cases -- User defined cases
if hooks[key] then if hooks[key] then
-- Remove caps and num lock
for _, m in ipairs(modifiers) do
if not util.table.hasitem(akey.ignore_modifiers, m) then
table.insert(filtered_modifiers, m)
end
end
for _,v in ipairs(hooks[key]) do for _,v in ipairs(hooks[key]) do
if #modifiers == #v[1] then if #filtered_modifiers == #v[1] then
local match = true local match = true
for _,v2 in ipairs(v[1]) do for _,v2 in ipairs(v[1]) do
match = match and mod[v2] match = match and mod[v2]
end end
if match or #modifiers == 0 then if match or #filtered_modifiers == 0 then
local cb local cb
local ret = v[3](command) local ret = v[3](command)
if ret then if ret then