X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=6bb8d9e649e5137f08da46c1db9e2c35747e4184;hb=07dfb8450bfaf90d86b220b671997d322d325a85;hp=8496fd0338a935b5b32e06ba54773a18ce343f2a;hpb=aa8556abfc027ccec794138448b72a1c8c8d0071;p=i3%2Fi3 diff --git a/src/randr.c b/src/randr.c index 8496fd03..6bb8d9e6 100644 --- a/src/randr.c +++ b/src/randr.c @@ -5,7 +5,7 @@ * © 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 + * https://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt * (take your time to read it completely, it answers all questions). * */ @@ -40,17 +40,26 @@ static Output *get_output_by_id(xcb_randr_output_t id) { } /* - * Returns the output with the given name if it is active (!) or NULL. + * Returns the output with the given name or NULL. + * If require_active is true, only active outputs are considered. * */ -Output *get_output_by_name(const char *name) { +Output *get_output_by_name(const char *name, const bool require_active) { Output *output; bool get_primary = (strcasecmp("primary", name) == 0); TAILQ_FOREACH(output, &outputs, outputs) { - if ((output->primary && get_primary) || - (output->active && strcasecmp(output->name, name) == 0)) { + if (output->primary && get_primary) { return output; } + if (require_active && !output->active) { + continue; + } + struct output_name *output_name; + SLIST_FOREACH(output_name, &output->names_head, names) { + if (strcasecmp(output_name->name, name) == 0) { + return output; + } + } } return NULL; @@ -105,6 +114,20 @@ Output *get_output_containing(unsigned int x, unsigned int y) { return NULL; } +/* + * Returns the active output which contains the midpoint of the given rect. If + * such an output doesn't exist, returns the output which contains most of the + * rectangle or NULL if there is no output which intersects with it. + * + */ +Output *get_output_from_rect(Rect rect) { + unsigned int mid_x = rect.x + rect.width / 2; + unsigned int mid_y = rect.y + rect.height / 2; + Output *output = get_output_containing(mid_x, mid_y); + + return output ? output : output_containing_rect(rect); +} + /* * Returns the active output which spans exactly the area specified by * rect or NULL if there is no output like this. @@ -127,27 +150,37 @@ Output *get_output_with_dimensions(Rect rect) { } /* - * In contained_by_output, we check if any active output contains part of the container. + * In output_containing_rect, we check if any active output contains part of the container. * We do this by checking if the output rect is intersected by the Rect. * This is the 2-dimensional counterpart of get_output_containing. - * Since we don't actually need the outputs intersected by the given Rect (There could - * be many), we just return true or false for convenience. + * Returns the output with the maximum intersecting area. * */ -bool contained_by_output(Rect rect) { +Output *output_containing_rect(Rect rect) { Output *output; int lx = rect.x, uy = rect.y; int rx = rect.x + rect.width, by = rect.y + rect.height; + long max_area = 0; + Output *result = NULL; TAILQ_FOREACH(output, &outputs, outputs) { if (!output->active) continue; + int lx_o = (int)output->rect.x, uy_o = (int)output->rect.y; + int rx_o = (int)(output->rect.x + output->rect.width), by_o = (int)(output->rect.y + output->rect.height); 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); - 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; + int left = max(lx, lx_o); + int right = min(rx, rx_o); + int bottom = min(by, by_o); + int top = max(uy, uy_o); + if (left < right && bottom > top) { + long area = (right - left) * (bottom - top); + if (area > max_area) { + result = output; + } + } } - return false; + return result; } /* @@ -177,7 +210,7 @@ Output *get_output_next_wrap(direction_t direction, Output *current) { } if (!best) best = current; - DLOG("current = %s, best = %s\n", current->name, best->name); + DLOG("current = %s, best = %s\n", output_primary_name(current), output_primary_name(best)); return best; } @@ -249,7 +282,7 @@ Output *get_output_next(direction_t direction, Output *current, output_close_far } } - DLOG("current = %s, best = %s\n", current->name, (best ? best->name : "NULL")); + DLOG("current = %s, best = %s\n", output_primary_name(current), (best ? output_primary_name(best) : "NULL")); return best; } @@ -265,7 +298,11 @@ Output *create_root_output(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"; + + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = "xroot-0"; + SLIST_INIT(&s->names_head); + SLIST_INSERT_HEAD(&s->names_head, output_name, names); return s; } @@ -279,12 +316,12 @@ void output_init_con(Output *output) { Con *con = NULL, *current; bool reused = false; - DLOG("init_con for output %s\n", output->name); + DLOG("init_con for output %s\n", output_primary_name(output)); /* Search for a Con with that name directly below the root node. There * might be one from a restored layout. */ TAILQ_FOREACH(current, &(croot->nodes_head), nodes) { - if (strcmp(current->name, output->name) != 0) + if (strcmp(current->name, output_primary_name(output)) != 0) continue; con = current; @@ -296,7 +333,7 @@ void output_init_con(Output *output) { if (con == NULL) { con = con_new(croot, NULL); FREE(con->name); - con->name = sstrdup(output->name); + con->name = sstrdup(output_primary_name(output)); con->type = CT_OUTPUT; con->layout = L_OUTPUT; con_fix_percent(croot); @@ -367,6 +404,10 @@ void output_init_con(Output *output) { FREE(name); DLOG("attaching\n"); con_attach(bottomdock, con, false); + + /* Change focus to the content container */ + TAILQ_REMOVE(&(con->focus_head), content, focused); + TAILQ_INSERT_HEAD(&(con->focus_head), content, focused); } /* @@ -383,14 +424,10 @@ void init_ws_for_output(Output *output, Con *content) { /* go through all assignments and move the existing workspaces to this output */ struct Workspace_Assignment *assignment; TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { - if (strcmp(assignment->output, output->name) != 0) + if (!output_triggers_assignment(output, assignment)) { continue; - - /* 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)); + } + Con *workspace = get_existing_workspace_by_name(assignment->name); if (workspace == NULL) continue; @@ -401,13 +438,13 @@ void init_ws_for_output(Output *output, Con *content) { LOG("Workspace \"%s\" assigned to output \"%s\", but it is already " "there. Do you have two assignment directives for the same " "workspace in your configuration file?\n", - workspace->name, output->name); + workspace->name, output_primary_name(output)); continue; } /* if so, move it over */ LOG("Moving workspace \"%s\" from output \"%s\" to \"%s\" due to assignment\n", - workspace->name, workspace_out->name, output->name); + workspace->name, workspace_out->name, output_primary_name(output)); /* if the workspace is currently visible on that output, we need to * switch to a different workspace - otherwise the output would end up @@ -442,9 +479,9 @@ void init_ws_for_output(Output *output, Con *content) { if (visible && previous == NULL) { LOG("There is no workspace left on \"%s\", re-initializing\n", workspace_out->name); - init_ws_for_output(get_output_by_name(workspace_out->name), + init_ws_for_output(get_output_by_name(workspace_out->name, true), output_get_content(workspace_out)); - DLOG("Done re-initializing, continuing with \"%s\"\n", output->name); + DLOG("Done re-initializing, continuing with \"%s\"\n", output_primary_name(output)); } } @@ -464,8 +501,9 @@ void init_ws_for_output(Output *output, Con *content) { /* otherwise, we create the first assigned ws for this output */ TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) { - if (strcmp(assignment->output, output->name) != 0) + if (!output_triggers_assignment(output, assignment)) { continue; + } LOG("Initializing first assigned workspace \"%s\" for output \"%s\"\n", assignment->name, assignment->output); @@ -512,7 +550,7 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) { } /* If default_orientation is NO_ORIENTATION, we change the orientation of - * the workspaces and their childs depending on output resolution. This is + * the workspaces and their children depending on output resolution. This is * only done for workspaces with maximum one child. */ if (config.default_orientation == NO_ORIENTATION) { TAILQ_FOREACH(workspace, &(content->nodes_head), nodes) { @@ -590,10 +628,45 @@ static bool randr_query_outputs_15(void) { xcb_get_atom_name_name(atom_reply)); free(atom_reply); - Output *new = get_output_by_name(name); + Output *new = get_output_by_name(name, false); if (new == NULL) { new = scalloc(1, sizeof(Output)); - new->name = sstrdup(name); + + SLIST_INIT(&new->names_head); + + /* Register associated output names in addition to the monitor name */ + xcb_randr_output_t *randr_outputs = xcb_randr_monitor_info_outputs(monitor_info); + int randr_output_len = xcb_randr_monitor_info_outputs_length(monitor_info); + for (int i = 0; i < randr_output_len; i++) { + xcb_randr_output_t randr_output = randr_outputs[i]; + + xcb_randr_get_output_info_reply_t *info = + xcb_randr_get_output_info_reply(conn, + xcb_randr_get_output_info(conn, randr_output, monitors->timestamp), + NULL); + + if (info != NULL && info->crtc != XCB_NONE) { + char *oname; + sasprintf(&oname, "%.*s", + xcb_randr_get_output_info_name_length(info), + xcb_randr_get_output_info_name(info)); + + if (strcmp(name, oname) != 0) { + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = sstrdup(oname); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); + } else { + free(oname); + } + } + FREE(info); + } + + /* Insert the monitor name last, so that it's used as the primary name */ + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + output_name->name = sstrdup(name); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); + if (monitor_info->primary) { TAILQ_INSERT_HEAD(&outputs, new, outputs); } else { @@ -642,16 +715,25 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, Output *new = get_output_by_id(id); bool existing = (new != NULL); - if (!existing) + if (!existing) { new = scalloc(1, sizeof(Output)); + SLIST_INIT(&new->names_head); + } new->id = id; new->primary = (primary && primary->output == id); - FREE(new->name); - sasprintf(&new->name, "%.*s", + while (!SLIST_EMPTY(&new->names_head)) { + FREE(SLIST_FIRST(&new->names_head)->name); + struct output_name *old_head = SLIST_FIRST(&new->names_head); + SLIST_REMOVE_HEAD(&new->names_head, names); + FREE(old_head); + } + struct output_name *output_name = scalloc(1, sizeof(struct output_name)); + sasprintf(&output_name->name, "%.*s", xcb_randr_get_output_info_name_length(output), xcb_randr_get_output_info_name(output)); + SLIST_INSERT_HEAD(&new->names_head, output_name, names); - DLOG("found output with name %s\n", new->name); + DLOG("found output with name %s\n", output_primary_name(new)); /* Even if no CRTC is used at the moment, we store the output so that * we do not need to change the list ever again (we only update the @@ -671,7 +753,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, icookie = xcb_randr_get_crtc_info(conn, output->crtc, cts); 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); + output_primary_name(new), crtc); free(new); return; } @@ -775,8 +857,9 @@ void randr_query_outputs(void) { /* 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) + if (root_output && root_output->active) { root_output->to_be_disabled = true; + } } else { DLOG("No active RandR output found. Enabling root output.\n"); root_output->active = true; @@ -788,7 +871,7 @@ void randr_query_outputs(void) { 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_primary_name(output), output->rect.x, output->rect.y); for (other = output; other != TAILQ_END(&outputs); @@ -812,7 +895,7 @@ void randr_query_outputs(void) { update_if_necessary(&(other->rect.width), width); update_if_necessary(&(other->rect.height), height); - DLOG("disabling output %p (%s)\n", other, other->name); + DLOG("disabling output %p (%s)\n", other, output_primary_name(other)); other->to_be_disabled = true; DLOG("new output mode %d x %d, other mode %d x %d\n", @@ -827,7 +910,7 @@ void randr_query_outputs(void) { * LVDS1 gets disabled. */ TAILQ_FOREACH(output, &outputs, outputs) { if (output->active && output->con == NULL) { - DLOG("Need to initialize a Con for output %s\n", output->name); + DLOG("Need to initialize a Con for output %s\n", output_primary_name(output)); output_init_con(output); output->changed = false; } @@ -853,7 +936,7 @@ void randr_query_outputs(void) { Con *content = output_get_content(output->con); if (!TAILQ_EMPTY(&(content->nodes_head))) continue; - DLOG("Should add ws for output %s\n", output->name); + DLOG("Should add ws for output %s\n", output_primary_name(output)); init_ws_for_output(output, content); } @@ -862,8 +945,10 @@ void randr_query_outputs(void) { if (!output->primary || !output->con) continue; - DLOG("Focusing primary output %s\n", output->name); - con_focus(con_descend_focused(output->con)); + DLOG("Focusing primary output %s\n", output_primary_name(output)); + Con *content = output_get_content(output->con); + Con *ws = TAILQ_FIRST(&(content)->focus_head); + workspace_show(ws); } /* render_layout flushes */ @@ -880,7 +965,7 @@ void randr_disable_output(Output *output) { assert(output->to_be_disabled); output->active = false; - DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name); + DLOG("Output %s disabled, re-assigning workspaces/docks\n", output_primary_name(output)); Output *first = get_first_output(); @@ -908,7 +993,7 @@ void randr_disable_output(Output *output) { 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_internal(current, DONT_KILL_WINDOW, false, false); + tree_close_internal(current, DONT_KILL_WINDOW, false); continue; } DLOG("Detaching current = %p / %s\n", current, current->name); @@ -926,7 +1011,7 @@ void randr_disable_output(Output *output) { if (next) { DLOG("now focusing next = %p\n", next); - con_focus(next); + con_activate(next); workspace_show(con_get_workspace(next)); } @@ -954,7 +1039,7 @@ void randr_disable_output(Output *output) { Con *con = output->con; /* clear the pointer before calling tree_close_internal in which the memory is freed */ output->con = NULL; - tree_close_internal(con, DONT_KILL_WINDOW, true, false); + tree_close_internal(con, DONT_KILL_WINDOW, true); DLOG("Done. Should be fine now\n"); } @@ -991,8 +1076,8 @@ void randr_init(int *event_base, const bool disable_randr15) { xcb_randr_query_version_reply( conn, xcb_randr_query_version(conn, XCB_RANDR_MAJOR_VERSION, XCB_RANDR_MINOR_VERSION), &err); if (err != NULL) { - free(err); ELOG("Could not query RandR version: X11 error code %d\n", err->error_code); + free(err); fallback_to_root_output(); return; }