LOG("This window is of type dock\n");
Output *output = get_output_containing(geom->x, geom->y);
if (output != NULL) {
- DLOG("Starting search at output %s\n", output->name);
+ DLOG("Starting search at output %s\n", output_primary_name(output));
search_at = output->con;
}
Con *wm_desktop_ws = NULL;
/* If not, check if it is assigned to a specific workspace */
- if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE))) {
+ if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE)) ||
+ (assignment = assignment_for(cwindow, A_TO_WORKSPACE_NUMBER))) {
DLOG("Assignment matches (%p)\n", match);
- Con *assigned_ws = workspace_get(assignment->dest.workspace, NULL);
+
+ Con *assigned_ws = NULL;
+ if (assignment->type == A_TO_WORKSPACE_NUMBER) {
+ long parsed_num = ws_name_to_number(assignment->dest.workspace);
+
+ assigned_ws = get_existing_workspace_by_num(parsed_num);
+ }
+ /* A_TO_WORKSPACE type assignment or fallback from A_TO_WORKSPACE_NUMBER
+ * when the target workspace number does not exist yet. */
+ if (!assigned_ws) {
+ assigned_ws = workspace_get(assignment->dest.workspace, NULL);
+ }
+
nc = con_descend_tiling_focused(assigned_ws);
DLOG("focused on ws %s: %p / %s\n", assigned_ws->name, nc, nc->name);
if (nc->type == CT_WORKSPACE)
} else
nc = tree_open_con(NULL, cwindow);
}
+
+ if ((assignment = assignment_for(cwindow, A_TO_OUTPUT))) {
+ con_move_to_output_name(nc, assignment->dest.output, true);
+ }
} else {
/* M_BELOW inserts the new window as a child of the one which was
* matched (e.g. dock areas) */
* needed e.g. for LibreOffice Impress multi-monitor
* presentations to work out of the box. */
if (output != NULL)
- con_move_to_output(nc, output);
+ con_move_to_output(nc, output, false);
con_toggle_fullscreen(nc, CF_OUTPUT);
}
fs = NULL;
* proper window event sequence. */
if (set_focus && nc->mapped) {
DLOG("Now setting focus.\n");
- con_focus(nc);
+ con_activate(nc);
}
tree_render();
free(geom);
out:
free(attr);
- return;
}