X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fworkspace.c;h=9b5593d6500e073bc88794dd2041a30d1eb871b4;hb=c56867792aa98ccedecfa40ca55e4a1a141a65c4;hp=70b034ab068725e8ec35093792d6689513f0843e;hpb=d73f1748dbd0d237d5817af93f5152a875cc03c1;p=i3%2Fi3 diff --git a/src/workspace.c b/src/workspace.c index 70b034ab..9b5593d6 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -1,33 +1,15 @@ /* - * vim:ts=8:expandtab + * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * - * © 2009-2010 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 "randr.h" -#include "layout.h" -#include "workspace.h" -#include "client.h" -#include "log.h" -#include "ewmh.h" + +#include "all.h" /* * Returns a pointer to the workspace with the given number (starting at 0), @@ -35,36 +17,40 @@ * 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; - - DLOG("We need to initialize that one, last ws = %d\n", last_ws); +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; + + workspace = current; + break; + } + } - for (int c = last_ws; c < number; c++) { - DLOG("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); + LOG("got output %p\n", output); + workspace = con_new(output); + workspace->name = strdup(num); - 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); + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}"); + } - TAILQ_INSERT_TAIL(workspaces, ws, workspaces); - } - DLOG("done\n"); + //ewmh_update_workarea(); - ewmh_update_workarea(); - - 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 @@ -84,13 +70,13 @@ 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; } /* @@ -100,24 +86,42 @@ void workspace_set_name(Workspace *ws, const char *name) { * */ bool workspace_is_visible(Workspace *ws) { - return (ws->output->current_workspace == ws); + return (ws->output != NULL && ws->output->current_workspace == ws); } +#endif + /* * 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; + + old = con_get_workspace(focused); + + workspace = workspace_get(num); + workspace->fullscreen_mode = CF_OUTPUT; + /* disable fullscreen */ + TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes) + current->fullscreen_mode = CF_NONE; + + LOG("switching to %p\n", workspace); + Con *next = workspace; - DLOG("show_workspace(%d)\n", workspace); + while (!TAILQ_EMPTY(&(next->focus_head))) + next = TAILQ_FIRST(&(next->focus_head)); - /* Store current_row/current_col */ - c_ws->current_row = current_row; - c_ws->current_col = current_col; + + if (TAILQ_EMPTY(&(old->nodes_head))) { + LOG("Closing old workspace (%p / %s), it is empty\n", old, old->name); + tree_close(old); + } + + con_focus(next); + workspace->fullscreen_mode = CF_OUTPUT; + LOG("focused now = %p / %s\n", focused, focused->name); +#if 0 /* Check if the workspace has not been used yet */ workspace_initialize(t_ws, c_ws->output, false); @@ -144,6 +148,15 @@ 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 */ @@ -156,6 +169,8 @@ void workspace_show(xcb_connection_t *conn, int workspace) { xcb_flush(conn); } + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"focus\"}"); + return; } @@ -169,6 +184,8 @@ void workspace_show(xcb_connection_t *conn, int workspace) { 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 @@ -193,8 +210,10 @@ void workspace_show(xcb_connection_t *conn, int workspace) { 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. @@ -204,9 +223,10 @@ void workspace_show(xcb_connection_t *conn, int workspace) { * output 1 and you just plugged in output 1). * */ -void workspace_assign_to(Workspace *ws, Output *output) { +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; @@ -228,15 +248,20 @@ void workspace_assign_to(Workspace *ws, Output *output) { render_workspace(global_conn, output, ws); /* …unless we want to see them at the moment, we should hide that workspace */ - if (workspace_is_visible(ws)) + if (visible && !hide_it) return; - workspace_unmap_clients(global_conn, ws); - + /* 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 c_ws...\n"); - c_ws = output->current_workspace; + 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); } /* @@ -268,7 +293,7 @@ void workspace_initialize(Workspace *ws, Output *output, bool recheck) { if (old_output != NULL && ws->output == old_output) return; - workspace_assign_to(ws, ws->output); + workspace_assign_to(ws, ws->output, false); } /* @@ -276,7 +301,7 @@ void workspace_initialize(Workspace *ws, Output *output, bool recheck) { * the preferred_output setting of every workspace (workspace assignments). * */ -Workspace *get_first_workspace_for_screen(Output *output) { +Workspace *get_first_workspace_for_output(Output *output) { Workspace *result = NULL; Workspace *ws; @@ -335,7 +360,7 @@ void workspace_map_clients(xcb_connection_t *conn, Workspace *ws) { /* 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) + if (stack_win->container->workspace == ws && stack_win->rect.height > 0) xcb_map_window(conn, stack_win->window); ignore_enter_notify_forall(conn, ws, false); @@ -408,16 +433,21 @@ void workspace_unmap_clients(xcb_connection_t *conn, Workspace *u_ws) { */ void workspace_update_urgent_flag(Workspace *ws) { Client *current; + bool old_flag = ws->urgent; + bool urgent = false; SLIST_FOREACH(current, &(ws->focus_stack), focus_clients) { if (!current->urgent) continue; - ws->urgent = true; - return; + urgent = true; + break; } - ws->urgent = false; + ws->urgent = urgent; + + if (old_flag != urgent) + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"urgent\"}"); } /* @@ -443,7 +473,9 @@ int workspace_height(Workspace *ws) { height -= client->desired_height; /* Space for the internal bar */ - height -= (font->height + 6); + if (!config.disable_workspace_bar) + height -= (font->height + 6); return height; } +#endif