From 6a5f2ecb18d0bd2ac8e530de9f0cb71dc855c483 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 17 Jan 2022 20:57:26 -0500 Subject: [PATCH 1/5] saturn: Provide more dbus constant names Makes reading the code easier^W possible. --- saturn/main.fnl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/saturn/main.fnl b/saturn/main.fnl index fe8650f..9707cbd 100644 --- a/saturn/main.fnl +++ b/saturn/main.fnl @@ -25,12 +25,17 @@ (local DBUS_NAME_FLAG_DO_NOT_QUEUE 4) +(local DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER 1) +(local DBUS_REQUEST_NAME_REPLY_IN_QUEUE 2) +(local DBUS_REQUEST_NAME_REPLY_EXISTS 3) +(local DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4) + (let [ret (bus:RequestName "net.telent.saturn" DBUS_NAME_FLAG_DO_NOT_QUEUE)] - (if (or (= ret 1) (= ret 4)) + (if (or (= ret DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) (= ret DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)) true - (= ret 2) + (= ret DBUS_REQUEST_NAME_REPLY_IN_QUEUE) (error "unexpected DBUS_REQUEST_NAME_REPLY_IN_QUEUE") - (= ret 3) + (= ret DBUS_REQUEST_NAME_REPLY_EXISTS) (do (print "already running") (os.exit 0)))) From e822df5f17a61e8d9956e51829a202efddce24d1 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 18 Jan 2022 20:20:34 +0000 Subject: [PATCH 2/5] saturn: prevent buttons from expanding vertically when few apps On my phone there are only five apps installed, and FlowBox stretches the buttons in weird ways unless told not to Also delete unused local --- saturn/main.fnl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/saturn/main.fnl b/saturn/main.fnl index fe8650f..a6dea99 100644 --- a/saturn/main.fnl +++ b/saturn/main.fnl @@ -131,15 +131,15 @@ (lgi.GObject.Closure (fn [a] (print "get"))) (lgi.GObject.Closure (fn [a] (print "set")))) -(local grid-columns 4) - (let [grid (Gtk.FlowBox { - :column_spacing 2 - :row_spacing 5 - }) + :orientation Gtk.Orientation.HORIZONTAL + :valign Gtk.Align.START + :column_spacing 2 + :row_spacing 5 + }) scrolled-window (Gtk.ScrolledWindow {})] (each [_ app (pairs (all-apps))] - (grid:insert (button-for app) -1)) + (grid:insert (button-for app) -1)) (scrolled-window:add grid) (window:add scrolled-window)) From 38f62baa82d7c86aa83466977bc7846fa6a609d2 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 17 Jan 2022 21:13:11 -0500 Subject: [PATCH 3/5] saturn: Show current instance on re-exec Allows "less dbus-enthusiastic" setups to *just* re-run the saturn executable to show it. --- saturn/main.fnl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/saturn/main.fnl b/saturn/main.fnl index 9707cbd..55a96f4 100644 --- a/saturn/main.fnl +++ b/saturn/main.fnl @@ -36,9 +36,17 @@ (= ret DBUS_REQUEST_NAME_REPLY_IN_QUEUE) (error "unexpected DBUS_REQUEST_NAME_REPLY_IN_QUEUE") (= ret DBUS_REQUEST_NAME_REPLY_EXISTS) - (do - (print "already running") - (os.exit 0)))) + ;; Show the currently running instance + (let [saturn (dbus.Proxy:new + { + :bus dbus.Bus.SESSION + :name "net.telent.saturn" + :interface "net.telent.saturn" + :path "/net/telent/saturn" + })] + (saturn:SetVisible true) + (os.exit 0) + ))) (local lfs (require :lfs)) From 0a2959af30820e2b195d966e28d2773cb5b7ba47 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 18 Jan 2022 20:54:35 +0000 Subject: [PATCH 4/5] review comments --- saturn/main.fnl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/saturn/main.fnl b/saturn/main.fnl index ecbf0e1..a79c7ee 100644 --- a/saturn/main.fnl +++ b/saturn/main.fnl @@ -85,7 +85,6 @@ (fn all-apps [] (var apps-table {}) - ;; for i in ${XDG_DATA_DIRS//:/ /} ; do ls $i/applications/*.desktop ;done (each [path (string.gmatch (os.getenv "XDG_DATA_DIRS") "[^:]*")] (let [apps (.. path "/applications/")] (when (lfs.attributes apps) @@ -97,8 +96,9 @@ apps-table) ;; Exec entries in desktop files may contain %u %f and other characters -;; in which the launcheris supposed to interpolate filenames/urls etc. -;; We don't +;; in which the launcher is supposed to interpolate filenames/urls etc. +;; We don't afford the user any way to pick filenames, but we do need +;; to remove the placeholders. (fn parse-percents [str] (str:gsub "%%(.)" (fn [c] (if (= c "%") "%" "")))) @@ -111,7 +111,7 @@ (posix.execp "/usr/bin/env" vec))))) (fn launch [app] -; (print (if app.DBusActivatable "dbus" "not dbus")) + ;; FIXME check app.DBusActivatable and do DBus launch if true (let [cmd (parse-percents app.Exec)] (if app.Terminal (spawn-async ["kitty" cmd]) From 29a17fafff11546f043f15cc6c0b57fc673dcf11 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 18 Jan 2022 20:55:06 +0000 Subject: [PATCH 5/5] declare dbus service attributes once --- saturn/main.fnl | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/saturn/main.fnl b/saturn/main.fnl index a79c7ee..3a6eef3 100644 --- a/saturn/main.fnl +++ b/saturn/main.fnl @@ -3,6 +3,14 @@ (local dbus (require :dbus_proxy)) (local inspect (require :inspect)) +(local dbus-service-attrs + { + :bus dbus.Bus.SESSION + :name "net.telent.saturn" + :interface "net.telent.saturn" + :path "/net/telent/saturn" + }) + (local bus (dbus.Proxy:new { :bus dbus.Bus.SESSION @@ -30,23 +38,20 @@ (local DBUS_REQUEST_NAME_REPLY_EXISTS 3) (local DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER 4) -(let [ret (bus:RequestName "net.telent.saturn" DBUS_NAME_FLAG_DO_NOT_QUEUE)] - (if (or (= ret DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) (= ret DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)) - true - (= ret DBUS_REQUEST_NAME_REPLY_IN_QUEUE) - (error "unexpected DBUS_REQUEST_NAME_REPLY_IN_QUEUE") - (= ret DBUS_REQUEST_NAME_REPLY_EXISTS) - ;; Show the currently running instance - (let [saturn (dbus.Proxy:new - { - :bus dbus.Bus.SESSION - :name "net.telent.saturn" - :interface "net.telent.saturn" - :path "/net/telent/saturn" - })] - (saturn:SetVisible true) - (os.exit 0) - ))) +(let [ret (bus:RequestName dbus-service-attrs.name + DBUS_NAME_FLAG_DO_NOT_QUEUE)] + (match ret + DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER + true + DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER + true + DBUS_REQUEST_NAME_REPLY_IN_QUEUE + (error "unexpected DBUS_REQUEST_NAME_REPLY_IN_QUEUE") + DBUS_REQUEST_NAME_REPLY_EXISTS + ;; Show the currently running instance + (let [saturn (dbus.Proxy:new dbus-service-attrs)] + (saturn:SetVisible true) + (os.exit 0)))) (local lfs (require :lfs)) @@ -80,7 +85,8 @@ (fn read-desktop-file [f] (let [parsed (inifile.parse f) vals (. parsed "Desktop Entry")] - (when vals.Icon (tset vals "IconImage" (find-icon vals.Icon))) + (when vals.Icon + (tset vals "IconImage" (find-icon vals.Icon))) vals)) (fn all-apps [] @@ -129,8 +135,8 @@ (fn handle-dbus-method-call [conn sender path interface method params invocation] - (when (and (= path "/net/telent/saturn") - (= interface "net.telent.saturn") + (when (and (= path dbus-service-attrs.path) + (= interface dbus-service-attrs.interface) (= method "SetVisible")) (let [[value] (dbus.variant.strip params)] (if value (window:show_all) (window:hide)) @@ -138,7 +144,7 @@ (Gio.DBusConnection.register_object bus.connection - "/net/telent/saturn" + dbus-service-attrs.path interface-info (lgi.GObject.Closure handle-dbus-method-call) (lgi.GObject.Closure (fn [a] (print "get")))