cargo fmt

Author: adrerl

channel/src/lib.rs

@@ -9,7 +9,7 @@ use core::{
 /// Single-producer, single-consumer ring buffer.
 /// N MUST be a power of 2. enforced at compile time via const assertion.
 pub struct Channel<T, const N: usize> {
-    buf:  [UnsafeCell<MaybeUninit<T>>; N],
+    buf: [UnsafeCell<MaybeUninit<T>>; N],
     head: AtomicUsize, // producer advances
     tail: AtomicUsize, // consumer advances
 }
@@ -29,10 +29,7 @@ impl<T, const N: usize> Channel<T, N> {
         let _ = Self::ASSERT_POWER_OF_2;
         // SAFETY: MaybeUninit arrays can be zero-initialized.
         Self {
-            buf: unsafe {
-                MaybeUninit::<[UnsafeCell<MaybeUninit<T>>; N]>::zeroed()
-                    .assume_init()
-            },
+            buf: unsafe { MaybeUninit::<[UnsafeCell<MaybeUninit<T>>; N]>::zeroed().assume_init() },
             head: AtomicUsize::new(0),
             tail: AtomicUsize::new(0),
         }
@@ -61,9 +58,7 @@ impl<T, const N: usize> Channel<T, N> {
         if tail == head {
             return None;
         }
-        let msg = unsafe {
-            (*self.buf[tail & (N - 1)].get()).assume_init_read()
-        };
+        let msg = unsafe { (*self.buf[tail & (N - 1)].get()).assume_init_read() };
         self.tail.store(tail.wrapping_add(1), Ordering::Release);
         Some(msg)
     }

compd/src/islands/focus.rs

@@ -10,7 +10,10 @@ pub fn process_msgs(state: &mut CompState) {
             InputMsg::WindowClosed { idx, .. } => {
                 if state.focused == Some(idx as usize) {
                     // refocus next z1 window. desktop (z0) is not focusable.
-                    state.focused = state.windows.iter().enumerate()
+                    state.focused = state
+                        .windows
+                        .iter()
+                        .enumerate()
                         .find(|(_, w)| w.as_ref().map(|w| w.z_layer == 1).unwrap_or(false))
                         .map(|(i, _)| i);
                 }

compd/src/islands/input.rs

@@ -1,8 +1,8 @@
 extern crate alloc;
 
-use libmorpheus::{compositor as compsys, hw, io, process};
-use crate::islands::{CompState, HitRegion, MouseCapture, TITLE_H, BORDER, PANEL_H, MAX_WINDOWS};
+use crate::islands::{CompState, HitRegion, MouseCapture, BORDER, MAX_WINDOWS, PANEL_H, TITLE_H};
 use crate::messages::InputMsg;
+use libmorpheus::{compositor as compsys, hw, io, process};
 
 const CTRL_BRACKET: u8 = 0x1D; // Ctrl+] — focus cycle scancode
 
@@ -14,8 +14,14 @@ pub fn poll(state: &mut CompState) {
 fn poll_keyboard(state: &mut CompState) {
     let mut kb = [0u8; 32];
     let avail = io::stdin_available();
-    let n = if avail > 0 { io::read_stdin(&mut kb) } else { 0 };
-    if n == 0 { return; }
+    let n = if avail > 0 {
+        io::read_stdin(&mut kb)
+    } else {
+        0
+    };
+    if n == 0 {
+        return;
+    }
 
     let mut has_cycle = false;
     for b in kb.iter_mut().take(n) {
@@ -143,7 +149,13 @@ fn poll_mouse(state: &mut CompState) {
                     }
                     route_to_child = false;
                 }
-                MouseCapture::Resize { idx, start_mx, start_my, start_w, start_h } => {
+                MouseCapture::Resize {
+                    idx,
+                    start_mx,
+                    start_my,
+                    start_w,
+                    start_h,
+                } => {
                     if let Some(ref mut win) = state.windows[idx] {
                         let dx = state.mouse_x - start_mx;
                         let dy = state.mouse_y - start_my;
@@ -204,15 +216,19 @@ fn hit_test(state: &CompState, mx: i32, my: i32) -> Option<(usize, HitRegion)> {
     for &c in &candidates[..cn] {
         if let Some(idx) = c {
             if let Some(ref win) = state.windows[idx] {
-                if win.z_layer != 1 { continue; }
+                if win.z_layer != 1 {
+                    continue;
+                }
 
                 let outer_x = win.x - BORDER as i32;
                 let outer_y = win.y - TITLE_H as i32 - BORDER as i32;
                 let outer_w = win.w as i32 + BORDER as i32 * 2;
                 let outer_h = win.h as i32 + TITLE_H as i32 + BORDER as i32 * 2;
 
-                if mx < outer_x || mx >= outer_x + outer_w
-                    || my < outer_y || my >= outer_y + outer_h
+                if mx < outer_x
+                    || mx >= outer_x + outer_w
+                    || my < outer_y
+                    || my >= outer_y + outer_h
                 {
                     continue;
                 }
@@ -223,8 +239,10 @@ fn hit_test(state: &CompState, mx: i32, my: i32) -> Option<(usize, HitRegion)> {
                 let tb_w = win.w as i32;
                 let close_x = tb_x + tb_w - 34;
                 let close_w = 30;
-                if my >= tb_y && my < tb_y + TITLE_H as i32
-                    && mx >= close_x && mx < close_x + close_w
+                if my >= tb_y
+                    && my < tb_y + TITLE_H as i32
+                    && mx >= close_x
+                    && mx < close_x + close_w
                 {
                     return Some((idx, HitRegion::Close));
                 }
@@ -242,8 +260,10 @@ fn hit_test(state: &CompState, mx: i32, my: i32) -> Option<(usize, HitRegion)> {
                 }
 
                 // content area
-                if mx >= win.x && mx < win.x + win.w as i32
-                    && my >= win.y && my < win.y + win.h as i32
+                if mx >= win.x
+                    && mx < win.x + win.w as i32
+                    && my >= win.y
+                    && my < win.y + win.h as i32
                 {
                     return Some((idx, HitRegion::Content));
                 }

compd/src/islands/mod.rs

@@ -1,12 +1,12 @@
-pub mod vsync;
+pub mod focus;
+pub mod input;
 pub mod renderer;
 pub mod surface_mgr;
-pub mod input;
-pub mod focus;
+pub mod vsync;
 
-use libmorpheus::compositor as compsys;
-use channel::Channel;
 use crate::messages::*;
+use channel::Channel;
+use libmorpheus::compositor as compsys;
 
 pub const MAX_WINDOWS: usize = 16;
 pub const TITLE_H: u32 = 22;
@@ -26,26 +26,30 @@ pub const CURSOR_RGB: (u8, u8, u8) = (255, 255, 255);
 pub const PANEL_H: u32 = 30;
 
 pub struct ChildWindow {
-    pub pid:           u32,
-    pub surface_ptr:   *const u32,
-    pub mapped:        bool,
+    pub pid: u32,
+    pub surface_ptr: *const u32,
+    pub mapped: bool,
     pub surface_vaddr: u64,
     pub surface_pages: u64,
-    pub x:             i32,
-    pub y:             i32,
-    pub w:             u32,
-    pub h:             u32,
-    pub src_w:         u32,
-    pub src_h:         u32,
-    pub src_stride:    u32, // in pixels. not bytes. the framebuffer stride IS bytes. yes again.
-    pub title:         [u8; 64],
-    pub title_len:     usize,
-    pub z_layer:       u8,  // 0=desktop background, 1=normal window, 3=overlay
+    pub x: i32,
+    pub y: i32,
+    pub w: u32,
+    pub h: u32,
+    pub src_w: u32,
+    pub src_h: u32,
+    pub src_stride: u32, // in pixels. not bytes. the framebuffer stride IS bytes. yes again.
+    pub title: [u8; 64],
+    pub title_len: usize,
+    pub z_layer: u8, // 0=desktop background, 1=normal window, 3=overlay
 }
 
 #[derive(Clone, Copy)]
 pub enum MouseCapture {
-    Move { idx: usize, off_x: i32, off_y: i32 },
+    Move {
+        idx: usize,
+        off_x: i32,
+        off_y: i32,
+    },
     Resize {
         idx: usize,
         start_mx: i32,
@@ -65,26 +69,26 @@ pub enum HitRegion {
 
 pub struct CompState {
     // --- renderer island owns these ---
-    pub fb_ptr:    *mut u32,
-    pub fb_w:      u32,
-    pub fb_h:      u32,
+    pub fb_ptr: *mut u32,
+    pub fb_w: u32,
+    pub fb_h: u32,
     pub fb_stride: u32, // stride in PIXELS (fb_info.stride / 4). yes confusing. no we can't change it.
-    pub is_bgrx:   bool,
+    pub is_bgrx: bool,
 
     // --- surface_mgr island owns these ---
-    pub windows:     [Option<ChildWindow>; MAX_WINDOWS],
-    pub cascade_n:   i32,
+    pub windows: [Option<ChildWindow>; MAX_WINDOWS],
+    pub cascade_n: i32,
     pub surface_buf: [compsys::SurfaceEntry; MAX_WINDOWS],
     pub desktop_idx: Option<usize>, // slot index of shelld's desktop surface (z_layer 0)
 
     // --- focus island owns these ---
     pub focused: Option<usize>,
 
     // --- input island owns these ---
-    pub mouse_x:      i32,
-    pub mouse_y:      i32,
+    pub mouse_x: i32,
+    pub mouse_y: i32,
     pub last_buttons: u8,
-    pub capture:      Option<MouseCapture>,
+    pub capture: Option<MouseCapture>,
 
     // --- channels (SPSC) ---
     pub ch_input_to_focus: Channel<InputMsg, 16>,
@@ -99,15 +103,15 @@ impl CompState {
             fb_h,
             fb_stride: fb_stride_px,
             is_bgrx,
-            windows:     [NONE; MAX_WINDOWS],
-            cascade_n:   0,
+            windows: [NONE; MAX_WINDOWS],
+            cascade_n: 0,
             surface_buf: [zeroed_surface_entry(); MAX_WINDOWS],
             desktop_idx: None,
-            focused:     None,
-            mouse_x:     (fb_w / 2) as i32,
-            mouse_y:     (fb_h / 2) as i32,
+            focused: None,
+            mouse_x: (fb_w / 2) as i32,
+            mouse_y: (fb_h / 2) as i32,
             last_buttons: 0,
-            capture:      None,
+            capture: None,
             ch_input_to_focus: Channel::new(),
         }
     }