fvwm-window-search 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580941b472f2b948d9f6d854a337a1d066646c7b3705986f76f3b429845026a3
-  data.tar.gz: 2e7b0a76b19a24514641ce603f35eee86f380bc8293c155014e80bfba9b24652
+  metadata.gz: dd55a9dff4bdaee0fcb2e3aab600d85f6c0d40b8a706ea1dd0d7d17e2c0a83c8
+  data.tar.gz: b47ae4bac4a1a0e68f629306de58e76f6d0111f48e1a9bb686fb63362179161b
 SHA512:
-  metadata.gz: e85229be05ab43082df6362ca7b4b72c5f57cfdca85835027c979f305d01c332d74d5fa6830338548e08beb0718b4b25f2cd382c03da4ff66b5bce7a05429d79
-  data.tar.gz: e9926afb792d151259ca4dadd48d6346da71437cbdc7642009392d08ff1e03a610b10b78e12475a58a6b901efb0551192d2977394e08e06aabdf51772e7c46e2
+  metadata.gz: 13ce630d60e59c33f1bd26c6b29f4dcca5134dabc8d4f0a6a54f812e9d5d50ebb4ca644031e126785cefdaad6cd95ce008a3ca7167deb04b103a0e9dfc43ed53
+  data.tar.gz: 00311f2288294e4556f3e38b297c33581a7f0ab0b8ced615daf07d31c88682d0555b164a8eb5be6d68729495a8460469ed244511d93d8f2cab0793abac7a8fbc

data/README.md

@@ -5,14 +5,14 @@ Incremental window search & immediate switch to the selected window
 
     $ gem install fvwm-window-search
 
