/* Strictly speaking, this line doesn’t really belong here, but since we
* are syncing, let’s un-register as a window manager first */
- xcb_change_window_attributes(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]) {XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT});
+ xcb_change_window_attributes(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]){XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT});
/* Make sure our changes reach the X server, we restart/exit now */
xcb_aux_sync(conn);
/* See if any container swallows this new window */
nc = con_for_window(search_at, cwindow, &match);
if (nc == NULL) {
- /* If not, check if it is assigned to a specific workspace / output */
- if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE | A_TO_OUTPUT))) {
+ /* If not, check if it is assigned to a specific workspace */
+ if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE))) {
DLOG("Assignment matches (%p)\n", match);
- if (assignment->type == A_TO_WORKSPACE) {
- Con *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)
- nc = tree_open_con(nc, cwindow);
- else
- nc = tree_open_con(nc->parent, cwindow);
-
- /* set the urgency hint on the window if the workspace is not visible */
- if (!workspace_is_visible(assigned_ws))
- urgency_hint = true;
- }
- /* TODO: handle assignments with type == A_TO_OUTPUT */
+ Con *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)
+ nc = tree_open_con(nc, cwindow);
+ else
+ nc = tree_open_con(nc->parent, cwindow);
+
+ /* set the urgency hint on the window if the workspace is not visible */
+ if (!workspace_is_visible(assigned_ws))
+ urgency_hint = true;
} else if (startup_ws) {
/* If it’s not assigned, but was started on a specific workspace,
* we want to open it there */
* which are not managed by the wm anyways). We store the original geometry
* here because it’s used for dock clients. */
if (nc->geometry.width == 0)
- nc->geometry = (Rect) {geom->x, geom->y, geom->width, geom->height};
+ nc->geometry = (Rect){geom->x, geom->y, geom->width, geom->height};
if (motif_border_style != BS_NORMAL) {
DLOG("MOTIF_WM_HINTS specifies decorations (border_style = %d)\n", motif_border_style);
if (want_floating) {
DLOG("geometry = %d x %d\n", nc->geometry.width, nc->geometry.height);
- /* motif hints will be applied only when `new_float` is `normal` or not
- * specified */
- bool automatic_border = (config.default_floating_border != BS_NORMAL &&
- motif_border_style == BS_NORMAL);
+ /* automatically set the border to the default value if a motif border
+ * was not specified */
+ bool automatic_border = (motif_border_style == BS_NORMAL);
floating_enable(nc, automatic_border);
}
- if (nc->border_style == BS_PIXEL) {
- /* if the border style is BS_PIXEL, explicitly set the border width of
- * the new container */
+ /* explicitly set the border width to the default */
+ if (nc->current_border_width == -1) {
nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
}