Header file tweaks.

SVN revision: 34103

src/E.h

@@ -37,8 +37,7 @@
 
 #define USE_EXT_INIT_WIN 1
 
-#include <X11/Xlib.h>
-#include <X11/extensions/shape.h>
+#include <X11/X.h>
 
 #ifdef HAVE_SM
 #define USE_SM 1

src/aclass.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 #ifndef _ACLASS_H
 #define _ACLASS_H
 
+#include <X11/Xlib.h>
 #include "etypes.h"
 
 /* aclass.c */

src/borders.h

@@ -24,6 +24,7 @@
 #ifndef _BORDERS_H_
 #define _BORDERS_H_
 
+#include <X11/Xlib.h>
 #include "eimage.h"
 #include "etypes.h"
 

src/buttons.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 #ifndef _BUTTONS_H_
 #define _BUTTONS_H_
 
+#include <X11/Xlib.h>
 #include "eobj.h"
 #include "etypes.h"
 

src/container.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 #ifndef _CONTAINER_H_
 #define _CONTAINER_H_
 
+#include <X11/Xlib.h>
 #include "eimage.h"
 
 typedef struct _container Container;

src/eimage.c

@@ -33,8 +33,10 @@ static Visual      *_default_vis;
 static Colormap     _default_cmap;
 
 void
-EImageInit(Display * dpy)
+EImageInit(void)
 {
+   Display            *dpy = disp;
+
    imlib_set_cache_size(2048 * 1024);
    imlib_set_font_cache_size(512 * 1024);
 

src/eimage.h

@@ -23,7 +23,7 @@
 #ifndef _EIMAGE_H_
 #define _EIMAGE_H_
 
-#include <X11/Xlib.h>
+#include <X11/X.h>
 #include "xwin.h"
 
 typedef void        EImage;
@@ -38,7 +38,7 @@ typedef struct {
 #define EIMAGE_HIGH_MASK_THR    0x0004
 #define EIMAGE_ISCALE           0x0f00	/* Intermediate scaling */
 
-void                EImageInit(Display * dpy);
+void                EImageInit(void);
 int                 EImageSetCacheSize(int size);
 
 EImage             *EImageCreate(int w, int h);

src/extinitwin.c

@@ -45,7 +45,7 @@ ExtInitWinMain(void)
 
    EGrabServer();
 
-   EImageInit(disp);
+   EImageInit();
 
    attr.backing_store = NotUseful;
    attr.override_redirect = True;

src/focus.h

@@ -23,6 +23,8 @@
 #ifndef _FOCUS_H_
 #define _FOCUS_H_
 
+#include <X11/Xlib.h>
+
 /* focus.c */
 #define FOCUS_NOP         0
 #define FOCUS_INIT        1

src/hints.h

@@ -24,6 +24,7 @@
 #ifndef _HINTS_H_
 #define _HINTS_H_
 
+#include <X11/Xlib.h>
 #include "etypes.h"
 #include "xwin.h"
 

src/hiwin.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Kim Woelders
+ * Copyright (C) 2005-2008 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -23,6 +23,8 @@
 #ifndef _HIWIN_H_
 #define _HIWIN_H_
 
+#include <X11/Xlib.h>
+
 typedef struct _hiwin Hiwin;
 
 Hiwin              *HiwinCreate(void);

src/main.c

@@ -247,7 +247,7 @@ main(int argc, char **argv)
    Esetenv("ETHEME", Mode.theme.path);
 
    /* Move elsewhere? */
-   EImageInit(disp);
+   EImageInit();
    HintsInit();
    CommsInit();
    SessionInit();

src/xwin.h

@@ -24,6 +24,9 @@
 #ifndef _XWIN_H_
 #define _XWIN_H_
 
+#include <X11/Xlib.h>
+#include <X11/extensions/shape.h>
+
 Display            *EDisplayOpen(const char *dstr, int scr);
 void                EDisplayClose(void);
 void                EDisplayDisconnect(void);