X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcommands.c;h=2d8155f276a162494db56b6ce416566875b2861a;hb=a0e33c1d683ffe3b67a3967980f61f828b41fef2;hp=fb3c5422ea273102d9c7fc79619cd031f358f4ae;hpb=89c0caaec418d0b3328cf692ffba2d4324e63a14;p=i3%2Fi3 diff --git a/src/commands.c b/src/commands.c index fb3c5422..2d8155f2 100644 --- a/src/commands.c +++ b/src/commands.c @@ -3,7 +3,7 @@ * * i3 - an improved dynamic tiling window manager * - * © 2009 Michael Stapelberg and contributors + * © 2009-2010 Michael Stapelberg and contributors * * See file LICENSE for license information. * @@ -22,9 +22,18 @@ #include "table.h" #include "layout.h" #include "i3.h" -#include "xinerama.h" +#include "randr.h" #include "client.h" #include "floating.h" +#include "xcb.h" +#include "config.h" +#include "workspace.h" +#include "commands.h" +#include "resize.h" +#include "log.h" +#include "sighandler.h" +#include "manage.h" +#include "ipc.h" bool focus_window_in_container(xcb_connection_t *conn, Container *container, direction_t direction) { /* If this container is empty, we’re done */ @@ -40,7 +49,7 @@ bool focus_window_in_container(xcb_connection_t *conn, Container *container, dir else if (direction == D_DOWN) { if ((candidate = CIRCLEQ_NEXT_OR_NULL(&(container->clients), container->currently_focused, clients)) == NULL) candidate = CIRCLEQ_FIRST(&(container->clients)); - } else LOG("Direction not implemented!\n"); + } else ELOG("Direction not implemented!\n"); /* If we could not switch, the container contains exactly one client. We return false */ if (candidate == container->currently_focused) @@ -52,22 +61,83 @@ bool focus_window_in_container(xcb_connection_t *conn, Container *container, dir return true; } -typedef enum { THING_WINDOW, THING_CONTAINER } thing_t; +typedef enum { THING_WINDOW, THING_CONTAINER, THING_SCREEN } thing_t; + +static void jump_to_mark(xcb_connection_t *conn, const char *mark) { + Client *current; + LOG("Jumping to \"%s\"\n", mark); + + Workspace *ws; + TAILQ_FOREACH(ws, workspaces, workspaces) + SLIST_FOREACH(current, &(ws->focus_stack), focus_clients) { + if (current->mark == NULL || strcmp(current->mark, mark) != 0) + continue; + + workspace_show(conn, current->workspace->num + 1); + set_focus(conn, current, true); + return; + } + + ELOG("No window with this mark found\n"); +} static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t thing) { - LOG("focusing direction %d\n", direction); + DLOG("focusing direction %d\n", direction); int new_row = current_row, new_col = current_col; - Container *container = CUR_CELL; Workspace *t_ws = c_ws; + /* Makes sure new_col and new_row are within bounds of the new workspace */ +#define CHECK_COLROW_BOUNDARIES \ + do { \ + if (new_col >= t_ws->cols) \ + new_col = (t_ws->cols - 1); \ + if (new_row >= t_ws->rows) \ + new_row = (t_ws->rows - 1); \ + } while (0) + /* There always is a container. If not, current_col or current_row is wrong */ assert(container != NULL); if (container->workspace->fullscreen_client != NULL) { - LOG("You're in fullscreen mode. Won't switch focus\n"); + LOG("You're in fullscreen mode. Forcing focus to operate on whole screens\n"); + thing = THING_SCREEN; + } + + /* For focusing screens, situation is different: we get the rect + * of the current screen, then get the screen which is on its + * right/left/bottom/top and just switch to the workspace on + * the target screen. */ + if (thing == THING_SCREEN) { + Output *cs = c_ws->output; + assert(cs != NULL); + Rect bounds = cs->rect; + + if (direction == D_RIGHT) + bounds.x += bounds.width; + else if (direction == D_LEFT) + bounds.x -= bounds.width; + else if (direction == D_UP) + bounds.y -= bounds.height; + else bounds.y += bounds.height; + + Output *target = get_output_containing(bounds.x, bounds.y); + if (target == NULL) { + DLOG("Target output NULL\n"); + /* Wrap around if the target screen is out of bounds */ + if (direction == D_RIGHT) + target = get_output_most(D_LEFT, cs); + else if (direction == D_LEFT) + target = get_output_most(D_RIGHT, cs); + else if (direction == D_UP) + target = get_output_most(D_DOWN, cs); + else target = get_output_most(D_UP, cs); + } + + DLOG("Switching to ws %d\n", target->current_workspace + 1); + workspace_show(conn, target->current_workspace->num + 1); return; } @@ -78,9 +148,9 @@ static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t t if (focus_window_in_container(conn, container, direction)) return; - if (direction == D_DOWN && cell_exists(current_col, current_row+1)) + if (direction == D_DOWN && cell_exists(t_ws, current_col, current_row+1)) new_row = current_row + t_ws->table[current_col][current_row]->rowspan; - else if (direction == D_UP && cell_exists(current_col, current_row-1)) { + else if (direction == D_UP && cell_exists(c_ws, current_col, current_row-1)) { /* Set new_row as a sane default, but it may get overwritten in a second */ new_row--; @@ -94,21 +164,53 @@ static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t t } } else { /* Let’s see if there is a screen down/up there to which we can switch */ - LOG("container is at %d with height %d\n", container->y, container->height); - i3Screen *screen; + DLOG("container is at %d with height %d\n", container->y, container->height); + Output *output; int destination_y = (direction == D_UP ? (container->y - 1) : (container->y + container->height + 1)); - if ((screen = get_screen_containing(container->x, destination_y)) == NULL) { - LOG("Wrapping screen around vertically\n"); + if ((output = get_output_containing(container->x, destination_y)) == NULL) { + DLOG("Wrapping screen around vertically\n"); /* No screen found? Then wrap */ - screen = get_screen_most((direction == D_UP ? D_DOWN : D_UP)); + output = get_output_most((direction == D_UP ? D_DOWN : D_UP), container->workspace->output); } - t_ws = &(workspaces[screen->current_workspace]); + t_ws = output->current_workspace; new_row = (direction == D_UP ? (t_ws->rows - 1) : 0); } + + CHECK_COLROW_BOUNDARIES; + + DLOG("new_col = %d, new_row = %d\n", new_col, new_row); + if (t_ws->table[new_col][new_row]->currently_focused == NULL) { + DLOG("Cell empty, checking for colspanned client above...\n"); + for (int cols = 0; cols < new_col; cols += t_ws->table[cols][new_row]->colspan) { + if (new_col > (cols + (t_ws->table[cols][new_row]->colspan - 1))) + continue; + + new_col = cols; + DLOG("Fixed it to new col %d\n", new_col); + break; + } + } + + if (t_ws->table[new_col][new_row]->currently_focused == NULL) { + DLOG("Cell still empty, checking for full cols above spanned width...\n"); + DLOG("new_col = %d\n", new_col); + DLOG("colspan = %d\n", container->colspan); + for (int cols = new_col; + cols < container->col + container->colspan; + cols += t_ws->table[cols][new_row]->colspan) { + DLOG("candidate: new_row = %d, cols = %d\n", new_row, cols); + if (t_ws->table[cols][new_row]->currently_focused == NULL) + continue; + + new_col = cols; + DLOG("Fixed it to new col %d\n", new_col); + break; + } + } } else if (direction == D_LEFT || direction == D_RIGHT) { - if (direction == D_RIGHT && cell_exists(current_col+1, current_row)) + if (direction == D_RIGHT && cell_exists(t_ws, current_col+1, current_row)) new_col = current_col + t_ws->table[current_col][current_row]->colspan; - else if (direction == D_LEFT && cell_exists(current_col-1, current_row)) { + else if (direction == D_LEFT && cell_exists(t_ws, current_col-1, current_row)) { /* Set new_col as a sane default, but it may get overwritten in a second */ new_col--; @@ -122,26 +224,55 @@ static void focus_thing(xcb_connection_t *conn, direction_t direction, thing_t t } } else { /* Let’s see if there is a screen left/right here to which we can switch */ - LOG("container is at %d with width %d\n", container->x, container->width); - i3Screen *screen; + DLOG("container is at %d with width %d\n", container->x, container->width); + Output *output; int destination_x = (direction == D_LEFT ? (container->x - 1) : (container->x + container->width + 1)); - if ((screen = get_screen_containing(destination_x, container->y)) == NULL) { - LOG("Wrapping screen around horizontally\n"); - screen = get_screen_most((direction == D_LEFT ? D_RIGHT : D_LEFT)); + if ((output = get_output_containing(destination_x, container->y)) == NULL) { + DLOG("Wrapping screen around horizontally\n"); + output = get_output_most((direction == D_LEFT ? D_RIGHT : D_LEFT), container->workspace->output); } - t_ws = &(workspaces[screen->current_workspace]); + t_ws = output->current_workspace; new_col = (direction == D_LEFT ? (t_ws->cols - 1) : 0); } + + CHECK_COLROW_BOUNDARIES; + + DLOG("new_col = %d, new_row = %d\n", new_col, new_row); + if (t_ws->table[new_col][new_row]->currently_focused == NULL) { + DLOG("Cell empty, checking for rowspanned client above...\n"); + for (int rows = 0; rows < new_row; rows += t_ws->table[new_col][rows]->rowspan) { + if (new_row > (rows + (t_ws->table[new_col][rows]->rowspan - 1))) + continue; + + new_row = rows; + DLOG("Fixed it to new row %d\n", new_row); + break; + } + } + + if (t_ws->table[new_col][new_row]->currently_focused == NULL) { + DLOG("Cell still empty, checking for full cols near full spanned height...\n"); + DLOG("new_row = %d\n", new_row); + DLOG("rowspan = %d\n", container->rowspan); + for (int rows = new_row; + rows < container->row + container->rowspan; + rows += t_ws->table[new_col][rows]->rowspan) { + DLOG("candidate: new_col = %d, rows = %d\n", new_col, rows); + if (t_ws->table[new_col][rows]->currently_focused == NULL) + continue; + + new_row = rows; + DLOG("Fixed it to new col %d\n", new_row); + break; + } + } + } else { - LOG("direction unhandled\n"); + ELOG("direction unhandled\n"); return; } - /* Bounds checking */ - if (new_col >= t_ws->cols) - new_col = (t_ws->cols - 1); - if (new_row >= t_ws->rows) - new_row = (t_ws->rows - 1); + CHECK_COLROW_BOUNDARIES; if (t_ws->table[new_col][new_row]->currently_focused != NULL) set_focus(conn, t_ws->table[new_col][new_row]->currently_focused, true); @@ -163,7 +294,7 @@ static bool move_current_window_in_container(xcb_connection_t *conn, Client *cli if (other == CIRCLEQ_END(&(client->container->clients))) return false; - LOG("i can do that\n"); + DLOG("i can do that\n"); /* We can move the client inside its current container */ CIRCLEQ_REMOVE(&(client->container->clients), client, clients); if (direction == D_UP) @@ -266,7 +397,7 @@ static void move_current_window(xcb_connection_t *conn, direction_t direction) { /* Fix colspan/rowspan if it’d overlap */ fix_colrowspan(conn, workspace); - render_workspace(conn, workspace->screen, workspace); + render_workspace(conn, workspace->output, workspace); xcb_flush(conn); set_focus(conn, current_client, true); @@ -320,7 +451,7 @@ static void move_current_container(xcb_connection_t *conn, direction_t direction return; } - LOG("old = %d,%d and new = %d,%d\n", container->col, container->row, new->col, new->row); + DLOG("old = %d,%d and new = %d,%d\n", container->col, container->row, new->col, new->row); /* Swap the containers */ int col = new->col; @@ -360,9 +491,9 @@ static void snap_current_container(xcb_connection_t *conn, direction_t direction switch (direction) { case D_LEFT: /* Snap to the left is actually a move to the left and then a snap right */ - if (!cell_exists(container->col - 1, container->row) || - CUR_TABLE[container->col-1][container->row]->currently_focused != NULL) { - LOG("cannot snap to left - the cell is already used\n"); + if (!cell_exists(container->workspace, container->col - 1, container->row) || + CUR_TABLE[container->col-1][container->row]->currently_focused != NULL) { + ELOG("cannot snap to left - the cell is already used\n"); return; } @@ -372,29 +503,30 @@ static void snap_current_container(xcb_connection_t *conn, direction_t direction case D_RIGHT: { /* Check if the cell is used */ int new_col = container->col + container->colspan; - if (!cell_exists(new_col, container->row) || - CUR_TABLE[new_col][container->row]->currently_focused != NULL) { - LOG("cannot snap to right - the cell is already used\n"); - return; - } + for (int i = 0; i < container->rowspan; i++) + if (!cell_exists(container->workspace, new_col, container->row + i) || + CUR_TABLE[new_col][container->row + i]->currently_focused != NULL) { + ELOG("cannot snap to right - the cell is already used\n"); + return; + } /* Check if there are other cells with rowspan, which are in our way. * If so, reduce their rowspan. */ for (int i = container->row-1; i >= 0; i--) { - LOG("we got cell %d, %d with rowspan %d\n", + DLOG("we got cell %d, %d with rowspan %d\n", new_col, i, CUR_TABLE[new_col][i]->rowspan); while ((CUR_TABLE[new_col][i]->rowspan-1) >= (container->row - i)) CUR_TABLE[new_col][i]->rowspan--; - LOG("new rowspan = %d\n", CUR_TABLE[new_col][i]->rowspan); + DLOG("new rowspan = %d\n", CUR_TABLE[new_col][i]->rowspan); } container->colspan++; break; } case D_UP: - if (!cell_exists(container->col, container->row - 1) || - CUR_TABLE[container->col][container->row-1]->currently_focused != NULL) { - LOG("cannot snap to top - the cell is already used\n"); + if (!cell_exists(container->workspace, container->col, container->row - 1) || + CUR_TABLE[container->col][container->row-1]->currently_focused != NULL) { + ELOG("cannot snap to top - the cell is already used\n"); return; } @@ -402,20 +534,21 @@ static void snap_current_container(xcb_connection_t *conn, direction_t direction snap_current_container(conn, D_DOWN); return; case D_DOWN: { - LOG("snapping down\n"); + DLOG("snapping down\n"); int new_row = container->row + container->rowspan; - if (!cell_exists(container->col, new_row) || - CUR_TABLE[container->col][new_row]->currently_focused != NULL) { - LOG("cannot snap down - the cell is already used\n"); - return; - } + for (int i = 0; i < container->colspan; i++) + if (!cell_exists(container->workspace, container->col + i, new_row) || + CUR_TABLE[container->col + i][new_row]->currently_focused != NULL) { + ELOG("cannot snap down - the cell is already used\n"); + return; + } for (int i = container->col-1; i >= 0; i--) { - LOG("we got cell %d, %d with colspan %d\n", + DLOG("we got cell %d, %d with colspan %d\n", i, new_row, CUR_TABLE[i][new_row]->colspan); while ((CUR_TABLE[i][new_row]->colspan-1) >= (container->col - i)) CUR_TABLE[i][new_row]->colspan--; - LOG("new colspan = %d\n", CUR_TABLE[i][new_row]->colspan); + DLOG("new colspan = %d\n", CUR_TABLE[i][new_row]->colspan); } @@ -432,45 +565,65 @@ static void snap_current_container(xcb_connection_t *conn, direction_t direction static void move_floating_window_to_workspace(xcb_connection_t *conn, Client *client, int workspace) { /* t_ws (to workspace) is just a container pointer to the workspace we’re switching to */ - Workspace *t_ws = &(workspaces[workspace-1]); + Workspace *t_ws = workspace_get(workspace-1), + *old_ws = client->workspace; LOG("moving floating\n"); - if (t_ws->screen == NULL) { - LOG("initializing new workspace, setting num to %d\n", workspace-1); - t_ws->screen = c_ws->screen; - /* Copy the dimensions from the virtual screen */ - memcpy(&(t_ws->rect), &(t_ws->screen->rect), sizeof(Rect)); - } else { - /* Check if there is already a fullscreen client on the destination workspace and - * stop moving if so. */ - if (client->fullscreen && (t_ws->fullscreen_client != NULL)) { - LOG("Not moving: Fullscreen client already existing on destination workspace.\n"); - return; - } - } + workspace_initialize(t_ws, c_ws->output, false); - /* Remove from focus stack */ - SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients); - - if (client->workspace->fullscreen_client == client) - client->workspace->fullscreen_client = NULL; + /* Check if there is already a fullscreen client on the destination workspace and + * stop moving if so. */ + if (client->fullscreen && (t_ws->fullscreen_client != NULL)) { + ELOG("Not moving: Fullscreen client already existing on destination workspace.\n"); + return; + } - /* Insert into destination focus stack */ - client->workspace = t_ws; - SLIST_INSERT_HEAD(&(t_ws->focus_stack), client, focus_clients); - if (client->fullscreen) - t_ws->fullscreen_client = client; + floating_assign_to_workspace(client, t_ws); /* If we’re moving it to an invisible screen, we need to unmap it */ - if (t_ws->screen->current_workspace != t_ws->num) { - LOG("This workspace is not visible, unmapping\n"); - xcb_unmap_window(conn, client->frame); + if (!workspace_is_visible(t_ws)) { + DLOG("This workspace is not visible, unmapping\n"); + client_unmap(conn, client); + } else { + /* If this is not the case, we move the window to a workspace + * which is on another screen, so we also need to adjust its + * coordinates. */ + DLOG("before x = %d, y = %d\n", client->rect.x, client->rect.y); + uint32_t relative_x = client->rect.x - old_ws->rect.x, + relative_y = client->rect.y - old_ws->rect.y; + DLOG("rel_x = %d, rel_y = %d\n", relative_x, relative_y); + client->rect.x = t_ws->rect.x + relative_x; + client->rect.y = t_ws->rect.y + relative_y; + DLOG("after x = %d, y = %d\n", client->rect.x, client->rect.y); + reposition_client(conn, client); + xcb_flush(conn); + } + + /* Configure the window above all tiling windows (or below a fullscreen + * window, if any) */ + if (t_ws->fullscreen_client != NULL) { + uint32_t values[] = { t_ws->fullscreen_client->frame, XCB_STACK_MODE_BELOW }; + xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values); + } else { + Client *last_tiling; + SLIST_FOREACH(last_tiling, &(t_ws->focus_stack), focus_clients) + if (!client_is_floating(last_tiling)) + break; + if (last_tiling != SLIST_END(&(t_ws->focus_stack))) { + uint32_t values[] = { last_tiling->frame, XCB_STACK_MODE_ABOVE }; + xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values); + } } - LOG("done\n"); + DLOG("done\n"); render_layout(conn); + + if (workspace_is_visible(t_ws)) { + client_warp_pointer_into(conn, client); + set_focus(conn, client, true); + } } /* @@ -485,29 +638,23 @@ static void move_current_window_to_workspace(xcb_connection_t *conn, int workspa assert(container != NULL); /* t_ws (to workspace) is just a container pointer to the workspace we’re switching to */ - Workspace *t_ws = &(workspaces[workspace-1]); + Workspace *t_ws = workspace_get(workspace-1); Client *current_client = container->currently_focused; if (current_client == NULL) { - LOG("No currently focused client in current container.\n"); + ELOG("No currently focused client in current container.\n"); return; } Client *to_focus = CIRCLEQ_NEXT_OR_NULL(&(container->clients), current_client, clients); if (to_focus == NULL) to_focus = CIRCLEQ_PREV_OR_NULL(&(container->clients), current_client, clients); - if (t_ws->screen == NULL) { - LOG("initializing new workspace, setting num to %d\n", workspace-1); - t_ws->screen = container->workspace->screen; - /* Copy the dimensions from the virtual screen */ - memcpy(&(t_ws->rect), &(container->workspace->screen->rect), sizeof(Rect)); - } else { - /* Check if there is already a fullscreen client on the destination workspace and - * stop moving if so. */ - if (current_client->fullscreen && (t_ws->fullscreen_client != NULL)) { - LOG("Not moving: Fullscreen client already existing on destination workspace.\n"); - return; - } + workspace_initialize(t_ws, container->workspace->output, false); + /* Check if there is already a fullscreen client on the destination workspace and + * stop moving if so. */ + if (current_client->fullscreen && (t_ws->fullscreen_client != NULL)) { + ELOG("Not moving: Fullscreen client already existing on destination workspace.\n"); + return; } Container *to_container = t_ws->table[t_ws->current_col][t_ws->current_row]; @@ -522,9 +669,7 @@ static void move_current_window_to_workspace(xcb_connection_t *conn, int workspa CIRCLEQ_INSERT_TAIL(&(to_container->clients), current_client, clients); SLIST_INSERT_HEAD(&(to_container->workspace->focus_stack), current_client, focus_clients); - if (current_client->fullscreen) - t_ws->fullscreen_client = current_client; - LOG("Moved.\n"); + DLOG("Moved.\n"); current_client->container = to_container; current_client->workspace = to_container->workspace; @@ -532,122 +677,25 @@ static void move_current_window_to_workspace(xcb_connection_t *conn, int workspa to_container->currently_focused = current_client; /* If we’re moving it to an invisible screen, we need to unmap it */ - if (to_container->workspace->screen->current_workspace != to_container->workspace->num) { - LOG("This workspace is not visible, unmapping\n"); - xcb_unmap_window(conn, current_client->frame); + if (!workspace_is_visible(to_container->workspace)) { + DLOG("This workspace is not visible, unmapping\n"); + client_unmap(conn, current_client); + } else { + if (current_client->fullscreen) { + DLOG("Calling client_enter_fullscreen again\n"); + client_enter_fullscreen(conn, current_client, false); + } } /* delete all empty columns/rows */ cleanup_table(conn, container->workspace); render_layout(conn); -} - -/* - * Switches to the given workspace - * - */ -void show_workspace(xcb_connection_t *conn, int workspace) { - Client *client; - bool need_warp = false; - xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root; - /* t_ws (to workspace) is just a convenience pointer to the workspace we’re switching to */ - Workspace *t_ws = &(workspaces[workspace-1]); - - LOG("show_workspace(%d)\n", workspace); - - /* Store current_row/current_col */ - c_ws->current_row = current_row; - c_ws->current_col = current_col; - - /* Check if the workspace has not been used yet */ - if (t_ws->screen == NULL) { - LOG("initializing new workspace, setting num to %d\n", workspace); - t_ws->screen = c_ws->screen; - /* Copy the dimensions from the virtual screen */ - memcpy(&(t_ws->rect), &(t_ws->screen->rect), sizeof(Rect)); - } - - if (c_ws->screen != t_ws->screen) { - /* We need to switch to the other screen first */ - LOG("moving over to other screen.\n"); - - /* Store the old client */ - Client *old_client = CUR_CELL->currently_focused; - - c_ws = &(workspaces[t_ws->screen->current_workspace]); - current_col = c_ws->current_col; - current_row = c_ws->current_row; - if (CUR_CELL->currently_focused != NULL) - need_warp = true; - else { - Rect *dims = &(c_ws->screen->rect); - xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, - dims->x + (dims->width / 2), dims->y + (dims->height / 2)); - } - - /* Re-decorate the old client, it’s not focused anymore */ - if ((old_client != NULL) && !old_client->dock) - redecorate_window(conn, old_client); - else xcb_flush(conn); - } - - /* Check if we need to change something or if we’re already there */ - if (c_ws->screen->current_workspace == (workspace-1)) { - Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); - if (last_focused != SLIST_END(&(c_ws->focus_stack))) { - set_focus(conn, last_focused, true); - if (need_warp) { - client_warp_pointer_into(conn, last_focused); - xcb_flush(conn); - } - } - return; + if (workspace_is_visible(to_container->workspace)) { + client_warp_pointer_into(conn, current_client); + set_focus(conn, current_client, true); } - - t_ws->screen->current_workspace = workspace-1; - Workspace *old_workspace = c_ws; - c_ws = &workspaces[workspace-1]; - - /* Unmap all clients of the old workspace */ - unmap_workspace(conn, old_workspace); - - current_row = c_ws->current_row; - current_col = c_ws->current_col; - LOG("new current row = %d, current col = %d\n", current_row, current_col); - - ignore_enter_notify_forall(conn, c_ws, true); - - /* Map all clients on the new workspace */ - FOR_TABLE(c_ws) - CIRCLEQ_FOREACH(client, &(c_ws->table[cols][rows]->clients), clients) - xcb_map_window(conn, client->frame); - - /* Map all floating clients */ - if (!c_ws->floating_hidden) - TAILQ_FOREACH(client, &(c_ws->floating_clients), floating_clients) - xcb_map_window(conn, client->frame); - - /* Map all stack windows, if any */ - struct Stack_Window *stack_win; - SLIST_FOREACH(stack_win, &stack_wins, stack_windows) - if (stack_win->container->workspace == c_ws) - xcb_map_window(conn, stack_win->window); - - ignore_enter_notify_forall(conn, c_ws, false); - - /* Restore focus on the new workspace */ - Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); - if (last_focused != SLIST_END(&(c_ws->focus_stack))) { - set_focus(conn, last_focused, true); - if (need_warp) { - client_warp_pointer_into(conn, last_focused); - xcb_flush(conn); - } - } else xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); - - render_layout(conn); } /* @@ -668,11 +716,12 @@ static void jump_to_window(xcb_connection_t *conn, const char *arguments) { if ((client = get_matching_client(conn, classtitle, NULL)) == NULL) { free(classtitle); - LOG("No matching client found.\n"); + ELOG("No matching client found.\n"); return; } free(classtitle); + workspace_show(conn, client->workspace->num + 1); set_focus(conn, client, true); } @@ -690,17 +739,17 @@ static void jump_to_container(xcb_connection_t *conn, const char *arguments) { /* No match? Either no arguments were specified, or no numbers */ if (result < 1) { - LOG("At least one valid argument required\n"); + ELOG("At least one valid argument required\n"); return; } /* Move to the target workspace */ - show_workspace(conn, ws); + workspace_show(conn, ws); if (result < 3) return; - LOG("Boundary-checking col %d, row %d... (max cols %d, max rows %d)\n", col, row, c_ws->cols, c_ws->rows); + DLOG("Boundary-checking col %d, row %d... (max cols %d, max rows %d)\n", col, row, c_ws->cols, c_ws->rows); /* Move to row/col */ if (row >= c_ws->rows) @@ -708,7 +757,7 @@ static void jump_to_container(xcb_connection_t *conn, const char *arguments) { if (col >= c_ws->cols) col = c_ws->cols - 1; - LOG("Jumping to col %d, row %d\n", col, row); + DLOG("Jumping to col %d, row %d\n", col, row); if (c_ws->table[col][row]->currently_focused != NULL) set_focus(conn, c_ws->table[col][row]->currently_focused, true); } @@ -718,52 +767,175 @@ static void jump_to_container(xcb_connection_t *conn, const char *arguments) { * was specified). That is, selects the window you were in before you focused * the current window. * + * The special values 'floating' (select the next floating window), 'tiling' + * (select the next tiling window), 'ft' (if the current window is floating, + * select the next tiling window and vice-versa) are also valid + * */ static void travel_focus_stack(xcb_connection_t *conn, const char *arguments) { /* Start count at -1 to always skip the first element */ int times, count = -1; Client *current; + bool floating_criteria; + + /* Either it’s one of the special values… */ + if (strcasecmp(arguments, "floating") == 0) { + floating_criteria = true; + } else if (strcasecmp(arguments, "tiling") == 0) { + floating_criteria = false; + } else if (strcasecmp(arguments, "ft") == 0) { + Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack)); + if (last_focused == SLIST_END(&(c_ws->focus_stack))) { + ELOG("Cannot select the next floating/tiling client because there is no client at all\n"); + return; + } - if (sscanf(arguments, "%u", ×) != 1) { - LOG("No or invalid argument given (\"%s\"), using default of 1 times\n", arguments); - times = 1; - } + floating_criteria = !client_is_floating(last_focused); + } else { + /* …or a number was specified */ + if (sscanf(arguments, "%u", ×) != 1) { + ELOG("No or invalid argument given (\"%s\"), using default of 1 times\n", arguments); + times = 1; + } - Workspace *ws = CUR_CELL->workspace; + SLIST_FOREACH(current, &(CUR_CELL->workspace->focus_stack), focus_clients) { + if (++count < times) { + DLOG("Skipping\n"); + continue; + } - SLIST_FOREACH(current, &(ws->focus_stack), focus_clients) { - if (++count < times) { - LOG("Skipping\n"); - continue; + DLOG("Focussing\n"); + set_focus(conn, current, true); + break; } - - LOG("Focussing\n"); - set_focus(conn, current, true); - break; + return; } + + /* Select the next client matching the criteria parsed above */ + SLIST_FOREACH(current, &(CUR_CELL->workspace->focus_stack), focus_clients) + if (client_is_floating(current) == floating_criteria) { + set_focus(conn, current, true); + break; + } } -/* - * Goes through the list of arguments (for exec()) and checks if the given argument - * is present. If not, it copies the arguments (because we cannot realloc it) and - * appends the given argument. +/* + * Switch to next or previous existing workspace * */ -static char **append_argument(char **original, char *argument) { - int num_args; - for (num_args = 0; original[num_args] != NULL; num_args++) { - LOG("original argument: \"%s\"\n", original[num_args]); - /* If the argument is already present we return the original pointer */ - if (strcmp(original[num_args], argument) == 0) - return original; - } - /* Copy the original array */ - char **result = smalloc((num_args+2) * sizeof(char*)); - memcpy(result, original, num_args * sizeof(char*)); - result[num_args] = argument; - result[num_args+1] = NULL; - - return result; +static void next_previous_workspace(xcb_connection_t *conn, int direction) { + Workspace *ws = c_ws; + + if (direction == 'n') { + while (1) { + ws = TAILQ_NEXT(ws, workspaces); + + if (ws == TAILQ_END(workspaces)) + ws = TAILQ_FIRST(workspaces); + + if (ws == c_ws) + return; + + if (ws->output == NULL) + continue; + + workspace_show(conn, ws->num + 1); + return; + } + } else if (direction == 'p') { + while (1) { + ws = TAILQ_PREV(ws, workspaces_head, workspaces); + + if (ws == TAILQ_END(workspaces)) + ws = TAILQ_LAST(workspaces, workspaces_head); + + if (ws == c_ws) + return; + + if (ws->output == NULL) + continue; + + workspace_show(conn, ws->num + 1); + return; + } + } +} + +static void parse_resize_command(xcb_connection_t *conn, Client *last_focused, const char *command) { + int first, second; + resize_orientation_t orientation = O_VERTICAL; + Container *con = last_focused->container; + Workspace *ws = last_focused->workspace; + + if (client_is_floating(last_focused)) { + DLOG("Resizing a floating client\n"); + if (STARTS_WITH(command, "left")) { + command += strlen("left"); + last_focused->rect.width += atoi(command); + last_focused->rect.x -= atoi(command); + } else if (STARTS_WITH(command, "right")) { + command += strlen("right"); + last_focused->rect.width += atoi(command); + } else if (STARTS_WITH(command, "top")) { + command += strlen("top"); + last_focused->rect.height += atoi(command); + last_focused->rect.y -= atoi(command); + } else if (STARTS_WITH(command, "bottom")) { + command += strlen("bottom"); + last_focused->rect.height += atoi(command); + } else { + ELOG("Syntax: resize [+|-]\n"); + return; + } + + /* resize_client flushes */ + resize_client(conn, last_focused); + + return; + } + + if (STARTS_WITH(command, "left")) { + if (con->col == 0) + return; + first = con->col - 1; + second = con->col; + command += strlen("left"); + } else if (STARTS_WITH(command, "right")) { + first = con->col + (con->colspan - 1); + DLOG("column %d\n", first); + + if (!cell_exists(ws, first, con->row) || + (first == (ws->cols-1))) + return; + + second = first + 1; + command += strlen("right"); + } else if (STARTS_WITH(command, "top")) { + if (con->row == 0) + return; + first = con->row - 1; + second = con->row; + orientation = O_HORIZONTAL; + command += strlen("top"); + } else if (STARTS_WITH(command, "bottom")) { + first = con->row + (con->rowspan - 1); + if (!cell_exists(ws, con->col, first) || + (first == (ws->rows-1))) + return; + + second = first + 1; + orientation = O_HORIZONTAL; + command += strlen("bottom"); + } else { + ELOG("Syntax: resize [+|-]\n"); + return; + } + + int pixels = atoi(command); + if (pixels == 0) + return; + + resize_container(conn, ws, first, second, orientation, pixels); } /* @@ -789,25 +961,101 @@ void parse_command(xcb_connection_t *conn, const char *command) { return; } + if (STARTS_WITH(command, "mark")) { + if (last_focused == NULL) { + ELOG("There is no window to mark\n"); + return; + } + const char *rest = command + strlen("mark"); + while (*rest == ' ') + rest++; + if (*rest == '\0') { + DLOG("interactive mark starting\n"); + start_application("i3-input -p 'mark ' -l 1 -P 'Mark: '"); + } else { + LOG("mark with \"%s\"\n", rest); + client_mark(conn, last_focused, rest); + } + return; + } + + if (STARTS_WITH(command, "goto")) { + const char *rest = command + strlen("goto"); + while (*rest == ' ') + rest++; + if (*rest == '\0') { + DLOG("interactive go to mark starting\n"); + start_application("i3-input -p 'goto ' -l 1 -P 'Goto: '"); + } else { + LOG("go to \"%s\"\n", rest); + jump_to_mark(conn, rest); + } + return; + } + + if (STARTS_WITH(command, "stack-limit ")) { + if (last_focused == NULL || client_is_floating(last_focused)) { + ELOG("No container focused\n"); + return; + } + const char *rest = command + strlen("stack-limit "); + if (strncmp(rest, "rows ", strlen("rows ")) == 0) { + last_focused->container->stack_limit = STACK_LIMIT_ROWS; + rest += strlen("rows "); + } else if (strncmp(rest, "cols ", strlen("cols ")) == 0) { + last_focused->container->stack_limit = STACK_LIMIT_COLS; + rest += strlen("cols "); + } else { + ELOG("Syntax: stack-limit \n"); + return; + } + + last_focused->container->stack_limit_value = atoi(rest); + if (last_focused->container->stack_limit_value == 0) + last_focused->container->stack_limit = STACK_LIMIT_NONE; + + return; + } + + if (STARTS_WITH(command, "resize ")) { + if (last_focused == NULL) + return; + const char *rest = command + strlen("resize "); + parse_resize_command(conn, last_focused, rest); + return; + } + + if (STARTS_WITH(command, "mode ")) { + const char *rest = command + strlen("mode "); + switch_mode(conn, rest); + return; + } + /* Is it an ? */ if (STARTS_WITH(command, "exit")) { LOG("User issued exit-command, exiting without error.\n"); + restore_geometry(global_conn); + ipc_shutdown(); exit(EXIT_SUCCESS); } + /* Is it a ? */ + if (STARTS_WITH(command, "reload")) { + load_configuration(conn, NULL, true); + render_layout(conn); + /* Send an IPC event just in case the ws names have changed */ + ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}"); + return; + } + /* Is it ? Then restart in place. */ if (STARTS_WITH(command, "restart")) { - LOG("restarting \"%s\"...\n", start_argv[0]); - /* make sure -a is in the argument list or append it */ - start_argv = append_argument(start_argv, "-a"); - - execvp(start_argv[0], start_argv); - /* not reached */ + i3_restart(); } if (STARTS_WITH(command, "kill")) { if (last_focused == NULL) { - LOG("There is no window to kill\n"); + ELOG("There is no window to kill\n"); return; } @@ -827,27 +1075,58 @@ void parse_command(xcb_connection_t *conn, const char *command) { /* Should we travel the focus stack? */ if (STARTS_WITH(command, "focus")) { - const char *arguments = command + strlen("focus"); + const char *arguments = command + strlen("focus "); travel_focus_stack(conn, arguments); return; } - /* Is it 'f' for fullscreen? */ + /* Is it 'f' for fullscreen, or 'fg' for fullscreen_global? */ if (command[0] == 'f') { if (last_focused == NULL) return; - client_toggle_fullscreen(conn, last_focused); + if (command[1] == 'g') + client_toggle_fullscreen_global(conn, last_focused); + else + client_toggle_fullscreen(conn, last_focused); return; } /* Is it just 's' for stacking or 'd' for default? */ - if ((command[0] == 's' || command[0] == 'd') && (command[1] == '\0')) { - if (last_focused == NULL || last_focused->floating >= FLOATING_AUTO_ON) { - LOG("not switching, this is a floating client\n"); + if ((command[0] == 's' || command[0] == 'd' || command[0] == 'T') && (command[1] == '\0')) { + if (last_focused != NULL && client_is_floating(last_focused)) { + ELOG("not switching, this is a floating client\n"); return; } LOG("Switching mode for current container\n"); - switch_layout_mode(conn, CUR_CELL, (command[0] == 's' ? MODE_STACK : MODE_DEFAULT)); + int new_mode = MODE_DEFAULT; + if (command[0] == 's' && CUR_CELL->mode != MODE_STACK) + new_mode = MODE_STACK; + if (command[0] == 'T' && CUR_CELL->mode != MODE_TABBED) + new_mode = MODE_TABBED; + switch_layout_mode(conn, CUR_CELL, new_mode); + return; + } + + /* Is it 'bn' (border normal), 'bp' (border 1pixel) or 'bb' (border borderless)? */ + /* or even 'bt' (toggle border: 'bp' -> 'bb' -> 'bn' ) */ + if (command[0] == 'b') { + if (last_focused == NULL) { + ELOG("No window focused, cannot change border type\n"); + return; + } + + char com = command[1]; + if (command[1] == 't') { + if (last_focused->titlebar_position == TITLEBAR_TOP && + !last_focused->borderless) + com = 'p'; + else if (last_focused->titlebar_position == TITLEBAR_OFF && + !last_focused->borderless) + com = 'b'; + else com = 'n'; + } + + client_change_border(conn, last_focused, com); return; } @@ -857,7 +1136,7 @@ void parse_command(xcb_connection_t *conn, const char *command) { return; } - enum { WITH_WINDOW, WITH_CONTAINER, WITH_WORKSPACE } with = WITH_WINDOW; + enum { WITH_WINDOW, WITH_CONTAINER, WITH_WORKSPACE, WITH_SCREEN } with = WITH_WINDOW; /* Is it a ? */ if (command[0] == 'w') { @@ -869,8 +1148,11 @@ void parse_command(xcb_connection_t *conn, const char *command) { } else if (command[0] == 'w') { with = WITH_WORKSPACE; command++; + } else if (command[0] == 's') { + with = WITH_SCREEN; + command++; } else { - LOG("not yet implemented.\n"); + ELOG("not yet implemented.\n"); return; } } @@ -883,35 +1165,50 @@ void parse_command(xcb_connection_t *conn, const char *command) { return; } if (last_focused == NULL) { - LOG("Cannot toggle tiling/floating: workspace empty\n"); + ELOG("Cannot toggle tiling/floating: workspace empty\n"); return; } + Workspace *ws = last_focused->workspace; + + if (last_focused->fullscreen) + client_leave_fullscreen(conn, last_focused); + toggle_floating_mode(conn, last_focused, false); /* delete all empty columns/rows */ - cleanup_table(conn, last_focused->workspace); + cleanup_table(conn, ws); /* Fix colspan/rowspan if it’d overlap */ - fix_colrowspan(conn, last_focused->workspace); + fix_colrowspan(conn, ws); + + render_workspace(conn, ws->output, ws); + + /* Re-focus the client because cleanup_table sets the focus to the last + * focused client inside a container only. */ + set_focus(conn, last_focused, true); - render_workspace(conn, last_focused->workspace->screen, last_focused->workspace); - xcb_flush(conn); return; } + /* Is it 'n' or 'p' for next/previous workspace? (nw) */ + if ((command[0] == 'n' || command[0] == 'p') && command[1] == 'w') { + next_previous_workspace(conn, command[0]); + return; + } + /* It’s a normal */ char *rest = NULL; enum { ACTION_FOCUS, ACTION_MOVE, ACTION_SNAP } action = ACTION_FOCUS; direction_t direction; int times = strtol(command, &rest, 10); if (rest == NULL) { - LOG("Invalid command (\"%s\")\n", command); + ELOG("Invalid command (\"%s\")\n", command); return; } if (*rest == '\0') { /* No rest? This was a workspace number, not a times specification */ - show_workspace(conn, times); + workspace_show(conn, times); return; } @@ -923,25 +1220,25 @@ void parse_command(xcb_connection_t *conn, const char *command) { int workspace = strtol(rest, &rest, 10); if (rest == NULL) { - LOG("Invalid command (\"%s\")\n", command); + ELOG("Invalid command (\"%s\")\n", command); return; } if (*rest == '\0') { - if (last_focused != NULL && last_focused->floating >= FLOATING_AUTO_ON) + if (last_focused != NULL && client_is_floating(last_focused)) move_floating_window_to_workspace(conn, last_focused, workspace); else move_current_window_to_workspace(conn, workspace); return; } if (last_focused == NULL) { - LOG("Not performing (no window found)\n"); + ELOG("Not performing (no window found)\n"); return; } - if (last_focused->floating >= FLOATING_AUTO_ON && - (action != ACTION_FOCUS && action != ACTION_MOVE)) { - LOG("Not performing (floating)\n"); + if (client_is_floating(last_focused) && + (action != ACTION_FOCUS && action != ACTION_MOVE)) { + ELOG("Not performing (floating)\n"); return; } @@ -956,13 +1253,17 @@ void parse_command(xcb_connection_t *conn, const char *command) { else if (*rest == 'l') direction = D_RIGHT; else { - LOG("unknown direction: %c\n", *rest); + ELOG("unknown direction: %c\n", *rest); return; } rest++; if (action == ACTION_FOCUS) { - if (last_focused->floating >= FLOATING_AUTO_ON) { + if (with == WITH_SCREEN) { + focus_thing(conn, direction, THING_SCREEN); + continue; + } + if (client_is_floating(last_focused)) { floating_focus_direction(conn, last_focused, direction); continue; } @@ -971,7 +1272,14 @@ void parse_command(xcb_connection_t *conn, const char *command) { } if (action == ACTION_MOVE) { - if (last_focused->floating >= FLOATING_AUTO_ON) { + if (with == WITH_SCREEN) { + /* TODO: this should swap the screen’s contents + * (e.g. all workspaces) with the next/previous/… + * screen */ + ELOG("Not yet implemented\n"); + continue; + } + if (client_is_floating(last_focused)) { floating_move(conn, last_focused, direction); continue; } @@ -982,10 +1290,12 @@ void parse_command(xcb_connection_t *conn, const char *command) { } if (action == ACTION_SNAP) { + if (with == WITH_SCREEN) { + ELOG("You cannot snap a screen (it makes no sense).\n"); + continue; + } snap_current_container(conn, direction); continue; } } - - LOG("--- done ---\n"); }