X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=6c63069f84572d89722539499253081002f51ae1;hb=c56867792aa98ccedecfa40ca55e4a1a141a65c4;hp=ac41e34f801a9f75ff82bc0ef8248126843f025e;hpb=718d62a3cd04795752391e19315a886848d2e302;p=i3%2Fi3 diff --git a/src/randr.c b/src/randr.c index ac41e34f..6c63069f 100644 --- a/src/randr.c +++ b/src/randr.c @@ -12,28 +12,11 @@ * (take your time to read it completely, it answers all questions). * */ -#include -#include -#include -#include -#include #include -#include -#include #include -#include "queue.h" -#include "i3.h" -#include "data.h" -#include "table.h" -#include "util.h" -#include "layout.h" -#include "xcb.h" -#include "config.h" -#include "workspace.h" -#include "log.h" -#include "ewmh.h" +#include "all.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. */ @@ -44,8 +27,10 @@ typedef xcb_randr_get_screen_resources_current_reply_t resources_reply; /* Stores all outputs available in your current session. */ struct outputs_head outputs = TAILQ_HEAD_INITIALIZER(outputs); +static bool randr_disabled = false; + /* - * Get a specific output by its internal X11 id. Used by randr_query_screens + * Get a specific output by its internal X11 id. Used by randr_query_outputs * to check if the output is new (only in the first scan) or if we are * re-scanning. * @@ -78,75 +63,75 @@ Output *get_output_by_name(const char *name) { * */ Output *get_first_output() { - Output *screen; + Output *output; - TAILQ_FOREACH(screen, &outputs, outputs) { - if (screen->active) - return screen; - } + TAILQ_FOREACH(output, &outputs, outputs) + if (output->active) + return output; return NULL; } /* - * Looks in virtual_screens for the Output which contains coordinates x, y + * Returns the active (!) output which contains the coordinates x, y or NULL + * if there is no output which contains these coordinates. * */ -Output *get_screen_containing(int x, int y) { - Output *screen; - TAILQ_FOREACH(screen, &outputs, outputs) { - if (!screen->active) +Output *get_output_containing(int x, 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, screen->rect.x, screen->rect.y, screen->rect.width, screen->rect.height); - if (x >= screen->rect.x && x < (screen->rect.x + screen->rect.width) && - y >= screen->rect.y && y < (screen->rect.y + screen->rect.height)) - return screen; + 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; } return NULL; } /* - * Gets the screen which is the last one in the given direction, for example the screen - * on the most bottom when direction == D_DOWN, the screen most right when direction == D_RIGHT - * and so on. + * Gets the output which is the last one in the given direction, for example + * the output on the most bottom when direction == D_DOWN, the output most + * right when direction == D_RIGHT and so on. * - * This function always returns a screen. + * This function always returns a output. * */ -Output *get_screen_most(direction_t direction, Output *current) { - Output *screen, *candidate = NULL; +Output *get_output_most(direction_t direction, Output *current) { + Output *output, *candidate = NULL; int position = 0; - TAILQ_FOREACH(screen, &outputs, outputs) { - if (!screen->active) + TAILQ_FOREACH(output, &outputs, outputs) { + if (!output->active) continue; /* Repeated calls of WIN determine the winner of the comparison */ #define WIN(variable, condition) \ if (variable condition) { \ - candidate = screen; \ + candidate = output; \ position = variable; \ } \ break; if (((direction == D_UP) || (direction == D_DOWN)) && - (current->rect.x != screen->rect.x)) + (current->rect.x != output->rect.x)) continue; if (((direction == D_LEFT) || (direction == D_RIGHT)) && - (current->rect.y != screen->rect.y)) + (current->rect.y != output->rect.y)) continue; switch (direction) { case D_UP: - WIN(screen->rect.y, <= position); + WIN(output->rect.y, <= position); case D_DOWN: - WIN(screen->rect.y, >= position); + WIN(output->rect.y, >= position); case D_LEFT: - WIN(screen->rect.x, <= position); + WIN(output->rect.x, <= position); case D_RIGHT: - WIN(screen->rect.x, >= position); + WIN(output->rect.x, >= position); } } @@ -155,39 +140,66 @@ Output *get_screen_most(direction_t direction, Output *current) { return candidate; } -static void initialize_output(xcb_connection_t *conn, Output *output, - Workspace *workspace) { +#if 0 +/* + * Initializes the specified output, assigning the specified workspace to it. + * + */ +void initialize_output(xcb_connection_t *conn, Output *output, Workspace *workspace) { i3Font *font = load_font(conn, config.font); workspace->output = output; output->current_workspace = workspace; - /* Create a xoutput for each output */ - Rect bar_rect = {output->rect.x, - output->rect.y + output->rect.height - (font->height + 6), - output->rect.x + output->rect.width, - font->height + 6}; - uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK; - uint32_t values[] = {1, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS}; - output->bar = create_window(conn, bar_rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, true, mask, values); - output->bargc = xcb_generate_id(conn); - xcb_create_gc(conn, output->bargc, output->bar, 0, 0); + /* Copy rect for the workspace */ + memcpy(&(workspace->rect), &(output->rect), sizeof(Rect)); + + /* Map clients on the workspace, if any */ + workspace_map_clients(conn, workspace); + + /* Create a bar window on each output */ + if (!config.disable_workspace_bar) { + Rect bar_rect = {output->rect.x, + output->rect.y + output->rect.height - (font->height + 6), + output->rect.x + output->rect.width, + font->height + 6}; + uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK; + uint32_t values[] = {1, XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_BUTTON_PRESS}; + output->bar = create_window(conn, bar_rect, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_CURSOR_LEFT_PTR, true, mask, values); + output->bargc = xcb_generate_id(conn); + xcb_create_gc(conn, output->bargc, output->bar, 0, 0); + } SLIST_INIT(&(output->dock_clients)); + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}"); DLOG("initialized output at (%d, %d) with %d x %d\n", output->rect.x, output->rect.y, output->rect.width, output->rect.height); + + DLOG("assigning configured workspaces to this output...\n"); + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) { + if (ws == workspace) + continue; + if (ws->preferred_output == NULL || + get_output_by_name(ws->preferred_output) != output) + continue; + + DLOG("assigning ws %d\n", ws->num + 1); + workspace_assign_to(ws, output, true); + } } +#endif /* - * Fills virtual_screens with exactly one screen with width/height of the - * whole X screen. + * Disables RandR support by creating exactly one output with the size of the + * X11 screen. * */ -static void disable_randr(xcb_connection_t *conn) { +void disable_randr(xcb_connection_t *conn) { xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; - DLOG("RandR extension not found, disabling.\n"); + DLOG("RandR extension unusable, disabling.\n"); Output *s = scalloc(sizeof(Output)); @@ -196,26 +208,11 @@ static void disable_randr(xcb_connection_t *conn) { s->rect.y = 0; s->rect.width = root_screen->width_in_pixels; s->rect.height = root_screen->height_in_pixels; + s->name = "xroot-0"; TAILQ_INSERT_TAIL(&outputs, s, outputs); -} -/* - * Searches for a mode in the current RandR configuration by the mode id. - * Returns NULL if no such mode could be found (should never happen). - * - */ -static mode_info *get_mode_by_id(resources_reply *reply, xcb_randr_mode_t mode) { - xcb_randr_mode_info_iterator_t it; - - for (it = xcb_randr_get_screen_resources_current_modes_iterator(reply); - it.rem > 0; - xcb_randr_mode_info_next(&it)) { - if (it.data->id == mode) - return it.data; - } - - return NULL; + randr_disabled = true; } /* @@ -231,8 +228,6 @@ static mode_info *get_mode_by_id(resources_reply *reply, xcb_randr_mode_t mode) */ static void output_change_mode(xcb_connection_t *conn, Output *output) { i3Font *font = load_font(conn, config.font); - Workspace *ws; - Client *client; DLOG("Output mode changed, reconfiguring bar, updating workspaces\n"); Rect bar_rect = {output->rect.x, @@ -242,17 +237,29 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) { xcb_set_window_rect(conn, output->bar, bar_rect); +#if 0 /* go through all workspaces and set force_reconfigure */ TAILQ_FOREACH(ws, workspaces, workspaces) { if (ws->output != output) continue; + SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) { + client->force_reconfigure = true; + if (!client_is_floating(client)) + continue; + /* For floating clients we need to translate the + * coordinates (old workspace to new workspace) */ + DLOG("old: (%x, %x)\n", client->rect.x, client->rect.y); + client->rect.x -= ws->rect.x; + client->rect.y -= ws->rect.y; + client->rect.x += ws->output->rect.x; + client->rect.y += ws->output->rect.y; + DLOG("new: (%x, %x)\n", client->rect.x, client->rect.y); + } + /* Update dimensions from output */ memcpy(&(ws->rect), &(ws->output->rect), sizeof(Rect)); - SLIST_FOREACH(client, &(ws->focus_stack), focus_clients) - client->force_reconfigure = true; - /* Update the dimensions of a fullscreen client, if any */ if (ws->fullscreen_client != NULL) { DLOG("Updating fullscreen client size\n"); @@ -265,10 +272,11 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) { xcb_set_window_rect(conn, client->child, r); } } +#endif } /* - * Gets called by randr_query_screens() for each output. The function adds new + * 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 @@ -281,15 +289,12 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, /* each CRT controller has a position in which we are interested in */ crtc_info *crtc; - /* the CRTC runs in a specific mode, while the position is stored in - * the output itself */ - mode_info *mode; - Output *new = get_output_by_id(id); bool existing = (new != NULL); if (!existing) new = scalloc(sizeof(Output)); new->id = id; + FREE(new->name); asprintf(&new->name, "%.*s", xcb_randr_get_output_info_name_length(output), xcb_randr_get_output_info_name(output)); @@ -302,30 +307,30 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, if (output->crtc == XCB_NONE) { if (!existing) TAILQ_INSERT_TAIL(&outputs, new, outputs); - else if (new->active) { + else if (new->active) new->to_be_disabled = true; - - } - free(output); return; } xcb_randr_get_crtc_info_cookie_t icookie; icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts); - if ((crtc = xcb_randr_get_crtc_info_reply(conn, icookie, NULL)) == NULL || - (mode = get_mode_by_id(res, crtc->mode)) == NULL) { - DLOG("Skipping output %s: could not get CRTC/mode (%p/%p)\n", - new->name, crtc, mode); + 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); free(new); - free(output); return; } - new->active = true; bool updated = update_if_necessary(&(new->rect.x), crtc->x) | update_if_necessary(&(new->rect.y), crtc->y) | - update_if_necessary(&(new->rect.width), mode->width) | - update_if_necessary(&(new->rect.height), mode->height); + update_if_necessary(&(new->rect.width), crtc->width) | + update_if_necessary(&(new->rect.height), crtc->height); + free(crtc); + new->active = (new->rect.width != 0 && new->rect.height != 0); + if (!new->active) { + DLOG("width/height 0/0, disabling output\n"); + return; + } DLOG("mode: %dx%d+%d+%d\n", new->rect.width, new->rect.height, new->rect.x, new->rect.y); @@ -336,7 +341,6 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, if (!updated || !existing) { if (!existing) TAILQ_INSERT_TAIL(&outputs, new, outputs); - free(output); return; } @@ -347,8 +351,8 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, * (Re-)queries the outputs via RandR and stores them in the list of outputs. * */ -void randr_query_screens(xcb_connection_t *conn) { - Workspace *ws; +void randr_query_outputs() { + Output *output, *other, *first; xcb_randr_get_screen_resources_current_cookie_t rcookie; resources_reply *res; /* timestamp of the configuration so that we get consistent replies to all @@ -358,10 +362,15 @@ void randr_query_screens(xcb_connection_t *conn) { /* 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 (crtcs, outputs, modes) */ rcookie = xcb_randr_get_screen_resources_current(conn, root); - if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) - die("Could not get RandR screen resources\n"); + 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); @@ -380,49 +389,51 @@ void randr_query_screens(xcb_connection_t *conn) { continue; handle_output(conn, randr_outputs[i], output, cts, res); + free(output); } free(res); - Output *screen, *oscreen; - /* Check for clones and reduce the mode to the lowest common mode */ - TAILQ_FOREACH(screen, &outputs, outputs) { - if (!screen->active || screen->to_be_disabled) + /* 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("screen %p, position (%d, %d), checking for clones\n", - screen, screen->rect.x, screen->rect.y); + DLOG("output %p, position (%d, %d), checking for clones\n", + output, output->rect.x, output->rect.y); - for (oscreen = screen; - oscreen != TAILQ_END(&outputs); - oscreen = TAILQ_NEXT(oscreen, outputs)) { - if (oscreen == screen || !oscreen->active || oscreen->to_be_disabled) + for (other = output; + other != TAILQ_END(&outputs); + other = TAILQ_NEXT(other, outputs)) { + if (other == output || !other->active || other->to_be_disabled) continue; - if (oscreen->rect.x != screen->rect.x || - oscreen->rect.y != screen->rect.y) + if (other->rect.x != output->rect.x || + other->rect.y != output->rect.y) continue; - DLOG("screen %p has the same position, his mode = %d x %d\n", - oscreen, oscreen->rect.width, oscreen->rect.height); - uint32_t width = min(oscreen->rect.width, screen->rect.width); - uint32_t height = min(oscreen->rect.height, screen->rect.height); + DLOG("output %p has the same position, his mode = %d x %d\n", + 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); - if (update_if_necessary(&(screen->rect.width), width) | - update_if_necessary(&(screen->rect.height), height)) - screen->changed = true; + if (update_if_necessary(&(output->rect.width), width) | + update_if_necessary(&(output->rect.height), height)) + output->changed = true; - update_if_necessary(&(oscreen->rect.width), width); - update_if_necessary(&(oscreen->rect.height), height); + update_if_necessary(&(other->rect.width), width); + update_if_necessary(&(other->rect.height), height); - DLOG("disabling screen %p (%s)\n", oscreen, oscreen->name); - oscreen->to_be_disabled = true; + DLOG("disabling output %p (%s)\n", other, other->name); + other->to_be_disabled = true; - DLOG("new screen mode %d x %d, oscreen mode %d x %d\n", - screen->rect.width, screen->rect.height, - oscreen->rect.width, oscreen->rect.height); + 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 *output, *first; + /* Handle outputs which have a new mode or are disabled now (either + * because the user disabled them or because they are clones) */ TAILQ_FOREACH(output, &outputs, outputs) { if (output->to_be_disabled) { output->active = false; @@ -431,26 +442,29 @@ void randr_query_screens(xcb_connection_t *conn) { if ((first = get_first_output()) == NULL) die("No usable outputs available\n"); - bool needs_init = (first->current_workspace == NULL); + //bool needs_init = (first->current_workspace == NULL); +#if 0 TAILQ_FOREACH(ws, workspaces, workspaces) { if (ws->output != output) continue; - workspace_assign_to(ws, first); + workspace_assign_to(ws, first, true); if (!needs_init) continue; - initialize_output(conn, first, ws); + //initialize_output(conn, first, ws); needs_init = false; } Client *dock; while (!SLIST_EMPTY(&(output->dock_clients))) { dock = SLIST_FIRST(&(output->dock_clients)); - SLIST_INSERT_HEAD(&(first->dock_clients), dock, dock_clients); SLIST_REMOVE_HEAD(&(output->dock_clients), dock_clients); + SLIST_INSERT_HEAD(&(first->dock_clients), dock, dock_clients); } - output->current_workspace = NULL; + +#endif + //output->current_workspace = NULL; output->to_be_disabled = false; } else if (output->changed) { output_change_mode(conn, output); @@ -458,18 +472,25 @@ void randr_query_screens(xcb_connection_t *conn) { } } - ewmh_update_workarea(); + if (TAILQ_EMPTY(&outputs)) { + ELOG("No outputs found via RandR, disabling\n"); + disable_randr(conn); + } + + //ewmh_update_workarea(); +#if 0 /* Just go through each active output and associate one workspace */ - TAILQ_FOREACH(screen, &outputs, outputs) { - if (!screen->active || screen->current_workspace != NULL) + TAILQ_FOREACH(output, &outputs, outputs) { + if (!output->active || output->current_workspace != NULL) continue; - ws = get_first_workspace_for_screen(screen); - initialize_output(conn, screen, ws); + ws = get_first_workspace_for_output(output); + initialize_output(conn, output, ws); } +#endif /* render_layout flushes */ - render_layout(conn); + tree_render(); } /* @@ -477,13 +498,13 @@ void randr_query_screens(xcb_connection_t *conn) { * XRandR information to setup workspaces for each screen. * */ -void initialize_randr(xcb_connection_t *conn, int *event_base) { +void randr_init(int *event_base) { const xcb_query_extension_reply_t *extreply; extreply = xcb_get_extension_data(conn, &xcb_randr_id); if (!extreply->present) disable_randr(conn); - else randr_query_screens(conn); + else randr_query_outputs(conn); if (event_base != NULL) *event_base = extreply->first_event;