Mercurial > aewl

changeset 105:3e74cc981e9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactored Sanders code somewhat
author arg@10ksloc.org
date Wed, 19 Jul 2006 13:52:31 +0200 (2006-07-19)
parents 3a708f113f55
children c292574503dd
files client.c dwm.h event.c
diffstat 3 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/client.c	Wed Jul 19 13:36:04 2006 +0200
+++ b/client.c	Wed Jul 19 13:52:31 2006 +0200
@@ -315,9 +315,9 @@
 		*c->w = c->maxw;
 	if(c->maxh && *c->h > c->maxh)
 		*c->h = c->maxh;
-	if(sticky == TopRight || sticky == BottomRight)
+	if(sticky == TopRight || sticky == BotRight)
 		*c->x = right - *c->w;
-	if(sticky == BottomLeft || sticky == BottomRight)
+	if(sticky == BotLeft || sticky == BotRight)
 		*c->y = bottom - *c->h;
 	resizetitle(c);
 	XSetWindowBorderWidth(dpy, c->win, 1);
--- a/dwm.h	Wed Jul 19 13:36:04 2006 +0200
+++ b/dwm.h	Wed Jul 19 13:52:31 2006 +0200
@@ -25,9 +25,9 @@
 /********** CUSTOMIZE **********/
 
 typedef union Arg Arg;
+typedef struct Client Client;
 typedef enum Corner Corner;
 typedef struct DC DC;
-typedef struct Client Client;
 typedef struct Fnt Fnt;
 typedef struct Key Key;
 typedef struct Rule Rule;
@@ -44,7 +44,7 @@
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
-enum Corner { TopLeft, TopRight, BottomLeft, BottomRight };
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
 
 struct Fnt {
 	int ascent;
--- a/event.c	Wed Jul 19 13:36:04 2006 +0200
+++ b/event.c	Wed Jul 19 13:52:31 2006 +0200
@@ -114,17 +114,10 @@
 			*c->h = abs(ocy - ev.xmotion.y);
 			*c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - *c->w;
 			*c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - *c->h;
-			if(ocx <= ev.xmotion.x) {
-				if(ocy <= ev.xmotion.y)
-					sticky = TopLeft;
-				else
-					sticky = BottomLeft;
-			} else {
-				if(ocy <= ev.xmotion.y)
-					sticky = TopRight;
-				else
-					sticky = BottomRight;
-			}
+			if(ocx <= ev.xmotion.x)
+				sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+			else
+				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
 			resize(c, True, sticky);
 			break;
 		case ButtonRelease: