fvwm-window-search 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e0b567a71daca6fd7780719a9228cd34a63f9cdfbf084a4b4c854f13b60c103
-  data.tar.gz: 8b274620b6a4ba391ad4127c91f63bfff85057c971c0678c4850b1a48cdb287b
+  metadata.gz: 128a87d266fc2fa55f7a0a49e4754ff7026eeb13ea1e9db1c392fa5615e6e8ea
+  data.tar.gz: a4da76f60401c5cf6ed56069032b1014efd2224da4deaaf11a1ff4ac5e282870
 SHA512:
-  metadata.gz: b354e8b6cfe44214474c39f54ba10a931835c272ced4b315abf7872cd4c33017a6a146b02c4699b4fe67c633a1fb25d45ddc340f1f1f81e7d8af5d9fd3a92a9e
-  data.tar.gz: a41ae5a0816b84a33149b60ca3a2a30556ec7ea443acd07b57a4a258c5276a5797141ba0c2a7cf93fd53d44e3f01ec3f68b16edb4be2a32c1daefc35dc6a68c3
+  metadata.gz: a4892c1dde0908b82df3c249aa7768572de54622033286290f92ce0ea251ccbe881538a4a068b2c98a2e21a345bffabb8247b9633ed7ceeb3ee606ee6110246f
+  data.tar.gz: e51b7dd7ea7c4184003873004b34d46103a4a38c673ee8368f6aba3758730993ca3578f15c26dcc6af39e091153fa312c161cba4a0b4b1fad457de32275d0d97

data/README.md

@@ -5,7 +5,7 @@ Incremental window search & immediate switch to the selected window
 
     $ gem install fvwm-window-search
 
-![demo](https://thumbs.gfycat.com/GenerousRingedFlicker-small.gif)
+![demo](https://sigwait.tk/~alex/junk/fvwm-window-search-2.2.0.gif)
 
 * Should work w/ most EWMH-compliant stackings X11 window managers.
 * Filter by window name/resource/class.

data/activate.c

@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -7,11 +6,8 @@
 #include <string.h>
 #include <limits.h>
 #include <libgen.h>
-#include <sys/stat.h>
-#include <errno.h>
+#include <sys/utsname.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 #include <jansson.h>
 
 #include "lib.c"
@@ -81,15 +77,17 @@ char* config() {
   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());
+    struct utsname info;
+    uname(&info);
+    char *template = 0 == strcmp(info.sysname, "Linux") ? "/run/user/%d" : "/tmp/user/%d";
+    snprintf(xdg_runtime_home, PATH_MAX-64, template, 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) {
+  if (!mkdir_p(dir, 0700)) {
     warn("failed to create %s", dir);
     return NULL;
   }
@@ -99,7 +97,7 @@ char* config() {
 
 void state_save(Display *dpy, Window id) {
   char *file = config();
-  int fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (-1 == fd) {
+  int fd = open(file, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (-1 == fd) {
     warn("failed to truncate %s", file);
     return;
   }

data/fontinfo.c

@@ -3,8 +3,6 @@
 #include <stdbool.h>
 #include <err.h>
 #include <X11/Xft/Xft.h>
-#include <X11/Xatom.h>
-
 #include "lib.c"
 
 long desktop_width(Display *dpy) {

data/lib.c

@@ -1,3 +1,11 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
 bool prop(Display *dpy, Window wid, Atom expected_type, const char *name,
           u_char **result, ulong *size) {
   Atom type;
@@ -58,3 +66,32 @@ WindowState state(Display *dpy, Window id) {
 
   return r;
 }
+
+bool mkdir_p(const char *s, mode_t mode) {
+  char *component = strdup(s);
+  char *p = component;
+
+  bool status = true;
+  while (*p && *p == '/') p++; // skip leading '/'
+
+  do {
+    while (*p && *p != '/') p++;
+
+    if (!*p)
+      p = NULL;
+    else
+      *p = '\0';
+
+    if (-1 == mkdir(component, mode) && errno != EEXIST) {
+      status = false;
+      break;
+    } else if (p) {
+      *p++ = '/';
+      while (*p && *p == '/') p++;
+    }
+
+  } while (p);
+
+  free(component);
+  return status;
+}

data/winlist.c

@@ -5,15 +5,11 @@
   {"desk":0,"host":"hm76","name":"xterm","resource":"xterm","class":"XTerm","id":67108878}
 */
 
-#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 <X11/Xutil.h>
 #include <jansson.h>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fvwm-window-search
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Alexander Gromnitsky
 autorequire:
 bindir: "."
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies: []
 description: |
   A window switcher: search for windows interactively using a patched