`df76f20`

fix scaling: validate profile monitors and always reset scale transform

- Don't apply profile positions when monitor set doesn't match current
- Add sanity check for clearly invalid positions (negative or >10000)
- Watchdog now always includes --scale NxN to reset transforms
- Fixes issue where stale multi-monitor profile caused wrong positions

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: df76f209e963646faf5481d7f739b90786a3ae02
Parents: 74bf29b
Tree: 94e1396

2 changed files

Status	File	+	-
M	`gardisplay/src/app.rs`	39	7
M	`gardisplay/src/watchdog.rs`	8	6

gardisplay/src/app.rsmodified

              .map(|m| (m.name.as_str(), m))
              .collect();
 +        // Check if the profile's monitor set matches the current monitors
 +        let current_monitors: Vec<&str> = view.monitors().iter().map(|s| s.info.name.as_str()).collect();
 +        let profile_monitors: Vec<&str> = profile.monitors.iter().map(|m| m.name.as_str()).collect();
++
 +        let monitors_match = current_monitors.len() == profile_monitors.len()
 +            && current_monitors.iter().all(|m| profile_monitors.contains(m));
++
 +        if !monitors_match {
 +            tracing::warn!(
 +                "profile monitors {:?} don't match current monitors {:?}, skipping position loading",
 +                profile_monitors,
 +                current_monitors
 +            );
 +            // Still set primary if specified
 +            if let Some(ref primary) = profile.primary {
 +                view.set_primary(primary);
 +            }
 +            view.recalculate_layout();
 +            return;
 +        }
++
          // Update monitor positions from profile
          for state in view.monitors_mut() {
              if let Some(config) = config_map.get(state.info.name.as_str()) {
 -                state.real_position = gartk_core::Point::new(config.x, config.y);
 -                tracing::debug!(
 -                    "loaded {} at ({}, {})",
 -                    state.info.name,
 -                    config.x,
 -                    config.y
 -                );
 +                // Sanity check: don't apply positions that are clearly wrong
 +                // (negative positions or positions way outside screen bounds)
 +                if config.x >= 0 && config.y >= 0 && config.x < 10000 && config.y < 10000 {
 +                    state.real_position = gartk_core::Point::new(config.x, config.y);
 +                    tracing::debug!(
 +                        "loaded {} at ({}, {})",
 +                        state.info.name,
 +                        config.x,
 +                        config.y
 +                    );
 +                } else {
 +                    tracing::warn!(
 +                        "ignoring invalid position ({}, {}) for {}",
 +                        config.x,
 +                        config.y,
 +                        state.info.name
 +                    );
 +                }
+             }
+         }

gardisplay/src/watchdog.rsmodified

              _ => "normal",
          };
 -        // Include scale if not 1.0
 -        let scale_arg = if (config.scale - 1.0).abs() > 0.001 {
 -            format!(" --scale {}x{}", config.scale, config.scale)
 +        // Always include scale to reset any transforms
 +        // scale 1x1 resets to identity transform
 +        let scale = if (config.scale - 1.0).abs() > 0.001 {
 +            config.scale
          } else {
 -            String::new()
 +            1.0
          };
          commands.push(format!(
 -            "xrandr --output {} --mode {}x{} --pos {}x{} --rotate {}{}",
 +            "xrandr --output {} --mode {}x{} --pos {}x{} --rotate {} --scale {}x{}",
              config.name,
              config.width,
              config.height,
              config.x,
              config.y,
              rotation,
 -            scale_arg
 +            scale,
 +            scale
          ));
+     }