/* 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
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.
}
/*
- * 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;
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);
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) |
/*
* (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);
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;
- 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;
- handle_output(conn, randr_outputs[i], output, cts, res);
- free(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);
+ }
+ }
+
+ /* 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 (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("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;
projects / i3 / i3 / blobdiff