+#undef I3__FILE__
+#define I3__FILE__ "x.c"
/*
* vim:ts=4:sw=4:expandtab
*
void x_draw_decoration(Con *con) {
Con *parent = con->parent;
bool leaf = con_is_leaf(con);
+
/* This code needs to run for:
* • leaf containers
* • non-leaf containers which are in a stacked/tabbed container
*
* It does not need to run for:
+ * • direct children of outputs or dockareas
* • floating containers (they don’t have a decoration)
*/
if ((!leaf &&
parent->layout != L_STACKED &&
parent->layout != L_TABBED) ||
+ parent->type == CT_OUTPUT ||
+ parent->type == CT_DOCKAREA ||
con->type == CT_FLOATING_CON)
return;
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) &&
/* 3: draw a rectangle in border color around the client */
if (p->border_style != BS_NONE && p->con_is_leaf) {
+ /* We might hide some borders adjacent to the screen-edge */
+ adjacent_t borders_to_hide = ADJ_NONE;
+ borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders;
+
Rect br = con_border_style_rect(con);
#if 0
DLOG("con->rect spans %d x %d\n", con->rect.width, con->rect.height);
* rectangle because some childs are not freely resizable and we want
* their background color to "shine through". */
xcb_change_gc(conn, con->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->background });
- xcb_rectangle_t borders[] = {
- { 0, 0, br.x, r->height },
- { 0, r->height + br.height + br.y, r->width, r->height },
- { r->width + br.width + br.x, 0, r->width, r->height }
- };
- xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 3, borders);
+ if (!(borders_to_hide & ADJ_LEFT_SCREEN_EDGE)) {
+ xcb_rectangle_t leftline = { 0, 0, br.x, r->height };
+ xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, &leftline);
+ }
+ if (!(borders_to_hide & ADJ_RIGHT_SCREEN_EDGE)) {
+ xcb_rectangle_t rightline = { r->width + br.width + br.x, 0, r->width, r->height };
+ xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, &rightline);
+ }
+ if (!(borders_to_hide & ADJ_LOWER_SCREEN_EDGE)) {
+ xcb_rectangle_t bottomline = { 0, r->height + br.height + br.y, r->width, r->height };
+ 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) {
+ if (p->border_style == BS_1PIXEL && !(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 } });
int text_offset_y = (con->deco_rect.height - config.font.height) / 2;
struct Window *win = con->window;
- if (win == NULL || win->name_x == NULL) {
+ if (win == NULL || win->name == 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,
+ draw_text_ascii("another container",
parent->pixmap, parent->pm_gc,
con->deco_rect.x + 2, con->deco_rect.y + text_offset_y,
con->deco_rect.width - 2);
//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 */
* Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
*
*/
-void x_set_i3_atoms() {
+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,