applied Martti Kühne's dmenu monitor patch

https://gist.github.com/mar77i/3349298/raw/f6581ca96627f4c71c0bd1faf531daaf2a613b95/monarg.patch becomes upstream now

diff --git a/LICENSE b/LICENSE
index e2bfc83c82e0622264d9b006e00dab0e6849aa29..0df62c64431f5f10951a0605beeee1effb83c456 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 MIT/X Consortium License
 
+© 2006-2013 Anselm R Garbe <anselm@garbe.us>
 © 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2006-2012 Anselm R Garbe <anselm@garbe.us>
 © 2009 Gottox <gottox@s01.de>
 © 2009 Markus Schnalke <meillo@marmaro.de>
 © 2009 Evan Gates <evan.gates@gmail.com>

diff --git a/dmenu.1 b/dmenu.1
index 88f77de337b226616df8cf8e97a53eb04fdf8f3e..bbee17d9e1c7a117b90e1e4e1bdbe3c8bdd26d85 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -7,6 +7,8 @@ dmenu \- dynamic menu
 .RB [ \-f ]
 .RB [ \-i ]
 .RB [ \-l
+.RB [ \-m
+.IR monitor ]
 .IR lines ]
 .RB [ \-p
 .IR prompt ]
@@ -49,6 +51,9 @@ dmenu matches menu items case insensitively.
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
+.BI \-m " monitor"
+dmenu is displayed on the monitor supplied.
+.TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP

diff --git a/dmenu.c b/dmenu.c
index 5e0a19c806dba9d50ca491fc2a5933e1c8a2d5f1..8d9bbb65e868147e028df42954d77a867181b9eb 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -54,6 +54,7 @@ static Item *matches, *matchend;
 static Item *prev, *curr, *next, *sel;
 static Window win;
 static XIC xic;
+static int mon = -1;
 
 #include "config.h"
 
@@ -84,6 +85,8 @@ main(int argc, char *argv[]) {
                /* these options take one argument */
                else if(!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
                        lines = atoi(argv[++i]);
+               else if(!strcmp(argv[i], "-m"))
+                       mon = atoi(argv[++i]);
                else if(!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
                        prompt = argv[++i];
                else if(!strcmp(argv[i], "-fn"))  /* font or font set */
@@ -557,7 +560,9 @@ setup(void) {
                XWindowAttributes wa;
 
                XGetInputFocus(dc->dpy, &w, &di);
-               if(w != root && w != PointerRoot && w != None) {
+               if(mon != -1 && mon < n)
+                       i = mon;
+               if(!i && w != root && w != PointerRoot && w != None) {
                        /* find top-level window containing current input focus */
                        do {
                                if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws)
@@ -572,7 +577,7 @@ setup(void) {
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */
-               if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+               if(mon == -1 && !area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
                        for(i = 0; i < n; i++)
                                if(INTERSECT(x, y, 1, 1, info[i]))
                                        break;
@@ -614,7 +619,7 @@ setup(void) {
 
 void
 usage(void) {
-       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
              "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
        exit(EXIT_FAILURE);
 }