rearranged several stuff

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 1d672fd..c171805 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -7,21 +7,29 @@
 
 /********** CUSTOMIZE **********/
 
 
 /********** CUSTOMIZE **********/
 

-#define FONT           "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR                "DarkSlateGrey"
-#define FGCOLOR                "LightSteelBlue"
-#define BORDERCOLOR    "SlateGray"
-#define WM_PROTOCOL_DELWIN 1
+#define FONT                           "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR                                "#666699"
+#define FGCOLOR                                "#eeeeee"
+#define BORDERCOLOR                    "#9999CC"
+#define MASTERW                                52 /* percent */
+#define WM_PROTOCOL_DELWIN     1

 
 /* tags */
 
 /* tags */

-enum { Tscratch, Tdev, Tirc, Twww, Twork, TLast };
+enum { Tscratch, Tdev, Twww, Twork, TLast };

 
 /********** CUSTOMIZE **********/
 
 
 /********** CUSTOMIZE **********/
 

+typedef union Arg Arg;

 typedef struct DC DC;
 typedef struct Client Client;
 typedef struct Fnt Fnt;
 typedef struct Key Key;
 typedef struct DC DC;
 typedef struct Client Client;
 typedef struct Fnt Fnt;
 typedef struct Key Key;

+typedef struct Rule Rule;
+
+union Arg {
+       const char **argv;
+       int i;
+};

 
 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };
 
 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };


@@ -58,80 +66,91 @@ struct Client {
        int grav;
        unsigned int border;
        long flags; 
        int grav;
        unsigned int border;
        long flags; 

+       Bool dofloat;

        Window win;
        Window win;

-       Window trans;

        Window title;
        Client *next;
        Window title;
        Client *next;

-       Client *snext;
+       Client *revert;
+};
+
+struct Rule {
+       const char *class;
+       const char *instance;
+       char *tags[TLast];
+       Bool dofloat;

 };
 
 struct Key {
        unsigned long mod;
        KeySym keysym;
 };
 
 struct Key {
        unsigned long mod;
        KeySym keysym;

-       void (*func)(void *aux);
-       void *aux;
+       void (*func)(Arg *arg);
+       Arg arg;

 };
 
 extern Display *dpy;
 };
 
 extern Display *dpy;

-extern Window root;
+extern Window root, barwin;

 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 extern Bool running, issel;

-extern void (*handler[LASTEvent]) (XEvent *);
+extern void (*handler[LASTEvent])(XEvent *);
+extern void (*arrange)(Arg *);
+extern Key key[];

 
 

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

 
 extern DC dc;
 
 extern DC dc;

-extern Client *clients, *stack;
+extern Client *clients, *sel;

 
 /* client.c */
 
 /* client.c */

+extern void ban(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 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);
-extern void update_size(Client *c);
-extern Client *gettitle(Window w);
-extern void craise(Client *c);
+extern void settitle(Client *c);
+extern void resize(Client *c, Bool inc);
+extern void setsize(Client *c);
+extern Client *getctitle(Window w);
+extern void higher(Client *c);

 extern void lower(Client *c);
 extern void lower(Client *c);

-extern void ckill(void *aux);
-extern void sel(void *aux);
-extern void max(void *aux);
-extern void floating(void *aux);
-extern void tiling(void *aux);

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

+extern void zoom(Arg *arg);
+extern void maximize(Arg *arg);
+extern void focusprev(Arg *arg);
+extern void focusnext(Arg *arg);
+extern void killclient(Arg *arg);

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

-extern void draw(Bool border, const char *text);
-extern unsigned long initcolor(const char *colstr);
-extern void initfont(const char *fontstr);
+extern void drawall();
+extern void drawstatus();
+extern void drawtitle(Client *c);
+extern void drawtext(const char *text, Bool invert, Bool border);
+extern unsigned long getcolor(const char *colstr);
+extern void setfont(const char *fontstr);

 extern unsigned int textnw(char *text, unsigned int len);
 extern unsigned int textw(char *text);
 extern unsigned int texth(void);
 
 /* event.c */
 extern unsigned int textnw(char *text, unsigned int len);
 extern unsigned int textw(char *text);
 extern unsigned int texth(void);
 
 /* event.c */

-extern void discard_events(long even_mask);
-
-/* dev.c */
-extern void update_keys(void);
-extern void keypress(XEvent *e);
-extern void mresize(Client *c);
-extern void mmove(Client *c);
+extern void grabkeys();

 
 /* main.c */
 
 /* main.c */

-extern int error_handler(Display *dsply, XErrorEvent *e);
-extern void send_message(Window w, Atom a, long value);
-extern int win_proto(Window w);
-extern void quit(void *aux);
+extern void quit(Arg *arg);
+extern int xerror(Display *dsply, XErrorEvent *ee);
+extern void sendevent(Window w, Atom a, long value);
+extern int getproto(Window w);
+
+/* tag.c */
+extern Client *getnext(Client *c);
+extern void settags(Client *c);
+extern void dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+extern void view(Arg *arg);
+extern void appendtag(Arg *arg);
+extern void replacetag(Arg *arg);

 
 /* util.c */
 
 /* util.c */

-extern void error(const char *errstr, ...);
+extern void eprint(const char *errstr, ...);

 extern void *emallocz(unsigned int size);
 extern void *emallocz(unsigned int size);

-extern void *emalloc(unsigned int size);
-extern void *erealloc(void *ptr, unsigned int size);
-extern char *estrdup(const char *str);
-extern void spawn(char *argv[]);
-extern void swap(void **p1, void **p2);
+extern void spawn(Arg *arg);