From b3d7e07f18f0f69f8c3b3542615da62dfc4c6175 Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Mon, 19 Feb 2007 13:53:40 +0100 Subject: some more refactoring --- client.c | 42 ------------------------------------------ dwm.h | 10 +++++----- view.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/client.c b/client.c index 9a30526..e7a3864 100644 --- a/client.c +++ b/client.c @@ -60,20 +60,6 @@ xerrordummy(Display *dsply, XErrorEvent *ee) { /* extern */ -void -attach(Client *c) { - if(clients) - clients->prev = c; - c->next = clients; - clients = c; -} - -void -attachstack(Client *c) { - c->snext = stack; - stack = c; -} - void configure(Client *c) { XConfigureEvent ce; @@ -92,24 +78,6 @@ configure(Client *c) { XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce); } -void -detach(Client *c) { - if(c->prev) - c->prev->next = c->next; - if(c->next) - c->next->prev = c->prev; - if(c == clients) - clients = c->next; - c->next = c->prev = NULL; -} - -void -detachstack(Client *c) { - Client **tc; - for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); - *tc = c->snext; -} - void focus(Client *c) { if(c && !isvisible(c)) @@ -135,16 +103,6 @@ focus(Client *c) { XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); } -Client * -getclient(Window w) { - Client *c; - - for(c = clients; c; c = c->next) - if(c->win == w) - return c; - return NULL; -} - Bool isprotodel(Client *c) { int i, n; diff --git a/dwm.h b/dwm.h index 35950a6..4a820b0 100644 --- a/dwm.h +++ b/dwm.h @@ -99,13 +99,8 @@ extern Display *dpy; extern Window root, barwin; /* client.c */ -extern void attach(Client *c); /* attaches c to global client list */ -extern void attachstack(Client *c); /* attaches client to stack */ extern void configure(Client *c); /* send synthetic configure event */ -extern void detach(Client *c); /* detaches c from global client list */ -extern void detachstack(Client *c); /* detaches client from stack */ extern void focus(Client *c); /* focus c, c may be NULL */ -extern Client *getclient(Window w); /* return client of w */ extern Bool isprotodel(Client *c); /* returns True if c->win supports wmatom[WMDelete] */ extern void killclient(Arg *arg); /* kill c nicely */ extern void manage(Window w, XWindowAttributes *wa); /* manage new client */ @@ -148,9 +143,14 @@ extern void eprint(const char *errstr, ...); /* prints errstr and exits with 1 * extern void spawn(Arg *arg); /* forks a new subprocess with to arg's cmd */ /* view.c */ +extern void attach(Client *c); /* attaches c to global client list */ +extern void attachstack(Client *c); /* attaches client to stack */ extern void dofloat(void); /* arranges all windows floating */ +extern void detach(Client *c); /* detaches c from global client list */ +extern void detachstack(Client *c); /* detaches client from stack */ extern void focusnext(Arg *arg); /* focuses next visible client, arg is ignored */ extern void focusprev(Arg *arg); /* focuses previous visible client, arg is ignored */ +extern Client *getclient(Window w); /* return client of w */ extern Bool isvisible(Client *c); /* returns True if client is visible */ extern Client *nextmanaged(Client *c); /* returns managed successor of c */ extern void restack(void); /* restores z layers of all clients */ diff --git a/view.c b/view.c index cd07b94..4781b4e 100644 --- a/view.c +++ b/view.c @@ -7,6 +7,20 @@ void (*arrange)(void) = DEFMODE; +void +attach(Client *c) { + if(clients) + clients->prev = c; + c->next = clients; + clients = c; +} + +void +attachstack(Client *c) { + c->snext = stack; + stack = c; +} + void dofloat(void) { Client *c; @@ -30,6 +44,24 @@ dofloat(void) { restack(); } +void +detach(Client *c) { + if(c->prev) + c->prev->next = c->next; + if(c->next) + c->next->prev = c->prev; + if(c == clients) + clients = c->next; + c->next = c->prev = NULL; +} + +void +detachstack(Client *c) { + Client **tc; + for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext); + *tc = c->snext; +} + void focusnext(Arg *arg) { Client *c; @@ -62,6 +94,16 @@ focusprev(Arg *arg) { } } +Client * +getclient(Window w) { + Client *c; + + for(c = clients; c; c = c->next) + if(c->win == w) + return c; + return NULL; +} + Bool isvisible(Client *c) { unsigned int i; -- cgit v1.2.3-13-gbd6f