X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/dfd84f9bf3b9d949412a73bc62a43109b340d395..2e836ecce1ba0629a6088b739c1092d27fccd72b:/client.c?ds=inline

diff --git a/client.c b/client.c
index 84fbce5..e9b83fe 100644
--- a/client.c
+++ b/client.c
@@ -3,6 +3,7 @@
  * See LICENSE file for license details.
  */
 
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <X11/Xatom.h>
@@ -10,6 +11,87 @@
 #include "util.h"
 #include "wm.h"
 
+void
+max(void *aux)
+{
+	if(!stack)
+		return;
+	stack->x = sx;
+	stack->y = bh;
+	stack->w = sw - 2 * stack->border;
+	stack->h = sh - bh - 2 * stack->border;
+	resize(stack);
+	discard_events(EnterWindowMask);
+}
+
+void
+arrange(void *aux)
+{
+	Client *c;
+	int n, cols, rows, gw, gh, i, j;
+    float rt, fd;
+
+	if(!clients)
+		return;
+	for(n = 0, c = clients; c; c = c->next, n++);
+	rt = sqrt(n);
+	if(modff(rt, &fd) < 0.5)
+		rows = floor(rt);
+	else
+		rows = ceil(rt);
+	if(rows * rows < n)
+		cols = rows + 1;
+	else
+		cols = rows;
+
+	gw = (sw - 2 * c->border)  / cols;
+	gh = (sh - bh - 2 * c->border) / rows;
+
+	for(i = j = 0, c = clients; c; c = c->next) {
+		c->x = i * gw;
+		c->y = j * gh + bh;
+		c->w = gw;
+		c->h = gh;
+		resize(c);
+		if(++i == cols) {
+			j++;
+			i = 0;
+		}
+	}
+	discard_events(EnterWindowMask);
+}
+
+void
+sel(void *aux)
+{
+	const char *arg = aux;
+	Client *c = NULL;
+
+	if(!arg || !stack)
+		return;
+	if(!strncmp(arg, "next", 5))
+		c = stack->snext ? stack->snext : stack;
+	else if(!strncmp(arg, "prev", 5))
+		for(c = stack; c && c->snext; c = c->snext);
+	if(!c)
+		c = stack;
+	raise(c);
+	focus(c);
+}
+
+void
+kill(void *aux)
+{
+	Client *c = stack;
+
+	if(!c)
+		return;
+	if(c->proto & WM_PROTOCOL_DELWIN)
+		send_message(c->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+	else
+		XKillClient(dpy, c->win);
+}
+
 static void
 resize_title(Client *c)
 {
@@ -81,6 +163,10 @@ update_size(Client *c)
 	}
 	else
 		c->minw = c->minh = 0;
+	if(c->flags & PWinGravity)
+		c->grav = size.win_gravity;
+	else
+		c->grav = NorthWestGravity;
 }
 
 void
@@ -113,7 +199,7 @@ focus(Client *c)
 		draw_client(old);
 	}
 	XUnmapWindow(dpy, c->title);
-	draw_client(old);
+	draw_client(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XFlush(dpy);
 }
@@ -133,6 +219,7 @@ manage(Window w, XWindowAttributes *wa)
 	c->tw = c->w = wa->width;
 	c->h = wa->height;
 	c->th = bh;
+	c->border = 1;
 	update_size(c);
 	XSetWindowBorderWidth(dpy, c->win, 1);
 	XSetWindowBorder(dpy, c->win, brush.border);
@@ -166,6 +253,61 @@ manage(Window w, XWindowAttributes *wa)
 	focus(c);
 }
 
+void
+gravitate(Client *c, Bool invert)
+{
+	int dx = 0, dy = 0;
+
+	switch(c->grav) {
+	case StaticGravity:
+	case NorthWestGravity:
+	case NorthGravity:
+	case NorthEastGravity:
+		dy = c->border;
+		break;
+	case EastGravity:
+	case CenterGravity:
+	case WestGravity:
+		dy = -(c->h / 2) + c->border;
+		break;
+	case SouthEastGravity:
+	case SouthGravity:
+	case SouthWestGravity:
+		dy = -c->h;
+		break;
+	default:
+		break;
+	}
+
+	switch (c->grav) {
+	case StaticGravity:
+	case NorthWestGravity:
+	case WestGravity:
+	case SouthWestGravity:
+		dx = c->border;
+		break;
+	case NorthGravity:
+	case CenterGravity:
+	case SouthGravity:
+		dx = -(c->w / 2) + c->border;
+		break;
+	case NorthEastGravity:
+	case EastGravity:
+	case SouthEastGravity:
+		dx = -(c->w + c->border);
+		break;
+	default:
+		break;
+	}
+
+	if(invert) {
+		dx = -dx;
+		dy = -dy;
+	}
+	c->x += dx;
+	c->y += dy;
+}
+
 void
 resize(Client *c)
 {
@@ -180,7 +322,7 @@ resize(Client *c)
 	e.y = c->y;
 	e.width = c->w;
 	e.height = c->h;
-	e.border_width = 0;
+	e.border_width = c->border;
 	e.above = None;
 	e.override_redirect = False;
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);