/* 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
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;
}
/*
}
/*
- * 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 *s = scalloc(1, sizeof(Output));
-
- s->active = true;
- 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;
+void create_root_output(xcb_connection_t *conn) {
+ root_output = scalloc(1, sizeof(Output));
+
+ root_output->active = true;
+ root_output->rect.x = 0;
+ root_output->rect.y = 0;
+ root_output->rect.width = root_screen->width_in_pixels;
+ root_output->rect.height = root_screen->height_in_pixels;
+ root_output->name = "xroot-0";
+ output_init_con(root_output);
+ init_ws_for_output(root_output, output_get_content(root_output->con));
+
+ TAILQ_INSERT_TAIL(&outputs, root_output, outputs);
}
/*
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) {
+/*
+ * (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;
/* an output is VGA-1, LVDS-1, etc. (usually physical video outputs) */
xcb_randr_output_t *randr_outputs;
- if (randr_disabled)
- return true;
-
/* 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);
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;
- }
+ if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL)
+ return;
+
cts = res->config_timestamp;
int len = xcb_randr_get_screen_resources_current_outputs_length(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
* lowest common mode */
TAILQ_FOREACH(output, &outputs, outputs) {
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
}
}
- 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)
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");
- }
- }
}
/*
void randr_init(int *event_base) {
const xcb_query_extension_reply_t *extreply;
+ create_root_output(conn);
+
extreply = xcb_get_extension_data(conn, &xcb_randr_id);
- if (!extreply->present) {
- disable_randr(conn);
+ if (!extreply->present)
return;
- } else
- randr_query_outputs();
+
+ randr_query_outputs();
if (event_base != NULL)
*event_base = extreply->first_event;
projects / i3 / i3 / blobdiff