Commit 45b2b45

nsxiv45b2b45

Small refactorings

Author: Bert
Date: 2011-01-17 20:14 +0100
Parent: 75b143a
Commit: 45b2b45285db636ece8fbb24890bd53d753e4eeb

+15 −9

3 files changed

Browse files Patch

−Context 3+

M app.c +1 −1
M events.c +2 −2
M window.c +12 −6

M app.c View

M events.c View

M window.c View

		@@ -22,7 +22,7 @@
22	22		#include "app.h"
23	23
24	24		void app_init(app_t *app) {
25		−	if (app == NULL)
	25	+	if (!app)
26	26		return;
27	27
28	28		app->fileidx = 0;

		@@ -30,7 +30,7 @@ void on_expose(app_t app, XEvent ev) {
30	30		}
31	31
32	32		void on_configurenotify(app_t app, XEvent ev) {
33		−	if (app == NULL \|\| ev == NULL)
	33	+	if (!app \|\| !ev)
34	34		return;
35	35
36	36		win_configure(&app->win, &ev->xconfigure);
		@@ -40,7 +40,7 @@ void on_keypress(app_t app, XEvent ev) {
40	40		KeySym keysym;
41	41		XKeyEvent *kev;
42	42
43		−	if (app == NULL \|\| ev == NULL)
	43	+	if (!app \|\| !ev)
44	44		return;
45	45
46	46		kev = &ev->xkey;

		@@ -27,6 +27,9 @@
27	27		Display *dpy;
28	28		int scr;
29	29		int scrw, scrh;
	30	+	Visual *vis;
	31	+	Colormap cmap;
	32	+	int depth;
30	33		GC gc;
31	34		XColor bgcol;
32	35
		@@ -35,7 +38,7 @@ void win_open(win_t *win) {
35	38		XSetWindowAttributes attr;
36	39		unsigned long mask;
37	40
38		−	if (win == NULL)
	41	+	if (!win)
39	42		return;
40	43
41	44		if (!(dpy = XOpenDisplay(NULL)))
		@@ -45,6 +48,10 @@ void win_open(win_t *win) {
45	48		scrw = DisplayWidth(dpy, scr);
46	49		scrh = DisplayHeight(dpy, scr);
47	50
	51	+	vis = DefaultVisual(dpy, scr);
	52	+	cmap = DefaultColormap(dpy, scr);
	53	+	depth = DefaultDepth(dpy, scr);
	54	+
48	55		if (!XAllocNamedColor(dpy, DefaultColormap(dpy, scr), BG_COLOR,
49	56		&bgcol, &bgcol))
50	57		FATAL("could not allocate color: %s", BG_COLOR);
		@@ -61,9 +68,8 @@ void win_open(win_t *win) {
61	68		attr.save_under = False;
62	69		mask = CWBackingStore \| CWBackPixel \| CWSaveUnder;
63	70
64		−	win->xwin = XCreateWindow(dpy, RootWindow(dpy, scr),
65		−	win->x, win->y, win->w, win->h, 0, DefaultDepth(dpy, scr), InputOutput,
66		−	DefaultVisual(dpy, scr), mask, &attr);
	71	+	win->xwin = XCreateWindow(dpy, RootWindow(dpy, scr), win->x, win->y,
	72	+	win->w, win->h, 0, depth, InputOutput, vis, mask, &attr);
67	73		if (win->xwin == None)
68	74		FATAL("could not create window");
69	75
		@@ -84,7 +90,7 @@ void win_open(win_t *win) {
84	90		}
85	91
86	92		void win_close(win_t *win) {
87		−	if (win == NULL)
	93	+	if (!win)
88	94		return;
89	95
90	96		XDestroyWindow(dpy, win->xwin);
		@@ -95,7 +101,7 @@ void win_close(win_t *win) {
95	101		int win_configure(win_t win, XConfigureEvent cev) {
96	102		int changed;
97	103
98		−	if (win == NULL)
	104	+	if (!win)
99	105		return 0;
100	106
101	107		changed = win->x != cev->x \|\| win->y != cev->y \|\|

nsxiv/45b2b45

Small refactorings

nsxiv45b2b45