X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/49197fe4bf023478108c76c1bed74a7d1ef138de..883e09b2eb8b6a42289bc5a64294df4122d90e38:/dwm.c
diff --git a/dwm.c b/dwm.c
index b6659ae..c9495ec 100644
--- a/dwm.c
+++ b/dwm.c
@@ -21,26 +21,25 @@
* creates a small title window, which is resized whenever the (_NET_)WM_NAME
* properties are updated or the client is moved/resized.
*
- * Keys and tagging rules are organized as arrays and defined in the config.h
- * file. These arrays are kept static in event.o and tag.o respectively,
- * because no other part of dwm needs access to them. The current layout is
- * represented by the lt pointer.
+ * Keys and tagging rules are organized as arrays and defined in config.h.
*
* To understand everything else, start reading main().
*/
#include <errno.h>
#include <locale.h>
-#include <regex.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/select.h>
+#include <sys/types.h>
#include <sys/wait.h>
+#include <regex.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
+#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
@@ -64,9 +63,9 @@ struct Client {
int rx, ry, rw, rh; /* revert geometry */
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
- long flags;
+ long flags;
unsigned int border, oldborder;
- Bool isbanned, isfixed, ismax, isfloating;
+ Bool isbanned, isfixed, ismax, isfloating, wasfloating;
Bool *tags;
Client *next;
Client *prev;
@@ -112,100 +111,97 @@ typedef struct {
regex_t *tagregex;
} Regs;
-/* functions */
-
-static void applyrules(Client *c);
-static void arrange(void);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void ban(Client *c);
-static void buttonpress(XEvent *e);
-static void cleanup(void);
-static void compileregs(void);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static void drawbar(void);
-static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void *emallocz(unsigned int size);
-static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
-static void expose(XEvent *e);
-static void floating(void); /* default floating layout */
-static void focus(Client *c);
-static void focusnext(const char *arg);
-static void focusprev(const char *arg);
-static Client *getclient(Window w);
-static long getstate(Window w);
-static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, Bool focused);
-static unsigned int idxoftag(const char *tag);
-static void initbar(void);
-static unsigned long initcolor(const char *colstr);
-static void initfont(const char *fontstr);
-static void initlayouts(void);
-static void initstyle(void);
-static Bool isarrange(void (*func)());
-static Bool isfloating(void);
-static Bool isoccupied(unsigned int t);
-static Bool isprotodel(Client *c);
-static Bool isvisible(Client *c);
-static void keypress(XEvent *e);
-static void killclient(const char *arg);
-static void leavenotify(XEvent *e);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void movemouse(Client *c);
-static Client *nexttiled(Client *c);
-static void propertynotify(XEvent *e);
-static void quit(const char *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-static void resizemouse(Client *c);
-static void restack(void);
-static void scan(void);
-static void setclientstate(Client *c, long state);
-static void setlayout(const char *arg);
-static void setmwfact(const char *arg);
-static void setup(void);
-static void spawn(const char *arg);
-static void tag(const char *arg);
-static unsigned int textnw(const char *text, unsigned int len);
-static unsigned int textw(const char *text);
-static void tile(void);
-static void togglebar(const char *arg);
-static void togglefloating(const char *arg);
-static void togglemax(const char *arg);
-static void toggletag(const char *arg);
-static void toggleview(const char *arg);
-static void unban(Client *c);
-static void unmanage(Client *c);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(void);
-static void updatesizehints(Client *c);
-static void updatetitle(Client *c);
-static void view(const char *arg);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dsply, XErrorEvent *ee);
-static int xerrorstart(Display *dsply, XErrorEvent *ee);
-static void zoom(const char *arg);
+/* forward declarations */
+void applyrules(Client *c);
+void arrange(void);
+void attach(Client *c);
+void attachstack(Client *c);
+void ban(Client *c);
+void buttonpress(XEvent *e);
+void checkotherwm(void);
+void cleanup(void);
+void compileregs(void);
+void configure(Client *c);
+void configurenotify(XEvent *e);
+void configurerequest(XEvent *e);
+void destroynotify(XEvent *e);
+void detach(Client *c);
+void detachstack(Client *c);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast]);
+void *emallocz(unsigned int size);
+void enternotify(XEvent *e);
+void eprint(const char *errstr, ...);
+void expose(XEvent *e);
+void floating(void); /* default floating layout */
+void focus(Client *c);
+void focusnext(const char *arg);
+void focusprev(const char *arg);
+Client *getclient(Window w);
+unsigned long getcolor(const char *colstr);
+long getstate(Window w);
+Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+void grabbuttons(Client *c, Bool focused);
+unsigned int idxoftag(const char *tag);
+void initfont(const char *fontstr);
+Bool isarrange(void (*func)());
+Bool isoccupied(unsigned int t);
+Bool isprotodel(Client *c);
+Bool isvisible(Client *c);
+void keypress(XEvent *e);
+void killclient(const char *arg);
+void leavenotify(XEvent *e);
+void manage(Window w, XWindowAttributes *wa);
+void mappingnotify(XEvent *e);
+void maprequest(XEvent *e);
+void movemouse(Client *c);
+Client *nexttiled(Client *c);
+void propertynotify(XEvent *e);
+void quit(const char *arg);
+void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+void resizemouse(Client *c);
+void restack(void);
+void run(void);
+void scan(void);
+void setclientstate(Client *c, long state);
+void setlayout(const char *arg);
+void setmwfact(const char *arg);
+void setup(void);
+void spawn(const char *arg);
+void tag(const char *arg);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+void tile(void);
+void togglebar(const char *arg);
+void togglefloating(const char *arg);
+void togglemax(const char *arg);
+void toggletag(const char *arg);
+void toggleview(const char *arg);
+void unban(Client *c);
+void unmanage(Client *c);
+void unmapnotify(XEvent *e);
+void updatebarpos(void);
+void updatesizehints(Client *c);
+void updatetitle(Client *c);
+void view(const char *arg);
+int xerror(Display *dpy, XErrorEvent *ee);
+int xerrordummy(Display *dsply, XErrorEvent *ee);
+int xerrorstart(Display *dsply, XErrorEvent *ee);
+void zoom(const char *arg);
/* variables */
-static char stext[256];
-static double mwfact;
-static int screen, sx, sy, sw, sh, wax, way, waw, wah;
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int bh, bpos, ntags;
-static unsigned int blw = 0;
-static unsigned int ltidx = 0; /* default */
-static unsigned int nlayouts = 0;
-static unsigned int nrules = 0;
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
+char stext[256];
+double mwfact;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int (*xerrorxlib)(Display *, XErrorEvent *);
+unsigned int bh, bpos, ntags;
+unsigned int blw = 0;
+unsigned int ltidx = 0; /* default */
+unsigned int nlayouts = 0;
+unsigned int nrules = 0;
+unsigned int numlockmask = 0;
+void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[ConfigureNotify] = configurenotify,
@@ -219,25 +215,25 @@ static void (*handler[LASTEvent]) (XEvent *) = {
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
};
-static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
-static Bool running = True;
-static Bool *seltags;
-static Bool selscreen = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
-static Cursor cursor[CurLast];
-static Display *dpy;
-static DC dc = {0};
-static Window barwin, root;
-static Regs *regs = NULL;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool otherwm, readin;
+Bool running = True;
+Bool *seltags;
+Bool selscreen = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Client *stack = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+Window barwin, root;
+Regs *regs = NULL;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* implementation */
-static void
+/* functions*/
+void
applyrules(Client *c) {
static char buf[512];
unsigned int i, j;
@@ -269,7 +265,7 @@ applyrules(Client *c) {
c->tags[i] = seltags[i];
}
-static void
+void
arrange(void) {
Client *c;
@@ -283,7 +279,7 @@ arrange(void) {
restack();
}
-static void
+void
attach(Client *c) {
if(clients)
clients->prev = c;
@@ -291,13 +287,13 @@ attach(Client *c) {
clients = c;
}
-static void
+void
attachstack(Client *c) {
c->snext = stack;
stack = c;
}
-static void
+void
ban(Client *c) {
if(c->isbanned)
return;
@@ -305,7 +301,7 @@ ban(Client *c) {
c->isbanned = True;
}
-static void
+void
buttonpress(XEvent *e) {
unsigned int i, x;
Client *c;
@@ -338,22 +334,46 @@ buttonpress(XEvent *e) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (isfloating() || c->isfloating)) {
- restack();
+ if(ev->button == Button1) {
+ if(isarrange(floating) || c->isfloating)
+ restack();
+ else
+ togglefloating(NULL);
movemouse(c);
}
- else if(ev->button == Button2)
- zoom(NULL);
- else if(ev->button == Button3
- && (isfloating() || c->isfloating) && !c->isfixed)
- {
- restack();
+ else if(ev->button == Button2) {
+ if(ISTILE && !c->isfixed && c->isfloating)
+ togglefloating(NULL);
+ else
+ zoom(NULL);
+ }
+ else if(ev->button == Button3 && !c->isfixed) {
+ if(isarrange(floating) || c->isfloating)
+ restack();
+ else
+ togglefloating(NULL);
resizemouse(c);
}
}
}
-static void
+void
+checkotherwm(void) {
+ otherwm = False;
+ XSetErrorHandler(xerrorstart);
+
+ /* this causes an error if some other window manager is running */
+ XSelectInput(dpy, root, SubstructureRedirectMask);
+ 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);
+}
+
+void
cleanup(void) {
close(STDIN_FILENO);
while(stack) {
@@ -376,7 +396,7 @@ cleanup(void) {
free(seltags);
}
-static void
+void
compileregs(void) {
unsigned int i;
regex_t *reg;
@@ -403,7 +423,7 @@ compileregs(void) {
}
}
-static void
+void
configure(Client *c) {
XConfigureEvent ce;
@@ -421,11 +441,11 @@ configure(Client *c) {
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
}
-static void
+void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
sw = ev->width;
sh = ev->height;
XFreePixmap(dpy, dc.drawable);
@@ -436,7 +456,7 @@ configurenotify(XEvent *e) {
}
}
-static void
+void
configurerequest(XEvent *e) {
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
@@ -446,7 +466,7 @@ configurerequest(XEvent *e) {
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || isfloating()) {
+ if(c->isfixed || c->isfloating || isarrange(floating)) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@ -481,7 +501,7 @@ configurerequest(XEvent *e) {
XSync(dpy, False);
}
-static void
+void
destroynotify(XEvent *e) {
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -490,7 +510,7 @@ destroynotify(XEvent *e) {
unmanage(c);
}
-static void
+void
detach(Client *c) {
if(c->prev)
c->prev->next = c->next;
@@ -501,7 +521,7 @@ detach(Client *c) {
c->next = c->prev = NULL;
}
-static void
+void
detachstack(Client *c) {
Client **tc;
@@ -509,7 +529,7 @@ detachstack(Client *c) {
*tc = c->snext;
}
-static void
+void
drawbar(void) {
int i, x;
@@ -549,7 +569,7 @@ drawbar(void) {
XSync(dpy, False);
}
-static void
+void
drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
int x;
XGCValues gcv;
@@ -570,7 +590,7 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
}
}
-static void
+void
drawtext(const char *text, unsigned long col[ColLast]) {
int x, y, w, h;
static char buf[256];
@@ -610,7 +630,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
-static void *
+void *
emallocz(unsigned int size) {
void *res = calloc(1, size);
@@ -619,7 +639,7 @@ emallocz(unsigned int size) {
return res;
}
-static void
+void
enternotify(XEvent *e) {
Client *c;
XCrossingEvent *ev = &e->xcrossing;
@@ -634,7 +654,7 @@ enternotify(XEvent *e) {
}
}
-static void
+void
eprint(const char *errstr, ...) {
va_list ap;
@@ -644,7 +664,7 @@ eprint(const char *errstr, ...) {
exit(EXIT_FAILURE);
}
-static void
+void
expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
@@ -654,7 +674,7 @@ expose(XEvent *e) {
}
}
-static void
+void
floating(void) { /* default floating layout */
Client *c;
@@ -663,7 +683,7 @@ floating(void) { /* default floating layout */
resize(c, c->x, c->y, c->w, c->h, True);
}
-static void
+void
focus(Client *c) {
if((!c && selscreen) || (c && !isvisible(c)))
for(c = stack; c && !isvisible(c); c = c->snext);
@@ -688,7 +708,7 @@ focus(Client *c) {
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
-static void
+void
focusnext(const char *arg) {
Client *c;
@@ -703,7 +723,7 @@ focusnext(const char *arg) {
}
}
-static void
+void
focusprev(const char *arg) {
Client *c;
@@ -720,7 +740,7 @@ focusprev(const char *arg) {
}
}
-static Client *
+Client *
getclient(Window w) {
Client *c;
@@ -728,7 +748,17 @@ getclient(Window w) {
return c;
}
-static long
+unsigned long
+getcolor(const char *colstr) {
+ Colormap cmap = DefaultColormap(dpy, screen);
+ XColor color;
+
+ if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+ eprint("error, cannot allocate color '%s'\n", colstr);
+ return color.pixel;
+}
+
+long
getstate(Window w) {
int format, status;
long result = -1;
@@ -746,7 +776,7 @@ getstate(Window w) {
return result;
}
-static Bool
+Bool
gettextprop(Window w, Atom atom, char *text, unsigned int size) {
char **list = NULL;
int n;
@@ -773,7 +803,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
return True;
}
-static void
+void
grabbuttons(Client *c, Bool focused) {
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@ -810,7 +840,7 @@ grabbuttons(Client *c, Bool focused) {
GrabModeAsync, GrabModeSync, None, None);
}
-static unsigned int
+unsigned int
idxoftag(const char *tag) {
unsigned int i;
@@ -820,38 +850,7 @@ idxoftag(const char *tag) {
return 0;
}
-static void
-initbar(void) {
- XSetWindowAttributes wa;
-
- wa.override_redirect = 1;
- wa.background_pixmap = ParentRelative;
- wa.event_mask = ButtonPressMask | ExposureMask;
- barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
- DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, barwin, cursor[CurNormal]);
- updatebarpos();
- XMapRaised(dpy, barwin);
- strcpy(stext, "dwm-"VERSION);
- dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
- XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
- if(!dc.font.set)
- XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-}
-
-static unsigned long
-initcolor(const char *colstr) {
- Colormap cmap = DefaultColormap(dpy, screen);
- XColor color;
-
- if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
- eprint("error, cannot allocate color '%s'\n", colstr);
- return color.pixel;
-}
-
-static void
+void
initfont(const char *fontstr) {
char *def, **missing;
int i, n;
@@ -885,7 +884,7 @@ initfont(const char *fontstr) {
XFreeFont(dpy, dc.font.xfont);
dc.font.xfont = NULL;
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
- || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+ && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
eprint("error, cannot load font: '%s'\n", fontstr);
dc.font.ascent = dc.font.xfont->ascent;
dc.font.descent = dc.font.xfont->descent;
@@ -893,42 +892,13 @@ initfont(const char *fontstr) {
dc.font.height = dc.font.ascent + dc.font.descent;
}
-static void
-initlayouts(void) {
- unsigned int i, w;
-
- nlayouts = sizeof layouts / sizeof layouts[0];
- for(blw = i = 0; i < nlayouts; i++) {
- w = textw(layouts[i].symbol);
- if(w > blw)
- blw = w;
- }
-}
-
-static void
-initstyle(void) {
- dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
- dc.norm[ColBG] = initcolor(NORMBGCOLOR);
- dc.norm[ColFG] = initcolor(NORMFGCOLOR);
- dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
- dc.sel[ColBG] = initcolor(SELBGCOLOR);
- dc.sel[ColFG] = initcolor(SELFGCOLOR);
- initfont(FONT);
- dc.h = bh = dc.font.height + 2;
-}
-
-static Bool
+Bool
isarrange(void (*func)())
{
return func == layouts[ltidx].arrange;
}
-static Bool
-isfloating(void) {
- return layouts[ltidx].arrange == floating;
-}
-
-static Bool
+Bool
isoccupied(unsigned int t) {
Client *c;
@@ -938,7 +908,7 @@ isoccupied(unsigned int t) {
return False;
}
-static Bool
+Bool
isprotodel(Client *c) {
int i, n;
Atom *protocols;
@@ -953,7 +923,7 @@ isprotodel(Client *c) {
return ret;
}
-static Bool
+Bool
isvisible(Client *c) {
unsigned int i;
@@ -963,7 +933,7 @@ isvisible(Client *c) {
return False;
}
-static void
+void
keypress(XEvent *e) {
KEYS
unsigned int len = sizeof keys / sizeof keys[0];
@@ -998,7 +968,7 @@ keypress(XEvent *e) {
}
}
-static void
+void
killclient(const char *arg) {
XEvent ev;
@@ -1017,7 +987,7 @@ killclient(const char *arg) {
XKillClient(dpy, sel->win);
}
-static void
+void
leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
@@ -1027,7 +997,7 @@ leavenotify(XEvent *e) {
}
}
-static void
+void
manage(Window w, XWindowAttributes *wa) {
unsigned int i;
Client *c, *t = NULL;
@@ -1085,7 +1055,7 @@ manage(Window w, XWindowAttributes *wa) {
arrange();
}
-static void
+void
mappingnotify(XEvent *e) {
XMappingEvent *ev = &e->xmapping;
@@ -1094,7 +1064,7 @@ mappingnotify(XEvent *e) {
keypress(NULL);
}
-static void
+void
maprequest(XEvent *e) {
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
@@ -1107,7 +1077,7 @@ maprequest(XEvent *e) {
manage(ev->window, &wa);
}
-static void
+void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
@@ -1150,13 +1120,13 @@ movemouse(Client *c) {
}
}
-static Client *
+Client *
nexttiled(Client *c) {
for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
-static void
+void
propertynotify(XEvent *e) {
Client *c;
Window trans;
@@ -1184,15 +1154,15 @@ propertynotify(XEvent *e) {
}
}
-static void
+void
quit(const char *arg) {
readin = running = False;
}
-static void
+void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
double dx, dy, max, min, ratio;
- XWindowChanges wc;
+ XWindowChanges wc;
if(sizehints) {
if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
@@ -1252,7 +1222,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
}
}
-static void
+void
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
@@ -1291,7 +1261,7 @@ resizemouse(Client *c) {
}
}
-static void
+void
restack(void) {
Client *c;
XEvent ev;
@@ -1300,9 +1270,9 @@ restack(void) {
drawbar();
if(!sel)
return;
- if(sel->isfloating || isfloating())
+ if(sel->isfloating || isarrange(floating))
XRaiseWindow(dpy, sel->win);
- if(!isfloating()) {
+ if(!isarrange(floating)) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
@@ -1320,7 +1290,55 @@ restack(void) {
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
-static void
+void
+run(void) {
+ char *p;
+ int r, xfd;
+ fd_set rd;
+ XEvent ev;
+
+ /* main event loop, also reads status text from stdin */
+ XSync(dpy, False);
+ xfd = ConnectionNumber(dpy);
+ readin = True;
+ while(running) {
+ FD_ZERO(&rd);
+ if(readin)
+ FD_SET(STDIN_FILENO, &rd);
+ FD_SET(xfd, &rd);
+ if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+ if(errno == EINTR)
+ continue;
+ eprint("select failed\n");
+ }
+ if(FD_ISSET(STDIN_FILENO, &rd)) {
+ switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+ case -1:
+ strncpy(stext, strerror(errno), sizeof stext - 1);
+ stext[sizeof stext - 1] = '\0';
+ readin = False;
+ break;
+ case 0:
+ strncpy(stext, "EOF", 4);
+ readin = False;
+ break;
+ default:
+ for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
+ for(; p >= stext && *p != '\n'; --p);
+ if(p > stext)
+ strncpy(stext, p + 1, sizeof stext);
+ }
+ drawbar();
+ }
+ while(XPending(dpy)) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
+ }
+ }
+}
+
+void
scan(void) {
unsigned int i, num;
Window *wins, d1, d2;
@@ -1347,7 +1365,7 @@ scan(void) {
XFree(wins);
}
-static void
+void
setclientstate(Client *c, long state) {
long data[] = {state, None};
@@ -1355,7 +1373,7 @@ setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
-static void
+void
setlayout(const char *arg) {
unsigned int i;
@@ -1377,20 +1395,20 @@ setlayout(const char *arg) {
drawbar();
}
-static void
+void
setmwfact(const char *arg) {
double delta;
- if(!isarrange(tile))
+ if(!ISTILE)
return;
/* arg handling, manipulate mwfact */
if(arg == NULL)
mwfact = MWFACT;
else if(1 == sscanf(arg, "%lf", &delta)) {
- if(arg[0] != '+' && arg[0] != '-')
- mwfact = delta;
- else
+ if(arg[0] == '+' || arg[0] == '-')
mwfact += delta;
+ else
+ mwfact = delta;
if(mwfact < 0.1)
mwfact = 0.1;
else if(mwfact > 0.9)
@@ -1399,10 +1417,10 @@ setmwfact(const char *arg) {
arrange();
}
-static void
+void
setup(void) {
- int i, j;
- unsigned int mask;
+ int d;
+ unsigned int i, j, mask;
Window w;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
@@ -1416,42 +1434,85 @@ setup(void) {
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
PropModeReplace, (unsigned char *) netatom, NetLast);
+
/* init cursors */
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
+
+ /* init geometry */
+ sx = sy = 0;
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+
/* init modifier map */
modmap = XGetModifierMapping(dpy);
- for (i = 0; i < 8; i++)
- for (j = 0; j < modmap->max_keypermod; j++) {
+ for(i = 0; i < 8; i++)
+ for(j = 0; j < modmap->max_keypermod; j++) {
if(modmap->modifiermap[i * modmap->max_keypermod + j]
- == XKeysymToKeycode(dpy, XK_Num_Lock))
+ == XKeysymToKeycode(dpy, XK_Num_Lock))
numlockmask = (1 << i);
}
XFreeModifiermap(modmap);
+
/* select for events */
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
| EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
- keypress(NULL); /* grabkeys */
+
+ /* grab keys */
+ keypress(NULL);
+
+ /* init tags */
compileregs();
- for(ntags = 0; tags[ntags]; ntags++);
+ ntags = sizeof tags / sizeof tags[0];
seltags = emallocz(sizeof(Bool) * ntags);
seltags[0] = True;
- /* geometry */
- sx = sy = 0;
- sw = DisplayWidth(dpy, screen);
- sh = DisplayHeight(dpy, screen);
- initstyle();
- initlayouts();
- initbar();
+
+ /* init appearance */
+ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
+ dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+ dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+ dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
+ dc.sel[ColBG] = getcolor(SELBGCOLOR);
+ dc.sel[ColFG] = getcolor(SELFGCOLOR);
+ initfont(FONT);
+ dc.h = bh = dc.font.height + 2;
+
+ /* init layouts */
+ mwfact = MWFACT;
+ nlayouts = sizeof layouts / sizeof layouts[0];
+ for(blw = i = 0; i < nlayouts; i++) {
+ j = textw(layouts[i].symbol);
+ if(j > blw)
+ blw = j;
+ }
+
+ /* init bar */
+ bpos = BARPOS;
+ wa.override_redirect = 1;
+ wa.background_pixmap = ParentRelative;
+ wa.event_mask = ButtonPressMask | ExposureMask;
+ barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
+ DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+ XDefineCursor(dpy, barwin, cursor[CurNormal]);
+ updatebarpos();
+ XMapRaised(dpy, barwin);
+ strcpy(stext, "dwm-"VERSION);
+ dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+ dc.gc = XCreateGC(dpy, root, 0, 0);
+ XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+ if(!dc.font.set)
+ XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+
/* multihead support */
- selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+ selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
}
-static void
+void
spawn(const char *arg) {
static char *shell = NULL;
@@ -1475,7 +1536,7 @@ spawn(const char *arg) {
wait(0);
}
-static void
+void
tag(const char *arg) {
unsigned int i;
@@ -1489,7 +1550,7 @@ tag(const char *arg) {
arrange();
}
-static unsigned int
+unsigned int
textnw(const char *text, unsigned int len) {
XRectangle r;
@@ -1500,15 +1561,15 @@ textnw(const char *text, unsigned int len) {
return XTextWidth(dc.font.xfont, text, len);
}
-static unsigned int
+unsigned int
textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height;
}
-static void
+void
tile(void) {
unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c;
+ Client *c, *mc;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
@@ -1521,7 +1582,8 @@ tile(void) {
nx = wax;
ny = way;
- for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
+ nw = 0; /* gcc stupidity requires this */
+ for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
c->ismax = False;
if(i == 0) { /* master */
nw = mw - 2 * c->border;
@@ -1530,9 +1592,9 @@ tile(void) {
else { /* tile window */
if(i == 1) {
ny = way;
- nx += mw;
+ nx += mc->w + 2 * mc->border;
+ nw = waw - nx - 2 * c->border;
}
- nw = waw - mw - 2 * c->border;
if(i + 1 == n) /* remainder */
nh = (way + wah) - ny - 2 * c->border;
else
@@ -1540,11 +1602,11 @@ tile(void) {
}
resize(c, nx, ny, nw, nh, RESIZEHINTS);
if(n > 1 && th != wah)
- ny += nh + 2 * c->border;
+ ny = c->y + c->h + 2 * c->border;
}
}
-static void
+void
togglebar(const char *arg) {
if(bpos == BarOff)
bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
@@ -1554,7 +1616,7 @@ togglebar(const char *arg) {
arrange();
}
-static void
+void
togglefloating(const char *arg) {
if(!sel)
return;
@@ -1564,26 +1626,35 @@ togglefloating(const char *arg) {
arrange();
}
-static void
+void
togglemax(const char *arg) {
XEvent ev;
- if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
+ if(!sel || sel->isfixed)
return;
if((sel->ismax = !sel->ismax)) {
+ if(isarrange(floating) || sel->isfloating)
+ sel->wasfloating = True;
+ else {
+ togglefloating(NULL);
+ sel->wasfloating = False;
+ }
sel->rx = sel->x;
sel->ry = sel->y;
sel->rw = sel->w;
sel->rh = sel->h;
resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
}
- else
+ else {
resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+ if(!sel->wasfloating)
+ togglefloating(NULL);
+ }
drawbar();
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
-static void
+void
toggletag(const char *arg) {
unsigned int i, j;
@@ -1597,7 +1668,7 @@ toggletag(const char *arg) {
arrange();
}
-static void
+void
toggleview(const char *arg) {
unsigned int i, j;
@@ -1605,11 +1676,11 @@ toggleview(const char *arg) {
seltags[i] = !seltags[i];
for(j = 0; j < ntags && !seltags[j]; j++);
if(j == ntags)
- seltags[i] = True; /* cannot toggle last view */
+ seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
-static void
+void
unban(Client *c) {
if(!c->isbanned)
return;
@@ -1617,7 +1688,7 @@ unban(Client *c) {
c->isbanned = False;
}
-static void
+void
unmanage(Client *c) {
XWindowChanges wc;
@@ -1640,7 +1711,7 @@ unmanage(Client *c) {
arrange();
}
-static void
+void
unmapnotify(XEvent *e) {
Client *c;
XUnmapEvent *ev = &e->xunmap;
@@ -1649,7 +1720,7 @@ unmapnotify(XEvent *e) {
unmanage(c);
}
-static void
+void
updatebarpos(void) {
XEvent ev;
@@ -1675,7 +1746,7 @@ updatebarpos(void) {
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
-static void
+void
updatesizehints(Client *c) {
long msize;
XSizeHints size;
@@ -1727,7 +1798,7 @@ updatesizehints(Client *c) {
&& c->maxw == c->minw && c->maxh == c->minh);
}
-static void
+void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
@@ -1736,7 +1807,7 @@ updatetitle(Client *c) {
/* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit. */
-static int
+int
xerror(Display *dpy, XErrorEvent *ee) {
if(ee->error_code == BadWindow
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
@@ -1752,20 +1823,20 @@ xerror(Display *dpy, XErrorEvent *ee) {
return xerrorxlib(dpy, ee); /* may call exit */
}
-static int
+int
xerrordummy(Display *dsply, XErrorEvent *ee) {
return 0;
}
/* Startup Error handler to check if another window manager
* is already running. */
-static int
+int
xerrorstart(Display *dsply, XErrorEvent *ee) {
otherwm = True;
return -1;
}
-static void
+void
view(const char *arg) {
unsigned int i;
@@ -1777,11 +1848,11 @@ view(const char *arg) {
arrange();
}
-static void
+void
zoom(const char *arg) {
Client *c;
- if(!sel || !isarrange(tile) || sel->isfloating)
+ if(!sel || !ISTILE || sel->isfloating)
return;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
@@ -1794,81 +1865,24 @@ zoom(const char *arg) {
int
main(int argc, char *argv[]) {
- char *p;
- int r, xfd;
- fd_set rd;
- XEvent ev;
-
if(argc == 2 && !strcmp("-v", argv[1]))
eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");
- /* macros from config.h can be used at function level only */
- mwfact = MWFACT;
- bpos = BARPOS;
-
setlocale(LC_CTYPE, "");
if(!(dpy = XOpenDisplay(0)))
eprint("dwm: cannot open display\n");
- xfd = ConnectionNumber(dpy);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- otherwm = False;
- XSetErrorHandler(xerrorstart);
- /* this causes an error if some other window manager is running */
- XSelectInput(dpy, root, SubstructureRedirectMask);
- 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);
+ checkotherwm();
setup();
drawbar();
scan();
-
- /* main event loop, also reads status text from stdin */
- XSync(dpy, False);
- readin = True;
- while(running) {
- FD_ZERO(&rd);
- if(readin)
- FD_SET(STDIN_FILENO, &rd);
- FD_SET(xfd, &rd);
- if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
- if(errno == EINTR)
- continue;
- eprint("select failed\n");
- }
- if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
- case -1:
- strncpy(stext, strerror(errno), sizeof stext - 1);
- stext[sizeof stext - 1] = '\0';
- readin = False;
- break;
- case 0:
- strncpy(stext, "EOF", 4);
- readin = False;
- break;
- default:
- for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
- for(; p >= stext && *p != '\n'; --p);
- if(p > stext)
- strncpy(stext, p + 1, sizeof stext);
- }
- drawbar();
- }
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
- }
+ run();
cleanup();
+
XCloseDisplay(dpy);
return 0;
}