simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / wm.h

diff --git a/wm.h b/wm.h
index 7ee6103..b5b07b5 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -13,19 +13,6 @@
 
 typedef struct Client Client;
 typedef struct Key Key;
-typedef enum Align Align;
-
-enum Align {
-       NORTH = 0x01,
-       EAST  = 0x02,
-       SOUTH = 0x04,
-       WEST  = 0x08,
-       NEAST = NORTH | EAST,
-       NWEST = NORTH | WEST,
-       SEAST = SOUTH | EAST,
-       SWEST = SOUTH | WEST,
-       CENTER = NEAST | SWEST
-};
 
 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };
@@ -34,20 +21,16 @@ enum { NetSupported, NetWMName, NetLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 
-/* rects */
-enum { RFloat, RGrid, RLast };
-
 struct Client {
-       char name[256];
-       char tag[256];
-       unsigned int border;
+       char name[256], tag[256];
        int proto;
-       Bool fixedsize;
+       int x, y, w, h;
+       int tx, ty, tw, th;
+       int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       long flags; 
        Window win;
        Window trans;
        Window title;
-       XSizeHints size;
-       XRectangle r[RLast];
        Client *next;
        Client *snext;
 };
@@ -63,11 +46,10 @@ extern Display *dpy;
 extern Window root, barwin;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
-extern XRectangle rect, barrect;
 extern Bool running, sel_screen, grid;
 extern void (*handler[LASTEvent]) (XEvent *);
 
-extern int screen;
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh;
 extern char statustext[1024], tag[256];
 
 extern Brush brush;
@@ -80,6 +62,7 @@ extern void draw_bar();
 extern void run(void *aux);
 extern void quit(void *aux);
 extern void kill(void *aux);
+extern void sel(void *aux);
 
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);
@@ -89,9 +72,13 @@ extern void focus(Client *c);
 extern void update_name(Client *c);
 extern void draw_client(Client *c);
 extern void resize(Client *c);
+extern void update_size(Client *c);
+extern Client *gettitle(Window w);
+extern void raise(Client *c);
+extern void lower(Client *c);
 
 /* event.c */
-extern unsigned int discard_events(long even_mask);
+extern void discard_events(long even_mask);
 
 /* key.c */
 extern void update_keys();