Added plumb patch

This commit is contained in:
_N0x 2024-09-22 16:34:17 +02:00
parent af172500da
commit c492d94019
4 changed files with 54 additions and 1 deletions

View File

@ -479,3 +479,9 @@ static char ascii_printable[] =
" !\"#$%&'()*+,-./0123456789:;<=>?" " !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
"`abcdefghijklmnopqrstuvwxyz{|}~"; "`abcdefghijklmnopqrstuvwxyz{|}~";
/*
* plumb_cmd is run on mouse button 3 click, with argument set to
* current selection and with cwd set to the cwd of the active shell
*/
static char *plumb_cmd = "plumb";

View File

@ -27,6 +27,9 @@
#elif defined(__FreeBSD__) || defined(__DragonFly__) #elif defined(__FreeBSD__) || defined(__DragonFly__)
#include <libutil.h> #include <libutil.h>
#endif #endif
#if defined(__OpenBSD__)
#include <sys/sysctl.h>
#endif
/* Arbitrary sizes */ /* Arbitrary sizes */
#define UTF_INVALID 0xFFFD #define UTF_INVALID 0xFFFD
@ -239,6 +242,22 @@ static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static const Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; static const Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
int
subprocwd(char *path)
{
#if defined(__linux)
if (snprintf(path, PATH_MAX, "/proc/%d/cwd", pid) < 0)
return -1;
return 0;
#elif defined(__OpenBSD__)
size_t sz = PATH_MAX;
int name[3] = {CTL_KERN, KERN_PROC_CWD, pid};
if (sysctl(name, 3, path, &sz, 0, 0) == -1)
return -1;
return 0;
#endif
}
ssize_t ssize_t
xwrite(int fd, const char *s, size_t len) xwrite(int fd, const char *s, size_t len)
{ {
@ -810,7 +829,7 @@ ttynew(const char *line, char *cmd, const char *out, char **args)
break; break;
default: default:
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (pledge("stdio rpath tty proc", NULL) == -1) if (pledge("stdio rpath tty proc ps exec", NULL) == -1)
die("pledge\n"); die("pledge\n");
#endif #endif
close(s); close(s);

View File

@ -114,6 +114,8 @@ void *xmalloc(size_t);
void *xrealloc(void *, size_t); void *xrealloc(void *, size_t);
char *xstrdup(const char *); char *xstrdup(const char *);
int subprocwd(char *);
/* config.h globals */ /* config.h globals */
extern char *utmp; extern char *utmp;
extern char *scroll; extern char *scroll;

View File

@ -5,6 +5,7 @@
#include <locale.h> #include <locale.h>
#include <signal.h> #include <signal.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/wait.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h> #include <libgen.h>
@ -700,6 +701,29 @@ xsetsel(char *str)
setsel(str, CurrentTime); setsel(str, CurrentTime);
} }
void
plumb(char *sel) {
if (sel == NULL)
return;
char cwd[PATH_MAX];
pid_t child;
if (subprocwd(cwd) != 0)
return;
switch(child = fork()) {
case -1:
return;
case 0:
if (chdir(cwd) != 0)
exit(1);
if (execvp(plumb_cmd, (char *const []){plumb_cmd, sel, 0}) == -1)
exit(1);
exit(0);
default:
waitpid(child, NULL, 0);
}
}
void void
brelease(XEvent *e) brelease(XEvent *e)
{ {
@ -717,6 +741,8 @@ brelease(XEvent *e)
return; return;
if (btn == Button1) if (btn == Button1)
mousesel(e, 1); mousesel(e, 1);
else if (e->xbutton.button == Button3)
plumb(xsel.primary);
} }
void void