annotate main.c @ 732:a642068c4834

simplification
author Anselm R. Garbe <arg@suckless.org>
date Tue, 06 Feb 2007 15:28:25 +0100
parents d99be681d502
children 6283adb1fcf2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
644
1ed8c40dde36 corrections
arg@mig29
parents: 643
diff changeset
1 /* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
2 * See LICENSE file for license details.
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
3 */
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
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
bda4880c462d with this patch everything works fine for me
arg@mig29
parents: 616
diff changeset
7 #include <locale.h>
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
8 #include <stdio.h>
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
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
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
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
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
15 #include <X11/Xatom.h>
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
16 #include <X11/Xproto.h>
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
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];
333
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
21 Bool *seltag;
697
4d12382fef8e removed unnecessary bx, by, bw variables
Anselm R. Garbe <arg@suckless.org>
parents: 689
diff changeset
22 int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
650
f3b8c71a69d4 experimental version which allows master clients being increased/decreased
Anselm R. Garbe <arg@suckless.org>
parents: 645
diff changeset
23 unsigned int master, nmaster, 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
24 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
25 Bool running = True;
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
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
36
123
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
37 static int (*xerrorxlib)(Display *, XErrorEvent *);
302
3b11e32e8d7e we close stdin as well
Anselm R.Garbe <arg@10ksloc.org>
parents: 295
diff changeset
38 static Bool otherwm, readin;
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
39
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
40 static void
487
be4f90c03582 applied Jukkas patch
arg@mmvi
parents: 473
diff changeset
41 cleanup(void) {
302
3b11e32e8d7e we close stdin as well
Anselm R.Garbe <arg@10ksloc.org>
parents: 295
diff changeset
42 close(STDIN_FILENO);
645
8e6d75c68b69 changed arg's color scheme
arg@mig29
parents: 644
diff changeset
43 while(stack) {
708
a2d568a5cdb8 applied Sanders all5.patch (thanks for your weekend session, Sander!)
Anselm R. Garbe <arg@suckless.org>
parents: 697
diff changeset
44 resize(stack, True);
645
8e6d75c68b69 changed arg's color scheme
arg@mig29
parents: 644
diff changeset
45 unmanage(stack);
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
46 }
295
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
47 if(dc.font.set)
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
48 XFreeFontSet(dpy, dc.font.set);
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
49 else
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
50 XFreeFont(dpy, dc.font.xfont);
292
4aa632b6ba66 changed main event loop
Anselm R.Garbe <arg@10ksloc.org>
parents: 291
diff changeset
51 XUngrabKey(dpy, AnyKey, AnyModifier, root);
295
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
52 XFreePixmap(dpy, dc.drawable);
7565875d07d3 extended cleanup
Anselm R.Garbe <arg@10ksloc.org>
parents: 293
diff changeset
53 XFreeGC(dpy, dc.gc);
309
204427dcc087 corrected order of cleanup code
Anselm R.Garbe <arg@10ksloc.org>
parents: 302
diff changeset
54 XDestroyWindow(dpy, barwin);
616
f617c75a8405 improved the memory leak prevention
arg@mig29
parents: 583
diff changeset
55 XFreeCursor(dpy, cursor[CurNormal]);
f617c75a8405 improved the memory leak prevention
arg@mig29
parents: 583
diff changeset
56 XFreeCursor(dpy, cursor[CurResize]);
f617c75a8405 improved the memory leak prevention
arg@mig29
parents: 583
diff changeset
57 XFreeCursor(dpy, cursor[CurMove]);
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
58 XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
292
4aa632b6ba66 changed main event loop
Anselm R.Garbe <arg@10ksloc.org>
parents: 291
diff changeset
59 XSync(dpy, False);
433
a6b8994af164 small fix
Anselm R. Garbe <arg@10kloc.org>
parents: 400
diff changeset
60 free(seltag);
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
61 }
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
62
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
63 static void
487
be4f90c03582 applied Jukkas patch
arg@mmvi
parents: 473
diff changeset
64 scan(void) {
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
65 unsigned int i, num;
123
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
66 Window *wins, d1, d2;
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
67 XWindowAttributes wa;
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
68
292
4aa632b6ba66 changed main event loop
Anselm R.Garbe <arg@10ksloc.org>
parents: 291
diff changeset
69 wins = NULL;
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
70 if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
71 for(i = 0; i < num; i++) {
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
72 if(!XGetWindowAttributes(dpy, wins[i], &wa))
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
73 continue;
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
74 if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
75 continue;
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
76 if(wa.map_state == IsViewable)
10
703255003abb changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents: 9
diff changeset
77 manage(wins[i], &wa);
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
78 }
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
79 }
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
80 if(wins)
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
81 XFree(wins);
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
82 }
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
83
333
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
84 static void
487
be4f90c03582 applied Jukkas patch
arg@mmvi
parents: 473
diff changeset
85 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
86 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
87 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
88 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
89 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
90 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
91
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
92 /* 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
93 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
94 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
95 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
96 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
97 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
98 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
99 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
100 /* 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
101 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
102 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
103 cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
104 /* init modifier map */
679
5f0134b88b8d small fix of initial numlockmask value
Anselm R. Garbe <arg@suckless.org>
parents: 675
diff changeset
105 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
106 modmap = XGetModifierMapping(dpy);
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
107 for (i = 0; i < 8; i++) {
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
108 for (j = 0; j < modmap->max_keypermod; j++) {
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
109 if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
110 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
111 }
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
112 }
616
f617c75a8405 improved the memory leak prevention
arg@mig29
parents: 583
diff changeset
113 XFreeModifiermap(modmap);
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
114 /* 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
115 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
116 | 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
117 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
118 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
119 grabkeys();
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
120 initrregs();
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
121 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
122 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
123 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
124 /* style */
689
cbec08a54a15 implemented new color scheme accordingly to Sanders proposal
Anselm R. Garbe <arg@suckless.org>
parents: 688
diff changeset
125 dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
353
8a06efe5b563 new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents: 352
diff changeset
126 dc.norm[ColBG] = getcolor(NORMBGCOLOR);
8a06efe5b563 new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents: 352
diff changeset
127 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
128 dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
353
8a06efe5b563 new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents: 352
diff changeset
129 dc.sel[ColBG] = getcolor(SELBGCOLOR);
8a06efe5b563 new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents: 352
diff changeset
130 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
131 setfont(FONT);
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
132 /* 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
133 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
134 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
135 sh = DisplayHeight(dpy, screen);
524
1a9a0877650c keep master ratio on resizecol -> arrange
Anselm R. Garbe <arg@10kloc.org>
parents: 516
diff changeset
136 master = MASTER;
650
f3b8c71a69d4 experimental version which allows master clients being increased/decreased
Anselm R. Garbe <arg@suckless.org>
parents: 645
diff changeset
137 nmaster = NMASTER;
688
39fa5308d73f removed mode label stuff
Anselm R. Garbe <arg@suckless.org>
parents: 679
diff changeset
138 bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
139 /* bar */
353
8a06efe5b563 new color stuff/new rendering stuff
Anselm R. Garbe <arg@10kloc.org>
parents: 352
diff changeset
140 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
141 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
142 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
143 wa.event_mask = ButtonPressMask | ExposureMask;
697
4d12382fef8e removed unnecessary bx, by, bw variables
Anselm R. Garbe <arg@suckless.org>
parents: 689
diff changeset
144 barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(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
145 CopyFromParent, DefaultVisual(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
146 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
147 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
148 XMapRaised(dpy, barwin);
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
149 strcpy(stext, "dwm-"VERSION);
565
fe766305eed1 applied Gottox' windowarea patch
arg@mig29
parents: 532
diff changeset
150 /* windowarea */
fe766305eed1 applied Gottox' windowarea patch
arg@mig29
parents: 532
diff changeset
151 wax = sx;
570
f05cfa7d5128 applied Gottox patches
arg@mig29
parents: 565
diff changeset
152 way = sy + bh;
565
fe766305eed1 applied Gottox' windowarea patch
arg@mig29
parents: 532
diff changeset
153 wah = sh - bh;
fe766305eed1 applied Gottox' windowarea patch
arg@mig29
parents: 532
diff changeset
154 waw = sw;
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
155 /* 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
156 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
157 dc.gc = XCreateGC(dpy, root, 0, 0);
344
93192711a36a changing tag indicator through underline
Anselm R. Garbe <arg@10kloc.org>
parents: 339
diff changeset
158 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
159 /* multihead support */
716
4ce65f61f01b renamed activescreen into selscreen
Anselm R. Garbe <arg@suckless.org>
parents: 714
diff changeset
160 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
161 }
827f8f6c9e97 separated setup stuff into main.c:setup() - this makes main() more readable
Anselm R. Garbe <arg@10kloc.org>
parents: 329
diff changeset
162
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
163 /*
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
164 * 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
165 * is already running.
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
166 */
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
167 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
168 xerrorstart(Display *dsply, XErrorEvent *ee) {
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
169 otherwm = True;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
170 return -1;
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
171 }
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
172
84
052fe7498930 ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents: 79
diff changeset
173 /* extern */
052fe7498930 ordered variables in structs and source files alphabetically
Anselm R. Garbe <garbeam@wmii.de>
parents: 79
diff changeset
174
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
175 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
176 getproto(Window w) {
329
cea0c98495bc rearranged getproto
Anselm R. Garbe <arg@10kloc.org>
parents: 328
diff changeset
177 int i, format, protos, status;
328
083f1f3e1e93 removed winprop (merged into getproto)
Anselm R. Garbe <arg@10kloc.org>
parents: 326
diff changeset
178 unsigned long extra, res;
083f1f3e1e93 removed winprop (merged into getproto)
Anselm R. Garbe <arg@10kloc.org>
parents: 326
diff changeset
179 Atom *protocols, real;
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
180
329
cea0c98495bc rearranged getproto
Anselm R. Garbe <arg@10kloc.org>
parents: 328
diff changeset
181 protos = 0;
cea0c98495bc rearranged getproto
Anselm R. Garbe <arg@10kloc.org>
parents: 328
diff changeset
182 status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False,
cea0c98495bc rearranged getproto
Anselm R. Garbe <arg@10kloc.org>
parents: 328
diff changeset
183 XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols);
328
083f1f3e1e93 removed winprop (merged into getproto)
Anselm R. Garbe <arg@10kloc.org>
parents: 326
diff changeset
184 if(status != Success || protocols == 0)
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
185 return protos;
329
cea0c98495bc rearranged getproto
Anselm R. Garbe <arg@10kloc.org>
parents: 328
diff changeset
186 for(i = 0; i < res; i++)
77
38c8f7f7d401 sanitized other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 76
diff changeset
187 if(protocols[i] == wmatom[WMDelete])
157
93012e947eae renamed WM_PROTOCOL_DELWIN into PROTODELWIN
arg@10ksloc.org
parents: 146
diff changeset
188 protos |= PROTODELWIN;
328
083f1f3e1e93 removed winprop (merged into getproto)
Anselm R. Garbe <arg@10kloc.org>
parents: 326
diff changeset
189 free(protocols);
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
190 return protos;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
191 }
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
192
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
193 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
194 sendevent(Window w, Atom a, long value) {
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
195 XEvent e;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
196
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
197 e.type = ClientMessage;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
198 e.xclient.window = w;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
199 e.xclient.message_type = a;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
200 e.xclient.format = 32;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
201 e.xclient.data.l[0] = value;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
202 e.xclient.data.l[1] = CurrentTime;
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
203 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
204 XSync(dpy, False);
13
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
205 }
5cc5e55a132d added protocol killing stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 10
diff changeset
206
76
4bd49f404f10 proceeded with cleaning up, sorting functions, etc
Anselm R. Garbe <garbeam@wmii.de>
parents: 75
diff changeset
207 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
208 quit(Arg *arg) {
302
3b11e32e8d7e we close stdin as well
Anselm R.Garbe <arg@10ksloc.org>
parents: 295
diff changeset
209 readin = running = False;
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
210 }
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
211
532
651f2c868b31 code polishing, removed unnecessary newlines
Anselm R. Garbe <arg@10kloc.org>
parents: 530
diff changeset
212 /* 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
213 * 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
214 * default error handler, which may call exit.
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
215 */
10
703255003abb changed how manage client works
Anselm R. Garbe <garbeam@wmii.de>
parents: 9
diff changeset
216 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
217 xerror(Display *dpy, XErrorEvent *ee) {
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
218 if(ee->error_code == BadWindow
123
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
219 || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
220 || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
221 || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
222 || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
223 || (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
224 || (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
225 || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
226 return 0;
34
cd30cce52b78 added logo+description
Anselm R. Garbe <garbeam@wmii.de>
parents: 33
diff changeset
227 fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
123
61490330e90a cleaned up code
arg@10ksloc.org
parents: 99
diff changeset
228 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
229 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
230 }
f96fb3fd8203 added grid mode on Mod1Mask g
Anselm R. Garbe <garbeam@wmii.de>
parents: 26
diff changeset
231
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
232 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
233 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
234 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
235 int r, xfd;
59
5d4653de9a1c implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents: 58
diff changeset
236 fd_set rd;
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
237
137
77922a389fa8 simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents: 126
diff changeset
238 if(argc == 2 && !strncmp("-v", argv[1], 3)) {
644
1ed8c40dde36 corrections
arg@mig29
parents: 643
diff changeset
239 fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
137
77922a389fa8 simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents: 126
diff changeset
240 exit(EXIT_SUCCESS);
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
241 }
137
77922a389fa8 simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents: 126
diff changeset
242 else if(argc != 1)
77922a389fa8 simplified main.c, switching back to single urxvt usage
arg@10ksloc.org
parents: 126
diff changeset
243 eprint("usage: dwm [-v]\n");
619
bda4880c462d with this patch everything works fine for me
arg@mig29
parents: 616
diff changeset
244 setlocale(LC_CTYPE, "");
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
245 dpy = XOpenDisplay(0);
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
246 if(!dpy)
197
c13f374f836c slight fix
arg@10ksloc.org
parents: 191
diff changeset
247 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
248 xfd = ConnectionNumber(dpy);
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
249 screen = DefaultScreen(dpy);
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
250 root = RootWindow(dpy, screen);
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
251 otherwm = False;
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
252 XSetErrorHandler(xerrorstart);
197
c13f374f836c slight fix
arg@10ksloc.org
parents: 191
diff changeset
253 /* this causes an error if some other window manager is running */
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
254 XSelectInput(dpy, root, SubstructureRedirectMask);
78
0d71fb80b592 changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents: 77
diff changeset
255 XSync(dpy, False);
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
256 if(otherwm)
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
257 eprint("dwm: another window manager is already running\n");
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
258
292
4aa632b6ba66 changed main event loop
Anselm R.Garbe <arg@10ksloc.org>
parents: 291
diff changeset
259 XSync(dpy, False);
78
0d71fb80b592 changing XFlush into XSync
Anselm R. Garbe <garbeam@wmii.de>
parents: 77
diff changeset
260 XSetErrorHandler(NULL);
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
261 xerrorxlib = XSetErrorHandler(xerror);
275
425cd4490c1e some other small fixes
Anselm R.Garbe <arg@10ksloc.org>
parents: 274
diff changeset
262 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
263 setup();
74
5370ef170cc9 sanitized names
Anselm R. Garbe <garbeam@wmii.de>
parents: 73
diff changeset
264 drawstatus();
75
f08271b7cb20 rearranged several stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 74
diff changeset
265 scan();
3
e969f3575b7a several new changes, made gridmenu working
Anselm R. Garbe <garbeam@wmii.de>
parents: 2
diff changeset
266
214
51ac019cf587 small fix of a comment
arg@10ksloc.org
parents: 203
diff changeset
267 /* main event loop, also reads status text from stdin */
242
cd15de32e173 prepared 0.8
Anselm R.Garbe <arg@10ksloc.org>
parents: 237
diff changeset
268 XSync(dpy, False);
292
4aa632b6ba66 changed main event loop
Anselm R.Garbe <arg@10ksloc.org>
parents: 291
diff changeset
269 procevent();
302
3b11e32e8d7e we close stdin as well
Anselm R.Garbe <arg@10ksloc.org>
parents: 295
diff changeset
270 readin = True;
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
271 while(running) {
59
5d4653de9a1c implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents: 58
diff changeset
272 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
273 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
274 FD_SET(STDIN_FILENO, &rd);
265
573b1c4a71a4 reducing ConnectionNumber calls to a bare minimum
Anselm R.Garbe <arg@10ksloc.org>
parents: 262
diff changeset
275 FD_SET(xfd, &rd);
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
276 if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
277 if(errno == EINTR)
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
278 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
279 eprint("select failed\n");
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
280 }
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
281 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
282 switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
283 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
284 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
285 stext[sizeof stext - 1] = '\0';
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
286 readin = False;
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
287 break;
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
288 case 0:
583
f4285a97e3e6 applied Jukka's patch preventing some cornercases and making the EOF error message correct
arg@mig29
parents: 582
diff changeset
289 strncpy(stext, "EOF", 4);
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
290 readin = False;
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
291 break;
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
292 default:
582
70472540c443 applied yet another proposal of Manuel
arg@mig29
parents: 581
diff changeset
293 for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
70472540c443 applied yet another proposal of Manuel
arg@mig29
parents: 581
diff changeset
294 for(p = stext + strlen(stext) - 1; 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
295 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
296 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
297 }
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
298 drawstatus();
59
5d4653de9a1c implemented dwm reading status text from stdin
Anselm R. Garbe <garbeam@wmii.de>
parents: 58
diff changeset
299 }
578
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
300 if(FD_ISSET(xfd, &rd))
8cb54d02a5b6 applied Manuels patch (thanks to Manuel!)
arg@mig29
parents: 570
diff changeset
301 procevent();
5
e5018cae273f added several other stuff
Anselm R. Garbe <garbeam@wmii.de>
parents: 3
diff changeset
302 }
0
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
303 cleanup();
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
304 XCloseDisplay(dpy);
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
305 return 0;
491f34c11291 initial import
Anselm R. Garbe <garbeam@wmii.de>
parents:
diff changeset
306 }