Move zooming and display mgmt to awesome

1 files changed, 161 insertions, 12 deletions

diff --git a/.config/awesome/mcrute.lua b/.config/awesome/mcrute.lua
index 2cf2071..62b83ae 100644
--- a/.config/awesome/mcrute.lua
+++ b/.config/awesome/mcrute.lua
@@ -10,6 +10,32 @@ local wibox = require("wibox")
 
 local timezone = "America/Los_Angeles"
 
+-- Good clear zoom stops for the Dell XPS 13 93{7,8}0
+local edp_zoom_modes = {
+--    "2560x1440",
+    "2048x1152",
+    "1920x1080",
+    "1600x900",
+    "1368x768",
+    "1280x720",
+    "1024x576",
+    "960x540",
+    "864x486",
+    "720x405",
+    "640x360",
+}
+
+-- Good clear daily driver modes for the Dell XPS 13 93{7,8}0
+local edp_display_modes = {
+    "1600x900",
+    "1920x1080",
+    "2048x1152",
+    "2880x1620",
+}
+
+-- Preferred daily driver mode for the Dell XPS 13 93{7,8}0
+local default_edp_mode = edp_display_modes[3]
+
 function dump(o)
     if type(o) == 'table' then
         local s = '{ '
@@ -23,6 +49,17 @@ function dump(o)
     end
 end
 
+function string_split(s, delimiter)
+    if s == nil then
+        return nil
+    end
+    local result = {}
+    for match in (s..delimiter):gmatch("(.-)"..delimiter) do
+        table.insert(result, match)
+    end
+    return result
+end
+
 -- TODO: figure out how to notify when below 5%
 function battery_low_warning()
     naughty.notify({ preset = naughty.config.presets.critical,
@@ -125,9 +162,10 @@ end
 
 function setup_device_handling()
     -- Refresh screen config when monitors are plugged and unplugged
-    awesome.connect_signal("screen::change", function()
-        awful.spawn.with_shell("$HOME/bin/setup-desktop.sh")
-    end)
+    awesome.connect_signal("screen::change", configure_displays)
+end
+
+function setup_screens()
 end
 
 function set_solid_wallpaper(s)
@@ -203,6 +241,52 @@ function move_mouse_top_right()
     })
 end
 
+function zoom_screen(zoom_stop)
+    local mode = default_edp_mode
+    local panning = "0x0"
+
+    zoom_stop = tonumber(zoom_stop) or 0
+    if zoom_stop > #edp_zoom_modes then
+        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)
+end
+
+local current_zoom_stop = 0
+
+function zoom_screen_up()
+    if current_zoom_stop == #edp_zoom_modes then
+        current_zoom_stop = #edp_zoom_modes
+    else
+        current_zoom_stop = current_zoom_stop + 1
+    end
+
+    zoom_screen(current_zoom_stop)
+end
+
+function zoom_screen_down()
+    if current_zoom_stop == 0 then
+        zoom_screen(0)
+    else
+        current_zoom_stop = current_zoom_stop - 1
+        zoom_screen(current_zoom_stop)
+    end
+end
+
+function zoom_screen_reset()
+    current_zoom_stop = 0
+    zoom_screen(current_zoom_stop)
+end
+
 function add_global_keys(globalkeys)
     light = os.getenv("HOME") .. "/.local/bin/light"
     if not gears.filesystem.file_readable(light) then
@@ -245,7 +329,10 @@ function add_global_keys(globalkeys)
 
         -- Other useful commands
         awful.key({ "Control", "Shift" }, "`",                      make_spawn("xscreensaver-command -lock")),
-        awful.key({ modkey, "Shift"    }, "p",                      move_mouse_top_right)
+        awful.key({ modkey, "Shift"    }, "p",                      move_mouse_top_right),
+        awful.key({ modkey             }, "z",                      zoom_screen_up),
+        awful.key({ modkey             }, "-",                      zoom_screen_down),
+        awful.key({ modkey             }, "=",                      zoom_screen_reset)
     )
 end
 
@@ -296,17 +383,79 @@ function pomodoro()
     }
 end
 
+function default_display_handler(card, edp_mode)
+    awful.util.spawn("xrandr --output eDP-1 --mode ".. edp_mode .. " --output " .. card .. " --auto --right-of eDP-1")
+end
+
+function get_displays()
+    local result = {}
+    local parts = nil
+    local outputs = nil
+
+    -- Do this first to ensure /sys is up-to-date
+    io.popen("xrandr -q"):close()
+    outputs = io.popen(os.getenv("HOME") .. "/bin/enumerate-displays")
+
+    while true do
+        parts = string_split(outputs:read("*l"), ":")
+        if parts == nil then
+            break
+        end
+        table.insert(result, { card = parts[1], edid = parts[2] })
+    end
+
+    outputs:close()
+    return result
+end
+
+function configure_displays()
+    local displays = get_displays()
+
+    -- Only built-in display is connected
+    if #displays == 1 and displays[1].edid == "DELL_XPS_13" then
+        awful.util.spawn("xrandr " .. 
+            "--output eDP-1 --mode " .. default_edp_mode .. " " ..
+            "--output DP-1 --off " ..
+            "--output DP-2 --off " ..
+            "--panning 0x0")
+        return
+    end
+
+    -- TODO: This should be a lot more intelliegent and a lot less hard coded
+    -- but it works for what I do so *shrug*
+    for _, s in pairs(displays) do
+        if s.edid == "DELL U2715H" then -- 27" Dell monitors
+            awful.util.spawn("xrandr " ..
+                "--output DP-1 --auto " ..
+                "--output DP-2 --auto --right-of DP-1 " ..
+                "--output eDP-1 --off")
+            return
+        elseif s.edid == "DELL U3415W" then -- 34" widescreen Dell monitors
+            awful.util.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
+            return
+        elseif s.edid == "DELL_XPS_13" then -- Built-in display
+            -- continue
+        else
+            default_display_handler(s.card, default_edp_mode)
+            return
+        end
+    end
+end
+
 return {
-    dump = dump,
-    setup_device_handling = setup_device_handling,
-    set_solid_wallpaper = set_solid_wallpaper,
-    customize_theme = customize_theme,
-    start_desktop_target = start_desktop_target,
-    add_window_rules = add_window_rules,
     add_global_keys = add_global_keys,
-    get_layouts = get_layouts,
+    add_window_rules = add_window_rules,
     battery_low_warning = battery_low_warning,
-    split_screen = split_screen,
+    configure_displays = configure_displays,
+    customize_theme = customize_theme,
+    dump = dump,
     get_clock = get_clock,
+    get_displays = get_displays,
+    get_layouts = get_layouts,
     pomodoro = pomodoro,
+    set_solid_wallpaper = set_solid_wallpaper,
+    setup_device_handling = setup_device_handling,
+    split_screen = split_screen,
+    start_desktop_target = start_desktop_target,
+    zoom_screen = zoom_screen,
 }