-![A screenshot of running fvwm-window-search](https://raw.github.com/gromnitsky/fvwm-window-search/master/screnshot1.png)
+![demo](https://thumbs.gfycat.com/GenerousRingedFlicker-small.gif)
 
-* Should work w/ any X11 window manager.
-* Filtering by windows names/resources/classes.
+* Should work w/ most stackings X11 window managers.
+* Filtering by window name/resource/classe.
 
 ## Reqs
 
-* Ruby
+* Ruby 2.4+
 * `xwininfo` & `xdotool` (`xorg-x11-utils` & `xdotool` Fedora pkgs)
 
 ## Compilation
@@ -22,7 +22,12 @@ not contravene w/ a system-installed dmenu.
 
 ## Usage
 
-Run `fvwm-window-search`.
+~~~
+$ ./fvwm-window-search -h
+Usage: fvwm-window-search [options]
+    -c path                          an alternative path to conf.yaml
+    -r                               focus a window only if Return is pressed
+~~~
 
 To customise dmenu or filtering, create a yaml file
 `$XDG_CONFIG_HOME/fvwm-window-search/conf.yaml`, e.g.:
@@ -40,8 +45,8 @@ filter:
 ~~~
 
 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.
+[dmenu(1)][]. `selhook-return-key-focus-only` is an equivalent of `-r`
+CLO.
 
 [dmenu(1)]: https://manpages.debian.org/unstable/suckless-tools/dmenu.1.en.html
 
@@ -51,7 +56,7 @@ a subkey is an array of regexes. See the defaults in
 
 ## Bugs
 
-* Tested only w/ Ruby-2.7.0 & Fvwm3.
+* Tested only w/ Fvwm3.
 * No distinction between normal & iconified windows.
 
 ## License

data/focus.sh

@@ -4,4 +4,19 @@ id=`echo "$1" | awk -F'|' '{print $NF} END { exit $NF == "" ? 1 : 0}'` || {
     echo "usage: `basename "$0"` 'name | class | id'"
     exit 1
 }
-xdotool windowactivate "$id" mousemove --window "$id" 0 0
+
+# tries to put a mouse pointer as shown on the picture below (▲ is the
+# pointer):
+#
+# +-------------+
+# |    Title    |
+# +-------------+
+# |      ▲      |
+# |             |
+# |             |
+# +-------------+
+
+eval "`xdotool getwindowgeometry --shell "$id"`"
+x=$((WIDTH/2))
+
+xdotool windowactivate "$id" mousemove --window "$id" "$x" 0

data/fvwm-window-search

@@ -3,18 +3,13 @@
 require_relative './lib'
 include FvwmWindowSearch
 require 'yaml'
-
-def options_load
-  xdg_config_home = ENV['XDG_CONFIG_HOME'] || File.expand_path('~/.config')
-  conf = File.join xdg_config_home, 'fvwm-window-search', 'conf.yaml'
-  r = File.read conf rescue nil
-  YAML.load r, conf rescue errx 1, "invalid config: #{$!}" if r
-end
+require 'optparse'
 
 def options
   default = {
     "dmenu" => {               # each key is a corresponding CL option
       "selhook" => File.join(__dir__, "focus.sh %s"),
+      "selhook-return-key-focus-only" => false,
       "fn" => "Monospace-10",
       "l" => 8,
       "b" => true,
@@ -27,7 +22,29 @@ def options
     }
   }
 
-  deep_merge(default, options_load || {})
+  cl = options_load_cl
+  env = deep_merge(default, options_load_file(cl) || {})
+  deep_merge env, cl
+end
+
+def options_load_cl
+  opt = { "dmenu" => {} }
+  OptionParser.new do |o|
+    o.on("-c path", "an alternative path to conf.yaml") { |v| opt["conf"] = v }
+    o.on("-r", "focus a window only if Return is pressed") do
+      opt["dmenu"]["selhook-return-key-focus-only"] = true
+    end
+  end.parse!
+  opt
+end
+
+def options_load_file opt       # return nil if config wasn't found
+  conf = opt["conf"] || -> do
+    xdg_config_home = ENV['XDG_CONFIG_HOME'] || File.expand_path('~/.config')
+    File.join xdg_config_home, 'fvwm-window-search', 'conf.yaml'
+  end.call
+  r = File.read conf rescue nil
+  YAML.load r, conf rescue errx 1, "invalid config: #{$!}" if r
 end
 
 def menu params, text

data/lib.rb

@@ -71,8 +71,8 @@ module FvwmWindowSearch
 
   def windows_filter patterns, winlist
     desired = -> (type, value) {
-      include = patterns[type].filter{|v| v[0] != '!'}
-      exclude = patterns[type].filter{|v| v[0] == '!'}.map {|v| v[1..-1]}
+      include = patterns[type].select {|v| v[0] != '!'}
+      exclude = patterns[type].select {|v| v[0] == '!'}.map {|v| v[1..-1]}
 
       exclude.each do |pattern|
         return true if value.match pattern
@@ -83,9 +83,9 @@ module FvwmWindowSearch
       true
     }
 
-    winlist.filter { |w| desired.call "class", w.class }
-      .filter{ |w| desired.call "resource", w.resource }
-      .filter{ |w| desired.call "name", w.name }
+    winlist.select { |w| desired.call "class", w.class }
+      .select { |w| desired.call "resource", w.resource }
+      .select { |w| desired.call "name", w.name }
   end
 
   def deep_merge first, second

metadata

@@ -1,19 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: fvwm-window-search
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire: 
 bindir: "."
 cert_chain: []
-date: 2020-07-19 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies: []
 description: |
-  Search for windows interactively using a patched dmenu utility.
-  Originally made for Fvwm, it's been fully rewritten to work out-of-the-box
-  with any window manager. Requires xdotool & xwininfo installed.
+  A window switcher: search for windows interactively using a patched
+  dmenu utility (comes with the gem). This was originally made for Fvwm,
+  but it's been fully rewritten to work out-of-the-box with any stacking
+  window manager. Requires xdotool & xwininfo installed.
+
+  It differs from rofi & co in that it activates (brings up) windows
+  _during_ the search.
 email: alexander.gromnitsky@gmail.com
 executables:
 - fvwm-window-search
@@ -40,7 +44,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -50,5 +54,6 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Interactive incremental windows search & selection for X Window
+summary: 'A window switcher: an interactive incremental windows search & selection
+  for X Window'
 test_files: []