Minor change to `Makefile` to set FreeBSD paths as default.

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index cff634d..177cf9c 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -174,7 +174,8 @@ static int niconpaths = 0;              /* number of paths to icon directories *
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       (void)fprintf(stderr, "usage: xmenu [-irw] [-p position] [title]\n");
+
+       (void)fprintf(stderr, "usage: xmenu [-irw] [-p position] [(-x|-X) [modifier-]button] [title]\n");

        exit(1);
 }
 
        exit(1);
 }
 


@@ -1912,7 +1913,7 @@ main(int argc, char *argv[])
                        XNextEvent(dpy, &ev);
                if (!rootmodeflag ||
                    (ev.type == ButtonPress &&
                        XNextEvent(dpy, &ev);
                if (!rootmodeflag ||
                    (ev.type == ButtonPress &&

-                    ((modifier != 0 && ev.xbutton.state == modifier) ||
+                    ((modifier != 0 && (ev.xbutton.state & modifier)) ||

                      (ev.xbutton.subwindow == None)))) {
                        if (rootmodeflag && passclickflag) {
                                XAllowEvents(dpy, ReplayPointer, CurrentTime);
                      (ev.xbutton.subwindow == None)))) {
                        if (rootmodeflag && passclickflag) {
                                XAllowEvents(dpy, ReplayPointer, CurrentTime);