Improve expandibility

include/config/rcxml.h

@@ -14,7 +14,7 @@ struct rcxml {
 	bool xdg_shell_server_side_deco;
 	int gap;
 	bool adaptive_sync;
-	int strength;
+	int screen_edge_strength;
 
 	/* focus */
 	bool focus_follow_mouse;

include/labwc.h

@@ -345,6 +345,8 @@ void view_child_finish(struct view_child *child);
 void subsurface_create(struct view *view, struct wlr_subsurface *wlr_subsurface);
 
 void view_set_activated(struct view *view, bool activated);
+void move_resistance(struct view *view, double *x, double *y, bool screen_edge);
+struct border view_border(struct view *view);
 void view_move_resize(struct view *view, struct wlr_box geo);
 void view_move(struct view *view, double x, double y);
 void view_minimize(struct view *view, bool minimized);

src/config/rcxml.c

@@ -323,7 +323,7 @@ entry(xmlNode *node, char *nodename, char *content)
 	} else if (!strcasecmp(nodename, "repeatDelay.keyboard")) {
 		rc.repeat_delay = atoi(content);
 	} else if (!strcasecmp(nodename, "screenEdgeStrength.core")) {
-		rc.strength = atoi(content);
+		rc.screen_edge_strength = atoi(content);
 	}
 }
 
@@ -419,7 +419,7 @@ rcxml_init()
 	rc.doubleclick_time = 500;
 	rc.repeat_rate = 25;
 	rc.repeat_delay = 600;
-	rc.strength = 0;
+	rc.screen_edge_strength = 0;
 }
 
 static struct {

src/cursor.c

@@ -79,7 +79,10 @@ process_cursor_move(struct server *server, uint32_t time)
 	struct view *view = server->grabbed_view;
 
 	/* Move the grabbed view to the new position. */
-	view_move(view, server->grab_box.x + dx, server->grab_box.y + dy);
+	dx += server->grab_box.x;
+	dy += server->grab_box.y;
+	move_resistance(view, &dx, &dy, true);
+	view_move(view, dx, dy);
 }
 
 static void

src/meson.build

@@ -13,6 +13,7 @@ labwc_sources = files(
   'seat.c',
   'server.c',
   'ssd.c',
+  'strength.c',
   'subsurface.c',
   'theme.c',
   'view.c',

src/strength.c

@@ -0,0 +1,56 @@
+#include "labwc.h"
+#include "config/rcxml.h"
+
+/* These functions could be extended to strength in the future. */
+void
+move_resistance(struct view *view, double *x, double *y, bool screen_edge)
+{
+	struct server *server = view->server;
+	struct wlr_box mgeom;
+	struct output *output;
+	struct border border = view_border(view);
+	int l, r, t, b; /* The edges of the current view */
+	int tl, tr, tt, tb; /* The desired edges */
+	int ml, mr, mt, mb; /* The edges of the monitor/other view */
+
+	l = view->x - border.left - rc.gap;
+	t = view->y - border.top - rc.gap;
+	r = view->x + view->w + border.right + rc.gap;
+	b = view->y + view->h + border.bottom + rc.gap;
+
+	tl = *x - border.left - rc.gap;
+	tt = *y - border.top - rc.gap;
+	tr = *x + view->w + border.right + rc.gap;
+	tb = *y + view->h + border.bottom + rc.gap;
+
+	if (screen_edge) {
+		if (!rc.screen_edge_strength) {
+			return;
+		}
+
+		wl_list_for_each(output, &server->outputs, link) {
+			mgeom = output_usable_area_in_layout_coords(output);
+	
+			ml = mgeom.x;
+			mt = mgeom.y;
+			mr = mgeom.x + mgeom.width;
+			mb = mgeom.y + mgeom.height;
+	
+			if (l >= ml && tl < ml && tl >= ml
+					- rc.screen_edge_strength) {
+				*x = ml + border.left + rc.gap;
+			} else if (r <= mr && tr > mr && tr <= mr
+					+ rc.screen_edge_strength) {
+				*x = mr - view->w - border.right - rc.gap;
+			}
+
+			if (t >= mt && tt < mt && tt >= mt
+					- rc.screen_edge_strength) {
+				*y = mt + border.top + rc.gap;
+			} else if (b <= mb && tb > mb && tb <= mb
+					+ rc.screen_edge_strength) {
+				*y = mb - view->h - border.bottom - rc.gap;
+			}
+		}
+	}
+}

src/view.c

@@ -16,8 +16,6 @@ view_set_activated(struct view *view, bool activated)
 	}
 }
 
-static void view_move_resistance(struct view *view, double *x, double *y);
-
 void
 view_move_resize(struct view *view, struct wlr_box geo)
 {
@@ -31,7 +29,6 @@ void
 view_move(struct view *view, double x, double y)
 {
 	if (view->impl->move) {
-		view_move_resistance(view, &x, &y);
 		view->impl->move(view, x, y);
 	}
 }
@@ -255,7 +252,7 @@ view_for_each_popup_surface(struct view *view,
 	}
 }
 
-static struct border
+struct border
 view_border(struct view *view)
 {
 	struct border border = {
@@ -426,55 +423,6 @@ view_snap_to_edge(struct view *view, const char *direction)
 	view_move_resize(view, dst);
 }
 
-static void
-view_move_resistance(struct view *view, double *x, double *y)
-{
-	struct wlr_box mgeom;
-	struct output *output;
-	struct border border = view_border(view);
-	int l, r, t, b; /* The edges of the current view */
-	int tl, tr, tt, tb; /* The desired edges */
-	int ml, mr, mt, mb; /* The edges of the Monitor */
-
-	if (!rc.strength) {
-		return;
-	}
-
-	output = view_output(view);
-	if (!output) {
-		return;
-	}
-
-	l = view->x - border.left - rc.gap;
-	t = view->y - border.top - rc.gap;
-	r = view->x + view->w + border.right + rc.gap;
-	b = view->y + view->h + border.bottom + rc.gap;
-
-	tl = *x - border.left - rc.gap;
-	tt = *y - border.top - rc.gap;
-	tr = *x + view->w + border.right + rc.gap;
-	tb = *y + view->h + border.bottom + rc.gap;
-
-	mgeom = output_usable_area_in_layout_coords(output);
-
-	ml = mgeom.x;
-	mt = mgeom.y;
-	mr = mgeom.x + mgeom.width;
-	mb = mgeom.y + mgeom.height;
-
-	if (l >= ml && tl < ml && tl >= ml - rc.strength) {
-		*x = ml + border.left + rc.gap;
-	} else if (r <= mr && tr > mr && tr <= mr + rc.strength) {
-		*x = mr - view->w - border.right - rc.gap;
-	}
-
-	if (t >= mt && tt < mt && tt >= mt - rc.strength) {
-		*y = mt + border.top + rc.gap;
-	} else if (b <= mb && tb > mb && tb <= mb + rc.strength) {
-		*y = mb - view->h - border.bottom - rc.gap;
-	}
-}
-
 const char *
 view_get_string_prop(struct view *view, const char *prop)
 {