kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=9c31fe29ede3f81df8b1753470fb795409fd2e0c
commit 9c31fe29ede3f81df8b1753470fb795409fd2e0c Author: Kim Woelders <[email protected]> Date: Fri Jan 16 07:25:38 2015 +0100 Clean up header file inclusion order. Fixes building with e.g. -std=c99 and c11 by always including config.h (which defines _GNU_SOURCE) first. --- src/aclass.c | 8 ++++++-- src/alert.c | 4 +++- src/animation.c | 5 ++++- src/backgrounds.c | 6 +++++- src/borders.c | 4 +++- src/buttons.c | 6 +++++- src/comms.c | 6 +++++- src/container.c | 6 +++++- src/cursors.c | 16 ++++++++++------ src/desktops.c | 14 +++++++++----- src/dialog.c | 3 ++- src/dock.c | 6 +++++- src/draw.c | 6 +++++- src/ecompmgr.c | 28 ++++++++++++++-------------- src/econfig.c | 7 +++++-- src/edbus.c | 7 +++++-- src/edge.c | 6 +++++- src/eglx.c | 13 +++++++++---- src/eimage.c | 12 ++++++++---- src/eobj.c | 6 +++++- src/events.c | 20 ++++++++++++-------- src/ewin-ops.c | 6 +++++- src/ewins.c | 10 +++++++--- src/ewmh.c | 6 +++++- src/extinitwin.c | 14 +++++++++----- src/file.c | 11 +++++++---- src/finders.c | 7 +++++-- src/focus.c | 6 +++++- src/fx.c | 8 ++++++-- src/glwin.c | 20 +++++++++++--------- src/grabs.c | 14 +++++++++----- src/handlers.c | 9 ++++++--- src/hints.c | 8 ++++++-- src/hiwin.c | 6 +++++- src/icccm.c | 14 +++++++++----- src/iclass.c | 6 +++++- src/iconify.c | 8 ++++++-- src/ipc.c | 6 +++++- src/lang.c | 13 +++++++------ src/list.c | 5 ++++- src/magwin.c | 15 +++++++++------ src/main.c | 6 +++++- src/memory.c | 5 ++++- src/menus-misc.c | 9 ++++++--- src/menus.c | 10 +++++++--- src/misc.c | 11 +++++++---- src/moveresize.c | 8 ++++++-- src/pager.c | 12 ++++++++---- src/parse.c | 5 ++++- src/settings.c | 6 ++++-- src/setup.c | 4 +++- src/shapewin.c | 6 +++++- src/slideout.c | 6 +++++- src/string.c | 7 +++++-- src/systray.c | 6 +++++- src/text.c | 6 +++++- src/text_pango.c | 4 ++-- src/text_xft.c | 8 ++++---- src/time.c | 4 +++- src/tooltips.c | 6 +++++- src/ttfont.c | 5 +++-- src/user.c | 11 +++++++---- src/warp.c | 8 ++++++-- src/x.c | 18 +++++++++++------- src/xprop.c | 6 +++--- src/zoom.c | 11 +++++++---- 66 files changed, 391 insertions(+), 178 deletions(-) diff --git a/src/aclass.c b/src/aclass.c index d6777ab..8ee8db4 100644 --- a/src/aclass.c +++ b/src/aclass.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <ctype.h> +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "conf.h" @@ -31,7 +36,6 @@ #include "grabs.h" #include "list.h" #include "timers.h" -#include <ctype.h> typedef struct _actiontype { char *params; diff --git a/src/alert.c b/src/alert.c index f7d57c0..1708ccc 100644 --- a/src/alert.c +++ b/src/alert.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/src/animation.c b/src/animation.c index 4bd7f70..538e212 100644 --- a/src/animation.c +++ b/src/animation.c @@ -21,12 +21,15 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <math.h> + #include "E.h" #include "animation.h" #include "eobj.h" #include "timers.h" #include "util.h" -#include <math.h> #define ENABLE_DEBUG 1 #if ENABLE_DEBUG diff --git a/src/backgrounds.c b/src/backgrounds.c index 92d8802..44e843e 100644 --- a/src/backgrounds.c +++ b/src/backgrounds.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,7 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <time.h> +#include <X11/Xlib.h> + #include "E.h" #include "backgrounds.h" #include "desktops.h" diff --git a/src/borders.c b/src/borders.c index 16fe2dc..80307e1 100644 --- a/src/borders.c +++ b/src/borders.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "borders.h" diff --git a/src/buttons.c b/src/buttons.c index f948f1b..25ef96d 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "buttons.h" diff --git a/src/comms.c b/src/comms.c index f1d8fea..d533cc0 100644 --- a/src/comms.c +++ b/src/comms.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "comms.h" #include "hints.h" diff --git a/src/container.c b/src/container.c index a924db0..4b626e7 100644 --- a/src/container.c +++ b/src/container.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "container.h" #include "dialog.h" diff --git a/src/cursors.c b/src/cursors.c index ee993ed..e27e654 100644 --- a/src/cursors.c +++ b/src/cursors.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,17 +21,21 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/cursorfont.h> +#if USE_COMPOSITE +#include <X11/extensions/Xfixes.h> +#include <X11/extensions/Xrender.h> +#endif + #include "E.h" #include "conf.h" #include "cursors.h" #include "emodule.h" #include "list.h" #include "xwin.h" -#include <X11/cursorfont.h> -#if USE_COMPOSITE -#include <X11/extensions/Xfixes.h> -#include <X11/extensions/Xrender.h> -#endif struct _ecursor { dlist_t list; diff --git a/src/desktops.c b/src/desktops.c index 07d7a8b..3a4f702 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,14 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <time.h> +#include <X11/Xlib.h> +#if USE_XRANDR +#include <X11/extensions/Xrandr.h> +#endif + #include "E.h" #include "aclass.h" #include "animation.h" @@ -43,10 +51,6 @@ #include "timers.h" #include "tooltips.h" #include "xwin.h" -#include <time.h> -#if USE_XRANDR -#include <X11/extensions/Xrandr.h> -#endif #define DESK_EVENT_MASK1 \ (ButtonPressMask | ButtonReleaseMask) diff --git a/src/dialog.c b/src/dialog.c index a658ab3..3743bad 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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,7 @@ */ #include "E.h" #if ENABLE_DIALOGS +#include <X11/Xlib.h> #include "dialog.h" #include "eimage.h" #include "ewins.h" diff --git a/src/dock.c b/src/dock.c index de56bbb..f53e9aa 100644 --- a/src/dock.c +++ b/src/dock.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2008 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "ewins.h" #include "iclass.h" diff --git a/src/draw.c b/src/draw.c index 2556772..e7dcdad 100644 --- a/src/draw.c +++ b/src/draw.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "desktops.h" #include "eobj.h" diff --git a/src/ecompmgr.c b/src/ecompmgr.c index b61b9c0..80453fc 100644 --- a/src/ecompmgr.c +++ b/src/ecompmgr.c @@ -26,22 +26,9 @@ * It has been mostly rewritten since, only the shadow code is more or less * intact. */ +#include "config.h" -#include "E.h" #if USE_COMPOSITE -#include "animation.h" -#include "desktops.h" -#include "ecompmgr.h" -#include "emodule.h" -#include "eobj.h" -#include "events.h" -#include "ewins.h" /* EwinsManage() */ -#include "hints.h" -#include "timers.h" -#include "util.h" -#include "windowmatch.h" -#include "xwin.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -58,6 +45,19 @@ #include <X11/extensions/Xpresent.h> #endif +#include "E.h" +#include "animation.h" +#include "desktops.h" +#include "ecompmgr.h" +#include "emodule.h" +#include "eobj.h" +#include "events.h" +#include "ewins.h" /* EwinsManage() */ +#include "hints.h" +#include "timers.h" +#include "windowmatch.h" +#include "xwin.h" + #define ENABLE_SHADOWS 1 #define USE_DESK_EXPOSE 0 diff --git a/src/econfig.c b/src/econfig.c index 9adaef4..c7d6375 100644 --- a/src/econfig.c +++ b/src/econfig.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -20,10 +20,13 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <ctype.h> + #include "E.h" #include "econfig.h" #include "emodule.h" -#include <ctype.h> /* * Braindead flat ASCII config file implementation diff --git a/src/edbus.c b/src/edbus.c index 1794bb7..266e56d 100644 --- a/src/edbus.c +++ b/src/edbus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2008 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,12 +20,15 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <dbus/dbus.h> + #include "E.h" #include "edbus.h" #include "events.h" #include "ipc.h" #include "xwin.h" -#include <dbus/dbus.h> #define ENABLE_INTROSPECTION 1 diff --git a/src/edge.c b/src/edge.c index c4ad043..eadf65c 100644 --- a/src/edge.c +++ b/src/edge.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "desktops.h" #include "eobj.h" diff --git a/src/eglx.c b/src/eglx.c index 7669a3d..437f74b 100644 --- a/src/eglx.c +++ b/src/eglx.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,16 +20,21 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <stdlib.h> #define GLX_GLXEXT_PROTOTYPES 1 -#include "E.h" -#include "eglx.h" -#include "eimage.h" #include <GL/gl.h> #include <GL/glu.h> #include <GL/glx.h> #include <X11/extensions/Xcomposite.h> #include <X11/extensions/Xrender.h> +#include "E.h" +#include "eglx.h" +#include "eimage.h" +#include "xwin.h" + #define ENABLE_DEBUG 1 #if ENABLE_DEBUG #define Dprintf(fmt...) do { if(EDebug(EDBUG_TYPE_GLX))Eprintf(fmt); } while(0) diff --git a/src/eimage.c b/src/eimage.c index 711cf65..6827674 100644 --- a/src/eimage.c +++ b/src/eimage.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -20,14 +20,18 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "eimage.h" -#include "xwin.h" +#include "config.h" + #include <Imlib2.h> +#include <X11/Xlib.h> #if USE_XRENDER #include <X11/extensions/Xrender.h> #endif +#include "E.h" +#include "eimage.h" +#include "xwin.h" + void EImageInit(void) { diff --git a/src/eobj.c b/src/eobj.c index def6257..728bb8d 100644 --- a/src/eobj.c +++ b/src/eobj.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -20,6 +20,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "animation.h" #include "desktops.h" diff --git a/src/events.c b/src/events.c index 3f84bf8..9650a1e 100644 --- a/src/events.c +++ b/src/events.c @@ -21,15 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "aclass.h" -#include "ecompmgr.h" -#include "emodule.h" -#include "events.h" -#include "timers.h" -#include "tooltips.h" -#include "xwin.h" +#include "config.h" + #include <sys/time.h> +#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/shape.h> #if USE_XSYNC @@ -61,6 +56,15 @@ #endif #define USE_GENERIC defined(USE_XI2) || defined(USE_XPRESENT) +#include "E.h" +#include "aclass.h" +#include "ecompmgr.h" +#include "emodule.h" +#include "events.h" +#include "timers.h" +#include "tooltips.h" +#include "xwin.h" + #if ENABLE_DEBUG_EVENTS static const char *EventName(unsigned int type); #endif diff --git a/src/ewin-ops.c b/src/ewin-ops.c index 93907c7..a776439 100644 --- a/src/ewin-ops.c +++ b/src/ewin-ops.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "animation.h" #include "borders.h" diff --git a/src/ewins.c b/src/ewins.c index 347d1a7..5531c0d 100644 --- a/src/ewins.c +++ b/src/ewins.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,12 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/extensions/shape.h> + #include "E.h" #include "aclass.h" #include "borders.h" @@ -40,8 +46,6 @@ #include "snaps.h" #include "windowmatch.h" #include "xwin.h" -#include <X11/Xutil.h> -#include <X11/extensions/shape.h> #define EWIN_TOP_EVENT_MASK \ (EnterWindowMask | LeaveWindowMask) diff --git a/src/ewmh.c b/src/ewmh.c index 9161b91..7e02eb3 100644 --- a/src/ewmh.c +++ b/src/ewmh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 Kim Woelders + * Copyright (C) 2003-2015 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,10 @@ /* * Extended Window Manager Hints. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "desktops.h" #include "events.h" diff --git a/src/extinitwin.c b/src/extinitwin.c index b545504..12ba87f 100644 --- a/src/extinitwin.c +++ b/src/extinitwin.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,10 +21,9 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "eimage.h" -#include "xprop.h" -#include "xwin.h" +#include "config.h" + +#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/shape.h> #define USE_EIWC_WINDOW 1 @@ -33,6 +32,11 @@ #include <X11/extensions/Xrender.h> #endif +#include "E.h" +#include "eimage.h" +#include "xprop.h" +#include "xwin.h" + typedef struct { EX_Cursor curs; XSetWindowAttributes attr; diff --git a/src/file.c b/src/file.c index d1abb94..94ff234 100644 --- a/src/file.c +++ b/src/file.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2007-2013 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -21,9 +21,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "file.h" -#include "util.h" +#include "config.h" + #include <dirent.h> #include <stdio.h> #include <string.h> @@ -31,6 +30,10 @@ #include <sys/types.h> #include <unistd.h> +#include "E.h" +#include "file.h" +#include "util.h" + char ** E_ls(const char *dir, int *num) { diff --git a/src/finders.c b/src/finders.c index 9156dd7..ec744b0 100644 --- a/src/finders.c +++ b/src/finders.c @@ -21,12 +21,15 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <ctype.h> +#include <string.h> + #include "E.h" #include "ewins.h" #include "groups.h" #include "util.h" -#include <ctype.h> -#include <string.h> EWin * EwinFindByPtr(const EWin * ewin) diff --git a/src/focus.c b/src/focus.c index f266b73..daf58a6 100644 --- a/src/focus.c +++ b/src/focus.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "cursors.h" #include "desktops.h" /* FIXME - Should not be here */ diff --git a/src/fx.c b/src/fx.c index f430307..0304ad4 100644 --- a/src/fx.c +++ b/src/fx.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <math.h> +#include <X11/Xlib.h> + #include "E.h" #include "animation.h" #include "desktops.h" @@ -31,7 +36,6 @@ #include "settings.h" #include "util.h" #include "xwin.h" -#include <math.h> #define M_2PI_F ((float)(2 * M_PI)) diff --git a/src/glwin.c b/src/glwin.c index ff54c19..f6ce6d0 100644 --- a/src/glwin.c +++ b/src/glwin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,6 +20,16 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <GL/gl.h> +#include <GL/glu.h> +#include <GL/glx.h> +#include <X11/keysym.h> + #include "E.h" #include "animation.h" #include "cursors.h" @@ -33,14 +43,6 @@ #include "grabs.h" #include "util.h" -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <GL/gl.h> -#include <GL/glu.h> -#include <GL/glx.h> -#include <X11/keysym.h> - #define ENABLE_DEBUG 1 #if ENABLE_DEBUG #define Dprintf(fmt...) do { if(EDebug(EDBUG_TYPE_GLX))Eprintf(fmt); } while(0) diff --git a/src/grabs.c b/src/grabs.c index 0f0f461..a82a748 100644 --- a/src/grabs.c +++ b/src/grabs.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,16 +21,20 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "cursors.h" -#include "grabs.h" -#include "xwin.h" +#include "config.h" + +#include <X11/Xlib.h> #if USE_XI2 #include <X11/extensions/XInput2.h> #define DEV_PTR Mode.events.xi2_ptr #define DEV_KBD Mode.events.xi2_kbd #endif +#include "E.h" +#include "cursors.h" +#include "grabs.h" +#include "xwin.h" + static int _GrabKeyboard(Win win, int sync_kbd) { diff --git a/src/handlers.c b/src/handlers.c index ae4d217..fc30185 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,11 +21,14 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "session.h" +#include "config.h" + #include <sys/wait.h> #include <signal.h> +#include "E.h" +#include "session.h" + static void SignalHandler(int sig) { diff --git a/src/hints.c b/src/hints.c index f4e012e..2370c07 100644 --- a/src/hints.c +++ b/src/hints.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 Kim Woelders + * Copyright (C) 2003-2015 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,11 @@ /* * Feeble attempt to collect hint stuff in one place */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/Xatom.h> + #include "E.h" #include "borders.h" /* FIXME - Should not be here */ #include "desktops.h" /* FIXME - Should not be here */ @@ -31,7 +36,6 @@ #include "hints.h" #include "xprop.h" #include "xwin.h" -#include <X11/Xatom.h> static void EHintsSetDeskInfo(void); static void EHintsSetAreaInfo(void); diff --git a/src/hiwin.c b/src/hiwin.c index 00c106b..98d4ee0 100644 --- a/src/hiwin.c +++ b/src/hiwin.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "cursors.h" #include "eobj.h" diff --git a/src/icccm.c b/src/icccm.c index 4ba1d2e..b964877 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,14 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#if USE_XSYNC +#include <X11/extensions/sync.h> +#endif + #include "E.h" #include "desktops.h" #include "ewins.h" @@ -28,10 +36,6 @@ #include "session.h" #include "xprop.h" #include "xwin.h" -#include <X11/Xutil.h> -#if USE_XSYNC -#include <X11/extensions/sync.h> -#endif static void ICCCM_SetIconSizes(void); diff --git a/src/iclass.c b/src/iclass.c index c06014c..1e1cac6 100644 --- a/src/iclass.c +++ b/src/iclass.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "backgrounds.h" #include "conf.h" diff --git a/src/iconify.c b/src/iconify.c index 7fb8388..9fbef93 100644 --- a/src/iconify.c +++ b/src/iconify.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <math.h> +#include <X11/Xlib.h> + #include "E.h" #include "container.h" #include "desktops.h" @@ -32,7 +37,6 @@ #include "timers.h" #include "tooltips.h" #include "xwin.h" -#include <math.h> #define M_PI_F ((float)(M_PI)) #define M_2PI_F ((float)(2 * M_PI)) diff --git a/src/ipc.c b/src/ipc.c index 6367062..57dd87a 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "borders.h" /* FIXME - Should not be here */ diff --git a/src/lang.c b/src/lang.c index 67d549a..1698262 100644 --- a/src/lang.c +++ b/src/lang.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2011 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,18 +21,19 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "emodule.h" -#include "lang.h" -#include <X11/Xlib.h> +#include "config.h" #ifdef HAVE_LOCALE_H #include <locale.h> #endif - #if HAVE_LANGINFO_CODESET #include <langinfo.h> #endif +#include <X11/Xlib.h> + +#include "E.h" +#include "emodule.h" +#include "lang.h" #ifndef ENABLE_NLS #define bindtextdomain(pkg,locale) diff --git a/src/list.c b/src/list.c index 72c58af..b5e4d22 100644 --- a/src/list.c +++ b/src/list.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Kim Woelders + * Copyright (C) 2013-2015 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 @@ -20,7 +20,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <stdlib.h> + #include "list.h" #if LIST_NOINLINE_dlist_find diff --git a/src/magwin.c b/src/magwin.c index e44f9b1..60c62fa 100644 --- a/src/magwin.c +++ b/src/magwin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,6 +20,14 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <X11/keysym.h> + #include "E.h" #include "animation.h" #include "cursors.h" @@ -34,11 +42,6 @@ #include "tclass.h" #include "util.h" -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <X11/keysym.h> - /* Magnifier window */ typedef struct { EWin *ewin; diff --git a/src/main.c b/src/main.c index e7d7819..f4326d3 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,9 +21,13 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <sys/utsname.h> #include <signal.h> #include <time.h> +#include <X11/Xlib.h> + #include "E.h" #include "comms.h" #include "cursors.h" diff --git a/src/memory.c b/src/memory.c index 310bb4e..e8914e1 100644 --- a/src/memory.c +++ b/src/memory.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2005-2013 Kim Woelders + * Copyright (C) 2005-2015 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 @@ -21,9 +21,12 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <ctype.h> #include <stdlib.h> #include <string.h> + #include "util.h" char * diff --git a/src/menus-misc.c b/src/menus-misc.c index 0bd2012..5dc7be3 100644 --- a/src/menus-misc.c +++ b/src/menus-misc.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <errno.h> +#include <sys/stat.h> + #include "E.h" #include "backgrounds.h" #include "borders.h" @@ -32,8 +37,6 @@ #include "menus.h" #include "parse.h" #include "progress.h" -#include <errno.h> -#include <sys/stat.h> static char menu_scan_recursive = 0; diff --git a/src/menus.c b/src/menus.c index 8c067e8..8203888 100644 --- a/src/menus.c +++ b/src/menus.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,12 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <time.h> +#include <X11/Xlib.h> +#include <X11/keysym.h> + #include "E.h" #include "animation.h" #include "borders.h" @@ -43,8 +49,6 @@ #include "timers.h" #include "tooltips.h" #include "xwin.h" -#include <time.h> -#include <X11/keysym.h> #define DEBUG_MENU_EVENTS 0 diff --git a/src/misc.c b/src/misc.c index c36db5b..d84caf2 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,11 +21,14 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <time.h> +#include <sys/time.h> +#include <X11/Xlib.h> + #include "E.h" -#include "eobj.h" #include "xwin.h" -#include <sys/time.h> -#include <time.h> /* * Debug/error message printing. diff --git a/src/moveresize.c b/src/moveresize.c index 5136ee1..0d74d0d 100644 --- a/src/moveresize.c +++ b/src/moveresize.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2012 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/keysym.h> + #include "E.h" #include "borders.h" #include "cursors.h" @@ -33,7 +38,6 @@ #include "hints.h" #include "timers.h" #include "xwin.h" -#include <X11/keysym.h> static struct { Win events; diff --git a/src/pager.c b/src/pager.c index 1dbfaad..cf0387c 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,13 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> +#if USE_XRENDER +#include <X11/extensions/Xrender.h> +#endif + #include "E.h" #include "backgrounds.h" #include "desktops.h" @@ -39,9 +46,6 @@ #include "timers.h" #include "tooltips.h" #include "xwin.h" -#if USE_XRENDER -#include <X11/extensions/Xrender.h> -#endif #define DEBUG_PAGER 0 #if DEBUG_PAGER diff --git a/src/parse.c b/src/parse.c index 0e00654..6d50b46 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,10 +20,13 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <ctype.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> + #include "parse.h" int diff --git a/src/settings.c b/src/settings.c index ee075ef..7ae6c2c 100644 --- a/src/settings.c +++ b/src/settings.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,8 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" +#include "config.h" + #if ENABLE_DIALOGS +#include "E.h" #include "dialog.h" #include "settings.h" diff --git a/src/setup.c b/src/setup.c index 5ea75ec..1da9ea7 100644 --- a/src/setup.c +++ b/src/setup.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,8 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" #include <signal.h> +#include <X11/Xlib.h> #include <X11/keysym.h> #include "E.h" diff --git a/src/shapewin.c b/src/shapewin.c index c7247a6..bd45b69 100644 --- a/src/shapewin.c +++ b/src/shapewin.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,6 +20,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "ewins.h" #include "shapewin.h" diff --git a/src/slideout.c b/src/slideout.c index aef100f..4e773b6 100644 --- a/src/slideout.c +++ b/src/slideout.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2013 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "borders.h" diff --git a/src/string.c b/src/string.c index dac8c96..732842a 100644 --- a/src/string.c +++ b/src/string.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Kim Woelders + * Copyright (C) 2008-2015 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 @@ -20,9 +20,12 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "util.h" +#include "config.h" + #include <ctype.h> +#include "util.h" + #ifndef HAVE_STRCASECMP int Estrcasecmp(const char *s1, const char *s2) diff --git a/src/systray.c b/src/systray.c index 2ccbcaa..23dc0ed 100644 --- a/src/systray.c +++ b/src/systray.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -20,6 +20,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "container.h" #include "events.h" diff --git a/src/text.c b/src/text.c index 4470bcb..5092d02 100644 --- a/src/text.c +++ b/src/text.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "eimage.h" #include "tclass.h" diff --git a/src/text_pango.c b/src/text_pango.c index 0ece29a..35a486b 100644 --- a/src/text_pango.c +++ b/src/text_pango.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Kim Woelders + * Copyright (C) 2007-2015 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 @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" +#include "config.h" #ifdef USE_PANGO #include <X11/Xft/Xft.h> diff --git a/src/text_xft.c b/src/text_xft.c index 9a505a3..f01ca97 100644 --- a/src/text_xft.c +++ b/src/text_xft.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 Kim Woelders + * Copyright (C) 2006-2015 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 @@ -20,13 +20,13 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "tclass.h" +#include "config.h" #ifdef USE_XFT -#include "xwin.h" #include <X11/extensions/Xrender.h> #include <X11/Xft/Xft.h> +#include "tclass.h" +#include "xtypes.h" /* * Xft diff --git a/src/time.c b/src/time.c index f83a986..ca27300 100644 --- a/src/time.c +++ b/src/time.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Kim Woelders + * Copyright (C) 2011-2015 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 @@ -21,11 +21,13 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "config.h" + #if USE_MONOTONIC_CLOCK #include <time.h> #else #include <sys/time.h> #endif + #include "util.h" unsigned int diff --git a/src/tooltips.c b/src/tooltips.c index 5cf1572..73ba268 100644 --- a/src/tooltips.c +++ b/src/tooltips.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,6 +21,10 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#include <X11/Xlib.h> + #include "E.h" #include "aclass.h" #include "conf.h" diff --git a/src/ttfont.c b/src/ttfont.c index f1c0558..3d928ab 100644 --- a/src/ttfont.c +++ b/src/ttfont.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,10 +21,11 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" +#include "config.h" #include "tclass.h" #if FONT_TYPE_IFT +#include "E.h" #include "eimage.h" #include <Imlib2.h> diff --git a/src/user.c b/src/user.c index 50fe68b..28bf9df 100644 --- a/src/user.c +++ b/src/user.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2012 Kim Woelders + * Copyright (C) 2012-2015 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 @@ -21,14 +21,17 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "file.h" -#include "user.h" -#include "util.h" +#include "config.h" + #include <pwd.h> #include <stdlib.h> #include <sys/types.h> #include <unistd.h> +#include "file.h" +#include "user.h" +#include "util.h" + static int usr_uid = -1; static const char *usr_name = "unknown"; static const char *usr_home = "/tmp"; diff --git a/src/warp.c b/src/warp.c index c78961a..58043c9 100644 --- a/src/warp.c +++ b/src/warp.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2014 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -31,6 +31,11 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ +#include "config.h" + +#include <X11/Xlib.h> +#include <X11/keysym.h> + #include "E.h" #include "desktops.h" #include "emodule.h" @@ -44,7 +49,6 @@ #include "tclass.h" #include "tooltips.h" #include "xwin.h" -#include <X11/keysym.h> static void WarpShapeDraw(EWin * ewin) diff --git a/src/x.c b/src/x.c index fddb432..a29e533 100644 --- a/src/x.c +++ b/src/x.c @@ -21,13 +21,12 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "E.h" -#include "edebug.h" -#include "util.h" -#include "xwin.h" +#include "config.h" + #include <string.h> #include <unistd.h> #include <X11/Xatom.h> +#include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/Xresource.h> #include <X11/extensions/shape.h> @@ -35,13 +34,18 @@ #include <X11/extensions/Xrender.h> #define RENDER_VERSION VERS(RENDER_MAJOR, RENDER_MINOR) #endif -#if USE_GLX -#include "eglx.h" -#endif #if USE_XI2 #include <X11/extensions/XInput2.h> #endif +#include "E.h" +#include "edebug.h" +#include "util.h" +#include "xwin.h" +#if USE_GLX +#include "eglx.h" +#endif + #define DEBUG_XWIN 0 #define DEBUG_PIXMAP 0 diff --git a/src/xprop.c b/src/xprop.c index 9296c03..376905f 100644 --- a/src/xprop.c +++ b/src/xprop.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2013 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -20,6 +20,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -27,8 +29,6 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include "config.h" - /* Window property change actions (must match _NET_WM_STATE_... ones) */ #define EX_PROP_LIST_REMOVE 0 #define EX_PROP_LIST_ADD 1 diff --git a/src/zoom.c b/src/zoom.c index 8ee4c63..b3876cb 100644 --- a/src/zoom.c +++ b/src/zoom.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2012 Kim Woelders + * Copyright (C) 2004-2015 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 @@ -21,15 +21,18 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + +#if USE_XRANDR +#include <X11/extensions/Xrandr.h> +#endif + #include "E.h" #include "borders.h" #include "ewins.h" #include "focus.h" #include "hints.h" #include "xwin.h" -#if USE_XRANDR -#include <X11/extensions/Xrandr.h> -#endif #define DEBUG_ZOOM 0 #if DEBUG_ZOOM --
