upgraded version info

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index e72bca2..88640b8 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -3,36 +3,21 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

+#include "config.h"

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

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

 
 typedef union Arg Arg;
 typedef struct Client Client;
 
 typedef union Arg Arg;
 typedef struct Client Client;

-typedef enum Corner Corner;

 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 union Arg {
 typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 union Arg {

-       const char **argv;
+       const char *cmd;

        int i;
 };
 
        int i;
 };
 


@@ -43,7 +28,8 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 

-enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+/* windowcorners */
+typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;

 
 struct Fnt {
        int ascent;
 
 struct Fnt {
        int ascent;


@@ -65,24 +51,26 @@ struct DC { /* draw context */
 
 struct Client {
        char name[256];
 
 struct Client {
        char name[256];

-       char *tags[TLast];

        int proto;
        int x, y, w, h;
        int tx, ty, tw, th; /* title */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;
        int proto;
        int x, y, w, h;
        int tx, ty, tw, th; /* title */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int grav;

-       unsigned int border;

        long flags; 
        long flags; 

+       unsigned int border;

        Bool isfloat;
        Bool ismax;
        Bool isfloat;
        Bool ismax;

+       Bool *tags;

        Client *next;
        Client *next;

-       Client *revert;
+       Client *prev;

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

-extern char *tags[TLast], stext[1024];
+extern const char *tags[];
+extern char stext[1024];

 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;

+extern unsigned int ntags;

 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];


@@ -103,10 +91,8 @@ extern Client *getctitle(Window w);
 extern void gravitate(Client *c, Bool invert);
 extern void higher(Client *c);
 extern void killclient(Arg *arg);
 extern void gravitate(Client *c, Bool invert);
 extern void higher(Client *c);
 extern void killclient(Arg *arg);

-extern void lower(Client *c);

 extern void manage(Window w, XWindowAttributes *wa);
 extern void manage(Window w, XWindowAttributes *wa);

-extern void pop(Client *c);
-extern void resize(Client *c, Bool inc, Corner sticky);
+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 setsize(Client *c);
 extern void settitle(Client *c);
 extern void togglemax(Arg *arg);


@@ -119,7 +105,7 @@ extern void drawstatus();
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);

-extern unsigned int textw(char *text);
+extern unsigned int textw(const char *text);

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


@@ -134,12 +120,15 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
 extern void appendtag(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
 extern void appendtag(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);

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

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

+extern void viewnext(Arg *arg);
+extern void viewprev(Arg *arg);

 
 /* util.c */
 extern void *emallocz(unsigned int size);
 
 /* util.c */
 extern void *emallocz(unsigned int size);