Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
stupid me, one needs to set c->{x,y,w,h} in configurerequest obviously ;)
[dwm.git]
/
dwm.h
diff --git
a/dwm.h
b/dwm.h
index
e6daa33
..
674ab1e
100644
(file)
--- a/
dwm.h
+++ b/
dwm.h
@@
-36,18
+36,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)
-/* other stuff used in different places */
-#define BORDERPX 1
-#define PROTODELWIN 1
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WM
Last };
/* default atoms */
+enum { WMProtocols, WMDelete, WM
State, WMLast };
/* default atoms */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColFG, ColBG, ColLast }; /* color */
-
-typedef enum {
- TopLeft, TopRight, BotLeft, BotRight
-} Corner; /* window corners */
+enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
typedef union {
const char *cmd;
typedef union {
const char *cmd;
@@
-66,7
+59,6
@@
typedef struct {
int x, y, w, h;
unsigned long norm[ColLast];
unsigned long sel[ColLast];
int x, y, w, h;
unsigned long norm[ColLast];
unsigned long sel[ColLast];
- unsigned long status[ColLast];
Drawable drawable;
Fnt font;
GC gc;
Drawable drawable;
Fnt font;
GC gc;
@@
-75,32
+67,31
@@
typedef struct {
typedef struct Client Client;
struct Client {
char name[256];
typedef struct Client Client;
struct Client {
char name[256];
- int proto;
int x, y, w, h;
int rx, ry, rw, rh; /* revert geometry */
int x, y, w, h;
int rx, ry, rw, rh; /* revert geometry */
- int tx, ty, tw, th; /* title window geometry */
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+ int minax, minay, maxax, maxay;
long flags;
unsigned int border;
long flags;
unsigned int border;
- Bool isf
loat, isfixed
, ismax;
+ Bool isf
ixed, isfloat
, ismax;
Bool *tags;
Client *next;
Client *prev;
Client *snext;
Window win;
Bool *tags;
Client *next;
Client *prev;
Client *snext;
Window win;
- Window twin;
};
extern const char *tags[]; /* all tags */
};
extern const char *tags[]; /* all tags */
-extern char stext[
1024];
/* status text */
-extern int b
x, by, bw, bh, bmw; /* bar geometry
, bar mode label width */
+extern char stext[
256];
/* status text */
+extern int b
h, 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 master, ntags, numlockmask; /* master percent, number of tags, dynamic lock mask */
+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 void (*handler[LASTEvent])(XEvent *); /* event handler */
extern void (*arrange)(void); /* arrange function, indicates mode */
extern Atom wmatom[WMLast], netatom[NetLast];
-extern Bool running,
issel, *seltag;
/* seltag is array of Bool */
+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 Client *clients, *sel, *stack; /* global client list and stack */
extern Cursor cursor[CurLast];
extern DC dc; /* global draw context */
@@
-108,23
+99,19
@@
extern Display *dpy;
extern Window root, barwin;
/* client.c */
extern Window root, barwin;
/* client.c */
-extern void ban(Client *c); /* ban c from screen */
extern void configure(Client *c); /* send synthetic configure event */
extern void focus(Client *c); /* focus c, c may be NULL */
extern Client *getclient(Window w); /* return client of w */
extern void configure(Client *c); /* send synthetic configure event */
extern void focus(Client *c); /* focus c, c may be NULL */
extern Client *getclient(Window w); /* return client of w */
-extern
Client *getctitle(Window w); /* return client of title window
*/
+extern
Bool isprotodel(Client *c); /* returns True if c->win supports wmatom[WMDelete]
*/
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 */
-extern void resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/
-extern void resizetitle(Client *c); /* resizes c->twin correctly */
+extern void resize(Client *c, Bool sizehints); /* resize 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 */
/* draw.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 */
/* draw.c */
-extern void drawall(void); /* draw all visible client titles and the bar */
extern void drawstatus(void); /* draw the bar */
extern void drawstatus(void); /* draw the bar */
-extern void drawclient(Client *c); /* draw title of c */
extern unsigned long getcolor(const char *colstr); /* return color of colstr */
extern void setfont(const char *fontstr); /* set the font for DC */
extern unsigned int textw(const char *text); /* return the width of text in px*/
extern unsigned long getcolor(const char *colstr); /* return color of colstr */
extern void setfont(const char *fontstr); /* set the font for DC */
extern unsigned int textw(const char *text); /* return the width of text in px*/
@@
-134,7
+121,6
@@
extern void grabkeys(void); /* grab all keys defined in config.h */
extern void procevent(void); /* process pending X events */
/* main.c */
extern void procevent(void); /* process pending X events */
/* main.c */
-extern int getproto(Window w); /* return protocol mask of WMProtocols property of w */
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 */
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 */
@@
-150,7
+136,6
@@
extern void toggletag(Arg *arg); /* toggles c tags with arg's index */
/* util.c */
extern void *emallocz(unsigned int size); /* allocates zero-initialized memory, exits on error */
extern void eprint(const char *errstr, ...); /* prints errstr and exits with 1 */
/* util.c */
extern void *emallocz(unsigned int size); /* allocates zero-initialized memory, exits on error */
extern void eprint(const char *errstr, ...); /* prints errstr and exits with 1 */
-extern void *erealloc(void *ptr, unsigned int size); /* reallocates memory, exits on error */
extern void spawn(Arg *arg); /* forks a new subprocess with to arg's cmd */
/* view.c */
extern void spawn(Arg *arg); /* forks a new subprocess with to arg's cmd */
/* view.c */
@@
-159,6
+144,7
@@
extern void dofloat(void); /* arranges all windows floating */
extern void dotile(void); /* arranges all windows tiled */
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 dotile(void); /* arranges all windows tiled */
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 incnmaster(Arg *arg); /* increments nmaster with arg's index value */
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 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 */