diff options
author | Kevin <[email protected]> | 2024-10-13 12:57:37 -0300 |
---|---|---|
committer | Kevin <[email protected]> | 2024-10-16 00:39:42 -0300 |
commit | 4dd0b1840d343dc65f1c781c3d6b8731b6e79eda (patch) | |
tree | 8749b46606589982d438bfd62aa1cdc682c2b3ae /lang/lua/astal/gtk3 | |
parent | dcc38701e9aa544f5f585c2bb2cc82d7fecca675 (diff) |
core: lua compat 5.1/5.4/luajit
Diffstat (limited to 'lang/lua/astal/gtk3')
-rw-r--r-- | lang/lua/astal/gtk3/app.lua | 16 | ||||
-rw-r--r-- | lang/lua/astal/gtk3/astalify.lua | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua index 7895f69..13347c3 100644 --- a/lang/lua/astal/gtk3/app.lua +++ b/lang/lua/astal/gtk3/app.lua @@ -5,6 +5,15 @@ local AstalIO = lgi.require("AstalIO", "0.1") local AstalLua = Astal.Application:derive("AstalLua") local request_handler +local function unpack(t, i) + i = i or 1 + if t[i] == nil then + return nil + else + return t[i], unpack(t, i + 1) + end +end + function AstalLua:do_request(msg, conn) if type(request_handler) == "function" then request_handler(msg, function(response) @@ -76,7 +85,7 @@ function Astal.Application:start(config) app.on_activate = function() if type(config.main) == "function" then - config.main(table.unpack(arg)) + config.main(unpack(arg)) end if config.hold then self:hold() @@ -86,8 +95,13 @@ function Astal.Application:start(config) local _, err = app:acquire_socket() if err ~= nil then return config.client(function(msg) +<<<<<<< HEAD:lang/lua/astal/gtk3/app.lua return AstalIO.send_message(self.instance_name, msg) end, table.unpack(arg)) +======= + return Astal.Application.send_message(self.instance_name, msg) + end, unpack(arg)) +>>>>>>> 18df91b (core: lua compat 5.1/5.4/luajit):core/lua/astal/application.lua end self:run(nil) diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua index 065de40..c344c07 100644 --- a/lang/lua/astal/gtk3/astalify.lua +++ b/lang/lua/astal/gtk3/astalify.lua @@ -28,8 +28,7 @@ local function map(tbl, fn) return copy end -local flatten -flatten = function(tbl) +local function flatten(tbl) local copy = {} for _, value in pairs(tbl) do if type(value) == "table" and getmetatable(value) == nil then |