git.stevedylan.dev

reverted accidental removal of sx, sy 74cbbe5f

Anselm R. Garbe · 2007-02-21 11:49 2 file(s) · +6 −5

dwm.h +1 −1


extern const char *tags[];			/* all tags */
extern char stext[256];				/* status text */
extern int screen, sw, sh;			/* screen geometry */
extern int screen, sx, sy, 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 */

main.c +5 −4

/* extern */

char stext[256];
int screen, sw, sh, wax, way, waw, wah;
int screen, sx, sy, sw, sh, wax, way, waw, wah;
unsigned int bh, ntags, numlockmask;
Atom wmatom[WMLast], netatom[NetLast];
Bool *seltag;

	dc.sel[ColFG] = initcolor(SELFGCOLOR);
	initfont(FONT);
	/* geometry */
	sx = sy = 0;
	sw = DisplayWidth(dpy, screen);
	sh = DisplayHeight(dpy, screen);
	initlayouts();

	wa.override_redirect = 1;
	wa.background_pixmap = ParentRelative;
	wa.event_mask = ButtonPressMask | ExposureMask;
	barwin = XCreateWindow(dpy, root, 0, (TOPBAR ? 0 : sh - bh), sw, bh, 0,
	barwin = XCreateWindow(dpy, root, sx, sy + (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 = 0;
	way = (TOPBAR ? bh : 0);
	wax = sx;
	way = sy + (TOPBAR ? bh : 0);
	wah = sh - bh;
	waw = sw;
	/* pixmap for everything */

87	87
88	88		extern const char tags[]; / all tags */
89	89		extern char stext[256]; /* status text */
90		-	extern int screen, sw, sh; /* screen geometry */
	90	+	extern int screen, sx, sy, sw, sh; /* screen geometry */
91	91		extern int wax, way, wah, waw; /* windowarea geometry */
92	92		extern unsigned int bh, blw; /* bar height, bar layout label width */
93	93		extern unsigned int master, nmaster; /* master percent, number of master clients */

18	18		/* extern */
19	19
20	20		char stext[256];
21		-	int screen, sw, sh, wax, way, waw, wah;
	21	+	int screen, sx, sy, sw, sh, wax, way, waw, wah;
22	22		unsigned int bh, ntags, numlockmask;
23	23		Atom wmatom[WMLast], netatom[NetLast];
24	24		Bool *seltag;

181	181		dc.sel[ColFG] = initcolor(SELFGCOLOR);
182	182		initfont(FONT);
183	183		/* geometry */
	184	+	sx = sy = 0;
184	185		sw = DisplayWidth(dpy, screen);
185	186		sh = DisplayHeight(dpy, screen);
186	187		initlayouts();

189	190		wa.override_redirect = 1;
190	191		wa.background_pixmap = ParentRelative;
191	192		wa.event_mask = ButtonPressMask \| ExposureMask;
192		-	barwin = XCreateWindow(dpy, root, 0, (TOPBAR ? 0 : sh - bh), sw, bh, 0,
	193	+	barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
193	194		DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
194	195		CWOverrideRedirect \| CWBackPixmap \| CWEventMask, &wa);
195	196		XDefineCursor(dpy, barwin, cursor[CurNormal]);
196	197		XMapRaised(dpy, barwin);
197	198		strcpy(stext, "dwm-"VERSION);
198	199		/* windowarea */
199		-	wax = 0;
200		-	way = (TOPBAR ? bh : 0);
	200	+	wax = sx;
	201	+	way = sy + (TOPBAR ? bh : 0);
201	202		wah = sh - bh;
202	203		waw = sw;
203	204		/* pixmap for everything */