Better start/stop handling for awesome

2 files changed, 26 insertions, 28 deletions

diff --git a/.config/awesome/mcrute.lua b/.config/awesome/mcrute.lua
index d1bfa02..064eb1c 100644
--- a/.config/awesome/mcrute.lua
+++ b/.config/awesome/mcrute.lua
@@ -218,13 +218,6 @@ local function do_equal(p, orientation)
     end
 end
 
--- setup_device_handling configures callbacks that need to be run when
--- something changes about the system. This used to connect some dbus events to
--- configure keyboards and mice but just does display management now.
-function setup_device_handling()
-    awesome.connect_signal("screen::change", configure_displays)
-end
-
 -- set_solid_wallpaper sets the gears wallpaper to a solid color as defined in
 -- beautiful.bg_normal
 function set_solid_wallpaper(s)
@@ -257,23 +250,31 @@ function customize_theme()
     end
 end
 
--- start_desktop_target calls systemd to startup all the processes in the user
--- session and hooks the quit function to properly shutdown systemd when
--- awesome quits. This starts a desktop.target in the user mode systemd which
--- can pull in widgets and anything else that enhances the desktop environment.
-function start_desktop_target()
-    awful.spawn.spawn("systemctl --user start desktop.target")
-
-    -- Only do this once in case awesome gets reloaded
-    if not awesome._awesome_quit then
-        awesome._awesome_quit = awesome.quit
-        awesome.quit = function()
-            -- The use of io.popen here is intentional because it will block until
-            -- systemd has finished stopping the target
-            io.popen("systemctl --user --wait stop desktop.target")
-            awesome._awesome_quit()
+-- connect_signals hooks into startup, exit, and screen change events. On
+-- startup it will start the desktop.target in the user mode systemd which can
+-- pull in widgets and anything else that enhances the desktop environment. It
+-- will stop this target at exit and wait for that shutdown to complete.
+--
+-- This function also configures callbacks that need to be run when something
+-- changes about the system. This used to connect some dbus events to configure
+-- keyboards and mice but just does display management now.
+function connect_signals()
+    awesome.connect_signal("screen::change", configure_displays)
+
+    awesome.connect_signal("startup", function()
+        awful.spawn.spawn("systemctl --user start desktop.target")
+    end)
+
+    awesome.connect_signal("exit", function(is_restart)
+        -- There is no need to do this if this is a restart because the current
+        -- awesome exec's a new awesome which will inherit everything from the
+        -- current session.
+        if not is_restart then
+            -- The use of io.popen here is intentional because it will block
+            -- until systemd has finished stopping the target.
+            io.popen("systemctl --user stop desktop.target")
         end
-    end
+    end)
 end
 
 -- add_window_rules mixes additional window rules into awful.rules.rules. To
@@ -555,11 +556,10 @@ return {
     -- Public "API" used by rc.lua
     add_global_keys = add_global_keys,
     add_window_rules = add_window_rules,
+    connect_signals = connect_signals,
     customize_theme = customize_theme,
     get_clock = get_clock,
     get_layouts = get_layouts,
-    setup_device_handling = setup_device_handling,
-    start_desktop_target = start_desktop_target,
     battery = battery,
 
     -- Public functions that are useful on import
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 3577384..7c763f3 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -20,7 +20,7 @@ require("awful.hotkeys_popup.keys")
 -- See this file for more details about local customizations
 local mcrute = require("mcrute")
 
-mcrute.setup_device_handling()
+mcrute.connect_signals()
 
 -- {{{ Error handling
 -- Check if awesome encountered an error during startup and fell back to
@@ -502,5 +502,3 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
-
-mcrute.start_desktop_target()