refactor(render): move rendering to separate module

src/args.rs

@@ -15,7 +15,7 @@ use clap::{
 };
 use clap_complete::{Shell, aot::generate as generate_completions};
 
-use crate::surface::{BackgroundImageScale, BackgroundType, FontSlant, FontWeight, Rgba};
+use crate::util::{BackgroundImageScale, BackgroundType, FontSlant, FontWeight, Rgba};
 
 #[derive(Copy, Clone, Debug, ValueEnum)]
 pub enum LogLevel {

src/auth.rs

@@ -5,7 +5,7 @@ use anyhow::{Result, anyhow};
 use atomic_enum::atomic_enum;
 use pam_rs::{Client, PamFlag};
 use tokio::sync::{mpsc, oneshot};
-use tracing::{debug, warn};
+use tracing::debug;
 use zeroize::Zeroizing;
 
 use crate::config::NLockConfig;

src/buffer.rs

@@ -1,10 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (C) 2026, Nathan Gill
 
-use nix::{
-    sys::mman::{MapFlags, ProtFlags, mmap, munmap},
-    unistd::ftruncate,
-};
 use std::{
     os::{fd::AsFd, raw::c_void},
     ptr::NonNull,
@@ -13,6 +9,11 @@ use std::{
         atomic::{AtomicBool, Ordering},
     },
 };
+
+use nix::{
+    sys::mman::{MapFlags, ProtFlags, mmap, munmap},
+    unistd::ftruncate,
+};
 use wayland_client::{
     Dispatch, QueueHandle,
     protocol::{wl_buffer, wl_shm, wl_surface},

src/cairo_ext.rs

@@ -2,22 +2,53 @@
 // Copyright (C) 2026, Nathan Gill
 
 use anyhow::{Result, anyhow};
-use cairo::{Context, Format, ImageSurface};
+use cairo::{Context, Format, ImageSurface, SubpixelOrder};
 use gdk_pixbuf::Pixbuf;
+use wayland_client::{WEnum, protocol::wl_output};
 
-use crate::surface::Rgba;
+use crate::util::Rgba;
 
 pub trait CairoExt {
     fn ext_set_source_rgba(&self, rgba: Rgba);
 }
 
 impl CairoExt for Context {
-    /// Set source RGBA from a `surface::Rgba` structure.
+    /// Set source RGBA from a `util::Rgba` structure.
     fn ext_set_source_rgba(&self, rgba: Rgba) {
         self.set_source_rgba(rgba.r, rgba.g, rgba.b, rgba.a);
     }
 }
 
+pub trait SubpixelOrderExt {
+    fn from_wl_subpixel(subpixel: WEnum<wl_output::Subpixel>) -> SubpixelOrder;
+}
+
+impl SubpixelOrderExt for SubpixelOrder {
+    /// Convert a Wayland output subpixel enum into a Cairo SubpixelOrder
+    ///
+    /// If the specified output subpixel order has no Cairo equivalent,
+    /// the Cairo default will be used.
+    fn from_wl_subpixel(subpixel: WEnum<wl_output::Subpixel>) -> SubpixelOrder {
+        match subpixel {
+            WEnum::Value(wl_output::Subpixel::HorizontalRgb) => {
+                return SubpixelOrder::Rgb;
+            }
+            WEnum::Value(wl_output::Subpixel::HorizontalBgr) => {
+                return SubpixelOrder::Bgr;
+            }
+            WEnum::Value(wl_output::Subpixel::VerticalRgb) => {
+                return SubpixelOrder::Vrgb;
+            }
+            WEnum::Value(wl_output::Subpixel::VerticalBgr) => {
+                return SubpixelOrder::Vbgr;
+            }
+            _ => {
+                return SubpixelOrder::Default;
+            }
+        }
+    }
+}
+
 pub trait ImageSurfaceExt {
     fn create_from_pixbuf(pixbuf: &Pixbuf) -> Result<ImageSurface>;
 }

src/config.rs

@@ -11,7 +11,7 @@ use tracing::debug;
 
 use crate::{
     args::NLockArgs,
-    surface::{BackgroundImageScale, BackgroundType, FontSlant, FontWeight, Rgba},
+    util::{BackgroundImageScale, BackgroundType, FontSlant, FontWeight, Rgba},
 };
 
 const CONFIG_FILE_NAME: &str = "nlock.toml";

src/event.rs

@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // Copyright (C) 2026, Nathan Gill
 
+use std::{
+    os::fd::{AsFd, AsRawFd, BorrowedFd},
+    sync::atomic::Ordering,
+};
+
 use anyhow::{Result, anyhow};
 use mio::{Events, Interest, Poll, Token, unix::SourceFd};
 use nix::{
     sys::timerfd::{ClockId, Expiration, TimerFd, TimerFlags, TimerSetTimeFlags},
     unistd::read,
 };
-use std::{
-    os::fd::{AsFd, AsRawFd, BorrowedFd},
-    sync::atomic::Ordering,
-};
 use wayland_client::{EventQueue, QueueHandle, backend::ReadEventsGuard};
 
 use crate::{state::NLockState, util::is_eintr};

src/main.rs

@@ -4,23 +4,17 @@
 pub mod args;
 pub mod auth;
 pub mod buffer;
+pub mod cairo_ext;
 pub mod config;
 pub mod event;
-pub mod cairo_ext;
+pub mod render;
 pub mod seat;
 pub mod state;
 pub mod surface;
 pub mod util;
 
 use std::sync::atomic::Ordering;
 
-use crate::{
-    args::run_cli,
-    auth::{AuthConfig, AuthRequest, run_auth_loop},
-    config::NLockConfig,
-    state::NLockState,
-};
-
 use anyhow::{Result, bail};
 
 #[cfg_attr(debug_assertions, allow(unused_imports))]
@@ -30,6 +24,13 @@ use tokio::sync::mpsc;
 use tracing::{debug, error, warn};
 use wayland_client::Connection;
 
+use crate::{
+    args::run_cli,
+    auth::{AuthConfig, AuthRequest, run_auth_loop},
+    config::NLockConfig,
+    state::NLockState,
+};
+
 async fn start(config: NLockConfig) -> Result<()> {
     // Prevent ptrace from attaching to nlock
     // Only do this in release config