removed some global vars which should be static instead
This commit is contained in:
parent
29c26b88e7
commit
52f0b9e2e3
4
dwm.h
4
dwm.h
@ -87,14 +87,14 @@ typedef struct {
|
|||||||
|
|
||||||
extern const char *tags[]; /* all tags */
|
extern const char *tags[]; /* all tags */
|
||||||
extern char stext[256]; /* status text */
|
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 int wax, way, wah, waw; /* windowarea geometry */
|
||||||
extern unsigned int bh, blw; /* bar height, bar layout label width */
|
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 master, nmaster; /* master percent, number of master clients */
|
||||||
extern unsigned int ntags, numlockmask; /* number of tags, dynamic lock mask */
|
extern unsigned int ntags, numlockmask; /* number of tags, dynamic lock mask */
|
||||||
extern void (*handler[LASTEvent])(XEvent *); /* event handler */
|
extern void (*handler[LASTEvent])(XEvent *); /* event handler */
|
||||||
extern Atom wmatom[WMLast], netatom[NetLast];
|
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 Client *clients, *sel, *stack; /* global client list and stack */
|
||||||
extern Cursor cursor[CurLast];
|
extern Cursor cursor[CurLast];
|
||||||
extern DC dc; /* global draw context */
|
extern DC dc; /* global draw context */
|
||||||
|
11
main.c
11
main.c
@ -18,10 +18,9 @@
|
|||||||
/* extern */
|
/* extern */
|
||||||
|
|
||||||
char stext[256];
|
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;
|
unsigned int bh, ntags, numlockmask;
|
||||||
Atom wmatom[WMLast], netatom[NetLast];
|
Atom wmatom[WMLast], netatom[NetLast];
|
||||||
Bool running = True;
|
|
||||||
Bool *seltag;
|
Bool *seltag;
|
||||||
Bool selscreen = True;
|
Bool selscreen = True;
|
||||||
Client *clients = NULL;
|
Client *clients = NULL;
|
||||||
@ -36,6 +35,7 @@ Window root, barwin;
|
|||||||
|
|
||||||
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
||||||
static Bool otherwm, readin;
|
static Bool otherwm, readin;
|
||||||
|
static Bool running = True;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cleanup(void) {
|
cleanup(void) {
|
||||||
@ -181,7 +181,6 @@ setup(void) {
|
|||||||
dc.sel[ColFG] = initcolor(SELFGCOLOR);
|
dc.sel[ColFG] = initcolor(SELFGCOLOR);
|
||||||
initfont(FONT);
|
initfont(FONT);
|
||||||
/* geometry */
|
/* geometry */
|
||||||
sx = sy = 0;
|
|
||||||
sw = DisplayWidth(dpy, screen);
|
sw = DisplayWidth(dpy, screen);
|
||||||
sh = DisplayHeight(dpy, screen);
|
sh = DisplayHeight(dpy, screen);
|
||||||
initlayouts();
|
initlayouts();
|
||||||
@ -190,15 +189,15 @@ setup(void) {
|
|||||||
wa.override_redirect = 1;
|
wa.override_redirect = 1;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
wa.event_mask = ButtonPressMask | ExposureMask;
|
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),
|
DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
|
||||||
XDefineCursor(dpy, barwin, cursor[CurNormal]);
|
XDefineCursor(dpy, barwin, cursor[CurNormal]);
|
||||||
XMapRaised(dpy, barwin);
|
XMapRaised(dpy, barwin);
|
||||||
strcpy(stext, "dwm-"VERSION);
|
strcpy(stext, "dwm-"VERSION);
|
||||||
/* windowarea */
|
/* windowarea */
|
||||||
wax = sx;
|
wax = 0;
|
||||||
way = sy + (TOPBAR ? bh : 0);
|
way = (TOPBAR ? bh : 0);
|
||||||
wah = sh - bh;
|
wah = sh - bh;
|
||||||
waw = sw;
|
waw = sw;
|
||||||
/* pixmap for everything */
|
/* pixmap for everything */
|
||||||
|
Loading…
Reference in New Issue
Block a user