-#undef I3__FILE__
-#define I3__FILE__ "randr.c"
/*
* vim:ts=4:sw=4:expandtab
*
* © 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 <time.h>
#include <xcb/randr.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_get_screen_resources_current_reply_t resources_reply;
-
/* Pointer to the result of the query for primary output */
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
}
/*
- * 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)
- return output;
+ 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;
}
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;
}
/*
}
/*
- * In contained_by_output, we check if any active output contains part of the container.
+ * 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.
+ *
+ */
+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_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;
+ }
+
+ return NULL;
+}
+
+/*
+ * 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.
- * Since we don't actually need the outputs intersected by the given Rect (There could
- * be many), we just return true or false for convenience.
+ * Returns the output with the maximum intersecting area.
*
*/
-bool contained_by_output(Rect rect) {
+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;
+ 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);
- if (rx >= (int)output->rect.x && lx <= (int)(output->rect.x + output->rect.width) &&
- by >= (int)output->rect.y && uy <= (int)(output->rect.y + output->rect.height))
- return true;
+ 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 false;
+ return result;
}
/*
}
if (!best)
best = current;
- DLOG("current = %s, best = %s\n", current->name, best->name);
+ DLOG("current = %s, best = %s\n", output_primary_name(current), output_primary_name(best));
return best;
}
}
}
- DLOG("current = %s, best = %s\n", current->name, (best ? best->name : "NULL"));
+ DLOG("current = %s, best = %s\n", output_primary_name(current), (best ? output_primary_name(best) : "NULL"));
return best;
}
/*
- * 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) {
- DLOG("RandR extension unusable, disabling.\n");
-
+Output *create_root_output(xcb_connection_t *conn) {
Output *s = scalloc(1, 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);
- init_ws_for_output(s, output_get_content(s->con));
- 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;
}
/*
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;
if (con == NULL) {
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);
FREE(name);
DLOG("attaching\n");
con_attach(bottomdock, con, false);
+
+ /* Change focus to the content container */
+ TAILQ_REMOVE(&(con->focus_head), content, focused);
+ TAILQ_INSERT_HEAD(&(con->focus_head), content, focused);
}
/*
/* 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->name) != 0)
+ if (!output_triggers_assignment(output, assignment)) {
continue;
-
- /* check if this workspace actually exists */
- Con *workspace = NULL, *out;
- TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
- GREP_FIRST(workspace, output_get_content(out),
- !strcasecmp(child->name, assignment->name));
+ }
+ Con *workspace = get_existing_workspace_by_name(assignment->name);
if (workspace == NULL)
continue;
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->name);
+ workspace->name, output_primary_name(output));
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->name);
+ 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
/* 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 aswell */
+ * 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),
+ 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->name);
+ DLOG("Done re-initializing, continuing with \"%s\"\n", output_primary_name(output));
}
}
/* otherwise, we create the first assigned ws for this output */
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
- if (strcmp(assignment->output, output->name) != 0)
+ if (!output_triggers_assignment(output, assignment)) {
continue;
+ }
LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n",
assignment->name, assignment->output);
Con *ws = create_workspace_on_output(output, content);
/* TODO: Set focus in main.c */
- con_focus(ws);
+ con_activate(ws);
}
/*
}
/*
- * 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
+ * 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_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)
+ if (!existing) {
new = scalloc(1, sizeof(Output));
+ SLIST_INIT(&new->names_head);
+ }
new->id = id;
new->primary = (primary && primary->output == id);
- FREE(new->name);
- sasprintf(&new->name, "%.*s",
+ 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
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;
}
- if (output->connection == XCB_RANDR_CONNECTION_DISCONNECTED) {
- DLOG("Disabling output %s: it is disconnected\n", new->name);
- new->to_be_disabled = true;
- return;
- }
-
bool updated = update_if_necessary(&(new->rect.x), crtc->x) |
update_if_necessary(&(new->rect.y), crtc->y) |
update_if_necessary(&(new->rect.width), crtc->width) |
if (!new->active) {
DLOG("width/height 0/0, disabling output\n");
return;
- } else {
- new->to_be_disabled = false;
}
DLOG("mode: %dx%d+%d+%d\n", new->rect.width, new->rect.height,
new->changed = true;
}
-static bool __randr_query_outputs(void) {
- 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 true;
+/*
+ * randr_query_outputs_14 uses RandR ≤ 1.4 to update outputs.
+ *
+ */
+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);
- return true;
+
+ 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];
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);
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",
* LVDS1 gets disabled. */
TAILQ_FOREACH(output, &outputs, outputs) {
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;
}
* because the user disabled them or because they are clones) */
TAILQ_FOREACH(output, &outputs, outputs) {
if (output->to_be_disabled) {
- output->active = false;
- DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name);
-
- first = get_first_output();
- if (!first) {
- FREE(res);
- FREE(primary);
- return false;
- }
-
- /* 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(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_focus(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);
- tree_close(output->con, DONT_KILL_WINDOW, true, false);
- DLOG("Done. Should be fine now\n");
- output->con = NULL;
- }
-
- output->to_be_disabled = false;
- output->changed = false;
+ randr_disable_output(output);
}
if (output->changed) {
}
}
- if (TAILQ_EMPTY(&outputs)) {
- ELOG("No outputs found via RandR, disabling\n");
- disable_randr(conn);
- }
-
/* Just go through each active output and assign one workspace */
TAILQ_FOREACH(output, &outputs, outputs) {
if (!output->active)
Con *content = output_get_content(output->con);
if (!TAILQ_EMPTY(&(content->nodes_head)))
continue;
- DLOG("Should add ws for output %s\n", output->name);
+ DLOG("Should add ws for output %s\n", output_primary_name(output));
init_ws_for_output(output, content);
}
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);
-
- return true;
}
/*
- * (Re-)queries the outputs via RandR and stores them in the list of outputs.
+ * Disables the output and moves its content.
*
*/
-void randr_query_outputs(void) {
- static bool first_query = true;
+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);
+ }
- if (first_query) {
- /* find monitors at least once via RandR */
- if (!__randr_query_outputs())
- die("No usable outputs available.\n");
- first_query = false;
- } else {
- /* requery */
- if (!__randr_query_outputs()) {
- DLOG("sleep %f ms due to zero displays\n", config.zero_disp_exit_timer_ms);
- usleep(config.zero_disp_exit_timer_ms * 1000);
+ /* 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 (!__randr_query_outputs())
- die("No usable outputs available.\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));
}
/*
* 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);
+ 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;
- } else
- randr_query_outputs();
+ }
+
+ 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;