after some days of experimenting with grey background, I finally give up and switch...

[dwm.git] / dwm.h

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

+#include "config.h"

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

-#include CONFIG

 
 /* mask shorthands, used in event.c and client.c */
 
 /* mask shorthands, used in event.c and client.c */

-#define BUTTONMASK     (ButtonPressMask | ButtonReleaseMask)
-#define MOUSEMASK      (BUTTONMASK | PointerMotionMask)
+#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;


@@ -16,7 +17,7 @@ typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 union Arg {
 typedef struct Fnt Fnt;
 
 union Arg {

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

        int i;
 };
 
        int i;
 };
 


@@ -50,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 *prev;
        Window win;
        Window title;
 };
 
        Client *next;
        Client *prev;
        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];


@@ -88,7 +91,6 @@ 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 resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);


@@ -103,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();


@@ -118,6 +120,7 @@ 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 void initrregs();

 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
 extern void replacetag(Arg *arg);
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
 extern void replacetag(Arg *arg);