X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Flayout.c;h=dd57cca86f527573277baf4697ad540f30686f3a;hb=a22550392d1a59b669548df51e0d536517aa17ec;hp=233859879f95d2ea1a0f5d9a749cfc492d42e311;hpb=d24e47a0f3225f1f17194a589a39674f5a5be3d0;p=i3%2Fi3 diff --git a/src/layout.c b/src/layout.c index 23385987..dd57cca8 100644 --- a/src/layout.c +++ b/src/layout.c @@ -24,6 +24,9 @@ #include "util.h" #include "xinerama.h" #include "layout.h" +#include "client.h" +#include "floating.h" +#include "handlers.h" /* * Updates *destination with new_value and returns true if it was changed or false @@ -31,7 +34,7 @@ * */ static bool update_if_necessary(uint32_t *destination, const uint32_t new_value) { - int old_value = *destination; + uint32_t old_value = *destination; return ((*destination = new_value) != old_value); } @@ -42,20 +45,17 @@ static bool update_if_necessary(uint32_t *destination, const uint32_t new_value) * windows correctly, meaning that the aspect ratio will be maintained when opening new windows. * */ -int get_unoccupied_x(Workspace *workspace, int row) { +int get_unoccupied_x(Workspace *workspace) { int unoccupied = workspace->rect.width; float default_factor = ((float)workspace->rect.width / workspace->cols) / workspace->rect.width; LOG("get_unoccupied_x(), starting with %d, default_factor = %f\n", unoccupied, default_factor); - for (int cols = 0; cols < workspace->cols;) { - Container *con = workspace->table[cols][row]; - LOG("width_factor[%d][%d] = %f, colspan = %d\n", cols, row, con->width_factor, con->colspan); - if (con->width_factor == 0) { - LOG("- %d * %f * %d = %f\n", workspace->rect.width, default_factor, con->colspan, workspace->rect.width * default_factor * con->colspan); - unoccupied -= workspace->rect.width * default_factor * con->colspan; - } - cols += con->colspan; + for (int cols = 0; cols < workspace->cols; cols++) { + LOG("width_factor[%d] = %f\n", cols, workspace->width_factor[cols]); + + if (workspace->width_factor[cols] == 0) + unoccupied -= workspace->rect.width * default_factor; } LOG("unoccupied space: %d\n", unoccupied); @@ -69,12 +69,10 @@ int get_unoccupied_y(Workspace *workspace, int col) { LOG("get_unoccupied_y(), starting with %d, default_factor = %f\n", unoccupied, default_factor); - for (int rows = 0; rows < workspace->rows;) { - Container *con = workspace->table[col][rows]; - LOG("height_factor[%d][%d] = %f, rowspan %d\n", col, rows, con->height_factor, con->rowspan); - if (con->height_factor == 0) - unoccupied -= workspace->rect.height * default_factor * con->rowspan; - rows += con->rowspan; + for (int rows = 0; rows < workspace->rows; rows++) { + LOG("height_factor[%d] = %f\n", rows, workspace->height_factor[rows]); + if (workspace->height_factor[rows] == 0) + unoccupied -= workspace->rect.height * default_factor; } LOG("unoccupied space: %d\n", unoccupied); @@ -88,7 +86,7 @@ int get_unoccupied_y(Workspace *workspace, int col) { * */ void redecorate_window(xcb_connection_t *conn, Client *client) { - if (client->container->mode == MODE_STACK) { + if (client->container != NULL && client->container->mode == MODE_STACK) { render_container(conn, client->container); /* We clear the frame to generate exposure events, because the color used in drawing may be different */ @@ -105,47 +103,48 @@ void redecorate_window(xcb_connection_t *conn, Client *client) { void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t drawable, xcb_gcontext_t gc, int offset) { i3Font *font = load_font(conn, config.font); int decoration_height = font->height + 2 + 2; - uint32_t background_color, - text_color, - border_color; + struct Colortriple *color; + Client *last_focused; /* Clients without a container (docks) won’t get decorated */ - if (client->container == NULL) + if (client->dock) return; - if (client->container->currently_focused == client) { - /* Distinguish if the window is currently focused… */ - if (CUR_CELL->currently_focused == client) - background_color = get_colorpixel(conn, "#285577"); - /* …or if it is the focused window in a not focused container */ - else background_color = get_colorpixel(conn, "#555555"); - - text_color = get_colorpixel(conn, "#ffffff"); - border_color = get_colorpixel(conn, "#4c7899"); + last_focused = SLIST_FIRST(&(client->workspace->focus_stack)); + if (client_is_floating(client)) { + if (last_focused == client) + color = &(config.client.focused); + else color = &(config.client.unfocused); } else { - background_color = get_colorpixel(conn, "#222222"); - text_color = get_colorpixel(conn, "#888888"); - border_color = get_colorpixel(conn, "#333333"); + if (client->container->currently_focused == client) { + /* Distinguish if the window is currently focused… */ + if (last_focused == client && c_ws == client->workspace) + color = &(config.client.focused); + /* …or if it is the focused window in a not focused container */ + else color = &(config.client.focused_inactive); + } else color = &(config.client.unfocused); } /* Our plan is the following: - - Draw a rect around the whole client in background_color + - Draw a rect around the whole client in color->background - Draw two lines in a lighter color - Draw the window’s title */ /* Draw a rectangle in background color around the window */ - xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, background_color); + if (client->borderless) + xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); + else xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, color->background); /* In stacking mode, we only render the rect for this specific decoration */ - if (client->container->mode == MODE_STACK) { - xcb_rectangle_t rect = {0, offset, client->container->width, offset + decoration_height }; - xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect); - } else { + if (client->container != NULL && client->container->mode == MODE_STACK) { /* We need to use the container’s width because it is the more recent value - when in stacking mode, clients get reconfigured only on demand (the not active client is not reconfigured), so the client’s rect.width would be wrong */ - xcb_rectangle_t rect = {0, 0, client->container->width, client->rect.height}; + xcb_rectangle_t rect = {0, offset, client->container->width, offset + decoration_height }; + xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect); + } else { + xcb_rectangle_t rect = {0, 0, client->rect.width, client->rect.height}; xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect); /* Draw the inner background to have a black frame around clients (such as mplayer) @@ -156,16 +155,21 @@ void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t draw xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect); } - /* Draw the lines */ - xcb_draw_line(conn, drawable, gc, border_color, 2, offset, client->rect.width, offset); - xcb_draw_line(conn, drawable, gc, border_color, 2, offset + font->height + 3, - 2 + client->rect.width, offset + font->height + 3); + if (client->titlebar_position != TITLEBAR_OFF) { + /* Draw the lines */ + xcb_draw_line(conn, drawable, gc, color->border, 0, offset, client->rect.width, offset); + if ((client->container == NULL || + client->container->mode != MODE_STACK || + CIRCLEQ_NEXT_OR_NULL(&(client->container->clients), client, clients) == NULL)) + xcb_draw_line(conn, drawable, gc, color->border, 2, offset + font->height + 3, + client->rect.width - 3, offset + font->height + 3); + } /* If the client has a title, we draw it */ if (client->name != NULL) { /* Draw the font */ uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT; - uint32_t values[] = { text_color, background_color, font->id }; + uint32_t values[] = { color->text, color->background, font->id }; xcb_change_gc(conn, gc, mask, values); /* name_len == -1 means this is a legacy application which does not specify _NET_WM_NAME, @@ -184,24 +188,49 @@ void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t draw * Pushes the client’s x and y coordinates to X11 * */ -static void reposition_client(xcb_connection_t *conn, Client *client) { +void reposition_client(xcb_connection_t *conn, Client *client) { + i3Screen *screen; + LOG("frame 0x%08x needs to be pushed to %dx%d\n", client->frame, client->rect.x, client->rect.y); /* Note: We can use a pointer to client->x like an array of uint32_ts because it is followed by client->y by definition */ xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, &(client->rect.x)); + + if (!client_is_floating(client)) + return; + + /* If the client is floating, we need to check if we moved it to a different workspace */ + if (client->workspace->screen == (screen = get_screen_containing(client->rect.x, client->rect.y))) + return; + + if (screen == NULL) { + LOG("Boundary checking disabled, no screen found for (%d, %d)\n", client->rect.x, client->rect.y); + return; + } + + LOG("Client is on workspace %p with screen %p\n", client->workspace, client->workspace->screen); + LOG("but screen at %d, %d is %p\n", client->rect.x, client->rect.y, screen); + floating_assign_to_workspace(client, &workspaces[screen->current_workspace]); } /* - * Pushes the client’s width/height to X11 and resizes the child window + * Pushes the client’s width/height to X11 and resizes the child window. This + * function also updates the client’s position, so if you work on tiling clients + * only, you can use this function instead of separate calls to reposition_client + * and resize_client to reduce flickering. * */ -static void resize_client(xcb_connection_t *conn, Client *client) { +void resize_client(xcb_connection_t *conn, Client *client) { i3Font *font = load_font(conn, config.font); + LOG("frame 0x%08x needs to be pushed to %dx%d\n", client->frame, client->rect.x, client->rect.y); LOG("resizing client 0x%08x to %d x %d\n", client->frame, client->rect.width, client->rect.height); xcb_configure_window(conn, client->frame, - XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, - &(client->rect.width)); + XCB_CONFIG_WINDOW_X | + XCB_CONFIG_WINDOW_Y | + XCB_CONFIG_WINDOW_WIDTH | + XCB_CONFIG_WINDOW_HEIGHT, + &(client->rect.x)); /* Adjust the position of the child inside its frame. * The coordinates of the child are relative to its frame, we @@ -219,11 +248,16 @@ static void resize_client(xcb_connection_t *conn, Client *client) { rect->height = client->rect.height - 2; break; default: - if (client->titlebar_position == TITLEBAR_OFF) { + if (client->titlebar_position == TITLEBAR_OFF && client->borderless) { rect->x = 0; rect->y = 0; rect->width = client->rect.width; rect->height = client->rect.height; + } else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) { + rect->x = 1; + rect->y = 1; + rect->width = client->rect.width - 1 - 1; + rect->height = client->rect.height - 1 - 1; } else { rect->x = 2; rect->y = font->height + 2 + 2; @@ -255,6 +289,20 @@ static void resize_client(xcb_connection_t *conn, Client *client) { LOG("new_height = %f, new_width = %d\n", new_height, new_width); } + if (client->height_increment > 1) { + int old_height = rect->height; + rect->height -= (rect->height - client->base_height) % client->height_increment; + LOG("Lost %d pixel due to client's height_increment (%d px)\n", + old_height - rect->height, client->height_increment); + } + + if (client->width_increment > 1) { + int old_width = rect->width; + rect->width -= (rect->width - client->base_width) % client->width_increment; + LOG("Lost %d pixel due to client's width_increment (%d px)\n", + old_width - rect->width, client->width_increment); + } + LOG("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height); xcb_configure_window(conn, client->child, mask, &(rect->x)); @@ -263,6 +311,13 @@ static void resize_client(xcb_connection_t *conn, Client *client) { * This is necessary to inform the client of its position relative to the root window, * not relative to its frame (as done in the configure_notify_event by the x server). */ fake_absolute_configure_notify(conn, client); + + /* Force redrawing after resizing the window because any now lost + * pixels could contain old garbage. */ + xcb_expose_event_t generated; + generated.window = client->frame; + generated.count = 0; + handle_expose_event(NULL, conn, &generated); } /* @@ -274,14 +329,10 @@ void render_container(xcb_connection_t *conn, Container *container) { Client *client; int num_clients = 0, current_client = 0; - if (container->currently_focused == NULL) - return; - CIRCLEQ_FOREACH(client, &(container->clients), clients) num_clients++; if (container->mode == MODE_DEFAULT) { - LOG("got %d clients in this default container.\n", num_clients); CIRCLEQ_FOREACH(client, &(container->clients), clients) { /* If the client is in fullscreen mode, it does not get reconfigured */ if (container->workspace->fullscreen_client == client) { @@ -294,15 +345,13 @@ void render_container(xcb_connection_t *conn, Container *container) { if (client->force_reconfigure | update_if_necessary(&(client->rect.x), container->x) | update_if_necessary(&(client->rect.y), container->y + - (container->height / num_clients) * current_client)) - reposition_client(conn, client); - - /* TODO: vertical default layout */ - if (client->force_reconfigure | + (container->height / num_clients) * current_client) | update_if_necessary(&(client->rect.width), container->width) | update_if_necessary(&(client->rect.height), container->height / num_clients)) resize_client(conn, client); + /* TODO: vertical default layout */ + client->force_reconfigure = false; current_client++; @@ -314,7 +363,7 @@ void render_container(xcb_connection_t *conn, Container *container) { /* Check if we need to remap our stack title window, it gets unmapped when the container is empty in src/handlers.c:unmap_notify() */ - if (stack_win->rect.height == 0) + if (stack_win->rect.height == 0 && num_clients > 0) xcb_map_window(conn, stack_win->window); /* Check if we need to reconfigure our stack title window */ @@ -340,8 +389,13 @@ void render_container(xcb_connection_t *conn, Container *container) { XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | XCB_CONFIG_WINDOW_STACK_MODE; - /* If there is no fullscreen client, we raise the stack window */ - if (container->workspace->fullscreen_client != NULL) { + /* Raise the stack window, but keep it below the first floating client + * and below the fullscreen client (if any) */ + Client *first_floating = TAILQ_FIRST(&(container->workspace->floating_clients)); + if (first_floating != TAILQ_END(&(container->workspace->floating_clients))) { + mask |= XCB_CONFIG_WINDOW_SIBLING; + values[4] = first_floating->frame; + } else if (container->workspace->fullscreen_client != NULL) { mask |= XCB_CONFIG_WINDOW_SIBLING; values[4] = container->workspace->fullscreen_client->frame; } @@ -349,8 +403,8 @@ void render_container(xcb_connection_t *conn, Container *container) { xcb_configure_window(conn, stack_win->window, mask, values); } - /* Reconfigure the currently focused client, if necessary. It is the only visible one */ - client = container->currently_focused; + /* Prepare the pixmap for usage */ + cached_pixmap_prepare(conn, &(stack_win->pixmap)); /* Render the decorations of all clients */ CIRCLEQ_FOREACH(client, &(container->clients), clients) { @@ -364,19 +418,19 @@ void render_container(xcb_connection_t *conn, Container *container) { * Note the bitwise OR instead of logical OR to force evaluation of both statements */ if (client->force_reconfigure | update_if_necessary(&(client->rect.x), container->x) | - update_if_necessary(&(client->rect.y), container->y + (decoration_height * num_clients))) - reposition_client(conn, client); - - if (client->force_reconfigure | + update_if_necessary(&(client->rect.y), container->y + (decoration_height * num_clients)) | update_if_necessary(&(client->rect.width), container->width) | update_if_necessary(&(client->rect.height), container->height - (decoration_height * num_clients))) resize_client(conn, client); client->force_reconfigure = false; - decorate_window(conn, client, stack_win->window, stack_win->gc, + decorate_window(conn, client, stack_win->pixmap.id, stack_win->pixmap.gc, current_client++ * decoration_height); } + + xcb_copy_area(conn, stack_win->pixmap.id, stack_win->window, stack_win->pixmap.gc, + 0, 0, 0, 0, stack_win->rect.width, stack_win->rect.height); } } @@ -385,7 +439,7 @@ static void render_bars(xcb_connection_t *conn, Workspace *r_ws, int width, int SLIST_FOREACH(client, &(r_ws->screen->dock_clients), dock_clients) { LOG("client is at %d, should be at %d\n", client->rect.y, *height); if (client->force_reconfigure | - update_if_necessary(&(client->rect.x), 0) | + update_if_necessary(&(client->rect.x), r_ws->rect.x) | update_if_necessary(&(client->rect.y), *height)) reposition_client(conn, client); @@ -401,28 +455,12 @@ static void render_bars(xcb_connection_t *conn, Workspace *r_ws, int width, int } static void render_internal_bar(xcb_connection_t *conn, Workspace *r_ws, int width, int height) { - LOG("Rendering internal bar\n"); i3Font *font = load_font(conn, config.font); i3Screen *screen = r_ws->screen; enum { SET_NORMAL = 0, SET_FOCUSED = 1 }; - uint32_t background_color[2], - text_color[2], - border_color[2], - black; - char label[3]; - - black = get_colorpixel(conn, "#000000"); - - background_color[SET_NORMAL] = get_colorpixel(conn, "#222222"); - text_color[SET_NORMAL] = get_colorpixel(conn, "#888888"); - border_color[SET_NORMAL] = get_colorpixel(conn, "#333333"); - - background_color[SET_FOCUSED] = get_colorpixel(conn, "#285577"); - text_color[SET_FOCUSED] = get_colorpixel(conn, "#ffffff"); - border_color[SET_FOCUSED] = get_colorpixel(conn, "#4c7899"); /* Fill the whole bar in black */ - xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, black); + xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); xcb_rectangle_t rect = {0, 0, width, height}; xcb_poly_fill_rectangle(conn, screen->bar, screen->bargc, 1, &rect); @@ -434,22 +472,31 @@ static void render_internal_bar(xcb_connection_t *conn, Workspace *r_ws, int wid if (workspaces[c].screen != screen) continue; - int set = (screen->current_workspace == c ? SET_FOCUSED : SET_NORMAL); - - xcb_draw_rect(conn, screen->bar, screen->bargc, border_color[set], - drawn * height, 1, height - 2, height - 2); - xcb_draw_rect(conn, screen->bar, screen->bargc, background_color[set], - drawn * height + 1, 2, height - 4, height - 4); - - snprintf(label, sizeof(label), "%d", c+1); - xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, text_color[set]); - xcb_change_gc_single(conn, screen->bargc, XCB_GC_BACKGROUND, background_color[set]); - xcb_image_text_8(conn, strlen(label), screen->bar, screen->bargc, drawn * height + 5 /* X */, - font->height + 1 /* Y = baseline of font */, label); - drawn++; + struct Colortriple *color = (screen->current_workspace == c ? &(config.bar.focused) : + &(config.bar.unfocused)); + Workspace *ws = &workspaces[c]; + + /* Draw the outer rect */ + xcb_draw_rect(conn, screen->bar, screen->bargc, color->border, + drawn, /* x */ + 1, /* y */ + ws->text_width + 5 + 5, /* width = text width + 5 px left + 5px right */ + height - 2 /* height = max. height - 1 px upper and 1 px bottom border */); + + /* Draw the background of this rect */ + xcb_draw_rect(conn, screen->bar, screen->bargc, color->background, + drawn + 1, + 2, + ws->text_width + 4 + 4, + height - 4); + + xcb_change_gc_single(conn, screen->bargc, XCB_GC_FOREGROUND, color->text); + xcb_change_gc_single(conn, screen->bargc, XCB_GC_BACKGROUND, color->background); + xcb_image_text_16(conn, ws->name_len, screen->bar, screen->bargc, drawn + 5 /* X */, + font->height + 1 /* Y = baseline of font */, + (xcb_char2b_t*)ws->name); + drawn += ws->text_width + 12; } - - LOG("done rendering internal\n"); } /* @@ -462,8 +509,6 @@ void ignore_enter_notify_forall(xcb_connection_t *conn, Workspace *workspace, bo Client *client; uint32_t values[1]; - LOG("Ignore enter_notify = %d\n", ignore_enter_notify); - FOR_TABLE(workspace) CIRCLEQ_FOREACH(client, &(workspace->table[cols][rows]->clients), clients) { /* Change event mask for the decorations */ @@ -497,8 +542,6 @@ void render_workspace(xcb_connection_t *conn, i3Screen *screen, Workspace *r_ws) /* Space for the internal bar */ height -= (font->height + 6); - LOG("got %d rows and %d cols\n", r_ws->rows, r_ws->cols); - int xoffset[r_ws->rows]; int yoffset[r_ws->cols]; /* Initialize offsets */ @@ -507,34 +550,31 @@ void render_workspace(xcb_connection_t *conn, i3Screen *screen, Workspace *r_ws) for (int rows = 0; rows < r_ws->rows; rows++) xoffset[rows] = r_ws->rect.x; - dump_table(conn, r_ws); - ignore_enter_notify_forall(conn, r_ws, true); /* Go through the whole table and render what’s necessary */ FOR_TABLE(r_ws) { Container *container = r_ws->table[cols][rows]; - int single_width, single_height; - LOG("\n"); - LOG("========\n"); - LOG("container has %d colspan, %d rowspan\n", - container->colspan, container->rowspan); - LOG("container at %d, %d\n", xoffset[rows], yoffset[cols]); + int single_width = -1, single_height; /* Update position of the container */ container->row = rows; container->col = cols; container->x = xoffset[rows]; container->y = yoffset[cols]; + container->width = 0; - if (container->width_factor == 0) - container->width = (width / r_ws->cols); - else container->width = get_unoccupied_x(r_ws, rows) * container->width_factor; - single_width = container->width; - container->width *= container->colspan; + for (int c = 0; c < container->colspan; c++) { + if (r_ws->width_factor[cols+c] == 0) + container->width += (width / r_ws->cols); + else container->width += get_unoccupied_x(r_ws) * r_ws->width_factor[cols+c]; - if (container->height_factor == 0) + if (single_width == -1) + single_width = container->width; + } + + //if (container->height_factor == 0) container->height = (height / r_ws->rows); - else container->height = get_unoccupied_y(r_ws, cols) * container->height_factor; + //else container->height = get_unoccupied_y(r_ws, cols) * container->height_factor; single_height = container->height; container->height *= container->rowspan; @@ -543,7 +583,6 @@ void render_workspace(xcb_connection_t *conn, i3Screen *screen, Workspace *r_ws) xoffset[rows] += single_width; yoffset[cols] += single_height; - LOG("==========\n"); } ignore_enter_notify_forall(conn, r_ws, false); @@ -563,10 +602,8 @@ void render_workspace(xcb_connection_t *conn, i3Screen *screen, Workspace *r_ws) void render_layout(xcb_connection_t *conn) { i3Screen *screen; - TAILQ_FOREACH(screen, virtual_screens, screens) { - LOG("Rendering screen %d\n", screen->num); + TAILQ_FOREACH(screen, virtual_screens, screens) render_workspace(conn, screen, &(workspaces[screen->current_workspace])); - } xcb_flush(conn); }