diff options
| author | Anselm R. Garbe <arg@suckless.org> | 2007-02-21 11:45:51 +0100 |
|---|---|---|
| committer | Anselm R. Garbe <arg@suckless.org> | 2007-02-21 11:45:51 +0100 |
| commit | 52f0b9e2e3e7eba1e7d2b940863d9a72fa8112d6 (patch) | |
| tree | 5b304916446359a964c8ba03bbab946dfdb573d7 | |
| parent | 29c26b88e7333fb8ea022c4bb4277bc0394ab9e3 (diff) | |
| download | dwm-52f0b9e2e3e7eba1e7d2b940863d9a72fa8112d6.tar.gz | |
removed some global vars which should be static instead
| -rw-r--r-- | dwm.h | 4 | ||||
| -rw-r--r-- | main.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/dwm.h b/dwm.h index 2751c9e..4e7e551 100644 --- a/dwm.h +++ b/dwm.h @@ -87,14 +87,14 @@ typedef struct { extern const char *tags[]; /* all tags */ extern char stext[256]; /* status text */ -extern int screen, sx, sy, sw, sh; /* screen geometry */ +extern int screen, sw, sh; /* screen geometry */ extern int wax, way, wah, waw; /* windowarea geometry */ extern unsigned int bh, blw; /* bar height, bar layout label width */ 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 Atom wmatom[WMLast], netatom[NetLast]; -extern Bool running, selscreen, *seltag; /* seltag is array of Bool */ +extern Bool 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 */ diff --git a/main.c b/main.c index 73b713f..3470287 100644 --- a/main.c +++ b/main.c @@ -18,10 +18,9 @@ /* extern */ char stext[256]; -int screen, sx, sy, sw, sh, wax, way, waw, wah; +int screen, sw, sh, wax, way, waw, wah; unsigned int bh, ntags, numlockmask; Atom wmatom[WMLast], netatom[NetLast]; -Bool running = True; Bool *seltag; Bool selscreen = True; Client *clients = NULL; @@ -36,6 +35,7 @@ Window root, barwin; static int (*xerrorxlib)(Display *, XErrorEvent *); static Bool otherwm, readin; +static Bool running = True; static void cleanup(void) { @@ -181,7 +181,6 @@ setup(void) { dc.sel[ColFG] = initcolor(SELFGCOLOR); initfont(FONT); /* geometry */ - sx = sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); initlayouts(); @@ -190,15 +189,15 @@ setup(void) { wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ButtonPressMask | ExposureMask; - barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0, + barwin = XCreateWindow(dpy, root, 0, (TOPBAR ? 0 : sh - bh), sw, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); strcpy(stext, "dwm-"VERSION); /* windowarea */ - wax = sx; - way = sy + (TOPBAR ? bh : 0); + wax = 0; + way = (TOPBAR ? bh : 0); wah = sh - bh; waw = sw; /* pixmap for everything */ |