From 88dba1cfffa5ae784346916008598859373f4480 Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Wed, 14 Aug 2019 18:45:13 +0200
Subject: [PATCH] Re-indent with indent-2.2.12

---
 epp/cpplib.c      | 51 +++++++++++++++++++++++------------------------
 epp/cpplib.h      |  2 +-
 src/E.h           |  2 +-
 src/aclass.c      |  2 +-
 src/animation.c   |  6 +++---
 src/backgrounds.c |  4 ++--
 src/buttons.c     |  2 +-
 src/buttons.h     |  2 +-
 src/config.c      |  2 +-
 src/container.h   | 14 ++++++-------
 src/dialog.h      |  2 +-
 src/ecompmgr.c    |  2 +-
 src/econfig.h     |  2 +-
 src/eglx.c        | 16 +++++++--------
 src/emodule.h     |  2 +-
 src/events.c      |  6 +++---
 src/ewins.h       | 10 +++++-----
 src/fx.c          |  4 ++--
 src/hiwin.c       | 10 +++++-----
 src/hiwin.h       |  4 ++--
 src/ipc.h         |  2 +-
 src/lang.c        | 18 ++++++++---------
 src/lang.h        |  4 ++--
 src/menus-misc.c  |  2 +-
 src/menus.c       |  2 +-
 src/pager.c       |  4 ++--
 src/slideout.c    |  6 +++---
 src/snaps.c       |  6 +++---
 src/sound.c       |  2 +-
 src/sound.h       | 10 +++++-----
 src/tclass.h      | 24 +++++++++++-----------
 src/timers.c      |  4 ++--
 src/timers.h      |  4 ++--
 src/x.c           |  2 +-
 src/xprop.c       | 10 +++++-----
 src/xwin.h        |  2 +-
 36 files changed, 123 insertions(+), 124 deletions(-)

diff --git a/epp/cpplib.c b/epp/cpplib.c
index 6209c817..d18f2663 100644
--- a/epp/cpplib.c
+++ b/epp/cpplib.c
@@ -166,8 +166,8 @@ static const char  *predefs = "";
 
 struct directive {
    int                 length;
-   int                 (*func) (cpp_reader * pfile, struct directive * keyword,
-				unsigned char *buf, unsigned char *limit);
+   int                 (*func)(cpp_reader * pfile, struct directive * keyword,
+			       unsigned char *buf, unsigned char *limit);
    const char         *name;
    enum node_type      type;
    char                command_reads_line;
@@ -398,55 +398,54 @@ static struct default_include {
    = INCLUDE_DEFAULTS;
 
 #else
-   =
-{
+   = {
    /* Pick up GNU C++ specific include files.  */
    {
-   GPLUSPLUS_INCLUDE_DIR, 1, 1}
+    GPLUSPLUS_INCLUDE_DIR, 1, 1}
    ,
 #ifdef CROSS_COMPILE
-      /* This is the dir for fixincludes.  Put it just before
-       * the files that we fix.  */
+   /* This is the dir for fixincludes.  Put it just before
+    * the files that we fix.  */
    {
-   GCC_INCLUDE_DIR, 0, 0}
+    GCC_INCLUDE_DIR, 0, 0}
    ,
-      /* For cross-compilation, this dir name is generated
-       * automatically in Makefile.in.  */
+   /* For cross-compilation, this dir name is generated
+    * automatically in Makefile.in.  */
    {
-   CROSS_INCLUDE_DIR, 0, 0}
+    CROSS_INCLUDE_DIR, 0, 0}
    ,
-      /* This is another place that the target system's headers might be.  */
+   /* This is another place that the target system's headers might be.  */
    {
-   TOOL_INCLUDE_DIR, 0, 1}
+    TOOL_INCLUDE_DIR, 0, 1}
    ,
 #else /* not CROSS_COMPILE */
-      /* This should be /usr/local/include and should come before
-       * the fixincludes-fixed header files.  */
+   /* This should be /usr/local/include and should come before
+    * the fixincludes-fixed header files.  */
    {
-   LOCAL_INCLUDE_DIR, 0, 1}
+    LOCAL_INCLUDE_DIR, 0, 1}
    ,
