src/main.rs

@@ -2,29 +2,25 @@ use anyhow::Result;
 use fixscreen::*;
 
 fn main() -> Result<()> {
-    let dell43 = Screen {
-        name: ("DELL U4323QE".to_string()),
+    let dell24 = Screen {
+        name: ("DELL U2415".to_string()),
         resolution: Resolution {
-            width: 3840,
-            height: 2160,
+            width: 1920,
+            height: 1200,
         },
-        offset: Offset { x: 2560, y: 0 },
+        offset: Offset { x: 0, y: 950 },
         //orientation: Orientation::Left,
-        workspaces: vec!["fraud".to_string()],
+        workspaces: vec!["distortion".to_string()],
         ..Default::default()
     };
-    let lenovo = Screen {
-        name: ("Lenovo Group Limited P27h-20".to_string()),
+    let dell30 = Screen {
+        name: ("DELL 3007WFP".to_string()),
         resolution: Resolution {
             width: 2560,
-            height: 1440,
+            height: 1600,
         },
-        offset: Offset {
-            x: 0,
-            y: ((dell43.resolution.height - 1440) / 2) as isize,
-        },
-        primary: true,
-        workspaces: vec!["distortion".to_string()],
+        offset: Offset { x: 1920, y: 0 },
+        workspaces: vec!["virtue".to_string()],
         ..Default::default()
     };
     let lg = Screen {
@@ -38,23 +34,29 @@ fn main() -> Result<()> {
             // monitors have a gap, you can move the mouse between any combo. When the top monitor
             // is flush with the left, the bottom monitor will have a hard edge that prevents the
             // mouse from moving to the left monitor.
-            x: (lenovo.resolution.width + dell43.resolution.width) as isize,
-            y: ((dell43.resolution.height - 1440) / 2) as isize,
+            x: 1 + dell24.resolution.height as isize,
+            y: 0,
         },
-        workspaces: vec!["virtue".to_string()],
+        workspaces: vec!["twilight".to_string()],
         ..Default::default()
     };
-    let map = screen_mapping_from_xorg_log("/var/log/X.0.log")?;
-    let lg_connected = std::env::args().len() > 1;
-
-    let mut screens = vec![dell43, lenovo];
-    if lg_connected {
-        screens.push(lg);
-    }
+    let lenovo = Screen {
+        name: ("Lenovo Group Limited P27h-20".to_string()),
+        resolution: Resolution {
+            width: 2560,
+            height: 1440,
+        },
+        offset: Offset { x: 1920, y: 1600 },
+        primary: true,
+        workspaces: vec!["fraud".to_string()],
+        ..Default::default()
+    };
+    let screens = vec![dell24, dell30, lenovo];
     let cfg = Config {
         screens: screens.clone(),
     };
 
+    let map = screen_mapping_from_xorg_log("/var/log/X.0.log")?;
     let cmd = run_cmd(&map, &cfg)?;
     println!("cmd {:#?}", cmd);
     // TODO(wathiede): run xrandr --output $DPY --primary