fvwm-window-search 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6334e45909512868782e41da16d60c26114f43230f0579b1e2e60918fadca628
-  data.tar.gz: 16e792a204f7ed859752781dc537a9e106200ac2c722dd8a581510d90d51d164
+  metadata.gz: 3e0b567a71daca6fd7780719a9228cd34a63f9cdfbf084a4b4c854f13b60c103
+  data.tar.gz: 8b274620b6a4ba391ad4127c91f63bfff85057c971c0678c4850b1a48cdb287b
 SHA512:
-  metadata.gz: ca486c7cac4a994953c0855877b687a44283c106b6e21cc2cba56ea4a95248ddec2b4a9fa3b0b4df1d82f1d8743a33d949566371c68e54c5c96d4646db4af531
-  data.tar.gz: 3b6f993cdc08f38fb695fb99ca9f2e50c09150bd3cb65d7423b9d99aa97917e71115863b5b46cf1372d34cf8f5dd40b623fd98df9456f8c8b5cb17006e1167c1
+  metadata.gz: b354e8b6cfe44214474c39f54ba10a931835c272ced4b315abf7872cd4c33017a6a146b02c4699b4fe67c633a1fb25d45ddc340f1f1f81e7d8af5d9fd3a92a9e
+  data.tar.gz: a41ae5a0816b84a33149b60ca3a2a30556ec7ea443acd07b57a4a258c5276a5797141ba0c2a7cf93fd53d44e3f01ec3f68b16edb4be2a32c1daefc35dc6a68c3

data/Makefile

@@ -2,7 +2,7 @@ out := _out
 dmenu := $(out)/dmenu
 dmenu.commit := 1a13d0465d1a6f4f74bc5b07b04c9bd542f20ba6
 
-all: $(out)/.dmenu.build $(out)/focus $(out)/winlist
+all: $(addprefix $(out)/, .dmenu.build activate winlist fontinfo)
 
 $(out)/.dmenu.build: $(out)/.dmenu.$(dmenu.commit) dmenu.patch
 	patch -d $(dmenu) -p1 < dmenu.patch
@@ -14,11 +14,15 @@ $(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))
+libs := x11
+LDFLAGS = $(shell pkg-config --libs $(libs))
+CFLAGS = -g -Wall -Werror $(shell pkg-config --cflags $(libs))
 $(out)/%: %.c lib.c
 	$(LINK.c) $< $(LOADLIBES) $(LDLIBS) -o $@
 
+$(out)/activate: libs += jansson
+$(out)/winlist: libs += jansson
+$(out)/fontinfo: libs += xft freetype2
+
 # an empty target to satisfy rubygems
 install:

data/README.md

@@ -7,13 +7,15 @@ 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/class.
+* Should work w/ most EWMH-compliant stackings X11 window managers.
+* Filter by window name/resource/class.
+* Optionally list windows from the current desktop only.
+* Preserve minimised/shaded window states.
 
 ## Reqs
 
 * Ruby 2.1+
-* `dnf install jansson-devel`
+* `dnf install jansson-devel freetype-devel`
 
 ## Compilation
 
@@ -25,10 +27,14 @@ doesn't interfere w/ a system-installed dmenu.
 ~~~
 $ ./fvwm-window-search -h
 Usage: fvwm-window-search [options]
-    -c path                      an alternative path to conf.yaml
-    -r                           switch to a window only when <Return> is pressed
+    -c path                     an alternative path to conf.yaml
+    -d                          list windows from the current desktop only
+    -r                          switch to a window only when <Return> is pressed
 ~~~
 
+To scroll in dmenu (using Up/Down/Home/End/PgUp/PgDown) without
+windows activation, hold <kbd>Shift</kbd>.
+
 To customise dmenu or filtering, create a yaml file
 `$XDG_CONFIG_HOME/fvwm-window-search/conf.yaml`, e.g.:
 
@@ -37,7 +43,7 @@ To customise dmenu or filtering, create a yaml file
 dmenu:
   fn: Monospace-12
   b: false
