Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
applying aluminium style for arg's config.h
[dwm.git]
/
main.c
diff --git
a/main.c
b/main.c
index
0727c2a
..
0f22c44
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1,5
+1,4
@@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
* See LICENSE file for license details.
*/
@@
-19,13
+18,14
@@
char stext[1024];
Bool *seltag;
char stext[1024];
Bool *seltag;
-int
screen, sx, sy, sw, sh, bx, by, bw, bh, mw
;
-unsigned int
ntags, numlockmask, modew
;
+int
bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah
;
+unsigned int
master, ntags, numlockmask
;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;
Client *clients = NULL;
Client *sel = NULL;
Atom wmatom[WMLast], netatom[NetLast];
Bool running = True;
Bool issel = True;
Client *clients = NULL;
Client *sel = NULL;
+Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
@@
-37,8
+37,7
@@
static int (*xerrorxlib)(Display *, XErrorEvent *);
static Bool otherwm, readin;
static void
static Bool otherwm, readin;
static void
-cleanup()
-{
+cleanup(void) {
close(STDIN_FILENO);
while(sel) {
resize(sel, True, TopLeft);
close(STDIN_FILENO);
while(sel) {
resize(sel, True, TopLeft);
@@
-54,11
+53,11
@@
cleanup()
XDestroyWindow(dpy, barwin);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
XDestroyWindow(dpy, barwin);
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
XSync(dpy, False);
+ free(seltag);
}
static void
}
static void
-scan()
-{
+scan(void) {
unsigned int i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
unsigned int i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
@@
-79,8
+78,7
@@
scan()
}
static void
}
static void
-setup()
-{
+setup(void) {
int i, j;
unsigned int mask;
Window w;
int i, j;
unsigned int mask;
Window w;
@@
-94,12
+92,11
@@
setup()
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
PropModeReplace, (unsigned char *) netatom, NetLast);
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 cursors */
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
+ /* init modifier map */
modmap = XGetModifierMapping(dpy);
for (i = 0; i < 8; i++) {
for (j = 0; j < modmap->max_keypermod; j++) {
modmap = XGetModifierMapping(dpy);
for (i = 0; i < 8; i++) {
for (j = 0; j < modmap->max_keypermod; j++) {
@@
-108,18
+105,16
@@
setup()
}
}
XFree(modmap);
}
}
XFree(modmap);
-
- wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
+ /* select for events */
+ wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
+ | EnterWindowMask | LeaveWindowMask;
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
wa.cursor = cursor[CurNormal];
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-
grabkeys();
initrregs();
grabkeys();
initrregs();
-
for(ntags = 0; tags[ntags]; ntags++);
seltag = emallocz(sizeof(Bool) * ntags);
seltag[0] = True;
for(ntags = 0; tags[ntags]; ntags++);
seltag = emallocz(sizeof(Bool) * ntags);
seltag[0] = True;
-
/* style */
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
dc.norm[ColFG] = getcolor(NORMFGCOLOR);
/* style */
dc.norm[ColBG] = getcolor(NORMBGCOLOR);
dc.norm[ColFG] = getcolor(NORMFGCOLOR);
@@
-128,13
+123,13
@@
setup()
dc.status[ColBG] = getcolor(STATUSBGCOLOR);
dc.status[ColFG] = getcolor(STATUSFGCOLOR);
setfont(FONT);
dc.status[ColBG] = getcolor(STATUSBGCOLOR);
dc.status[ColFG] = getcolor(STATUSFGCOLOR);
setfont(FONT);
-
-
modew = 0
;
+ /* geometry */
+
bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL)
;
sx = sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
sx = sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- m
w = (sw * MASTERW) / 100
;
-
+ m
aster = MASTER
;
+ /* bar */
bx = by = 0;
bw = sw;
dc.h = bh = dc.font.height + 2;
bx = by = 0;
bw = sw;
dc.h = bh = dc.font.height + 2;
@@
-146,13
+141,18
@@
setup()
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
-
+ strcpy(stext, "dwm-"VERSION);
+ /* windowarea */
+ wax = sx;
+ way = bh;
+ wah = sh - bh;
+ waw = sw;
+ /* pixmap for everything */
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);
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);
-
+ /* multihead support */
issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
- strcpy(stext, "dwm-"VERSION);
}
/*
}
/*
@@
-160,8
+160,7
@@
setup()
* is already running.
*/
static int
* is already running.
*/
static int
-xerrorstart(Display *dsply, XErrorEvent *ee)
-{
+xerrorstart(Display *dsply, XErrorEvent *ee) {
otherwm = True;
return -1;
}
otherwm = True;
return -1;
}
@@
-169,8
+168,7
@@
xerrorstart(Display *dsply, XErrorEvent *ee)
/* extern */
int
/* extern */
int
-getproto(Window w)
-{
+getproto(Window w) {
int i, format, protos, status;
unsigned long extra, res;
Atom *protocols, real;
int i, format, protos, status;
unsigned long extra, res;
Atom *protocols, real;
@@
-188,8
+186,7
@@
getproto(Window w)
}
void
}
void
-sendevent(Window w, Atom a, long value)
-{
+sendevent(Window w, Atom a, long value) {
XEvent e;
e.type = ClientMessage;
XEvent e;
e.type = ClientMessage;
@@
-203,35
+200,32
@@
sendevent(Window w, Atom a, long value)
}
void
}
void
-quit(Arg *arg)
-{
+quit(Arg *arg) {
readin = running = False;
}
readin = running = False;
}
-/*
- * There's no way to check accesses to destroyed windows, thus those cases are
+/* 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
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which
calls exit()
.
+ * default error handler, which
may call exit
.
*/
int
*/
int
-xerror(Display *dpy, XErrorEvent *ee)
-{
+xerror(Display *dpy, XErrorEvent *ee) {
if(ee->error_code == BadWindow
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
if(ee->error_code == BadWindow
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
- || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
+ || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
+ || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
ee->request_code, ee->error_code);
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
ee->request_code, ee->error_code);
- return xerrorxlib(dpy, ee); /* may call exit
()
*/
+ return xerrorxlib(dpy, ee); /* may call exit */
}
int
}
int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
int r, xfd;
fd_set rd;
int r, xfd;
fd_set rd;
@@
-241,21
+235,17
@@
main(int argc, char *argv[])
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
}
else if(argc != 1)
eprint("usage: dwm [-v]\n");
-
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dwm: cannot open display\n");
-
xfd = ConnectionNumber(dpy);
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
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);
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");
if(otherwm)
eprint("dwm: another window manager is already running\n");
@@
-263,7
+253,6
@@
main(int argc, char *argv[])
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
-
setup();
drawstatus();
scan();
setup();
drawstatus();
scan();
@@
-296,6
+285,5
@@
main(int argc, char *argv[])
}
cleanup();
XCloseDisplay(dpy);
}
cleanup();
XCloseDisplay(dpy);
-
return 0;
}
return 0;
}