fixed a typo

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 56b8433..236c780 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -1,5 +1,4 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
+/* See LICENSE file for copyright and license details.

  *
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window
  *
  * dynamic window manager is designed like any other X client as well. It is
  * driven through handling X events. In contrast to other X clients, a window


@@ -36,10 +35,11 @@
 /* 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)
 

-enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMState, WMLast };       /* default atoms */
+enum { BarTop, BarBot, BarOff };                       /* bar position */

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

+enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMState, WMLast };       /* default atoms */

 
 typedef struct Client Client;
 struct Client {
 
 typedef struct Client Client;
 struct Client {


@@ -47,9 +47,10 @@ struct Client {
        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;
+       int minax, maxax, minay, maxay;
+       int unmapped;

        long flags; 
        long flags; 

-       unsigned int border;
+       unsigned int border, oldborder;

        Bool isbanned, isfixed, ismax, isfloating;
        Bool *tags;
        Client *next;
        Bool isbanned, isfixed, ismax, isfloating;
        Bool *tags;
        Client *next;


@@ -73,40 +74,36 @@ typedef struct {
        } font;
 } DC; /* draw context */
 
        } font;
 } DC; /* draw context */
 

-typedef struct {
-       const char *symbol;
-       void (*arrange)(void);
-} Layout;
-
-extern const char *tags[];             /* all tags */
-char stext[256];                       /* status text */
-int screen, sx, sy, sw, sh;            /* screen geometry */
-int wax, way, wah, waw;                        /* windowarea geometry */
-unsigned int bh, blw;                  /* bar height, bar layout label width */
-unsigned int ntags, numlockmask;       /* number of tags, dynamic lock mask */
-void (*handler[LASTEvent])(XEvent *);  /* event handler */
-Atom wmatom[WMLast], netatom[NetLast];
-Bool selscreen, *seltag;               /* seltag is array of Bool */
-Client *clients, *sel, *stack;         /* global client list and stack */
-Cursor cursor[CurLast];
-DC dc;                                 /* global draw context */
-Display *dpy;
-Layout *lt;
-Window root, barwin;
+extern const char *tags[];                     /* all tags */
+extern char stext[256];                                /* status text */
+extern int screen, sx, sy, sw, sh;             /* screen geometry */
+extern int wax, way, wah, waw;                 /* windowarea geometry */
+extern unsigned int bh, blw, bpos;             /* bar height, bar layout label width, bar position */
+extern unsigned int ntags, numlockmask;                /* number of tags, numlock mask */
+extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
+extern Atom dwmtags, wmatom[WMLast], netatom[NetLast];
+extern Bool 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 Display *dpy;
+extern Window root, barwin;

 
 /* client.c */
 void attach(Client *c);                        /* attaches c to global client list */
 
 /* client.c */
 void attach(Client *c);                        /* attaches c to global client list */

+void ban(Client *c);                   /* bans c */

 void configure(Client *c);             /* send synthetic configure event */
 void detach(Client *c);                        /* detaches c from global client list */
 void configure(Client *c);             /* send synthetic configure event */
 void detach(Client *c);                        /* detaches c from global client list */

-void focus(Client *c);                 /* focus c, c may be NULL */
-void killclient(const char *arg);              /* kill c nicely */
+void focus(Client *c);                 /* focus c if visible && !NULL, or focus top visible */
+void killclient(const char *arg);      /* kill sel  nicely */

 void manage(Window w, XWindowAttributes *wa);  /* manage new client */
 void resize(Client *c, int x, int y,
                int w, int h, Bool sizehints);  /* resize with given coordinates c*/
 void manage(Window w, XWindowAttributes *wa);  /* manage new client */
 void resize(Client *c, int x, int y,
                int w, int h, Bool sizehints);  /* resize with given coordinates c*/

-void togglefloating(const char *arg);  /* toggles focused client between floating/tiled state */
-void updatesizehints(Client *c);               /* update the size hint variables of c */
-void updatetitle(Client *c);           /* update the name of c */
+void togglefloating(const char *arg);  /* toggles sel between floating/tiled state */
+void unban(Client *c);                 /* unbans c */

 void unmanage(Client *c);              /* destroy c */
 void unmanage(Client *c);              /* destroy c */

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

 
 /* draw.c */
 void drawstatus(void);                 /* draw the bar */
 
 /* draw.c */
 void drawstatus(void);                 /* draw the bar */