-  selhook-return-key-focus-only: true
+  selection_hook_activation_return_key_only: true
 filter-out:
     name: ['System Monitor']
     resource: []
@@ -45,8 +51,8 @@ filter-out:
 ~~~
 
 Subkeys in `dmenu` are the usual CLOs for
-[dmenu(1)][]. `selhook-return-key-focus-only` is an equivalent of `-r`
-CLO.
+[dmenu(1)][]. `selection_hook_activation_return_key_only` is an
+equivalent of `-r` CLO.
 
 [dmenu(1)]: https://manpages.debian.org/unstable/suckless-tools/dmenu.1.en.html
 
@@ -64,11 +70,6 @@ This is not the case with rubygems! The latter generates a stub script
 that invokes `./fvwm-window-search` file. This indirection may add
 ~140ms of additional delay.
 
-## Bugs
-
-* Tested only w/ Fvwm3.
-* No distinction between normal & iconified windows.
-
 ## License
 
 MIT.

data/activate.c

@@ -0,0 +1,163 @@
+#include <stdlib.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <limits.h>
+#include <libgen.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <jansson.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, const 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 active = client_msg(dpy, id, "_NET_ACTIVE_WINDOW", 0, 0, 0, 0, 0);
+
+  const int _net_wm_state_rm = 0;
+  bool unshaded = client_msg(dpy, id, "_NET_WM_STATE", _net_wm_state_rm,
+                             myAtoms._NET_WM_STATE_SHADED, 0, 0, 0);
+
+  XMapRaised(dpy, id);
+  return active && unshaded;
+}
+
+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;
+}
+
+// the result shout be freed
+char* config() {
+  char xdg_runtime_home[PATH_MAX-64];
+  if (getenv("XDG_RUNTIME_HOME")) {
+    snprintf(xdg_runtime_home, PATH_MAX-64, "%s", getenv("XDG_RUNTIME_HOME"));
+  } else {
+    snprintf(xdg_runtime_home, PATH_MAX-64, "/run/user/%d", getuid());
+  }
+  char *file = (char*)malloc(PATH_MAX);
+  snprintf(file, PATH_MAX, "%s/%s/%s",
+           xdg_runtime_home, "fvwm-window-search", "last_window.json");
+
+  char *dir = dirname(strdup(file));
+  mkdir(xdg_runtime_home, 0755);
+  int r = mkdir(dir, 0755); if (-1 == r && EEXIST != errno) {
+    warn("failed to create %s", dir);
+    return NULL;
+  }
+  free(dir);
+  return file;
+}
+
+void state_save(Display *dpy, Window id) {
+  char *file = config();
+  int fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (-1 == fd) {
+    warn("failed to truncate %s", file);
+    return;
+  }
+  free(file);
+
+  WindowState ws = state(dpy, id);
+  json_t *o = json_object();
+  json_object_set_new(o, "id", json_integer(ws.id));
+  json_object_set_new(o, "_NET_WM_STATE_SHADED", json_boolean(ws._NET_WM_STATE_SHADED));
+  json_object_set_new(o, "_NET_WM_STATE_HIDDEN", json_boolean(ws._NET_WM_STATE_HIDDEN));
+
+  char *dump = json_dumps(o, JSON_COMPACT);
+  write(fd, dump, strlen(dump));
+  free(dump);
+  json_decref(o);
+
+  close(fd);
+}
+
+Window state_load(Display *dpy, Window  id_current) {
+  char *file = config();
+  json_t *root = json_load_file(file, 0, NULL);
+  free(file);
+  if (!root) return 0;
+
+  Window id = json_integer_value(json_object_get(root, "id"));
+  if (id == id_current) return id;
+
+  const int _net_wm_state_add = 1;
+  bool is_shaded = json_boolean_value(json_object_get(root, "_NET_WM_STATE_SHADED"));
+  if (is_shaded) client_msg(dpy, id, "_NET_WM_STATE", _net_wm_state_add,
+                            myAtoms._NET_WM_STATE_SHADED, 0, 0, 0);
+  bool is_hidden = json_boolean_value(json_object_get(root, "_NET_WM_STATE_HIDDEN"));
+  if (is_hidden) client_msg(dpy, id, "_NET_WM_STATE", _net_wm_state_add,
+                            myAtoms._NET_WM_STATE_HIDDEN, 0, 0, 0);
+
+  json_decref(root);
+  return id;
+}
+
+
+
+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: activate window-id");
+
+  mk_atoms(dpy);
+
+  ulong id = str2id(argv[1]);
+  if (!id) errx(1, "invalid window id: `%s`", argv[1]);
+
+  Window prev_id = state_load(dpy, id);
+  if (prev_id != id) state_save(dpy, id);
+
+  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 → activate.sh}

