2zw

2zw - X11 Windowmanager

Files | Log | Commits | Refs | README

eaa7bf2

Author: erikbackman

Date: 2024-02-23

Subject: cleanup

Diff

commit eaa7bf23a4e43f3f71c5bfefe39ab22c2c6c8555
Author: erikbackman <erikbackman@users.noreply.github.com>
Date:   Fri Feb 23 13:50:27 2024 +0100

    cleanup

diff --git a/src/main.zig b/src/main.zig
index 0134c69..96e6e16 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -267,18 +267,14 @@ fn onNotifyEnter(e: *C.XEvent) void {
     while (C.XCheckTypedEvent(display, C.EnterNotify, e)) {}
 }
 
-fn updateWindowAttributes(window: C.Window) void {
+fn onButtonPress(e: *C.XEvent) void {
+    if (e.xbutton.subwindow == 0) return;
     var attributes: C.XWindowAttributes = undefined;
     _ = C.XGetWindowAttributes(display, window, &attributes);
     win_w = attributes.width;
     win_h = attributes.height;
     win_x = attributes.x;
     win_y = attributes.y;
-}
-
-fn onButtonPress(e: *C.XEvent) void {
-    if (e.xbutton.subwindow == 0) return;
-    updateWindowAttributes(e.xbutton.subwindow);
     if (winToNode(e.xbutton.subwindow)) |node| focus(node);
     mouse = e.xbutton;
 }
@@ -349,15 +345,11 @@ fn quit() void {
 }
 
 fn winNext() void {
-    if (cursor) |c| {
-        if (c.next) |next| focus(next) else if (list.first) |first| focus(first);
-    }
+    if (cursor.?.next) |next| focus(next) else if (list.first) |first| focus(first);
 }
 
 fn winPrev() void {
-    if (cursor) |c| {
-        if (c.prev) |prev| focus(prev) else if (list.last) |last| focus(last);
-    }
+    if (cursor.?.prev) |prev| focus(prev) else if (list.last) |last| focus(last);
 }
 
 fn centerCurrent() void {