From 6ecbe998f8adf67f7700197df5ceb91e48742135 Mon Sep 17 00:00:00 2001
From: IoIxD <alphaproject217@gmail.com>
Date: Sat, 23 May 2026 23:32:14 -0700
Subject: [PATCH] fix wayland csd

---
 src/backend/wayland/interfaces.c | 24 ++++++++++++++++--------
 src/backend/wayland/wayland.c    | 12 ++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/backend/wayland/interfaces.c b/src/backend/wayland/interfaces.c
index 5325096..3b482f1 100644
--- a/src/backend/wayland/interfaces.c
+++ b/src/backend/wayland/interfaces.c
@@ -425,9 +425,11 @@ static void pointer_leave(void* data, struct wl_pointer* wl_pointer, MwU32 seria
 	WAYLAND_EVENT_OP_END(self);
 };
 
-static void xdg_borderless_step(MwLL self, MwMouse p, MwU32 serial) {
+static void xdg_borderless_step_mdown(MwLL self, MwMouse p, MwU32 serial) {
 	if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL && self->wayland.backbuffer.surface == curSurface) {
-		if(p.point.y >= (self->wayland.wh + CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM) - 5) {
+		if(p.point.y <= CSD_BORDER_FRAME_TOP) {
+			xdg_toplevel_move(self->wayland.toplevel->xdg_top_level, self->wayland.pointer_seat, serial);
+		} else if(p.point.y >= (self->wayland.wh + CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM) - 5) {
 			if(p.point.x >= (self->wayland.ww + CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT) - 5) {
 				xdg_toplevel_resize(self->wayland.toplevel->xdg_top_level, self->wayland.pointer_seat, serial, XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT);
 			} else {
@@ -443,12 +445,15 @@ static void xdg_borderless_step(MwLL self, MwMouse p, MwU32 serial) {
 			xdg_toplevel_resize(self->wayland.toplevel->xdg_top_level, self->wayland.pointer_seat, serial, XDG_TOPLEVEL_RESIZE_EDGE_RIGHT);
 		} else if(p.point.x <= 5) {
 			xdg_toplevel_resize(self->wayland.toplevel->xdg_top_level, self->wayland.pointer_seat, serial, XDG_TOPLEVEL_RESIZE_EDGE_LEFT);
-		} else if(p.point.y <= CSD_BORDER_FRAME_TOP) {
+		}
+	};
+}
+static void xdg_borderless_step_mup(MwLL self, MwMouse p, MwU32 serial) {
+	if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL && self->wayland.backbuffer.surface == curSurface) {
+		if(p.point.y <= CSD_BORDER_FRAME_TOP) {
 			if(p.point.x >= CSD_BORDER_FRAME_LEFT && p.point.x <= CSD_BORDER_FRAME_LEFT + 18) {
 				MwLLDispatch(self, close, NULL);
 			} else if(p.point.x >= (self->wayland.ww + CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT) - 21) {
-				xdg_toplevel_set_minimized(self->wayland.toplevel->xdg_top_level);
-			} else if(p.point.x >= (self->wayland.ww + CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT) - 38) {
 				self->wayland.toplevel->maxim_state = !self->wayland.toplevel->maxim_state;
 				if(self->wayland.toplevel->maxim_state == 0) {
 					xdg_toplevel_unset_maximized(self->wayland.toplevel->xdg_top_level);
@@ -457,8 +462,8 @@ static void xdg_borderless_step(MwLL self, MwMouse p, MwU32 serial) {
 				}
 				self->wayland.setting_wh = 1;
 				MwLLWaylandRegionSetup(self);
-			} else {
-				xdg_toplevel_move(self->wayland.toplevel->xdg_top_level, self->wayland.pointer_seat, serial);
+			} else if(p.point.x >= (self->wayland.ww + CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT) - 38) {
+				xdg_toplevel_set_minimized(self->wayland.toplevel->xdg_top_level);
 			}
 		}
 	};
@@ -606,7 +611,10 @@ static void pointer_button(void* data, struct wl_pointer* wl_pointer, MwU32 seri
 	}
 
 	if(!self->wayland.has_decorations) {
-		xdg_borderless_step(self, p, serial);
+		if(state != WL_POINTER_BUTTON_STATE_RELEASED)
+			xdg_borderless_step_mdown(self, p, serial);
+		else
+			xdg_borderless_step_mup(self, p, serial);
 	}
 
 	WAYLAND_EVENT_OP_END(self);
diff --git a/src/backend/wayland/wayland.c b/src/backend/wayland/wayland.c
index 89f00f1..99ce624 100644
--- a/src/backend/wayland/wayland.c
+++ b/src/backend/wayland/wayland.c
@@ -176,12 +176,12 @@ static void xdg_toplevel_configure(void*		data,
 	MwLLWaylandRegionInvalidate(self);
 	self->wayland.ww = width;
 	self->wayland.wh = height;
-	if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
-		if(!self->wayland.has_decorations && self->wayland.toplevel->maxim_state) {
-			self->wayland.ww -= CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT;
-			self->wayland.wh -= CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM;
-		}
-	}
+	// if(self->wayland.type == MwLL_WAYLAND_TOPLEVEL) {
+	// 	if(!self->wayland.has_decorations && self->wayland.toplevel->maxim_state) {
+	// 		self->wayland.ww -= CSD_BORDER_FRAME_LEFT + CSD_BORDER_FRAME_RIGHT;
+	// 		self->wayland.wh -= CSD_BORDER_FRAME_TOP + CSD_BORDER_FRAME_BOTTOM;
+	// 	}
+	// }
 
 	if(self->wayland.resizing == 0) {
 		xdg_surface_set_window_geometry(self->wayland.toplevel->xdg_surface, 0, 0, self->wayland.ww, self->wayland.wh);