nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

handle_configure_request: reuse 'workspace' variable

This commit is contained in:
Orestis Floros 2018-08-22 14:10:42 +03:00
parent 0ac75bea5a
commit 9ae84593ba
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/handlers.c
View File

@ -406,23 +406,22 @@ static void handle_configure_request(xcb_configure_request_event_t *event) {
goto out; goto out;
} }
Con *ws = con_get_workspace(con); if (workspace == NULL) {
if (ws == NULL) {
DLOG("Window is not being managed, ignoring ConfigureRequest\n"); DLOG("Window is not being managed, ignoring ConfigureRequest\n");
goto out; goto out;
} }
if (strcmp(ws->name, "__i3_scratch") == 0) { if (strcmp(workspace->name, "__i3_scratch") == 0) {
DLOG("This is a scratchpad container, ignoring ConfigureRequest\n"); DLOG("This is a scratchpad container, ignoring ConfigureRequest\n");
goto out; goto out;
} }
if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(ws))) { if (config.focus_on_window_activation == FOWA_FOCUS || (config.focus_on_window_activation == FOWA_SMART && workspace_is_visible(workspace))) {
DLOG("Focusing con = %p\n", con); DLOG("Focusing con = %p\n", con);
workspace_show(ws); workspace_show(workspace);
con_activate(con); con_activate(con);
tree_render(); tree_render();
} else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(ws))) { } else if (config.focus_on_window_activation == FOWA_URGENT || (config.focus_on_window_activation == FOWA_SMART && !workspace_is_visible(workspace))) {
DLOG("Marking con = %p urgent\n", con); DLOG("Marking con = %p urgent\n", con);
con_set_urgency(con, true); con_set_urgency(con, true);
tree_render(); tree_render();