X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Frandr.c;h=0c702db05ab9dc1868a3405031081e00bede64a5;hb=c3b4006f6b11578020238b1aa3d51eeab80d29e3;hp=e0ad4eb2d4dd5d43bbe3ff22a60976ce43bfa9a4;hpb=f54ce1ddda7870ca8be9581b4033c8d8e89f1095;p=i3%2Fi3 diff --git a/src/randr.c b/src/randr.c index e0ad4eb2..0c702db0 100644 --- a/src/randr.c +++ b/src/randr.c @@ -3,7 +3,7 @@ * * i3 - an improved dynamic tiling window manager * - * © 2009-2010 Michael Stapelberg and contributors + * © 2009-2011 Michael Stapelberg and contributors * * See file LICENSE for license information. * @@ -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); @@ -209,12 +212,171 @@ void disable_randr(xcb_connection_t *conn) { s->rect.width = root_screen->width_in_pixels; s->rect.height = root_screen->height_in_pixels; s->name = "xroot-0"; + output_init_con(s); TAILQ_INSERT_TAIL(&outputs, s, outputs); randr_disabled = true; } +/* + * Initializes a CT_OUTPUT Con (searches existing ones from inplace restart + * before) to use for the given Output. + * + * XXX: for assignments, we probably need to move workspace creation from here + * to after the loop in randr_query_outputs(). + * + */ +void output_init_con(Output *output) { + Con *con = NULL, *current; + bool reused = false; + + DLOG("init_con for output %s\n", output->name); + + /* 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) + continue; + + con = current; + reused = true; + DLOG("Using existing con %p / %s\n", con, con->name); + break; + } + + if (con == NULL) { + con = con_new(croot); + FREE(con->name); + con->name = sstrdup(output->name); + con->type = CT_OUTPUT; + con->layout = L_OUTPUT; + } + con->rect = output->rect; + output->con = con; + + char *name; + asprintf(&name, "[i3 con] output %s", con->name); + x_set_name(con, 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 */ + Con *ws = con_new(NULL); + ws->type = CT_WORKSPACE; + + /* get the next unused workspace number */ + DLOG("Getting next unused workspace\n"); + int c = 0; + bool exists = true; + while (exists) { + Con *out, *current, *child; + + c++; + + FREE(ws->name); + asprintf(&(ws->name), "%d", c); + + exists = false; + TAILQ_FOREACH(out, &(croot->nodes_head), nodes) { + TAILQ_FOREACH(current, &(out->nodes_head), nodes) { + if (current->type != CT_CON) + continue; + + 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, content, false); + + asprintf(&name, "[i3 con] workspace %s", ws->name); + x_set_name(ws, name); + free(name); + + ws->fullscreen_mode = CF_OUTPUT; + + /* 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); +} + /* * This function needs to be called when changing the mode of an output when * it already has some workspaces (or a bar window) assigned. @@ -227,9 +389,37 @@ void disable_randr(xcb_connection_t *conn) { * */ static void output_change_mode(xcb_connection_t *conn, Output *output) { - i3Font *font = load_font(conn, config.font); + //i3Font *font = load_font(conn, config.font); + + DLOG("Output mode changed, updating rect\n"); + assert(output->con != NULL); + output->con->rect = output->rect; + + Con *content, *workspace, *child; - DLOG("Output mode changed, reconfiguring bar, updating workspaces\n"); + /* 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), output->rect.x + output->rect.width, @@ -237,7 +427,6 @@ 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) @@ -294,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), @@ -305,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; } @@ -339,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; } @@ -353,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; @@ -365,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; @@ -392,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); @@ -440,33 +641,78 @@ 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 */ + /* 1: Get the con to focus next, if the disappearing ws is focused */ + Con *next = NULL; + if (TAILQ_FIRST(&(croot->focus_head)) == output->con) { + DLOG("This output (%p) was focused! Getting next\n", output->con); + next = con_next_focused(output->con); + DLOG("next = %p\n", next); + } - //bool needs_init = (first->current_workspace == NULL); + /* 2: iterate through workspaces and re-assign them */ + Con *current; + 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_content, false); + DLOG("Done, next\n"); + } + DLOG("re-attached all workspaces\n"); -#if 0 - TAILQ_FOREACH(ws, workspaces, workspaces) { - if (ws->output != output) - continue; - - workspace_assign_to(ws, first, true); - if (!needs_init) - continue; - //initialize_output(conn, first, ws); - needs_init = false; - } + if (next) { + DLOG("now focusing next = %p\n", next); + con_focus(next); + } - Client *dock; - while (!SLIST_EMPTY(&(output->dock_clients))) { - dock = SLIST_FIRST(&(output->dock_clients)); - SLIST_REMOVE_HEAD(&(output->dock_clients), dock_clients); - SLIST_INSERT_HEAD(&(first->dock_clients), dock, dock_clients); + /* 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"); + output->con = NULL; } -#endif - //output->current_workspace = NULL; output->to_be_disabled = false; - } else if (output->changed) { + output->changed = false; + } + + if (output->active && output->con == NULL) { + DLOG("Need to initialize a Con for output %s\n", output->name); + output_init_con(output); + output->changed = false; + } + + if (output->changed) { output_change_mode(conn, output); output->changed = false; } @@ -477,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 */ @@ -489,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); } /* @@ -504,7 +762,7 @@ void randr_init(int *event_base) { extreply = xcb_get_extension_data(conn, &xcb_randr_id); if (!extreply->present) disable_randr(conn); - else randr_query_outputs(conn); + else randr_query_outputs(); if (event_base != NULL) *event_base = extreply->first_event;