X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fworkspace.c;h=4e93b92e08079613bdbdc17fd487f22217e2e2cd;hb=2f992f5c0ed75452a61b19d6c118e5f5f3ba67e9;hp=c5e9ecdb1aa0213ace106545a52330e56cf8634c;hpb=c4df9f1d954e28c3a205b04e9269f06aac62efaf;p=i3%2Fi3 diff --git a/src/workspace.c b/src/workspace.c index c5e9ecdb..4e93b92e 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -1,31 +1,15 @@ /* - * vim:ts=8:expandtab + * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * - * © 2009 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE) * * workspace.c: Functions for modifying workspaces * */ -#include -#include -#include #include -#include - -#include "util.h" -#include "data.h" -#include "i3.h" -#include "config.h" -#include "xcb.h" -#include "table.h" -#include "xinerama.h" -#include "layout.h" -#include "workspace.h" -#include "client.h" + +#include "all.h" /* * Returns a pointer to the workspace with the given number (starting at 0), @@ -33,34 +17,75 @@ * memory and initializing the data structures correctly). * */ -Workspace *workspace_get(int number) { - Workspace *ws = NULL; - TAILQ_FOREACH(ws, workspaces, workspaces) - if (ws->num == number) - return ws; - - /* If we are still there, we could not find the requested workspace. */ - int last_ws = TAILQ_LAST(workspaces, workspaces_head)->num; - - LOG("We need to initialize that one, last ws = %d\n", last_ws); +Con *workspace_get(const char *num, bool *created) { + Con *output, *workspace = NULL, *child; + + /* 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(child, &(output_get_content(output)->nodes_head), nodes) { + if (strcasecmp(child->name, num) != 0) + continue; + + workspace = child; + break; + } - for (int c = last_ws; c < number; c++) { - LOG("Creating new ws\n"); + LOG("getting ws %s\n", num); + if (workspace == NULL) { + LOG("need to create this one\n"); + output = con_get_output(focused); + 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); + char *name; + asprintf(&name, "[i3 con] workspace %s", num); + x_set_name(workspace, name); + free(name); + workspace->type = CT_WORKSPACE; + FREE(workspace->name); + workspace->name = sstrdup(num); + /* We set ->num to the number if this workspace’s name consists only of + * a positive number. Otherwise it’s a named ws and num will be -1. */ + char *end; + long parsed_num = strtol(num, &end, 10); + if (parsed_num == LONG_MIN || + parsed_num == LONG_MAX || + parsed_num < 0 || + (end && *end != '\0')) + workspace->num = -1; + else workspace->num = parsed_num; + LOG("num = %d\n", workspace->num); + + /* 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; + } - ws = scalloc(sizeof(Workspace)); - ws->num = c+1; - TAILQ_INIT(&(ws->floating_clients)); - expand_table_cols(ws); - expand_table_rows(ws); - workspace_set_name(ws, NULL); + con_attach(workspace, content, false); - TAILQ_INSERT_TAIL(workspaces, ws, workspaces); - } - LOG("done\n"); + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}"); + if (created != NULL) + *created = true; + } + else if (created != NULL) { + *created = false; + } - return ws; + 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 @@ -80,14 +105,15 @@ void workspace_set_name(Workspace *ws, const char *name) { 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; - - free(label); + ws->utf8_name = label; } +#endif /* * Returns true if the workspace is currently visible. Especially important for @@ -95,43 +121,169 @@ void workspace_set_name(Workspace *ws, const char *name) { * workspaces. * */ -bool workspace_is_visible(Workspace *ws) { - return (ws->screen->current_workspace == ws); +bool workspace_is_visible(Con *ws) { + Con *output = con_get_output(ws); + if (output == NULL) + return false; + Con *fs = con_get_fullscreen_con(output); + LOG("workspace visible? fs = %p, ws = %p\n", fs, ws); + return (fs == ws); +} + +/* + * XXX: we need to clean up all this recursive walking code. + * + */ +Con *_get_sticky(Con *con, const char *sticky_group, Con *exclude) { + Con *current; + + TAILQ_FOREACH(current, &(con->nodes_head), nodes) { + if (current != exclude && + current->sticky_group != NULL && + current->window != NULL && + strcmp(current->sticky_group, sticky_group) == 0) + return current; + + Con *recurse = _get_sticky(current, sticky_group, exclude); + if (recurse != NULL) + return recurse; + } + + TAILQ_FOREACH(current, &(con->floating_head), floating_windows) { + if (current != exclude && + current->sticky_group != NULL && + current->window != NULL && + strcmp(current->sticky_group, sticky_group) == 0) + return current; + + Con *recurse = _get_sticky(current, sticky_group, exclude); + if (recurse != NULL) + return recurse; + } + + return NULL; +} + +/* + * Reassigns all child windows in sticky containers. Called when the user + * changes workspaces. + * + * XXX: what about sticky containers which contain containers? + * + */ +static void workspace_reassign_sticky(Con *con) { + Con *current; + /* 1: go through all containers */ + + /* handle all children and floating windows of this node */ + TAILQ_FOREACH(current, &(con->nodes_head), nodes) { + if (current->sticky_group == NULL) { + workspace_reassign_sticky(current); + continue; + } + + LOG("Ah, this one is sticky: %s / %p\n", current->name, current); + /* 2: find a window which we can re-assign */ + Con *output = con_get_output(current); + Con *src = _get_sticky(output, current->sticky_group, current); + + if (src == NULL) { + LOG("No window found for this sticky group\n"); + workspace_reassign_sticky(current); + continue; + } + + x_move_win(src, current); + current->window = src->window; + current->mapped = true; + src->window = NULL; + src->mapped = false; + + x_reparent_child(current, src); + + LOG("re-assigned window from src %p to dest %p\n", src, current); + } + + TAILQ_FOREACH(current, &(con->floating_head), floating_windows) + workspace_reassign_sticky(current); } /* * Switches to the given workspace * */ -void workspace_show(xcb_connection_t *conn, int workspace) { - bool need_warp = false; - xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root; - /* t_ws (to workspace) is just a convenience pointer to the workspace we’re switching to */ - Workspace *t_ws = workspace_get(workspace-1); +void workspace_show(const char *num) { + Con *workspace, *current, *old = NULL; + + bool changed_num_workspaces; + workspace = workspace_get(num, &changed_num_workspaces); + + /* 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; + } + assert(old != NULL); + + /* Check if the the currently focused con is on the same Output as the + * workspace we chose as 'old'. If not, use the workspace of the currently + * focused con */ + Con *ws = con_get_workspace(focused); + if (ws && ws->parent != old->parent) + old = ws; + + /* 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 == old) + return; + + workspace_reassign_sticky(workspace); + + LOG("switching to %p\n", workspace); + Con *next = con_descend_focused(workspace); + + 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); + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}"); + changed_num_workspaces = true; + } + } + + con_focus(next); + workspace->fullscreen_mode = CF_OUTPUT; + LOG("focused now = %p / %s\n", focused, focused->name); - LOG("show_workspace(%d)\n", workspace); + /* Update the EWMH hints */ + if (changed_num_workspaces) + ewmh_update_workarea(); + ewmh_update_current_desktop(); - /* Store current_row/current_col */ - c_ws->current_row = current_row; - c_ws->current_col = current_col; + 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->screen); + workspace_initialize(t_ws, c_ws->output, false); - if (c_ws->screen != t_ws->screen) { - /* We need to switch to the other screen first */ - LOG("moving over to other screen.\n"); + 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->screen->current_workspace; + 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->screen->rect); + 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)); } @@ -140,10 +292,19 @@ void workspace_show(xcb_connection_t *conn, int workspace) { 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->screen->current_workspace->num == (workspace-1)) { + 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); @@ -152,24 +313,28 @@ void workspace_show(xcb_connection_t *conn, int workspace) { xcb_flush(conn); } + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); + return; } Workspace *old_workspace = c_ws; - c_ws = t_ws->screen->current_workspace = workspace_get(workspace-1); + 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; - LOG("new current row = %d, current col = %d\n", current_row, 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 screen 0, ws 4 to screen 1, create single + * 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). */ @@ -184,63 +349,63 @@ void workspace_show(xcb_connection_t *conn, int workspace) { /* 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 screen. */ + * 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 /* - * Parses the preferred_screen property of a workspace. You can either specify - * the screen number (it is not given that the screen numbering always stays - * the same) or the screen coordinates (exact coordinates, e.g. 1280 will match - * the screen starting at x=1280, but 1281 will not). For coordinates, you can - * either specify an x coordinate ("1280") or an y coordinate ("x800") or both - * ("1280x800"). + * 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). * */ -static i3Screen *get_screen_from_preference(struct screens_head *slist, char *preference) { - i3Screen *screen; - char *rest; - int preferred_screen = strtol(preference, &rest, 10); - - LOG("Getting screen for preference \"%s\" (%d)\n", preference, preferred_screen); - - if ((rest == preference) || (preferred_screen >= num_screens)) { - int x = INT_MAX, y = INT_MAX; - if (strchr(preference, 'x') != NULL) { - /* Check if only the y coordinate was specified */ - if (*preference == 'x') - y = atoi(preference+1); - else { - x = atoi(preference); - y = atoi(strchr(preference, 'x') + 1); - } - } else { - x = atoi(preference); - } +void workspace_assign_to(Workspace *ws, Output *output, bool hide_it) { + Client *client; + bool empty = true; + bool visible = workspace_is_visible(ws); - LOG("Looking for screen at %d x %d\n", x, y); + ws->output = output; - TAILQ_FOREACH(screen, slist, screens) - if ((x == INT_MAX || screen->rect.x == x) && - (y == INT_MAX || screen->rect.y == y)) { - LOG("found %p\n", screen); - return screen; - } + /* Copy the dimensions from the virtual output */ + memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect)); - LOG("none found\n"); - return NULL; - } else { - int c = 0; - TAILQ_FOREACH(screen, slist, screens) - if (c++ == preferred_screen) - return screen; + ewmh_update_workarea(); + + /* Force reconfiguration for each client on that workspace */ + SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) { + client->force_reconfigure = true; + empty = false; } - return NULL; + 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); } /* @@ -250,35 +415,43 @@ static i3Screen *get_screen_from_preference(struct screens_head *slist, char *pr * the screen is not attached at the moment. * */ -void workspace_initialize(Workspace *ws, i3Screen *screen) { - if (ws->screen != NULL) { - LOG("Workspace already initialized\n"); +void workspace_initialize(Workspace *ws, Output *output, bool recheck) { + Output *old_output; + + if (ws->output != NULL && !recheck) { + DLOG("Workspace already initialized\n"); return; } - /* If this workspace has no preferred screen or if the screen it wants + old_output = ws->output; + + /* 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 screen which was given */ - if (ws->preferred_screen == NULL || - (ws->screen = get_screen_from_preference(virtual_screens, ws->preferred_screen)) == NULL) - ws->screen = screen; + * 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; - /* Copy the dimensions from the virtual screen */ - memcpy(&(ws->rect), &(ws->screen->rect), sizeof(Rect)); + workspace_assign_to(ws, ws->output, false); } /* * Gets the first unused workspace for the given screen, taking into account - * the preferred_screen setting of every workspace (workspace assignments). + * the preferred_output setting of every workspace (workspace assignments). * */ -Workspace *get_first_workspace_for_screen(struct screens_head *slist, i3Screen *screen) { +Workspace *get_first_workspace_for_output(Output *output) { Workspace *result = NULL; Workspace *ws; TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->preferred_screen == NULL || - !screens_are_equal(get_screen_from_preference(slist, ws->preferred_screen), screen)) + if (ws->preferred_output == NULL || + get_output_by_name(ws->preferred_output) != output) continue; result = ws; @@ -287,9 +460,8 @@ Workspace *get_first_workspace_for_screen(struct screens_head *slist, i3Screen * if (result == NULL) { /* No assignment found, returning first unused workspace */ - Workspace *ws; TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->screen != NULL) + if (ws->output != NULL) continue; result = ws; @@ -298,122 +470,82 @@ Workspace *get_first_workspace_for_screen(struct screens_head *slist, i3Screen * } if (result == NULL) { - LOG("No existing free workspace found to assign, creating a new one\n"); + DLOG("No existing free workspace found to assign, creating a new one\n"); - Workspace *ws; int last_ws = 0; TAILQ_FOREACH(ws, workspaces, workspaces) last_ws = ws->num; - result = workspace_get(last_ws + 1); + result = workspace_get(last_ws + 1, NULL); } - workspace_initialize(result, screen); + workspace_initialize(result, output, false); return result; } -/* - * Maps all clients (and stack windows) of the given workspace. - * - */ -void workspace_map_clients(xcb_connection_t *conn, Workspace *ws) { - Client *client; - - ignore_enter_notify_forall(conn, ws, true); +#endif - /* Map all clients on the new workspace */ - FOR_TABLE(ws) - CIRCLEQ_FOREACH(client, &(ws->table[cols][rows]->clients), clients) - client_map(conn, client); +static bool get_urgency_flag(Con *con) { + Con *child; + TAILQ_FOREACH(child, &(con->nodes_head), nodes) + if (child->urgent || get_urgency_flag(child)) + return true; - /* Map all floating clients */ - if (!ws->floating_hidden) - TAILQ_FOREACH(client, &(ws->floating_clients), floating_clients) - client_map(conn, client); + TAILQ_FOREACH(child, &(con->floating_head), floating_windows) + if (child->urgent || get_urgency_flag(child)) + return true; - /* Map all stack windows, if any */ - struct Stack_Window *stack_win; - SLIST_FOREACH(stack_win, &stack_wins, stack_windows) - if (stack_win->container->workspace == ws) - xcb_map_window(conn, stack_win->window); - - ignore_enter_notify_forall(conn, ws, false); + return false; } /* - * Unmaps all clients (and stack windows) of the given workspace. - * - * This needs to be called separately when temporarily rendering - * a workspace which is not the active workspace to force - * reconfiguration of all clients, like in src/xinerama.c when - * re-assigning a workspace to another screen. + * Goes through all clients on the given workspace and updates the workspace’s + * urgent flag accordingly. * */ -void workspace_unmap_clients(xcb_connection_t *conn, Workspace *u_ws) { - Client *client; - struct Stack_Window *stack_win; - - /* Ignore notify events because they would cause focus to be changed */ - ignore_enter_notify_forall(conn, u_ws, true); - - /* Unmap all clients of the given workspace */ - int unmapped_clients = 0; - FOR_TABLE(u_ws) - CIRCLEQ_FOREACH(client, &(u_ws->table[cols][rows]->clients), clients) { - LOG("unmapping normal client %p / %p / %p\n", client, client->frame, client->child); - client_unmap(conn, client); - unmapped_clients++; - } - - /* To find floating clients, we traverse the focus stack */ - SLIST_FOREACH(client, &(u_ws->focus_stack), focus_clients) { - if (!client_is_floating(client)) - continue; - - LOG("unmapping floating client %p / %p / %p\n", client, client->frame, client->child); - - client_unmap(conn, client); - unmapped_clients++; - } - - /* If we did not unmap any clients, the workspace is empty and we can destroy it, at least - * if it is not the current workspace. */ - if (unmapped_clients == 0 && u_ws != c_ws) { - /* Re-assign the workspace of all dock clients which use this workspace */ - Client *dock; - LOG("workspace %p is empty\n", u_ws); - SLIST_FOREACH(dock, &(u_ws->screen->dock_clients), dock_clients) { - if (dock->workspace != u_ws) - continue; - - LOG("Re-assigning dock client to c_ws (%p)\n", c_ws); - dock->workspace = c_ws; - } - u_ws->screen = NULL; - } +void workspace_update_urgent_flag(Con *ws) { + bool old_flag = ws->urgent; + ws->urgent = get_urgency_flag(ws); + DLOG("Workspace urgency flag changed from %d to %d\n", old_flag, ws->urgent); - /* Unmap the stack windows on the given workspace, if any */ - SLIST_FOREACH(stack_win, &stack_wins, stack_windows) - if (stack_win->container->workspace == u_ws) - xcb_unmap_window(conn, stack_win->window); - - ignore_enter_notify_forall(conn, u_ws, false); + if (old_flag != ws->urgent) + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"urgent\"}"); } /* - * Goes through all clients on the given workspace and updates the workspace’s - * urgent flag accordingly. + * '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 workspace_update_urgent_flag(Workspace *ws) { - Client *current; +void ws_force_orientation(Con *ws, orientation_t orientation) { + /* 1: create a new split container */ + Con *split = con_new(NULL); + split->parent = ws; - SLIST_FOREACH(current, &(ws->focus_stack), focus_clients) { - if (!current->urgent) - continue; + /* 2: copy layout and orientation from workspace */ + split->layout = ws->layout; + split->orientation = ws->orientation; - ws->urgent = true; - return; - } + 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); - ws->urgent = false; + if (old_focused) + con_focus(old_focused); }