Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
removed viewall signature from dwm.h
[dwm.git] / view.c
diff --git a/view.c b/view.c
index daf0711..14cfc1d 100644 (file)
--- a/view.c
+++ b/view.c
@@ -5,51 +5,24 @@
 
 /* static */
 
 
 /* static */
 
-static Client *
-minclient(void) {
-       Client *c, *min;
-
-       if((clients && clients->isfloat) || arrange == dofloat)
-               return clients; /* don't touch floating order */
-       for(min = c = clients; c; c = c->next)
-               if(c->weight < min->weight)
-                       min = c;
-       return min;
-}
-
 static Client *
 nexttiled(Client *c) {
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
 
 static Client *
 nexttiled(Client *c) {
        for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
        return c;
 }
 
-static void
-reorder(void) {
-       Client *c, *newclients, *tail;
-
-       newclients = tail = NULL;
-       while((c = minclient())) {
-               detach(c);
-               if(tail) {
-                       c->prev = tail;
-                       tail->next = c;
-                       tail = c;
-               }
-               else
-                       tail = newclients = c;
-       }
-       clients = newclients;
-}
-
 static void
 togglemax(Client *c) {
        XEvent ev;
 static void
 togglemax(Client *c) {
        XEvent ev;
+               
+       if(c->isfixed)
+               return;
 
        if((c->ismax = !c->ismax)) {
 
        if((c->ismax = !c->ismax)) {
-               c->rx = c->x; c->x = sx;
-               c->ry = c->y; c->y = bh;
-               c->rw = c->w; c->w = sw - 2 * BORDERPX;
-               c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
+               c->rx = c->x; c->x = wax;
+               c->ry = c->y; c->y = way;
+               c->rw = c->w; c->w = waw - 2 * BORDERPX;
+               c->rh = c->h; c->h = wah - 2 * BORDERPX;
        }
        else {
                c->x = c->rx;
        }
        else {
                c->x = c->rx;
@@ -96,17 +69,13 @@ dofloat(void) {
 
 void
 dotile(void) {
 
 void
 dotile(void) {
-       unsigned int i, n, mpx, stackw, stackh, th;
+       unsigned int i, n, mpx, stackw, th;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
        Client *c;
 
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-       mpx = (sw * master) / 1000;
-       stackw = sw - mpx;
-       stackh = sh - bh;
-       th = stackh;
-       if(n > 1)
-               th /= (n - 1);
+       mpx = (waw * master) / 1000;
+       stackw = waw - mpx;
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
 
        for(i = 0, c = clients; c; c = c->next)
                if(isvisible(c)) {
@@ -115,28 +84,26 @@ dotile(void) {
                                continue;
                        }
                        c->ismax = False;
                                continue;
                        }
                        c->ismax = False;
-                       c->x = sx;
-                       c->y = sy + bh;
+                       c->x = wax;
+                       c->y = way;
                        if(n == 1) { /* only 1 window */
                        if(n == 1) { /* only 1 window */
-                               c->w = sw - 2 * BORDERPX;
-                               c->h = sh - 2 * BORDERPX - bh;
+                               c->w = waw - 2 * BORDERPX;
+                               c->h = wah - 2 * BORDERPX;
                        }
                        else if(i == 0) { /* master window */
                                c->w = mpx - 2 * BORDERPX;
                        }
                        else if(i == 0) { /* master window */
                                c->w = mpx - 2 * BORDERPX;
-                               c->h = sh - bh - 2 * BORDERPX;
+                               c->h = wah - 2 * BORDERPX;
+                               th = wah / (n - 1);
                        }
                        else {  /* tile window */
                                c->x += mpx;
                                c->w = stackw - 2 * BORDERPX;
                                if(th > bh) {
                        }
                        else {  /* tile window */
                                c->x += mpx;
                                c->w = stackw - 2 * BORDERPX;
                                if(th > bh) {
-                                       c->y = sy + (i - 1) * th + bh;
-                                       if(i + 1 == n)
-                                               c->h = sh - c->y - 2 * BORDERPX;
-                                       else
-                                               c->h = th - 2 * BORDERPX;
+                                       c->y += (i - 1) * th;
+                                       c->h = th - 2 * BORDERPX;
                                }
                                else /* fallback if th < bh */
                                }
                                else /* fallback if th < bh */
-                                       c->h = stackh - 2 * BORDERPX;
+                                       c->h = wah - 2 * BORDERPX;
                        }
                        resize(c, False, TopLeft);
                        i++;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -192,25 +159,14 @@ isvisible(Client *c) {
 }
 
 void
 }
 
 void
-resizecol(Arg *arg) {
-       unsigned int n;
-       Client *c;
-
-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
-                       n++;
-       if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
-               return;
-       if(sel == getnext(clients)) {
+resizemaster(Arg *arg) {
+       if(arg->i == 0)
+               master = MASTER;
+       else {
                if(master + arg->i > 950 || master + arg->i < 50)
                        return;
                master += arg->i;
        }
                if(master + arg->i > 950 || master + arg->i < 50)
                        return;
                master += arg->i;
        }
-       else {
-               if(master - arg->i > 950 || master - arg->i < 50)
-                       return;
-               master -= arg->i;
-       }
        arrange();
 }
 
        arrange();
 }
 
@@ -244,6 +200,14 @@ restack(void) {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
+void
+togglefloat(Arg *arg) {
+       if (!sel || arrange == dofloat)
+               return;
+       sel->isfloat = !sel->isfloat;
+       arrange();
+}
+
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
 void
 togglemode(Arg *arg) {
        arrange = (arrange == dofloat) ? dotile : dofloat;
@@ -261,7 +225,6 @@ toggleview(Arg *arg) {
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
-       reorder();
        arrange();
 }
 
        arrange();
 }
 
@@ -270,19 +233,8 @@ view(Arg *arg) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
-               seltag[i] = False;
+               seltag[i] = (arg->i == -1) ? True : False;
        seltag[arg->i] = True;
        seltag[arg->i] = True;
-       reorder();
-       arrange();
-}
-
-void
-viewall(Arg *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltag[i] = True;
-       reorder();
        arrange();
 }
 
        arrange();
 }