Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2345 from psychon/fix_transient_for_unsetting 

Handle unsetting of .transient_for
This commit is contained in:
mergify[bot] 2018-08-19 06:35:15 +00:00 committed by GitHub
parent 8151a13e44 297003126d
commit e9d95fba1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
objects/client.c
View File

@ -983,7 +983,9 @@ client_find_transient_for(client_t *c)
{
int counter;
client_t *tc, *tmp;
lua_State *L = globalconf_get_lua_State();
/* This might return NULL, in which case we unset transient_for */
tmp = tc = client_getbywin(c->transient_for_window);
/* Verify that there are no loops in the transient_for relation after we are done */
@ -994,15 +996,17 @@ client_find_transient_for(client_t *c)
counter = globalconf.stack.len+1;
tmp = tmp->transient_for;
}
if (counter <= globalconf.stack.len)
if (counter > globalconf.stack.len)
{
lua_State *L = globalconf_get_lua_State();
/* There was a loop, so unset .transient_for */
tc = NULL;
}
luaA_object_push(L, c);
client_set_transient_for(L, -1, tc);
lua_pop(L, 1);
}
}
void
client_set_class_instance(lua_State *L, int cidx, const char *class, const char *instance)

4
property.c
View File

@ -109,7 +109,11 @@ property_update_wm_transient_for(client_t *c, xcb_get_property_cookie_t cookie)
if(!xcb_icccm_get_wm_transient_for_reply(globalconf.connection,
cookie,
&trans, NULL))
{
c->transient_for_window = XCB_NONE;
client_find_transient_for(c);
return;
}
c->transient_for_window = trans;