Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
dwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added Button{4,5} description to dwm.1
[dwm.git]
/
view.c
diff --git
a/view.c
b/view.c
index
503f1c2
..
06aed3e
100644
(file)
--- a/
view.c
+++ b/
view.c
@@
-2,6
+2,7
@@
* See LICENSE file for license details.
*/
#include "dwm.h"
* See LICENSE file for license details.
*/
#include "dwm.h"
+#include <stdio.h>
/* static */
/* static */
@@
-149,10
+150,14
@@
focusprev(Arg *arg) {
void
incnmaster(Arg *arg) {
void
incnmaster(Arg *arg) {
- if((nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+ if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
return;
nmaster += arg->i;
return;
nmaster += arg->i;
- arrange();
+ updatemodetext();
+ if(sel)
+ arrange();
+ else
+ drawstatus();
}
Bool
}
Bool
@@
-218,6
+223,7
@@
togglefloat(Arg *arg) {
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
void
togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
+ updatemodetext();
if(sel)
arrange();
else
if(sel)
arrange();
else
@@
-236,6
+242,12
@@
toggleview(Arg *arg) {
}
void
}
void
+updatemodetext() {
+ snprintf(mtext, sizeof mtext, arrange == dofloat ? FLOATSYMBOL : TILESYMBOL, nmaster);
+ bmw = textw(mtext);
+}
+
+void
view(Arg *arg) {
unsigned int i;
view(Arg *arg) {
unsigned int i;
@@
-260,14
+272,14
@@
zoom(Arg *arg) {
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
- c = sel;
- if((arrange != dofloat) && c != nexttiled(clients)) {
- detach(c);
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
- focus(c);
- arrange();
- }
+ if((c = sel) == nexttiled(clients))
+ if(!(c = nexttiled(c->next)))
+ return;
+ detach(c);
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
+ focus(c);
+ arrange();
}
}