Commit graph

84 commits

Author SHA1 Message Date
Chris Down 4a3862666f Always send xsel logfile to /dev/null
We don't want this logging to disk, but /dev/stderr doesn't always work
(see #81). Let's just stop all logging to avoid more shenanigans.
2018-05-10 17:13:46 +01:00
Chris Down 44545be18e Canonicalise missing elements in readlink
Fixes #81.
2018-05-09 13:02:54 +01:00
Gravemind 95cf774b0d Fix wrong file deleted after partial selection (#76)
It was deleting the file before the partial selection because
`last_filename` was saved before filename was actually ready (so was
actually saving the one before the last).

Fixes #75.
2018-04-19 11:00:21 +01:00
Chris Down 486dbe31fa Recover without restarting if we deleted the entire clip directory 2018-03-11 20:21:00 -04:00
Chris Down fa9d01a752 Don't populate ${last_data[any]}
Fixes #67. This used to be useful in order to avoid doing multiple
writes back when we didn't deduplicate in clipmenu client, but now we do
and don't need this. Even more impressively, it actually breaks things!
See #67 for more information.
2018-03-08 22:32:43 -08:00
Chris Down a93cc27b65 Add nanosecond resolution to cache file output
Possibly related to #62.
2018-02-21 17:23:07 +00:00
Chris Down 44d7baa27a Have CM_MAX_CLIPS understand new version 5 format 2018-02-20 11:36:00 +00:00
Chris Down ee0a6f6d31 Add shellcheck disable for CM_SELECTIONS 2018-02-20 11:31:08 +00:00
Chris Down 4e969bd67d Truncate cache file on duplicate 2018-02-20 11:21:37 +00:00
Chris Down 1896ceaccc Act on possible partials in both directions 2018-02-20 10:39:30 +00:00
Chris Down 0b885650fe Revert "Remove partial clip dedupe support"
This reverts commit caa009b222.
2018-02-20 10:38:48 +00:00
Chris Down 8896df9011 Use -o/-i, not -k
-k is not selection based
2018-02-20 10:30:54 +00:00
Chris Down c7c894a023 Use separate line cache for each selection 2018-02-20 10:29:35 +00:00
Chris Down 7b4267868e Revert "Remove last_data checks"
This reverts commit 55407ba3f6.
2018-02-20 10:09:50 +00:00
Chris Down 52b144d970 Revert "Take clipboard ownership prior to clipnotify"
This reverts commit eb7d2b9481.
2018-02-20 10:09:24 +00:00
Chris Down 9c436084f2 Revert "Use xsel -o/-i instead of -k"
This reverts commit 47eb3d182c.
2018-02-20 10:08:20 +00:00
Chris Down 9a52f7ddba Revert "Make sure we don't break #34 in new pre-ownership"
This reverts commit fe69861101.
2018-02-20 10:08:13 +00:00
Chris Down 6825c302dc Revert "Remove CM_ONESHOT-specific logic in flock failure checks"
This reverts commit 728d242d3c.
2018-02-20 10:07:58 +00:00
Chris Down a85f8998b4 Revert "Make main work block async"
There is currently a bug where this causes a copy storm at startup. More
worryingly, more and more newlines are appended to the end, so something
is going wrong in copy logic anyway, async or not.

This reverts commit 11304d3a60.
2018-02-20 09:29:49 +00:00
Chris Down caab3f6a62 Add $CM_SELECTIONS to limit which selections we copy
Closes #60.
2018-02-19 18:21:44 +00:00
Chris Down 728d242d3c Remove CM_ONESHOT-specific logic in flock failure checks
Now that we're in a subshell and acting asynchronously, this doesn't do
anything different.
2018-02-19 15:41:11 +00:00
Chris Down fe69861101 Make sure we don't break #34 in new pre-ownership 2018-02-19 15:11:51 +00:00
Chris Down 47eb3d182c Use xsel -o/-i instead of -k
-k is not selection based, so it also takes PRIMARY.
2018-02-19 15:07:26 +00:00
Chris Down 11304d3a60 Make main work block async
Closes #59.
2018-02-19 15:04:52 +00:00
Chris Down eb7d2b9481 Take clipboard ownership prior to clipnotify
This avoids infinite loop if we make the work block async
2018-02-19 15:01:21 +00:00
Chris Down 55407ba3f6 Remove last_data checks
Nowadays everything should be using clipnotify, which avoids constantly
copying the same data.
2018-02-19 14:51:00 +00:00
Chris Down b5e8543b3e Use xsel -k, instead of -o -> -i 2018-02-19 14:43:44 +00:00
Chris Down 3704ce3427 Fall back to polling if clipnotify fails 2018-02-08 01:05:15 +00:00
Chris Down b33d74cae5 Add messages when clipnotify is not detected 2018-02-08 00:55:29 +00:00
Chris Down 2b04a1eafe Add optional support for clipnotify to avoid polling 2018-02-05 23:49:41 +00:00
Chris Down f576a116fd Don't attempt to write to sockets represented as files
Fixes #54.
2017-10-29 10:40:38 +00:00
Chris Down 35a3cb2e8a Use /proc/self/fd/2 instead of /dev/stderr where possible
/dev/stderr is not standardised, whereas /proc/self/fd is provided by
the kernel. Add a fallback for non-Linux.
2017-10-29 02:08:25 +00:00
Chris Down f34bd68797 Bump major_version to 4 2017-10-25 01:57:35 +01:00
Chris Down 48b1ebf9fb If CM_MAX_CLIPS is 0, don't truncate 2017-10-24 22:53:54 +02:00
Chris Down 6855d24e3a Prefer $XDG_RUNTIME_DIR for storage
Closes #51.
2017-10-24 19:14:23 +02:00
Chris Down 4a0bd8f1f4 Only keep $CM_MAX_CLIPS newest clips
Closes #50.
2017-10-24 17:34:23 +02:00
Chris Down e6c312b639 Avoid double writing if both selections are the same 2017-10-24 17:34:00 +02:00
Chris Down 8bb4ff3999 Gate new clipboard entry output on CM_DEBUG
Closes #49.
2017-10-24 17:03:02 +02:00
Chris Down 2cd2287612 Add more documentation on -h/--help for clipmenu{,d} 2017-05-31 20:03:06 +01:00
Chris Down 60611584ec Remove unused last_filename 2017-05-30 09:06:04 +01:00
Chris Down f0d09c7692 Use $TMPDIR as base for cache directory
Closes #38.
2017-05-30 09:03:35 +01:00
Chris Down caa009b222 Remove partial clip dedupe support
The application that was particularly bad at this (Chrome) now no longer
does this, and this is basically a hack that has lasted too long.

Also closes #41 and closes #42 since the questionable "feature" is going
away.
2017-05-30 08:58:19 +01:00
Chris Down e7a15a5d50 Do not sleep initially in oneshot mode 2017-05-10 10:05:16 +01:00
Chris Down e65b51b33c Use CM_* env vars 2017-03-19 07:53:26 +00:00
Chris Down eecc031718 Use stderr for xsel logging when detached 2017-03-19 07:38:34 +00:00
Chris Down 19569a81bc Log new clipboard entries without $DEBUG 2017-03-19 07:34:29 +00:00
Chris Down 28d8db8860 clipmenud: Time out all calls to xsel after 1 second
I'm not entirely sure how this happens, but sometimes xsel gets rather
stuck:

    % systemctl --user status clipmenud
    ● clipmenud.service - Clipmenu daemon
       Loaded: loaded (/usr/lib/systemd/user/clipmenud.service; disabled; vendor preset: enabled)
       Active: active (running) since Wed 2017-03-15 11:14:14 GMT; 1 day 13h ago
     Main PID: 31630 (clipmenud)
       CGroup: /user.slice/user-1000.slice/user@1000.service/clipmenud.service
               ├─ 9052 /bin/bash /usr/bin/clipmenud
               ├─ 9053 xsel --logfile /dev/null -o --primary
               └─31630 /bin/bash /usr/bin/clipmenud

    Mar 15 11:14:14 gongzuo systemd[474]: Started Clipmenu daemon.
    % strace -p 9053
    strace: Process 9053 attached
    restart_syscall(<... resuming interrupted restart_syscall ...>^Cstrace: Process 9053 detached
     <detached ...>
    % ps aux | grep 9053
    cdown     9053  0.0  0.0  15956   896 ?        S    Mar15   0:00 xsel --logfile /dev/null -o --primary
2017-03-17 01:18:43 +00:00
Chris Down d8dbb1d5af Use wrapper for xsel to avoid having to pass --logfile again and again 2017-03-17 01:18:43 +00:00
drake-on-mandrake 6facea933b Add --logfile /dev/null to the xsel command 2017-03-09 14:48:16 +00:00
Chris Down db05c51942 Add oneshot mode support
Fixes #27.
2017-02-17 20:45:06 -05:00