oops

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index c171805..c23c86c 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -3,154 +3,137 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+#include "config.h"

 #include <X11/Xlib.h>
 
 #include <X11/Xlib.h>
 

-/********** CUSTOMIZE **********/
+/* mask shorthands, used in event.c and client.c */
+#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+#define PROTODELWIN            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 */
-enum { Tscratch, Tdev, Twww, Twork, TLast };
-
-/********** CUSTOMIZE **********/
-
-typedef union Arg Arg;
-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;
+typedef union {
+       const char *cmd;

        int i;
        int i;

-};
+} 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 };

 
 

-struct Fnt {
-       XFontStruct *xfont;
-       XFontSet set;
+/* color */
+enum { ColFG, ColBG, ColLast };
+
+/* window corners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
+
+typedef struct {

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

-};
+       XFontSet set;
+       XFontStruct *xfont;
+} Fnt;

 
 

-struct DC { /* draw context */
-       GC gc;
-       Drawable drawable;
+typedef struct { /* draw context */

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

+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       unsigned long status[ColLast];
+       Drawable drawable;

        Fnt font;
        Fnt font;

-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
-};
+       GC gc;
+} DC;

 
 

+typedef struct Client Client;

 struct Client {
        char name[256];
 struct Client {
        char name[256];

-       char *tags[TLast];

        int proto;
        int x, y, w, h;
        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;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;

-       unsigned int border;

        long flags; 
        long flags; 

-       Bool dofloat;
-       Window win;
-       Window title;
+       unsigned int border;
+       Bool isfloat;
+       Bool ismax;
+       Bool *tags;

        Client *next;
        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;
+       Client *prev;
+       Window win;
+       Window twin;

 };
 
 };
 

-extern Display *dpy;
-extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
-extern Cursor cursor[CurLast];
-extern Bool running, issel;
+extern const char *tags[];
+extern char stext[1024];
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+extern unsigned int ntags, numlockmask, modew;

 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, *seltag;

 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 Client *getclient(Window w);

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

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

 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);
 extern void killclient(Arg *arg);

+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);

 
 /* 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 texth(void);
+extern unsigned int textw(const char *text);

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

+extern void procevent();

 
 /* main.c */
 
 /* 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 void initrregs();

 extern Client *getnext(Client *c);
 extern Client *getnext(Client *c);

+extern Client *getprev(Client *c);

 extern void settags(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);
+extern void tag(Arg *arg);
+extern void toggletag(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 *erealloc(void *ptr, unsigned int size);

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

+
+/* view.c */
+extern void dofloat(Arg *arg);
+extern void dotile(Arg *arg);
+extern void focusnext(Arg *arg);
+extern void focusprev(Arg *arg);
+extern Bool isvisible(Client *c);
+extern void restack();
+extern void togglemode(Arg *arg);
+extern void toggleview(Arg *arg);
+extern void view(Arg *arg);
+extern void zoom(Arg *arg);