remove LAYOUT_PROTO, use a LayoutArrange typedef

awesome-client-common.c

@@ -20,6 +20,7 @@
  *
  */
 
+#include <stdio.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 

awesome-client.c

@@ -22,6 +22,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 

common.h

@@ -1,31 +0,0 @@
-/*
- * common.h - common defines
- *
- * Copyright © 2007 Julien Danjou <julien@danjou.info>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef AWESOME_COMMON_H
-#define AWESOME_COMMON_H
-
-#include "config.h"
-
-/** Common prototype definition for layouts function */
-#define LAYOUT_PROTO(name)         void name(int)
-
-#endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

draw.h

@@ -22,6 +22,9 @@
 #ifndef AWESOME_DRAW_H
 #define AWESOME_DRAW_H
 
+#include <X11/Xlib.h>
+#include <X11/Xft/Xft.h>
+
 typedef struct
 {
     /* Co-ords of upper left corner */

layout.h

@@ -27,6 +27,8 @@
 
 #define AWESOMEPROPS_ATOM(disp)                    XInternAtom(disp, "_AWESOME_PROPERTIES", False)
 
+typedef void (LayoutArrange)(int);
+
 void arrange(int);
 void restack(int);
 void loadawesomeprops(int);

layouts/fibonacci.h

@@ -22,10 +22,10 @@
 #ifndef AWESOME_FIBONACCI_H
 #define AWESOME_FIBONACCI_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_spiral);
+LayoutArrange layout_spiral;
-LAYOUT_PROTO(layout_dwindle);
+LayoutArrange layout_dwindle;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

layouts/floating.h

@@ -23,9 +23,9 @@
 #ifndef AWESOME_FLOATING_H
 #define AWESOME_FLOATING_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_floating);
+LayoutArrange layout_floating;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

layouts/max.h

@@ -22,9 +22,9 @@
 #ifndef AWESOME_MAX_H
 #define AWESOME_MAX_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_max);
+LayoutArrange layout_max;
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

layouts/tile.h

@@ -23,10 +23,10 @@
 #ifndef AWESOME_TILE_H
 #define AWESOME_TILE_H
 
-#include "common.h"
+#include "layout.h"
 
-LAYOUT_PROTO(layout_tile);
+LayoutArrange layout_tile;
-LAYOUT_PROTO(layout_tileleft);
+LayoutArrange layout_tileleft;
 
 Uicb uicb_tag_setnmaster;
 Uicb uicb_tag_setncol;

util.h

@@ -25,7 +25,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "common.h"
 
 /** Link a name to a function */
 typedef struct

window.c

@@ -22,6 +22,7 @@
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h> 
 
+#include "config.h"
 #include "window.h"
 #include "util.h"
 

xutil.h

@@ -22,7 +22,6 @@
 #ifndef AWESOME_XUTIL_H
 #define AWESOME_XUTIL_H
 
-#include "common.h"
 #include "screen.h"
 
 Bool xgettextprop(Display *, Window, Atom, char *, ssize_t);