fixed a bug reported by sander

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 803fe9f..c4594fc 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -3,7 +3,7 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

-#include CONFIG
+#include "config.h"

 #include <X11/Xlib.h>
 
 /* mask shorthands, used in event.c and client.c */
 #include <X11/Xlib.h>
 
 /* mask shorthands, used in event.c and client.c */


@@ -17,7 +17,7 @@ typedef struct DC DC;
 typedef struct Fnt Fnt;
 
 union Arg {
 typedef struct Fnt Fnt;
 
 union Arg {

-       const char **argv;
+       const char *cmd;

        int i;
 };
 
        int i;
 };
 


@@ -51,7 +51,6 @@ struct DC { /* draw context */
 
 struct Client {
        char name[256];
 
 struct Client {
        char name[256];

-       char *tags[TLast];

        int proto;
        int x, y, w, h;
        int tx, ty, tw, th; /* title */
        int proto;
        int x, y, w, h;
        int tx, ty, tw, th; /* title */


@@ -61,18 +60,21 @@ struct Client {
        unsigned int border;
        Bool isfloat;
        Bool ismax;
        unsigned int border;
        Bool isfloat;
        Bool ismax;

+       Bool *tags;

        Client *next;
        Client *prev;
        Window win;
        Window title;
 };
 
        Client *next;
        Client *prev;
        Window win;
        Window title;
 };
 

-extern char *tags[TLast], stext[1024];
-extern int tsel, 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 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];

-extern Bool running, issel;
+extern Bool running, issel, *seltag;

 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;


@@ -87,9 +89,7 @@ extern void focusprev(Arg *arg);
 extern Client *getclient(Window w);
 extern Client *getctitle(Window w);
 extern void gravitate(Client *c, Bool invert);
 extern Client *getclient(Window w);
 extern Client *getctitle(Window w);
 extern void gravitate(Client *c, Bool invert);

-extern void higher(Client *c);

 extern void killclient(Arg *arg);
 extern void killclient(Arg *arg);

-extern void lower(Client *c);

 extern void manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
 extern void resize(Client *c, Bool sizehints, Corner sticky);
 extern void setsize(Client *c);


@@ -104,10 +104,11 @@ extern void drawstatus();
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);
 extern void drawtitle(Client *c);
 extern unsigned long getcolor(const char *colstr);
 extern void setfont(const char *fontstr);

-extern unsigned int textw(char *text);
+extern unsigned int textw(const char *text);

 
 /* event.c */
 extern void grabkeys();
 
 /* event.c */
 extern void grabkeys();

+extern void procevent();

 
 /* main.c */
 extern int getproto(Window w);
 
 /* main.c */
 extern int getproto(Window w);


@@ -116,19 +117,22 @@ extern void sendevent(Window w, Atom a, long value);
 extern int xerror(Display *dsply, XErrorEvent *ee);
 
 /* tag.c */
 extern int xerror(Display *dsply, XErrorEvent *ee);
 
 /* tag.c */

-extern void appendtag(Arg *arg);

 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);

+extern void initrregs();
+extern Bool isvisible(Client *c);

 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);
 extern Client *getnext(Client *c);
 extern Client *getprev(Client *c);

-extern void replacetag(Arg *arg);
+extern void restack();

 extern void settags(Client *c);
 extern void settags(Client *c);

+extern void tag(Arg *arg);

 extern void togglemode(Arg *arg);
 extern void togglemode(Arg *arg);

+extern void toggletag(Arg *arg);
+extern void toggleview(Arg *arg);

 extern void view(Arg *arg);
 extern void view(Arg *arg);

-extern void viewnext(Arg *arg);
-extern void viewprev(Arg *arg);

 
 /* util.c */
 extern void *emallocz(unsigned int size);
 extern void eprint(const char *errstr, ...);
 
 /* util.c */
 extern void *emallocz(unsigned int size);
 extern void eprint(const char *errstr, ...);

+extern void *erealloc(void *ptr, unsigned int size);

 extern void spawn(Arg *arg);
 extern void spawn(Arg *arg);