Permalink
Browse files

pull all non-X11 headers from calmwm.h and place them only where they

are required.

encourged to go all the way by oga@
  • Loading branch information...
1 parent 09a2d7f commit ccb207a8a8d95d9673614727a5f60facdf57b275 okan committed Dec 15, 2009
Showing with 151 additions and 13 deletions.
  1. +10 −0 calmwm.c
  2. +0 −13 calmwm.h
  3. +9 −0 client.c
  4. +11 −0 conf.c
  5. +10 −0 font.c
  6. +9 −0 group.c
  7. +10 −0 input.c
  8. +9 −0 kbfunc.c
  9. +10 −0 menu.c
  10. +10 −0 mousefunc.c
  11. +4 −0 parse.y
  12. +10 −0 screen.c
  13. +9 −0 search.c
  14. +10 −0 util.c
  15. +10 −0 xevents.c
  16. +10 −0 xmalloc.c
  17. +10 −0 xutil.c
View
@@ -18,8 +18,18 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
#include <getopt.h>
#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "calmwm.h"
View
@@ -21,19 +21,6 @@
#ifndef _CALMWM_H_
#define _CALMWM_H_
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-
#include <X11/Xatom.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>
View
@@ -18,7 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "calmwm.h"
View
11 conf.c
@@ -18,6 +18,17 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
#ifndef timespeccmp
View
10 font.c
@@ -16,6 +16,16 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
int
View
@@ -19,7 +19,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "calmwm.h"
View
10 input.c
@@ -18,6 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
int
View
@@ -18,8 +18,17 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
#include <dirent.h>
+#include <err.h>
+#include <errno.h>
#include <paths.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "calmwm.h"
View
10 menu.c
@@ -15,6 +15,16 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
#define PROMPT_SCHAR '»'
View
@@ -19,6 +19,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
static int mousefunc_sweep_calc(struct client_ctx *, int, int, int, int);
View
@@ -21,7 +21,11 @@
%{
+#include <sys/param.h>
+#include <sys/queue.h>
+
#include <ctype.h>
+#include <err.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
View
@@ -18,6 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
struct screen_ctx *
View
@@ -17,8 +17,17 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
#include <assert.h>
+#include <err.h>
+#include <errno.h>
#include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
#include "calmwm.h"
View
10 util.c
@@ -18,6 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
#define MAXARGLEN 20
View
@@ -24,6 +24,16 @@
* management of the xevent's.
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
static void xev_handle_maprequest(XEvent *);
View
@@ -18,6 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
void *
View
10 xutil.c
@@ -18,6 +18,16 @@
* $Id$
*/
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
#include "calmwm.h"
static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };

0 comments on commit ccb207a

Please sign in to comment.