git.stevedylan.dev

fixed -m bug (thanks Rob) 0291c722

Connor Lane Smith · 2011-05-11 12:25 2 file(s) · +12 −12

dmenu.c +9 −9

		}
		else if(!strcmp(argv[i], "-b"))
			topbar = False;
		else if(!strcmp(argv[i], "-f"))
			fast = True;
		else if(!strcmp(argv[i], "-i"))
			fstrncmp = strncasecmp;
		else if(!strcmp(argv[i], "-f"))
			fast = True;
		else if(i == argc-1)
			goto usage;
		/* double flags */

	mh = (lines + 1) * bh;
#ifdef XINERAMA
	if((info = XineramaQueryScreens(dc->dpy, &n))) {
		int i, di;
		int i, m, di;
		unsigned int du;
		Window dw;

		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
		for(i = 0; i < n; i++)
		for(i = 0, m = -1; i < n; i++)
			if((monitor == info[i].screen_number)
			|| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
				break;
		x = info[i].x_org;
		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
		mw = info[i].width;
			|| (m < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
				m = i;
		x = info[m].x_org;
		y = info[m].y_org + (topbar ? 0 : info[m].height - mh);
		mw = info[m].width;
		XFree(info);
	}
	else

draw.c +3 −3

#include <X11/Xlib.h>
#include "draw.h"

#define MAX(a, b)   ((a) > (b) ? (a) : (b))
#define MIN(a, b)   ((a) < (b) ? (a) : (b))
#define DEFFONT     "fixed"
#define MAX(a, b)  ((a) > (b) ? (a) : (b))
#define MIN(a, b)  ((a) < (b) ? (a) : (b))
#define DEFFONT    "fixed"

static Bool loadfont(DC *dc, const char *fontstr);


76	76		}
77	77		else if(!strcmp(argv[i], "-b"))
78	78		topbar = False;
	79	+	else if(!strcmp(argv[i], "-f"))
	80	+	fast = True;
79	81		else if(!strcmp(argv[i], "-i"))
80	82		fstrncmp = strncasecmp;
81		-	else if(!strcmp(argv[i], "-f"))
82		-	fast = True;
83	83		else if(i == argc-1)
84	84		goto usage;
85	85		/* double flags */

506	506		mh = (lines + 1) * bh;
507	507		#ifdef XINERAMA
508	508		if((info = XineramaQueryScreens(dc->dpy, &n))) {
509		-	int i, di;
	509	+	int i, m, di;
510	510		unsigned int du;
511	511		Window dw;
512	512
513	513		XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
514		-	for(i = 0; i < n; i++)
	514	+	for(i = 0, m = -1; i < n; i++)
515	515		if((monitor == info[i].screen_number)
516		-	\|\| (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
517		-	break;
518		-	x = info[i].x_org;
519		-	y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
520		-	mw = info[i].width;
	516	+	\|\| (m < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
	517	+	m = i;
	518	+	x = info[m].x_org;
	519	+	y = info[m].y_org + (topbar ? 0 : info[m].height - mh);
	520	+	mw = info[m].width;
521	521		XFree(info);
522	522		}
523	523		else

7	7		#include <X11/Xlib.h>
8	8		#include "draw.h"
9	9
10		-	#define MAX(a, b) ((a) > (b) ? (a) : (b))
11		-	#define MIN(a, b) ((a) < (b) ? (a) : (b))
12		-	#define DEFFONT "fixed"
	10	+	#define MAX(a, b) ((a) > (b) ? (a) : (b))
	11	+	#define MIN(a, b) ((a) < (b) ? (a) : (b))
	12	+	#define DEFFONT "fixed"
13	13
14	14		static Bool loadfont(DC dc, const char fontstr);
15	15