Cleanup deprecated awesome functions

1 files changed, 14 insertions, 16 deletions

diff --git a/.config/awesome/mcrute.lua b/.config/awesome/mcrute.lua
index 4bf6734..60a9d86 100644
--- a/.config/awesome/mcrute.lua
+++ b/.config/awesome/mcrute.lua
@@ -273,7 +273,7 @@ function connect_signals()
     awful.screen.connect_for_each_screen(function(s)
         s:connect_signal("arrange", function()
             for _, c in pairs(awful.client.visible(s)) do
-                if awful.client.floating.get(c) then
+                if c.floating then
                     c.border_width = dpi(3)
                     c.border_color = beautiful.border_focus
                 else
@@ -302,9 +302,9 @@ function connect_signals()
         -- 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
+            -- The use of os.execute here is intentional because it will block
             -- until systemd has finished stopping the target.
-            io.popen("systemctl --user stop desktop.target")
+            os.execute("systemctl --user stop desktop.target")
         end
     end)
 end
@@ -357,15 +357,12 @@ function zoom_screen(zoom_stop)
         zoom_stop = #edp_zoom_modes
     end
 
-    print(zoom_stop)
-    print(mode)
-
     if zoom_stop ~= 0 then
         mode = edp_zoom_modes[zoom_stop]
         panning = default_edp_mode
     end
 
-    awful.util.spawn("xrandr --output eDP-1 --mode " .. mode .. " --panning " .. panning)
+    awful.spawn.spawn("xrandr --output eDP-1 --mode " .. mode .. " --panning " .. panning)
 end
 
 --
@@ -405,10 +402,10 @@ function zoom_screen_reset()
     zoom_screen(0)
 end
 
--- make_spawn is a shortcut for generating awful.util.spawn closures and allows
+-- make_spawn is a shortcut for generating awful.spawn.spawn closures and allows
 -- using this shorthand in other places in this file.
 function make_spawn(cmd)
-    return function() awful.util.spawn(cmd) end
+    return function() awful.spawn.spawn(cmd) end
 end
 
 -- add_global_keys adds additional key bindings to the root key map. More
@@ -506,7 +503,7 @@ end
 -- and position it to the right of the laptop built-in display. This should be
 -- good enough for most screens.
 function default_display_handler(card, edp_mode)
-    awful.util.spawn("xrandr --output eDP-1 --mode " .. edp_mode .. " --output " .. card .. " --auto --right-of eDP-1")
+    awful.spawn.spawn("xrandr --output eDP-1 --mode " .. edp_mode .. " --output " .. card .. " --auto --right-of eDP-1")
 end
 
 -- get_displays uses a shell script helper (~/bin/enumerate-displays) to
@@ -521,6 +518,7 @@ function get_displays()
     local parts = nil
     local outputs = nil
 
+    -- TODO: Make this async (awful.spawn.with_line_callback)
     outputs = io.popen(os.getenv("HOME") .. "/bin/enumerate-displays")
 
     while true do
@@ -552,7 +550,7 @@ function configure_displays()
 
     -- Only built-in display is connected
     if #displays == 1 and displays[1].edid == "DELL_XPS_13" then
-        awful.util.spawn("xrandr " .. 
+        awful.spawn.spawn("xrandr " ..
             "--output eDP-1 --mode " .. default_edp_mode .. " " ..
             "--output DP-1 --off " ..
             "--output DP-2 --off " ..
@@ -564,23 +562,23 @@ function configure_displays()
 
     for _, s in pairs(displays) do
         if s.edid == "DELL U2715H" then -- 27" Dell monitors (assumed 2)
-            awful.util.spawn("xrandr " ..
+            awful.spawn.spawn("xrandr " ..
                 "--output DP-1 --auto " ..
                 "--output DP-2 --auto --right-of DP-1 " ..
                 "--output eDP-1 --off")
             return
         elseif s.edid == "DELL U3219Q" then -- 32" 4k Dell monitor
-            awful.util.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
+            awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
             --split_screen_vertical()
         elseif s.edid == "49S405" then -- 32" 4k Dell monitor
-            awful.util.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
+            awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
             --split_screen_vertical()
         elseif s.edid == "DELL U3415W" then -- 34" curved widescreen Dell monitors
-            awful.util.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
+            awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
             --split_screen_vertical()
             return
         elseif s.edid == "DELL U3417W" then -- 34" curved widescreen Dell monitors
-            awful.util.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
+            awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
             --split_screen_vertical()
             return
         elseif s.edid == "DELL_XPS_13" then -- Built-in display