*
* i3 - an improved dynamic tiling window manager
*
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
*
* See file LICENSE for license information.
*
#include "config.h"
#include "xcb.h"
#include "table.h"
-#include "xinerama.h"
+#include "randr.h"
#include "layout.h"
#include "workspace.h"
#include "client.h"
#include "log.h"
+#include "ewmh.h"
/*
* Returns a pointer to the workspace with the given number (starting at 0),
}
DLOG("done\n");
+ ewmh_update_workarea();
+
return ws;
}
*
*/
bool workspace_is_visible(Workspace *ws) {
- return (ws->screen->current_workspace == ws);
+ return (ws->output->current_workspace == ws);
}
/*
c_ws->current_col = current_col;
/* 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 */
- 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));
}
}
/* 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);
}
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);
/* 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);
}
}
-
/*
- * 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);
-
- 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);
- }
+void workspace_assign_to(Workspace *ws, Output *output) {
+ Client *client;
+ bool empty = true;
- 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;
+ ws->output = output;
+
+ /* 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 */
+ 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 (workspace_is_visible(ws))
+ return;
+
+ workspace_unmap_clients(global_conn, ws);
+
+ if (c_ws == ws) {
+ DLOG("Need to adjust c_ws...\n");
+ c_ws = output->current_workspace;
+ }
}
/*
* the screen is not attached at the moment.
*
*/
-void workspace_initialize(Workspace *ws, i3Screen *screen) {
- if (ws->screen != NULL) {
+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);
}
/*
* 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_screen(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;
/* 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;
result = workspace_get(last_ws + 1);
}
- workspace_initialize(result, screen);
+ workspace_initialize(result, output, false);
return result;
}
/* 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 */
/* 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 */
projects / i3 / i3 / blobdiff