From 793c37923ebae5251ed55f7d55bc026b2e511fa0 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 19 Jul 2019 14:20:00 +0200 Subject: selection: add text_from_clipboard() This function reads data from the clipboard, and calls a user-provided callback for each chunk of clipboard data. --- selection.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'selection.c') diff --git a/selection.c b/selection.c index 024e7f37..6f7c015e 100644 --- a/selection.c +++ b/selection.c @@ -454,7 +454,9 @@ selection_to_clipboard(struct terminal *term, uint32_t serial) } void -selection_from_clipboard(struct terminal *term, uint32_t serial) +text_from_clipboard(struct terminal *term, uint32_t serial, + void (*cb)(const char *data, size_t size, void *user), + void *user) { struct clipboard *clipboard = &term->selection.clipboard; if (clipboard->data_offer == NULL) @@ -478,9 +480,6 @@ selection_from_clipboard(struct terminal *term, uint32_t serial) /* Don't keep our copy of the write-end open (or we'll never get EOF) */ close(write_fd); - if (term->bracketed_paste) - vt_to_slave(term, "\033[200~", 6); - /* Read until EOF */ while (true) { char text[256]; @@ -492,13 +491,33 @@ selection_from_clipboard(struct terminal *term, uint32_t serial) } else if (amount == 0) break; - vt_to_slave(term, text, amount); + cb(text, amount, user); } + close(read_fd); +} + +static void +from_clipboard_cb(const char *data, size_t size, void *user) +{ + struct terminal *term = user; + vt_to_slave(term, data, size); +} + +void +selection_from_clipboard(struct terminal *term, uint32_t serial) +{ + struct clipboard *clipboard = &term->selection.clipboard; + if (clipboard->data_offer == NULL) + return; + if (term->bracketed_paste) - vt_to_slave(term, "\033[201~", 6); + vt_to_slave(term, "\033[200~", 6); - close(read_fd); + text_from_clipboard(term, serial, &from_clipboard_cb, term); + + if (term->bracketed_paste) + vt_to_slave(term, "\033[201~", 6); } void -- cgit v1.3