Discard colons within references

Fixes baskerville#1218.
q3cpma · Nov 1, 2020 · 01107f9 · 01107f9
1 parent ddb2d32
commit 01107f9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/query.c b/src/query.c
@@ -542,7 +542,7 @@ int node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 	char *path = strrchr(desc, '@');
 	char *colon = strrchr(desc, ':');
 
-	/* Discard hashes inside a DESKTOP_SEL */
+	/* Discard hashes inside a DESKTOP_SEL, e.g. `newest#@prev#older:/1/2` */
 	if (hash != NULL && colon != NULL && path != NULL &&
 	    path < hash && hash < colon) {
 		if (path > desc && *(path - 1) == '#') {
@@ -564,6 +564,11 @@ int node_from_desc(char *desc, coordinates_t *ref, coordinates_t *dst)
 		}
 	}
 
+	/* Discard colons within references, e.g. `@next.occupied:/#any.descendant_of.window` */
+	if (colon != NULL && hash != NULL && colon < hash) {
+		colon = NULL;
+	}
+
 	node_select_t sel = make_node_select();
 
 	if (!parse_node_modifiers(colon != NULL ? colon : desc, &sel)) {