@@ -9,4 +9,4 @@ __filename=`readlink -f "$0"`
 __dirname=`dirname "${__filename}"`
 
 # shellcheck disable=2086
-${__dirname}/_out/focus $id
+${__dirname}/_out/activate $id

data/dmenu.patch

@@ -14,19 +14,20 @@ 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..1920110 100644
+index 1edb647..65c831f 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -21,3 +21,7 @@ static unsigned int lines      = 0;
+@@ -21,3 +21,8 @@ static unsigned int lines      = 0;
   * for example: " /?\"&[]"
   */
  static const char worddelimiters[] = " ";
 +
-+/* -selhook option; run a command on every selection */
++/* -selection_hook option; run a command on every selection */
 +static const char *selection_hook = NULL;
-+static int selection_hook_return_key_focus_only = 0;
++static int selection_hook_activation = 1;
++static int selection_hook_activation_return_key_only = 0;
 diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..274668a 100644
+index 65f25ce..47a6b37 100644
 --- a/dmenu.c
 +++ b/dmenu.c
 @@ -304,6 +304,62 @@ movewordedge(int dir)
@@ -92,7 +93,45 @@ index 65f25ce..274668a 100644
  static void
  keypress(XKeyEvent *ev)
  {
-@@ -464,6 +520,7 @@ insert:
+@@ -410,6 +466,7 @@ insert:
+ 		insert(NULL, nextrune(-1) - cursor);
+ 		break;
+ 	case XK_End:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (text[cursor] != '\0') {
+ 			cursor = strlen(text);
+ 			break;
+@@ -429,6 +486,7 @@ insert:
+ 		cleanup();
+ 		exit(1);
+ 	case XK_Home:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (sel == matches) {
+ 			cursor = 0;
+ 			break;
+@@ -445,18 +503,21 @@ insert:
+ 			return;
+ 		/* fallthrough */
+ 	case XK_Up:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (sel && sel->left && (sel = sel->left)->right == curr) {
+ 			curr = prev;
+ 			calcoffsets();
+ 		}
+ 		break;
+ 	case XK_Next:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (!next)
+ 			return;
+ 		sel = curr = next;
+ 		calcoffsets();
+ 		break;
+ 	case XK_Prior:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (!prev)
+ 			return;
+ 		sel = curr = prev;
+@@ -464,6 +525,7 @@ insert:
  		break;
  	case XK_Return:
  	case XK_KP_Enter:
@@ -100,29 +139,40 @@ index 65f25ce..274668a 100644
  		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
  		if (!(ev->state & ControlMask)) {
  			cleanup();
-@@ -572,6 +629,8 @@ run(void)
+@@ -481,6 +543,7 @@ insert:
+ 			return;
+ 		/* fallthrough */
+ 	case XK_Down:
++		if (ev->state & ShiftMask) selection_hook_activation = 0;
+ 		if (sel && sel->right && (sel = sel->right) == next) {
+ 			curr = next;
+ 			calcoffsets();
+@@ -572,6 +635,11 @@ run(void)
  			break;
  		case KeyPress:
  			keypress(&ev.xkey);
-+			if (!selection_hook_return_key_focus_only)
++			if (!selection_hook_activation_return_key_only &&
++				selection_hook_activation)
 +				selhook(selection_hook, sel);
++
++			selection_hook_activation = 1;
  			break;
  		case SelectionNotify:
  			if (ev.xselection.property == utf8)
-@@ -712,6 +771,8 @@ main(int argc, char *argv[])
+@@ -712,6 +780,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 (!strcmp(argv[i], "-selection_hook_activation_return_key_only")) {
++			selection_hook_activation_return_key_only = 1;
  		} else if (i + 1 == argc)
  			usage();
  		/* these options take one argument */
-@@ -733,6 +794,8 @@ main(int argc, char *argv[])
+@@ -733,6 +803,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], "-selection_hook")) /* a command to run */
 +			selection_hook = argv[++i];
  		else
  			usage();

data/fontinfo.c

@@ -0,0 +1,34 @@
+// Prints a triptych of 'screenWidth charWidth userTextWidth' to stdout.
+
+#include <stdbool.h>
+#include <err.h>
+#include <X11/Xft/Xft.h>
+#include <X11/Xatom.h>
+
+#include "lib.c"
+
+long desktop_width(Display *dpy) {
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  if (!prop(dpy, DefaultRootWindow(dpy), XA_CARDINAL, "_NET_DESKTOP_GEOMETRY", &prop_val, &prop_size))
+    return -1;
+
+  long r = ((long*)prop_val)[0];
+  free(prop_val);
+  return r;
+}
+
+int main(int argc, char **argv) {
+  Display *dpy = XOpenDisplay(getenv("DISPLAY"));
+  if (!dpy) errx(1, "failed to open display %s", getenv("DISPLAY"));
+  if (argc != 3) errx(1, "usage: fontinfo font text-string");
+
+  XftFont *font = XftFontOpenName(dpy, DefaultScreen(dpy), argv[1]);
+  if (!font) errx(1, "no font match");
+
+  XGlyphInfo info_text, info_char;
+  XftTextExtentsUtf8(dpy, font, (FcChar8*)"@", 1, &info_char);
+  XftTextExtentsUtf8(dpy, font, (FcChar8*)argv[2], strlen(argv[2]), &info_text);
+
+  printf("%ld %d %d\n", desktop_width(dpy), info_char.width, info_text.width);
+}

data/fvwm-window-search

@@ -1,18 +1,21 @@
 #!/usr/bin/env -S ruby --disable-gems
+# coding: utf-8
+# frozen_string_literal: true
 
 require 'yaml'
 require 'json'
 require 'optparse'
+require 'shellwords'
 
 def options
   default = {
-    "dmenu" => { # each key corresponds to a dmenu CL option, except for selhook*
+    'dmenu' => { # each key corresponds to a dmenu CL option
       "fn" => "Monospace-10",
       "l" => 8,
       "b" => true,
       "i" => true,
-      "selhook" => File.join(__dir__, "focus.sh %s"),
-      "selhook-return-key-focus-only" => false, # FIXME: rename
+      'selection_hook' => File.join(__dir__, "activate.sh %s"),
+      'selection_hook_activation_return_key_only' => false,
     },
     "filter-out" => {
       "name" => [],
@@ -30,8 +33,9 @@ def options_command_line
   opt = { "dmenu" => {} }
   OptionParser.new do |o|
     o.on("-c path", "an alternative path to conf.yaml") { |v| opt["conf"] = v }
+    o.on('-d', 'list windows from the current desktop only') { opt['this_desk_only'] = true }
     o.on("-r", "switch to a window only when <Return> is pressed") do
-      opt["dmenu"]["selhook-return-key-focus-only"] = true
+      opt['dmenu']['selection_hook_activation_return_key_only'] = true
     end
   end.parse!
   opt
@@ -51,8 +55,10 @@ def deep_merge first, second
   first.merge(second, &merger)
 end
 
+def helper exe; File.join(__dir__, "_out/#{exe}"); end
+
 def dmenu_cmd params
-  [File.join(__dir__, "_out/dmenu/dmenu")] + params.map do |k,v|
+  [helper('dmenu/dmenu')] + params.map do |k,v|
     k = "-"+k
     if !!v == v
       v ? k : nil
@@ -81,12 +87,38 @@ def desired patterns, window
     match.call("name", window['name'])
 end
 
+def dmenu_max_text_len opt
+  cmd = "#{helper('fontinfo')} #{opt['dmenu']['fn'].shellescape} '@'"
+  desk_width, char_width = `#{cmd}`.split.map(&:to_i)
+  (desk_width - char_width*2) / char_width
+end
+
+def menu_line max_len, desk_indicator, w
+  desk = w['desk'] == -1 ? '*' : w['desk'].to_s
+  desktop = desk_indicator + desk
+  id = '0x'+w['id'].to_s(16)
+
+  c = ->(s, len) { s.size > len ? s[0...len-1] + '…' : s }
+
+  name_width = max_len - 4 - 10 - 10 - 9 - 4*3
+
+  "%-4s | %10s | %-#{name_width}s | %10s | %9s" % [
+    desktop,
+    c.call(w['class'], 10),
+    c.call(w['name'], name_width),
+    c.call(w['host'], 10),
+    c.call(id, 9)
+  ]
+end
+
 def main
   opt = options
   pp opt if $DEBUG
+
+  max_len = dmenu_max_text_len opt
   dmenu = IO.popen(dmenu_cmd(opt['dmenu']), 'r+')
 
-  IO.popen(File.join(__dir__, '_out/winlist')).each_line do |line|
+  IO.popen(helper('winlist')).each_line do |line|
     begin
       w = JSON.parse line
     rescue
@@ -94,10 +126,16 @@ def main
       next
     end
 
+    if opt['this_desk_only']
+      next unless w['desk_cur']
+      desk_indicator = ''
+    else
+      desk_indicator = w['desk_cur'] ? '→ ' : '  '
+    end
+
     next unless desired opt['filter-out'], w
 
-    desk = w['desk'] == -1 ? '*' : w['desk']
-    dmenu.puts [desk, w['class'], w['name'], w['host'], '0x'+w['id'].to_s(16)].join ' | '
+    dmenu.puts menu_line(max_len, desk_indicator, w)
   end
 
   dmenu.close

data/lib.c

@@ -22,3 +22,39 @@ long desktop(Display *dpy, Window wid) {
   free(prop_val);
   return r;
 }
+
+typedef struct {
+  bool _NET_WM_STATE_SHADED;
+  bool _NET_WM_STATE_HIDDEN;
+  Window id;
+} WindowState;
+
+typedef struct {
+  Atom _NET_WM_STATE_SHADED;
+  Atom _NET_WM_STATE_HIDDEN;
+  Atom UTF8_STRING;
+} MyAtoms;
+
+MyAtoms myAtoms;
+
+void mk_atoms(Display *dpy) {
+  myAtoms._NET_WM_STATE_SHADED = XInternAtom(dpy, "_NET_WM_STATE_SHADED", False);
+  myAtoms._NET_WM_STATE_HIDDEN = XInternAtom(dpy, "_NET_WM_STATE_HIDDEN", False);
+  myAtoms.UTF8_STRING = XInternAtom(dpy, "UTF8_STRING", False);
+}
+
+WindowState state(Display *dpy, Window id) {
+  WindowState r = { .id = id };
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  if (!prop(dpy, id, XA_ATOM, "_NET_WM_STATE", &prop_val, &prop_size)) return r;
+
+  Atom *atoms = (Atom*)prop_val;
+  for (int idx = 0; idx < prop_size; idx++) {
+    if (atoms[idx] == myAtoms._NET_WM_STATE_SHADED) r._NET_WM_STATE_SHADED = true;
+    if (atoms[idx] == myAtoms._NET_WM_STATE_HIDDEN) r._NET_WM_STATE_HIDDEN = true;
+  }
+  XFree(prop_val);
+
+  return r;
+}

data/winlist.c

@@ -14,6 +14,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 #include <jansson.h>
 
 #include "lib.c"
@@ -25,12 +26,11 @@ typedef struct {
 
 // result (WinList.ids) should be freed
 WinList winlist(Display *dpy) {
-  WinList list;
+  WinList list = { .ids = NULL };
   u_char *result;
 
-  if (!prop(dpy, DefaultRootWindow(dpy), XA_WINDOW, "_NET_CLIENT_LIST",
+  if (!prop(dpy, DefaultRootWindow(dpy), XA_WINDOW, "_NET_CLIENT_LIST_STACKING",
             &result, &list.size)) {
-    list.size = -1;
     return list;
   }
 
@@ -43,40 +43,15 @@ 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;
+  return prop_val ? (char*)prop_val : strdup("nil");
 }
 
-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 (ResClass.*) 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);
+// result (XClassHint.*) should be freed
+XClassHint wm_class(Display *dpy, Window wid) {
+  XClassHint r = { .res_name = NULL };
+  XGetClassHint(dpy, wid, &r);
+  if (!r.res_name) r.res_name = strdup("nil");
+  if (!r.res_class) r.res_class = strdup("nil");
   return r;
 }
 
@@ -85,12 +60,24 @@ 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);
+  bool r = prop(dpy, wid, myAtoms.UTF8_STRING, "_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;
+  return prop_val ? (char*)prop_val : strdup("nil");
+}
+
+long desktop_current(Display *dpy) {
+  u_char *prop_val = NULL;
+  ulong prop_size;
+  long r = -1;
+  if (!prop(dpy, DefaultRootWindow(dpy), XA_CARDINAL, "_NET_CURRENT_DESKTOP",
+            &prop_val, &prop_size))
+    return r;
+
+  if (prop_val) r = ((long*)prop_val)[0];
+  free(prop_val);
+  return r;
 }
 
 
@@ -98,21 +85,25 @@ char* wm_name(Display *dpy, Window wid) {
 int main() {
   Display *dpy = XOpenDisplay(getenv("DISPLAY"));
   if (!dpy) errx(1, "failed to open display %s", getenv("DISPLAY"));
+  mk_atoms(dpy);
 
   WinList list = winlist(dpy);
-  for (ulong idx = 0; idx < list.size; idx++) {
+  for (long idx = list.size-1; idx >= 0; 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);
+    XClassHint rc = wm_class(dpy, wid);
+    long desk = desktop(dpy, wid);
+    bool is_desk_cur = desk < 0 || desk == desktop_current(dpy);
 
     json_t *line = json_object();
-    json_object_set_new(line, "desk", json_integer(desktop(dpy, wid)));
+    json_object_set_new(line, "desk", json_integer(desk));
+    json_object_set_new(line, "desk_cur", json_boolean(is_desk_cur));
     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, "resource", json_string(rc.res_name));
+    json_object_set_new(line, "class", json_string(rc.res_class));
     json_object_set_new(line, "id", json_integer(wid));
 
     char *dump = json_dumps(line, JSON_COMPACT);
@@ -122,8 +113,8 @@ int main() {
 
     free(host);
     free(name);
-    free(rc.resource);
-    free(rc.class_name);
+    free(rc.res_name);
+    free(rc.res_class);
   }
   XFree(list.ids);
 }

metadata

@@ -1,20 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: fvwm-window-search
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2021-04-09 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 a preinstalled jansson-devel C library.
+  dmenu utility (the gem fetches & patches it during its installation).
+  This was originally made for Fvwm, but it's been rewritten to work with
+  any EWMH-compliant stacking window manager.
+
+  Requires a preinstalled jansson-devel C library.
 
   It differs from rofi & co in that it activates (brings up) windows
   _during_ the search.
@@ -28,10 +30,11 @@ files:
 - "./fvwm-window-search"
 - Makefile
 - README.md
+- activate.c
+- activate.sh
 - dmenu.patch
 - extconf.rb
-- focus.c
-- focus.sh
+- fontinfo.c
 - lib.c
 - winlist.c
 homepage: https://github.com/gromnitsky/fvwm-window-search

data/focus.c

@@ -1,80 +0,0 @@
-#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;
-}