author | Anselm R. Garbe <arg@suckless.org> |
Tue, 20 Feb 2007 13:40:31 +0100 | |
changeset 792 | 99044861fd9b |
parent 789 | 3edec0a35000 |
child 793 | 79cb72e82b21 |
permissions | -rw-r--r-- |
644 | 1 |
/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com> |
0 | 2 |
* See LICENSE file for license details. |
3 |
*/ |
|
4 |
||
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
5 |
#include "dwm.h" |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
6 |
#include <errno.h> |
619 | 7 |
#include <locale.h> |
0 | 8 |
#include <stdio.h> |
9 |
#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
|
10 |
#include <string.h> |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
11 |
#include <unistd.h> |
138
c1185dc7a36e
some cleanups/fixes inspired by Jukka Salmi's feedback
arg@10ksloc.org
parents:
137
diff
changeset
|
12 |
#include <sys/select.h> |
0 | 13 |
#include <X11/cursorfont.h> |
291
8e6e0aa5e2ae
removed NUMLOCKMASK, added dynamically calculated numlockmask instead
Anselm R.Garbe <arg@10ksloc.org>
parents:
281
diff
changeset
|
14 |
#include <X11/keysym.h> |
0 | 15 |
#include <X11/Xatom.h> |
16 |
#include <X11/Xproto.h> |
|
17 |
||
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
18 |
/* extern */ |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
19 |
|
688
39fa5308d73f
removed mode label stuff
Anselm R. Garbe <arg@suckless.org>
parents:
679
diff
changeset
|
20 |
char stext[256]; |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
21 |
int screen, sx, sy, sw, sh, wax, way, waw, wah; |
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
22 |
unsigned int bh, ntags, numlockmask; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
23 |
Atom wmatom[WMLast], 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
|
24 |
Bool running = True; |
740
1cb9ae0a0104
fixed order of Bool declarations
Anselm R. Garbe <arg@suckless.org>
parents:
739
diff
changeset
|
25 |
Bool *seltag; |
716
4ce65f61f01b
renamed activescreen into selscreen
Anselm R. Garbe <arg@suckless.org>
parents:
714
diff
changeset
|
26 |
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
|
27 |
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
|
28 |
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
|
29 |
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
|
30 |
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
|
31 |
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
|
32 |
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
|
33 |
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
|
34 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
35 |
/* static */ |
0 | 36 |
|
123 | 37 |
static int (*xerrorxlib)(Display *, XErrorEvent *); |
302 | 38 |
static Bool otherwm, readin; |
0 | 39 |
|
40 |
static void |
|
487 | 41 |
cleanup(void) { |
302 | 42 |
close(STDIN_FILENO); |
645 | 43 |
while(stack) { |
762
140bcd4782d8
removed ugly ban(), extended resize() that it only resets the size if necessary, added border_width commit to manage()
Anselm R. Garbe <arg@suckless.org>
parents:
757
diff
changeset
|
44 |
if(stack->isbanned) |
140bcd4782d8
removed ugly ban(), extended resize() that it only resets the size if necessary, added border_width commit to manage()
Anselm R. Garbe <arg@suckless.org>
parents:
757
diff
changeset
|
45 |
XMoveWindow(dpy, stack->win, stack->x, stack->y); |
645 | 46 |
unmanage(stack); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
47 |
} |
295 | 48 |
if(dc.font.set) |
49 |
XFreeFontSet(dpy, dc.font.set); |
|
50 |
else |
|
51 |
XFreeFont(dpy, dc.font.xfont); |
|
292 | 52 |
XUngrabKey(dpy, AnyKey, AnyModifier, root); |
295 | 53 |
XFreePixmap(dpy, dc.drawable); |
54 |
XFreeGC(dpy, dc.gc); |
|
309
204427dcc087
corrected order of cleanup code
Anselm R.Garbe <arg@10ksloc.org>
parents:
302
diff
changeset
|
55 |
XDestroyWindow(dpy, barwin); |
616 | 56 |
XFreeCursor(dpy, cursor[CurNormal]); |
57 |
XFreeCursor(dpy, cursor[CurResize]); |
|
58 |
XFreeCursor(dpy, cursor[CurMove]); |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
59 |
XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); |
292 | 60 |
XSync(dpy, False); |
433 | 61 |
free(seltag); |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
62 |
} |
0 | 63 |
|
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
64 |
static unsigned int |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
65 |
textnw(const char *text, unsigned int len) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
66 |
XRectangle r; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
67 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
68 |
if(dc.font.set) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
69 |
XmbTextExtents(dc.font.set, text, len, NULL, &r); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
70 |
return r.width; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
71 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
72 |
return XTextWidth(dc.font.xfont, text, len); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
73 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
74 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
75 |
static void |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
76 |
drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
77 |
int x; |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
78 |
XGCValues gcv; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
79 |
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
80 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
81 |
gcv.foreground = col[ColFG]; |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
82 |
XChangeGC(dpy, dc.gc, GCForeground, &gcv); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
83 |
x = (dc.font.ascent + dc.font.descent + 2) / 4; |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
84 |
r.x = dc.x + 1; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
85 |
r.y = dc.y + 1; |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
86 |
if(filled) { |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
87 |
r.width = r.height = x + 1; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
88 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
89 |
} |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
90 |
else if(empty) { |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
91 |
r.width = r.height = x; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
92 |
XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
93 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
94 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
95 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
96 |
static unsigned long |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
97 |
getcolor(const char *colstr) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
98 |
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
|
99 |
XColor color; |
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 |
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
|
102 |
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
|
103 |
return color.pixel; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
104 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
105 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
106 |
static Bool |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
107 |
isoccupied(unsigned int t) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
108 |
Client *c; |
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 |
for(c = clients; c; c = c->next) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
111 |
if(c->tags[t]) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
112 |
return True; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
113 |
return False; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
114 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
115 |
|
0 | 116 |
static void |
487 | 117 |
scan(void) { |
0 | 118 |
unsigned int i, num; |
123 | 119 |
Window *wins, d1, d2; |
0 | 120 |
XWindowAttributes wa; |
121 |
||
292 | 122 |
wins = NULL; |
0 | 123 |
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { |
124 |
for(i = 0; i < num; i++) { |
|
757
22dfaeb82491
made for/if/else constructs more consistent, some code polishing
Anselm R. Garbe <arg@suckless.org>
parents:
744
diff
changeset
|
125 |
if(!XGetWindowAttributes(dpy, wins[i], &wa) |
22dfaeb82491
made for/if/else constructs more consistent, some code polishing
Anselm R. Garbe <arg@suckless.org>
parents:
744
diff
changeset
|
126 |
|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) |
0 | 127 |
continue; |
128 |
if(wa.map_state == IsViewable) |
|
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
129 |
manage(wins[i], &wa); |
0 | 130 |
} |
131 |
} |
|
132 |
if(wins) |
|
133 |
XFree(wins); |
|
134 |
} |
|
135 |
||
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
136 |
static void |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
137 |
setfont(const char *fontstr) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
138 |
char *def, **missing; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
139 |
int i, n; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
140 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
141 |
missing = NULL; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
142 |
if(dc.font.set) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
143 |
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
|
144 |
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
|
145 |
if(missing) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
146 |
while(n--) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
147 |
fprintf(stderr, "missing fontset: %s\n", missing[n]); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
148 |
XFreeStringList(missing); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
149 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
150 |
if(dc.font.set) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
151 |
XFontSetExtents *font_extents; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
152 |
XFontStruct **xfonts; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
153 |
char **font_names; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
154 |
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
|
155 |
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
|
156 |
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
|
157 |
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
|
158 |
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
|
159 |
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
|
160 |
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
|
161 |
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
|
162 |
xfonts++; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
163 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
164 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
165 |
else { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
166 |
if(dc.font.xfont) |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
167 |
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
|
168 |
dc.font.xfont = NULL; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
169 |
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
|
170 |
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
|
171 |
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
|
172 |
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
|
173 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
174 |
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
|
175 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
176 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
177 |
static void |
487 | 178 |
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
|
179 |
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
|
180 |
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
|
181 |
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
|
182 |
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
|
183 |
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
|
184 |
|
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
185 |
/* 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
|
186 |
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
|
187 |
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
|
188 |
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
|
189 |
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
|
190 |
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
|
191 |
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
|
192 |
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
|
193 |
/* 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
|
194 |
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
|
195 |
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
|
196 |
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
197 |
/* init modifier map */ |
679
5f0134b88b8d
small fix of initial numlockmask value
Anselm R. Garbe <arg@suckless.org>
parents:
675
diff
changeset
|
198 |
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
|
199 |
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
|
200 |
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
|
201 |
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
|
202 |
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
|
203 |
== 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
|
204 |
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
|
205 |
} |
616 | 206 |
XFreeModifiermap(modmap); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
207 |
/* 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
|
208 |
wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
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
|
209 |
| EnterWindowMask | LeaveWindowMask; |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
210 |
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
|
211 |
XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
212 |
grabkeys(); |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
213 |
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
|
214 |
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
|
215 |
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
|
216 |
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
|
217 |
/* style */ |
689
cbec08a54a15
implemented new color scheme accordingly to Sanders proposal
Anselm R. Garbe <arg@suckless.org>
parents:
688
diff
changeset
|
218 |
dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
219 |
dc.norm[ColBG] = getcolor(NORMBGCOLOR); |
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
220 |
dc.norm[ColFG] = getcolor(NORMFGCOLOR); |
689
cbec08a54a15
implemented new color scheme accordingly to Sanders proposal
Anselm R. Garbe <arg@suckless.org>
parents:
688
diff
changeset
|
221 |
dc.sel[ColBorder] = getcolor(SELBORDERCOLOR); |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
222 |
dc.sel[ColBG] = getcolor(SELBGCOLOR); |
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
223 |
dc.sel[ColFG] = getcolor(SELFGCOLOR); |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
224 |
setfont(FONT); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
225 |
/* geometry */ |
333
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
226 |
sx = sy = 0; |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
227 |
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
|
228 |
sh = DisplayHeight(dpy, screen); |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
229 |
initlayouts(); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
230 |
/* bar */ |
353
8a06efe5b563
new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents:
352
diff
changeset
|
231 |
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
|
232 |
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
|
233 |
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
|
234 |
wa.event_mask = ButtonPressMask | ExposureMask; |
739
7834ffd650d5
added TOPBAR option for making the bar appear what the user likes
Anselm R. Garbe <arg@suckless.org>
parents:
737
diff
changeset
|
235 |
barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0, |
7834ffd650d5
added TOPBAR option for making the bar appear what the user likes
Anselm R. Garbe <arg@suckless.org>
parents:
737
diff
changeset
|
236 |
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
|
237 |
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
|
238 |
XDefineCursor(dpy, barwin, 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
|
239 |
XMapRaised(dpy, barwin); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
240 |
strcpy(stext, "dwm-"VERSION); |
565 | 241 |
/* windowarea */ |
242 |
wax = sx; |
|
739
7834ffd650d5
added TOPBAR option for making the bar appear what the user likes
Anselm R. Garbe <arg@suckless.org>
parents:
737
diff
changeset
|
243 |
way = sy + (TOPBAR ? bh : 0); |
565 | 244 |
wah = sh - bh; |
245 |
waw = sw; |
|
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
246 |
/* 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
|
247 |
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
|
248 |
dc.gc = XCreateGC(dpy, root, 0, 0); |
344
93192711a36a
changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents:
339
diff
changeset
|
249 |
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); |
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
250 |
/* multihead support */ |
716
4ce65f61f01b
renamed activescreen into selscreen
Anselm R. Garbe <arg@suckless.org>
parents:
714
diff
changeset
|
251 |
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
|
252 |
} |
827f8f6c9e97
separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents:
329
diff
changeset
|
253 |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
254 |
/* |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
255 |
* 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
|
256 |
* is already running. |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
257 |
*/ |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
258 |
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
|
259 |
xerrorstart(Display *dsply, XErrorEvent *ee) { |
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
260 |
otherwm = True; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
261 |
return -1; |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
262 |
} |
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
263 |
|
84
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
264 |
/* extern */ |
052fe7498930
ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents:
79
diff
changeset
|
265 |
|
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
266 |
void |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
267 |
drawstatus(void) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
268 |
int i, x; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
269 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
270 |
dc.x = dc.y = 0; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
271 |
for(i = 0; i < ntags; i++) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
272 |
dc.w = textw(tags[i]); |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
273 |
if(seltag[i]) { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
274 |
drawtext(tags[i], dc.sel); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
275 |
drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
276 |
} |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
277 |
else { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
278 |
drawtext(tags[i], dc.norm); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
279 |
drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
280 |
} |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
281 |
dc.x += dc.w; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
282 |
} |
782
92862ab407d5
introduced Layout struct
Anselm R. Garbe <arg@suckless.org>
parents:
778
diff
changeset
|
283 |
dc.w = blw; |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
284 |
drawtext(lt->symbol, dc.norm); |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
285 |
x = dc.x + dc.w; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
286 |
dc.w = textw(stext); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
287 |
dc.x = sw - dc.w; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
288 |
if(dc.x < x) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
289 |
dc.x = x; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
290 |
dc.w = sw - x; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
291 |
} |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
292 |
drawtext(stext, dc.norm); |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
293 |
if((dc.w = dc.x - x) > bh) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
294 |
dc.x = x; |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
295 |
drawtext(sel ? sel->name : NULL, sel ? dc.sel : dc.norm); |
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
296 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
297 |
XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
298 |
XSync(dpy, False); |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
299 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
300 |
|
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
301 |
void |
792
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
302 |
drawtext(const char *text, unsigned long col[ColLast]) { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
303 |
int x, y, w, h; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
304 |
static char buf[256]; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
305 |
unsigned int len, olen; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
306 |
XGCValues gcv; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
307 |
XRectangle r = { dc.x, dc.y, dc.w, dc.h }; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
308 |
|
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
309 |
XSetForeground(dpy, dc.gc, col[ColBG]); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
310 |
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
311 |
if(!text) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
312 |
return; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
313 |
w = 0; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
314 |
olen = len = strlen(text); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
315 |
if(len >= sizeof buf) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
316 |
len = sizeof buf - 1; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
317 |
memcpy(buf, text, len); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
318 |
buf[len] = 0; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
319 |
h = dc.font.ascent + dc.font.descent; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
320 |
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
321 |
x = dc.x + (h / 2); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
322 |
/* shorten text if necessary */ |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
323 |
while(len && (w = textnw(buf, len)) > dc.w - h) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
324 |
buf[--len] = 0; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
325 |
if(len < olen) { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
326 |
if(len > 1) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
327 |
buf[len - 1] = '.'; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
328 |
if(len > 2) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
329 |
buf[len - 2] = '.'; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
330 |
if(len > 3) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
331 |
buf[len - 3] = '.'; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
332 |
} |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
333 |
if(w > dc.w) |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
334 |
return; /* too long */ |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
335 |
gcv.foreground = col[ColFG]; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
336 |
if(dc.font.set) { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
337 |
XChangeGC(dpy, dc.gc, GCForeground, &gcv); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
338 |
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
339 |
} |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
340 |
else { |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
341 |
gcv.font = dc.font.xfont->fid; |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
342 |
XChangeGC(dpy, dc.gc, GCForeground | GCFont, &gcv); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
343 |
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
344 |
} |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
345 |
} |
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
346 |
|
99044861fd9b
separating drawsquare from drawtext, made drawtext extern
Anselm R. Garbe <arg@suckless.org>
parents:
789
diff
changeset
|
347 |
void |
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
|
348 |
sendevent(Window w, Atom a, long value) { |
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
349 |
XEvent e; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
350 |
|
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
351 |
e.type = ClientMessage; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
352 |
e.xclient.window = w; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
353 |
e.xclient.message_type = a; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
354 |
e.xclient.format = 32; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
355 |
e.xclient.data.l[0] = value; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
356 |
e.xclient.data.l[1] = CurrentTime; |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
357 |
XSendEvent(dpy, w, False, NoEventMask, &e); |
79
aabebd6e61f3
fixed XSync handling and finished man page
Anselm R. Garbe <garbeam@wmii.de>
parents:
78
diff
changeset
|
358 |
XSync(dpy, False); |
13
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
359 |
} |
5cc5e55a132d
added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents:
10
diff
changeset
|
360 |
|
777
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
361 |
unsigned int |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
362 |
textw(const char *text) { |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
363 |
return textnw(text, strlen(text)) + dc.font.height; |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
364 |
} |
469dc170f833
draw.c is useless (belongs to main.c now)
Anselm R. Garbe <arg@suckless.org>
parents:
770
diff
changeset
|
365 |
|
76
4bd49f404f10
proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents:
75
diff
changeset
|
366 |
void |
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
|
367 |
quit(Arg *arg) { |
302 | 368 |
readin = running = False; |
75 | 369 |
} |
370 |
||
532
651f2c868b31
code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents:
530
diff
changeset
|
371 |
/* 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
|
372 |
* 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
|
373 |
* default error handler, which may call exit. |
0 | 374 |
*/ |
10
703255003abb
changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents:
9
diff
changeset
|
375 |
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
|
376 |
xerror(Display *dpy, XErrorEvent *ee) { |
75 | 377 |
if(ee->error_code == BadWindow |
123 | 378 |
|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) |
379 |
|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) |
|
380 |
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) |
|
381 |
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) |
|
382 |
|| (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
|
383 |
|| (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
|
384 |
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) |
0 | 385 |
return 0; |
34 | 386 |
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", |
123 | 387 |
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
|
388 |
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
|
389 |
} |
f96fb3fd8203
added grid mode on Mod1Mask g
Anselm R. Garbe <garbeam@wmii.de>
parents:
26
diff
changeset
|
390 |
|
0 | 391 |
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
|
392 |
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
|
393 |
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
|
394 |
int r, xfd; |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
395 |
fd_set rd; |
778
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
396 |
XEvent ev; |
0 | 397 |
|
789
3edec0a35000
using eprint instead of fputs
Anselm R. Garbe <arg@suckless.org>
parents:
782
diff
changeset
|
398 |
if(argc == 2 && !strncmp("-v", argv[1], 3)) |
3edec0a35000
using eprint instead of fputs
Anselm R. Garbe <arg@suckless.org>
parents:
782
diff
changeset
|
399 |
eprint("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n"); |
137
77922a389fa8
simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents:
126
diff
changeset
|
400 |
else if(argc != 1) |
77922a389fa8
simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents:
126
diff
changeset
|
401 |
eprint("usage: dwm [-v]\n"); |
619 | 402 |
setlocale(LC_CTYPE, ""); |
789
3edec0a35000
using eprint instead of fputs
Anselm R. Garbe <arg@suckless.org>
parents:
782
diff
changeset
|
403 |
if(!(dpy = XOpenDisplay(0))) |
197 | 404 |
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
|
405 |
xfd = ConnectionNumber(dpy); |
0 | 406 |
screen = DefaultScreen(dpy); |
407 |
root = RootWindow(dpy, screen); |
|
75 | 408 |
otherwm = False; |
409 |
XSetErrorHandler(xerrorstart); |
|
197 | 410 |
/* this causes an error if some other window manager is running */ |
0 | 411 |
XSelectInput(dpy, root, SubstructureRedirectMask); |
78
0d71fb80b592
changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
412 |
XSync(dpy, False); |
75 | 413 |
if(otherwm) |
414 |
eprint("dwm: another window manager is already running\n"); |
|
0 | 415 |
|
292 | 416 |
XSync(dpy, False); |
78
0d71fb80b592
changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents:
77
diff
changeset
|
417 |
XSetErrorHandler(NULL); |
75 | 418 |
xerrorxlib = XSetErrorHandler(xerror); |
275 | 419 |
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
|
420 |
setup(); |
74 | 421 |
drawstatus(); |
75 | 422 |
scan(); |
3
e969f3575b7a
several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents:
2
diff
changeset
|
423 |
|
214 | 424 |
/* main event loop, also reads status text from stdin */ |
242 | 425 |
XSync(dpy, False); |
302 | 426 |
readin = True; |
5 | 427 |
while(running) { |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
428 |
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
|
429 |
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
|
430 |
FD_SET(STDIN_FILENO, &rd); |
265
573b1c4a71a4
reducing ConnectionNumber calls to a bare minimum
Anselm R.Garbe <arg@10ksloc.org>
parents:
262
diff
changeset
|
431 |
FD_SET(xfd, &rd); |
578 | 432 |
if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) { |
433 |
if(errno == EINTR) |
|
434 |
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
|
435 |
eprint("select failed\n"); |
578 | 436 |
} |
437 |
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
|
438 |
switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) { |
578 | 439 |
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
|
440 |
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
|
441 |
stext[sizeof stext - 1] = '\0'; |
578 | 442 |
readin = False; |
443 |
break; |
|
444 |
case 0: |
|
583
f4285a97e3e6
applied Jukka's patch preventing some cornercases and making the EOF error message correct
arg@mig29
parents:
582
diff
changeset
|
445 |
strncpy(stext, "EOF", 4); |
578 | 446 |
readin = False; |
447 |
break; |
|
448 |
default: |
|
582 | 449 |
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
|
450 |
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
|
451 |
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
|
452 |
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
|
453 |
} |
578 | 454 |
drawstatus(); |
59
5d4653de9a1c
implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents:
58
diff
changeset
|
455 |
} |
578 | 456 |
if(FD_ISSET(xfd, &rd)) |
778
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
457 |
while(XPending(dpy)) { |
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
458 |
XNextEvent(dpy, &ev); |
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
459 |
if(handler[ev.type]) |
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
460 |
(handler[ev.type])(&ev); /* call handler */ |
2ec66bdbb8ad
removed procevent, more refactoring
Anselm R. Garbe <arg@suckless.org>
parents:
777
diff
changeset
|
461 |
} |
5 | 462 |
} |
0 | 463 |
cleanup(); |
464 |
XCloseDisplay(dpy); |
|
465 |
return 0; |
|
466 |
} |