X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=b8907b956e71698482b258407b772f8d7d622d39;hb=1f74f8d2c188a39c2c8c46b01921e6569cb4fc81;hp=acac36cab04c85feca9bf2bda0bbb1ec05cce825;hpb=c0563af3e27543d97eb3d201c2e197cc6285cb80;p=i3%2Fi3 diff --git a/src/randr.c b/src/randr.c index acac36ca..d4d7402a 100644 --- a/src/randr.c +++ b/src/randr.c @@ -2,27 +2,17 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * - * © 2009-2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * For more information on RandR, please see the X.org RandR specification at - * http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt + * https://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt * (take your time to read it completely, it answers all questions). * */ -#include - -#include - #include "all.h" -/* While a clean namespace is usually a pretty good thing, we really need - * to use shorter names than the whole xcb_randr_* default names. */ -typedef xcb_randr_get_crtc_info_reply_t crtc_info; -typedef xcb_randr_mode_info_t mode_info; -typedef xcb_randr_get_screen_resources_current_reply_t resources_reply; +#include +#include /* Pointer to the result of the query for primary output */ xcb_randr_get_output_primary_reply_t *primary; @@ -30,7 +20,9 @@ xcb_randr_get_output_primary_reply_t *primary; /* Stores all outputs available in your current session. */ struct outputs_head outputs = TAILQ_HEAD_INITIALIZER(outputs); -static bool randr_disabled = false; +/* This is the output covering the root window */ +static Output *root_output; +static bool has_randr_1_5 = false; /* * Get a specific output by its internal X11 id. Used by randr_query_outputs @@ -41,22 +33,34 @@ static bool randr_disabled = false; static Output *get_output_by_id(xcb_randr_output_t id) { Output *output; TAILQ_FOREACH(output, &outputs, outputs) - if (output->id == id) - return output; + if (output->id == id) + return output; return NULL; } /* - * Returns the output with the given name if it is active (!) or NULL. + * Returns the output with the given name or NULL. + * If require_active is true, only active outputs are considered. * */ -Output *get_output_by_name(const char *name) { +Output *get_output_by_name(const char *name, const bool require_active) { Output *output; - TAILQ_FOREACH(output, &outputs, outputs) - if (output->active && - strcasecmp(output->name, name) == 0) + bool get_primary = (strcasecmp("primary", name) == 0); + TAILQ_FOREACH(output, &outputs, outputs) { + if (output->primary && get_primary) { return output; + } + if (require_active && !output->active) { + continue; + } + struct output_name *output_name; + SLIST_FOREACH(output_name, &output->names_head, names) { + if (strcasecmp(output_name->name, name) == 0) { + return output; + } + } + } return NULL; } @@ -65,14 +69,29 @@ Output *get_output_by_name(const char *name) { * Returns the first output which is active. * */ -Output *get_first_output() { +Output *get_first_output(void) { Output *output; TAILQ_FOREACH(output, &outputs, outputs) - if (output->active) - return output; + if (output->active) + return output; - return NULL; + die("No usable outputs available.\n"); +} + +/* + * Check whether there are any active outputs (excluding the root output). + * + */ +static bool any_randr_output_active(void) { + Output *output; + + TAILQ_FOREACH(output, &outputs, outputs) { + if (output != root_output && !output->to_be_disabled && output->active) + return true; + } + + return false; } /* @@ -80,13 +99,13 @@ Output *get_first_output() { * if there is no output which contains these coordinates. * */ -Output *get_output_containing(int x, int y) { +Output *get_output_containing(unsigned int x, unsigned int y) { Output *output; TAILQ_FOREACH(output, &outputs, outputs) { if (!output->active) continue; DLOG("comparing x=%d y=%d with x=%d and y=%d width %d height %d\n", - x, y, output->rect.x, output->rect.y, output->rect.width, output->rect.height); + x, y, output->rect.x, output->rect.y, output->rect.width, output->rect.height); if (x >= output->rect.x && x < (output->rect.x + output->rect.width) && y >= output->rect.y && y < (output->rect.y + output->rect.height)) return output; @@ -96,147 +115,213 @@ Output *get_output_containing(int x, int y) { } /* - * Gets the output which is the last one in the given direction, for example - * the output on the most bottom when direction == D_DOWN, the output most - * right when direction == D_RIGHT and so on. + * Returns the active output which contains the midpoint of the given rect. If + * such an output doesn't exist, returns the output which contains most of the + * rectangle or NULL if there is no output which intersects with it. * - * This function always returns a output. + */ +Output *get_output_from_rect(Rect rect) { + unsigned int mid_x = rect.x + rect.width / 2; + unsigned int mid_y = rect.y + rect.height / 2; + Output *output = get_output_containing(mid_x, mid_y); + + return output ? output : output_containing_rect(rect); +} + +/* + * Returns the active output which spans exactly the area specified by + * rect or NULL if there is no output like this. * */ -Output *get_output_most(direction_t direction, Output *current) { - Output *output, *candidate = NULL; - int position = 0; +Output *get_output_with_dimensions(Rect rect) { + Output *output; TAILQ_FOREACH(output, &outputs, outputs) { if (!output->active) continue; + DLOG("comparing x=%d y=%d %dx%d with x=%d and y=%d %dx%d\n", + rect.x, rect.y, rect.width, rect.height, + output->rect.x, output->rect.y, output->rect.width, output->rect.height); + if (rect.x == output->rect.x && rect.width == output->rect.width && + rect.y == output->rect.y && rect.height == output->rect.height) + return output; + } - /* Repeated calls of WIN determine the winner of the comparison */ - #define WIN(variable, condition) \ - if (variable condition) { \ - candidate = output; \ - position = variable; \ - } \ - break; - - if (((direction == D_UP) || (direction == D_DOWN)) && - (current->rect.x != output->rect.x)) - continue; + return NULL; +} - if (((direction == D_LEFT) || (direction == D_RIGHT)) && - (current->rect.y != output->rect.y)) +/* + * In output_containing_rect, we check if any active output contains part of the container. + * We do this by checking if the output rect is intersected by the Rect. + * This is the 2-dimensional counterpart of get_output_containing. + * Returns the output with the maximum intersecting area. + * + */ +Output *output_containing_rect(Rect rect) { + Output *output; + int lx = rect.x, uy = rect.y; + int rx = rect.x + rect.width, by = rect.y + rect.height; + long max_area = 0; + Output *result = NULL; + TAILQ_FOREACH(output, &outputs, outputs) { + if (!output->active) continue; - - switch (direction) { - case D_UP: - WIN(output->rect.y, <= position); - case D_DOWN: - WIN(output->rect.y, >= position); - case D_LEFT: - WIN(output->rect.x, <= position); - case D_RIGHT: - WIN(output->rect.x, >= position); + int lx_o = (int)output->rect.x, uy_o = (int)output->rect.y; + int rx_o = (int)(output->rect.x + output->rect.width), by_o = (int)(output->rect.y + output->rect.height); + DLOG("comparing x=%d y=%d with x=%d and y=%d width %d height %d\n", + rect.x, rect.y, output->rect.x, output->rect.y, output->rect.width, output->rect.height); + int left = max(lx, lx_o); + int right = min(rx, rx_o); + int bottom = min(by, by_o); + int top = max(uy, uy_o); + if (left < right && bottom > top) { + long area = (right - left) * (bottom - top); + if (area > max_area) { + result = output; + } } } + return result; +} - assert(candidate != NULL); - - return candidate; +/* + * Like get_output_next with close_far == CLOSEST_OUTPUT, but wraps. + * + * For example if get_output_next(D_DOWN, x, FARTHEST_OUTPUT) = NULL, then + * get_output_next_wrap(D_DOWN, x) will return the topmost output. + * + * This function always returns a output: if no active outputs can be found, + * current itself is returned. + * + */ +Output *get_output_next_wrap(direction_t direction, Output *current) { + Output *best = get_output_next(direction, current, CLOSEST_OUTPUT); + /* If no output can be found, wrap */ + if (!best) { + direction_t opposite; + if (direction == D_RIGHT) + opposite = D_LEFT; + else if (direction == D_LEFT) + opposite = D_RIGHT; + else if (direction == D_DOWN) + opposite = D_UP; + else + opposite = D_DOWN; + best = get_output_next(opposite, current, FARTHEST_OUTPUT); + } + if (!best) + best = current; + DLOG("current = %s, best = %s\n", output_primary_name(current), output_primary_name(best)); + return best; } -#if 0 /* - * Initializes the specified output, assigning the specified workspace to it. + * Gets the output which is the next one in the given direction. + * + * If close_far == CLOSEST_OUTPUT, then the output next to the current one will + * selected. If close_far == FARTHEST_OUTPUT, the output which is the last one + * in the given direction will be selected. + * + * NULL will be returned when no active outputs are present in the direction + * specified (note that “current” counts as such an output). * */ -void initialize_output(xcb_connection_t *conn, Output *output, Workspace *workspace) { - i3Font *font = load_font(conn, config.font); - - workspace->output = output; - output->current_workspace = workspace; - - /* Copy rect for the workspace */ - memcpy(&(workspace->rect), &(output->rect), sizeof(Rect)); - - /* Map clients on the workspace, if any */ - workspace_map_clients(conn, workspace); - - /* Create a bar window on each output */ - if (!config.disable_workspace_bar) { - Rect bar_rect = {output->rect.x, - output->rect.y + output->rect.height - (font->height + 6), - output->rect.x + output->rect.width, - font->height + 6}; - uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK; - uint32_t values[] = {1, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS}; - output->bar = create_window(conn, bar_rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, true, mask, values); - output->bargc = xcb_generate_id(conn); - xcb_create_gc(conn, output->bargc, output->bar, 0, 0); - } +Output *get_output_next(direction_t direction, Output *current, output_close_far_t close_far) { + Rect *cur = &(current->rect), + *other; + Output *output, + *best = NULL; + TAILQ_FOREACH(output, &outputs, outputs) { + if (!output->active) + continue; - SLIST_INIT(&(output->dock_clients)); + other = &(output->rect); - ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}"); - DLOG("initialized output at (%d, %d) with %d x %d\n", - output->rect.x, output->rect.y, output->rect.width, output->rect.height); + if ((direction == D_RIGHT && other->x > cur->x) || + (direction == D_LEFT && other->x < cur->x)) { + /* Skip the output when it doesn’t overlap the other one’s y + * coordinate at all. */ + if ((other->y + other->height) <= cur->y || + (cur->y + cur->height) <= other->y) + continue; + } else if ((direction == D_DOWN && other->y > cur->y) || + (direction == D_UP && other->y < cur->y)) { + /* Skip the output when it doesn’t overlap the other one’s x + * coordinate at all. */ + if ((other->x + other->width) <= cur->x || + (cur->x + cur->width) <= other->x) + continue; + } else + continue; - DLOG("assigning configured workspaces to this output...\n"); - Workspace *ws; - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws == workspace) - continue; - if (ws->preferred_output == NULL || - get_output_by_name(ws->preferred_output) != output) - continue; + /* No candidate yet? Start with this one. */ + if (!best) { + best = output; + continue; + } - DLOG("assigning ws %d\n", ws->num + 1); - workspace_assign_to(ws, output, true); + if (close_far == CLOSEST_OUTPUT) { + /* Is this output better (closer to the current output) than our + * current best bet? */ + if ((direction == D_RIGHT && other->x < best->rect.x) || + (direction == D_LEFT && other->x > best->rect.x) || + (direction == D_DOWN && other->y < best->rect.y) || + (direction == D_UP && other->y > best->rect.y)) { + best = output; + continue; + } + } else { + /* Is this output better (farther to the current output) than our + * current best bet? */ + if ((direction == D_RIGHT && other->x > best->rect.x) || + (direction == D_LEFT && other->x < best->rect.x) || + (direction == D_DOWN && other->y > best->rect.y) || + (direction == D_UP && other->y < best->rect.y)) { + best = output; + continue; + } } + } + + DLOG("current = %s, best = %s\n", output_primary_name(current), (best ? output_primary_name(best) : "NULL")); + return best; } -#endif /* - * Disables RandR support by creating exactly one output with the size of the - * X11 screen. + * Creates an output covering the root window. * */ -void disable_randr(xcb_connection_t *conn) { - xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; +Output *create_root_output(xcb_connection_t *conn) { + Output *s = scalloc(1, sizeof(Output)); - DLOG("RandR extension unusable, disabling.\n"); - - Output *s = scalloc(sizeof(Output)); - - s->active = true; + s->active = false; s->rect.x = 0; s->rect.y = 0; s->rect.width = root_screen->width_in_pixels; s->rect.height = root_screen->height_in_pixels; - s->name = "xroot-0"; - output_init_con(s); - TAILQ_INSERT_TAIL(&outputs, s, outputs); + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = "xroot-0"; + SLIST_INIT(&s->names_head); + SLIST_INSERT_HEAD(&s->names_head, output_name, names); - randr_disabled = true; + return s; } /* * Initializes a CT_OUTPUT Con (searches existing ones from inplace restart * before) to use for the given Output. * - * XXX: for assignments, we probably need to move workspace creation from here - * to after the loop in randr_query_outputs(). - * */ void output_init_con(Output *output) { Con *con = NULL, *current; bool reused = false; - DLOG("init_con for output %s\n", output->name); + DLOG("init_con for output %s\n", output_primary_name(output)); /* Search for a Con with that name directly below the root node. There * might be one from a restored layout. */ TAILQ_FOREACH(current, &(croot->nodes_head), nodes) { - if (strcmp(current->name, output->name) != 0) + if (strcmp(current->name, output_primary_name(output)) != 0) continue; con = current; @@ -246,17 +331,18 @@ void output_init_con(Output *output) { } if (con == NULL) { - con = con_new(croot); + con = con_new(croot, NULL); FREE(con->name); - con->name = sstrdup(output->name); + con->name = sstrdup(output_primary_name(output)); con->type = CT_OUTPUT; con->layout = L_OUTPUT; + con_fix_percent(croot); } con->rect = output->rect; output->con = con; char *name; - asprintf(&name, "[i3 con] output %s", con->name); + sasprintf(&name, "[i3 con] output %s", con->name); x_set_name(con, name); FREE(name); @@ -266,20 +352,20 @@ void output_init_con(Output *output) { } DLOG("Changing layout, adding top/bottom dockarea\n"); - Con *topdock = con_new(NULL); + Con *topdock = con_new(NULL, NULL); topdock->type = CT_DOCKAREA; topdock->layout = L_DOCKAREA; - topdock->orientation = VERT; /* this container swallows dock clients */ - Match *match = scalloc(sizeof(Match)); + Match *match = scalloc(1, sizeof(Match)); match_init(match); match->dock = M_DOCK_TOP; match->insert_where = M_BELOW; TAILQ_INSERT_TAIL(&(topdock->swallow_head), match, matches); + FREE(topdock->name); topdock->name = sstrdup("topdock"); - asprintf(&name, "[i3 con] top dockarea %s", con->name); + sasprintf(&name, "[i3 con] top dockarea %s", con->name); x_set_name(topdock, name); FREE(name); DLOG("attaching\n"); @@ -288,83 +374,149 @@ void output_init_con(Output *output) { /* content container */ DLOG("adding main content container\n"); - Con *content = con_new(NULL); + Con *content = con_new(NULL, NULL); content->type = CT_CON; + content->layout = L_SPLITH; + FREE(content->name); content->name = sstrdup("content"); - asprintf(&name, "[i3 con] content %s", con->name); + sasprintf(&name, "[i3 con] content %s", con->name); x_set_name(content, name); FREE(name); con_attach(content, con, false); /* bottom dock container */ - Con *bottomdock = con_new(NULL); + Con *bottomdock = con_new(NULL, NULL); bottomdock->type = CT_DOCKAREA; bottomdock->layout = L_DOCKAREA; - bottomdock->orientation = VERT; /* this container swallows dock clients */ - match = scalloc(sizeof(Match)); + match = scalloc(1, sizeof(Match)); match_init(match); match->dock = M_DOCK_BOTTOM; match->insert_where = M_BELOW; TAILQ_INSERT_TAIL(&(bottomdock->swallow_head), match, matches); + FREE(bottomdock->name); bottomdock->name = sstrdup("bottomdock"); - asprintf(&name, "[i3 con] bottom dockarea %s", con->name); + sasprintf(&name, "[i3 con] bottom dockarea %s", con->name); x_set_name(bottomdock, name); FREE(name); DLOG("attaching\n"); con_attach(bottomdock, con, false); - DLOG("Now adding a workspace\n"); - - /* add a workspace to this output */ - Con *ws = con_new(NULL); - ws->type = CT_WORKSPACE; - - /* get the next unused workspace number */ - DLOG("Getting next unused workspace\n"); - int c = 0; - bool exists = true; - while (exists) { - Con *out, *current, *child; + /* Change focus to the content container */ + TAILQ_REMOVE(&(con->focus_head), content, focused); + TAILQ_INSERT_HEAD(&(con->focus_head), content, focused); +} - c++; +/* + * Initializes at least one workspace for this output, trying the following + * steps until there is at least one workspace: + * + * • Move existing workspaces, which are assigned to be on the given output, to + * the output. + * • Create the first assigned workspace for this output. + * • Create the first unused workspace. + * + */ +void init_ws_for_output(Output *output, Con *content) { + /* go through all assignments and move the existing workspaces to this output */ + struct Workspace_Assignment *assignment; + TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { + if (strcmp(assignment->output, output_primary_name(output)) != 0) + continue; - FREE(ws->name); - asprintf(&(ws->name), "%d", c); + Con *workspace = get_existing_workspace_by_name(assignment->name); + if (workspace == NULL) + continue; - exists = false; - TAILQ_FOREACH(out, &(croot->nodes_head), nodes) { - TAILQ_FOREACH(current, &(out->nodes_head), nodes) { - if (current->type != CT_CON) - continue; + /* check that this workspace is not already attached (that means the + * user configured this assignment twice) */ + Con *workspace_out = con_get_output(workspace); + if (workspace_out == output->con) { + LOG("Workspace \"%s\" assigned to output \"%s\", but it is already " + "there. Do you have two assignment directives for the same " + "workspace in your configuration file?\n", + workspace->name, output_primary_name(output)); + continue; + } - TAILQ_FOREACH(child, &(current->nodes_head), nodes) { - if (strcasecmp(child->name, ws->name) != 0) - continue; + /* if so, move it over */ + LOG("Moving workspace \"%s\" from output \"%s\" to \"%s\" due to assignment\n", + workspace->name, workspace_out->name, output_primary_name(output)); + + /* if the workspace is currently visible on that output, we need to + * switch to a different workspace - otherwise the output would end up + * with no active workspace */ + bool visible = workspace_is_visible(workspace); + Con *previous = NULL; + if (visible && (previous = TAILQ_NEXT(workspace, focused))) { + LOG("Switching to previously used workspace \"%s\" on output \"%s\"\n", + previous->name, workspace_out->name); + workspace_show(previous); + } - exists = true; - break; - } - } + /* Render the output on which the workspace was to get correct Rects. + * Then, we need to work with the "content" container, since we cannot + * be sure that the workspace itself was rendered at all (in case it’s + * invisible, it won’t be rendered). */ + render_con(workspace_out, false); + Con *ws_out_content = output_get_content(workspace_out); + + Con *floating_con; + TAILQ_FOREACH(floating_con, &(workspace->floating_head), floating_windows) + /* NB: We use output->con here because content is not yet rendered, + * so it has a rect of {0, 0, 0, 0}. */ + floating_fix_coordinates(floating_con, &(ws_out_content->rect), &(output->con->rect)); + + con_detach(workspace); + con_attach(workspace, content, false); + + /* In case the workspace we just moved was visible but there was no + * other workspace to switch to, we need to initialize the source + * output as well */ + if (visible && previous == NULL) { + LOG("There is no workspace left on \"%s\", re-initializing\n", + workspace_out->name); + init_ws_for_output(get_output_by_name(workspace_out->name, true), + output_get_content(workspace_out)); + DLOG("Done re-initializing, continuing with \"%s\"\n", output_primary_name(output)); } + } - DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists); + /* if a workspace exists, we are done now */ + if (!TAILQ_EMPTY(&(content->nodes_head))) { + /* ensure that one of the workspaces is actually visible (in fullscreen + * mode), if they were invisible before, this might not be the case. */ + Con *visible = NULL; + GREP_FIRST(visible, content, child->fullscreen_mode == CF_OUTPUT); + if (!visible) { + visible = TAILQ_FIRST(&(content->nodes_head)); + focused = content; + workspace_show(visible); + } + return; } - ws->num = c; - con_attach(ws, content, false); - asprintf(&name, "[i3 con] workspace %s", ws->name); - x_set_name(ws, name); - free(name); + /* otherwise, we create the first assigned ws for this output */ + TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { + if (strcmp(assignment->output, output_primary_name(output)) != 0) + continue; + + LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n", + assignment->name, assignment->output); + focused = content; + workspace_show_by_name(assignment->name); + return; + } - ws->fullscreen_mode = CF_OUTPUT; - ws->orientation = HORIZ; + /* if there is still no workspace, we create the first free workspace */ + DLOG("Now adding a workspace\n"); + Con *ws = create_workspace_on_output(output, content); /* TODO: Set focus in main.c */ - con_focus(ws); + con_activate(ws); } /* @@ -379,82 +531,208 @@ void output_init_con(Output *output) { * */ static void output_change_mode(xcb_connection_t *conn, Output *output) { - //i3Font *font = load_font(conn, config.font); - DLOG("Output mode changed, updating rect\n"); assert(output->con != NULL); output->con->rect = output->rect; -#if 0 - Rect bar_rect = {output->rect.x, - output->rect.y + output->rect.height - (font->height + 6), - output->rect.x + output->rect.width, - font->height + 6}; - - xcb_set_window_rect(conn, output->bar, bar_rect); - - /* go through all workspaces and set force_reconfigure */ - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->output != output) - continue; - - SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) { - client->force_reconfigure = true; - if (!client_is_floating(client)) - continue; - /* For floating clients we need to translate the - * coordinates (old workspace to new workspace) */ - DLOG("old: (%x, %x)\n", client->rect.x, client->rect.y); - client->rect.x -= ws->rect.x; - client->rect.y -= ws->rect.y; - client->rect.x += ws->output->rect.x; - client->rect.y += ws->output->rect.y; - DLOG("new: (%x, %x)\n", client->rect.x, client->rect.y); - } - /* Update dimensions from output */ - memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect)); + Con *content, *workspace, *child; + + /* Point content to the container of the workspaces */ + content = output_get_content(output->con); + + /* Fix the position of all floating windows on this output. + * The 'rect' of each workspace will be updated in src/render.c. */ + TAILQ_FOREACH(workspace, &(content->nodes_head), nodes) { + TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) { + floating_fix_coordinates(child, &(workspace->rect), &(output->con->rect)); + } + } + + /* If default_orientation is NO_ORIENTATION, we change the orientation of + * the workspaces and their childs depending on output resolution. This is + * only done for workspaces with maximum one child. */ + if (config.default_orientation == NO_ORIENTATION) { + TAILQ_FOREACH(workspace, &(content->nodes_head), nodes) { + /* Workspaces with more than one child are left untouched because + * we do not want to change an existing layout. */ + if (con_num_children(workspace) > 1) + continue; - /* Update the dimensions of a fullscreen client, if any */ - if (ws->fullscreen_client != NULL) { - DLOG("Updating fullscreen client size\n"); - client = ws->fullscreen_client; - Rect r = ws->rect; - xcb_set_window_rect(conn, client->frame, r); + workspace->layout = (output->rect.height > output->rect.width) ? L_SPLITV : L_SPLITH; + DLOG("Setting workspace [%d,%s]'s layout to %d.\n", workspace->num, workspace->name, workspace->layout); + if ((child = TAILQ_FIRST(&(workspace->nodes_head)))) { + if (child->layout == L_SPLITV || child->layout == L_SPLITH) + child->layout = workspace->layout; + DLOG("Setting child [%d,%s]'s layout to %d.\n", child->num, child->name, child->layout); + } + } + } +} - r.x = 0; - r.y = 0; - xcb_set_window_rect(conn, client->child, r); +/* + * randr_query_outputs_15 uses RandR ≥ 1.5 to update outputs. + * + */ +static bool randr_query_outputs_15(void) { +#if XCB_RANDR_MINOR_VERSION < 5 + return false; +#else + /* RandR 1.5 available at compile-time, i.e. libxcb is new enough */ + if (!has_randr_1_5) { + return false; + } + /* RandR 1.5 available at run-time (supported by the server and not + * disabled by the user) */ + DLOG("Querying outputs using RandR 1.5\n"); + xcb_generic_error_t *err; + xcb_randr_get_monitors_reply_t *monitors = + xcb_randr_get_monitors_reply( + conn, xcb_randr_get_monitors(conn, root, true), &err); + if (err != NULL) { + ELOG("Could not get RandR monitors: X11 error code %d\n", err->error_code); + free(err); + /* Fall back to RandR ≤ 1.4 */ + return false; + } + + /* Mark all outputs as to_be_disabled, since xcb_randr_get_monitors() will + * only return active outputs. */ + Output *output; + TAILQ_FOREACH(output, &outputs, outputs) { + if (output != root_output) { + output->to_be_disabled = true; + } + } + + DLOG("%d RandR monitors found (timestamp %d)\n", + xcb_randr_get_monitors_monitors_length(monitors), + monitors->timestamp); + + xcb_randr_monitor_info_iterator_t iter; + for (iter = xcb_randr_get_monitors_monitors_iterator(monitors); + iter.rem; + xcb_randr_monitor_info_next(&iter)) { + const xcb_randr_monitor_info_t *monitor_info = iter.data; + xcb_get_atom_name_reply_t *atom_reply = + xcb_get_atom_name_reply( + conn, xcb_get_atom_name(conn, monitor_info->name), &err); + if (err != NULL) { + ELOG("Could not get RandR monitor name: X11 error code %d\n", err->error_code); + free(err); + continue; + } + char *name; + sasprintf(&name, "%.*s", + xcb_get_atom_name_name_length(atom_reply), + xcb_get_atom_name_name(atom_reply)); + free(atom_reply); + + Output *new = get_output_by_name(name, false); + if (new == NULL) { + new = scalloc(1, sizeof(Output)); + + SLIST_INIT(&new->names_head); + + /* Register associated output names in addition to the monitor name */ + xcb_randr_output_t *randr_outputs = xcb_randr_monitor_info_outputs(monitor_info); + int randr_output_len = xcb_randr_monitor_info_outputs_length(monitor_info); + for (int i = 0; i < randr_output_len; i++) { + xcb_randr_output_t randr_output = randr_outputs[i]; + + xcb_randr_get_output_info_reply_t *info = + xcb_randr_get_output_info_reply(conn, + xcb_randr_get_output_info(conn, randr_output, monitors->timestamp), + NULL); + + if (info != NULL && info->crtc != XCB_NONE) { + char *oname; + sasprintf(&oname, "%.*s", + xcb_randr_get_output_info_name_length(info), + xcb_randr_get_output_info_name(info)); + + if (strcmp(name, oname) != 0) { + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = sstrdup(oname); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); + } else { + free(oname); + } } + FREE(info); + } + + /* Insert the monitor name last, so that it's used as the primary name */ + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = sstrdup(name); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); + + if (monitor_info->primary) { + TAILQ_INSERT_HEAD(&outputs, new, outputs); + } else { + TAILQ_INSERT_TAIL(&outputs, new, outputs); + } } + /* We specified get_active == true in xcb_randr_get_monitors(), so we + * will only receive active outputs. */ + new->active = true; + new->to_be_disabled = false; + + new->primary = monitor_info->primary; + + new->changed = + update_if_necessary(&(new->rect.x), monitor_info->x) | + update_if_necessary(&(new->rect.y), monitor_info->y) | + update_if_necessary(&(new->rect.width), monitor_info->width) | + update_if_necessary(&(new->rect.height), monitor_info->height); + + DLOG("name %s, x %d, y %d, width %d px, height %d px, width %d mm, height %d mm, primary %d, automatic %d\n", + name, + monitor_info->x, monitor_info->y, monitor_info->width, monitor_info->height, + monitor_info->width_in_millimeters, monitor_info->height_in_millimeters, + monitor_info->primary, monitor_info->automatic); + free(name); + } + free(monitors); + return true; #endif } /* - * Gets called by randr_query_outputs() for each output. The function adds new - * outputs to the list of outputs, checks if the mode of existing outputs has - * been changed or if an existing output has been disabled. It will then change - * either the "changed" or the "to_be_deleted" flag of the output, if + * Gets called by randr_query_outputs_14() for each output. The function adds + * new outputs to the list of outputs, checks if the mode of existing outputs + * has been changed or if an existing output has been disabled. It will then + * change either the "changed" or the "to_be_deleted" flag of the output, if * appropriate. * */ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, xcb_randr_get_output_info_reply_t *output, - xcb_timestamp_t cts, resources_reply *res) { + xcb_timestamp_t cts, + xcb_randr_get_screen_resources_current_reply_t *res) { /* each CRT controller has a position in which we are interested in */ - crtc_info *crtc; + xcb_randr_get_crtc_info_reply_t *crtc; Output *new = get_output_by_id(id); bool existing = (new != NULL); - if (!existing) - new = scalloc(sizeof(Output)); + if (!existing) { + new = scalloc(1, sizeof(Output)); + SLIST_INIT(&new->names_head); + } new->id = id; new->primary = (primary && primary->output == id); - FREE(new->name); - asprintf(&new->name, "%.*s", - xcb_randr_get_output_info_name_length(output), - xcb_randr_get_output_info_name(output)); + while (!SLIST_EMPTY(&new->names_head)) { + FREE(SLIST_FIRST(&new->names_head)->name); + struct output_name *old_head = SLIST_FIRST(&new->names_head); + SLIST_REMOVE_HEAD(&new->names_head, names); + FREE(old_head); + } + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + sasprintf(&output_name->name, "%.*s", + xcb_randr_get_output_info_name_length(output), + xcb_randr_get_output_info_name(output)); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); - DLOG("found output with name %s\n", new->name); + DLOG("found output with name %s\n", output_primary_name(new)); /* Even if no CRTC is used at the moment, we store the output so that * we do not need to change the list ever again (we only update the @@ -463,7 +741,8 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, if (!existing) { if (new->primary) TAILQ_INSERT_HEAD(&outputs, new, outputs); - else TAILQ_INSERT_TAIL(&outputs, new, outputs); + else + TAILQ_INSERT_TAIL(&outputs, new, outputs); } else if (new->active) new->to_be_disabled = true; return; @@ -473,7 +752,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts); if ((crtc = xcb_randr_get_crtc_info_reply(conn, icookie, NULL)) == NULL) { DLOG("Skipping output %s: could not get CRTC (%p)\n", - new->name, crtc); + output_primary_name(new), crtc); free(new); return; } @@ -490,7 +769,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, } DLOG("mode: %dx%d+%d+%d\n", new->rect.width, new->rect.height, - new->rect.x, new->rect.y); + new->rect.x, new->rect.y); /* If we don’t need to change an existing output or if the output * does not exist in the first place, the case is simple: we either @@ -499,7 +778,8 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, if (!existing) { if (new->primary) TAILQ_INSERT_HEAD(&outputs, new, outputs); - else TAILQ_INSERT_TAIL(&outputs, new, outputs); + else + TAILQ_INSERT_TAIL(&outputs, new, outputs); } return; } @@ -508,40 +788,38 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, } /* - * (Re-)queries the outputs via RandR and stores them in the list of outputs. + * randr_query_outputs_14 uses RandR ≤ 1.4 to update outputs. * */ -void randr_query_outputs() { - Output *output, *other, *first; - xcb_randr_get_output_primary_cookie_t pcookie; - xcb_randr_get_screen_resources_current_cookie_t rcookie; - resources_reply *res; - - /* timestamp of the configuration so that we get consistent replies to all - * requests (if the configuration changes between our different calls) */ - xcb_timestamp_t cts; - - /* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */ - xcb_randr_output_t *randr_outputs; - - if (randr_disabled) - return; +static void randr_query_outputs_14(void) { + DLOG("Querying outputs using RandR ≤ 1.4\n"); /* Get screen resources (primary output, crtcs, outputs, modes) */ + xcb_randr_get_screen_resources_current_cookie_t rcookie; rcookie = xcb_randr_get_screen_resources_current(conn, root); + xcb_randr_get_output_primary_cookie_t pcookie; pcookie = xcb_randr_get_output_primary(conn, root); if ((primary = xcb_randr_get_output_primary_reply(conn, pcookie, NULL)) == NULL) ELOG("Could not get RandR primary output\n"); - else DLOG("primary output is %08x\n", primary->output); - if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) { - disable_randr(conn); + else + DLOG("primary output is %08x\n", primary->output); + + xcb_randr_get_screen_resources_current_reply_t *res = + xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL); + if (res == NULL) { + ELOG("Could not query screen resources.\n"); return; } - cts = res->config_timestamp; - int len = xcb_randr_get_screen_resources_current_outputs_length(res); - randr_outputs = xcb_randr_get_screen_resources_current_outputs(res); + /* timestamp of the configuration so that we get consistent replies to all + * requests (if the configuration changes between our different calls) */ + const xcb_timestamp_t cts = res->config_timestamp; + + const int len = xcb_randr_get_screen_resources_current_outputs_length(res); + + /* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */ + xcb_randr_output_t *randr_outputs = xcb_randr_get_screen_resources_current_outputs(res); /* Request information for each output */ xcb_randr_get_output_info_cookie_t ocookie[len]; @@ -559,13 +837,40 @@ void randr_query_outputs() { free(output); } + FREE(res); +} + +/* + * (Re-)queries the outputs via RandR and stores them in the list of outputs. + * + * If no outputs are found use the root window. + * + */ +void randr_query_outputs(void) { + Output *output, *other; + + if (!randr_query_outputs_15()) { + randr_query_outputs_14(); + } + + /* If there's no randr output, enable the output covering the root window. */ + if (any_randr_output_active()) { + DLOG("Active RandR output found. Disabling root output.\n"); + if (root_output && root_output->active) { + root_output->to_be_disabled = true; + } + } else { + DLOG("No active RandR output found. Enabling root output.\n"); + root_output->active = true; + } + /* Check for clones, disable the clones and reduce the mode to the * lowest common mode */ TAILQ_FOREACH(output, &outputs, outputs) { if (!output->active || output->to_be_disabled) continue; DLOG("output %p / %s, position (%d, %d), checking for clones\n", - output, output->name, output->rect.x, output->rect.y); + output, output_primary_name(output), output->rect.x, output->rect.y); for (other = output; other != TAILQ_END(&outputs); @@ -578,7 +883,7 @@ void randr_query_outputs() { continue; DLOG("output %p has the same position, his mode = %d x %d\n", - other, other->rect.width, other->rect.height); + other, other->rect.width, other->rect.height); uint32_t width = min(other->rect.width, output->rect.width); uint32_t height = min(other->rect.height, output->rect.height); @@ -589,70 +894,33 @@ void randr_query_outputs() { update_if_necessary(&(other->rect.width), width); update_if_necessary(&(other->rect.height), height); - DLOG("disabling output %p (%s)\n", other, other->name); + DLOG("disabling output %p (%s)\n", other, output_primary_name(other)); other->to_be_disabled = true; DLOG("new output mode %d x %d, other mode %d x %d\n", - output->rect.width, output->rect.height, - other->rect.width, other->rect.height); + output->rect.width, output->rect.height, + other->rect.width, other->rect.height); } } - /* Handle outputs which have a new mode or are disabled now (either - * because the user disabled them or because they are clones) */ + /* Ensure that all outputs which are active also have a con. This is + * necessary because in the next step, a clone might get disabled. Example: + * LVDS1 active, VGA1 gets activated as a clone of LVDS1 (has no con). + * LVDS1 gets disabled. */ TAILQ_FOREACH(output, &outputs, outputs) { - if (output->to_be_disabled) { - output->active = false; - DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name); - - if ((first = get_first_output()) == NULL) - die("No usable outputs available\n"); - - Con *first_content = output_get_content(first->con); - - if (output->con != NULL) { - /* We need to move the workspaces from the disappearing output to the first output */ - /* 1: Get the con to focus next, if the disappearing ws is focused */ - Con *next = NULL; - if (TAILQ_FIRST(&(croot->focus_head)) == output->con) { - DLOG("This output (%p) was focused! Getting next\n", output->con); - next = con_next_focused(output->con); - DLOG("next = %p\n", next); - } - - /* 2: iterate through workspaces and re-assign them */ - Con *current; - Con *old_content = output_get_content(output->con); - while (!TAILQ_EMPTY(&(old_content->nodes_head))) { - current = TAILQ_FIRST(&(old_content->nodes_head)); - DLOG("Detaching current = %p / %s\n", current, current->name); - con_detach(current); - DLOG("Re-attaching current = %p / %s\n", current, current->name); - con_attach(current, first_content, false); - DLOG("Done, next\n"); - } - DLOG("re-attached all workspaces\n"); - - if (next) { - DLOG("now focusing next = %p\n", next); - con_focus(next); - } - - DLOG("destroying disappearing con %p\n", output->con); - tree_close(output->con, false, true); - DLOG("Done. Should be fine now\n"); - output->con = NULL; - } - - output->to_be_disabled = false; - output->changed = false; - } - if (output->active && output->con == NULL) { - DLOG("Need to initialize a Con for output %s\n", output->name); + DLOG("Need to initialize a Con for output %s\n", output_primary_name(output)); output_init_con(output); output->changed = false; } + } + + /* Handle outputs which have a new mode or are disabled now (either + * because the user disabled them or because they are clones) */ + TAILQ_FOREACH(output, &outputs, outputs) { + if (output->to_be_disabled) { + randr_disable_output(output); + } if (output->changed) { output_change_mode(conn, output); @@ -660,60 +928,173 @@ void randr_query_outputs() { } } - if (TAILQ_EMPTY(&outputs)) { - ELOG("No outputs found via RandR, disabling\n"); - disable_randr(conn); - } - - ewmh_update_workarea(); - -#if 0 - /* Just go through each active output and associate one workspace */ + /* Just go through each active output and assign one workspace */ TAILQ_FOREACH(output, &outputs, outputs) { - if (!output->active || output->current_workspace != NULL) - continue; - ws = get_first_workspace_for_output(output); - initialize_output(conn, output, ws); + if (!output->active) + continue; + Con *content = output_get_content(output->con); + if (!TAILQ_EMPTY(&(content->nodes_head))) + continue; + DLOG("Should add ws for output %s\n", output_primary_name(output)); + init_ws_for_output(output, content); } -#endif /* Focus the primary screen, if possible */ TAILQ_FOREACH(output, &outputs, outputs) { if (!output->primary || !output->con) continue; - DLOG("Focusing primary output %s\n", output->name); - con_focus(con_descend_focused(output->con)); + DLOG("Focusing primary output %s\n", output_primary_name(output)); + con_activate(con_descend_focused(output->con)); } /* render_layout flushes */ tree_render(); - FREE(res); FREE(primary); } +/* + * Disables the output and moves its content. + * + */ +void randr_disable_output(Output *output) { + assert(output->to_be_disabled); + + output->active = false; + DLOG("Output %s disabled, re-assigning workspaces/docks\n", output_primary_name(output)); + + Output *first = get_first_output(); + + /* TODO: refactor the following code into a nice function. maybe + * use an on_destroy callback which is implement differently for + * different container types (CT_CONTENT vs. CT_DOCKAREA)? */ + Con *first_content = output_get_content(first->con); + + if (output->con != NULL) { + /* We need to move the workspaces from the disappearing output to the first output */ + /* 1: Get the con to focus next, if the disappearing ws is focused */ + Con *next = NULL; + if (TAILQ_FIRST(&(croot->focus_head)) == output->con) { + DLOG("This output (%p) was focused! Getting next\n", output->con); + next = focused; + DLOG("next = %p\n", next); + } + + /* 2: iterate through workspaces and re-assign them, fixing the coordinates + * of floating containers as we go */ + Con *current; + Con *old_content = output_get_content(output->con); + while (!TAILQ_EMPTY(&(old_content->nodes_head))) { + current = TAILQ_FIRST(&(old_content->nodes_head)); + if (current != next && TAILQ_EMPTY(&(current->focus_head))) { + /* the workspace is empty and not focused, get rid of it */ + DLOG("Getting rid of current = %p / %s (empty, unfocused)\n", current, current->name); + tree_close_internal(current, DONT_KILL_WINDOW, false, false); + continue; + } + DLOG("Detaching current = %p / %s\n", current, current->name); + con_detach(current); + DLOG("Re-attaching current = %p / %s\n", current, current->name); + con_attach(current, first_content, false); + DLOG("Fixing the coordinates of floating containers\n"); + Con *floating_con; + TAILQ_FOREACH(floating_con, &(current->floating_head), floating_windows) { + floating_fix_coordinates(floating_con, &(output->con->rect), &(first->con->rect)); + } + DLOG("Done, next\n"); + } + DLOG("re-attached all workspaces\n"); + + if (next) { + DLOG("now focusing next = %p\n", next); + con_activate(next); + workspace_show(con_get_workspace(next)); + } + + /* 3: move the dock clients to the first output */ + Con *child; + TAILQ_FOREACH(child, &(output->con->nodes_head), nodes) { + if (child->type != CT_DOCKAREA) + continue; + DLOG("Handling dock con %p\n", child); + Con *dock; + while (!TAILQ_EMPTY(&(child->nodes_head))) { + dock = TAILQ_FIRST(&(child->nodes_head)); + Con *nc; + Match *match; + nc = con_for_window(first->con, dock->window, &match); + DLOG("Moving dock client %p to nc %p\n", dock, nc); + con_detach(dock); + DLOG("Re-attaching\n"); + con_attach(dock, nc, false); + DLOG("Done\n"); + } + } + + DLOG("destroying disappearing con %p\n", output->con); + Con *con = output->con; + /* clear the pointer before calling tree_close_internal in which the memory is freed */ + output->con = NULL; + tree_close_internal(con, DONT_KILL_WINDOW, true, false); + DLOG("Done. Should be fine now\n"); + } + + output->to_be_disabled = false; + output->changed = false; +} + +static void fallback_to_root_output(void) { + root_output->active = true; + output_init_con(root_output); + init_ws_for_output(root_output, output_get_content(root_output->con)); +} + /* * We have just established a connection to the X server and need the initial * XRandR information to setup workspaces for each screen. * */ -void randr_init(int *event_base) { +void randr_init(int *event_base, const bool disable_randr15) { const xcb_query_extension_reply_t *extreply; + root_output = create_root_output(conn); + TAILQ_INSERT_TAIL(&outputs, root_output, outputs); + extreply = xcb_get_extension_data(conn, &xcb_randr_id); - if (!extreply->present) - disable_randr(conn); - else randr_query_outputs(); + if (!extreply->present) { + DLOG("RandR is not present, activating root output.\n"); + fallback_to_root_output(); + return; + } + + xcb_generic_error_t *err; + xcb_randr_query_version_reply_t *randr_version = + xcb_randr_query_version_reply( + conn, xcb_randr_query_version(conn, XCB_RANDR_MAJOR_VERSION, XCB_RANDR_MINOR_VERSION), &err); + if (err != NULL) { + ELOG("Could not query RandR version: X11 error code %d\n", err->error_code); + free(err); + fallback_to_root_output(); + return; + } + + has_randr_1_5 = (randr_version->major_version >= 1) && + (randr_version->minor_version >= 5) && + !disable_randr15; + + free(randr_version); + + randr_query_outputs(); if (event_base != NULL) *event_base = extreply->first_event; xcb_randr_select_input(conn, root, - XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE | - XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE | - XCB_RANDR_NOTIFY_MASK_CRTC_CHANGE | - XCB_RANDR_NOTIFY_MASK_OUTPUT_PROPERTY); + XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE | + XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE | + XCB_RANDR_NOTIFY_MASK_CRTC_CHANGE | + XCB_RANDR_NOTIFY_MASK_OUTPUT_PROPERTY); xcb_flush(conn); }