prepared merging layout.c and tag.c into screen.c

[dwm.git] / dwm.h

diff --git a/dwm.h b/dwm.h
index c2f1e7e..36a0266 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -39,7 +39,7 @@ enum { BarTop, BarBot, BarOff };                      /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 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 */
+enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */

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


@@ -74,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 */


@@ -86,13 +81,12 @@ 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 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 wmatom[WMLast], netatom[NetLast];
-extern Bool selscreen, *seltag;                        /* seltag is array of Bool */
+extern Atom dwmprops, wmatom[WMLast], netatom[NetLast];
+extern Bool selscreen, *seltags;               /* seltags 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 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 */


@@ -102,12 +96,13 @@ void configure(Client *c);         /* send synthetic configure event */
 void detach(Client *c);                        /* detaches c from global client list */
 void focus(Client *c);                 /* focus c if visible && !NULL, or focus top visible */
 void killclient(const char *arg);      /* kill sel  nicely */
 void detach(Client *c);                        /* detaches c from global client list */
 void focus(Client *c);                 /* focus c if visible && !NULL, or focus top visible */
 void killclient(const char *arg);      /* kill sel  nicely */

+Bool loadprops(Client *c);             /* loads client properties */

 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 sel between floating/tiled state */
+void saveprops(Client *c);             /* saves client properties */

 void unban(Client *c);                 /* unbans c */
 void unban(Client *c);                 /* unbans c */

-void unmanage(Client *c);              /* destroy c */
+void unmanage(Client *c, long state);  /* unmanage c */

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


@@ -120,23 +115,34 @@ 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 focusclient(const char *arg);     /* focuses next(1)/previous(-1) visible client */
+void arrange(void);                    /* arranges all windows depending on the layout in use */
+void focusnext(const char *arg);       /* focuses next visible client */
+void focusprev(const char *arg);       /* focuses prev visible client */
+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 */
 void initlayouts(void);                        /* initialize layout array */

+void loaddwmprops(void);               /* loads dwm properties */

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

+void savedwmprops(void);               /* saves dwm properties */

 void setlayout(const char *arg);       /* sets layout, NULL means next layout */
 void togglebar(const char *arg);       /* shows/hides the bar */
 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 */

+Bool gettextprop(Window w, Atom atom,
+               char *text, unsigned int size); /* return text property, UTF-8 compliant */

 void updatebarpos(void);               /* updates the bar position */
 void quit(const char *arg);            /* quit dwm nicely */
 int xerror(Display *dsply, XErrorEvent *ee);   /* dwm's X error handler */
 
 /* tag.c */
 void updatebarpos(void);               /* updates the bar position */
 void quit(const char *arg);            /* quit dwm nicely */
 int xerror(Display *dsply, XErrorEvent *ee);   /* dwm's X error handler */
 
 /* tag.c */

+void applyrules(Client *c);            /* applies rules to c */

 void compileregs(void);                        /* initialize regexps of rules defined in config.h */
 Bool isvisible(Client *c);             /* returns True if client is visible */
 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 sel with arg's index */
 void tag(const char *arg);             /* tags sel with arg's index */

+void togglefloating(const char *arg);  /* toggles sel between floating/tiled state */

 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 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 */