From 717fa182d4ce129d3e8ab8466bf8ce8d70c40fae Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Tue, 17 Jan 2012 13:08:20 +0100
Subject: [PATCH] Replace flags instead bool in global struct

---
 src/wmfs.c | 16 ++++++++--------
 src/wmfs.h |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/wmfs.c b/src/wmfs.c
index b9604eb..d14eb64 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -154,7 +154,7 @@ wmfs_xinit(void)
       */
      SLIST_INIT(&W->h.barwin);
 
-     W->running = true;
+     W->flags |= WMFS_RUNNING;
 }
 
 void
@@ -344,7 +344,7 @@ wmfs_loop(void)
      int maxfd, fd = ConnectionNumber(W->dpy);
      fd_set iset;
 
-     while(W->running)
+     while(W->flags & WMFS_RUNNING)
      {
           maxfd = fd + 1;
 
@@ -361,7 +361,7 @@ wmfs_loop(void)
           {
                if(FD_ISSET(fd, &iset))
                {
-                    while(W->running && XPending(W->dpy))
+                    while((W->flags & WMFS_RUNNING) && XPending(W->dpy))
                     {
                          XNextEvent(W->dpy, &ev);
                          EVENT_HANDLE(&ev);
@@ -446,7 +446,7 @@ wmfs_quit(void)
           unlink(W->fifo.path);
      }
 
-     W->running = false;
+     W->flags &= ~WMFS_RUNNING;
 
      XCloseDisplay(W->dpy);
 }
@@ -458,8 +458,8 @@ uicb_reload(Uicb cmd)
 {
      (void)cmd;
 
-     W->running = false;
-     W->reload  = true;
+     W->flags &= ~WMFS_RUNNING;
+     W->flags |= WMFS_RELOAD;
 }
 
 void
@@ -467,7 +467,7 @@ uicb_quit(Uicb cmd)
 {
      (void)cmd;
 
-     W->running = false;
+     W->flags &= ~WMFS_RUNNING;
 }
 
 int
@@ -519,7 +519,7 @@ main(int argc, char **argv)
      wmfs_loop();
      wmfs_quit();
 
-     r = W->reload;
+     r = (W->flags & WMFS_RELOAD);
      free(W);
 
      if(r)
diff --git a/src/wmfs.h b/src/wmfs.h
index 6de0320..f0acf73 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -271,13 +271,14 @@ struct wmfs
      int xmaxw, xmaxh;
      int nscreen;
      Flags numlockmask;
-#define WMFS_SCAN 0x01
+#define WMFS_SCAN     0x01
+#define WMFS_RUNNING  0x02
+#define WMFS_RELOAD   0x04
      Flags flags;
      GC gc, rgc;
      Atom *net_atom;
      char **argv;
      char confpath[MAX_PATH_LEN];
-     bool running, reload;
 
      /* FIFO stuffs */
      struct