* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 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
/* 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;
/*
* Get a specific output by its internal X11 id. Used by randr_query_outputs
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;
}
Output *get_output_by_name(const char *name) {
Output *output;
TAILQ_FOREACH(output, &outputs, outputs)
- if (output->active &&
- strcasecmp(output->name, name) == 0)
- return output;
+ if (output->active &&
+ strcasecmp(output->name, name) == 0)
+ return output;
return NULL;
}
Output *output;
TAILQ_FOREACH(output, &outputs, outputs)
- if (output->active)
- return output;
+ if (output->active)
+ return output;
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;
+}
+
/*
* Returns the active (!) output which contains the coordinates x, y or NULL
* 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;
* be many), we just return true or false for convenience.
*
*/
-bool contained_by_output(Rect rect){
+bool contained_by_output(Rect rect) {
Output *output;
int lx = rect.x, uy = rect.y;
int rx = rect.x + rect.width, by = rect.y + rect.height;
if (!output->active)
continue;
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);
+ 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;
}
return false;
-
}
/*
Rect *cur = &(current->rect),
*other;
Output *output,
- *best = NULL;
+ *best = NULL;
TAILQ_FOREACH(output, &outputs, outputs) {
if (!output->active)
continue;
other = &(output->rect);
if ((direction == D_RIGHT && other->x > cur->x) ||
- (direction == D_LEFT && 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)
+ (cur->y + cur->height) <= other->y)
continue;
} else if ((direction == D_DOWN && other->y > cur->y) ||
- (direction == D_UP && 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)
+ (cur->x + cur->width) <= other->x)
continue;
} else
continue;
/* 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)) {
+ (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;
}
/* 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)) {
+ (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;
}
}
/*
- * 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));
- 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);
- init_ws_for_output(s, output_get_content(s->con));
-
- TAILQ_INSERT_TAIL(&outputs, s, outputs);
- randr_disabled = true;
+ return s;
}
/*
topdock->type = CT_DOCKAREA;
topdock->layout = L_DOCKAREA;
/* 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;
bottomdock->type = CT_DOCKAREA;
bottomdock->layout = L_DOCKAREA;
/* 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;
/* 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));
+ GREP_FIRST(workspace, output_get_content(out),
+ !strcasecmp(child->name, assignment->name));
if (workspace == NULL)
continue;
Con *floating_con;
TAILQ_FOREACH(floating_con, &(workspace->floating_head), floating_windows)
- /* NB: We use output->con here because content is not yet rendered,
+ /* 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));
+ floating_fix_coordinates(floating_con, &(ws_out_content->rect), &(output->con->rect));
con_detach(workspace);
con_attach(workspace, content, false);
Output *new = get_output_by_id(id);
bool existing = (new != NULL);
if (!existing)
- new = scalloc(sizeof(Output));
+ new = scalloc(1, sizeof(Output));
new->id = id;
new->primary = (primary && primary->output == id);
FREE(new->name);
sasprintf(&new->name, "%.*s",
- xcb_randr_get_output_info_name_length(output),
- xcb_randr_get_output_info_name(output));
+ xcb_randr_get_output_info_name_length(output),
+ xcb_randr_get_output_info_name(output));
DLOG("found output with name %s\n", new->name);
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;
}
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
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;
}
/*
* (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, *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) */
/* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */
xcb_randr_output_t *randr_outputs;
- if (randr_disabled)
- return;
-
/* Get screen resources (primary output, crtcs, outputs, modes) */
rcookie = xcb_randr_get_screen_resources_current(conn, root);
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;
- }
- cts = res->config_timestamp;
+ else
+ DLOG("primary output is %08x\n", primary->output);
- int len = xcb_randr_get_screen_resources_current_outputs_length(res);
- randr_outputs = xcb_randr_get_screen_resources_current_outputs(res);
+ resources_reply *res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL);
+ if (res == NULL) {
+ ELOG("Could not query screen resources.\n");
+ } else {
+ cts = res->config_timestamp;
- /* Request information for each output */
- xcb_randr_get_output_info_cookie_t ocookie[len];
- for (int i = 0; i < len; i++)
- ocookie[i] = xcb_randr_get_output_info(conn, randr_outputs[i], cts);
+ int len = xcb_randr_get_screen_resources_current_outputs_length(res);
+ randr_outputs = xcb_randr_get_screen_resources_current_outputs(res);
- /* Loop through all outputs available for this X11 screen */
- for (int i = 0; i < len; i++) {
- xcb_randr_get_output_info_reply_t *output;
+ /* Request information for each output */
+ xcb_randr_get_output_info_cookie_t ocookie[len];
+ for (int i = 0; i < len; i++)
+ ocookie[i] = xcb_randr_get_output_info(conn, randr_outputs[i], cts);
- if ((output = xcb_randr_get_output_info_reply(conn, ocookie[i], NULL)) == NULL)
- continue;
+ /* Loop through all outputs available for this X11 screen */
+ for (int i = 0; i < len; i++) {
+ xcb_randr_get_output_info_reply_t *output;
+
+ if ((output = xcb_randr_get_output_info_reply(conn, ocookie[i], NULL)) == NULL)
+ continue;
+
+ handle_output(conn, randr_outputs[i], output, cts, res);
+ free(output);
+ }
+ }
- handle_output(conn, randr_outputs[i], output, cts, res);
- free(output);
+ /* 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->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
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->name, output->rect.x, output->rect.y);
for (other = output;
other != TAILQ_END(&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);
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);
}
}
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);
+ tree_close_internal(current, DONT_KILL_WINDOW, false, false);
continue;
}
DLOG("Detaching current = %p / %s\n", current, current->name);
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));
+ floating_fix_coordinates(floating_con, &(output->con->rect), &(first->con->rect));
DLOG("Done, next\n");
}
DLOG("re-attached all workspaces\n");
}
DLOG("destroying disappearing con %p\n", output->con);
- tree_close(output->con, DONT_KILL_WINDOW, true, false);
+ tree_close_internal(output->con, DONT_KILL_WINDOW, true, false);
DLOG("Done. Should be fine now\n");
output->con = NULL;
}
}
}
- if (TAILQ_EMPTY(&outputs)) {
- ELOG("No outputs found via RandR, disabling\n");
- disable_randr(conn);
- }
-
- /* Verifies that there is at least one active output as a side-effect. */
- get_first_output();
-
/* Just go through each active output and assign one workspace */
TAILQ_FOREACH(output, &outputs, outputs) {
if (!output->active)
void randr_init(int *event_base) {
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");
+ root_output->active = true;
+ output_init_con(root_output);
+ init_ws_for_output(root_output, output_get_content(root_output->con));
+
return;
- } else randr_query_outputs();
+ }
+
+ 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);
}
projects / i3 / i3 / blobdiff