awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1492 from actionless/clone-awful-key-data 

fix(awful: key): clone table with user data
This commit is contained in:
Emmanuel Lepage Vallée 2017-01-31 10:52:57 -05:00 committed by GitHub
parent 22057dcbde 79a60b3009
commit 6c248485db
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/awful/key.lua
View File

@ -95,7 +95,7 @@ function key.new(mod, _key, press, release, data)
end end
-- append custom userdata (like description) to a hotkey -- append custom userdata (like description) to a hotkey
data = data or {} data = data and util.table.clone(data) or {}
data.mod = mod data.mod = mod
data.key = _key data.key = _key
table.insert(key.hotkeys, data) table.insert(key.hotkeys, data)

24
tests/test-awesomerc.lua
View File

@ -4,12 +4,6 @@ local awful = require("awful")
local old_c = nil local old_c = nil
local function get_callback(mod, key)
local inf = {}
awful.key(mod, key, nil, nil, inf)
return inf.execute
end
-- Get a tag and a client -- Get a tag and a client
local function get_c_and_t() local function get_c_and_t()
@ -42,14 +36,12 @@ local steps = {
assert(old_c) assert(old_c)
-- Test layout -- Test layout
-- local cb = get_callback({modkey}, " ")
-- assert(cb)
--TODO use the key once the bug is fixed --TODO use the key once the bug is fixed
local l = old_c.screen.selected_tag.layout local l = old_c.screen.selected_tag.layout
assert(l) assert(l)
-- cb() --awful.key.execute({modkey}, " ")
awful.layout.inc(1) awful.layout.inc(1)
assert(old_c.screen.selected_tag.layout ~= l) assert(old_c.screen.selected_tag.layout ~= l)
@ -57,7 +49,7 @@ local steps = {
-- Test ontop -- Test ontop
assert(not old_c.ontop) assert(not old_c.ontop)
get_callback({modkey}, "t")() awful.key.execute({modkey}, "t")
awesome.sync() awesome.sync()
return true return true
@ -75,7 +67,7 @@ local steps = {
-- Now, test the master_width_factor -- Now, test the master_width_factor
assert(t.master_width_factor == 0.5) assert(t.master_width_factor == 0.5)
get_callback({modkey}, "l")() awful.key.execute({modkey}, "l")
awesome.sync() awesome.sync()
return true return true
@ -90,7 +82,7 @@ local steps = {
-- Now, test the master_count -- Now, test the master_count
assert(t.master_count == 1) assert(t.master_count == 1)
get_callback({modkey, "Shift"}, "h")() awful.key.execute({modkey, "Shift"}, "h")
awesome.sync() awesome.sync()
return true return true
@ -105,8 +97,8 @@ local steps = {
-- Now, test the column_count -- Now, test the column_count
assert(t.column_count == 1) assert(t.column_count == 1)
get_callback({modkey, "Control"}, "h")() awful.key.execute({modkey, "Control"}, "h")
get_callback({modkey, "Shift" }, "l")() awful.key.execute({modkey, "Shift" }, "l")
awesome.sync() awesome.sync()
return true return true
@ -121,7 +113,7 @@ local steps = {
-- Now, test the switching tag -- Now, test the switching tag
assert(t.index == 1) assert(t.index == 1)
get_callback({modkey, }, "Right")() awful.key.execute({modkey, }, "Right")
awesome.sync() awesome.sync()
return true return true
@ -201,7 +193,7 @@ local steps = {
-- tags[1] and the client history should be kept -- tags[1] and the client history should be kept
assert(client.focus == old_c) assert(client.focus == old_c)
--get_callback({modkey, "Shift" }, "#"..(9+i))() --FIXME --awful.key.execute({modkey, "Shift" }, "#"..(9+i)) --FIXME
client.focus:move_to_tag(tags[2]) client.focus:move_to_tag(tags[2])
assert(not client.focus) assert(not client.focus)