tmoved focus{next,prev} and nexttiled from client.c to layout.c (because those … | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 29c26b88e7333fb8ea022c4bb4277bc0394ab9e3 | |
parent f196b71e4d543e7d8c4fd6398cf1bedd3dafc024 | |
Author: Anselm R. Garbe <[email protected]> | |
Date: Wed, 21 Feb 2007 11:39:57 +0100 | |
moved focus{next,prev} and nexttiled from client.c to layout.c (because those a… | |
Diffstat: | |
M client.c | 46 ++++++-----------------------… | |
M dwm.h | 8 ++++---- | |
M layout.c | 46 +++++++++++++++++++++++++----… | |
3 files changed, 50 insertions(+), 50 deletions(-) | |
--- | |
diff --git a/client.c b/client.c | |
t@@ -171,38 +171,6 @@ focus(Client *c) { | |
} | |
void | |
-focusnext(Arg *arg) { | |
- Client *c; | |
- | |
- if(!sel) | |
- return; | |
- for(c = sel->next; c && !isvisible(c); c = c->next); | |
- if(!c) | |
- for(c = clients; c && !isvisible(c); c = c->next); | |
- if(c) { | |
- focus(c); | |
- restack(); | |
- } | |
-} | |
- | |
-void | |
-focusprev(Arg *arg) { | |
- Client *c; | |
- | |
- if(!sel) | |
- return; | |
- for(c = sel->prev; c && !isvisible(c); c = c->prev); | |
- if(!c) { | |
- for(c = clients; c && c->next; c = c->next); | |
- for(; c && !isvisible(c); c = c->prev); | |
- } | |
- if(c) { | |
- focus(c); | |
- restack(); | |
- } | |
-} | |
- | |
-void | |
killclient(Arg *arg) { | |
if(!sel) | |
return; | |
t@@ -266,12 +234,6 @@ manage(Window w, XWindowAttributes *wa) { | |
lt->arrange(); | |
} | |
-Client * | |
-nexttiled(Client *c) { | |
- for(; c && (c->isversatile || !isvisible(c)); c = c->next); | |
- return c; | |
-} | |
- | |
void | |
resize(Client *c, int x, int y, int w, int h, Bool sizehints) { | |
float actual, dx, dy, max, min; | |
t@@ -341,6 +303,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehi… | |
} | |
void | |
+toggleversatile(Arg *arg) { | |
+ if(!sel || lt->arrange == versatile) | |
+ return; | |
+ sel->isversatile = !sel->isversatile; | |
+ lt->arrange(); | |
+} | |
+ | |
+void | |
updatesizehints(Client *c) { | |
long msize; | |
XSizeHints size; | |
diff --git a/dwm.h b/dwm.h | |
t@@ -105,13 +105,11 @@ extern Window root, barwin; | |
/* client.c */ | |
extern void configure(Client *c); /* send synthetic configure e… | |
extern void focus(Client *c); /* focus c, c may be NULL… | |
-extern void focusnext(Arg *arg); /* focuses next visible client… | |
-extern void focusprev(Arg *arg); /* focuses previous visible cl… | |
extern void killclient(Arg *arg); /* kill c nicely */ | |
extern void manage(Window w, XWindowAttributes *wa); /* manage new clie… | |
-extern Client *nexttiled(Client *c); /* returns tiled successor… | |
extern void resize(Client *c, int x, int y, | |
int w, int h, Bool sizehints); /* resize with given coo… | |
+extern void toggleversatile(Arg *arg); /* toggles focused clien… | |
extern void updatesizehints(Client *c); /* update the size hint… | |
extern void updatetitle(Client *c); /* update the name of c */ | |
extern void unmanage(Client *c); /* destroy c */ | |
t@@ -127,12 +125,14 @@ extern unsigned int textw(const char *text); /* r… | |
extern void grabkeys(void); /* grab all keys defined in… | |
/* layout.c */ | |
+extern void focusnext(Arg *arg); /* focuses next visible client… | |
+extern void focusprev(Arg *arg); /* focuses previous visible cl… | |
extern void incnmaster(Arg *arg); /* increments nmaster with ar… | |
extern void initlayouts(void); /* initialize layout arr… | |
+extern Client *nexttiled(Client *c); /* returns tiled successor… | |
extern void resizemaster(Arg *arg); /* resizes the master perce… | |
extern void restack(void); /* restores z layers of all … | |
extern void setlayout(Arg *arg); /* sets layout, -1 toggles */ | |
-extern void toggleversatile(Arg *arg); /* toggles focusesd clie… | |
extern void versatile(void); /* arranges all windows ve… | |
/* main.c */ | |
diff --git a/layout.c b/layout.c | |
t@@ -69,6 +69,38 @@ LAYOUTS | |
/* extern */ | |
void | |
+focusnext(Arg *arg) { | |
+ Client *c; | |
+ | |
+ if(!sel) | |
+ return; | |
+ for(c = sel->next; c && !isvisible(c); c = c->next); | |
+ if(!c) | |
+ for(c = clients; c && !isvisible(c); c = c->next); | |
+ if(c) { | |
+ focus(c); | |
+ restack(); | |
+ } | |
+} | |
+ | |
+void | |
+focusprev(Arg *arg) { | |
+ Client *c; | |
+ | |
+ if(!sel) | |
+ return; | |
+ for(c = sel->prev; c && !isvisible(c); c = c->prev); | |
+ if(!c) { | |
+ for(c = clients; c && c->next; c = c->next); | |
+ for(; c && !isvisible(c); c = c->prev); | |
+ } | |
+ if(c) { | |
+ focus(c); | |
+ restack(); | |
+ } | |
+} | |
+ | |
+void | |
incnmaster(Arg *arg) { | |
if((lt->arrange != tile) || (nmaster + arg->i < 1) | |
|| (wah / (nmaster + arg->i) <= 2 * BORDERPX)) | |
t@@ -93,6 +125,12 @@ initlayouts(void) { | |
} | |
} | |
+Client * | |
+nexttiled(Client *c) { | |
+ for(; c && (c->isversatile || !isvisible(c)); c = c->next); | |
+ return c; | |
+} | |
+ | |
void | |
resizemaster(Arg *arg) { | |
if(lt->arrange != tile) | |
t@@ -154,14 +192,6 @@ setlayout(Arg *arg) { | |
} | |
void | |
-toggleversatile(Arg *arg) { | |
- if(!sel || lt->arrange == versatile) | |
- return; | |
- sel->isversatile = !sel->isversatile; | |
- lt->arrange(); | |
-} | |
- | |
-void | |
versatile(void) { | |
Client *c; | |