added draw.c again (except getcolor and setfont which are helpers in main.c)

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 57fab91..42f847b 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -24,9 +24,8 @@
  *
  * Keys and tagging rules are organized as arrays and defined in the config.h
  * file. These arrays are kept static in event.o and tag.o respectively,
  *
  * Keys and tagging rules are organized as arrays and defined in the config.h
  * file. These arrays are kept static in event.o and tag.o respectively,

- * because no other part of dwm needs access to them.  The current mode is
- * represented by the arrange() function pointer, which wether points to
- * dofloat() or dotile(). 
+ * because no other part of dwm needs access to them.  The current layout is
+ * represented by the lt pointer.

  *
  * To understand everything else, start reading main.c:main().
  */
  *
  * To understand everything else, start reading main.c:main().
  */


@@ -73,7 +72,7 @@ struct Client {
        int minax, minay, maxax, maxay;
        long flags; 
        unsigned int border;
        int minax, minay, maxax, maxay;
        long flags; 
        unsigned int border;

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

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


@@ -81,21 +80,26 @@ struct Client {
        Window win;
 };
 
        Window win;
 };
 

+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+

 extern const char *tags[];                     /* all tags */
 extern char stext[256];                                /* status text */
 extern const char *tags[];                     /* all tags */
 extern char stext[256];                                /* status text */

-extern int bh, bmw;                            /* bar height, bar mode label width */

 extern int screen, sx, sy, sw, sh;             /* screen geometry */
 extern int wax, way, wah, waw;                 /* windowarea geometry */
 extern int screen, sx, sy, sw, sh;             /* screen geometry */
 extern int wax, way, wah, waw;                 /* windowarea geometry */

+extern unsigned int bh, blw;                   /* bar height, bar layout label width */

 extern unsigned int master, nmaster;           /* master percent, number of master clients */
 extern unsigned int ntags, numlockmask;                /* number of tags, dynamic lock mask */
 extern void (*handler[LASTEvent])(XEvent *);   /* event handler */
 extern unsigned int master, nmaster;           /* master percent, number of master clients */
 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 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 Display *dpy;
 extern Atom wmatom[WMLast], netatom[NetLast];
 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 Display *dpy;

+extern Layout *lt;

 extern Window root, barwin;
 
 /* client.c */
 extern Window root, barwin;
 
 /* client.c */


@@ -103,12 +107,11 @@ extern void configure(Client *c);         /* send synthetic configure event */
 extern void focus(Client *c);                  /* focus c, c may be NULL */
 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 focus(Client *c);                  /* focus c, c may be NULL */
 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 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 */

-Client *nexttiled(Client *c);                  /* returns tiled successor of c */
+extern Client *nexttiled(Client *c);           /* returns tiled successor of c */

 extern void resize(Client *c, int x, int y,
 extern void resize(Client *c, int x, int y,

-               int w, int h, Bool sizehints);  /* resize c*/
+               int w, int h, Bool sizehints);  /* resize with given coordinates 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 */


@@ -116,31 +119,32 @@ extern void zoom(Arg *arg);                       /* zooms the focused client to master area, arg is
 
 /* draw.c */
 extern void drawstatus(void);                  /* draw the bar */
 
 /* draw.c */
 extern void drawstatus(void);                  /* draw the bar */

-extern unsigned long getcolor(const char *colstr);     /* return color of colstr */
-extern void setfont(const char *fontstr);      /* set the font for DC */
+extern void drawtext(const char *text,
+               unsigned long col[ColLast]);    /* draw text */

 extern unsigned int textw(const char *text);   /* return the width of text in px*/
 
 /* event.c */
 extern void grabkeys(void);                    /* grab all keys defined in config.h */
 extern unsigned int textw(const char *text);   /* return the width of text in px*/
 
 /* event.c */
 extern void grabkeys(void);                    /* grab all keys defined in config.h */

-extern void procevent(void);                   /* process pending X events */
+
+/* layout.c */
+extern void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
+extern void initlayouts(void);                 /* initialize layout array */
+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 setlayout(Arg *arg);               /* sets layout, -1 toggles */
+extern void toggleversatile(Arg *arg);         /* toggles focusesd client between versatile/and non-versatile state */
+extern void versatile(void);                   /* arranges all windows versatile */

 
 /* main.c */
 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 */
 
 
 /* main.c */
 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 */
 

-/* screen.c */
-extern void compileregexps(void);              /* initialize regexps of rules defined in config.h */
-extern void dofloat(void);                     /* arranges all windows floating */
-extern void dotile(void);                      /* arranges all windows tiled */
-extern void incnmaster(Arg *arg);              /* increments nmaster with arg's index value */
+/* tag.c */
+extern void compileregs(void);                 /* initialize regexps of rules defined in config.h */

 extern Bool isvisible(Client *c);              /* returns True if client is visible */
 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 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 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 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 */