return candidate;
}
-#if 0
-/*
- * Initializes the specified output, assigning the specified workspace to it.
- *
- */
-void initialize_output(xcb_connection_t *conn, Output *output, Workspace *workspace) {
- i3Font *font = load_font(conn, config.font);
-
- workspace->output = output;
- output->current_workspace = workspace;
-
- /* Copy rect for the workspace */
- memcpy(&(workspace->rect), &(output->rect), sizeof(Rect));
-
- /* Map clients on the workspace, if any */
- workspace_map_clients(conn, workspace);
-
- /* Create a bar window on each output */
- if (!config.disable_workspace_bar) {
- Rect bar_rect = {output->rect.x,
- output->rect.y + output->rect.height - (font->height + 6),
- output->rect.x + output->rect.width,
- font->height + 6};
- uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK;
- uint32_t values[] = {1, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS};
- output->bar = create_window(conn, bar_rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, true, mask, values);
- output->bargc = xcb_generate_id(conn);
- xcb_create_gc(conn, output->bargc, output->bar, 0, 0);
- }
-
- SLIST_INIT(&(output->dock_clients));
-
- ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
- DLOG("initialized output at (%d, %d) with %d x %d\n",
- output->rect.x, output->rect.y, output->rect.width, output->rect.height);
-
- DLOG("assigning configured workspaces to this output...\n");
- Workspace *ws;
- TAILQ_FOREACH(ws, workspaces, workspaces) {
- if (ws == workspace)
- continue;
- if (ws->preferred_output == NULL ||
- get_output_by_name(ws->preferred_output) != output)
- continue;
-
- DLOG("assigning ws %d\n", ws->num + 1);
- workspace_assign_to(ws, output, true);
- }
-}
-#endif
-
/*
* Disables RandR support by creating exactly one output with the size of the
* X11 screen.
*
*/
void disable_randr(xcb_connection_t *conn) {
- xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
-
DLOG("RandR extension unusable, disabling.\n");
Output *s = scalloc(sizeof(Output));
s->rect.height = root_screen->height_in_pixels;
s->name = "xroot-0";
output_init_con(s);
+ init_ws_for_output(s, output_get_content(s->con));
TAILQ_INSERT_TAIL(&outputs, s, outputs);
* Initializes a CT_OUTPUT Con (searches existing ones from inplace restart
* before) to use for the given Output.
*
- * XXX: for assignments, we probably need to move workspace creation from here
- * to after the loop in randr_query_outputs().
- *
*/
void output_init_con(Output *output) {
Con *con = NULL, *current;
}
if (con == NULL) {
- con = con_new(croot);
+ con = con_new(croot, NULL);
FREE(con->name);
con->name = sstrdup(output->name);
con->type = CT_OUTPUT;
con->layout = L_OUTPUT;
+ con_fix_percent(croot);
}
con->rect = output->rect;
output->con = con;
}
DLOG("Changing layout, adding top/bottom dockarea\n");
- Con *topdock = con_new(NULL);
+ Con *topdock = con_new(NULL, NULL);
topdock->type = CT_DOCKAREA;
topdock->layout = L_DOCKAREA;
topdock->orientation = VERT;
match->insert_where = M_BELOW;
TAILQ_INSERT_TAIL(&(topdock->swallow_head), match, matches);
+ FREE(topdock->name);
topdock->name = sstrdup("topdock");
asprintf(&name, "[i3 con] top dockarea %s", con->name);
/* content container */
DLOG("adding main content container\n");
- Con *content = con_new(NULL);
+ Con *content = con_new(NULL, NULL);
content->type = CT_CON;
+ FREE(content->name);
content->name = sstrdup("content");
asprintf(&name, "[i3 con] content %s", con->name);
con_attach(content, con, false);
/* bottom dock container */
- Con *bottomdock = con_new(NULL);
+ Con *bottomdock = con_new(NULL, NULL);
bottomdock->type = CT_DOCKAREA;
bottomdock->layout = L_DOCKAREA;
bottomdock->orientation = VERT;
match->insert_where = M_BELOW;
TAILQ_INSERT_TAIL(&(bottomdock->swallow_head), match, matches);
+ FREE(bottomdock->name);
bottomdock->name = sstrdup("bottomdock");
asprintf(&name, "[i3 con] bottom dockarea %s", con->name);
FREE(name);
DLOG("attaching\n");
con_attach(bottomdock, con, false);
+}
+
+/*
+ * Initializes at least one workspace for this output, trying the following
+ * steps until there is at least one workspace:
+ *
+ * • Move existing workspaces, which are assigned to be on the given output, to
+ * the output.
+ * • Create the first assigned workspace for this output.
+ * • Create the first unused workspace.
+ *
+ */
+void init_ws_for_output(Output *output, Con *content) {
+ char *name;
+
+ /* go through all assignments and move the existing workspaces to this output */
+ struct Workspace_Assignment *assignment;
+ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+ if (strcmp(assignment->output, output->name) != 0)
+ continue;
+
+ /* check if this workspace actually exists */
+ Con *workspace = NULL, *out;
+ TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
+ GREP_FIRST(workspace, output_get_content(out),
+ !strcasecmp(child->name, assignment->name));
+ if (workspace == NULL)
+ continue;
+
+ /* check that this workspace is not already attached (that means the
+ * user configured this assignment twice) */
+ Con *workspace_out = con_get_output(workspace);
+ if (workspace_out == output->con) {
+ LOG("Workspace \"%s\" assigned to output \"%s\", but it is already "
+ "there. Do you have two assignment directives for the same "
+ "workspace in your configuration file?\n",
+ workspace->name, output->name);
+ continue;
+ }
+
+ /* if so, move it over */
+ LOG("Moving workspace \"%s\" from output \"%s\" to \"%s\" due to assignment\n",
+ workspace->name, workspace_out->name, output->name);
+
+ /* if the workspace is currently visible on that output, we need to
+ * switch to a different workspace - otherwise the output would end up
+ * with no active workspace */
+ bool visible = workspace_is_visible(workspace);
+ Con *previous = NULL;
+ if (visible && (previous = TAILQ_NEXT(workspace, focused))) {
+ LOG("Switching to previously used workspace \"%s\" on output \"%s\"\n",
+ previous->name, workspace_out->name);
+ workspace_show(previous->name);
+ }
+
+ con_detach(workspace);
+ con_attach(workspace, content, false);
+
+ /* In case the workspace we just moved was visible but there was no
+ * other workspace to switch to, we need to initialize the source
+ * output aswell */
+ if (visible && previous == NULL) {
+ LOG("There is no workspace left on \"%s\", re-initializing\n",
+ workspace_out->name);
+ init_ws_for_output(get_output_by_name(workspace_out->name),
+ output_get_content(workspace_out));
+ DLOG("Done re-initializing, continuing with \"%s\"\n", output->name);
+ }
+ }
+
+ /* if a workspace exists, we are done now */
+ if (!TAILQ_EMPTY(&(content->nodes_head))) {
+ /* ensure that one of the workspaces is actually visible (in fullscreen
+ * mode), if they were invisible before, this might not be the case. */
+ Con *visible = NULL;
+ GREP_FIRST(visible, content, child->fullscreen_mode == CF_OUTPUT);
+ if (!visible) {
+ visible = TAILQ_FIRST(&(content->nodes_head));
+ focused = content;
+ workspace_show(visible->name);
+ }
+ return;
+ }
+ /* otherwise, we create the first assigned ws for this output */
+ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
+ if (strcmp(assignment->output, output->name) != 0)
+ continue;
+
+ LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n",
+ assignment->name, assignment->output);
+ focused = content;
+ workspace_show(assignment->name);
+ return;
+ }
+
+ /* if there is still no workspace, we create the first free workspace */
DLOG("Now adding a workspace\n");
/* add a workspace to this output */
- Con *ws = con_new(NULL);
+ Con *ws = con_new(NULL, NULL);
ws->type = CT_WORKSPACE;
/* get the next unused workspace number */
}
}
}
-
-#if 0
- Rect bar_rect = {output->rect.x,
- output->rect.y + output->rect.height - (font->height + 6),
- output->rect.x + output->rect.width,
- font->height + 6};
-
- xcb_set_window_rect(conn, output->bar, bar_rect);
-
- /* go through all workspaces and set force_reconfigure */
- TAILQ_FOREACH(ws, workspaces, workspaces) {
- if (ws->output != output)
- continue;
-
- SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) {
- client->force_reconfigure = true;
- if (!client_is_floating(client))
- continue;
- /* For floating clients we need to translate the
- * coordinates (old workspace to new workspace) */
- DLOG("old: (%x, %x)\n", client->rect.x, client->rect.y);
- client->rect.x -= ws->rect.x;
- client->rect.y -= ws->rect.y;
- client->rect.x += ws->output->rect.x;
- client->rect.y += ws->output->rect.y;
- DLOG("new: (%x, %x)\n", client->rect.x, client->rect.y);
- }
-
- /* Update dimensions from output */
- memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect));
-
- /* Update the dimensions of a fullscreen client, if any */
- if (ws->fullscreen_client != NULL) {
- DLOG("Updating fullscreen client size\n");
- client = ws->fullscreen_client;
- Rect r = ws->rect;
- xcb_set_window_rect(conn, client->frame, r);
-
- r.x = 0;
- r.y = 0;
- xcb_set_window_rect(conn, client->child, r);
- }
- }
-#endif
}
/*
}
}
+ /* Ensure that all outputs which are active also have a con. This is
+ * necessary because in the next step, a clone might get disabled. Example:
+ * LVDS1 active, VGA1 gets activated as a clone of LVDS1 (has no con).
+ * LVDS1 gets disabled. */
+ TAILQ_FOREACH(output, &outputs, outputs) {
+ if (output->active && output->con == NULL) {
+ DLOG("Need to initialize a Con for output %s\n", output->name);
+ output_init_con(output);
+ output->changed = false;
+ }
+ }
+
/* Handle outputs which have a new mode or are disabled now (either
* because the user disabled them or because they are clones) */
TAILQ_FOREACH(output, &outputs, outputs) {
}
DLOG("destroying disappearing con %p\n", output->con);
- tree_close(output->con, false, true);
+ tree_close(output->con, DONT_KILL_WINDOW, true);
DLOG("Done. Should be fine now\n");
output->con = NULL;
}
output->changed = false;
}
- if (output->active && output->con == NULL) {
- DLOG("Need to initialize a Con for output %s\n", output->name);
- output_init_con(output);
- output->changed = false;
- }
-
if (output->changed) {
output_change_mode(conn, output);
output->changed = false;
ewmh_update_workarea();
-#if 0
- /* Just go through each active output and associate one workspace */
+ /* Just go through each active output and assign one workspace */
TAILQ_FOREACH(output, &outputs, outputs) {
- if (!output->active || output->current_workspace != NULL)
- continue;
- ws = get_first_workspace_for_output(output);
- initialize_output(conn, output, ws);
+ if (!output->active)
+ continue;
+ Con *content = output_get_content(output->con);
+ if (!TAILQ_EMPTY(&(content->nodes_head)))
+ continue;
+ DLOG("Should add ws for output %s\n", output->name);
+ init_ws_for_output(output, content);
}
-#endif
/* Focus the primary screen, if possible */
TAILQ_FOREACH(output, &outputs, outputs) {
projects / i3 / i3 / blobdiff