@@ -117,28 +114,29 @@ unsigned int textw(const char *text);     /* return the width of text in px*/
 void grabkeys(void);                   /* grab all keys defined in config.h */
 
 /* layout.c */
 void grabkeys(void);                   /* grab all keys defined in config.h */
 
 /* layout.c */

-void floating(void);                   /* arranges all windows floating */
+void arrange(void);                    /* arranges all windows depending on the layout in use */

 void focusclient(const char *arg);     /* focuses next(1)/previous(-1) visible client */
 void focusclient(const char *arg);     /* focuses next(1)/previous(-1) visible client */

-void incmasterw(const char *arg);      /* increments the master width with arg's index value */
-void incnmaster(const char *arg);      /* increments nmaster with arg's index value */
+const char *getsymbol(void);           /* returns symbol of enabled layout */
+Bool isfloating(void);                 /* returns True if floating layout is enabled */
+Bool isarrange(void (*func)());                /* returns True if func is the layout function in use */

 void initlayouts(void);                        /* initialize layout array */
 Client *nexttiled(Client *c);          /* returns tiled successor of c */
 void restack(void);                    /* restores z layers of all clients */
 void initlayouts(void);                        /* initialize layout array */
 Client *nexttiled(Client *c);          /* returns tiled successor of c */
 void restack(void);                    /* restores z layers of all clients */

-void setlayout(const char *arg);               /* sets layout, -1 toggles */
-void togglemax(const char *arg);               /* toggles maximization of floating client */
-void zoom(const char *arg);            /* zooms the focused client to master area, arg is ignored */
+void setlayout(const char *arg);       /* sets layout, NULL means next layout */
+void togglebar(const char *arg);       /* shows/hides the bar */
+void togglemax(const char *arg);       /* toggles maximization of floating client */

 
 /* main.c */
 
 /* main.c */

+void updatebarpos(void);               /* updates the bar position */

 void quit(const char *arg);            /* quit dwm nicely */
 void quit(const char *arg);            /* quit dwm nicely */

-void sendevent(Window w, Atom a, long value);  /* send synthetic event to w */

 int xerror(Display *dsply, XErrorEvent *ee);   /* dwm's X error handler */
 
 /* tag.c */
 void compileregs(void);                        /* initialize regexps of rules defined in config.h */
 Bool isvisible(Client *c);             /* returns True if client is visible */
 void settags(Client *c, Client *trans);        /* sets tags of c */
 int xerror(Display *dsply, XErrorEvent *ee);   /* dwm's X error handler */
 
 /* tag.c */
 void compileregs(void);                        /* initialize regexps of rules defined in config.h */
 Bool isvisible(Client *c);             /* returns True if client is visible */
 void settags(Client *c, Client *trans);        /* sets tags of c */

-void tag(const char *arg);             /* tags c with arg's index */
-void toggletag(const char *arg);               /* toggles c tags with arg's index */
+void tag(const char *arg);             /* tags sel with arg's index */
+void toggletag(const char *arg);       /* toggles sel tags with arg's index */

 void toggleview(const char *arg);      /* toggles the tag with arg's index (in)visible */
 void view(const char *arg);            /* views the tag with arg's index */
 
 void toggleview(const char *arg);      /* toggles the tag with arg's index (in)visible */
 void view(const char *arg);            /* views the tag with arg's index */
 


@@ -146,4 +144,3 @@ void view(const char *arg);         /* views the tag with arg's index */
 void *emallocz(unsigned int size);     /* allocates zero-initialized memory, exits on error */
 void eprint(const char *errstr, ...);  /* prints errstr and exits with 1 */
 void spawn(const char *arg);           /* forks a new subprocess with arg's cmd */
 void *emallocz(unsigned int size);     /* allocates zero-initialized memory, exits on error */
 void eprint(const char *errstr, ...);  /* prints errstr and exits with 1 */
 void spawn(const char *arg);           /* forks a new subprocess with arg's cmd */

-