src/main.rs

@@ -3,7 +3,6 @@ mod state;
 
 use setup::{become_wm, handle_args};
 
-use state::WmState;
 use x11rb::{connect, connection::Connection};
 
 fn main() -> anyhow::Result<()> {
@@ -18,7 +17,6 @@ fn main() -> anyhow::Result<()> {
 
     become_wm(&conn, screen)?;
 
-    let mut _wm_state = WmState::new(&conn, screen_num)?;
     // TODO: setup
     // Whole bunch to do here
     //  - setting up application state

src/state.rs

@@ -27,16 +27,16 @@ impl<'a, C: Connection> WmState<'a, C> {
         conn.create_gc(black_gc, screen.root, &gc_aux)?;
         conn.close_font(font)?;
 
-        let wm_protocols = conn.intern_atom(false, b"WM_PROTOCOLS")?.reply()?.atom;
-        let wm_delete_window = conn.intern_atom(false, b"WM_DELETE_WINDOW")?.reply()?.atom;
+        let wm_protocols = conn.intern_atom(false, b"WM_PROTOCOLS")?;
+        let wm_delete_window = conn.intern_atom(false, b"WM_DELETE_WINDOW")?;
 
         Ok(WmState {
-            conn,
-            screen_num,
-            black_gc,
+            conn: conn,
+            screen_num: screen_num,
+            black_gc: black_gc,
             windows: Vec::default(),
-            wm_protocols,
-            wm_delete_window,
+            wm_protocols: wm_protocols.reply()?.atom,
+            wm_delete_window: wm_delete_window.reply()?.atom,
         })
     }
 }