/*
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <limits.h>
-#include <err.h>
-
-#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 "log.h"
+
+#include "all.h"
/*
* Returns a pointer to the workspace with the given number (starting at 0),
* 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;
+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;
+ }
+ }
- DLOG("We need to initialize that one, last ws = %d\n", last_ws);
+ 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);
- for (int c = last_ws; c < number; c++) {
- DLOG("Creating new ws\n");
+ ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
+ }
- 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);
+ //ewmh_update_workarea();
- TAILQ_INSERT_TAIL(workspaces, ws, workspaces);
- }
- DLOG("done\n");
-
- 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
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;
}
/*
*
*/
bool workspace_is_visible(Workspace *ws) {
- return (ws->screen->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);
- DLOG("show_workspace(%d)\n", workspace);
+ workspace = workspace_get(num);
+ workspace->fullscreen_mode = CF_OUTPUT;
+ /* disable fullscreen */
+ TAILQ_FOREACH(current, &(workspace->parent->nodes_head), nodes)
+ current->fullscreen_mode = CF_NONE;
- /* Store current_row/current_col */
- c_ws->current_row = current_row;
- c_ws->current_col = current_col;
+ LOG("switching to %p\n", workspace);
+ Con *next = workspace;
+
+ while (!TAILQ_EMPTY(&(next->focus_head)))
+ next = TAILQ_FIRST(&(next->focus_head));
+
+
+ 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->screen, false);
+ workspace_initialize(t_ws, c_ws->output, false);
- if (c_ws->screen != t_ws->screen) {
- /* We need to switch to the other screen first */
- DLOG("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));
}
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);
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_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 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). */
/* 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").
- *
- */
-static i3Screen *get_screen_from_preference(struct screens_head *slist, char *preference) {
- i3Screen *screen;
- char *rest;
- int preferred_screen = strtol(preference, &rest, 10);
-
- DLOG("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);
- }
-
- DLOG("Looking for screen at %d x %d\n", x, y);
-
- TAILQ_FOREACH(screen, slist, screens)
- if ((x == INT_MAX || screen->rect.x == x) &&
- (y == INT_MAX || screen->rect.y == y)) {
- DLOG("found %p\n", screen);
- return screen;
- }
-
- DLOG("none found\n");
- return NULL;
- } else {
- int c = 0;
- TAILQ_FOREACH(screen, slist, screens)
- if (c++ == preferred_screen)
- return screen;
- }
-
- return NULL;
-}
-
-/*
- * Assigns the given workspace to the given screen by correctly updating its
+ * 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 screen and when re-assigning it to a
- * different screen which just got available (if you configured it to be on
- * screen 1 and you just plugged in screen 1).
+ * 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, i3Screen *screen) {
+void workspace_assign_to(Workspace *ws, Output *output, bool hide_it) {
Client *client;
bool empty = true;
+ bool visible = workspace_is_visible(ws);
- ws->screen = screen;
+ ws->output = output;
- /* Copy the dimensions from the virtual screen */
- memcpy(&(ws->rect), &(ws->screen->rect), sizeof(Rect));
+ /* Copy the dimensions from the virtual output */
+ memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect));
+
+ ewmh_update_workarea();
/* Force reconfiguration for each client on that workspace */
- FOR_TABLE(ws)
- CIRCLEQ_FOREACH(client, &(ws->table[cols][rows]->clients), clients) {
- client->force_reconfigure = true;
- empty = false;
- }
+ 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, screen, ws);
+ 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 = screen->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);
}
/*
* the screen is not attached at the moment.
*
*/
-void workspace_initialize(Workspace *ws, i3Screen *screen, bool recheck) {
- i3Screen *old_screen;
+void workspace_initialize(Workspace *ws, Output *output, bool recheck) {
+ Output *old_output;
- if (ws->screen != NULL && !recheck) {
+ if (ws->output != NULL && !recheck) {
DLOG("Workspace already initialized\n");
return;
}
- old_screen = ws->screen;
+ old_output = ws->output;
- /* If this workspace has no preferred screen or if the screen it wants
+ /* 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_screen = %p, ws->screen = %p\n", old_screen, ws->screen);
+ 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_screen != NULL && ws->screen == old_screen)
+ if (old_output != NULL && ws->output == old_output)
return;
- workspace_assign_to(ws, ws->screen);
+ 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;
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;
if (result == NULL) {
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);
}
- workspace_initialize(result, screen, false);
+ workspace_initialize(result, output, false);
return result;
}
/* 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);
/* Re-assign the workspace of all dock clients which use this workspace */
Client *dock;
DLOG("workspace %p is empty\n", u_ws);
- SLIST_FOREACH(dock, &(u_ws->screen->dock_clients), dock_clients) {
+ SLIST_FOREACH(dock, &(u_ws->output->dock_clients), dock_clients) {
if (dock->workspace != u_ws)
continue;
DLOG("Re-assigning dock client to c_ws (%p)\n", c_ws);
dock->workspace = c_ws;
}
- u_ws->screen = NULL;
+ u_ws->output = NULL;
}
/* Unmap the stack windows on the given workspace, if any */
*/
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\"}");
}
/*
/* Reserve space for dock clients */
Client *client;
- SLIST_FOREACH(client, &(ws->screen->dock_clients), dock_clients)
+ SLIST_FOREACH(client, &(ws->output->dock_clients), dock_clients)
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
projects / i3 / i3 / blobdiff