X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=0c702db05ab9dc1868a3405031081e00bede64a5;hb=c3b4006f6b11578020238b1aa3d51eeab80d29e3;hp=43a734421a41c2d5eaa2c72179a5f8587718f71b;hpb=55b6d31e4ab1a79e4acb7e4d53e531fc1bc9b9da;p=i3%2Fi3 diff --git a/src/randr.c b/src/randr.c index 43a73442..0c702db0 100644 --- a/src/randr.c +++ b/src/randr.c @@ -24,6 +24,9 @@ typedef xcb_randr_get_crtc_info_reply_t crtc_info; typedef xcb_randr_mode_info_t mode_info; typedef xcb_randr_get_screen_resources_current_reply_t resources_reply; +/* Pointer to the result of the query for primary output */ +xcb_randr_get_output_primary_reply_t *primary; + /* Stores all outputs available in your current session. */ struct outputs_head outputs = TAILQ_HEAD_INITIALIZER(outputs); @@ -247,6 +250,7 @@ void output_init_con(Output *output) { FREE(con->name); con->name = sstrdup(output->name); con->type = CT_OUTPUT; + con->layout = L_OUTPUT; } con->rect = output->rect; output->con = con; @@ -254,12 +258,65 @@ void output_init_con(Output *output) { char *name; asprintf(&name, "[i3 con] output %s", con->name); x_set_name(con, name); - free(name); + FREE(name); if (reused) { DLOG("Not adding workspace, this was a reused con\n"); return; } + + DLOG("Changing layout, adding top/bottom dockarea\n"); + Con *topdock = con_new(NULL); + topdock->type = CT_DOCKAREA; + topdock->layout = L_DOCKAREA; + topdock->orientation = VERT; + /* this container swallows dock clients */ + Match *match = scalloc(sizeof(Match)); + match_init(match); + match->dock = M_DOCK_TOP; + match->insert_where = M_BELOW; + TAILQ_INSERT_TAIL(&(topdock->swallow_head), match, matches); + + topdock->name = sstrdup("topdock"); + + asprintf(&name, "[i3 con] top dockarea %s", con->name); + x_set_name(topdock, name); + FREE(name); + DLOG("attaching\n"); + con_attach(topdock, con, false); + + /* content container */ + + DLOG("adding main content container\n"); + Con *content = con_new(NULL); + content->type = CT_CON; + content->name = sstrdup("content"); + + asprintf(&name, "[i3 con] content %s", con->name); + x_set_name(content, name); + FREE(name); + con_attach(content, con, false); + + /* bottom dock container */ + Con *bottomdock = con_new(NULL); + bottomdock->type = CT_DOCKAREA; + bottomdock->layout = L_DOCKAREA; + bottomdock->orientation = VERT; + /* this container swallows dock clients */ + match = scalloc(sizeof(Match)); + match_init(match); + match->dock = M_DOCK_BOTTOM; + match->insert_where = M_BELOW; + TAILQ_INSERT_TAIL(&(bottomdock->swallow_head), match, matches); + + bottomdock->name = sstrdup("bottomdock"); + + asprintf(&name, "[i3 con] bottom dockarea %s", con->name); + x_set_name(bottomdock, name); + FREE(name); + DLOG("attaching\n"); + con_attach(bottomdock, con, false); + DLOG("Now adding a workspace\n"); /* add a workspace to this output */ @@ -271,7 +328,7 @@ void output_init_con(Output *output) { int c = 0; bool exists = true; while (exists) { - Con *out, *current; + Con *out, *current, *child; c++; @@ -281,25 +338,40 @@ void output_init_con(Output *output) { exists = false; TAILQ_FOREACH(out, &(croot->nodes_head), nodes) { TAILQ_FOREACH(current, &(out->nodes_head), nodes) { - if (strcasecmp(current->name, ws->name) != 0) + if (current->type != CT_CON) continue; - exists = true; - break; + TAILQ_FOREACH(child, &(current->nodes_head), nodes) { + if (strcasecmp(child->name, ws->name) != 0) + continue; + + exists = true; + break; + } } } DLOG("result for ws %s / %d: exists = %d\n", ws->name, c, exists); } ws->num = c; - con_attach(ws, con, false); + con_attach(ws, content, false); asprintf(&name, "[i3 con] workspace %s", ws->name); x_set_name(ws, name); free(name); ws->fullscreen_mode = CF_OUTPUT; - ws->orientation = HORIZ; + + /* If default_orientation is set to NO_ORIENTATION we determine + * orientation depending on output resolution. */ + if (config.default_orientation == NO_ORIENTATION) { + ws->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ; + DLOG("Auto orientation. Workspace size set to (%d,%d), setting orientation to %d.\n", + output->rect.width, output->rect.height, ws->orientation); + } else { + ws->orientation = config.default_orientation; + } + /* TODO: Set focus in main.c */ con_focus(ws); @@ -322,6 +394,31 @@ static void output_change_mode(xcb_connection_t *conn, Output *output) { DLOG("Output mode changed, updating rect\n"); assert(output->con != NULL); output->con->rect = output->rect; + + Con *content, *workspace, *child; + + /* Point content to the container of the workspaces */ + content = output_get_content(output->con); + + /* If default_orientation is NO_ORIENTATION, we change the orientation of + * the workspaces and their childs 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) { + /* Workspaces with more than one child are left untouched because + * we do not want to change an existing layout. */ + if (con_num_children(workspace) > 1) + continue; + + workspace->orientation = (output->rect.height > output->rect.width) ? VERT : HORIZ; + DLOG("Setting workspace [%d,%s]'s orientation to %d.\n", workspace->num, workspace->name, workspace->orientation); + if ((child = TAILQ_FIRST(&(workspace->nodes_head)))) { + child->orientation = workspace->orientation; + DLOG("Setting child [%d,%s]'s orientation to %d.\n", child->num, child->name, child->orientation); + } + } + } + #if 0 Rect bar_rect = {output->rect.x, output->rect.y + output->rect.height - (font->height + 6), @@ -386,6 +483,7 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, if (!existing) new = scalloc(sizeof(Output)); new->id = id; + new->primary = (primary && primary->output == id); FREE(new->name); asprintf(&new->name, "%.*s", xcb_randr_get_output_info_name_length(output), @@ -397,9 +495,11 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, * we do not need to change the list ever again (we only update the * position/size) */ if (output->crtc == XCB_NONE) { - if (!existing) - TAILQ_INSERT_TAIL(&outputs, new, outputs); - else if (new->active) + if (!existing) { + if (new->primary) + TAILQ_INSERT_HEAD(&outputs, new, outputs); + else TAILQ_INSERT_TAIL(&outputs, new, outputs); + } else if (new->active) new->to_be_disabled = true; return; } @@ -431,8 +531,11 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, * does not exist in the first place, the case is simple: we either * need to insert the new output or we are done. */ if (!updated || !existing) { - if (!existing) - TAILQ_INSERT_TAIL(&outputs, new, outputs); + if (!existing) { + if (new->primary) + TAILQ_INSERT_HEAD(&outputs, new, outputs); + else TAILQ_INSERT_TAIL(&outputs, new, outputs); + } return; } @@ -445,8 +548,10 @@ static void handle_output(xcb_connection_t *conn, xcb_randr_output_t id, */ void randr_query_outputs() { 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) */ xcb_timestamp_t cts; @@ -457,8 +562,13 @@ void randr_query_outputs() { if (randr_disabled) return; - /* Get screen resources (crtcs, outputs, modes) */ + /* 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); + + 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); if ((res = xcb_randr_get_screen_resources_current_reply(conn, rcookie, NULL)) == NULL) { disable_randr(conn); return; @@ -484,14 +594,13 @@ void randr_query_outputs() { free(output); } - free(res); /* 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("output %p, position (%d, %d), checking for clones\n", - output, output->rect.x, output->rect.y); + DLOG("output %p / %s, position (%d, %d), checking for clones\n", + output, output->name, output->rect.x, output->rect.y); for (other = output; other != TAILQ_END(&outputs); @@ -532,7 +641,12 @@ void randr_query_outputs() { DLOG("Output %s disabled, re-assigning workspaces/docks\n", output->name); if ((first = get_first_output()) == NULL) - die("No usable outputs available\n"); + die("No usable outputs available\n"); + + /* TODO: refactor the following code into a nice function. maybe + * use an on_destroy callback which is implement differently for + * different container types (CT_CONTENT vs. CT_DOCKAREA)? */ + Con *first_content = output_get_content(first->con); if (output->con != NULL) { /* We need to move the workspaces from the disappearing output to the first output */ @@ -546,12 +660,13 @@ void randr_query_outputs() { /* 2: iterate through workspaces and re-assign them */ Con *current; - while (!TAILQ_EMPTY(&(output->con->nodes_head))) { - current = TAILQ_FIRST(&(output->con->nodes_head)); + Con *old_content = output_get_content(output->con); + while (!TAILQ_EMPTY(&(old_content->nodes_head))) { + current = TAILQ_FIRST(&(old_content->nodes_head)); DLOG("Detaching current = %p / %s\n", current, current->name); con_detach(current); DLOG("Re-attaching current = %p / %s\n", current, current->name); - con_attach(current, first->con, false); + con_attach(current, first_content, false); DLOG("Done, next\n"); } DLOG("re-attached all workspaces\n"); @@ -561,6 +676,26 @@ void randr_query_outputs() { con_focus(next); } + /* 3: move the dock clients to the first output */ + Con *child; + TAILQ_FOREACH(child, &(output->con->nodes_head), nodes) { + if (child->type != CT_DOCKAREA) + continue; + DLOG("Handling dock con %p\n", child); + Con *dock; + while (!TAILQ_EMPTY(&(child->nodes_head))) { + dock = TAILQ_FIRST(&(child->nodes_head)); + Con *nc; + Match *match; + nc = con_for_window(first->con, dock->window, &match); + DLOG("Moving dock client %p to nc %p\n", dock, nc); + con_detach(dock); + DLOG("Re-attaching\n"); + con_attach(dock, nc, false); + DLOG("Done\n"); + } + } + DLOG("destroying disappearing con %p\n", output->con); tree_close(output->con, false, true); DLOG("Done. Should be fine now\n"); @@ -568,6 +703,7 @@ void randr_query_outputs() { } output->to_be_disabled = false; + output->changed = false; } if (output->active && output->con == NULL) { @@ -587,7 +723,7 @@ void randr_query_outputs() { disable_randr(conn); } - //ewmh_update_workarea(); + ewmh_update_workarea(); #if 0 /* Just go through each active output and associate one workspace */ @@ -599,8 +735,20 @@ void randr_query_outputs() { } #endif + /* Focus the primary screen, if possible */ + TAILQ_FOREACH(output, &outputs, outputs) { + if (!output->primary || !output->con) + continue; + + DLOG("Focusing primary output %s\n", output->name); + con_focus(con_descend_focused(output->con)); + } + /* render_layout flushes */ tree_render(); + + FREE(res); + FREE(primary); } /*