#include "util.h"
#include "xinerama.h"
#include "layout.h"
+#include "client.h"
+#include "floating.h"
/*
* Updates *destination with new_value and returns true if it was changed or false
*
*/
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);
}
* 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);
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);
*
*/
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 */
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");
+ LOG("redecorating child %08x\n", client->child);
+ 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)
+ 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);
+ 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)
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);
+ 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,
* 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]);
+ LOG("fixed that\n");
}
/*
* Pushes the client’s width/height to X11 and resizes the child window
*
*/
-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("resizing client 0x%08x to %d x %d\n", client->frame, client->rect.width, client->rect.height);
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;
Client *client;
int num_clients = 0, current_client = 0;
- if (container->currently_focused == NULL)
- return;
-
CIRCLEQ_FOREACH(client, &(container->clients), clients)
num_clients++;
/* 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 */
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;
}
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) {
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);
}
}
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);
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);
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");
/* 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;
+ int single_width = -1, single_height;
LOG("\n");
LOG("========\n");
LOG("container has %d colspan, %d rowspan\n",
container->col = cols;
container->x = xoffset[rows];
container->y = yoffset[cols];
+ container->width = 0;
+
+ 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->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 (single_width == -1)
+ single_width = container->width;
+ }
- if (container->height_factor == 0)
+ //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;
projects / i3 / i3 / blobdiff