tnew stuff - dwm - [fork] customized build of dwm, the dynamic window manager | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd | |
parent 3a69c5173cdd24959410870bec2a10a76272e034 | |
Author: Anselm R. Garbe <[email protected]> | |
Date: Tue, 11 Jul 2006 11:27:56 +0200 | |
new stuff | |
Diffstat: | |
M client.c | 2 +- | |
M draw.c | 6 +++--- | |
M menu.c | 24 ++++++++++++------------ | |
M wm.c | 10 +++++----- | |
M wm.h | 15 ++++----------- | |
5 files changed, 25 insertions(+), 32 deletions(-) | |
--- | |
diff --git a/client.c b/client.c | |
t@@ -14,7 +14,7 @@ update_client_name(Client *c) | |
{ | |
XTextProperty name; | |
int n; | |
- char **list = 0; | |
+ char **list = NULL; | |
name.nitems = 0; | |
c->name[0] = 0; | |
diff --git a/draw.c b/draw.c | |
t@@ -116,7 +116,7 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr) | |
char **missing, *def; | |
int n; | |
- missing = 0; | |
+ missing = NULL; | |
def = "?"; | |
setlocale(LC_ALL, ""); | |
if(font->set) | |
t@@ -128,7 +128,7 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr) | |
XFreeStringList(missing); | |
if(font->set) { | |
XFreeFontSet(dpy, font->set); | |
- font->set = 0; | |
+ font->set = NULL; | |
} | |
} | |
if(font->set) { | |
t@@ -151,7 +151,7 @@ loadfont(Display *dpy, Fnt *font, const char *fontstr) | |
else { | |
if(font->xfont) | |
XFreeFont(dpy, font->xfont); | |
- font->xfont = 0; | |
+ font->xfont = NULL; | |
font->xfont = XLoadQueryFont(dpy, fontstr); | |
if (!font->xfont) | |
font->xfont = XLoadQueryFont(dpy, "fixed"); | |
diff --git a/menu.c b/menu.c | |
t@@ -34,15 +34,15 @@ static Window win; | |
static XRectangle rect; | |
static Bool done = False; | |
-static Item *allitem = 0; /* first of all items */ | |
-static Item *item = 0; /* first of pattern matching items */ | |
-static Item *sel = 0; | |
-static Item *nextoff = 0; | |
-static Item *prevoff = 0; | |
-static Item *curroff = 0; | |
+static Item *allitem = NULL; /* first of all items */ | |
+static Item *item = NULL; /* first of pattern matching items */ | |
+static Item *sel = NULL; | |
+static Item *nextoff = NULL; | |
+static Item *prevoff = NULL; | |
+static Item *curroff = NULL; | |
static int screen; | |
-static char *title = 0; | |
+static char *title = NULL; | |
static char text[4096]; | |
static int ret = 0; | |
static int nitem = 0; | |
t@@ -107,7 +107,7 @@ update_items(char *pattern) | |
else | |
cmdw = twidth; | |
- item = j = 0; | |
+ item = j = NULL; | |
nitem = 0; | |
for(i = allitem; i; i=i->next) | |
t@@ -117,7 +117,7 @@ update_items(char *pattern) | |
else | |
j->right = i; | |
i->left = j; | |
- i->right = 0; | |
+ i->right = NULL; | |
j = i; | |
nitem++; | |
} | |
t@@ -129,7 +129,7 @@ update_items(char *pattern) | |
else | |
j->right = i; | |
i->left = j; | |
- i->right = 0; | |
+ i->right = NULL; | |
j = i; | |
nitem++; | |
} | |
t@@ -319,7 +319,7 @@ kpress(XKeyEvent * e) | |
static char * | |
read_allitems() | |
{ | |
- static char *maxname = 0; | |
+ static char *maxname = NULL; | |
char *p, buf[1024]; | |
unsigned int len = 0, max = 0; | |
Item *i, *new; | |
t@@ -336,7 +336,7 @@ read_allitems() | |
} | |
new = emalloc(sizeof(Item)); | |
- new->next = new->left = new->right = 0; | |
+ new->next = new->left = new->right = NULL; | |
new->text = p; | |
if(!i) | |
allitem = new; | |
diff --git a/wm.c b/wm.c | |
t@@ -20,8 +20,9 @@ Atom wm_atom[WMLast], net_atom[NetLast]; | |
Cursor cursor[CurLast]; | |
XRectangle rect, barrect; | |
Bool running = True; | |
+Client *client = NULL; | |
-char *bartext; | |
+char *bartext, tag[256]; | |
int screen, sel_screen; | |
unsigned int lock_mask, numlock_mask; | |
t@@ -74,12 +75,11 @@ win_property(Window w, Atom a, Atom t, long l, unsigned ch… | |
status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format, | |
&res, &extra, prop); | |
- if(status != Success || *prop == 0) { | |
+ if(status != Success || *prop == NULL) { | |
return 0; | |
} | |
- if(res == 0) { | |
+ if(res == 0) | |
free((void *) *prop); | |
- } | |
return res; | |
} | |
t@@ -264,7 +264,7 @@ main(int argc, char *argv[]) | |
barrect.width, barrect.height, 0, DefaultDepth(dpy, sc… | |
CopyFromParent, DefaultVisual(dpy, screen), | |
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); | |
- bartext = 0; | |
+ bartext = NULL; | |
XDefineCursor(dpy, barwin, cursor[CurNormal]); | |
XMapRaised(dpy, barwin); | |
draw_bar(); | |
diff --git a/wm.h b/wm.h | |
t@@ -20,11 +20,10 @@ enum { CurNormal, CurResize, CurMove, CurInput, CurLast }; | |
enum { RFloat, RGrid, RLast }; | |
typedef struct Client Client; | |
-typedef struct Tag Tag; | |
struct Client { | |
- Tag *tag; | |
char name[256]; | |
+ char tag[256]; | |
int proto; | |
unsigned int border; | |
Bool fixedsize; | |
t@@ -37,27 +36,21 @@ struct Client { | |
Client *snext; | |
}; | |
-struct Tag { | |
- char name[256]; | |
- Client *stack; | |
- XRectangle r; | |
- Tag *next; | |
- Tag *cnext; | |
-}; | |
- | |
extern Display *dpy; | |
extern Window root, barwin; | |
extern Atom wm_atom[WMLast], net_atom[NetLast]; | |
extern Cursor cursor[CurLast]; | |
extern XRectangle rect, barrect; | |
extern Bool running; | |
+extern Bool grid; | |
extern void (*handler[LASTEvent]) (XEvent *); | |
extern int screen, sel_screen; | |
extern unsigned int lock_mask, numlock_mask; | |
-extern char *bartext; | |
+extern char *bartext, tag[256]; | |
extern Brush brush; | |
+extern Client *client; | |
/* bar.c */ | |
extern void draw_bar(); |