git.stevedylan.dev

renamed setfont to initfont, getcolor to initcolor d180ba41

Anselm R. Garbe · 2007-02-20 13:56 1 file(s) · +29 −29

main.c +29 −29

}

static unsigned long
getcolor(const char *colstr) {
initcolor(const char *colstr) {
	Colormap cmap = DefaultColormap(dpy, screen);
	XColor color;


}

static void
scan(void) {
	unsigned int i, num;
	Window *wins, d1, d2;
	XWindowAttributes wa;

	wins = NULL;
	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
		for(i = 0; i < num; i++) {
			if(!XGetWindowAttributes(dpy, wins[i], &wa)
			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
				continue;
			if(wa.map_state == IsViewable)
				manage(wins[i], &wa);
		}
	}
	if(wins)
		XFree(wins);
}

static void
setfont(const char *fontstr) {
initfont(const char *fontstr) {
	char *def, **missing;
	int i, n;


}

static void
scan(void) {
	unsigned int i, num;
	Window *wins, d1, d2;
	XWindowAttributes wa;

	wins = NULL;
	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
		for(i = 0; i < num; i++) {
			if(!XGetWindowAttributes(dpy, wins[i], &wa)
			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
				continue;
			if(wa.map_state == IsViewable)
				manage(wins[i], &wa);
		}
	}
	if(wins)
		XFree(wins);
}

static void
setup(void) {
	int i, j;
	unsigned int mask;

	seltag = emallocz(sizeof(Bool) * ntags);
	seltag[0] = True;
	/* style */
	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
	dc.sel[ColBG] = getcolor(SELBGCOLOR);
	dc.sel[ColFG] = getcolor(SELFGCOLOR);
	setfont(FONT);
	dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
	dc.norm[ColBG] = initcolor(NORMBGCOLOR);
	dc.norm[ColFG] = initcolor(NORMFGCOLOR);
	dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
	dc.sel[ColBG] = initcolor(SELBGCOLOR);
	dc.sel[ColFG] = initcolor(SELFGCOLOR);
	initfont(FONT);
	/* geometry */
	sx = sy = 0;
	sw = DisplayWidth(dpy, screen);

62	62		}
63	63
64	64		static unsigned long
65		-	getcolor(const char *colstr) {
	65	+	initcolor(const char *colstr) {
66	66		Colormap cmap = DefaultColormap(dpy, screen);
67	67		XColor color;
68	68

72	72		}
73	73
74	74		static void
75		-	scan(void) {
76		-	unsigned int i, num;
77		-	Window *wins, d1, d2;
78		-	XWindowAttributes wa;
79		-
80		-	wins = NULL;
81		-	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
82		-	for(i = 0; i < num; i++) {
83		-	if(!XGetWindowAttributes(dpy, wins[i], &wa)
84		-	\|\| wa.override_redirect \|\| XGetTransientForHint(dpy, wins[i], &d1))
85		-	continue;
86		-	if(wa.map_state == IsViewable)
87		-	manage(wins[i], &wa);
88		-	}
89		-	}
90		-	if(wins)
91		-	XFree(wins);
92		-	}
93		-
94		-	static void
95		-	setfont(const char *fontstr) {
	75	+	initfont(const char *fontstr) {
96	76		char def, *missing;
97	77		int i, n;
98	78

133	113		}
134	114
135	115		static void
	116	+	scan(void) {
	117	+	unsigned int i, num;
	118	+	Window *wins, d1, d2;
	119	+	XWindowAttributes wa;
	120	+
	121	+	wins = NULL;
	122	+	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
	123	+	for(i = 0; i < num; i++) {
	124	+	if(!XGetWindowAttributes(dpy, wins[i], &wa)
	125	+	\|\| wa.override_redirect \|\| XGetTransientForHint(dpy, wins[i], &d1))
	126	+	continue;
	127	+	if(wa.map_state == IsViewable)
	128	+	manage(wins[i], &wa);
	129	+	}
	130	+	}
	131	+	if(wins)
	132	+	XFree(wins);
	133	+	}
	134	+
	135	+	static void
136	136		setup(void) {
137	137		int i, j;
138	138		unsigned int mask;

173	173		seltag = emallocz(sizeof(Bool) * ntags);
174	174		seltag[0] = True;
175	175		/* style */
176		-	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
177		-	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
178		-	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
179		-	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
180		-	dc.sel[ColBG] = getcolor(SELBGCOLOR);
181		-	dc.sel[ColFG] = getcolor(SELFGCOLOR);
182		-	setfont(FONT);
	176	+	dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
	177	+	dc.norm[ColBG] = initcolor(NORMBGCOLOR);
	178	+	dc.norm[ColFG] = initcolor(NORMFGCOLOR);
	179	+	dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
	180	+	dc.sel[ColBG] = initcolor(SELBGCOLOR);
	181	+	dc.sel[ColFG] = initcolor(SELFGCOLOR);
	182	+	initfont(FONT);
183	183		/* geometry */
184	184		sx = sy = 0;
185	185		sw = DisplayWidth(dpy, screen);