fvwm-window-search 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1365fa4326358bdf06efd23fa5e8a42348dfad1a4acae24f169fa603c0c6f8c2
-  data.tar.gz: da1fc15018240a4d37bad24726e81f60cfe44232e7e23b172d30c7d5d384d91c
+  metadata.gz: 580941b472f2b948d9f6d854a337a1d066646c7b3705986f76f3b429845026a3
+  data.tar.gz: 2e7b0a76b19a24514641ce603f35eee86f380bc8293c155014e80bfba9b24652
 SHA512:
-  metadata.gz: 2bd53629fa900f2c1b30e6cd02a4de7db3bde4676ec5b0c5dcef9c5ef9a26c3c174cce33a58470060643da89532fccb478609110d31fdc7faeb1aab765a8706a
-  data.tar.gz: 0ecc94c5b3161697d3f71cf02e20ef06d70b4d878c5b224b6f3737335aa494bd9b6bb5637c97e953b36169f6b67a13aeaff916b5885806649554b3f18590286c
+  metadata.gz: e85229be05ab43082df6362ca7b4b72c5f57cfdca85835027c979f305d01c332d74d5fa6830338548e08beb0718b4b25f2cd382c03da4ff66b5bce7a05429d79
+  data.tar.gz: e9926afb792d151259ca4dadd48d6346da71437cbdc7642009392d08ff1e03a610b10b78e12475a58a6b901efb0551192d2977394e08e06aabdf51772e7c46e2

data/README.md

@@ -12,7 +12,7 @@ Incremental window search & immediate switch to the selected window
 
 ## Reqs
 
-* Ruby (tested w/ 2.7.0)
+* Ruby
 * `xwininfo` & `xdotool` (`xorg-x11-utils` & `xdotool` Fedora pkgs)
 
 ## Compilation
@@ -32,18 +32,26 @@ To customise dmenu or filtering, create a yaml file
 dmenu:
   fn: Monospace-12
   b: false
+  selhook-return-key-focus-only: true
 filter:
     name: ['System Monitor']
+    resource: []
+    class: []
 ~~~
 
-This passes to dmenu `-fn` & `-b` CLOs & instructs to filter out any
-window that matches `System Monitor` regexp in its title.
+Subkeys in `dmenu` are the usual CLOs for
+[dmenu(1)][]. `selhook-return-key-focus-only` is a custom one, that
+enables window focusing on pressing Return only.
 
-See the defaults in `fvwm-window-search` file.
+[dmenu(1)]: https://manpages.debian.org/unstable/suckless-tools/dmenu.1.en.html
+
+`filter` key tells what windows should be filtered out. Each value in
+a subkey is an array of regexes. See the defaults in
+`fvwm-window-search` file.
 
 ## Bugs
 
-* Tested only w/ Fvwm3.
+* Tested only w/ Ruby-2.7.0 & Fvwm3.
 * No distinction between normal & iconified windows.
 
 ## License

data/dmenu.patch

@@ -14,18 +14,19 @@ index a03a95c..ee5cffb 100644
  $(OBJ): arg.h config.h config.mk drw.h
  
 diff --git a/config.def.h b/config.def.h
-index 1edb647..c6d081f 100644
+index 1edb647..1920110 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -21,3 +21,6 @@ static unsigned int lines      = 0;
+@@ -21,3 +21,7 @@ static unsigned int lines      = 0;
   * for example: " /?\"&[]"
   */
  static const char worddelimiters[] = " ";
 +
 +/* -selhook option; run a command on every selection */
 +static const char *selection_hook = NULL;
++static int selection_hook_return_key_focus_only = 0;
 diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..69254ee 100644
+index 65f25ce..274668a 100644
 --- a/dmenu.c
 +++ b/dmenu.c
 @@ -304,6 +304,62 @@ movewordedge(int dir)
@@ -99,29 +100,29 @@ index 65f25ce..69254ee 100644
  		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
  		if (!(ev->state & ControlMask)) {
  			cleanup();
-@@ -572,6 +629,7 @@ run(void)
+@@ -572,6 +629,8 @@ run(void)
  			break;
  		case KeyPress:
  			keypress(&ev.xkey);
-+			selhook(selection_hook, sel);
++			if (!selection_hook_return_key_focus_only)
++				selhook(selection_hook, sel);
  			break;
  		case SelectionNotify:
  			if (ev.xselection.property == utf8)
-@@ -690,7 +748,8 @@ static void
- usage(void)
- {
- 	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
--	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
-+	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n"
-+	      "             [-selhook cmd]\n", stderr);
- 	exit(1);
- }
- 
-@@ -733,6 +792,8 @@ main(int argc, char *argv[])
+@@ -712,6 +771,8 @@ main(int argc, char *argv[])
+ 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+ 			fstrncmp = strncasecmp;
+ 			fstrstr = cistrstr;
++		} else if (!strcmp(argv[i], "-selhook-return-key-focus-only")) {
++			selection_hook_return_key_focus_only = 1;
+ 		} else if (i + 1 == argc)
+ 			usage();
+ 		/* these options take one argument */
+@@ -733,6 +794,8 @@ main(int argc, char *argv[])
  			colors[SchemeSel][ColFg] = argv[++i];
  		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
  			embed = argv[++i];
-+		else if(!strcmp(argv[i], "-selhook"))  /* a command to run */
++		else if (!strcmp(argv[i], "-selhook")) /* a command to run */
 +			selection_hook = argv[++i];
  		else
  			usage();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fvwm-window-search
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2020-07-18 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   Search for windows interactively using a patched dmenu utility.