some more refactoring

diff --git a/main.c b/main.c
index bd19e49..20450db 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@
 
 char stext[256];
 int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;
 
 char stext[256];
 int bh, bmw, screen, sx, sy, sw, sh, wax, way, waw, wah;

-unsigned int master, nmaster, ntags, numlockmask;
+unsigned int ntags, numlockmask;

 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool *seltag;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool *seltag;


@@ -133,8 +133,6 @@ setup(void) {
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       master = MASTER;
-       nmaster = NMASTER;

        bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* bar */
        dc.h = bh = dc.font.height + 2;
        bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
        /* bar */
        dc.h = bh = dc.font.height + 2;

diff --git a/tile.c b/tile.c
index a9bc0f5..fe25943 100644 (file)
--- a/tile.c
+++ b/tile.c
@@ -3,15 +3,17 @@
  */
 #include "dwm.h"
 
  */
 #include "dwm.h"
 

+unsigned int master = MASTER;
+unsigned int nmaster = NMASTER;
+

 /* static */
 
 static void
 togglemax(Client *c) {
        XEvent ev;
 /* static */
 
 static void
 togglemax(Client *c) {
        XEvent ev;

-               
+

        if(c->isfixed)
                return;
        if(c->isfixed)
                return;

-

        if((c->ismax = !c->ismax)) {
                c->rx = c->x;
                c->ry = c->y;
        if((c->ismax = !c->ismax)) {
                c->rx = c->x;
                c->ry = c->y;