Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Gottox' drawtext simplification
[dwm.git]
/
dwm.c
diff --git
a/dwm.c
b/dwm.c
index
235365b
..
3b6efaa
100644
(file)
--- a/
dwm.c
+++ b/
dwm.c
@@
-16,8
+16,8
@@
* Each child of the root window is called a client, except windows which have
* set the override_redirect flag. Clients are organized in a global
* doubly-linked client list, the focus history is remembered through a global
* Each child of the root window is called a client, except windows which have
* set the override_redirect flag. Clients are organized in a global
* doubly-linked client list, the focus history is remembered through a global
- * stack list. Each client contains a
n array of Bools of the same size as the
- *
global tags array to indicate the tags of a
client.
+ * stack list. Each client contains a
bit array to indicate the tags of a
+ * client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
@@
-53,7
+53,6
@@
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
-#define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@
-70,9
+69,8
@@
struct Client {
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
- long flags;
int bw, oldbw;
int bw, oldbw;
- Bool isbanned, isfixed, isfloating, ism
ax
, isurgent;
+ Bool isbanned, isfixed, isfloating, ism
oved
, isurgent;
uint tags;
Client *next;
Client *prev;
uint tags;
Client *next;
Client *prev;
@@
-184,7
+182,6
@@
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const void *arg);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const void *arg);
-void viewprevtag(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
@@
-263,13
+260,18
@@
arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
Client *c;
for(c = clients; c; c = c->next)
- if(VISIBLE(c)) {
- if(!lt->arrange || c->isfloating)
+ if(c->tags & tagset[seltags]) { /* is visible */
+ if(ismax && !c->isfixed) {
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+ c->ismoved = True;
+ }
+ else if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
resize(c, c->x, c->y, c->w, c->h, True);
+ c->isbanned = False;
}
else if(!c->isbanned) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
else if(!c->isbanned) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = True;
+ c->isbanned =
c->ismoved =
True;
}
focus(NULL);
}
focus(NULL);
@@
-328,7
+330,7
@@
buttonpress(XEvent *e) {
}
else if((c = getclient(ev->window))) {
focus(c);
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY ||
ismax
)
+ if(CLEANMASK(ev->state) != MODKEY ||
(ismax && !c->isfixed)
)
return;
if(ev->button == Button1)
movemouse(c);
return;
if(ev->button == Button1)
movemouse(c);
@@
-349,7
+351,6
@@
checkotherwm(void) {
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
- XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
@@
-358,7
+359,7
@@
checkotherwm(void) {
void
cleanup(void) {
close(STDIN_FILENO);
void
cleanup(void) {
close(STDIN_FILENO);
- view(
NULL
);
+ view(
(uint[]){~0}
);
while(stack)
unmanage(stack);
if(dc.font.set)
while(stack)
unmanage(stack);
if(dc.font.set)
@@
-416,7
+417,9
@@
configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(c->isfixed || c->isfloating || !lt->arrange) {
+ if(ismax && !c->isbanned && !c->isfixed)
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
+ else if(c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
@@
-432,7
+435,7
@@
configurerequest(XEvent *e) {
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(
VISIBLE(c)
)
+ if(
!c->isbanned
)
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
@@
-485,7
+488,7
@@
drawbar(void) {
Client *c;
dc.x = 0;
Client *c;
dc.x = 0;
- for(c = stack; c &&
!VISIBLE(c)
; c = c->snext);
+ for(c = stack; c &&
c->isbanned
; c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
@@
-516,7
+519,7
@@
drawbar(void) {
dc.x = x;
if(c) {
drawtext(c->name, dc.sel, False);
dc.x = x;
if(c) {
drawtext(c->name, dc.sel, False);
- drawsquare(
False
, c->isfloating, False, dc.sel);
+ drawsquare(
c->isfixed
, c->isfloating, False, dc.sel);
}
else
drawtext(NULL, dc.norm, False);
}
else
drawtext(NULL, dc.norm, False);
@@
-568,14
+571,8
@@
drawtext(const char *text, ulong col[ColLast], Bool invert) {
for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
if(!len)
return;
for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
if(!len)
return;
- if(len < olen) {
- if(len > 1)
- buf[len - 1] = '.';
- if(len > 2)
- buf[len - 2] = '.';
- if(len > 3)
- buf[len - 3] = '.';
- }
+ if(len < olen)
+ strncpy(&buf[MAX(0, len - 3)], "...", len);
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@
-616,8
+613,8
@@
expose(XEvent *e) {
void
focus(Client *c) {
void
focus(Client *c) {
- if(!c || (c &&
!VISIBLE(c)
))
- for(c = stack; c &&
!VISIBLE(c)
; c = c->snext);
+ if(!c || (c &&
c->isbanned
))
+ for(c = stack; c &&
c->isbanned
; c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@
-629,10
+626,6
@@
focus(Client *c) {
}
sel = c;
if(c) {
}
sel = c;
if(c) {
- if(ismax) {
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- c->ismax = True;
- }
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
@@
-655,9
+648,9
@@
focusnext(const void *arg) {
if(!sel)
return;
if(!sel)
return;
- for(c = sel->next; c &&
!VISIBLE(c)
; c = c->next);
+ for(c = sel->next; c &&
c->isbanned
; c = c->next);
if(!c)
if(!c)
- for(c = clients; c &&
!VISIBLE(c)
; c = c->next);
+ for(c = clients; c &&
c->isbanned
; c = c->next);
if(c) {
focus(c);
restack();
if(c) {
focus(c);
restack();
@@
-670,10
+663,10
@@
focusprev(const void *arg) {
if(!sel)
return;
if(!sel)
return;
- for(c = sel->prev; c &&
!VISIBLE(c)
; c = c->prev);
+ for(c = sel->prev; c &&
c->isbanned
; c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c &&
!VISIBLE(c)
; c = c->prev);
+ for(; c &&
c->isbanned
; c = c->prev);
}
if(c) {
focus(c);
}
if(c) {
focus(c);
@@
-875,11
+868,9
@@
keypress(XEvent *e) {
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
- {
- if(keys[i].func)
- keys[i].func(keys[i].arg);
- }
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+ && keys[i].func)
+ keys[i].func(keys[i].arg);
}
void
}
void
@@
-949,6
+940,8
@@
manage(Window w, XWindowAttributes *wa) {
applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
+ if(c->isfloating)
+ XRaiseWindow(dpy, c->win);
attach(c);
attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
attach(c);
attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
@@
-1030,7
+1023,7
@@
movemouse(Client *c) {
Client *
nexttiled(Client *c) {
Client *
nexttiled(Client *c) {
- for(; c && (c->isfloating ||
!VISIBLE(c)
); c = c->next);
+ for(; c && (c->isfloating ||
c->isbanned
); c = c->next);
return c;
}
return c;
}
@@
-1126,8
+1119,8
@@
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
h = bh;
if(w < bh)
w = bh;
h = bh;
if(w < bh)
w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h || c->is
banned || c->ismax
) {
- c->is
banned = c->ismax
= False;
+ if(c->x != x || c->y != y || c->w != w || c->h != h || c->is
moved
) {
+ c->is
moved
= False;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
@@
-1200,7
+1193,7
@@
restack(void) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating &&
VISIBLE(c)
) {
+ if(!c->isfloating &&
!c->isbanned
) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
@@
-1309,7
+1302,7
@@
void
setmfact(const void *arg) {
double d = *((double*) arg);
setmfact(const void *arg) {
double d = *((double*) arg);
- if(!d ||
lt->arrange != til
e)
+ if(!d ||
!lt->arrang
e)
return;
d = d < 1.0 ? d + mfact : d - 1.0;
if(d < 0.1 || d > 0.9)
return;
d = d < 1.0 ? d + mfact : d - 1.0;
if(d < 0.1 || d > 0.9)
@@
-1482,7
+1475,7
@@
void
togglefloating(const void *arg) {
if(!sel)
return;
togglefloating(const void *arg) {
if(!sel)
return;
- sel->isfloating = !sel->isfloating;
+ sel->isfloating = !sel->isfloating
|| sel->isfixed
;
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
arrange();
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
arrange();
@@
-1604,42
+1597,40
@@
updatesizehints(Client *c) {
long msize;
XSizeHints size;
long msize;
XSizeHints size;
- if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
- size.flags = PSize;
- c->flags = size.flags;
- if(c->flags & PBaseSize) {
+ XGetWMNormalHints(dpy, c->win, &size, &msize);
+ if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
}
c->basew = size.base_width;
c->baseh = size.base_height;
}
- else if(
c->
flags & PMinSize) {
+ else if(
size.
flags & PMinSize) {
c->basew = size.min_width;
c->baseh = size.min_height;
}
else
c->basew = c->baseh = 0;
c->basew = size.min_width;
c->baseh = size.min_height;
}
else
c->basew = c->baseh = 0;
- if(
c->
flags & PResizeInc) {
+ if(
size.
flags & PResizeInc) {
c->incw = size.width_inc;
c->inch = size.height_inc;
}
else
c->incw = c->inch = 0;
c->incw = size.width_inc;
c->inch = size.height_inc;
}
else
c->incw = c->inch = 0;
- if(
c->
flags & PMaxSize) {
+ if(
size.
flags & PMaxSize) {
c->maxw = size.max_width;
c->maxh = size.max_height;
}
else
c->maxw = c->maxh = 0;
c->maxw = size.max_width;
c->maxh = size.max_height;
}
else
c->maxw = c->maxh = 0;
- if(
c->
flags & PMinSize) {
+ if(
size.
flags & PMinSize) {
c->minw = size.min_width;
c->minh = size.min_height;
}
c->minw = size.min_width;
c->minh = size.min_height;
}
- else if(
c->
flags & PBaseSize) {
+ else if(
size.
flags & PBaseSize) {
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
- if(
c->
flags & PAspect) {
+ if(
size.
flags & PAspect) {
c->minax = size.min_aspect.x;
c->maxax = size.max_aspect.x;
c->minay = size.min_aspect.y;
c->minax = size.min_aspect.x;
c->maxax = size.max_aspect.x;
c->minay = size.min_aspect.y;
@@
-1672,16
+1663,9
@@
updatewmhints(Client *c) {
void
view(const void *arg) {
void
view(const void *arg) {
- if(*(int *)arg & TAGMASK) {
- seltags ^= 1; /* toggle sel tagset */
- tagset[seltags] = *(int *)arg & TAGMASK;
- arrange();
- }
-}
-
-void
-viewprevtag(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
seltags ^= 1; /* toggle sel tagset */
+ if(arg && (*(int *)arg & TAGMASK))
+ tagset[seltags] = *(int *)arg & TAGMASK;
arrange();
}
arrange();
}
@@
-1722,7
+1706,7
@@
void
zoom(const void *arg) {
Client *c = sel;
zoom(const void *arg) {
Client *c = sel;
- if(
!lt->arrange || sel->isfloating
)
+ if(
ismax || !lt->arrange || (sel && sel->isfloating)
)
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))