X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=src%2Flayout.c;h=a3690ad6d2a9aad4284b4f38a34d9e69bc0376a3;hb=751fb27b239ec3fd8272782bdb023c759e615c16;hp=ad18f936e6c4b7542005b8987c4c37cfc89d3d8f;hpb=a12ca34d1c90b8223ced1605927c2f3a6728b5cf;p=i3%2Fi3 diff --git a/src/layout.c b/src/layout.c index ad18f936..a3690ad6 100644 --- a/src/layout.c +++ b/src/layout.c @@ -15,9 +15,9 @@ #include #include #include +#include #include "config.h" -#include "font.h" #include "i3.h" #include "xcb.h" #include "table.h" @@ -25,15 +25,16 @@ #include "xinerama.h" #include "layout.h" -/* This macro copies the old value of the given variable, changes the variable to contain - the new one and returns true if it changed. - Note that when combining multiple HAS_CHANGED statements, you need to use different variables. - If someone by chance knows why this is necessary (order of expressions in gcc?) and/or can - come up with a fix, please mail me. */ -#define HAS_CHANGED(temp, value, new) (temp = value, temp != (value = new)) +/* + * Updates *destination with new_value and returns true if it was changed or false + * if it was the same + * + */ +static bool update_if_necessary(uint32_t *destination, const uint32_t new_value) { + int old_value = *destination; -static int old_value_1; -static int old_value_2; + return ((*destination = new_value) != old_value); +} /* * Gets the unoccupied space (= space which is available for windows which were resized by the user) @@ -45,11 +46,11 @@ int get_unoccupied_x(Workspace *workspace, int row) { int unoccupied = workspace->rect.width; float default_factor = ((float)workspace->rect.width / workspace->cols) / workspace->rect.width; - printf("get_unoccupied_x(), starting with %d, default_factor = %f\n", unoccupied, default_factor); + 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]; - printf("width_factor[%d][%d] = %f, colspan = %d\n", cols, row, con->width_factor, con->colspan); + LOG("width_factor[%d][%d] = %f, colspan = %d\n", cols, row, con->width_factor, con->colspan); if (con->width_factor == 0) unoccupied -= workspace->rect.width * default_factor * con->colspan; cols += con->colspan; @@ -57,7 +58,7 @@ int get_unoccupied_x(Workspace *workspace, int row) { assert(unoccupied != 0); - printf("unoccupied space: %d\n", unoccupied); + LOG("unoccupied space: %d\n", unoccupied); return unoccupied; } @@ -66,11 +67,11 @@ int get_unoccupied_y(Workspace *workspace, int col) { int unoccupied = workspace->rect.height; float default_factor = ((float)workspace->rect.height / workspace->rows) / workspace->rect.height; - printf("get_unoccupied_y(), starting with %d, default_factor = %f\n", unoccupied, default_factor); + 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]; - printf("height_factor[%d][%d] = %f, rowspan %d\n", col, rows, con->height_factor, con->rowspan); + 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; @@ -78,7 +79,7 @@ int get_unoccupied_y(Workspace *workspace, int col) { assert(unoccupied != 0); - printf("unoccupied space: %d\n", unoccupied); + LOG("unoccupied space: %d\n", unoccupied); return unoccupied; } @@ -91,11 +92,13 @@ int get_unoccupied_y(Workspace *workspace, int col) { void redecorate_window(xcb_connection_t *conn, Client *client) { if (client->container->mode == MODE_STACK) { render_container(conn, client->container); - xcb_flush(conn); + /* We clear the frame to generate exposure events, because the color used + in drawing may be different */ + xcb_clear_area(conn, true, client->frame, 0, 0, client->rect.width, client->rect.height); } else decorate_window(conn, client, client->frame, client->titlegc, 0); + xcb_flush(conn); } - /* * (Re-)draws window decorations for a given Client onto the given drawable/graphic context. * When in stacking mode, the window decorations are drawn onto an own window. @@ -103,6 +106,7 @@ 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; @@ -114,16 +118,16 @@ void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t draw if (client->container->currently_focused == client) { /* Distinguish if the window is currently focused… */ if (CUR_CELL->currently_focused == client) - background_color = get_colorpixel(conn, client, client->frame, "#285577"); + background_color = get_colorpixel(conn, "#285577"); /* …or if it is the focused window in a not focused container */ - else background_color = get_colorpixel(conn, client, client->frame, "#555555"); + else background_color = get_colorpixel(conn, "#555555"); - text_color = get_colorpixel(conn, client, client->frame, "#ffffff"); - border_color = get_colorpixel(conn, client, client->frame, "#4c7899"); + text_color = get_colorpixel(conn, "#ffffff"); + border_color = get_colorpixel(conn, "#4c7899"); } else { - background_color = get_colorpixel(conn, client, client->frame, "#222222"); - text_color = get_colorpixel(conn, client, client->frame, "#888888"); - border_color = get_colorpixel(conn, client, client->frame, "#333333"); + background_color = get_colorpixel(conn, "#222222"); + text_color = get_colorpixel(conn, "#888888"); + border_color = get_colorpixel(conn, "#333333"); } /* Our plan is the following: @@ -135,49 +139,69 @@ void decorate_window(xcb_connection_t *conn, Client *client, xcb_drawable_t draw /* Draw a rectangle in background color around the window */ xcb_change_gc_single(conn, gc, XCB_GC_FOREGROUND, background_color); - xcb_rectangle_t rect = {0, offset, client->rect.width, offset + client->rect.height}; - xcb_poly_fill_rectangle(conn, drawable, gc, 1, &rect); + /* 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 { + /* 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_poly_fill_rectangle(conn, drawable, gc, 1, &rect); + + /* Draw the inner background to have a black frame around clients (such as mplayer) + which cannot be resized exactly in our frames and therefore are centered */ + xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000")); + xcb_rectangle_t crect = {2, decoration_height, + client->rect.width - (2 + 2), client->rect.height - 2 - decoration_height}; + 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); - /* Draw the font */ - uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT; - uint32_t values[] = { text_color, background_color, font->id }; - xcb_change_gc(conn, gc, mask, values); - - /* TODO: utf8? */ - char *label; - asprintf(&label, "(%08x) %.*s", client->frame, client->name_len, client->name); - xcb_void_cookie_t text_cookie = xcb_image_text_8_checked(conn, strlen(label), drawable, - gc, 3 /* X */, offset + font->height /* Y = baseline of font */, label); - check_error(conn, text_cookie, "Could not draw client's title"); - free(label); + /* 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 }; + xcb_change_gc(conn, gc, mask, values); + + /* name_len == -1 means this is a legacy application which does not specify _NET_WM_NAME, + and we don’t handle the old window name (COMPOUND_TEXT) but only _NET_WM_NAME, which + is UTF-8 */ + if (client->name_len == -1) + xcb_image_text_8(conn, strlen(client->name), drawable, gc, 3 /* X */, + offset + font->height /* Y = baseline of font */, client->name); + else + xcb_image_text_16(conn, client->name_len, drawable, gc, 3 /* X */, + offset + font->height /* Y = baseline of font */, (xcb_char2b_t*)client->name); + } } /* * Pushes the client’s x and y coordinates to X11 * */ -static void reposition_client(xcb_connection_t *connection, Client *client) { - printf("frame needs to be pushed to %dx%d\n", client->rect.x, client->rect.y); +static void reposition_client(xcb_connection_t *conn, Client *client) { + 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(connection, client->frame, - XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, &(client->rect.x)); + xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, &(client->rect.x)); } /* * Pushes the client’s width/height to X11 and resizes the child window * */ -static void resize_client(xcb_connection_t *connection, Client *client) { - i3Font *font = load_font(connection, config.font); +static void resize_client(xcb_connection_t *conn, Client *client) { + i3Font *font = load_font(conn, config.font); - printf("resizing client to %d x %d\n", client->rect.width, client->rect.height); - xcb_configure_window(connection, client->frame, + 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)); @@ -189,7 +213,7 @@ static void resize_client(xcb_connection_t *connection, Client *client) { XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT; Rect *rect = &(client->child_rect); - switch (client->container->mode) { + switch ((client->container != NULL ? client->container->mode : MODE_DEFAULT)) { case MODE_STACK: rect->x = 2; rect->y = 0; @@ -211,29 +235,36 @@ static void resize_client(xcb_connection_t *connection, Client *client) { break; } - printf("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height); + /* Obey the ratio, if any */ + if (client->proportional_height != 0 && + client->proportional_width != 0) { + LOG("proportional height = %d, width = %d\n", client->proportional_height, client->proportional_width); + double new_height = rect->height + 1; + int new_width = rect->width; - xcb_configure_window(connection, client->child, mask, &(rect->x)); + while (new_height > rect->height) { + new_height = ((double)client->proportional_height / client->proportional_width) * new_width; - /* After configuring a child window we need to fake a configure_notify_event according - to ICCCM 4.2.3. This seems rather broken, especially since X sends exactly the same - configure_notify_event automatically according to xtrace. Anyone knows details? */ - xcb_configure_notify_event_t event; + if (new_height > rect->height) + new_width--; + } + /* Center the window */ + rect->y += ceil(rect->height / 2) - floor(new_height / 2); + rect->x += ceil(rect->width / 2) - floor(new_width / 2); - event.event = client->child; - event.window = client->child; - event.response_type = XCB_CONFIGURE_NOTIFY; + rect->height = new_height; + rect->width = new_width; + LOG("new_height = %f, new_width = %d\n", new_height, new_width); + } - event.x = rect->x; - event.y = rect->y; - event.width = rect->width; - event.height = rect->height; + LOG("child will be at %dx%d with size %dx%d\n", rect->x, rect->y, rect->width, rect->height); - event.border_width = 0; - event.above_sibling = XCB_NONE; - event.override_redirect = false; + xcb_configure_window(conn, client->child, mask, &(rect->x)); - xcb_send_event(connection, false, client->child, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&event); + /* After configuring a child window we need to fake a configure_notify_event (see ICCCM 4.2.3). + * 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); } /* @@ -241,7 +272,7 @@ static void resize_client(xcb_connection_t *connection, Client *client) { * when focus changes in a stacking container) * */ -void render_container(xcb_connection_t *connection, Container *container) { +void render_container(xcb_connection_t *conn, Container *container) { Client *client; int num_clients = 0, current_client = 0; @@ -252,112 +283,240 @@ void render_container(xcb_connection_t *connection, Container *container) { num_clients++; if (container->mode == MODE_DEFAULT) { - printf("got %d clients in this default container.\n", num_clients); + 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) { + current_client++; + continue; + } + /* Check if we changed client->x or client->y by updating it. * Note the bitwise OR instead of logical OR to force evaluation of both statements */ if (client->force_reconfigure | - HAS_CHANGED(old_value_1, client->rect.x, container->x) | - HAS_CHANGED(old_value_2, client->rect.y, container->y + + update_if_necessary(&(client->rect.x), container->x) | + update_if_necessary(&(client->rect.y), container->y + (container->height / num_clients) * current_client)) - reposition_client(connection, client); + reposition_client(conn, client); /* TODO: vertical default layout */ if (client->force_reconfigure | - HAS_CHANGED(old_value_1, client->rect.width, container->width) | - HAS_CHANGED(old_value_2, client->rect.height, container->height / num_clients)) - resize_client(connection, client); + update_if_necessary(&(client->rect.width), container->width) | + update_if_necessary(&(client->rect.height), container->height / num_clients)) + resize_client(conn, client); client->force_reconfigure = false; current_client++; } } else { - i3Font *font = load_font(connection, config.font); + i3Font *font = load_font(conn, config.font); int decoration_height = (font->height + 2 + 2); struct Stack_Window *stack_win = &(container->stack_win); /* 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->height == 0) - xcb_map_window(connection, stack_win->window); + if (stack_win->rect.height == 0) + xcb_map_window(conn, stack_win->window); /* Check if we need to reconfigure our stack title window */ - if (HAS_CHANGED(old_value_1, stack_win->width, container->width) | - HAS_CHANGED(old_value_2, stack_win->height, decoration_height * num_clients)) { - xcb_configure_window(connection, stack_win->window, - XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, &(stack_win->width)); + if (update_if_necessary(&(stack_win->rect.x), container->x) | + update_if_necessary(&(stack_win->rect.y), container->y) | + update_if_necessary(&(stack_win->rect.width), container->width) | + update_if_necessary(&(stack_win->rect.height), decoration_height * num_clients)) { + + /* Configuration can happen in two slightly different ways: + + If there is no client in fullscreen mode, 5 parameters are passed + (x, y, width, height, stack mode is set to above which means top-most position). + + If there is a fullscreen client, the fourth parameter is set to to the + fullscreen window as sibling and the stack mode is set to below, which means + that the stack_window will be placed just below the sibling, that is, under + the fullscreen window. + */ + uint32_t values[] = { stack_win->rect.x, stack_win->rect.y, + stack_win->rect.width, stack_win->rect.height, + XCB_STACK_MODE_ABOVE, XCB_STACK_MODE_BELOW }; + uint32_t mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | + 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) { + mask |= XCB_CONFIG_WINDOW_SIBLING; + values[4] = container->workspace->fullscreen_client->frame; + } - uint32_t values[] = { XCB_STACK_MODE_ABOVE }; - xcb_configure_window(connection, stack_win->window, XCB_CONFIG_WINDOW_STACK_MODE, values); + 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; - /* Check if we changed client->x or client->y by updating it. - * Note the bitwise OR instead of logical OR to force evaluation of both statements */ - if (client->force_reconfigure | - HAS_CHANGED(old_value_1, client->rect.x, container->x) | - HAS_CHANGED(old_value_2, client->rect.y, container->y + (decoration_height * num_clients))) - reposition_client(connection, client); + if (container->workspace->fullscreen_client == NULL) { + uint32_t values[] = { XCB_STACK_MODE_ABOVE }; + xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values); + } - if (client->force_reconfigure | - HAS_CHANGED(old_value_1, client->rect.width, container->width) | - HAS_CHANGED(old_value_2, client->rect.height, container->height - (decoration_height * num_clients))) - resize_client(connection, client); + /* Render the decorations of all 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) { + current_client++; + continue; + } - client->force_reconfigure = false; + /* Check if we changed client->x or client->y by updating it. + * 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); - uint32_t values[] = { XCB_STACK_MODE_ABOVE }; - xcb_configure_window(connection, client->frame, XCB_CONFIG_WINDOW_STACK_MODE, values); + if (client->force_reconfigure | + update_if_necessary(&(client->rect.width), container->width) | + update_if_necessary(&(client->rect.height), container->height - (decoration_height * num_clients))) + resize_client(conn, client); - /* Render the decorations of all clients */ - CIRCLEQ_FOREACH(client, &(container->clients), clients) - decorate_window(connection, client, stack_win->window, stack_win->gc, + client->force_reconfigure = false; + + decorate_window(conn, client, stack_win->window, stack_win->gc, current_client++ * decoration_height); + } } } -static void render_bars(xcb_connection_t *connection, Workspace *r_ws, int width, int height) { +static void render_bars(xcb_connection_t *conn, Workspace *r_ws, int width, int *height) { Client *client; - SLIST_FOREACH(client, &(r_ws->dock_clients), dock_clients) { + 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 | - HAS_CHANGED(old_value_1, client->rect.x, 0) | - HAS_CHANGED(old_value_2, client->rect.y, height)) - reposition_client(connection, client); + update_if_necessary(&(client->rect.x), 0) | + update_if_necessary(&(client->rect.y), *height)) + reposition_client(conn, client); if (client->force_reconfigure | - HAS_CHANGED(old_value_1, client->rect.width, width) | - HAS_CHANGED(old_value_2, client->rect.height, client->desired_height)) - resize_client(connection, client); + update_if_necessary(&(client->rect.width), width) | + update_if_necessary(&(client->rect.height), client->desired_height)) + resize_client(conn, client); client->force_reconfigure = false; - height += client->desired_height; + LOG("desired_height = %d\n", client->desired_height); + *height += client->desired_height; } } -void render_layout(xcb_connection_t *connection) { +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_rectangle_t rect = {0, 0, width, height}; + xcb_poly_fill_rectangle(conn, screen->bar, screen->bargc, 1, &rect); + + /* Set font */ + xcb_change_gc_single(conn, screen->bargc, XCB_GC_FONT, font->id); + + int drawn = 0; + for (int c = 0; c < 10; c++) { + 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++; + } + + LOG("done rendering internal\n"); +} + +/* + * Modifies the event mask of all clients on the given workspace to either ignore or to handle + * enter notifies. It is handy to ignore notifies because they will be sent when a window is mapped + * under the cursor, thus when the user didn’t enter the window actively at all. + * + */ +void ignore_enter_notify_forall(xcb_connection_t *conn, Workspace *workspace, bool ignore_enter_notify) { + 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 */ + values[0] = FRAME_EVENT_MASK; + if (ignore_enter_notify) + values[0] &= ~(XCB_EVENT_MASK_ENTER_WINDOW); + xcb_change_window_attributes(conn, client->frame, XCB_CW_EVENT_MASK, values); + + /* Change event mask for the child itself */ + values[0] = CHILD_EVENT_MASK; + if (ignore_enter_notify) + values[0] &= ~(XCB_EVENT_MASK_ENTER_WINDOW); + xcb_change_window_attributes(conn, client->child, XCB_CW_EVENT_MASK, values); + } +} + +/* + * Renders the whole layout, that is: Go through each screen, each workspace, each container + * and render each client. This also renders the bars. + * + * If you don’t need to render *everything*, you should call render_container on the container + * you want to refresh. + * + */ +void render_layout(xcb_connection_t *conn) { i3Screen *screen; + i3Font *font = load_font(conn, config.font); - TAILQ_FOREACH(screen, &virtual_screens, screens) { + TAILQ_FOREACH(screen, virtual_screens, screens) { /* r_ws (rendering workspace) is just a shortcut to the Workspace being currently rendered */ Workspace *r_ws = &(workspaces[screen->current_workspace]); - printf("Rendering screen %d\n", screen->num); - if (r_ws->fullscreen_client != NULL) - /* This is easy: A client has entered fullscreen mode, so we don’t render at all */ - continue; + LOG("Rendering screen %d\n", screen->num); int width = r_ws->rect.width; int height = r_ws->rect.height; /* Reserve space for dock clients */ Client *client; - SLIST_FOREACH(client, &(r_ws->dock_clients), dock_clients) + SLIST_FOREACH(client, &(screen->dock_clients), dock_clients) height -= client->desired_height; - printf("got %d rows and %d cols\n", r_ws->rows, r_ws->cols); + /* 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]; @@ -367,39 +526,50 @@ void render_layout(xcb_connection_t *connection) { 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 (int cols = 0; cols < r_ws->cols; cols++) - for (int rows = 0; rows < r_ws->rows; rows++) { - Container *container = r_ws->table[cols][rows]; - printf("\n========\ncontainer has %d colspan, %d rowspan\n", - container->colspan, container->rowspan); - printf("container at %d, %d\n", xoffset[rows], yoffset[cols]); - /* Update position of the container */ - container->row = rows; - container->col = cols; - container->x = xoffset[rows]; - container->y = yoffset[cols]; - - if (container->width_factor == 0) - container->width = (width / r_ws->cols); - else container->width = get_unoccupied_x(r_ws, rows) * container->width_factor; - container->width *= container->colspan; - - if (container->height_factor == 0) - container->height = (height / r_ws->rows); - else container->height = get_unoccupied_y(r_ws, cols) * container->height_factor; - container->height *= container->rowspan; - - /* Render the container if it is not empty */ - render_container(connection, container); - - xoffset[rows] += container->width; - yoffset[cols] += container->height; - printf("==========\n"); - } + 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]); + /* Update position of the container */ + container->row = rows; + container->col = cols; + container->x = xoffset[rows]; + container->y = yoffset[cols]; + + 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; + + if (container->height_factor == 0) + container->height = (height / r_ws->rows); + else container->height = get_unoccupied_y(r_ws, cols) * container->height_factor; + single_height = container->height; + container->height *= container->rowspan; + + /* Render the container if it is not empty */ + render_container(conn, container); + + xoffset[rows] += single_width; + yoffset[cols] += single_height; + LOG("==========\n"); + } + + ignore_enter_notify_forall(conn, r_ws, false); - render_bars(connection, r_ws, width, height); + render_bars(conn, r_ws, width, &height); + render_internal_bar(conn, r_ws, width, font->height + 6); } - xcb_flush(connection); + xcb_flush(conn); }