some cleanups/fixes inspired by Jukka Salmi's feedback

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index c171805..a6a04ca 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -5,26 +5,31 @@
 
 #include <X11/Xlib.h>
 
 
 #include <X11/Xlib.h>
 

-/********** CUSTOMIZE **********/
+/* CUSTOMIZE */

 
 

-#define FONT                           "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR                                "#666699"
-#define FGCOLOR                                "#eeeeee"
-#define BORDERCOLOR                    "#9999CC"
-#define MASTERW                                52 /* percent */
+#define FONT                   "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR                        "#0a2c2d"
+#define FGCOLOR                        "#ddeeee"
+#define BORDERCOLOR            "#176164"
+#define MODKEY                 Mod1Mask /* Mod4Mask */
+/*
+#define BGCOLOR                        "#666699"
+#define FGCOLOR                        "#eeeeee"
+#define BORDERCOLOR            "#9999CC"
+*/
+#define MASTERW                        52 /* percent */

 #define WM_PROTOCOL_DELWIN     1
 
 /* tags */
 #define WM_PROTOCOL_DELWIN     1
 
 /* tags */

-enum { Tscratch, Tdev, Twww, Twork, TLast };
+enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };

 
 

-/********** CUSTOMIZE **********/
+/* END CUSTOMIZE */

 
 typedef union Arg Arg;
 
 typedef union Arg Arg;

-typedef struct DC DC;

 typedef struct Client Client;
 typedef struct Client Client;

+typedef enum Corner Corner;
+typedef struct DC DC;

 typedef struct Fnt Fnt;
 typedef struct Fnt Fnt;

-typedef struct Key Key;
-typedef struct Rule Rule;

 
 union Arg {
        const char **argv;
 
 union Arg {
        const char **argv;


@@ -32,28 +37,30 @@ union Arg {
 };
 
 /* atoms */
 };
 
 /* atoms */

-enum { WMProtocols, WMDelete, WMLast };

 enum { NetSupported, NetWMName, NetLast };
 enum { NetSupported, NetWMName, NetLast };

+enum { WMProtocols, WMDelete, WMLast };

 
 /* cursor */
 
 /* cursor */

-enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
+enum { CurNormal, CurResize, CurMove, CurLast };
+
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };

 
 struct Fnt {
 
 struct Fnt {

-       XFontStruct *xfont;
-       XFontSet set;

        int ascent;
        int descent;
        int height;
        int ascent;
        int descent;
        int height;

+       XFontSet set;
+       XFontStruct *xfont;

 };
 
 struct DC { /* draw context */
 };
 
 struct DC { /* draw context */

-       GC gc;
-       Drawable drawable;

        int x, y, w, h;
        int x, y, w, h;

-       Fnt font;

        unsigned long bg;
        unsigned long fg;
        unsigned long border;
        unsigned long bg;
        unsigned long fg;
        unsigned long border;

+       Drawable drawable;
+       Fnt font;
+       GC gc;

 };
 
 struct Client {
 };
 
 struct Client {


@@ -61,96 +68,79 @@ struct Client {
        char *tags[TLast];
        int proto;
        int x, y, w, h;
        char *tags[TLast];
        int proto;
        int x, y, w, h;

-       int tx, ty, tw, th;
+       int tx, ty, tw, th; /* title */

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        unsigned int border;
        long flags; 
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        unsigned int border;
        long flags; 

-       Bool dofloat;
+       Bool isfloat;
+       Bool ismax;
+       Client *next;
+       Client *prev;

        Window win;
        Window title;
        Window win;
        Window title;

-       Client *next;
-       Client *revert;

 };
 
 };
 

-struct Rule {
-       const char *class;
-       const char *instance;
-       char *tags[TLast];
-       Bool dofloat;
-};
-
-struct Key {
-       unsigned long mod;
-       KeySym keysym;
-       void (*func)(Arg *arg);
-       Arg arg;
-};
-
-extern Display *dpy;
-extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
-extern Cursor cursor[CurLast];
-extern Bool running, issel;
+extern char *tags[TLast], stext[1024];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;

 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 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 DC dc;
+extern Atom wmatom[WMLast], netatom[NetLast];
+extern Bool running, issel;

 extern Client *clients, *sel;
 extern Client *clients, *sel;

+extern Cursor cursor[CurLast];
+extern DC dc;
+extern Display *dpy;
+extern Window root, barwin;

 
 /* client.c */
 extern void ban(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 focus(Client *c);

-extern void settitle(Client *c);
-extern void resize(Client *c, Bool inc);
-extern void setsize(Client *c);
+extern void focusnext(Arg *arg);
+extern void focusprev(Arg *arg);
+extern Client *getclient(Window w);

 extern Client *getctitle(Window w);
 extern Client *getctitle(Window w);

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

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

+extern void killclient(Arg *arg);

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

-extern void gravitate(Client *c, Bool invert);
+extern void manage(Window w, XWindowAttributes *wa);
+extern void resize(Client *c, Bool sizehints, Corner sticky);
+extern void setsize(Client *c);
+extern void settitle(Client *c);
+extern void togglemax(Arg *arg);
+extern void unmanage(Client *c);

 extern void zoom(Arg *arg);
 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 */
 extern void drawall();
 extern void drawstatus();
 extern void drawtitle(Client *c);
 
 /* draw.c */
 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 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 textw(char *text);

-extern unsigned int texth(void);

 
 /* event.c */
 extern void grabkeys();
 
 /* main.c */
 
 /* event.c */
 extern void grabkeys();
 
 /* main.c */

+extern int getproto(Window w);

 extern void quit(Arg *arg);
 extern void quit(Arg *arg);

-extern int xerror(Display *dsply, XErrorEvent *ee);

 extern void sendevent(Window w, Atom a, long value);
 extern void sendevent(Window w, Atom a, long value);

-extern int getproto(Window w);
+extern int xerror(Display *dsply, XErrorEvent *ee);

 
 /* tag.c */
 
 /* tag.c */

-extern Client *getnext(Client *c);
-extern void settags(Client *c);
+extern void appendtag(Arg *arg);

 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);

-extern void view(Arg *arg);
-extern void appendtag(Arg *arg);
+extern Client *getnext(Client *c, unsigned int t);
+extern Client *getprev(Client *c);

 extern void replacetag(Arg *arg);
 extern void replacetag(Arg *arg);

+extern void settags(Client *c);
+extern void togglemode(Arg *arg);
+extern void view(Arg *arg);

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

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

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

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

 extern void spawn(Arg *arg);
 extern void spawn(Arg *arg);