+#undef I3__FILE__
+#define I3__FILE__ "x.c"
/*
* vim:ts=4:sw=4:expandtab
*
p->con_deco_rect = con->deco_rect;
p->background = config.client.background;
p->con_is_leaf = con_is_leaf(con);
+ p->parent_orientation = con_orientation(parent);
if (con->deco_render_params != NULL &&
(con->window == NULL || !con->window->name_x_changed) &&
xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, &bottomline);
}
/* 1pixel border needs an additional line at the top */
- if (p->border_style == BS_1PIXEL && !(borders_to_hide & ADJ_UPPER_SCREEN_EDGE)) {
+ if (p->border_style == BS_PIXEL && !(borders_to_hide & ADJ_UPPER_SCREEN_EDGE)) {
xcb_rectangle_t topline = { br.x, 0, con->rect.width + br.width + br.x, br.y };
xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, &topline);
}
TAILQ_PREV(con, nodes_head, nodes) == NULL &&
con->parent->type != CT_FLOATING_CON) {
xcb_change_gc(conn, con->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->indicator });
- if (con_orientation(con->parent) == HORIZ)
+ if (p->parent_orientation == HORIZ)
xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, (xcb_rectangle_t[]){
- { r->width + br.width + br.x, 0, r->width, r->height + br.height } });
+ { r->width + br.width + br.x, br.y, r->width, r->height + br.height } });
else
xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, (xcb_rectangle_t[]){
{ br.x, r->height + br.height + br.y, r->width - (2 * br.x), r->height } });
/* 5: draw two unconnected lines in border color */
xcb_change_gc(conn, parent->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->border });
Rect *dr = &(con->deco_rect);
+ int deco_diff_l = 2;
+ int deco_diff_r = 2;
+ if (parent->layout == L_TABBED) {
+ if (TAILQ_PREV(con, nodes_head, nodes) != NULL)
+ deco_diff_l = 0;
+ if (TAILQ_NEXT(con, nodes) != NULL)
+ deco_diff_r = 0;
+ }
xcb_segment_t segments[] = {
{ dr->x, dr->y,
dr->x + dr->width - 1, dr->y },
- { dr->x + 2, dr->y + dr->height - 1,
- dr->x + dr->width - 3, dr->y + dr->height - 1 }
+ { dr->x + deco_diff_l, dr->y + dr->height - 1,
+ dr->x - deco_diff_r + dr->width - 1, dr->y + dr->height - 1 }
};
xcb_poly_segment(conn, parent->pixmap, parent->pm_gc, 2, segments);
int text_offset_y = (con->deco_rect.height - config.font.height) / 2;
struct Window *win = con->window;
- if (win == NULL || win->name_x == NULL) {
- /* this is a non-leaf container, we need to make up a good description */
- // TODO: use a good description instead of just "another container"
- draw_text("another container", strlen("another container"), false,
+ if (win == NULL) {
+ /* we have a split container which gets a representation
+ * of its children as title
+ */
+ char *title;
+ char *tree = con_get_tree_representation(con);
+ sasprintf(&title, "i3: %s", tree);
+ free(tree);
+
+ draw_text_ascii(title,
parent->pixmap, parent->pm_gc,
con->deco_rect.x + 2, con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2);
+ free(title);
+
goto copy_pixmaps;
}
+ if (win->name == NULL)
+ goto copy_pixmaps;
+
int indent_level = 0,
indent_mult = 0;
Con *il_parent = parent;
//DLOG("indent_level = %d, indent_mult = %d\n", indent_level, indent_mult);
int indent_px = (indent_level * 5) * indent_mult;
- draw_text(win->name_x, win->name_len, win->uses_net_wm_name,
+ draw_text(win->name,
parent->pixmap, parent->pm_gc,
con->deco_rect.x + 2 + indent_px, con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2 - indent_px);
}
cookie = xcb_unmap_window(conn, con->frame);
- DLOG("unmapping container (serial %d)\n", cookie.sequence);
+ DLOG("unmapping container %p / %s (serial %d)\n", con, con->name, cookie.sequence);
/* we need to increase ignore_unmap for this container (if it
* contains a window) and for every window "under" this one which
* contains a window */
*
*/
void x_set_i3_atoms(void) {
+ pid_t pid = getpid();
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8,
(current_socketpath == NULL ? 0 : strlen(current_socketpath)),
current_socketpath);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_PID, XCB_ATOM_CARDINAL, 32, 1, &pid);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
strlen(current_configpath), current_configpath);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SHMLOG_PATH, A_UTF8_STRING, 8,