yosh
/
cwm-patched
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch bwidth type; unfortunately X11 is inconsistent.

This commit is contained in:
okan 2017-04-26 21:10:54 +00:00
parent 15b9a8fe27
commit 4d85e2e2a6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.h
View File

@ -119,7 +119,7 @@ struct client_ctx {
struct group_ctx *gc;
Window win;
Colormap colormap;
unsigned int bwidth; /* border width */
int bwidth; /* border width */
struct geom geom, savegeom, fullgeom;
struct {
long flags; /* defined hints */

10
client.c
View File

@ -545,7 +545,7 @@ client_draw_border(struct client_ctx *cc)
if (cc->flags & CLIENT_URGENCY)
pixel = sc->xftcolor[CWM_COLOR_BORDER_URGENCY].pixel;
XSetWindowBorderWidth(X_Dpy, cc->win, cc->bwidth);
XSetWindowBorderWidth(X_Dpy, cc->win, (unsigned int)cc->bwidth);
XSetWindowBorder(X_Dpy, cc->win, pixel);
}
@ -743,13 +743,13 @@ client_placecalc(struct client_ctx *cc)
wmax = DisplayWidth(X_Dpy, sc->which);
hmax = DisplayHeight(X_Dpy, sc->which);
if (cc->geom.x + ((int)cc->bwidth * 2) >= wmax)
if (cc->geom.x + (cc->bwidth * 2) >= wmax)
cc->geom.x = wmax - (cc->bwidth * 2);
if (cc->geom.x + cc->geom.w - ((int)cc->bwidth * 2) < 0)
if (cc->geom.x + cc->geom.w - (cc->bwidth * 2) < 0)
cc->geom.x = -cc->geom.w;
if (cc->geom.y + ((int)cc->bwidth * 2) >= hmax)
if (cc->geom.y + (cc->bwidth * 2) >= hmax)
cc->geom.y = hmax - (cc->bwidth * 2);
if (cc->geom.y + cc->geom.h - ((int)cc->bwidth * 2) < 0)
if (cc->geom.y + cc->geom.h - (cc->bwidth * 2) < 0)
cc->geom.y = -cc->geom.h;
} else {
struct geom area;

2
parse.y
View File

@ -116,7 +116,7 @@ main : FONTNAME STRING {
conf->stickygroups = $2;
}
| BORDERWIDTH NUMBER {
if ($2 < 0 || $2 > UINT_MAX) {
if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid borderwidth");
YYERROR;
}