-      /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
-       * Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h.  */
+   /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
+    * Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h.  */
    {
-   TOOL_INCLUDE_DIR, 0, 1}
+    TOOL_INCLUDE_DIR, 0, 1}
    ,
-      /* This is the dir for fixincludes.  Put it just before
-       * the files that we fix.  */
+   /* This is the dir for fixincludes.  Put it just before
+    * the files that we fix.  */
    {
-   GCC_INCLUDE_DIR, 0, 0}
+    GCC_INCLUDE_DIR, 0, 0}
    ,
-      /* Some systems have an extra dir of include files.  */
+   /* Some systems have an extra dir of include files.  */
 #ifdef SYSTEM_INCLUDE_DIR
    {
-   SYSTEM_INCLUDE_DIR, 0, 0}
+    SYSTEM_INCLUDE_DIR, 0, 0}
    ,
 #endif
    {
-   STANDARD_INCLUDE_DIR, 0, 0}
+    STANDARD_INCLUDE_DIR, 0, 0}
    ,
 #endif /* not CROSS_COMPILE */
    {
-   0, 0, 0}
+    0, 0, 0}
 };
 
 #endif /* no INCLUDE_DEFAULTS */
diff --git a/epp/cpplib.h b/epp/cpplib.h
index 5653dd2f..04be98e7 100644
--- a/epp/cpplib.h
+++ b/epp/cpplib.h
@@ -65,7 +65,7 @@ enum cpp_token {
 };
 
 typedef enum cpp_token (*parse_underflow_t) (cpp_reader *);
-typedef int         (*parse_cleanup_t) (cpp_buffer *, cpp_reader *);
+typedef int         (*parse_cleanup_t)(cpp_buffer *, cpp_reader *);
 
 /* A parse_marker indicates a previous position,
    which we can backtrack to. */
diff --git a/src/E.h b/src/E.h
index c8263c2d..dd90bfa4 100644
--- a/src/E.h
+++ b/src/E.h
@@ -466,7 +466,7 @@ void                ConfigAlertLoad(const char *txt);
 char               *FindFile(const char *file, const char *themepath, int type);
 char               *ThemeFileFind(const char *file, int type);
 int                 ConfigFileLoad(const char *name, const char *themepath,
-				   int (*parse) (FILE * fs), int preparse);
+				   int (*parse)(FILE * fs), int preparse);
 int                 ConfigFileRead(FILE * fs);
 int                 ThemeConfigLoad(void);
 
diff --git a/src/aclass.c b/src/aclass.c
index 28dbf486..773ea57b 100644
--- a/src/aclass.c
+++ b/src/aclass.c
@@ -813,7 +813,7 @@ AclassConfigLoadConfig(const char *name)
 }
 
 static void
-AclassConfigWrite(const ActionClass * ac, void (*prf) (const char *fmt, ...))
+AclassConfigWrite(const ActionClass * ac, void (*prf)(const char *fmt, ...))
 {
    char                s[FILEPATH_LEN_MAX];
    Action             *aa;
diff --git a/src/animation.c b/src/animation.c
index 538e2124..5d7a919e 100644
--- a/src/animation.c
+++ b/src/animation.c
@@ -55,9 +55,9 @@ static struct {
    Idler              *idler;
    unsigned int        time_ms;	/* Just use Mode.events.time_ms? */
    unsigned int        seqn;
-} Mode_anim =
-{
-NULL, NULL, 0, 0};
+} Mode_anim = {
+   NULL, NULL, 0, 0
+};
 
 static int
 _AnimatorsTimer(void *timer_call)
