rearranged

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 113e861..ba12527 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -94,6 +94,7 @@ extern Cursor cursor[CurLast];
 extern Bool running, issel;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Bool running, issel;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);

+extern Key key[];

 
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern char *tags[TLast], stext[1024];
 
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern char *tags[TLast], stext[1024];


@@ -101,47 +102,34 @@ extern char *tags[TLast], stext[1024];
 extern DC dc;
 extern Client *clients, *sel;
 
 extern DC dc;
 extern Client *clients, *sel;
 

-/* bar.c */
-extern void draw_bar();
-extern void barclick(XButtonPressedEvent *e);
-

 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
 extern void unmanage(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);

-extern void draw_client(Client *c);

 extern void resize(Client *c, Bool inc);
 extern void update_size(Client *c);
 extern Client *gettitle(Window w);
 extern void craise(Client *c);
 extern void lower(Client *c);
 extern void resize(Client *c, Bool inc);
 extern void update_size(Client *c);
 extern Client *gettitle(Window w);
 extern void craise(Client *c);
 extern void lower(Client *c);

-extern void ckill(Arg *arg);
-extern void nextc(Arg *arg);
-extern void prevc(Arg *arg);
-extern void max(Arg *arg);
-extern void floating(Arg *arg);
-extern void tiling(Arg *arg);
-extern void ttrunc(Arg *arg);
-extern void tappend(Arg *arg);
-extern void view(Arg *arg);
-extern void zoom(Arg *arg);

 extern void gravitate(Client *c, Bool invert);
 extern void gravitate(Client *c, Bool invert);

+extern void ban_client(Client *c);
+extern Client *next(Client *c);

 
 /* draw.c */
 
 /* draw.c */

-extern void drawtext(const char *text, Bool border);
+extern void draw_bar();
+extern void draw_client(Client *c);
+extern void drawtext(const char *text, Bool invert, Bool border);

 extern unsigned long initcolor(const char *colstr);
 extern void initfont(const char *fontstr);
 extern unsigned int textnw(char *text, unsigned int len);
 extern unsigned int textw(char *text);
 extern unsigned int texth(void);
 
 extern unsigned long initcolor(const char *colstr);
 extern void initfont(const char *fontstr);
 extern unsigned int textnw(char *text, unsigned int len);
 extern unsigned int textw(char *text);
 extern unsigned int texth(void);
 

-/* dev.c */
-extern void update_keys(void);
+/* key.c */
+extern void grabkeys();

 extern void keypress(XEvent *e);
 extern void keypress(XEvent *e);

-extern void mresize(Client *c);
-extern void mmove(Client *c);

 
 /* main.c */
 extern int error_handler(Display *dsply, XErrorEvent *e);
 
 /* main.c */
 extern int error_handler(Display *dsply, XErrorEvent *e);


@@ -149,8 +137,12 @@ extern void send_message(Window w, Atom a, long value);
 extern int win_proto(Window w);
 extern void quit(Arg *arg);
 
 extern int win_proto(Window w);
 extern void quit(Arg *arg);
 

+/* screen.c */
+extern void floating(Arg *arg);
+extern void tiling(Arg *arg);
+extern void view(Arg *arg);
+

 /* util.c */
 extern void error(const char *errstr, ...);
 extern void *emallocz(unsigned int size);
 extern void spawn(Arg *arg);
 /* util.c */
 extern void error(const char *errstr, ...);
 extern void *emallocz(unsigned int size);
 extern void spawn(Arg *arg);

-extern void swap(void **p1, void **p2);