mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-03 07:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

multi-seat: re-enable OSC 52 support

Browse source
This commit is contained in:
Daniel Eklöf 2020-07-08 19:28:08 +02:00
parent 4c7d29f7eb
commit 11373a6561
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

53
osc.c
View file

@ -52,31 +52,42 @@ osc_to_clipboard(struct terminal *term, const char *target,
} }
} }
(void)to_clipboard; /* Find a seat in which the terminal has focus */
(void)to_primary; struct seat *seat = NULL;
#if 0 tll_foreach(term->wl->seats, it) {
if (it->item.kbd_focus == term) {
seat = &it->item;
break;
}
}
if (seat == NULL) {
LOG_WARN("OSC52: client tried to write to clipboard data while window was unfocused");
return;
}
if (to_clipboard) { if (to_clipboard) {
char *copy = strdup(decoded); char *copy = strdup(decoded);
if (!text_to_clipboard(term, copy, term->wl->input_serial)) if (!text_to_clipboard(seat, term, copy, seat->input_serial))
free(copy); free(copy);
} }
if (to_primary) { if (to_primary) {
char *copy = strdup(decoded); char *copy = strdup(decoded);
if (!text_to_primary(term, copy, term->wl->input_serial)) if (!text_to_primary(seat, term, copy, seat->input_serial))
free(copy); free(copy);
} }
#endif
free(decoded); free(decoded);
} }
struct clip_context { struct clip_context {
struct seat *seat;
struct terminal *term; struct terminal *term;
uint8_t buf[3]; uint8_t buf[3];
int idx; int idx;
}; };
#if 0
static void static void
from_clipboard_cb(const char *text, size_t size, void *user) from_clipboard_cb(const char *text, size_t size, void *user)
{ {
@ -121,8 +132,7 @@ from_clipboard_cb(const char *text, size_t size, void *user)
term_to_slave(term, chunk, strlen(chunk)); term_to_slave(term, chunk, strlen(chunk));
free(chunk); free(chunk);
} }
#endif
#if 0
static void static void
from_clipboard_done(void *user) from_clipboard_done(void *user)
{ {
@ -138,7 +148,7 @@ from_clipboard_done(void *user)
term_to_slave(term, "\033\\", 2); term_to_slave(term, "\033\\", 2);
free(ctx); free(ctx);
} }
#endif
static void static void
osc_from_clipboard(struct terminal *term, const char *source) osc_from_clipboard(struct terminal *term, const char *source)
{ {
@ -156,27 +166,40 @@ osc_from_clipboard(struct terminal *term, const char *source)
if (src == 0) if (src == 0)
return; return;
/* Find a seat in which the terminal has focus */
struct seat *seat = NULL;
tll_foreach(term->wl->seats, it) {
if (it->item.kbd_focus == term) {
seat = &it->item;
break;
}
}
if (seat == NULL) {
LOG_WARN("OSC52: client tried to read clipboard data while window was unfocused");
return;
}
term_to_slave(term, "\033]52;", 5); term_to_slave(term, "\033]52;", 5);
term_to_slave(term, &src, 1); term_to_slave(term, &src, 1);
term_to_slave(term, ";", 1); term_to_slave(term, ";", 1);
struct clip_context *ctx = malloc(sizeof(*ctx)); struct clip_context *ctx = malloc(sizeof(*ctx));
*ctx = (struct clip_context) {.term = term}; *ctx = (struct clip_context) {.seat = seat, .term = term};
#if 0
switch (src) { switch (src) {
case 'c': case 'c':
text_from_clipboard( text_from_clipboard(
term, term->wl->input_serial, seat, term, seat->input_serial,
&from_clipboard_cb, &from_clipboard_done, ctx); &from_clipboard_cb, &from_clipboard_done, ctx);
break; break;
case 's': case 's':
case 'p': case 'p':
text_from_primary(term, &from_clipboard_cb, &from_clipboard_done, ctx); text_from_primary(
seat, term, &from_clipboard_cb, &from_clipboard_done, ctx);
break; break;
} }
#endif
} }
static void static void