Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

selection_getter: Convert to use a table as argument 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2019-02-10 09:49:11 +01:00
parent 3dac3fd1d8
commit 4c82199d19
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
objects/selection_getter.c
View File

@ -54,8 +54,14 @@ luaA_selection_getter_new(lua_State *L)
selection_getter_t *selection; selection_getter_t *selection;
xcb_atom_t name_atom, target_atom; xcb_atom_t name_atom, target_atom;
name = luaL_checklstring(L, 2, &name_length); luaA_checktable(L, 2);
target = luaL_checklstring(L, 3, &target_length); lua_pushliteral(L, "selection");
lua_gettable(L, 2);
lua_pushliteral(L, "target");
lua_gettable(L, 2);
name = luaL_checklstring(L, -2, &name_length);
target = luaL_checklstring(L, -1, &target_length);
/* Create a selection object */ /* Create a selection object */
selection = (void *) selection_getter_class.allocator(L); selection = (void *) selection_getter_class.allocator(L);

8
tests/test-selection-getter.lua
View File

@ -61,7 +61,7 @@ runner.run_steps{
-- Now query the state of the clipboard (should be empty) -- Now query the state of the clipboard (should be empty)
continue = false continue = false
local s = selection_getter("CLIPBOARD", "TARGETS") local s = selection_getter{ selection = "CLIPBOARD", target = "TARGETS" }
s:connect_signal("data", function(...) error("Got unexpected data: " .. dump_return{...}) end) s:connect_signal("data", function(...) error("Got unexpected data: " .. dump_return{...}) end)
s:connect_signal("data_end", function() s:connect_signal("data_end", function()
assert(not continue) assert(not continue)
@ -97,7 +97,7 @@ runner.run_steps{
-- Query whether the clipboard contains a text (UTF8_STRING) -- Query whether the clipboard contains a text (UTF8_STRING)
continue = false continue = false
local s = selection_getter("CLIPBOARD", "TARGETS") local s = selection_getter{ selection = "CLIPBOARD", target = "TARGETS" }
local data = nil local data = nil
s:connect_signal("data", function(_, d) s:connect_signal("data", function(_, d)
assert(not data) assert(not data)
@ -120,7 +120,7 @@ runner.run_steps{
-- Query the text in the clipboard -- Query the text in the clipboard
continue = false continue = false
local s = selection_getter("CLIPBOARD", "UTF8_STRING") local s = selection_getter{ selection = "CLIPBOARD", target = "UTF8_STRING" }
local data = nil local data = nil
s:connect_signal("data", function(_, d) s:connect_signal("data", function(_, d)
assert(data == nil) assert(data == nil)
@ -161,7 +161,7 @@ runner.run_steps{
-- Query the image in the clipboard -- Query the image in the clipboard
continue = false continue = false
local s = selection_getter("CLIPBOARD", "image/bmp") local s = selection_getter{ selection = "CLIPBOARD", target = "image/bmp" }
local data = {} local data = {}
s:connect_signal("data", function(_, d) s:connect_signal("data", function(_, d)
table.insert(data, d) table.insert(data, d)