X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=f47613465d6d8b9e6c1cda9c930dcbe7ba94b5a6;hb=8d6f43bd88e79d5222889eb3f1a2f0ac25f1695b;hp=3da4be032ce0ddd1a85171bae64334ee645d6eb8;hpb=eed83a7ee1c76d80dba9e55de8fc125ec41f6e0b;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 3da4be0..f476134 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -1068,7 +1068,8 @@ char *
 expand_tilde(const char *s)
 {
 	struct passwd           *ppwd;
-	int                     i, max;
+	int                     i;
+	long			max;
 	char                    *user;
 	const char              *sc = s;
 	char			*result;
@@ -5051,7 +5052,7 @@ resize(struct ws_win *win, union arg *args)
 {
 	xcb_timestamp_t		timestamp = 0;
 	struct swm_region	*r = NULL;
-	int			resize_step = 0;
+	int			resize_stp = 0;
 	struct swm_geometry	g;
 	int			top = 0, left = 0, resizing;
 	int			dx, dy;
@@ -5089,24 +5090,24 @@ resize(struct ws_win *win, union arg *args)
 	switch (args->id) {
 	case SWM_ARG_ID_WIDTHSHRINK:
 		WIDTH(win) -= SWM_RESIZE_STEPS;
-		resize_step = 1;
+		resize_stp = 1;
 		break;
 	case SWM_ARG_ID_WIDTHGROW:
 		WIDTH(win) += SWM_RESIZE_STEPS;
-		resize_step = 1;
+		resize_stp = 1;
 		break;
 	case SWM_ARG_ID_HEIGHTSHRINK:
 		HEIGHT(win) -= SWM_RESIZE_STEPS;
-		resize_step = 1;
+		resize_stp = 1;
 		break;
 	case SWM_ARG_ID_HEIGHTGROW:
 		HEIGHT(win) += SWM_RESIZE_STEPS;
-		resize_step = 1;
+		resize_stp = 1;
 		break;
 	default:
 		break;
 	}
-	if (resize_step) {
+	if (resize_stp) {
 		constrain_window(win, r, 1);
 		update_window(win);
 		store_float_geom(win,r);
@@ -5240,7 +5241,7 @@ void
 move(struct ws_win *win, union arg *args)
 {
 	xcb_timestamp_t		timestamp = 0;
-	int			move_step = 0, moving;
+	int			move_stp = 0, moving;
 	struct swm_region	*r = NULL;
 	xcb_query_pointer_reply_t	*qpr;
 	xcb_generic_event_t		*evt;
@@ -5273,28 +5274,28 @@ move(struct ws_win *win, union arg *args)
 
 	focus_flush();
 
-	move_step = 0;
+	move_stp = 0;
 	switch (args->id) {
 	case SWM_ARG_ID_MOVELEFT:
 		X(win) -= (SWM_MOVE_STEPS - border_width);
-		move_step = 1;
+		move_stp = 1;
 		break;
 	case SWM_ARG_ID_MOVERIGHT:
 		X(win) += (SWM_MOVE_STEPS - border_width);
-		move_step = 1;
+		move_stp = 1;
 		break;
 	case SWM_ARG_ID_MOVEUP:
 		Y(win) -= (SWM_MOVE_STEPS - border_width);
-		move_step = 1;
+		move_stp = 1;
 		break;
 	case SWM_ARG_ID_MOVEDOWN:
 		Y(win) += (SWM_MOVE_STEPS - border_width);
-		move_step = 1;
+		move_stp = 1;
 		break;
 	default:
 		break;
 	}
-	if (move_step) {
+	if (move_stp) {
 		constrain_window(win, r, 0);
 		update_window(win);
 		store_float_geom(win, r);
@@ -7855,9 +7856,6 @@ leavenotify(xcb_leave_notify_event_t *e)
 }
 #endif
 
-/* lets us use one switch statement for arbitrary mode/detail combinations */
-#define MERGE_MEMBERS(a,b)	(((a & 0xffff) << 16) | (b & 0xffff))
-
 void
 mapnotify(xcb_map_notify_event_t *e)
 {