changed symbols for float/tiled mode, added mouse-driven mode toggle to buttonpress()

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index b96facd..c23c86c 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -11,15 +11,10 @@
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 #define PROTODELWIN            1
 
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 #define PROTODELWIN            1
 

-typedef union Arg Arg;
-typedef struct Client Client;
-typedef struct DC DC;
-typedef struct Fnt Fnt;
-
-union Arg {
+typedef union {

        const char *cmd;
        int i;
        const char *cmd;
        int i;

-};
+} Arg;

 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };
 
 /* atoms */
 enum { NetSupported, NetWMName, NetLast };


@@ -28,27 +23,31 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 

-/* windowcorners */
+/* color */
+enum { ColFG, ColBG, ColLast };
+
+/* window corners */

 typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 
 typedef enum { TopLeft, TopRight, BotLeft, BotRight } Corner;
 

-struct Fnt {
+typedef struct {

        int ascent;
        int descent;
        int height;
        XFontSet set;
        XFontStruct *xfont;
        int ascent;
        int descent;
        int height;
        XFontSet set;
        XFontStruct *xfont;

-};
+} Fnt;

 
 

-struct DC { /* draw context */
+typedef struct { /* draw context */

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

-       unsigned long bg;
-       unsigned long fg;
-       unsigned long border;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       unsigned long status[ColLast];

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

-};
+} DC;

 
 

+typedef struct Client Client;

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


@@ -64,13 +63,13 @@ struct Client {
        Client *next;
        Client *prev;
        Window win;
        Client *next;
        Client *prev;
        Window win;

-       Window title;
+       Window twin;

 };
 
 extern const char *tags[];
 extern char stext[1024];
 extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 };
 
 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;
+extern unsigned int ntags, numlockmask, modew;

 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];