From c2176afe9cf236c385c0058da9febdb063577283 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Tue, 31 Jan 2012 12:03:56 +0000
Subject: [PATCH] Sync OpenBSD patchset 1020:

Add pane id to each pane in layout description (while still accepting
the old form). Based on diff from George Nachman.
---
 cmd-select-layout.c |  3 +++
 layout-custom.c     | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index 12879e89..0ae63b8a 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -105,6 +105,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 			layout = layout_set_next(wl->window);
 		else
 			layout = layout_set_previous(wl->window);
+		server_redraw_window(wl->window);
 		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
 		return (0);
 	}
@@ -115,6 +116,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 		layout = layout_set_lookup(args->argv[0]);
 	if (layout != -1) {
 		layout = layout_set_select(wl->window, layout);
+		server_redraw_window(wl->window);
 		ctx->info(ctx, "arranging in: %s", layout_set_name(layout));
 		return (0);
 	}
@@ -125,6 +127,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
 			ctx->error(ctx, "can't set layout: %s", layoutname);
 			return (-1);
 		}
+		server_redraw_window(wl->window);
 		ctx->info(ctx, "arranging in: %s", layoutname);
 		return (0);
 	}
diff --git a/layout-custom.c b/layout-custom.c
index b4a6d833..5e1d2ce2 100644
--- a/layout-custom.c
+++ b/layout-custom.c
@@ -79,8 +79,13 @@ layout_append(struct layout_cell *lc, char *buf, size_t len)
 	if (len == 0)
 		return (-1);
 
-	tmplen = xsnprintf(tmp, sizeof tmp,
-	    "%ux%u,%u,%u", lc->sx, lc->sy, lc->xoff, lc->yoff);
+	if (lc->wp != NULL) {
+		tmplen = xsnprintf(tmp, sizeof tmp, "%ux%u,%u,%u,%u",
+		    lc->sx, lc->sy, lc->xoff, lc->yoff, lc->wp->id);
+	} else {
+		tmplen = xsnprintf(tmp, sizeof tmp, "%ux%u,%u,%u",
+		    lc->sx, lc->sy, lc->xoff, lc->yoff);
+	}
 	if (tmplen > (sizeof tmp) - 1)
 		return (-1);
 	if (strlcat(buf, tmp, len) >= len)
@@ -202,7 +207,8 @@ layout_construct(struct layout_cell *lcparent, const char **layout)
 
 	if (!isdigit((u_char) **layout))
 		return (NULL);
-	if (sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4)
+	if (sscanf(*layout, "%ux%u,%u,%u,%*u", &sx, &sy, &xoff, &yoff) != 5 &&
+	    sscanf(*layout, "%ux%u,%u,%u", &sx, &sy, &xoff, &yoff) != 4)
 		return (NULL);
 
 	while (isdigit((u_char) **layout))
@@ -222,6 +228,11 @@ layout_construct(struct layout_cell *lcparent, const char **layout)
 	(*layout)++;
 	while (isdigit((u_char) **layout))
 		(*layout)++;
+	if (**layout == ',') {
+		(*layout)++;
+		while (isdigit((u_char) **layout))
+			(*layout)++;
+	}
 
 	lc = layout_create_cell(lcparent);
 	lc->sx = sx;