Accessibility: Zoom

Cargo.toml

@@ -17,7 +17,7 @@ bytemuck = "1.12"
 calloop = {version = "0.14.1", features = ["executor"]}
 cosmic-comp-config = {path = "cosmic-comp-config"}
 cosmic-config = {git = "https://github.com/pop-os/libcosmic/", features = ["calloop", "macro"]}
-cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", rev = "178eb0b", default-features = false, features = ["server"]}
+cosmic-protocols = {git = "https://github.com/pop-os/cosmic-protocols", rev = "ed2a481", default-features = false, features = ["server"]}
 cosmic-settings-config = { git = "https://github.com/pop-os/cosmic-settings-daemon" }
 libdisplay-info = "0.2.0"
 egui = {version = "0.30.0", optional = true}
@@ -115,4 +115,8 @@ inherits = "release"
 lto = "fat"
 
 [patch.crates-io]
-smithay = { git = "https://github.com/smithay/smithay.git", rev = "f93476c" }
+smithay = { git = "https://github.com/smithay/smithay.git", rev = "f93476c" }
+
+[patch."https://github.com/pop-os/cosmic-protocols"]
+cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", rev = "ed2a481" }
+cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", rev = "ed2a481" }

cosmic-comp-config/src/lib.rs

@@ -48,6 +48,7 @@ pub struct CosmicCompConfig {
     pub descale_xwayland: bool,
     /// The threshold before windows snap themselves to output edges
     pub edge_snap_threshold: u32,
+    pub accessibility_zoom: ZoomConfig,
 }
 
 impl Default for CosmicCompConfig {
@@ -79,6 +80,7 @@ impl Default for CosmicCompConfig {
             focus_follows_cursor_delay: 250,
             descale_xwayland: false,
             edge_snap_threshold: 0,
+            accessibility_zoom: ZoomConfig::default(),
         }
     }
 }
@@ -124,3 +126,27 @@ fn default_repeat_rate() -> u32 {
 fn default_repeat_delay() -> u32 {
     600
 }
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
+pub struct ZoomConfig {
+    pub start_on_login: bool,
+    pub increment: u32,
+    pub view_moves: ZoomMovement,
+}
+
+impl Default for ZoomConfig {
+    fn default() -> Self {
+        ZoomConfig {
+            start_on_login: false,
+            increment: 50,
+            view_moves: ZoomMovement::Continuously,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize)]
+pub enum ZoomMovement {
+    OnEdge,
+    Centered,
+    Continuously,
+}

data/keybindings.ron

@@ -70,6 +70,9 @@
     (modifiers: [Super], key: "r"): Resizing(Outwards),
     (modifiers: [Super, Shift], key: "r"): Resizing(Inwards),
 
+    (modifiers: [Super], key: "equal"): ZoomIn,
+    (modifiers: [Super], key: "minus"): ZoomOut,
+
     (modifiers: [Super], key: "b"): System(WebBrowser),
     (modifiers: [Super], key: "f"): System(HomeFolder),
     (modifiers: [Super], key: "t"): System(Terminal),

resources/i18n/de/cosmic_comp.ftl

@@ -1,5 +1,27 @@
+a11y-zoom-move-continuously = Ansicht bewegt kontinuierlich sich mit dem Cursor
+a11y-zoom-move-onedge = Ansicht bewegt sich an den Rändern
+a11y-zoom-move-centered = Ansicht hält Cursor zentriert
+a11y-zoom-settings = Bildschirmlupe-Einstellungen...
 grow-window = Vergrößern
 shrink-window = Verkleinern
 swap-windows = Fenster tauschen
 stack-windows = Fenster stapeln
-unknown-keybinding = <nicht zugewiesen>
+unknown-keybinding = <nicht zugewiesen>
+window-menu-minimize = Minimieren
+window-menu-maximize = Maximieren
+window-menu-tiled = Schwebendes Fenster
+window-menu-screenshot = Bildschirmfoto aufnehmen
+window-menu-move = Bewegen
+window-menu-resize = Größe anpassen
+window-menu-move-prev-workspace = Zur vorherigen Arbeitsfläche verschieben
+window-menu-move-next-workspace = Zur nächsten Arbeitsfläche verschieben 
+window-menu-stack = Fensterstapel erstellen
+window-menu-unstack-all = Fensterstapel auflösen
+window-menu-unstack = Fenster aus Stapel lösen
+window-menu-sticky = Klebendes Fenster
+window-menu-close = Schließen
+window-menu-close-all = Schließe alle Fenster
+window-menu-resize-edge-top = Oben
+window-menu-resize-edge-left = Links
+window-menu-resize-edge-right = Rechts
+window-menu-resize-edge-bottom = Unten

resources/i18n/en/cosmic_comp.ftl

@@ -1,3 +1,7 @@
+a11y-zoom-move-continuously = View moves continuously with pointer
+a11y-zoom-move-onedge = View moves when pointer reaches edge
+a11y-zoom-move-centered = View moves to keep pointer centered
+a11y-zoom-settings = Magnifier settings...
 grow-window = Grow
 shrink-window = Shrink
 swap-windows = Swap Windows

src/backend/mod.rs

@@ -3,9 +3,7 @@
 use crate::state::State;
 use anyhow::{anyhow, Context, Result};
 use cosmic_comp_config::NumlockState;
-use smithay::backend::input::{self as smithay_input};
 use smithay::reexports::{calloop::EventLoop, wayland_server::DisplayHandle};
-use smithay::utils::SERIAL_COUNTER;
 use tracing::{info, warn};
 
 pub mod render;
@@ -72,7 +70,17 @@ pub fn init_backend_auto(
             .write()
             .unwrap()
             .seats
-            .add_seat(initial_seat);
+            .add_seat(initial_seat.clone());
+
+        if state
+            .common
+            .config
+            .cosmic_conf
+            .accessibility_zoom
+            .start_on_login
+        {
+            state.update_zoom(&initial_seat, 1.0, true);
+        }
 
         let desired_numlock = state
             .common

src/backend/render/cursor.rs

@@ -256,6 +256,7 @@ pub fn draw_cursor<R>(
     seat: &Seat<State>,
     location: Point<f64, Logical>,
     scale: Scale<f64>,
+    buffer_scale: f64,
     time: Time<Monotonic>,
     draw_default: bool,
 ) -> Vec<(CursorRenderElement<R>, Point<i32, BufferCoords>)>
@@ -292,7 +293,7 @@ where
             return Vec::new();
         }
 
-        let integer_scale = scale.x.max(scale.y).ceil() as u32;
+        let integer_scale = (scale.x.max(scale.y) * buffer_scale).ceil() as u32;
         let frame = state
             .get_named_cursor(current_cursor)
             .get_image(integer_scale, time.as_millis());