Major cleanup of display handling

1 files changed, 65 insertions, 36 deletions

diff --git a/.config/awesome/mcrute.lua b/.config/awesome/mcrute.lua
index ae7056b..a9ec8b3 100644
--- a/.config/awesome/mcrute.lua
+++ b/.config/awesome/mcrute.lua
@@ -39,8 +39,27 @@ if gears.filesystem.file_readable(tz_file) then
     timezone = io.open(tz_file, "r"):read():gsub("^%s*(.-)%s*$", "%1")
 end
 
+-- EDIDs for simple displays that disable the internal screen and set
+-- the external display to auto resolution
+local simple_external_display_ids = {
+    ["DELL U3219Q"]  = true, -- 32" 4k Dell monitor
+    ["49S405"]       = true, -- 32" 4k Dell monitor
+    ["LF32TU87"]     = true, -- 32" 4k Samsung F32TU87x monitor
+    ["DELL U3415W"]  = true, -- 34" curved widescreen Dell monitors
+    ["DELL U3417W"]  = true, -- 34" curved widescreen Dell monitors
+    ["GOOGLE JN32A"] = true, -- 32" Google Branded Monitor
+}
+
+-- EDIDs for internal displays that don't reconfigure themselves
+local internal_display_ids = {
+    AUO_11048 = true,
+    BOE_51207 = true,
+    SHP_20757 = true,
+    SDC_20289 = true,
+}
+
 -- Good clear zoom stops for the Dell XPS 13 93{7,8}0
-local edp_zoom_modes = {
+local edp_zoom_modes_9380 = {
 --  "2880x1620",
 --  "2560x1440",
 --  "2048x1152",
@@ -56,15 +75,13 @@ local edp_zoom_modes = {
 }
 
 -- Good clear daily driver modes for the Dell XPS 13 93{7,8}0
-local edp_display_modes = {
+local edp_display_modes_9380 = {
     "1600x900",
     "1920x1080",
     "2048x1152",
     "2560x1440",
     "2560x1600",
     "2880x1620",
-
-
 }
 
 local edp_display_modes_9320 = {
@@ -77,15 +94,33 @@ local edp_display_modes_9320 = {
     "3840x2400",
 }
 
+local edp_display_modes_9310 = {
+--    "3456x2160",
+    "2560x1600",
+    "1920x1200",
+    "1680x1050",
+    "1400x900",
+    "1280x800",
+}
+
 local default_edp_display_modes = {
-    BOE_51207 = edp_display_modes[3], -- Dell XPS 13 93{7,8}0
-    AUO_11048 = edp_display_modes[3], -- X1 Carbon Display
-    SHP_20757 = edp_display_modes[5], -- Dell XPS 13 9320
+    BOE_51207 = edp_display_modes_9380[3], -- Dell XPS 13 93{7,8}0
+    AUO_11048 = edp_display_modes_9380[3], -- X1 Carbon Display
+    SHP_20757 = edp_display_modes_9380[5], -- Dell XPS 13 9320
+    SDC_20289 = edp_display_modes_9310[1], -- Dell XPS 13 9310
+}
+
+local default_edp_zoom_modes = {
+    BOE_51207 = edp_zoom_modes_9380,
+    AUO_11048 = edp_zoom_modes_9380,
+    SHP_20757 = edp_display_modes_9320,
+    SDC_20289 = edp_display_modes_9310,
 }
 
 -- Preferred daily driver mode
 -- This is populated by the get_default_edp_mode function, below
-local default_edp_mode = edp_display_modes[3]
+local default_edp_mode = edp_display_modes_9380[3]
+local edp_zoom_modes = edp_zoom_modes_9380
 
 -- dumps is a debugging tool that prints text representations of lua objects
 function dump(o)
@@ -610,6 +645,18 @@ end
 
 default_edp_mode = get_default_edp_mode()
 
+-- get_default_zoom_modes enumerates the displays and returns the proffered
+-- zoom mode table for the eDP-1 device.
+--
+-- This function overrides the default set in the top of the file at first
+-- runtime with the correct version for the first display.
+function get_default_zoom_modes()
+    local displays = get_displays()
+    return default_edp_zoom_modes[displays[1].edid]
+end
+
+edp_zoom_modes = get_default_zoom_modes()
+
 -- configure_displays uses xrandr to configure the displays connected to the
 -- system when they are connected for removed.
 --
@@ -625,8 +672,8 @@ default_edp_mode = get_default_edp_mode()
 function configure_displays()
     local displays = get_displays()
 
-    -- Only built-in (XPS 13) display is connected
-    if #displays == 1 and (displays[1].edid == "AUO_11048" or displays[1].edid == "BOE_51207" or displays[1].edid == "SHP_20757") then
+    -- Only an internal display is connected
+    if #displays == 1 and internal_display_ids[displays[1].edid] then
         awful.spawn.spawn("xrandr " ..
             "--output eDP-1 --mode " .. default_edp_mode .. " " ..
             "--output DP-1 --off " ..
@@ -644,35 +691,17 @@ function configure_displays()
                 "--output DP-2 --auto --right-of DP-1 " ..
                 "--output eDP-1 --off")
             return
-        elseif s.edid == "DELL U3219Q" then -- 32" 4k Dell monitor
-            awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
-            --split_screen_vertical()
-        elseif s.edid == "LF32TU87" then -- 32" 4k Samsung monitor
-            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.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
-            --split_screen_vertical()
-        elseif s.edid == "LF32TU87" then -- 32" 4k Samsung F32TU87x monitor
-            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.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.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
-            --split_screen_vertical()
-            return
-        elseif s.edid == "GOOGLE JN32A" then -- XPS 13 Built-in display
+        elseif s.edid == "LG TV" then -- Home TV
+            awful.spawn.spawn("xrandr " ..
+                "--output eDP-1 --mode " .. default_edp_mode ..
+                " --output " .. s.card .. " --mode 1920x1080 " ..
+                "--right-of eDP-1")
+                return
+        elseif simple_external_display_ids[s.edid] then
             awful.spawn.spawn("xrandr --output " .. s.card .. " --auto --output eDP-1 --off")
             return
-        elseif s.edid == "BOE_51207" then -- XPS 13 Built-in display
+        elseif internal_display_ids[s.edid] then
             -- continue
-        elseif s.edid == "AUO_11048" then -- X1 Carbon Built-in display
-            -- continue
-        elseif s.edid == "LG TV" then -- Home TV
-            awful.spawn.spawn("xrandr --output eDP-1 --mode " .. default_edp_mode .. " --output " .. s.card .. " --mode 1920x1080 --right-of eDP-1")
         else
             default_display_handler(s.card, default_edp_mode)
             return