koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

layout restore: support more criteria, match only once (+test)

Browse Source
This commit is contained in:
Michael Stapelberg
2013-12-14 11:44:06 +01:00
parent 598498330a
commit 58297f4ab5
3 changed files with 127 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/load_layout.c
View File

@ -151,15 +151,20 @@ static int json_string(void *ctx, const unsigned char *val, unsigned int len) {
#endif
LOG("string: %.*s for key %s\n", (int)len, val, last_key);
if (parsing_swallows) {
/* TODO: the other swallowing keys */
char *sval;
sasprintf(&sval, "%.*s", len, val);
if (strcasecmp(last_key, "class") == 0) {
char *sval;
sasprintf(&sval, "%.*s", len, val);
current_swallow->class = regex_new(sval);
free(sval);
} else if (strcasecmp(last_key, "instance") == 0) {
current_swallow->instance = regex_new(sval);
} else if (strcasecmp(last_key, "window_role") == 0) {
current_swallow->role = regex_new(sval);
} else if (strcasecmp(last_key, "title") == 0) {
current_swallow->title = regex_new(sval);
} else {
ELOG("swallow key %s unknown\n", last_key);
}
free(sval);
} else {
if (strcasecmp(last_key, "name") == 0) {
json_node->name = scalloc((len+1) * sizeof(char));

8
src/manage.c
View File

@ -315,6 +315,14 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
if (match != NULL && match->insert_where == M_BELOW) {
nc = tree_open_con(nc, cwindow);
}
/* If M_BELOW is not used, the container is replaced. This happens with
* "swallows" criteria that are used for stored layouts, in which case
* we need to remove that criterion, because they should only be valid
* once. */
if (match != NULL && match->insert_where != M_BELOW) {
TAILQ_REMOVE(&(nc->swallow_head), match, matches);
}
}
DLOG("new container = %p\n", nc);