em/dwm
1
0
Fork 0
Code Releases Activity

applied Ph's MIN/MAX patch, nice work!

Browse Source
This commit is contained in:
anselm@anselm1 2008-04-20 18:28:21 +01:00
parent 5fa559dbfc
commit 874837f653
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dwm.c
View File

@ -41,6 +41,8 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
/* macros */ /* macros */
#define MAX(a, b) ((a)>(b)?(a):(b))
#define MIN(a, b) ((a)<(b)?(a):(b))
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
#define LENGTH(x) (sizeof x / sizeof x[0]) #define LENGTH(x) (sizeof x / sizeof x[0])
@ -601,9 +603,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
if(!text) if(!text)
return; return;
w = 0; w = 0;
olen = len = strlen(text); olen = strlen(text);
if(len >= sizeof buf) len = MIN(olen, sizeof buf - 1);
len = sizeof buf - 1;
memcpy(buf, text, len); memcpy(buf, text, len);
buf[len] = 0; buf[len] = 0;
h = dc.font.ascent + dc.font.descent; h = dc.font.ascent + dc.font.descent;
@ -880,10 +881,8 @@ initfont(const char *fontstr) {
font_extents = XExtentsOfFontSet(dc.font.set); font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
if(dc.font.ascent < (*xfonts)->ascent) dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
dc.font.ascent = (*xfonts)->ascent; dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
if(dc.font.descent < (*xfonts)->descent)
dc.font.descent = (*xfonts)->descent;
xfonts++; xfonts++;
} }
} }
@ -1008,10 +1007,8 @@ manage(Window w, XWindowAttributes *wa) {
c->x = wx + ww - c->w - 2 * c->bw; c->x = wx + ww - c->w - 2 * c->bw;
if(c->y + c->h + 2 * c->bw > wy + wh) if(c->y + c->h + 2 * c->bw > wy + wh)
c->y = wy + wh - c->h - 2 * c->bw; c->y = wy + wh - c->h - 2 * c->bw;
if(c->x < wx) c->x = MAX(c->x, wx);
c->x = wx; c->y = MAX(c->y, wy);
if(c->y < wy)
c->y = wy;
c->bw = BORDERPX; c->bw = BORDERPX;
} }
@ -1177,10 +1174,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
if(sizehints) { if(sizehints) {
/* set minimum possible */ /* set minimum possible */
if(w < 1) w = MAX(1, w);
w = 1; h = MAX(1, h);
if(h < 1)
h = 1;
/* temporarily remove base dimensions */ /* temporarily remove base dimensions */
w -= c->basew; w -= c->basew;
@ -1206,14 +1201,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
w += c->basew; w += c->basew;
h += c->baseh; h += c->baseh;
if(c->minw > 0 && w < c->minw) w = MAX(w, c->minw);
w = c->minw; h = MAX(h, c->minh);
if(c->minh > 0 && h < c->minh)
h = c->minh; if (c->maxw)
if(c->maxw > 0 && w > c->maxw) w = MIN(w, c->maxw);
w = c->maxw;
if(c->maxh > 0 && h > c->maxh) if (c->maxh)
h = c->maxh; h = MIN(h, c->maxh);
} }
if(w <= 0 || h <= 0) if(w <= 0 || h <= 0)
return; return;
@ -1266,10 +1261,8 @@ resizemouse(Client *c) {
break; break;
case MotionNotify: case MotionNotify:
XSync(dpy, False); XSync(dpy, False);
if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0) nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
nw = 1; nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)
nh = 1;
if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL); togglefloating(NULL);
if((lt->isfloating) || c->isfloating) if((lt->isfloating) || c->isfloating)
@ -1520,13 +1513,11 @@ setup(void) {
/* init bar */ /* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) { for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
w = textw(layouts[i].symbol); w = textw(layouts[i].symbol);
if(w > blw) blw = MAX(blw, w);
blw = w;
} }
for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) { for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
w = textw(geoms[i].symbol); w = textw(geoms[i].symbol);
if(w > bgw) bgw = MAX(bgw, w);
bgw = w;
} }
wa.override_redirect = 1; wa.override_redirect = 1;