Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
removed TODO, because dwm is nearly finished
[dwm.git]
/
dwm.h
diff --git
a/dwm.h
b/dwm.h
index
e95633b
..
5a714f2
100644
(file)
--- a/
dwm.h
+++ b/
dwm.h
@@
-8,9
+8,14
@@
/********** CUSTOMIZE **********/
#define FONT "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
/********** CUSTOMIZE **********/
#define FONT "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
+#define BGCOLOR "#0a2c2d"
+#define FGCOLOR "#ddeeee"
+#define BORDERCOLOR "#176164"
+/*
#define BGCOLOR "#666699"
#define FGCOLOR "#eeeeee"
#define BORDERCOLOR "#9999CC"
#define BGCOLOR "#666699"
#define FGCOLOR "#eeeeee"
#define BORDERCOLOR "#9999CC"
+*/
#define MASTERW 52 /* percent */
#define WM_PROTOCOL_DELWIN 1
#define MASTERW 52 /* percent */
#define WM_PROTOCOL_DELWIN 1
@@
-20,8
+25,9
@@
enum { Tscratch, Tdev, Twww, Twork, TLast };
/********** CUSTOMIZE **********/
typedef union Arg Arg;
/********** CUSTOMIZE **********/
typedef union Arg Arg;
-typedef struct DC DC;
typedef struct Client Client;
typedef struct Client Client;
+typedef enum Corner Corner;
+typedef struct DC DC;
typedef struct Fnt Fnt;
typedef struct Key Key;
typedef struct Rule Rule;
typedef struct Fnt Fnt;
typedef struct Key Key;
typedef struct Rule Rule;
@@
-32,52
+38,56
@@
union Arg {
};
/* atoms */
};
/* atoms */
-enum { WMProtocols, WMDelete, WMLast };
enum { NetSupported, NetWMName, NetLast };
enum { NetSupported, NetWMName, NetLast };
+enum { WMProtocols, WMDelete, WMLast };
/* cursor */
/* cursor */
-enum { CurNormal, CurResize, CurMove, CurInput, CurLast };
+enum { CurNormal, CurResize, CurMove, CurLast };
+
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
struct Fnt {
struct Fnt {
- XFontStruct *xfont;
- XFontSet set;
int ascent;
int descent;
int height;
int ascent;
int descent;
int height;
+ XFontSet set;
+ XFontStruct *xfont;
};
struct DC { /* draw context */
};
struct DC { /* draw context */
- GC gc;
- Drawable drawable;
int x, y, w, h;
int x, y, w, h;
- Fnt font;
unsigned long bg;
unsigned long fg;
unsigned long border;
unsigned long bg;
unsigned long fg;
unsigned long border;
+ Drawable drawable;
+ Fnt font;
+ GC gc;
};
struct Client {
char name[256];
char *tags[TLast];
int proto;
};
struct Client {
char name[256];
char *tags[TLast];
int proto;
- int x, y, w, h;
- int tx, ty, tw, th;
+ int *x, *y, *w, *h; /* current geom */
+ int bx, by, bw, bh; /* title bar */
+ int fx, fy, fw, fh; /* floating geom */
+ int tx, ty, tw, th; /* tiled geom */
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int grav;
unsigned int border;
long flags;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int grav;
unsigned int border;
long flags;
- Bool dofloat;
- Window win;
- Window title;
+ Bool isfloat;
Client *next;
Client *revert;
Client *next;
Client *revert;
+ Window win;
+ Window title;
};
struct Rule {
const char *class;
const char *instance;
char *tags[TLast];
};
struct Rule {
const char *class;
const char *instance;
char *tags[TLast];
- Bool
do
float;
+ Bool
is
float;
};
struct Key {
};
struct Key {
@@
-87,20
+97,18
@@
struct Key {
Arg arg;
};
Arg arg;
};
-extern Display *dpy;
-extern Window root, barwin;
-extern Atom wm_atom[WMLast], net_atom[NetLast];
-extern Cursor cursor[CurLast];
-extern Bool running, issel;
+extern char *tags[TLast], stext[1024];
+extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
extern void (*handler[LASTEvent])(XEvent *);
extern void (*arrange)(Arg *);
extern void (*handler[LASTEvent])(XEvent *);
extern void (*arrange)(Arg *);
-extern Key key[];
-
-extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-extern char *tags[TLast], stext[1024];
-
-extern DC dc;
+extern Atom wmatom[WMLast], netatom[NetLast];
+extern Bool running, issel;
extern Client *clients, *sel;
extern Client *clients, *sel;
+extern Cursor cursor[CurLast];
+extern DC dc;
+extern Display *dpy;
+extern Key key[];
+extern Window root, barwin;
/* client.c */
extern void ban(Client *c);
/* client.c */
extern void ban(Client *c);
@@
-115,7
+123,9
@@
extern void killclient(Arg *arg);
extern void lower(Client *c);
extern void manage(Window w, XWindowAttributes *wa);
extern void maximize(Arg *arg);
extern void lower(Client *c);
extern void manage(Window w, XWindowAttributes *wa);
extern void maximize(Arg *arg);
-extern void resize(Client *c, Bool inc);
+extern void pop(Client *c);
+extern void resize(Client *c, Bool inc, Corner sticky);
+extern void setgeom(Client *c);
extern void setsize(Client *c);
extern void settitle(Client *c);
extern void unmanage(Client *c);
extern void setsize(Client *c);
extern void settitle(Client *c);
extern void unmanage(Client *c);
@@
-124,11
+134,9
@@
extern void zoom(Arg *arg);
/* draw.c */
extern void drawall();
extern void drawstatus();
/* draw.c */
extern void drawall();
extern void drawstatus();
-extern void drawtext(const char *text, Bool invert, Bool border);
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 textnw(char *text, unsigned int len);
extern unsigned int textw(char *text);
/* event.c */
extern unsigned int textw(char *text);
/* event.c */
@@
-144,7
+152,8
@@
extern int xerror(Display *dsply, XErrorEvent *ee);
extern void appendtag(Arg *arg);
extern void dofloat(Arg *arg);
extern void dotile(Arg *arg);
extern void appendtag(Arg *arg);
extern void dofloat(Arg *arg);
extern void dotile(Arg *arg);
-extern Client *getnext(Client *c);
+extern Client *getnext(Client *c, unsigned int t);
+extern void heretag(Arg *arg);
extern void replacetag(Arg *arg);
extern void settags(Client *c);
extern void view(Arg *arg);
extern void replacetag(Arg *arg);
extern void settags(Client *c);
extern void view(Arg *arg);