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 b9ba8f7..b5b07b5 100644 (file)
--- a/wm.h
+++ b/wm.h
@@ -11,6 +11,9 @@
 
 #define WM_PROTOCOL_DELWIN 1
 
 
 #define WM_PROTOCOL_DELWIN 1
 

+typedef struct Client Client;
+typedef struct Key Key;
+

 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };
 /* atoms */
 enum { WMProtocols, WMDelete, WMLast };
 enum { NetSupported, NetWMName, NetLast };


@@ -18,23 +21,16 @@ enum { NetSupported, NetWMName, NetLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
 

-/* rects */
-enum { RFloat, RGrid, RLast };
-
-typedef struct Client Client;
-typedef struct Key Key;
-

 struct Client {
 struct Client {

-       char name[256];
-       char tag[256];
-       unsigned int border;
+       char name[256], tag[256];

        int proto;
        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;
        Window win;
        Window trans;
        Window title;

-       XSizeHints size;
-       XRectangle r[RLast];

        Client *next;
        Client *snext;
 };
        Client *next;
        Client *snext;
 };


@@ -42,20 +38,19 @@ struct Client {
 struct Key {
        unsigned long mod;
        KeySym keysym;
 struct Key {
        unsigned long mod;
        KeySym keysym;

-       void (*func)(char *arg);
-       char *arg;
+       void (*func)(void *aux);
+       void *aux;

 };
 
 extern Display *dpy;
 extern Window root, barwin;
 extern Atom wm_atom[WMLast], net_atom[NetLast];
 extern Cursor cursor[CurLast];
 };
 
 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 Bool running, sel_screen, grid;
 extern void (*handler[LASTEvent]) (XEvent *);
 

-extern int screen;
-extern char *bartext, tag[256];
+extern int screen, sx, sy, sw, sh, bx, by, bw, bh;
+extern char statustext[1024], tag[256];

 
 extern Brush brush;
 extern Client *clients, *stack;
 
 extern Brush brush;
 extern Client *clients, *stack;


@@ -64,8 +59,10 @@ extern Client *clients, *stack;
 extern void draw_bar();
 
 /* cmd.c */
 extern void draw_bar();
 
 /* cmd.c */

-extern void run(char *arg);
-extern void quit(char *arg);
+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);
 
 /* client.c */
 extern void manage(Window w, XWindowAttributes *wa);


@@ -73,14 +70,24 @@ extern void unmanage(Client *c);
 extern Client *getclient(Window w);
 extern void focus(Client *c);
 extern void update_name(Client *c);
 extern Client *getclient(Window w);
 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 */
 
 /* event.c */

-extern unsigned int flush_events(long even_mask);
+extern void discard_events(long even_mask);

 
 /* key.c */
 extern void update_keys();
 extern void keypress(XEvent *e);
 
 
 /* key.c */
 extern void update_keys();
 extern void keypress(XEvent *e);
 

+/* mouse.c */
+extern void mresize(Client *c);
+extern void mmove(Client *c);
+

 /* wm.c */
 extern int error_handler(Display *dpy, XErrorEvent *error);
 extern void send_message(Window w, Atom a, long value);
 /* wm.c */
 extern int error_handler(Display *dpy, XErrorEvent *error);
 extern void send_message(Window w, Atom a, long value);