X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=2ff50af57625603435881c3a3625e1223662bdd2;hb=52e931e4986d7c3c91726d26ea5f21d8bff704e4;hp=024c527cde757ad603af83010e4f1f3088884b62;hpb=94a4eee141a947f4a3d0506b2eab53cd77166048;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 024c527..2ff50af 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -1554,31 +1554,23 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep,
     size_t sz)
 {
 	char			*ptr;
-	char			num[8], tmp[SWM_BAR_MAX];
-	int			limit;
-	size_t			len, numoff = 0;
+	char			tmp[SWM_BAR_MAX];
+	int			limit, size;
+	size_t			len;
 
 	/* reset strlcat(3) buffer */
 	*tmp = '\0';
 
 	/* get number, if any */
 	fmt++;
-	while (*fmt != '\0' && isdigit((unsigned char) *fmt)) {
-		if (numoff >= sizeof num - 1)
-			break;
-		num[numoff++] = *fmt++;
-	}
-	num[numoff] = '\0';
-
-	if ((limit = strtonum(num, 1, sizeof tmp - 1, NULL)) == 0)
+	size = 0;
+	if (sscanf(fmt, "%d%n", &limit, &size) != 1)
+		limit = sizeof tmp - 1;
+	if (limit <= 0 || limit >= sizeof tmp)
 		limit = sizeof tmp - 1;
 
-	/* if number is too big, skip to the first non-digit */
-	if (numoff >= sizeof num - 1) {
-		while (*fmt != '\0' && isdigit((unsigned char) *fmt))
-			fmt++;
-	}
 	/* there is nothing to replace (ie EOL) */
+	fmt += size;
 	if (*fmt == '\0')
 		return (fmt);
 
@@ -6219,9 +6211,10 @@ manage_window(Window id)
 			TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);
 		else if ((ww = win->ws->focus) &&
 		    spawn_position == SWM_STACK_ABOVE)
-			TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, entry);
+			TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus,
+			    win, entry);
 		else if (ww && spawn_position == SWM_STACK_BELOW)
-			TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, entry);
+			TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
 		else switch (spawn_position) {
 		default:
 		case SWM_STACK_TOP:
@@ -6320,10 +6313,21 @@ manage_window(Window id)
 	win->s = r->s;	/* this never changes */
 	if (trans && (ww = find_window(trans)))
 		TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry);
-	else if (spawn_position == SWM_STACK_ABOVE && win->ws->focus)
-		TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, entry);
-	else
-		TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
+	else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE)
+		TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win,
+		    entry);
+	else if (win->ws->focus && spawn_position == SWM_STACK_BELOW)
+		TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
+	else switch (spawn_position) {
+	default:
+	case SWM_STACK_TOP:
+	case SWM_STACK_ABOVE:
+		TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
+		break;
+	case SWM_STACK_BOTTOM:
+	case SWM_STACK_BELOW:
+		TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
+	}
 
 	/* ignore window border if there is one. */
 	WIDTH(win) = win->wa.width;
@@ -7166,7 +7170,7 @@ scan_xrandr(int i)
 	/* map virtual screens onto physical screens */
 #ifdef SWM_XRR_HAS_CRTC
 	if (xrandr_support) {
-		sr = XRRGetScreenResources(display, screens[i].root);
+		sr = XRRGetScreenResourcesCurrent(display, screens[i].root);
 		if (sr == NULL)
 			new_region(&screens[i], 0, 0,
 			    DisplayWidth(display, i),