about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--bar.c13
-rw-r--r--config.h14
-rw-r--r--dwm.h1
-rw-r--r--main.c1
4 files changed, 14 insertions, 15 deletions
diff --git a/bar.c b/bar.c
index 9e3c386..91689cf 100644
--- a/bar.c
+++ b/bar.c
@@ -69,7 +69,8 @@ initfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+		|| !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
@@ -186,9 +187,7 @@ drawbar(void) {
 }
 
 void
-initbar(void) {
-	XSetWindowAttributes wa;
-
+initstyle(void) {
 	dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = initcolor(NORMBGCOLOR);
 	dc.norm[ColFG] = initcolor(NORMFGCOLOR);
@@ -197,6 +196,12 @@ initbar(void) {
 	dc.sel[ColFG] = initcolor(SELFGCOLOR);
 	initfont(FONT);
 	dc.h = bh = dc.font.height + 2;
+}
+
+void
+initbar(void) {
+	XSetWindowAttributes wa;
+
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask | ExposureMask;
diff --git a/config.h b/config.h
index cf24e67..f946407 100644
--- a/config.h
+++ b/config.h
@@ -4,19 +4,11 @@
 #define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
 #define FONT			"-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
-#define DARK /* LIGHT */
-#ifdef DARK
-#define NORMBORDERCOLOR		"#222"
+#define NORMBORDERCOLOR		"#333"
 #define NORMBGCOLOR		"#000"
-#define NORMFGCOLOR		"#ddd"
-#define SELBORDERCOLOR		"#09f"
-#else
-#define NORMBORDERCOLOR		"#666"
-#define NORMBGCOLOR		"#eee"
-#define NORMFGCOLOR		"#222"
+#define NORMFGCOLOR		"#ccc"
 #define SELBORDERCOLOR		"#f00"
-#endif
-#define SELBGCOLOR		"#369"
+#define SELBGCOLOR		"#00f"
 #define SELFGCOLOR		"#fff"
 
 /* tagging */
diff --git a/dwm.h b/dwm.h
index 6ab6bc3..8c9a141 100644
--- a/dwm.h
+++ b/dwm.h
@@ -91,6 +91,7 @@ extern Window root, barwin;
 /* bar.c */
 void drawbar(void);			/* draw the bar */
 void initbar(void);			/* initializes the bar */
+void initstyle(void);			/* initializes colors and font */
 unsigned int textw(const char *text);	/* return the width of text in px*/
 void togglebar(const char *arg);	/* shows/hides the bar */
 void updatebarpos(void);		/* updates the bar position */
diff --git a/main.c b/main.c
index de38cbc..1e1ad4c 100644
--- a/main.c
+++ b/main.c
@@ -148,6 +148,7 @@ setup(void) {
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
+	initstyle();
 	initlayouts();
 	initbar();
 	/* multihead support */
mitter Kartik K. Agaram <vc@akkartik.com> 2016-09-09 18:32:52 -0700 3309' href='/akkartik/mu/commit/031merge.cc?h=hlt&id=af023b323bb6fdb09851cb673401fca2abe983b6'>af023b32 ^
02909fec ^
2b250717 ^
02909fec ^













2b250717 ^
02909fec ^


5c0e5492 ^
af023b32 ^


02909fec ^




3473c63a ^
02909fec ^




b55b15a9 ^
02909fec ^


2b250717 ^
02909fec ^











1211a3ab ^
02909fec ^

2b250717 ^
9dcbec39 ^

02909fec ^







2b250717 ^
02909fec ^


b55b15a9 ^
02909fec ^






49620728 ^

b55b15a9 ^



02909fec ^


192d59d3 ^
02909fec ^
192d59d3 ^
02909fec ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227