author | Anselm R. Garbe <garbeam@gmail.com> |
Sun, 12 Aug 2007 12:46:08 +0200 | |
changeset 943 | d0b93818f723 |
parent 917 | 434e10a35d3c |
child 949 | 99ee5c370f94 |
permissions | -rw-r--r-- |
910
c13cb8c6b7a5
referred to LICENSE file
Anselm R. Garbe <arg@suckless.org>
parents:
909
diff
changeset
|
1 |
/* See LICENSE file for copyright and license details. */ |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
2 |
#include "dwm.h" |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
3 |
#include <errno.h> |
619 | 4 |
#include <locale.h> |
0 | 5 |
#include <stdio.h> |
6 |
#include <stdlib.h> |
|
57
f005d46462e8
implemented bar for dwm (I miss status text), I plan that status text is read from stdin in dwm
Anselm R. Garbe <garbeam@wmii.de>
parents:
52
diff
changeset
|
7 |
#include <string.h> |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
8 |
#include <unistd.h> |
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
9 |
#include <sys/select.h> |
0 | 10 |
#include <X11/cursorfont.h> |
291
8e6e0aa5e2ae
removed NUMLOCKMASK, added dynamically calculated numlockmask instead
Anselm R.Garbe <arg@10ksloc.org>
parents:
281
diff
changeset
|
11 |
#include <X11/keysym.h> |
0 | 12 |
#include <X11/Xatom.h> |
13 |
#include <X11/Xproto.h> |
|
14 |
||
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
15 |
/* extern */ |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
16 |
|
688
39fa5308d73f
removed mode label stuff
Anselm R. Garbe <arg@suckless.org>
parents:
679
diff
changeset
|
17 |
char stext[256]; |
801
9f2426241f09
reverted accidental removal of sx, sy
Anselm R. Garbe <arg@suckless.org>
parents:
800
diff
changeset
|
18 |
int screen, sx, sy, sw, sh, wax, way, waw, wah; |
917
434e10a35d3c
I change the style of init somewhat, init as early as possible.
Anselm R. Garbe <arg@suckless.org>
parents:
914
diff
changeset
|
19 |
unsigned int bh, ntags; |
434e10a35d3c
I change the style of init somewhat, init as early as possible.
Anselm R. Garbe <arg@suckless.org>
parents:
914
diff
changeset
|
20 |
unsigned int bpos = BARPOS; |
434e10a35d3c
I change the style of init somewhat, init as early as possible.
Anselm R. Garbe <arg@suckless.org>
parents:
914
diff
changeset
|
21 |
unsigned int numlockmask = 0; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
22 |
Atom wmatom[WMLast], netatom[NetLast]; |
740
1cb9ae0a0104
fixed order of Bool declarations
Anselm R. Garbe <arg@suckless.org>
parents:
739
diff
changeset
|
23 |
Bool *seltag; |
716
4ce65f61f01b
renamed activescreen into selscreen
Anselm R. Garbe <arg@suckless.org>
parents:
714
diff
changeset
|
24 |
Bool selscreen = True; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
25 |
Client *clients = NULL; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
26 |
Client *sel = NULL; |
446
a2e587651c79
using a global stack for focus recovery on arrange() - seems to work great
Anselm R. Garbe <arg@10kloc.org>
parents:
433
diff
changeset
|
27 |
Client *stack = NULL; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
28 |
Cursor cursor[CurLast]; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
29 |
Display *dpy; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
30 |
DC dc = {0}; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
31 |
Window root, barwin; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
32 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
33 |
/* static */ |
0 | 34 |
|
123 | 35 |
static int (*xerrorxlib)(Display *, XErrorEvent *); |
302 | 36 |
static Bool otherwm, readin; |
800
6133edf536de
removed some global vars which should be static instead
Anselm R. Garbe <arg@suckless.org>
parents:
795
diff
changeset
|
37 |
static Bool running = True; |
0 | 38 |
|
39 |
static void |
|
487 | 40 |
cleanup(void) { |
302 | 41 |
close(STDIN_FILENO); |
645 | 42 |
while(stack) { |
914
dad36921af06
applied anudots [un]ban repair patch
Anselm R. Garbe <arg@suckless.org>
parents:
910
diff
changeset
|
43 |
unban(stack); |
645 | 44 |
unmanage(stack); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
45 |
} |
295 | 46 |
if(dc.font.set) |
47 |
XFreeFontSet(dpy, dc.font.set); |
|
48 |
else |
|
49 |
XFreeFont(dpy, dc.font.xfont); |
|
292 | 50 |
XUngrabKey(dpy, AnyKey, AnyModifier, root); |
295 | 51 |
XFreePixmap(dpy, dc.drawable); |
52 |
XFreeGC(dpy, dc.gc); |
|
309
204427dcc087
corrected order of cleanup code
Anselm R.Garbe <arg@10ksloc.org>
parents:
302
diff
changeset
|
53 |
XDestroyWindow(dpy, barwin); |
616 | 54 |
XFreeCursor(dpy, cursor[CurNormal]); |
55 |
XFreeCursor(dpy, cursor[CurResize]); |
|
56 |
XFreeCursor(dpy, cursor[CurMove]); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
57 |
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); |
292 | 58 |
XSync(dpy, False); |
433 | 59 |
free(seltag); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
60 |
} |
0 | 61 |
|
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
62 |
static unsigned long |
795
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
63 |
initcolor(const char *colstr) { |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
64 |
Colormap cmap = DefaultColormap(dpy, screen); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
65 |
XColor color; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
66 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
67 |
if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
68 |
eprint("error, cannot allocate color '%s'\n", colstr); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
69 |
return color.pixel; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
70 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
71 |
|
0 | 72 |
static void |
795
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
73 |
initfont(const char *fontstr) { |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
74 |
char *def, **missing; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
75 |
int i, n; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
76 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
77 |
missing = NULL; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
78 |
if(dc.font.set) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
79 |
XFreeFontSet(dpy, dc.font.set); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
80 |
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
81 |
if(missing) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
82 |
while(n--) |
865
018c38468422
fixed the border issue for mplayer, ff is definately broken when using F11 (fullscreen mode)
Anselm R. Garbe <arg@suckless.org>
parents:
858
diff
changeset
|
83 |
fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]); |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
84 |
XFreeStringList(missing); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
85 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
86 |
if(dc.font.set) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
87 |
XFontSetExtents *font_extents; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
88 |
XFontStruct **xfonts; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
89 |
char **font_names; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
90 |
dc.font.ascent = dc.font.descent = 0; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
91 |
font_extents = XExtentsOfFontSet(dc.font.set); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
92 |
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
93 |
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
94 |
if(dc.font.ascent < (*xfonts)->ascent) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
95 |
dc.font.ascent = (*xfonts)->ascent; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
96 |
if(dc.font.descent < (*xfonts)->descent) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
97 |
dc.font.descent = (*xfonts)->descent; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
98 |
xfonts++; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
99 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
100 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
101 |
else { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
102 |
if(dc.font.xfont) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
103 |
XFreeFont(dpy, dc.font.xfont); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
104 |
dc.font.xfont = NULL; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
105 |
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
106 |
eprint("error, cannot load font: '%s'\n", fontstr); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
107 |
dc.font.ascent = dc.font.xfont->ascent; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
108 |
dc.font.descent = dc.font.xfont->descent; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
109 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
110 |
dc.font.height = dc.font.ascent + dc.font.descent; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
111 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
112 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
113 |
static void |
795
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
114 |
scan(void) { |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
115 |
unsigned int i, num; |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
116 |
Window *wins, d1, d2; |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
117 |
XWindowAttributes wa; |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
118 |
|
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
119 |
wins = NULL; |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
120 |
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
121 |
for(i = 0; i < num; i++) { |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
122 |
if(!XGetWindowAttributes(dpy, wins[i], &wa) |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
123 |
|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
124 |
continue; |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
125 |
if(wa.map_state == IsViewable) |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
126 |
manage(wins[i], &wa); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
127 |
} |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
128 |
} |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
129 |
if(wins) |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
130 |
XFree(wins); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
131 |
} |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
132 |
|
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
133 |
static void |
487 | 134 |
setup(void) { |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
135 |
int i, j; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
136 |
unsigned int mask; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
137 |
Window w; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
138 |
XModifierKeymap *modmap; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
139 |
XSetWindowAttributes wa; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
140 |
|
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
141 |
/* init atoms */ |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
142 |
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
143 |
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); |
725
d99be681d502
handling WM_STATE seems to make DnD in gtk/qt apps working, well let's handle this in dwm as well
Anselm R. Garbe <arg@suckless.org>
parents:
716
diff
changeset
|
144 |
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
145 |
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
146 |
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
147 |
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
148 |
PropModeReplace, (unsigned char *) netatom, NetLast); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
149 |
/* init cursors */ |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
150 |
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
151 |
cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
152 |
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
153 |
/* init modifier map */ |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
154 |
modmap = XGetModifierMapping(dpy); |
757
22dfaeb82491
made for/if/else constructs more consistent, some code polishing
Anselm R. Garbe <arg@suckless.org>
parents:
744
diff
changeset
|
155 |
for (i = 0; i < 8; i++) |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
156 |
for (j = 0; j < modmap->max_keypermod; j++) { |
757
22dfaeb82491
made for/if/else constructs more consistent, some code polishing
Anselm R. Garbe <arg@suckless.org>
parents:
744
diff
changeset
|
157 |
if(modmap->modifiermap[i * modmap->max_keypermod + j] |
22dfaeb82491
made for/if/else constructs more consistent, some code polishing
Anselm R. Garbe <arg@suckless.org>
parents:
744
diff
changeset
|
158 |
== XKeysymToKeycode(dpy, XK_Num_Lock)) |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
159 |
numlockmask = (1 << i); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
160 |
} |
616 | 161 |
XFreeModifiermap(modmap); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
162 |
/* select for events */ |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
458
diff
changeset
|
163 |
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
867
067a7784150e
applied patch of Paul Liu to allow onthefly resizing due to xrandr changes
Anselm R. Garbe <arg@suckless.org>
parents:
865
diff
changeset
|
164 |
| EnterWindowMask | LeaveWindowMask | StructureNotifyMask; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
165 |
wa.cursor = cursor[CurNormal]; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
166 |
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); |
867
067a7784150e
applied patch of Paul Liu to allow onthefly resizing due to xrandr changes
Anselm R. Garbe <arg@suckless.org>
parents:
865
diff
changeset
|
167 |
XSelectInput(dpy, root, wa.event_mask); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
168 |
grabkeys(); |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
169 |
compileregs(); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
170 |
for(ntags = 0; tags[ntags]; ntags++); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
171 |
seltag = emallocz(sizeof(Bool) * ntags); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
172 |
seltag[0] = True; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
173 |
/* style */ |
795
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
174 |
dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
175 |
dc.norm[ColBG] = initcolor(NORMBGCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
176 |
dc.norm[ColFG] = initcolor(NORMFGCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
177 |
dc.sel[ColBorder] = initcolor(SELBORDERCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
178 |
dc.sel[ColBG] = initcolor(SELBGCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
179 |
dc.sel[ColFG] = initcolor(SELFGCOLOR); |
3b23c75920a3
renamed setfont to initfont, getcolor to initcolor
Anselm R. Garbe <arg@suckless.org>
parents:
793
diff
changeset
|
180 |
initfont(FONT); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
181 |
/* geometry */ |
801
9f2426241f09
reverted accidental removal of sx, sy
Anselm R. Garbe <arg@suckless.org>
parents:
800
diff
changeset
|
182 |
sx = sy = 0; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
183 |
sw = DisplayWidth(dpy, screen); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
184 |
sh = DisplayHeight(dpy, screen); |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
185 |
initlayouts(); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
186 |
/* bar */ |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
187 |
dc.h = bh = dc.font.height + 2; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
188 |
wa.override_redirect = 1; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
189 |
wa.background_pixmap = ParentRelative; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
190 |
wa.event_mask = ButtonPressMask | ExposureMask; |
880
f330be522eca
another fix, call lt->arrange() in togglebar only
Anselm R. Garbe <arg@suckless.org>
parents:
879
diff
changeset
|
191 |
barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, |
739
7834ffd650d5
added TOPBAR option for making the bar appear what the user likes
Anselm R. Garbe <arg@suckless.org>
parents:
737
diff
changeset
|
192 |
DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
193 |
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
194 |
XDefineCursor(dpy, barwin, cursor[CurNormal]); |
878 | 195 |
updatebarpos(); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
196 |
XMapRaised(dpy, barwin); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
197 |
strcpy(stext, "dwm-"VERSION); |
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
198 |
/* pixmap for everything */ |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
199 |
dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
200 |
dc.gc = XCreateGC(dpy, root, 0, 0); |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
339
diff
changeset
|
201 |
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); |
850
2ea201354cf0
we don't need to set the font all the time
Anselm R. Garbe <arg@suckless.org>
parents:
848
diff
changeset
|
202 |
if(!dc.font.set) |
2ea201354cf0
we don't need to set the font all the time
Anselm R. Garbe <arg@suckless.org>
parents:
848
diff
changeset
|
203 |
XSetFont(dpy, dc.gc, dc.font.xfont->fid); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
204 |
/* multihead support */ |
716
4ce65f61f01b
renamed activescreen into selscreen
Anselm R. Garbe <arg@suckless.org>
parents:
714
diff
changeset
|
205 |
selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
206 |
} |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
207 |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
208 |
/* |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
209 |
* Startup Error handler to check if another window manager |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
210 |
* is already running. |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
211 |
*/ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
212 |
static int |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
458
diff
changeset
|
213 |
xerrorstart(Display *dsply, XErrorEvent *ee) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
214 |
otherwm = True; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
215 |
return -1; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
216 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
217 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
218 |
/* extern */ |
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
219 |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
220 |
void |
823
fb5cbf0bd923
replaced Arg union with const char *arg, seems cleaner to me, even if we need atoi() in some places
Anselm R. Garbe <arg@suckless.org>
parents:
813
diff
changeset
|
221 |
quit(const char *arg) { |
302 | 222 |
readin = running = False; |
75 | 223 |
} |
224 |
||
878 | 225 |
void |
226 |
updatebarpos(void) { |
|
885 | 227 |
XEvent ev; |
228 |
||
878 | 229 |
wax = sx; |
230 |
way = sy; |
|
231 |
wah = sh; |
|
232 |
waw = sw; |
|
233 |
switch(bpos) { |
|
880
f330be522eca
another fix, call lt->arrange() in togglebar only
Anselm R. Garbe <arg@suckless.org>
parents:
879
diff
changeset
|
234 |
default: |
878 | 235 |
wah -= bh; |
236 |
way += bh; |
|
237 |
XMoveWindow(dpy, barwin, sx, sy); |
|
238 |
break; |
|
239 |
case BarBot: |
|
240 |
wah -= bh; |
|
241 |
XMoveWindow(dpy, barwin, sx, sy + wah); |
|
242 |
break; |
|
243 |
case BarOff: |
|
244 |
XMoveWindow(dpy, barwin, sx, sy - bh); |
|
880
f330be522eca
another fix, call lt->arrange() in togglebar only
Anselm R. Garbe <arg@suckless.org>
parents:
879
diff
changeset
|
245 |
break; |
878 | 246 |
} |
884 | 247 |
XSync(dpy, False); |
248 |
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); |
|
878 | 249 |
} |
250 |
||
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
251 |
/* There's no way to check accesses to destroyed windows, thus those cases are |
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
252 |
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs |
455
4e3e22673073
fixed some other comments, now also the code side seems to be at a level to be reviewed by experienced programmers
Anselm R. Garbe <arg@10kloc.org>
parents:
446
diff
changeset
|
253 |
* default error handler, which may call exit. |
0 | 254 |
*/ |
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
255 |
int |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
458
diff
changeset
|
256 |
xerror(Display *dpy, XErrorEvent *ee) { |
75 | 257 |
if(ee->error_code == BadWindow |
123 | 258 |
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) |
259 |
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) |
|
260 |
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) |
|
261 |
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) |
|
262 |
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) |
|
458
81fcd7ddafee
applied Christof Musik's multihead patch for a pathologic cornercase
Anselm R. Garbe <arg@10kloc.org>
parents:
455
diff
changeset
|
263 |
|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess) |
81fcd7ddafee
applied Christof Musik's multihead patch for a pathologic cornercase
Anselm R. Garbe <arg@10kloc.org>
parents:
455
diff
changeset
|
264 |
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) |
0 | 265 |
return 0; |
34 | 266 |
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", |
123 | 267 |
ee->request_code, ee->error_code); |
455
4e3e22673073
fixed some other comments, now also the code side seems to be at a level to be reviewed by experienced programmers
Anselm R. Garbe <arg@10kloc.org>
parents:
446
diff
changeset
|
268 |
return xerrorxlib(dpy, ee); /* may call exit */ |
27
f96fb3fd8203
added grid mode on Mod1Mask g
Anselm R. Garbe <garbeam@wmii.de>
parents:
26
diff
changeset
|
269 |
} |
f96fb3fd8203
added grid mode on Mod1Mask g
Anselm R. Garbe <garbeam@wmii.de>
parents:
26
diff
changeset
|
270 |
|
0 | 271 |
int |
461
9d23330a5268
removed a bunch of lines through making function signatures more consistent with my style ( { does not belong to a new line, if function args are single-lined)
Anselm R. Garbe <arg@10kloc.org>
parents:
458
diff
changeset
|
272 |
main(int argc, char *argv[]) { |
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
273 |
char *p; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
274 |
int r, xfd; |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
275 |
fd_set rd; |
778
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
276 |
XEvent ev; |
0 | 277 |
|
896
9fb6e8e6715b
removed the only one and superfloues strncmp
Anselm R. Garbe <arg@suckless.org>
parents:
886
diff
changeset
|
278 |
if(argc == 2 && !strcmp("-v", argv[1])) |
909
8a8b7a413e66
Jukka also belongs to Copyright holders after all he has contributed and done for dwm, updated -v as well
Anselm R. Garbe <arg@suckless.org>
parents:
907
diff
changeset
|
279 |
eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n"); |
137
77922a389fa8
simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents:
126
diff
changeset
|
280 |
else if(argc != 1) |
77922a389fa8
simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents:
126
diff
changeset
|
281 |
eprint("usage: dwm [-v]\n"); |
619 | 282 |
setlocale(LC_CTYPE, ""); |
789
3edec0a35000
using eprint instead of fputs
Anselm R. Garbe <arg@suckless.org>
parents:
782
diff
changeset
|
283 |
if(!(dpy = XOpenDisplay(0))) |
197 | 284 |
eprint("dwm: cannot open display\n"); |
265
573b1c4a71a4
reducing ConnectionNumber calls to a bare minimum
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
285 |
xfd = ConnectionNumber(dpy); |
0 | 286 |
screen = DefaultScreen(dpy); |
287 |
root = RootWindow(dpy, screen); |
|
75 | 288 |
otherwm = False; |
289 |
XSetErrorHandler(xerrorstart); |
|
197 | 290 |
/* this causes an error if some other window manager is running */ |
0 | 291 |
XSelectInput(dpy, root, SubstructureRedirectMask); |
78
0d71fb80b592
changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
292 |
XSync(dpy, False); |
75 | 293 |
if(otherwm) |
294 |
eprint("dwm: another window manager is already running\n"); |
|
0 | 295 |
|
292 | 296 |
XSync(dpy, False); |
78
0d71fb80b592
changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
297 |
XSetErrorHandler(NULL); |
75 | 298 |
xerrorxlib = XSetErrorHandler(xerror); |
275 | 299 |
XSync(dpy, False); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
300 |
setup(); |
74 | 301 |
drawstatus(); |
75 | 302 |
scan(); |
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
303 |
|
214 | 304 |
/* main event loop, also reads status text from stdin */ |
242 | 305 |
XSync(dpy, False); |
302 | 306 |
readin = True; |
5 | 307 |
while(running) { |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
308 |
FD_ZERO(&rd); |
164
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
162
diff
changeset
|
309 |
if(readin) |
21071ae1fe68
made fullscreen apps working fine in floating mode (there is no sane way to make them work in tiled mode, thus I switch to floating mode if I run such kind of app), also fixed the xterm issue reported by Sander
arg@10ksloc.org
parents:
162
diff
changeset
|
310 |
FD_SET(STDIN_FILENO, &rd); |
265
573b1c4a71a4
reducing ConnectionNumber calls to a bare minimum
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
311 |
FD_SET(xfd, &rd); |
578 | 312 |
if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) { |
313 |
if(errno == EINTR) |
|
314 |
continue; |
|
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
315 |
eprint("select failed\n"); |
578 | 316 |
} |
317 |
if(FD_ISSET(STDIN_FILENO, &rd)) { |
|
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
318 |
switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) { |
578 | 319 |
case -1: |
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
320 |
strncpy(stext, strerror(errno), sizeof stext - 1); |
583
f4285a97e3e6
applied Jukka's patch preventing some cornercases and making the EOF error message correct
arg@mig29
parents:
582
diff
changeset
|
321 |
stext[sizeof stext - 1] = '\0'; |
578 | 322 |
readin = False; |
323 |
break; |
|
324 |
case 0: |
|
583
f4285a97e3e6
applied Jukka's patch preventing some cornercases and making the EOF error message correct
arg@mig29
parents:
582
diff
changeset
|
325 |
strncpy(stext, "EOF", 4); |
578 | 326 |
readin = False; |
327 |
break; |
|
328 |
default: |
|
582 | 329 |
for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0'); |
744
628c5bac7f3b
pneubeck pointed out an obvious thing, that a second p = stext + strlen(stext) - 1 is unnecessary
Anselm R. Garbe <arg@suckless.org>
parents:
740
diff
changeset
|
330 |
for(; p >= stext && *p != '\n'; --p); |
581
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
331 |
if(p > stext) |
601842ee4484
applied Jukka's sizeof K&R compliance patch, applied Manuels' last-line printage proposal for stdin reading.
arg@mig29
parents:
580
diff
changeset
|
332 |
strncpy(stext, p + 1, sizeof stext); |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
333 |
} |
578 | 334 |
drawstatus(); |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
335 |
} |
812
8992a53a0d6a
just ignore the FD_ISSET check in main.c of xfd, just call XPending (which does the same afair)
Anselm R. Garbe <arg@suckless.org>
parents:
801
diff
changeset
|
336 |
while(XPending(dpy)) { |
8992a53a0d6a
just ignore the FD_ISSET check in main.c of xfd, just call XPending (which does the same afair)
Anselm R. Garbe <arg@suckless.org>
parents:
801
diff
changeset
|
337 |
XNextEvent(dpy, &ev); |
8992a53a0d6a
just ignore the FD_ISSET check in main.c of xfd, just call XPending (which does the same afair)
Anselm R. Garbe <arg@suckless.org>
parents:
801
diff
changeset
|
338 |
if(handler[ev.type]) |
8992a53a0d6a
just ignore the FD_ISSET check in main.c of xfd, just call XPending (which does the same afair)
Anselm R. Garbe <arg@suckless.org>
parents:
801
diff
changeset
|
339 |
(handler[ev.type])(&ev); /* call handler */ |
8992a53a0d6a
just ignore the FD_ISSET check in main.c of xfd, just call XPending (which does the same afair)
Anselm R. Garbe <arg@suckless.org>
parents:
801
diff
changeset
|
340 |
} |
5 | 341 |
} |
0 | 342 |
cleanup(); |
343 |
XCloseDisplay(dpy); |
|
344 |
return 0; |
|
345 |
} |