* 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
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");
+ return NULL;
}
/*
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;
}
void disable_randr(xcb_connection_t *conn) {
DLOG("RandR extension unusable, disabling.\n");
- Output *s = scalloc(sizeof(Output));
+ Output *s = scalloc(1, sizeof(Output));
s->active = true;
s->rect.x = 0;
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;
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->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;
}
new->changed = true;
}
-/*
- * (Re-)queries the outputs via RandR and stores them in the list of outputs.
- *
- */
-void randr_query_outputs(void) {
+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;
xcb_randr_output_t *randr_outputs;
if (randr_disabled)
- return;
+ return true;
/* Get screen resources (primary output, crtcs, outputs, modes) */
rcookie = xcb_randr_get_screen_resources_current(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);
+ 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;
+ return true;
}
cts = res->config_timestamp;
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);
}
}
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
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");
FREE(res);
FREE(primary);
+
+ return true;
+}
+
+/*
+ * (Re-)queries the outputs via RandR and stores them in the list of outputs.
+ *
+ */
+void randr_query_outputs(void) {
+ static bool first_query = true;
+
+ 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);
+
+ if (!__randr_query_outputs())
+ die("No usable outputs available.\n");
+ }
+ }
}
/*
if (!extreply->present) {
disable_randr(conn);
return;
- } else randr_query_outputs();
+ } else
+ 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