nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

take into account x11 border_width settings (fixes uxterm border issue)

This commit is contained in:
Michael Stapelberg 2010-11-14 23:44:13 +01:00
parent 39b378b0a4
commit 76c07900c2
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/data.h
View File

@ -297,6 +297,9 @@ struct Con {
int base_width; int base_width;
int base_height; int base_height;
/* the x11 border pixel attribute */
int border_width;
/* minimum increment size specified for the window (in pixels) */ /* minimum increment size specified for the window (in pixels) */
int width_increment; int width_increment;
int height_increment; int height_increment;

2
src/manage.c
View File

@ -185,6 +185,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
nc->window = cwindow; nc->window = cwindow;
x_reinit(nc); x_reinit(nc);
nc->border_width = geom->border_width;
char *name; char *name;
asprintf(&name, "[i3 con] container around %p", cwindow); asprintf(&name, "[i3 con] container around %p", cwindow);
x_set_name(nc, name); x_set_name(nc, name);

4
src/render.c
View File

@ -51,6 +51,10 @@ void render_con(Con *con) {
*inset = (Rect){0, 0, con->rect.width, con->rect.height}; *inset = (Rect){0, 0, con->rect.width, con->rect.height};
*inset = rect_add(*inset, con_border_style_rect(con)); *inset = rect_add(*inset, con_border_style_rect(con));
/* Obey x11 border */
inset->width -= (2 * con->border_width);
inset->height -= (2 * con->border_width);
/* Obey the aspect ratio, if any */ /* Obey the aspect ratio, if any */
if (con->proportional_height != 0 && if (con->proportional_height != 0 &&
con->proportional_width != 0) { con->proportional_width != 0) {