From: Reginald Kennedy <rk@rejii.com>
Date: Fri, 13 Jul 2012 23:32:05 +0000 (+0800)
Subject: Fix linux Makefile.
X-Git-Tag: SPECTRWM_1_2_0~132
X-Git-Url: https://code.delx.au/spectrwm/commitdiff_plain/e5e36a7e1d7392fa3c18dee9166d0f48fce7403f

Fix linux Makefile.

Some whitespace.
---

diff --git a/linux/Makefile b/linux/Makefile
index a31b77d..a2667b1 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,6 +1,6 @@
 CFLAGS+= -Wall -g -D_GNU_SOURCE -I.
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
-LDADD+= -lX11 -lXrandr -lXtst -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms
+LDADD+= -lX11 -lXrandr -lXtst -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util
 
 PREFIX?= /usr/local
 BINDIR?= $(PREFIX)/bin
diff --git a/spectrwm.c b/spectrwm.c
index f22f18a..ae94249 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -3080,7 +3080,7 @@ cycle_layout(struct swm_region *r, union arg *args)
 		ws->cur_layout = &layouts[0];
 
 	stack();
-	
+
 	a.id = SWM_ARG_ID_FOCUSCUR;
 
 	focus(r, &a);
@@ -3726,7 +3726,7 @@ iconify(struct swm_region *r, union arg *args)
 	unmap_window(r->ws->focus);
 	update_iconic(r->ws->focus, 1);
 	stack();
-	
+
 	r->ws->focus = NULL;
 	a.id = SWM_ARG_ID_FOCUSCUR;
 	focus(r, &a);
@@ -4439,7 +4439,7 @@ resize(struct ws_win *win, union arg *args)
 			break;
 		}
 		free(evt);
-	} 
+	}
 	if (time) {
 		do_sync();
 		update_window(win);
@@ -4564,10 +4564,10 @@ move(struct ws_win *win, union arg *args)
 
 	buttonrelease = 0;
 	while ((evt = xcb_poll_for_event(conn)) && buttonrelease != 1) {
-		/*	
+		/*
 		XMaskEvent(display, MOUSEMASK | ExposureMask |
 		    SubstructureRedirectMask, &ev);
-		*/	
+		*/
 		switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
 		case XCB_BUTTON_RELEASE:
 			buttonrelease = 1;
@@ -7422,7 +7422,7 @@ screenchange(xcb_randr_screen_change_notify_event_t *e)
 	else
 		xcb_randr_set_screen_size(conn, e->root, e->width,
 			e->height, e->mwidth, e->mheight);
-	
+
 	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
 	/* silly event doesn't include the screen index */
 	for (i = 0; i < num_screens; i++)
@@ -7651,7 +7651,7 @@ void
 event_handle(xcb_generic_event_t *evt)
 {
 	uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
-	
+
 	if (type == 0)
 	{
 		/* XXX - handle error */
@@ -7677,7 +7677,7 @@ event_handle(xcb_generic_event_t *evt)
 	EVENT(XCB_UNMAP_NOTIFY, unmapnotify);
 	EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);
 #undef EVENT
-	}	
+	}
 	if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)
 		screenchange((void *)evt);
 }
@@ -7756,12 +7756,12 @@ main(int argc, char *argv[])
 			event_handle(evt);
 		free(evt);
 	}
-	
+
 	if (active_wm())
 		errx(1, "other wm running");
 
 	xcb_aux_sync(conn);
-	
+
 	setup_globals();
 	setup_screens();
 	setup_keys();