mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #942 from thejan2009/bugfix-931

Browse source 
fix for_window [] move scratchpad
This commit is contained in:
Drew DeVault 2016-10-08 09:45:21 -04:00 committed by GitHub
commit 8d277bc962
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/handlers.c
View file

@ -376,6 +376,7 @@ static bool handle_view_created(wlc_handle handle) {
if (newview) { if (newview) {
ipc_event_window(newview, "new"); ipc_event_window(newview, "new");
set_focused_container(newview); set_focused_container(newview);
wlc_view_set_mask(handle, VISIBLE);
swayc_t *output = swayc_parent_by_type(newview, C_OUTPUT); swayc_t *output = swayc_parent_by_type(newview, C_OUTPUT);
arrange_windows(output, -1, -1); arrange_windows(output, -1, -1);
// check if it matches for_window in config and execute if so // check if it matches for_window in config and execute if so
@ -401,7 +402,8 @@ static bool handle_view_created(wlc_handle handle) {
// if parent container is a workspace, newview its only child and // if parent container is a workspace, newview its only child and
// layout is tabbed/stacked, add a container around newview // layout is tabbed/stacked, add a container around newview
swayc_t *parent_container = newview->parent; swayc_t *parent_container = newview->parent;
if (parent_container->type == C_WORKSPACE && parent_container->children->length == 1 && if (parent_container && parent_container->type == C_WORKSPACE &&
parent_container->children && parent_container->children->length == 1 &&
(parent_container->layout == L_TABBED || parent_container->layout == L_STACKED)) { (parent_container->layout == L_TABBED || parent_container->layout == L_STACKED)) {
swayc_t *container = new_container(newview, parent_container->layout); swayc_t *container = new_container(newview, parent_container->layout);
set_focused_container(newview); set_focused_container(newview);
@ -413,8 +415,8 @@ static bool handle_view_created(wlc_handle handle) {
*h = handle; *h = handle;
sway_log(L_DEBUG, "Adding unmanaged window %p to %p", h, output->unmanaged); sway_log(L_DEBUG, "Adding unmanaged window %p to %p", h, output->unmanaged);
list_add(output->unmanaged, h); list_add(output->unmanaged, h);
}
wlc_view_set_mask(handle, VISIBLE); wlc_view_set_mask(handle, VISIBLE);
}
if (return_to_workspace && current_ws != swayc_active_workspace()) { if (return_to_workspace && current_ws != swayc_active_workspace()) {
// we were on one workspace, switched to another to add this view, // we were on one workspace, switched to another to add this view,