Attachment #87228 for bug #117143

Lines 22-25 Link Here

(-)wmii-3.orig/cmd/Makefile (-1 / +1 lines)
22	# @${CC} -o $* $*.o ${LDFLAGS} -lsocket	22	# @${CC} -o $* $*.o ${LDFLAGS} -lsocket
23		23
24	clean:	24	clean:
25	rm -f wmiimenu wmiir wmiipsel wmiiwarp *.o	25	rm -f wmiisetsid wmiimenu wmiir wmiipsel wmiiwarp *.o




	a->view = v;
	a->id = id++;
	a->rect = rect;
	a->rect.y = AREA_VIEW_Y;
	a->rect.height = rect.height - brect.height;
	a->mode = def.colmode;
	a->rect.width = w;

			x = 0;
		else
			x = fr->rect.x / dx;
		if(fr->rect.y < AREA_VIEW_Y)
			y = AREA_VIEW_Y;
		else
			y = fr->rect.y / dy;
		maxx = (fr->rect.x + fr->rect.width) / dx;

	}

	if(fit && (p1.y + f->rect.height < a->rect.y + a->rect.height))
		f->rect.y = (p1.y < AREA_VIEW_Y) ? AREA_VIEW_Y : p1.y;
	else {
		diff = a->rect.height - f->rect.height;
		f->rect.y = a->rect.y + (random() % (diff ? diff : 1));

Lines 74-80 Link Here

(-)wmii-3.orig/cmd/wm/bar.c (-1 / +1 lines)
74	unsigned int i, j;	74	unsigned int i, j;
75	brect = rect;	75	brect = rect;
76	brect.height = height_of_bar();	76	brect.height = height_of_bar();
77	brect.y = rect.height - brect.height;	77	brect.y = WM_BAR_Y;
78	XMoveResizeWindow(dpy, barwin, brect.x, brect.y, brect.width, brect.height);	78	XMoveResizeWindow(dpy, barwin, brect.x, brect.y, brect.width, brect.height);
79	XSync(dpy, False);	79	XSync(dpy, False);
80	XFreePixmap(dpy, barpmap);	80	XFreePixmap(dpy, barpmap);

Lines 318-324 Link Here

(-)wmii-3.orig/cmd/wm/view.c (-1 / +1 lines)
318	for(i = 1; i < v->area.size; i++) {	318	for(i = 1; i < v->area.size; i++) {
319	Area *a = v->area.data[i];	319	Area *a = v->area.data[i];
320	a->rect.x = xoff;	320	a->rect.x = xoff;
321	a->rect.y = 0;	321	a->rect.y = AREA_VIEW_Y;
322	a->rect.height = rect.height - brect.height;	322	a->rect.height = rect.height - brect.height;
323	xoff += a->rect.width;	323	xoff += a->rect.width;
324	arrange_column(a, False);	324	arrange_column(a, False);

Lines 327-333 Link Here

(-)wmii-3.orig/cmd/wm/wm.c (-1 / +1 lines)
327		327
328	brect = rect;	328	brect = rect;
329	brect.height = height_of_bar();	329	brect.height = height_of_bar();
330	brect.y = rect.height - brect.height;	330	brect.y = WM_BAR_Y;
331	barwin = XCreateWindow(dpy, RootWindow(dpy, screen), brect.x, brect.y,	331	barwin = XCreateWindow(dpy, RootWindow(dpy, screen), brect.x, brect.y,
332	brect.width, brect.height, 0, DefaultDepth(dpy, screen),	332	brect.width, brect.height, 0, DefaultDepth(dpy, screen),
333	CopyFromParent, DefaultVisual(dpy, screen),	333	CopyFromParent, DefaultVisual(dpy, screen),

Lines 10-15 Link Here

(-)wmii-3.orig/cmd/wm/wm.h (+8 lines)
10	#include <ixp.h>	10	#include <ixp.h>
11	#include <blitz.h>	11	#include <blitz.h>
12		12
		13	#if BAR_ON_TOP == 1
		14	#define WM_BAR_Y 0
		15	#define AREA_VIEW_Y brect.height
		16	#else
		17	#define WM_BAR_Y rect.height - brect.height
		18	#define AREA_VIEW_Y 0
		19	#endif
		20
13	/* WM atoms */	21	/* WM atoms */
14	enum {	22	enum {
15	WMState,	23	WMState,

Lines 20-25 Link Here

(-)wmii-3.orig/cmd/wmiimenu.c (-1 / +7 lines)
20	#include <blitz.h>	20	#include <blitz.h>
21	#include <cext.h>	21	#include <cext.h>
22		22
		23	#if BAR_ON_TOP == 1
		24	#define MENU_Y 0
		25	#else
		26	#define MENU_Y DisplayHeight(dpy, screen) - mrect.height
		27	#endif
		28
23	VECTOR(ItemVector, char *);	29	VECTOR(ItemVector, char *);
24	static Bool done = False;	30	static Bool done = False;
25	static int ret = 0;	31	static int ret = 0;
Lines 373-379 Link Here
373		379
374	mrect.width = DisplayWidth(dpy, screen);	380	mrect.width = DisplayWidth(dpy, screen);
375	mrect.height = draw.font.ascent + draw.font.descent + 4;	381	mrect.height = draw.font.ascent + draw.font.descent + 4;
376	mrect.y = DisplayHeight(dpy, screen) - mrect.height;	382	mrect.y = MENU_Y;
377	mrect.x = 0;	383	mrect.x = 0;
378		384
379	win = XCreateWindow(dpy, RootWindow(dpy, screen), mrect.x, mrect.y,	385	win = XCreateWindow(dpy, RootWindow(dpy, screen), mrect.x, mrect.y,

Lines 12-21 Link Here

(-)wmii-3.orig/config.mk (-1 / +2 lines)
12		12
13	# includes and libs	13	# includes and libs
14	LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11	14	LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
		15	BAR_ON_TOP = 0
15		16
16	# Linux/BSD	17	# Linux/BSD
17	CFLAGS = -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \	18	CFLAGS = -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
18	-DVERSION=\"${VERSION}\"	19	-DVERSION=\"${VERSION}\" -DBAR_ON_TOP=${BAR_ON_TOP}
19	LDFLAGS = ${LIBS}	20	LDFLAGS = ${LIBS}
20		21
21	# Solaris	22	# Solaris

Return to bug 117143

Lines 41-46 Link Here

(-)wmii-3.orig/cmd/wm/area.c (-3 / +4 lines)
41	a->view = v;	41	a->view = v;
42	a->id = id++;	42	a->id = id++;
43	a->rect = rect;	43	a->rect = rect;
		44	a->rect.y = AREA_VIEW_Y;
44	a->rect.height = rect.height - brect.height;	45	a->rect.height = rect.height - brect.height;
45	a->mode = def.colmode;	46	a->mode = def.colmode;
46	a->rect.width = w;	47	a->rect.width = w;
Lines 185-192 Link Here
185	x = 0;	186	x = 0;
186	else	187	else
187	x = fr->rect.x / dx;	188	x = fr->rect.x / dx;
188	if(fr->rect.y < 0)	189	if(fr->rect.y < AREA_VIEW_Y)
189	y = 0;	190	y = AREA_VIEW_Y;
190	else	191	else
191	y = fr->rect.y / dy;	192	y = fr->rect.y / dy;
192	maxx = (fr->rect.x + fr->rect.width) / dx;	193	maxx = (fr->rect.x + fr->rect.width) / dx;
Lines 226-232 Link Here
226	}	227	}
227		228
228	if(fit && (p1.y + f->rect.height < a->rect.y + a->rect.height))	229	if(fit && (p1.y + f->rect.height < a->rect.y + a->rect.height))
229	f->rect.y = p1.y;	230	f->rect.y = (p1.y < AREA_VIEW_Y) ? AREA_VIEW_Y : p1.y;
230	else {	231	else {
231	diff = a->rect.height - f->rect.height;	232	diff = a->rect.height - f->rect.height;
232	f->rect.y = a->rect.y + (random() % (diff ? diff : 1));	233	f->rect.y = a->rect.y + (random() % (diff ? diff : 1));