Fix: layout name being overwritten causing search to fail

src/cmd.c

@@ -463,8 +463,8 @@ int cmdlayout(char **argv)
 		return 1;
 	}
 
-	for (uint32_t i = 0; layouts[i].name; i++) {
-		if (!strcmp(layouts[i].name, *argv)) {
+	for (uint32_t i = 0; layouts[i].command; i++) {
+		if (!strcmp(layouts[i].command, *argv)) {
 			if (&layouts[i] != setws->layout) {
 				setws->layout = &layouts[i];
 				needsrefresh = lytchange = 1;

src/config.def.h

@@ -222,18 +222,22 @@ Cmd wincmds[] = {
 };
 
 Layout layouts[] = {
-	/* command, function, implements_resize, invert_split_direction */
-	{"tile",    ltile,   1, 0}, /* first is default */
-	{"rtile",   rtile,   1, 0},
-	{"mono",    mono,    0, 0},
-	{"grid",    grid,    0, 0},
-	{"spiral",  spiral,  1, 0},
-	{"dwindle", dwindle, 1, 0},
-	{"none",    NULL,    1, 0}, /* NULL layout function is floating */
-	{"tstack",  tstack,  1, 1},
-    {"dyntile", dyntile, 1, 0},
+	/* we keep two copies of the string for the command and name
+	 * this allows us to update the display name without changing the command
+	 * see in dyntile above where the current layout is modified */
+
+	/* name,    command,  function, implements_resize, invert_split_direction */
+	{"tile",    "tile",    ltile,   1, 0}, /* first is default */
+	{"rtile",   "rtile",   rtile,   1, 0},
+	{"mono",    "mono",    mono,    0, 0},
+	{"grid",    "grid",    grid,    0, 0},
+	{"spiral",  "spiral",  spiral,  1, 0},
+	{"dwindle", "dwindle", dwindle, 1, 0},
+	{"none",    "none",    NULL,    1, 0}, /* NULL layout function is floating */
+	{"tstack",  "tstack",  tstack,  1, 1},
+    {"dyntile", "dyntile", dyntile, 1, 0},
 	/* don't add below the terminating null */
-	{NULL,      NULL,    0, 0}
+	{NULL,       NULL,     NULL,    0, 0}
 };
 
 WsCmd wscmds[] = {

src/dk.h

@@ -275,6 +275,7 @@ typedef struct WsCmd {
 
 typedef struct Layout {
 	const char *name;
+	const char *command;
 	int (*func)(Workspace *);
 	int implements_resize;
 	int invert_split_direction;