merged tag.c, view.c and tile.c to manage.c

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 79627bd..318ce9e 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -36,11 +36,9 @@
 
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)

-/* other stuff used in different places */
-#define PROTODELWIN            1

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

-enum { WMProtocols, WMDelete, WMLast };                        /* default atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast };       /* default atoms */

 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 


@@ -69,13 +67,13 @@ typedef struct {
 typedef struct Client Client;
 struct Client {
        char name[256];
 typedef struct Client Client;
 struct Client {
        char name[256];

-       int proto;

        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int x, y, w, h;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;

+       int minax, minay, maxax, maxay;

        long flags; 
        unsigned int border;
        long flags; 
        unsigned int border;

-       Bool isfloat, isfixed, ismax;
+       Bool isbanned, isfixed, isfloat, ismax;

        Bool *tags;
        Client *next;
        Client *prev;
        Bool *tags;
        Client *next;
        Client *prev;


@@ -93,7 +91,7 @@ extern unsigned int ntags, numlockmask;               /* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern void (*arrange)(void);                  /* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern void (*arrange)(void);                  /* arrange function, indicates mode  */
 extern Atom wmatom[WMLast], netatom[NetLast];

-extern Bool running, issel, *seltag;           /* seltag is array of Bool */
+extern Bool running, selscreen, *seltag;       /* seltag is array of Bool */

 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */
 extern Client *clients, *sel, *stack;          /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */


@@ -103,10 +101,10 @@ extern Window root, barwin;
 /* client.c */
 extern void configure(Client *c);              /* send synthetic configure event */
 extern void focus(Client *c);                  /* focus c, c may be NULL */
 /* client.c */
 extern void configure(Client *c);              /* send synthetic configure event */
 extern void focus(Client *c);                  /* focus c, c may be NULL */

-extern Client *getclient(Window w);            /* return client of w */

 extern void killclient(Arg *arg);              /* kill c nicely */
 extern void manage(Window w, XWindowAttributes *wa);   /* manage new client */
 extern void killclient(Arg *arg);              /* kill c nicely */
 extern void manage(Window w, XWindowAttributes *wa);   /* manage new client */

-extern void resize(Client *c, Bool sizehints); /* resize c*/
+extern void resize(Client *c, int x, int y,
+               int w, int h, Bool sizehints);  /* resize c*/

 extern void updatesizehints(Client *c);                /* update the size hint variables of c */
 extern void updatetitle(Client *c);            /* update the name of c */
 extern void unmanage(Client *c);               /* destroy c */
 extern void updatesizehints(Client *c);                /* update the size hint variables of c */
 extern void updatetitle(Client *c);            /* update the name of c */
 extern void unmanage(Client *c);               /* destroy c */


@@ -122,36 +120,35 @@ extern void grabkeys(void);                       /* grab all keys defined in config.h */
 extern void procevent(void);                   /* process pending X events */
 
 /* main.c */
 extern void procevent(void);                   /* process pending X events */
 
 /* main.c */

-extern int getproto(Window w);                 /* return protocol mask of WMProtocols property of w */

 extern void quit(Arg *arg);                    /* quit dwm nicely */
 extern void sendevent(Window w, Atom a, long value);   /* send synthetic event to w */
 extern int xerror(Display *dsply, XErrorEvent *ee);    /* dwm's X error handler */
 
 extern void quit(Arg *arg);                    /* quit dwm nicely */
 extern void sendevent(Window w, Atom a, long value);   /* send synthetic event to w */
 extern int xerror(Display *dsply, XErrorEvent *ee);    /* dwm's X error handler */
 

-/* tag.c */
-extern void initrregs(void);                   /* initialize regexps of rules defined in config.h */
-extern Client *getnext(Client *c);             /* returns next visible client */
-extern Client *getprev(Client *c);             /* returns previous visible client */
-extern void settags(Client *c, Client *trans); /* sets tags of c */
-extern void tag(Arg *arg);                     /* tags c with arg's index */
-extern void toggletag(Arg *arg);               /* toggles c tags with arg's index */
-
-/* util.c */
-extern void *emallocz(unsigned int size);      /* allocates zero-initialized memory, exits on error */
-extern void eprint(const char *errstr, ...);   /* prints errstr and exits with 1 */
-extern void spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */
-
-/* view.c */
+/* manage.c */
+extern void attach(Client *c);                 /* attaches c to global client list */
+extern void attachstack(Client *c);            /* attaches client to stack */
+extern void compileregexps(void);              /* initialize regexps of rules defined in config.h */

 extern void detach(Client *c);                 /* detaches c from global client list */
 extern void detach(Client *c);                 /* detaches c from global client list */

+extern void detachstack(Client *c);            /* detaches client from stack */

 extern void dofloat(void);                     /* arranges all windows floating */
 extern void dotile(void);                      /* arranges all windows tiled */
 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */
 extern void dofloat(void);                     /* arranges all windows floating */
 extern void dotile(void);                      /* arranges all windows tiled */
 extern void focusnext(Arg *arg);               /* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);               /* focuses previous visible client, arg is ignored */

+extern Client *getclient(Window w);            /* return client of w */

 extern void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
 extern Bool isvisible(Client *c);              /* returns True if client is visible */
 extern void resizemaster(Arg *arg);            /* resizes the master percent with arg's index value */
 extern void restack(void);                     /* restores z layers of all clients */
 extern void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
 extern Bool isvisible(Client *c);              /* returns True if client is visible */
 extern void resizemaster(Arg *arg);            /* resizes the master percent with arg's index value */
 extern void restack(void);                     /* restores z layers of all clients */

+extern void settags(Client *c, Client *trans); /* sets tags of c */
+extern void tag(Arg *arg);                     /* tags c with arg's index */

 extern void togglefloat(Arg *arg);             /* toggles focusesd client between floating/non-floating state */
 extern void togglemode(Arg *arg);              /* toggles global arrange function (dotile/dofloat) */
 extern void togglefloat(Arg *arg);             /* toggles focusesd client between floating/non-floating state */
 extern void togglemode(Arg *arg);              /* toggles global arrange function (dotile/dofloat) */

+extern void toggletag(Arg *arg);               /* toggles c tags with arg's index */

 extern void toggleview(Arg *arg);              /* toggles the tag with arg's index (in)visible */
 extern void view(Arg *arg);                    /* views the tag with arg's index */
 extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */
 extern void toggleview(Arg *arg);              /* toggles the tag with arg's index (in)visible */
 extern void view(Arg *arg);                    /* views the tag with arg's index */
 extern void zoom(Arg *arg);                    /* zooms the focused client to master area, arg is ignored */

+
+/* util.c */
+extern void *emallocz(unsigned int size);      /* allocates zero-initialized memory, exits on error */
+extern void eprint(const char *errstr, ...);   /* prints errstr and exits with 1 */
+extern void spawn(Arg *arg);                   /* forks a new subprocess with to arg's cmd */