made Layout a static struct in layout.c, added some convenience getters in layout...

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index 999f027..8f5ffdb 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -48,6 +48,7 @@ struct Client {
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;

+       int unmapped;

        long flags; 
        unsigned int border, oldborder;
        Bool isbanned, isfixed, ismax, isfloating;
        long flags; 
        unsigned int border, oldborder;
        Bool isbanned, isfixed, ismax, isfloating;


@@ -73,11 +74,6 @@ 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 */
 extern char stext[256];                                /* status text */
 extern int screen, sx, sy, sw, sh;             /* screen geometry */
 extern const char *tags[];                     /* all tags */
 extern char stext[256];                                /* status text */
 extern int screen, sx, sy, sw, sh;             /* screen geometry */


@@ -91,7 +87,6 @@ extern Client *clients, *sel, *stack;         /* global client list and stack */
 extern Cursor cursor[CurLast];
 extern DC dc;                                  /* global draw context */
 extern Display *dpy;
 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 */


@@ -119,17 +114,17 @@ 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 True  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 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 */
 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, NULL means next layout */
 void togglebar(const char *arg);       /* shows/hides the bar */
 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 */

 
 /* main.c */
 void updatebarpos(void);               /* updates the bar position */
 
 /* main.c */
 void updatebarpos(void);               /* updates the bar position */