all: Cosmetic and typo

CMakeLists.txt

@@ -27,19 +27,19 @@ project(${PROJECT_NAME} C)
 
 # Definition of the wmfs source
 set(wmfs_src
-  src/init.c
-  src/wmfs.c
-  src/config.c
-  src/event.c
-  src/mouse.c
-  src/util.c
-  src/layout.c
-  src/tag.c
   src/bar.c
-  src/draw.c
   src/client.c
+  src/config.c
+  src/draw.c
+  src/event.c
   src/frame.c
-  src/infobar.c)
+  src/infobar.c
+  src/init.c
+  src/layout.c
+  src/mouse.c
+  src/tag.c
+  src/util.c
+  src/wmfs.c)
 
 # Set the executable from the wmfs_src
 add_executable(wmfs ${wmfs_src})

src/event.c

@@ -150,7 +150,6 @@ configurerequest(XConfigureRequestEvent *ev)
 
           XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
      }
-
      XSync(dpy, False);
 
      return;
@@ -188,7 +187,6 @@ enternotify(XCrossingEvent *ev)
         || (c = client_gb_frame(ev->window))
         || (c = client_gb_titlebar(ev->window)))
           client_focus(c);
-
      else
           client_focus(NULL);
 
@@ -267,8 +265,7 @@ keypress(XKeyPressedEvent *ev)
      keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
      for(i = 0; i < conf.nkeybind; ++i)
           if(keysym == keys[i].keysym
-             && (keys[i].mod & ~(numlockmask | LockMask)) ==
+             && (keys[i].mod & ~(numlockmask | LockMask)) ==  (ev->state & ~(numlockmask | LockMask))
-             (ev->state & ~(numlockmask | LockMask))
              && keys[i].func)
                keys[i].func(keys[i].cmd);
 

src/infobar.c

@@ -79,7 +79,6 @@ infobar_init(void)
 void
 infobar_draw(void)
 {
-
      infobar_draw_taglist();
      infobar_draw_layout();
      bar_refresh_color(infobar->bar);
@@ -136,7 +135,6 @@ infobar_destroy(void)
      int i;
 
      bar_delete(infobar->bar);
-     bar_delete_subwin(infobar->bar);
      bar_delete(infobar->layout_button);
      bar_delete_subwin(infobar->layout_button);
      for(i = 1; i < conf.ntag + 1; ++i)
@@ -144,6 +142,7 @@ infobar_destroy(void)
           bar_delete_subwin(infobar->tags[i]);
           bar_delete(infobar->tags[i]);
      }
+     bar_delete_subwin(infobar->bar);
      efree(infobar);
 
      return;

src/wmfs.c

@@ -171,31 +171,23 @@ uicb_quit(uicb_t cmd)
 void
 scan(void)
 {
-     uint i, num;
+     uint i, n;
-     Window *wins = NULL, d;
+     Window usl, usl2, *w = NULL;
      XWindowAttributes wa;
 
-     if(XQueryTree(dpy, root, &d, &d, &wins, &num))
+     if(XQueryTree(dpy, root, &usl, &usl2, &w, &n))
      {
-          for(i = 0; i < num; i++)
+          for(i = 0; i < n; i++)
           {
-               if(!XGetWindowAttributes(dpy, wins[i], &wa)
+               if(!XGetWindowAttributes(dpy, w[i], &wa))
-                  || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d))
                     continue;
-               if(wa.map_state == IsViewable || getwinstate(wins[i]) == IconicState)
+               if(wa.override_redirect || XGetTransientForHint(dpy, w[i], &usl))
-                    client_manage(wins[i], &wa);
-
-          }
-          for(i = 0; i < num; i++)
-          {
-               if(!XGetWindowAttributes(dpy, wins[i], &wa))
                     continue;
-               if(XGetTransientForHint(dpy, wins[i], &d)
+               if(wa.map_state == IsViewable)
-                  && (wa.map_state == IsViewable || getwinstate(wins[i]) == IconicState))
+                    client_manage(w[i], &wa);
-                    client_manage(wins[i], &wa);
           }
      }
-     XFree(wins);
+     XFree(w);
 
      arrange();
 

src/wmfs.h

@@ -211,10 +211,8 @@ void init_key(void);
 void init_geometry(void);
 
 /* wmfs.c */
-void checkotherwm(void);
 int errorhandler(Display *d, XErrorEvent *event);
 int errorhandlerdummy(Display *d, XErrorEvent *event);
-int errorhandlerstart(Display *d, XErrorEvent *event);
 void quit(void);
 void mainloop(void);
 void scan(void);