fvwm-window-search 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd55a9dff4bdaee0fcb2e3aab600d85f6c0d40b8a706ea1dd0d7d17e2c0a83c8
-  data.tar.gz: b47ae4bac4a1a0e68f629306de58e76f6d0111f48e1a9bb686fb63362179161b
+  metadata.gz: 2819e711c1b51e6a619fbbf5839481b9a8019fc2c6db40265bda3756c65cad51
+  data.tar.gz: 8a58cab8dfc2e504e83d9b71a430a52bb95a63144fc5c499db02172078c57cb6
 SHA512:
-  metadata.gz: 13ce630d60e59c33f1bd26c6b29f4dcca5134dabc8d4f0a6a54f812e9d5d50ebb4ca644031e126785cefdaad6cd95ce008a3ca7167deb04b103a0e9dfc43ed53
-  data.tar.gz: 00311f2288294e4556f3e38b297c33581a7f0ab0b8ced615daf07d31c88682d0555b164a8eb5be6d68729495a8460469ed244511d93d8f2cab0793abac7a8fbc
+  metadata.gz: 9d0ab3a08c7bf6993e74c6c8aa07cfbbc1d34dfbc0a31bc6e61f190d6db4fbe0201305967522bf7507470df21e8183e49032b78faa9ea8e77b5f71fe0603d0d5
+  data.tar.gz: 58b49f87d0b92f176b6cf4c80ae0d11fc81f471ed096ac64e50bb74c64c5e52cc929ee437c240c298212ee58cf4af4633d965ebe6ebfc15e27f7f2943bf4c48d

data/Makefile

@@ -1,6 +1,8 @@
 out := _out
 dmenu := $(out)/dmenu
-dmenu.commit := 9b38fda6feda68f95754d5b8932b1a69471df960
+dmenu.commit := 1a13d0465d1a6f4f74bc5b07b04c9bd542f20ba6
+
+all: $(out)/.dmenu.build $(out)/focus $(out)/winlist
 
 $(out)/.dmenu.build: $(out)/.dmenu.$(dmenu.commit) dmenu.patch
 	patch -d $(dmenu) -p1 < dmenu.patch
@@ -12,5 +14,11 @@ $(out)/.dmenu.$(dmenu.commit):
 	git -C $(dmenu) checkout $(dmenu.commit) -q
 	touch $@
 