diff --git a/src/backgrounds.c b/src/backgrounds.c
index d756d38e..2cbda3a9 100644
--- a/src/backgrounds.c
+++ b/src/backgrounds.c
@@ -576,8 +576,8 @@ BackgroundRealize(Background * bg, Win win, EX_Drawable draw,
    if (!draw)
       draw = WinGetXwin(win);
 
-   hasbg = ! !bg->bg.im;
-   hasfg = ! !bg->top.im;
+   hasbg = !!bg->bg.im;
+   hasfg = !!bg->top.im;
 
    if (!hasbg && !hasfg)
      {
diff --git a/src/buttons.c b/src/buttons.c
index cbd490bd..1fa2864c 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -448,7 +448,7 @@ ButtonDragEnd(Button * b)
 }
 
 void
-ButtonsForeach(int id, Desk * dsk, void (*func) (Button * b))
+ButtonsForeach(int id, Desk * dsk, void (*func)(Button * b))
 {
    Button             *b, *tmp;
 
diff --git a/src/buttons.h b/src/buttons.h
index 48066280..becef2ed 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -52,7 +52,7 @@ int                 ButtonEmbedWindow(Button * ButtonToUse,
 				      EX_Window WindowToEmbed);
 
 void                ButtonsForeach(int id, Desk * dsk,
-				   void (*func) (Button * b));
+				   void (*func)(Button * b));
 void                ButtonsMoveStickyToDesk(Desk * d);
 int                 ButtonsConfigLoad(FILE * fs);
 
diff --git a/src/config.c b/src/config.c
index 4745148c..2db5d897 100644
--- a/src/config.c
+++ b/src/config.c
@@ -547,7 +547,7 @@ ConfigFileFind(const char *name, const char *themepath, int pp)
 
 int
 ConfigFileLoad(const char *name, const char *themepath,
-	       int (*parse) (FILE * fs), int preparse)
+	       int (*parse)(FILE * fs), int preparse)
 {
    int                 err = -1;
    char               *file;
diff --git a/src/container.h b/src/container.h
index a6f82072..bf3e2526 100644
--- a/src/container.h
+++ b/src/container.h
@@ -43,13 +43,13 @@ typedef struct {
 } ContainerObject;
 
 typedef struct {
-   void                (*Init) (Container * ct);
-   void                (*Exit) (Container * ct, int wm_exit);
-   void                (*Signal) (Container * ct, int signal, void *prm);
-   void                (*Event) (Container * ct, XEvent * ev);
-   void                (*ObjSizeCalc) (Container * ct, ContainerObject * cto);
-   void                (*ObjPlace) (Container * ct, ContainerObject * cto,
-				    EImage * im);
+   void                (*Init)(Container * ct);
+   void                (*Exit)(Container * ct, int wm_exit);
+   void                (*Signal)(Container * ct, int signal, void *prm);
+   void                (*Event)(Container * ct, XEvent * ev);
+   void                (*ObjSizeCalc)(Container * ct, ContainerObject * cto);
+   void                (*ObjPlace)(Container * ct, ContainerObject * cto,
+				   EImage * im);
 } ContainerOps;
 
 struct _container {
diff --git a/src/dialog.h b/src/dialog.h
index f6fc0a12..3c099462 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -70,7 +70,7 @@ typedef struct {
    short               sound;
    const char         *header_image;
    const char         *header_text;
-   void                (*fill) (Dialog * d, DItem * table, void *data);
+   void                (*fill)(Dialog * d, DItem * table, void *data);
    int                 flags;
    DialogCallbackFunc *func_apply;
    DialogExitFunc     *func_exit;
diff --git a/src/ecompmgr.c b/src/ecompmgr.c
index c5c9858d..645bc7c8 100644
--- a/src/ecompmgr.c
+++ b/src/ecompmgr.c
@@ -1516,7 +1516,7 @@ ECompMgrWinDamage(EObj * eo, XEvent * ev)
 static void
 ECompMgrWinDumpInfo(const char *txt, EObj * eo, EX_SrvRegion rgn, int ipc)
 {
-   void                (*prf) (const char *fmt, ...);
+   void                (*prf)(const char *fmt, ...);
    ECmWinInfo         *cw = eo->cmhook;
 
    prf = (ipc) ? IpcPrintf : Eprintf;
diff --git a/src/econfig.h b/src/econfig.h
index c3452f82..8e720c51 100644
--- a/src/econfig.h
+++ b/src/econfig.h
@@ -28,7 +28,7 @@ typedef struct {
    void               *ptr;
    char                type;
    int                 dflt;
-   void                (*func) (void *item, const char *value);
+   void                (*func)(void *item, const char *value);
 } CfgItem;
 
 typedef struct {
diff --git a/src/eglx.c b/src/eglx.c
index c4458296..6e72f931 100644
--- a/src/eglx.c
+++ b/src/eglx.c
@@ -63,14 +63,14 @@
 #include <dlfcn.h>
 
 /* GL functions and helper */
-typedef void        (*glXBindTexImageEXT_func) (Display * dpy,
-						GLXDrawable drawable,
-						int buffer,
-						const int *attrib_list);
-typedef void        (*glXReleaseTexImageEXT_func) (Display * dpy,
-						   GLXDrawable drawable,
-						   int buffer);
-typedef void        (*glXFuncPtr) (void);
+typedef void        (*glXBindTexImageEXT_func)(Display * dpy,
+					       GLXDrawable drawable,
+					       int buffer,
+					       const int *attrib_list);
+typedef void        (*glXReleaseTexImageEXT_func)(Display * dpy,
+						  GLXDrawable drawable,
+						  int buffer);
+typedef void        (*glXFuncPtr)(void);
 typedef             glXFuncPtr(*glXGetProcAddress_func) (const GLubyte *);
 
 static glXBindTexImageEXT_func _glXBindTexImageEXT;
diff --git a/src/emodule.h b/src/emodule.h
index 34aebb23..07d0a950 100644
--- a/src/emodule.h
+++ b/src/emodule.h
@@ -29,7 +29,7 @@
 typedef struct {
    const char         *name;
    const char         *nick;
-   void                (*Signal) (int sig, void *prm);
+   void                (*Signal)(int sig, void *prm);
    IpcItemList         ipc;
    CfgItemList         cfg;
 } EModule;
diff --git a/src/events.c b/src/events.c
index 338f8012..37fe48c9 100644
--- a/src/events.c
+++ b/src/events.c
@@ -83,8 +83,8 @@ typedef struct {
 typedef struct {
    const char         *name;
    unsigned int        ix;
-   int                 (*query_ver) (Display * dpy, int *major, int *minor);
-   void                (*init) (int avaliable);
+   int                 (*query_ver)(Display * dpy, int *major, int *minor);
+   void                (*init)(int avaliable);
 } EServerExt;
 
 static EServerExtData ExtData[12];
@@ -348,7 +348,7 @@ struct _EventFdDesc {
    const char         *name;
 #endif
    int                 fd;
-   void                (*handler) (void);
+   void                (*handler)(void);
 };
 
 static int          nfds = 0;
diff --git a/src/ewins.h b/src/ewins.h
index 1aeecfa9..897256ac 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -57,11 +57,11 @@ typedef union {
 #define EwinInhSetWM(ewin, item, on)   ewin->inh_wm.b.item = (on)
 
 typedef struct {
-   void                (*Init) (EWin * ewin);
-   void                (*Layout) (EWin * ewin, int *px, int *py, int *pw,
-				  int *ph);
-   void                (*MoveResize) (EWin * ewin, int resize);
-   void                (*Close) (EWin * ewin);
+   void                (*Init)(EWin * ewin);
+   void                (*Layout)(EWin * ewin, int *px, int *py, int *pw,
+				 int *ph);
+   void                (*MoveResize)(EWin * ewin, int resize);
+   void                (*Close)(EWin * ewin);
 } EWinOps;
 
 struct _ewin {
diff --git a/src/fx.c b/src/fx.c
index 0304ad4f..c564c5f3 100644
--- a/src/fx.c
+++ b/src/fx.c
@@ -47,8 +47,8 @@
 
 typedef struct {
    const char         *name;
-   void                (*init_func) (const char *name);
-   void                (*ops_func) (int op);
+   void                (*init_func)(const char *name);
+   void                (*ops_func)(int op);
    char                enabled;
    char                active;
 } FXHandler;
diff --git a/src/hiwin.c b/src/hiwin.c
index 5a8a4b09..5d96a74f 100644
--- a/src/hiwin.c
+++ b/src/hiwin.c
@@ -42,16 +42,16 @@ struct _hiwin {
    EWin               *ewin;
    int                 zoom;
    int                 xo, yo, wo, ho;
-   void                (*evcb) (Win win, XEvent * ev, void *data);
+   void                (*evcb)(Win win, XEvent * ev, void *data);
    void               *data;
    char                animate;
    EImage             *im;
 };
 
 typedef struct {
-   void                (*init) (Hiwin * phi);
-   void                (*draw) (Hiwin * phi);
-   void                (*fini) (Hiwin * phi, int shown);
+   void                (*init)(Hiwin * phi);
+   void                (*draw)(Hiwin * phi);
+   void                (*fini)(Hiwin * phi, int shown);
 } HiwinRender;
 
 static ImageClass  *hiwin_ic = NULL;
@@ -298,7 +298,7 @@ HiwinInit(Hiwin * phi, EWin * ewin, EObj * parent)
 }
 
 void
-HiwinSetCallback(Hiwin * phi, void (*func) (Win win, XEvent * ev, void *data),
+HiwinSetCallback(Hiwin * phi, void (*func)(Win win, XEvent * ev, void *data),
 		 void *data)
 {
    phi->evcb = func;
diff --git a/src/hiwin.h b/src/hiwin.h
index 03f0715d..d92c0bef 100644
--- a/src/hiwin.h
+++ b/src/hiwin.h
@@ -32,8 +32,8 @@ Hiwin              *HiwinCreate(void);
 void                HiwinSetGeom(Hiwin * phi, int x, int y, int w, int h);
 void                HiwinInit(Hiwin * phi, EWin * ewin, EObj * parent);
 void                HiwinSetCallback(Hiwin * phi,
-				     void (*func) (Win win, XEvent * ev,
-						   void *data), void *data);
+				     void (*func)(Win win, XEvent * ev,
+						  void *data), void *data);
 void                HiwinGetXY(Hiwin * phi, int *x, int *y);
 void                HiwinMove(Hiwin * phi, int x, int y);
 EWin               *HiwinGetEwin(Hiwin * phi, int check);
diff --git a/src/ipc.h b/src/ipc.h
index 81b043e5..944e4bed 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -28,7 +28,7 @@
 #include "util.h"
 
 typedef struct {
-   void                (*func) (const char *line);
+   void                (*func)(const char *line);
    const char         *name;
    const char         *nick;
    const char         *help_text;
diff --git a/src/lang.c b/src/lang.c
index 178adc0b..2754dd71 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -216,7 +216,7 @@ EwcClose(void)
 }
 
 int
-EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
+EwcStrToWcs(const char *str, int len, wchar_t *wcs, int wcl)
 {
 #if HAVE_ICONV
    ICONV_CONST char   *pi;
@@ -232,7 +232,7 @@ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
 	no = 4096;
 	po = buf;
 	rc = iconv(iconv_cd_str2wcs, &pi, &ni, &po, &no);
-	if (rc == (size_t) (-1) || no == 0)
+	if (rc == (size_t)(-1) || no == 0)
 	   return -1;
 	wcl = (4096 - no) / sizeof(wchar_t);
 	return wcl;
@@ -241,7 +241,7 @@ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
    po = (char *)wcs;
    no = wcl * sizeof(wchar_t);
    rc = iconv(iconv_cd_str2wcs, &pi, &ni, &po, &no);
-   if (rc == (size_t) (-1))
+   if (rc == (size_t)(-1))
       return 0;
    return wcl - no / sizeof(wchar_t);
 #else
@@ -249,7 +249,7 @@ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
       return mbstowcs(NULL, str, 0);
 
    mbstowcs(wcs, str, wcl);
-   wcs[wcl] = (wchar_t) '\0';
+   wcs[wcl] = (wchar_t)'\0';
 
    len = 0;
    return wcl;
@@ -257,7 +257,7 @@ EwcStrToWcs(const char *str, int len, wchar_t * wcs, int wcl)
 }
 
 int
-EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
+EwcWcsToStr(const wchar_t *wcs, int wcl, char *str, int len)
 {
 #if HAVE_ICONV
    ICONV_CONST char   *pi;
@@ -267,7 +267,7 @@ EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
    ni = wcl * sizeof(wchar_t);
    no = len;
    rc = iconv(iconv_cd_wcs2str, &pi, &ni, &str, &no);
-   if (rc == (size_t) (-1))
+   if (rc == (size_t)(-1))
       return 0;
    return len - no;
 #else
@@ -294,9 +294,9 @@ EwcWcsToStr(const wchar_t * wcs, int wcl, char *str, int len)
 static struct {
    char               *internal;
    char               *exported;
-} Conf_locale =
-{
-NULL, NULL};
+} Conf_locale = {
+   NULL, NULL
+};
 
 static struct {
    char                init;
diff --git a/src/lang.h b/src/lang.h
index 9cd5625b..521593e9 100644
--- a/src/lang.h
+++ b/src/lang.h
@@ -52,9 +52,9 @@ void                EstrInt2EncFree(const char *str, int want_utf8);
 
 int                 EwcOpen(int utf8);
 void                EwcClose(void);
-int                 EwcStrToWcs(const char *str, int len, wchar_t * wcs,
+int                 EwcStrToWcs(const char *str, int len, wchar_t *wcs,
 				int wcl);
-int                 EwcWcsToStr(const wchar_t * wcs, int wcl, char *str,
+int                 EwcWcsToStr(const wchar_t *wcs, int wcl, char *str,
 				int len);
 
 #endif /* _LANG_H_ */
diff --git a/src/menus-misc.c b/src/menus-misc.c
index 05e06004..4fd565a3 100644
--- a/src/menus-misc.c
+++ b/src/menus-misc.c
@@ -490,7 +490,7 @@ MenuCheckShowEwinDesk(EWin * ewin, void *prm)
 }
 
 static void
-MenuLoadFromEwins(Menu * m, int (*f) (EWin * ewin, void *prm), void *prm)
+MenuLoadFromEwins(Menu * m, int (*f)(EWin * ewin, void *prm), void *prm)
 {
    EWin               *const *lst;
    int                 i, num;
diff --git a/src/menus.c b/src/menus.c
index a69f5a4c..d0ed9cf3 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1148,7 +1148,7 @@ MenusShowNamed(const char *name, const char *param)
 int
 MenusActive(void)
 {
-   return ! !Mode_menus.first;
+   return !!Mode_menus.first;
 }
 
 static void
diff --git a/src/pager.c b/src/pager.c
index 438d4252..b0c9ff5b 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -751,7 +751,7 @@ PagerShow(Pager * p)
 
 typedef struct {
    Desk               *dsk;
-   void                (*func) (Pager * p, void *prm);
+   void                (*func)(Pager * p, void *prm);
    void               *prm;
 } pager_foreach_data;
 
@@ -767,7 +767,7 @@ _PagersForeachFunc(void *item, void *prm)
 }
 
 static void
-PagersForeach(Desk * dsk, void (*func) (Pager * p, void *prm), void *prm)
+PagersForeach(Desk * dsk, void (*func)(Pager * p, void *prm), void *prm)
 {
    pager_foreach_data  data;
 
diff --git a/src/slideout.c b/src/slideout.c
index 4e773b60..a24ee5fc 100644
--- a/src/slideout.c
+++ b/src/slideout.c
@@ -61,9 +61,9 @@ static              LIST_HEAD(slideout_list);
 
 static struct {
    Slideout           *active;
-} Mode_slideouts =
-{
-NULL};
+} Mode_slideouts = {
+   NULL
+};
 
 static void         SlideoutHandleEvent(Win win, XEvent * ev, void *prm);
 
diff --git a/src/snaps.c b/src/snaps.c
index 6144c3c1..c700dc7d 100644
--- a/src/snaps.c
+++ b/src/snaps.c
@@ -696,11 +696,11 @@ _DlgFillSnap(Dialog * d, DItem * table, void *data)
 	  {
 	     sd->match.name = 1;
 	     sd->match.clss = 1;
-	     sd->match.role = ! !ewin->icccm.wm_role;
+	     sd->match.role = !!ewin->icccm.wm_role;
 	  }
 	else
 	  {
-	     sd->match.title = ! !EwinGetIcccmName(ewin);
+	     sd->match.title = !!EwinGetIcccmName(ewin);
 	  }
      }
 
@@ -1599,7 +1599,7 @@ static void
 _SnapShow(void *data, void *prm)
 {
    Snapshot           *sn = (Snapshot *) data;
-   int                 full = ! !prm;
+   int                 full = !!prm;
    char                buf[FILEPATH_LEN_MAX];
    const char         *name;
 
diff --git a/src/sound.c b/src/sound.c
index b68aa5b3..2433f6a0 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -285,7 +285,7 @@ SoundFree(const char *name)
    sclass = SclassFind(name);
    SclassDestroy(sclass);
 
-   return ! !sclass;
+   return !!sclass;
 }
 
 static void
diff --git a/src/sound.h b/src/sound.h
index f7c9c9a9..6dd99d3a 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -34,11 +34,11 @@ typedef struct {
 typedef struct _sample Sample;
 
 typedef struct {
-   int                 (*Init) (void);
-   void                (*Exit) (void);
-   Sample             *(*SampleLoad) (const char *file);
-   void                (*SampleDestroy) (Sample * s);
-   void                (*SamplePlay) (Sample * s);
+   int                 (*Init)(void);
+   void                (*Exit)(void);
+   Sample             *(*SampleLoad)(const char *file);
+   void                (*SampleDestroy)(Sample * s);
+   void                (*SamplePlay)(Sample * s);
 } SoundOps;
 
 int                 SoundSampleGetData(const char *file, SoundSampleData * ssd);
diff --git a/src/tclass.h b/src/tclass.h
index ce714abe..b70c2456 100644
--- a/src/tclass.h
+++ b/src/tclass.h
@@ -45,18 +45,18 @@
 #endif
 
 typedef struct {
-   int                 (*Load) (TextState * ts, const char *name);
-   void                (*Destroy) (TextState * ts);
-   void                (*TextSize) (TextState * ts, const char *text, int len,
-				    int *width, int *height, int *ascent);
-   void                (*TextFit) (TextState * ts, char **ptext,
-				   int *pwidth, int textwidth_limit);
-   void                (*TextDraw) (TextState * ts, int x, int y,
-				    const char *text, int len);
-   int                 (*FdcInit) (TextState * ts, Win win, EX_Drawable draw);
-   void                (*FdcFini) (TextState * ts);
-   void                (*FdcSetDrawable) (TextState * ts, unsigned long draw);
-   void                (*FdcSetColor) (TextState * ts, unsigned int color);
+   int                 (*Load)(TextState * ts, const char *name);
+   void                (*Destroy)(TextState * ts);
+   void                (*TextSize)(TextState * ts, const char *text, int len,
+				   int *width, int *height, int *ascent);
+   void                (*TextFit)(TextState * ts, char **ptext,
+				  int *pwidth, int textwidth_limit);
+   void                (*TextDraw)(TextState * ts, int x, int y,
+				   const char *text, int len);
+   int                 (*FdcInit)(TextState * ts, Win win, EX_Drawable draw);
+   void                (*FdcFini)(TextState * ts);
+   void                (*FdcSetDrawable)(TextState * ts, unsigned long draw);
+   void                (*FdcSetColor)(TextState * ts, unsigned int color);
 } FontOps;
 
 struct _textstate {
diff --git a/src/timers.c b/src/timers.c
index c0c41722..361dca5c 100644
--- a/src/timers.c
+++ b/src/timers.c
@@ -29,7 +29,7 @@ struct _timer {
    unsigned int        in_time;
    unsigned int        at_time;
    struct _timer      *next;
-   int                 (*func) (void *data);
+   int                 (*func)(void *data);
    void               *data;
    char                again;
 };
@@ -83,7 +83,7 @@ _TimerDel(Timer * timer)
 }
 
 Timer              *
-TimerAdd(int dt_ms, int (*func) (void *data), void *data)
+TimerAdd(int dt_ms, int (*func)(void *data), void *data)
 {
    Timer              *timer;
 
diff --git a/src/timers.h b/src/timers.h
index 422944ef..53694679 100644
--- a/src/timers.h
+++ b/src/timers.h
@@ -26,7 +26,7 @@
 
 #include "etypes.h"
 
-Timer              *TimerAdd(int dt_ms, int (*func) (void *data), void *data);
+Timer              *TimerAdd(int dt_ms, int (*func)(void *data), void *data);
 void                TimerDel(Timer * timer);
 void                TimerSetInterval(Timer * timer, int dt_ms);
 void                TimersRun(unsigned int t_ms);
@@ -39,7 +39,7 @@ int                 TimersRunNextIn(unsigned int t_ms);
 #define TIMER_DEL(timer) \
    if (timer) { TimerDel(timer); timer = NULL; }
 
-Idler              *IdlerAdd(void (*func) (void *data), void *data);
+Idler              *IdlerAdd(void (*func)(void *data), void *data);
 void                IdlerDel(Idler * id);
 void                IdlersRun(void);
 
diff --git a/src/x.c b/src/x.c
index 74bf5358..64ac8fd6 100644
--- a/src/x.c
+++ b/src/x.c
@@ -2401,7 +2401,7 @@ ERegionIsEmpty(EX_SrvRegion rgn)
 
 void
 ERegionShow(const char *txt, EX_SrvRegion rgn,
-	    void (*prf) (const char *fmt, ...))
+	    void (*prf)(const char *fmt, ...))
 {
    int                 i, nr;
    XRectangle         *pr;
diff --git a/src/xprop.c b/src/xprop.c
index 29eea50b..33408515 100644
--- a/src/xprop.c
+++ b/src/xprop.c
@@ -984,7 +984,7 @@ ex_netwm_name_get(EX_Window win, char **name)
    s = _ex_window_prop_string_utf8_get(win, EX_ATOM_NET_WM_NAME);
    *name = s;
 
-   return ! !s;
+   return !!s;
 }
 
 void
@@ -1001,7 +1001,7 @@ ex_netwm_visible_name_get(EX_Window win, char **name)
    s = _ex_window_prop_string_utf8_get(win, EX_ATOM_NET_WM_VISIBLE_NAME);
    *name = s;
 
-   return ! !s;
+   return !!s;
 }
 
 void
@@ -1018,7 +1018,7 @@ ex_netwm_icon_name_get(EX_Window win, char **name)
    s = _ex_window_prop_string_utf8_get(win, EX_ATOM_NET_WM_ICON_NAME);
    *name = s;
 
-   return ! !s;
+   return !!s;
 }
 
 void
@@ -1035,7 +1035,7 @@ ex_netwm_visible_icon_name_get(EX_Window win, char **name)
    s = _ex_window_prop_string_utf8_get(win, EX_ATOM_NET_WM_VISIBLE_ICON_NAME);
    *name = s;
 
-   return ! !s;
+   return !!s;
 }
 
 void
@@ -1085,5 +1085,5 @@ ex_netwm_startup_id_get(EX_Window win, char **id)
    s = _ex_window_prop_string_utf8_get(win, EX_ATOM_NET_STARTUP_ID);
    *id = s;
 
-   return ! !s;
+   return !!s;
 }
diff --git a/src/xwin.h b/src/xwin.h
index 5d60acba..1272976d 100644
--- a/src/xwin.h
+++ b/src/xwin.h
@@ -349,7 +349,7 @@ void                ERegionUnionOffset(EX_SrvRegion dst, int dx, int dy,
 int                 ERegionIsEmpty(EX_SrvRegion rgn);
 #endif
 void                ERegionShow(const char *txt, EX_SrvRegion rgn,
-				void (*prf) (const char *fmt, ...));
+				void (*prf)(const char *fmt, ...));
 
 void                EPictureSetClip(EX_Picture pict, EX_SrvRegion clip);