update lua and gjs layout

installing the gjs package through meson or npm now results in the same
exposed structure

lua: fix rockspec

docs: aur package

4 files changed, 427 insertions, 0 deletions

diff --git a/lang/lua/astal/gtk3/app.lua b/lang/lua/astal/gtk3/app.lua
new file mode 100644
index 0000000..7895f69
--- /dev/null
+++ b/lang/lua/astal/gtk3/app.lua
@@ -0,0 +1,96 @@
+local lgi = require("lgi")
+local Astal = lgi.require("Astal", "3.0")
+local AstalIO = lgi.require("AstalIO", "0.1")
+
+local AstalLua = Astal.Application:derive("AstalLua")
+local request_handler
+
+function AstalLua:do_request(msg, conn)
+    if type(request_handler) == "function" then
+        request_handler(msg, function(response)
+            AstalIO.write_sock(conn, tostring(response), function(_, res)
+                AstalIO.write_sock_finish(res)
+            end)
+        end)
+    else
+        Astal.Application.do_request(self, msg, conn)
+    end
+end
+
+function AstalLua:quit(code)
+    Astal.Application.quit(self)
+    os.exit(code)
+end
+
+local app = AstalLua()
+
+---@class StartConfig
+---@field icons? string
+---@field instance_name? string
+---@field gtk_theme? string
+---@field icon_theme? string
+---@field cursor_theme? string
+---@field css? string
+---@field hold? boolean
+---@field request_handler? fun(msg: string, response: fun(res: any))
+---@field main? fun(...): unknown
+---@field client? fun(message: fun(msg: string): string, ...): unknown
+
+---@param config StartConfig | nil
+function Astal.Application:start(config)
+    if config == nil then
+        config = {}
+    end
+
+    if config.client == nil then
+        config.client = function()
+            print('Astal instance "' .. app.instance_name .. '" is already running')
+            os.exit(1)
+        end
+    end
+
+    if config.hold == nil then
+        config.hold = true
+    end
+
+    request_handler = config.request_handler
+
+    if config.css then
+        self:apply_css(config.css)
+    end
+    if config.icons then
+        self:add_icons(config.icons)
+    end
+    if config.instance_name then
+        self.instance_name = config.instance_name
+    end
+    if config.gtk_theme then
+        self.gtk_theme = config.gtk_theme
+    end
+    if config.icon_theme then
+        self.icon_theme = config.icon_theme
+    end
+    if config.cursor_theme then
+        self.cursor_theme = config.cursor_theme
+    end
+
+    app.on_activate = function()
+        if type(config.main) == "function" then
+            config.main(table.unpack(arg))
+        end
+        if config.hold then
+            self:hold()
+        end
+    end
+
+    local _, err = app:acquire_socket()
+    if err ~= nil then
+        return config.client(function(msg)
+            return AstalIO.send_message(self.instance_name, msg)
+        end, table.unpack(arg))
+    end
+
+    self:run(nil)
+end
+
+return app
diff --git a/lang/lua/astal/gtk3/astalify.lua b/lang/lua/astal/gtk3/astalify.lua
new file mode 100644
index 0000000..065de40
--- /dev/null
+++ b/lang/lua/astal/gtk3/astalify.lua
@@ -0,0 +1,236 @@
+local lgi = require("lgi")
+local Astal = lgi.require("Astal", "3.0")
+local Gtk = lgi.require("Gtk", "3.0")
+local GObject = lgi.require("GObject", "2.0")
+local Binding = require("astal.lib.binding")
+local Variable = require("astal.lib.variable")
+local exec_async = require("astal.lib.process").exec_async
+
+local function filter(tbl, fn)
+    local copy = {}
+    for key, value in pairs(tbl) do
+        if fn(value, key) then
+            if type(key) == "number" then
+                table.insert(copy, value)
+            else
+                copy[key] = value
+            end
+        end
+    end
+    return copy
+end
+
+local function map(tbl, fn)
+    local copy = {}
+    for key, value in pairs(tbl) do
+        copy[key] = fn(value)
+    end
+    return copy
+end
+
+local flatten
+flatten = function(tbl)
+    local copy = {}
+    for _, value in pairs(tbl) do
+        if type(value) == "table" and getmetatable(value) == nil then
+            for _, inner in pairs(flatten(value)) do
+                table.insert(copy, inner)
+            end
+        else
+            table.insert(copy, value)
+        end
+    end
+    return copy
+end
+
+local function includes(tbl, elem)
+    for _, value in pairs(tbl) do
+        if value == elem then
+            return true
+        end
+    end
+    return false
+end
+
+local function set_children(parent, children)
+    children = map(flatten(children), function(item)
+        if Gtk.Widget:is_type_of(item) then
+            return item
+        end
+        return Gtk.Label({
+            visible = true,
+            label = tostring(item),
+        })
+    end)
+
+    -- remove
+    if Gtk.Bin:is_type_of(parent) then
+        local ch = parent:get_child()
+        if ch ~= nil then
+            parent:remove(ch)
+        end
+        if ch ~= nil and not includes(children, ch) and not parent.no_implicit_destroy then
+            ch:destroy()
+        end
+    elseif Gtk.Container:is_type_of(parent) then
+        for _, ch in ipairs(parent:get_children()) do
+            parent:remove(ch)
+            if ch ~= nil and not includes(children, ch) and not parent.no_implicit_destroy then
+                ch:destroy()
+            end
+        end
+    end
+
+    -- TODO: add more container types
+    if Astal.Box:is_type_of(parent) then
+        parent:set_children(children)
+    elseif Astal.Stack:is_type_of(parent) then
+        parent:set_children(children)
+    elseif Astal.CenterBox:is_type_of(parent) then
+        parent.start_widget = children[1]
+        parent.center_widget = children[2]
+        parent.end_widget = children[3]
+    elseif Astal.Overlay:is_type_of(parent) then
+        parent:set_child(children[1])
+        children[1] = nil
+        parent:set_overlays(children)
+    elseif Gtk.Container:is_type_of(parent) then
+        for _, child in pairs(children) do
+            if Gtk.Widget:is_type_of(child) then
+                parent:add(child)
+            end
+        end
+    end
+end
+
+local function merge_bindings(array)
+    local function get_values(...)
+        local args = { ... }
+        local i = 0
+        return map(array, function(value)
+            if getmetatable(value) == Binding then
+                i = i + 1
+                return args[i]
+            else
+                return value
+            end
+        end)
+    end
+
+    local bindings = filter(array, function(v)
+        return getmetatable(v) == Binding
+    end)
+
+    if #bindings == 0 then
+        return array
+    end
+
+    if #bindings == 1 then
+        return bindings[1]:as(get_values)
+    end
+
+    return Variable.derive(bindings, get_values)()
+end
+
+return function(ctor)
+    function ctor:hook(object, signalOrCallback, callback)
+        if GObject.Object:is_type_of(object) and type(signalOrCallback) == "string" then
+            local id
+            if string.sub(signalOrCallback, 1, 8) == "notify::" then
+                local prop = string.gsub(signalOrCallback, "notify::", "")
+                id = object.on_notify:connect(function()
+                    callback(self, object[prop])
+                end, prop, false)
+            else
+                id = object["on_" .. signalOrCallback]:connect(function(_, ...)
+                    callback(self, ...)
+                end)
+            end
+            self.on_destroy = function()
+                GObject.signal_handler_disconnect(object, id)
+            end
+        elseif type(object.subscribe) == "function" then
+            local unsub = object.subscribe(function(...)
+                signalOrCallback(self, ...)
+            end)
+            self.on_destroy = unsub
+        else
+            error("can not hook: not gobject+signal or subscribable")
+        end
+    end
+
+    function ctor:toggle_class_name(name, on)
+        Astal.widget_toggle_class_name(self, name, on)
+    end
+
+    return function(tbl)
+        if tbl == nil then
+            tbl = {}
+        end
+
+        local bindings = {}
+        local setup = tbl.setup
+
+        -- collect children
+        local children = merge_bindings(flatten(filter(tbl, function(_, key)
+            return type(key) == "number"
+        end)))
+
+        -- default visible to true
+        if type(tbl.visible) ~= "boolean" then
+            tbl.visible = true
+        end
+
+        -- collect props
+        local props = filter(tbl, function(_, key)
+            return type(key) == "string" and key ~= "setup"
+        end)
+
+        -- collect signal handlers
+        for prop, value in pairs(props) do
+            if string.sub(prop, 0, 2) == "on" and type(value) ~= "function" then
+                props[prop] = function()
+                    exec_async(value, print)
+                end
+            end
+        end
+
+        -- collect bindings
+        for prop, value in pairs(props) do
+            if getmetatable(value) == Binding then
+                bindings[prop] = value
+                props[prop] = value:get()
+            end
+        end
+
+        -- construct, attach bindings, add children
+        local widget = ctor()
+
+        if getmetatable(children) == Binding then
+            set_children(widget, children:get())
+            widget.on_destroy = children:subscribe(function(v)
+                set_children(widget, v)
+            end)
+        else
+            if #children > 0 then
+                set_children(widget, children)
+            end
+        end
+
+        for prop, binding in pairs(bindings) do
+            widget.on_destroy = binding:subscribe(function(v)
+                widget[prop] = v
+            end)
+        end
+
+        for prop, value in pairs(props) do
+            widget[prop] = value
+        end
+
+        if type(setup) == "function" then
+            setup(widget)
+        end
+
+        return widget
+    end
+end
diff --git a/lang/lua/astal/gtk3/init.lua b/lang/lua/astal/gtk3/init.lua
new file mode 100644
index 0000000..6fb5455
--- /dev/null
+++ b/lang/lua/astal/gtk3/init.lua
@@ -0,0 +1,5 @@
+return {
+    App = require("astal.gtk3.app"),
+    astalify = require("astal.gtk3.astalify"),
+    Widget = require("astal.gtk3.widget"),
+}
diff --git a/lang/lua/astal/gtk3/widget.lua b/lang/lua/astal/gtk3/widget.lua
new file mode 100644
index 0000000..beaad6c
--- /dev/null
+++ b/lang/lua/astal/gtk3/widget.lua
@@ -0,0 +1,90 @@
+local lgi = require("lgi")
+local Astal = lgi.require("Astal", "3.0")
+local Gtk = lgi.require("Gtk", "3.0")
+local astalify = require("astal.gtk3.astalify")
+
+local Widget = {
+    astalify = astalify,
+    Box = astalify(Astal.Box),
+    Button = astalify(Astal.Button),
+    CenterBox = astalify(Astal.CenterBox),
+    CircularProgress = astalify(Astal.CircularProgress),
+    DrawingArea = astalify(Gtk.DrawingArea),
+    Entry = astalify(Gtk.Entry),
+    EventBox = astalify(Astal.EventBox),
+    -- TODO: Fixed
+    -- TODO: FlowBox
+    Icon = astalify(Astal.Icon),
+    Label = astalify(Gtk.Label),
+    LevelBar = astalify(Astal.LevelBar),
+    -- TODO: ListBox
+    Overlay = astalify(Astal.Overlay),
+    Revealer = astalify(Gtk.Revealer),
+    Scrollable = astalify(Astal.Scrollable),
+    Slider = astalify(Astal.Slider),
+    Stack = astalify(Astal.Stack),
+    Switch = astalify(Gtk.Switch),
+    Window = astalify(Astal.Window),
+}
+
+Gtk.Widget._attribute.css = {
+    get = Astal.widget_get_css,
+    set = Astal.widget_set_css,
+}
+
+Gtk.Widget._attribute.class_name = {
+    get = function(self)
+        local result = ""
+        local strings = Astal.widget_get_class_names(self)
+        for i, str in ipairs(strings) do
+            result = result .. str
+            if i < #strings then
+                result = result .. " "
+            end
+        end
+        return result
+    end,
+    set = function(self, class_name)
+        local names = {}
+        for word in class_name:gmatch("%S+") do
+            table.insert(names, word)
+        end
+        Astal.widget_set_class_names(self, names)
+    end,
+}
+
+Gtk.Widget._attribute.cursor = {
+    get = Astal.widget_get_cursor,
+    set = Astal.widget_set_cursor,
+}
+
+Gtk.Widget._attribute.click_through = {
+    get = Astal.widget_get_click_through,
+    set = Astal.widget_set_click_through,
+}
+
+local no_implicit_destroy = {}
+Gtk.Widget._attribute.no_implicit_destroy = {
+    get = function(self)
+        return no_implicit_destroy[self] or false
+    end,
+    set = function(self, v)
+        if no_implicit_destroy[self] == nil then
+            self.on_destroy = function()
+                no_implicit_destroy[self] = nil
+            end
+        end
+        no_implicit_destroy[self] = v
+    end,
+}
+
+Astal.Box._attribute.children = {
+    get = Astal.Box.get_children,
+    set = Astal.Box.set_children,
+}
+
+return setmetatable(Widget, {
+    __call = function(_, ctor)
+        return astalify(ctor)
+    end,
+})