+libs := x11 jansson
+LDFLAGS := $(shell pkg-config --libs $(libs))
+CFLAGS := -g -Wall $(shell pkg-config --cflags $(libs))
+$(out)/%: %.c lib.c
+	$(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@
+
 # an empty target to satisfy rubygems
 install:

data/README.md

@@ -8,12 +8,12 @@ Incremental window search & immediate switch to the selected window
 ![demo](https://thumbs.gfycat.com/GenerousRingedFlicker-small.gif)
 
 * Should work w/ most stackings X11 window managers.
-* Filtering by window name/resource/classe.
+* Filtering by window name/resource/class.
 
 ## Reqs
 
 * Ruby 2.4+
-* `xwininfo` & `xdotool` (`xorg-x11-utils` & `xdotool` Fedora pkgs)
+* `dnf install jansson-devel`
 
 ## Compilation
 
@@ -38,7 +38,7 @@ dmenu:
   fn: Monospace-12
   b: false
   selhook-return-key-focus-only: true
-filter:
+filter-out:
     name: ['System Monitor']
     resource: []
     class: []
@@ -50,8 +50,8 @@ CLO.
 
 [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
+`filter-out` 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

data/focus.c

@@ -0,0 +1,80 @@
+#include <stdlib.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdbool.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#include "lib.c"
+
+ulong str2id(const char *s) {
+    ulong id;
+    if (sscanf(s, "0x%lx", &id) != 1 &&
+        sscanf(s, "0X%lx", &id) != 1 &&
+        sscanf(s, "%lu", &id) != 1) return 0;
+    return id;
+}
+
+bool client_msg(Display *dpy, Window id, char *msg,
+                unsigned long data0, unsigned long data1,
+                unsigned long data2, unsigned long data3,
+                unsigned long data4) {
+    XEvent event;
+    long mask = SubstructureRedirectMask | SubstructureNotifyMask;
+
+    event.xclient.type = ClientMessage;
+    event.xclient.serial = 0;
+    event.xclient.send_event = True;
+    event.xclient.message_type = XInternAtom(dpy, msg, False);
+    event.xclient.window = id;
+    event.xclient.format = 32;
+    event.xclient.data.l[0] = data0;
+    event.xclient.data.l[1] = data1;
+    event.xclient.data.l[2] = data2;
+    event.xclient.data.l[3] = data3;
+    event.xclient.data.l[4] = data4;
+
+    if (XSendEvent(dpy, DefaultRootWindow(dpy), False, mask, &event))
+      return true;
+    warnx("cannot send %s event", msg);
+    return false;
+}
+
+bool window_activate(Display *dpy, Window id) {
+  long desk = desktop(dpy, id);
+  if (-1 != desk) {
+    client_msg(dpy, DefaultRootWindow(dpy), "_NET_CURRENT_DESKTOP",
+               desk, 0, 0, 0, 0);
+  }
+
+  bool r = client_msg(dpy, id, "_NET_ACTIVE_WINDOW", 0, 0, 0, 0, 0);
+  XMapRaised(dpy, id);
+  return r;
+}
+
+bool window_center_mouse(Display *dpy, ulong id) {
+  XWindowAttributes attrs;
+  if (!XGetWindowAttributes(dpy, id, &attrs)) return false;
+  if (!XWarpPointer(dpy, 0, id, 0, 0, 0, 0, attrs.width/2, attrs.height/2))
+    return false;
+  XFlush(dpy);
+  return true;
+}
+
+
+
+int main(int argc, char **argv) {
+  Display *dpy = XOpenDisplay(getenv("DISPLAY"));
+  if (!dpy) errx(1, "failed to open display %s", getenv("DISPLAY"));
+  if (argc != 2) errx(1, "usage: focus window-id");
+
+  ulong id = str2id(argv[1]);
+  if (!id) errx(1, "invalid window id: `%s`", argv[1]);
+
+  XSynchronize(dpy, True); // snake oil?
+  bool r = window_activate(dpy, id);
+  if (!r) return 1;
+  r = window_center_mouse(dpy, id);
+  return !r;
+}

data/focus.sh

@@ -1,22 +1,12 @@
 #!/bin/sh
 
 id=`echo "$1" | awk -F'|' '{print $NF} END { exit $NF == "" ? 1 : 0}'` || {
-    echo "usage: `basename "$0"` 'name | class | id'"
+    echo "usage: `basename "$0"` 'foo | bar | id'"
     exit 1
 }
 
-# tries to put a mouse pointer as shown on the picture below (▲ is the
-# pointer):
-#
-# +-------------+
-# |    Title    |
-# +-------------+
-# |      ▲      |
-# |             |
-# |             |
-# +-------------+
+__filename=`readlink -f "$0"`
+__dirname=`dirname "${__filename}"`
 
-eval "`xdotool getwindowgeometry --shell "$id"`"
-x=$((WIDTH/2))
-
-xdotool windowactivate "$id" mousemove --window "$id" "$x" 0
+# shellcheck disable=2086
+${__dirname}/_out/focus $id

data/fvwm-window-search

@@ -15,7 +15,7 @@ def options
       "b" => true,
       "i" => true,
     },
-    "filter" => {
+    "filter-out" => {
       "name" => [],
       "resource" => [],
       "class" => ['^Fvwm', '!^FvwmIdent$']
@@ -61,18 +61,15 @@ def menu params, text
 end
 
 def main
-  ['xwininfo', 'xdotool'].each do |util|
-    errx 1, "no #{util} in PATH" unless which util
-  end
-
   opt = options
   begin
-    winlist = windows_filter opt["filter"], windows
+    winlist = windows_filter_out opt["filter-out"], windows
   rescue RegexpError
-    errx 1, "filter: #{$!}"
+    errx 1, "filter-out: #{$!}"
   end
   winlist = winlist.map do |w|
-    "#{w.name} | #{w.class} | #{w.id}"
+    desk = w['desk'] == -1 ? '*' : w['desk']
+    [desk, w['class'], w['name'], w['host'], '0x'+w['id'].to_s(16)].join ' | '
   end.join "\n"
 
   menu opt["dmenu"], winlist

data/lib.c

@@ -0,0 +1,24 @@
+bool prop(Display *dpy, Window wid, Atom expected_type, const char *name,
+          u_char **result, ulong *size) {
+  Atom type;
+  int format;
+  ulong bytes_after;
+
+  Atom atom = XInternAtom(dpy, name, False);
+  int r = XGetWindowProperty(dpy, wid, atom, 0L, ~0L, False,
+                             expected_type, &type, &format,
+                             size, &bytes_after, result);
+  return r == Success && result;
+}
+
+long desktop(Display *dpy, Window wid) {
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  if (!prop(dpy, wid, XA_CARDINAL, "_NET_WM_DESKTOP", &prop_val, &prop_size))
+    return -2;
+
+  long r = -1;
+  if (prop_val) r = ((long*)prop_val)[0];
+  free(prop_val);
+  return r;
+}

data/lib.rb

@@ -1,75 +1,12 @@
-module FvwmWindowSearch; end
-
-class FvwmWindowSearch::Window
-  def initialize xwininfo_line
-    @line = xwininfo_line.match(/^([x0-9a-f]+)\s+(["\(].+["\)]):\s+\((.*)\)\s+([x0-9+-]+)\s+([0-9+-]+)$/)
-    raise "invalid xwininfo line" unless @line
-    @dim = parse
-  end
-
-  def parse
-    dim = {}
-    if @line[4]
-      m4 = @line[4].match(/^([0-9]+)x([0-9]+)\+([0-9-]+)\+([0-9-]+)$/)
-      if m4
-        dim[:w] = m4[1].to_i
-        dim[:h] = m4[2].to_i
-        dim[:x_rel] = m4[3].to_i
-        dim[:y_rel] = m4[4].to_i
-      end
-    end
-
-    if @line[5]
-      m5 = @line[5].match(/^\+([0-9-]+)\+([0-9-]+)$/)
-      if m5
-        dim[:x] = m5[1].to_i
-        dim[:y] = m5[2].to_i
-      end
-    end
-
-    dim
-  end
-
-  def id; @line[1]; end
-
-  def name;
-    return unless @line[2]
-    @line[2] == '(has no name)' ? nil : @line[2][1..-2]
-  end
-
-  def resource; @line[3]&.split(' ')&.dig(0)&.slice(1..-2); end
-  def class;    @line[3]&.split(' ')&.dig(1)&.slice(1..-2); end
-  def width; @dim[:w]; end
-  def height; @dim[:h]; end
-  def x; @dim[:x]; end # an absolute upper-left X
-  def y; @dim[:y]; end # an absolute upper-left Y
-  def x_rel; @dim[:x_rel]; end
-  def y_rel; @dim[:y_rel]; end
-
-  def useful?
-    return false unless @line
-    return false if width == 0 || height == 0
-    return false if (x == x_rel) && (y == y_rel)
-    return false if x_rel > 0 || y_rel > 0
-    return false unless self.class
-    true
-  end
-
-  def inspect
-    "#<Window> id=#{id}, name=#{name}, resource=#{resource}, class=#{self.class}"
-  end
-end
+require "json"
 
 module FvwmWindowSearch
   def windows
-  `xwininfo -root -tree`.split("\n")
-    .select {|v| v.match(/^\s*0x.+/)}
-    .map(&:strip)
-    .map {|v| Window.new(v)}
-    .select(&:useful?)
+    cmd = File.join(__dir__, '_out/winlist')
+    JSON.parse `#{cmd}`
   end
 
-  def windows_filter patterns, winlist
+  def windows_filter_out patterns, winlist
     desired = -> (type, value) {
       include = patterns[type].select {|v| v[0] != '!'}
       exclude = patterns[type].select {|v| v[0] == '!'}.map {|v| v[1..-1]}
@@ -83,9 +20,9 @@ module FvwmWindowSearch
       true
     }
 
-    winlist.select { |w| desired.call "class", w.class }
-      .select { |w| desired.call "resource", w.resource }
-      .select { |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
@@ -97,9 +34,4 @@ module FvwmWindowSearch
     $stderr.puts "#{File.basename $0} error: #{msg}"
     exit exit_code
   end
-
-  def which cmd
-    ENV['PATH'].split(File::PATH_SEPARATOR).map {|v| File.join v, cmd }
-      .find {|v| File.executable?(v) && !File.directory?(v) }
-  end
 end

data/winlist.c

@@ -0,0 +1,124 @@
+#include <stdlib.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <string.h>
+#include <math.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <jansson.h>
+
+#include "lib.c"
+
+typedef struct {
+  Window *ids;
+  ulong size;
+} WinList;
+
+// result should be freed
+WinList winlist(Display *dpy) {
+  WinList list;
+  u_char *result;
+
+  if (!prop(dpy, DefaultRootWindow(dpy), XA_WINDOW, "_NET_CLIENT_LIST",
+            &result, &list.size)) {
+    list.size = -1;
+    return list;
+  }
+
+  list.ids = (Window*)result;
+  return list;
+}
+
+// result should be freed
+char* wm_client_machine(Display *dpy, Window wid) {
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  prop(dpy, wid, XA_STRING, "WM_CLIENT_MACHINE", &prop_val, &prop_size);
+  return (char*)prop_val;
+}
+
+ulong str_index(const char *s, char ch) {
+  char *p = strchr(s, ch);
+  if (!p) return -1;
+  return (ulong)(p - s);
+}
+
+typedef struct {
+  char *resource;
+  char *class_name;
+} ResClass;
+
+// result should be freed
+ResClass wm_class(Display *dpy, Window wid) {
+  ResClass r = {.resource = NULL};
+
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  if (!prop(dpy, wid, XA_STRING, "WM_CLASS", &prop_val, &prop_size))
+    return r;
+
+  ulong idx = str_index((char*)prop_val, '\0');
+  if (idx < prop_size) {
+    r.resource = (char*)malloc(idx+2);
+    snprintf(r.resource, idx+1, "%s", prop_val);
+
+    ulong len = prop_size-idx;
+    r.class_name = (char*)malloc(len+1);
+    snprintf(r.class_name, len, "%s", prop_val+idx+1);
+  }
+
+  free(prop_val);
+  return r;
+}
+
+// result should be freed
+char* wm_name(Display *dpy, Window wid) {
+  u_char *prop_val = NULL;
+  ulong prop_size;
+
+  Atom utf8_str = XInternAtom(dpy, "UTF8_STRING", False);
+  bool r = prop(dpy, wid, utf8_str, "_NET_WM_NAME", &prop_val, &prop_size);
+  if (r && prop_val) return (char*)prop_val;
+
+  prop(dpy, wid, XA_STRING, "WM_NAME", &prop_val, &prop_size);
+  return (char*)prop_val;
+}
+
+
+
+int main() {
+  Display *dpy = XOpenDisplay(getenv("DISPLAY"));
+  if (!dpy) errx(1, "failed to open display %s", getenv("DISPLAY"));
+
+  json_t *r = json_array();
+  WinList list = winlist(dpy);
+  for (ulong idx = 0; idx < list.size; idx++) {
+    ulong wid = list.ids[idx];
+
+    char *host = wm_client_machine(dpy, wid);
+    char *name = wm_name(dpy, wid);
+    ResClass rc = wm_class(dpy, wid);
+
+    json_t *line = json_object();
+    json_object_set_new(line, "desk", json_integer(desktop(dpy, wid)));
+    json_object_set_new(line, "host", json_string(host));
+    json_object_set_new(line, "name", json_string(name));
+    json_object_set_new(line, "resource", json_string(rc.resource));
+    json_object_set_new(line, "class", json_string(rc.class_name));
+    json_object_set_new(line, "id", json_integer(wid));
+    json_array_append_new(r, line);
+
+    free(host);
+    free(name);
+    free(rc.resource);
+    free(rc.class_name);
+  }
+  XFree(list.ids);
+
+  char *dump = json_dumps(r, JSON_COMPACT);
+  printf("%s\n", dump);
+  free(dump);
+  json_decref(r);
+}

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fvwm-window-search
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
-autorequire: 
+autorequire:
 bindir: "."
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies: []
 description: |
   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.
+  window manager. Requires jansson-devel C library installed.
 
   It differs from rofi & co in that it activates (brings up) windows
   _during_ the search.
@@ -30,13 +30,16 @@ files:
 - README.md
 - dmenu.patch
 - extconf.rb
+- focus.c
 - focus.sh
+- lib.c
 - lib.rb
+- winlist.c
 homepage: https://github.com/gromnitsky/fvwm-window-search
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'A window switcher: an interactive incremental windows search & selection
   for X Window'