X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fworkspace.c;h=4021dd14419abbdf01bf6534ff52638171a18454;hb=72d2b2c9bddf4df87b1ac3db7dfc5ec1e1ece10e;hp=b5095d118341080a1a646873fd62663d847bdb7c;hpb=2312187439d8efcc656023d57dde351f0700a7c8;p=i3%2Fi3 diff --git a/src/workspace.c b/src/workspace.c index b5095d11..4021dd14 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -17,30 +17,31 @@ * memory and initializing the data structures correctly). * */ -Con *workspace_get(const char *num) { - Con *output, *workspace = NULL, *current; - - /* TODO: could that look like this in the future? - GET_MATCHING_NODE(workspace, croot, strcasecmp(current->name, num) != 0); - */ - TAILQ_FOREACH(output, &(croot->nodes_head), nodes) { - TAILQ_FOREACH(current, &(output->nodes_head), nodes) { - if (strcasecmp(current->name, num) != 0) - continue; +Con *workspace_get(const char *num, bool *created) { + Con *output, *workspace = NULL; - workspace = current; - break; - } - } + TAILQ_FOREACH(output, &(croot->nodes_head), nodes) + GREP_FIRST(workspace, output_get_content(output), !strcasecmp(child->name, num)); - LOG("getting ws %s\n", num); if (workspace == NULL) { - LOG("need to create this one\n"); + LOG("Creating new workspace \"%s\"\n", num); + /* unless an assignment is found, we will create this workspace on the current output */ output = con_get_output(focused); - LOG("got output %p\n", output); + /* look for assignments */ + struct Workspace_Assignment *assignment; + TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { + if (strcmp(assignment->name, num) != 0) + continue; + + LOG("Found workspace assignment to output \"%s\"\n", assignment->output); + GREP_FIRST(output, croot, !strcmp(child->name, assignment->output)); + break; + } + Con *content = output_get_content(output); + LOG("got output %p with content %p\n", output, content); /* We need to attach this container after setting its type. con_attach * will handle CT_WORKSPACEs differently */ - workspace = con_new(NULL); + workspace = con_new(NULL, NULL); char *name; asprintf(&name, "[i3 con] workspace %s", num); x_set_name(workspace, name); @@ -59,48 +60,31 @@ Con *workspace_get(const char *num) { workspace->num = -1; else workspace->num = parsed_num; LOG("num = %d\n", workspace->num); - workspace->orientation = HORIZ; - con_attach(workspace, output, false); + + /* If default_orientation is set to NO_ORIENTATION we + * determine workspace orientation from workspace size. + * Otherwise we just set the orientation to default_orientation. */ + if (config.default_orientation == NO_ORIENTATION) { + workspace->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ; + DLOG("Auto orientation. Output resolution set to (%d,%d), setting orientation to %d.\n", + workspace->rect.width, workspace->rect.height, workspace->orientation); + } else { + workspace->orientation = config.default_orientation; + } + + con_attach(workspace, content, false); ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}"); + if (created != NULL) + *created = true; + } + else if (created != NULL) { + *created = false; } - - //ewmh_update_workarea(); return workspace; } -#if 0 - -/* - * Sets the name (or just its number) for the given workspace. This has to - * be called for every workspace as the rendering function - * (render_internal_bar) relies on workspace->name and workspace->name_len - * being ready-to-use. - * - */ -void workspace_set_name(Workspace *ws, const char *name) { - char *label; - int ret; - - if (name != NULL) - ret = asprintf(&label, "%d: %s", ws->num + 1, name); - else ret = asprintf(&label, "%d", ws->num + 1); - - if (ret == -1) - errx(1, "asprintf() failed"); - - FREE(ws->name); - FREE(ws->utf8_name); - - ws->name = convert_utf8_to_ucs2(label, &(ws->name_len)); - if (config.font != NULL) - ws->text_width = predict_text_width(global_conn, config.font, ws->name, ws->name_len); - else ws->text_width = 0; - ws->utf8_name = label; -} -#endif - /* * Returns true if the workspace is currently visible. Especially important for * multi-monitor environments, as they can have multiple currenlty active @@ -111,7 +95,7 @@ bool workspace_is_visible(Con *ws) { Con *output = con_get_output(ws); if (output == NULL) return false; - Con *fs = con_get_fullscreen_con(output); + Con *fs = con_get_fullscreen_con(output, CF_OUTPUT); LOG("workspace visible? fs = %p, ws = %p\n", fs, ws); return (fs == ws); } @@ -199,33 +183,39 @@ static void workspace_reassign_sticky(Con *con) { * */ void workspace_show(const char *num) { - Con *workspace, *current, *old; + Con *workspace, *current, *old = NULL; - old = con_get_workspace(focused); + bool changed_num_workspaces; + workspace = workspace_get(num, &changed_num_workspaces); - workspace = workspace_get(num); - if (workspace == old) - return; - workspace->fullscreen_mode = CF_OUTPUT; - /* disable fullscreen */ - TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes) + /* disable fullscreen for the other workspaces and get the workspace we are + * currently on. */ + TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes) { + if (current->fullscreen_mode == CF_OUTPUT) + old = current; current->fullscreen_mode = CF_NONE; + } + + /* enable fullscreen for the target workspace. If it happens to be the + * same one we are currently on anyways, we can stop here. */ + workspace->fullscreen_mode = CF_OUTPUT; + if (workspace == con_get_workspace(focused)) { + DLOG("Not switching, already there.\n"); + return; + } workspace_reassign_sticky(workspace); LOG("switching to %p\n", workspace); - Con *next = workspace; + Con *next = con_descend_focused(workspace); - while (!TAILQ_EMPTY(&(next->focus_head))) - next = TAILQ_FIRST(&(next->focus_head)); - - - if (TAILQ_EMPTY(&(old->nodes_head)) && TAILQ_EMPTY(&(old->floating_head))) { + if (old && TAILQ_EMPTY(&(old->nodes_head)) && TAILQ_EMPTY(&(old->floating_head))) { /* check if this workspace is currently visible */ if (!workspace_is_visible(old)) { LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name); - tree_close(old, false, false); + tree_close(old, DONT_KILL_WINDOW, false); ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); + changed_num_workspaces = true; } } @@ -233,226 +223,40 @@ void workspace_show(const char *num) { workspace->fullscreen_mode = CF_OUTPUT; LOG("focused now = %p / %s\n", focused, focused->name); - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); -#if 0 - - /* Check if the workspace has not been used yet */ - workspace_initialize(t_ws, c_ws->output, false); - - if (c_ws->output != t_ws->output) { - /* We need to switch to the other output first */ - DLOG("moving over to other output.\n"); - - /* Store the old client */ - Client *old_client = CUR_CELL->currently_focused; - - c_ws = t_ws->output->current_workspace; - current_col = c_ws->current_col; - current_row = c_ws->current_row; - if (CUR_CELL->currently_focused != NULL) - need_warp = true; - else { - Rect *dims = &(c_ws->output->rect); - xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, - dims->x + (dims->width / 2), dims->y + (dims->height / 2)); - } - - /* Re-decorate the old client, it’s not focused anymore */ - if ((old_client != NULL) && !old_client->dock) - redecorate_window(conn, old_client); - else xcb_flush(conn); - - /* We need to check if a global fullscreen-client is blocking - * the t_ws and if necessary switch that to local fullscreen */ - Client* client = c_ws->fullscreen_client; - if (client != NULL && client->workspace != c_ws) { - if (c_ws->fullscreen_client->workspace != c_ws) - c_ws->fullscreen_client = NULL; - client_enter_fullscreen(conn, client, false); - } - } - - /* Check if we need to change something or if we’re already there */ - if (c_ws->output->current_workspace->num == (workspace-1)) { - Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); - if (last_focused != SLIST_END(&(c_ws->focus_stack))) - set_focus(conn, last_focused, true); - if (need_warp) { - client_warp_pointer_into(conn, last_focused); - xcb_flush(conn); - } - - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); - - return; - } - - Workspace *old_workspace = c_ws; - c_ws = t_ws->output->current_workspace = workspace_get(workspace-1); - - /* Unmap all clients of the old workspace */ - workspace_unmap_clients(conn, old_workspace); - - current_row = c_ws->current_row; - current_col = c_ws->current_col; - DLOG("new current row = %d, current col = %d\n", current_row, current_col); - - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); - - workspace_map_clients(conn, c_ws); - - /* POTENTIAL TO IMPROVE HERE: due to the call to _map_clients first and - * render_layout afterwards, there is a short flickering on the source - * workspace (assign ws 3 to output 0, ws 4 to output 1, create single - * client on ws 4, move it to ws 3, switch to ws 3, you’ll see the - * flickering). */ - - /* Restore focus on the new workspace */ - Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); - if (last_focused != SLIST_END(&(c_ws->focus_stack))) - set_focus(conn, last_focused, true); - else xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); - - render_layout(conn); - - /* We can warp the pointer only after the window has been - * reconfigured in render_layout, otherwise the pointer will - * be warped to the old position, which will not work when we - * moved it to another output. */ - if (last_focused != SLIST_END(&(c_ws->focus_stack)) && need_warp) { - client_warp_pointer_into(conn, last_focused); - xcb_flush(conn); - } -#endif -} - -#if 0 -/* - * Assigns the given workspace to the given output by correctly updating its - * state and reconfiguring all the clients on this workspace. - * - * This is called when initializing a output and when re-assigning it to a - * different output which just got available (if you configured it to be on - * output 1 and you just plugged in output 1). - * - */ -void workspace_assign_to(Workspace *ws, Output *output, bool hide_it) { - Client *client; - bool empty = true; - bool visible = workspace_is_visible(ws); - - ws->output = output; - - /* Copy the dimensions from the virtual output */ - memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect)); - + /* Update the EWMH hints */ + if (changed_num_workspaces) ewmh_update_workarea(); + ewmh_update_current_desktop(); - /* Force reconfiguration for each client on that workspace */ - SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) { - client->force_reconfigure = true; - empty = false; - } - - if (empty) - return; - - /* Render the workspace to reconfigure the clients. However, they will be visible now, so… */ - render_workspace(global_conn, output, ws); - - /* …unless we want to see them at the moment, we should hide that workspace */ - if (visible && !hide_it) - return; - - /* however, if this is the current workspace, we only need to adjust - * the output’s current_workspace pointer (and must not unmap the - * windows) */ - if (c_ws == ws) { - DLOG("Need to adjust output->current_workspace...\n"); - output->current_workspace = c_ws; - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); - return; - } - - workspace_unmap_clients(global_conn, ws); + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); } /* - * Initializes the given workspace if it is not already initialized. The given - * screen is to be understood as a fallback, if the workspace itself either - * was not assigned to a particular screen or cannot be placed there because - * the screen is not attached at the moment. + * Focuses the next workspace. * */ -void workspace_initialize(Workspace *ws, Output *output, bool recheck) { - Output *old_output; - - if (ws->output != NULL && !recheck) { - DLOG("Workspace already initialized\n"); - return; - } - - old_output = ws->output; +void workspace_next() { + Con *ws = con_get_workspace(focused); + Con *next = TAILQ_NEXT(ws, nodes); + if (!next) + next = TAILQ_FIRST(&(ws->parent->nodes_head)); - /* If this workspace has no preferred output or if the output it wants - * to be on is not available at the moment, we initialize it with - * the output which was given */ - if (ws->preferred_output == NULL || - (ws->output = get_output_by_name(ws->preferred_output)) == NULL) - ws->output = output; - - DLOG("old_output = %p, ws->output = %p\n", old_output, ws->output); - /* If the assignment did not change, we do not need to update anything */ - if (old_output != NULL && ws->output == old_output) - return; - - workspace_assign_to(ws, ws->output, false); + workspace_show(next->name); } /* - * Gets the first unused workspace for the given screen, taking into account - * the preferred_output setting of every workspace (workspace assignments). + * Focuses the previous workspace. * */ -Workspace *get_first_workspace_for_output(Output *output) { - Workspace *result = NULL; - - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->preferred_output == NULL || - get_output_by_name(ws->preferred_output) != output) - continue; - - result = ws; - break; - } - - if (result == NULL) { - /* No assignment found, returning first unused workspace */ - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->output != NULL) - continue; - - result = ws; - break; - } - } - - if (result == NULL) { - DLOG("No existing free workspace found to assign, creating a new one\n"); +void workspace_prev() { + Con *ws = con_get_workspace(focused); + Con *prev = TAILQ_PREV(ws, nodes_head, nodes); + if (!prev) + prev = TAILQ_LAST(&(ws->parent->nodes_head), nodes_head); - int last_ws = 0; - TAILQ_FOREACH(ws, workspaces, workspaces) - last_ws = ws->num; - result = workspace_get(last_ws + 1); - } - - workspace_initialize(result, output, false); - return result; + workspace_show(prev->name); } -#endif - static bool get_urgency_flag(Con *con) { Con *child; TAILQ_FOREACH(child, &(con->nodes_head), nodes) @@ -479,3 +283,84 @@ void workspace_update_urgent_flag(Con *ws) { if (old_flag != ws->urgent) ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"urgent\"}"); } + +/* + * 'Forces' workspace orientation by moving all cons into a new split-con with + * the same orientation as the workspace and then changing the workspace + * orientation. + * + */ +void ws_force_orientation(Con *ws, orientation_t orientation) { + /* 1: create a new split container */ + Con *split = con_new(NULL, NULL); + split->parent = ws; + + /* 2: copy layout and orientation from workspace */ + split->layout = ws->layout; + split->orientation = ws->orientation; + + Con *old_focused = TAILQ_FIRST(&(ws->focus_head)); + + /* 3: move the existing cons of this workspace below the new con */ + DLOG("Moving cons\n"); + while (!TAILQ_EMPTY(&(ws->nodes_head))) { + Con *child = TAILQ_FIRST(&(ws->nodes_head)); + con_detach(child); + con_attach(child, split, true); + } + + /* 4: switch workspace orientation */ + ws->orientation = orientation; + + /* 5: attach the new split container to the workspace */ + DLOG("Attaching new split to ws\n"); + con_attach(split, ws, false); + + /* 6: fix the percentages */ + con_fix_percent(ws); + + if (old_focused) + con_focus(old_focused); +} + +/* + * Called when a new con (with a window, not an empty or split con) should be + * attached to the workspace (for example when managing a new window or when + * moving an existing window to the workspace level). + * + * Depending on the workspace_layout setting, this function either returns the + * workspace itself (default layout) or creates a new stacked/tabbed con and + * returns that. + * + */ +Con *workspace_attach_to(Con *ws) { + DLOG("Attaching a window to workspace %p / %s\n", ws, ws->name); + + if (config.default_layout == L_DEFAULT) { + DLOG("Default layout, just attaching it to the workspace itself.\n"); + return ws; + } + + DLOG("Non-default layout, creating a new split container\n"); + /* 1: create a new split container */ + Con *new = con_new(NULL, NULL); + new->parent = ws; + + /* 2: set the requested layout on the split con */ + new->layout = config.default_layout; + + /* 3: While the layout is irrelevant in stacked/tabbed mode, it needs + * to be set. Otherwise, this con will not be interpreted as a split + * container. */ + if (config.default_orientation == NO_ORIENTATION) { + new->orientation = (ws->rect.height > ws->rect.width) ? VERT : HORIZ; + } else { + new->orientation = config.default_orientation; + } + + /* 4: attach the new split container to the workspace */ + DLOG("Attaching new split %p to workspace %p\n", new, ws); + con_attach(new, ws, false); + + return new; +}