commit: 8a6b1fa7e71d5ca0d19829151223135b3e6a9c06 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Feb 14 08:20:38 2019 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Feb 14 19:19:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6b1fa7
app-shells/fzy: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/11047 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> app-shells/fzy/files/fzy-add-utf-8-support.patch | 89 ------------------------ 1 file changed, 89 deletions(-) diff --git a/app-shells/fzy/files/fzy-add-utf-8-support.patch b/app-shells/fzy/files/fzy-add-utf-8-support.patch deleted file mode 100644 index 886957379a8..00000000000 --- a/app-shells/fzy/files/fzy-add-utf-8-support.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 8dd7a9f49c2b65f28025902106f364ff11d4170d Mon Sep 17 00:00:00 2001 -From: syrrim <[email protected]> -Date: Mon, 23 Apr 2018 01:25:48 -0400 -Subject: [PATCH] add utf-8 support to input, fixes #21 - -- non ascii bytes won't be ignored -- one can seek over and delete whole utf-8 codepoints at a time -- the cursor will be positioned properly around double width chars ---- - src/tty_interface.c | 31 ++++++++++++++++++++++++++----- - 1 file changed, 26 insertions(+), 5 deletions(-) - -diff --git a/src/tty_interface.c b/src/tty_interface.c -index a7d506e..35f2919 100644 ---- a/src/tty_interface.c -+++ b/src/tty_interface.c -@@ -7,6 +7,14 @@ - #include "tty_interface.h" - #include "../config.h" - -+static int isprint_unicode(char c){ -+ return isprint(c) || c & (1<<7); -+} -+ -+static int is_boundary(char c) { -+ return ~c & (1<<7) || c & (1<<6); -+} -+ - static void clear(tty_interface_t *state) { - tty_t *tty = state->tty; - -@@ -95,7 +103,10 @@ static void draw(tty_interface_t *state) { - tty_moveup(tty, num_lines); - } - -- tty_setcol(tty, strlen(options->prompt) + state->cursor); -+ tty_setcol(tty, 0); -+ fputs(options->prompt, tty->fout); -+ for(size_t i=0; i<state->cursor; i++) -+ fputc(state->search[i], tty->fout); - tty_flush(tty); - } - -@@ -138,9 +149,13 @@ static void action_del_char(tty_interface_t *state) { - if(state->cursor == 0) { - return; - } -+ size_t original_cursor = state->cursor; - - state->cursor--; -- memmove(&state->search[state->cursor], &state->search[state->cursor + 1], length - state->cursor); -+ while(!is_boundary(state->search[state->cursor]) && state->cursor) -+ state->cursor--; -+ -+ memmove(&state->search[state->cursor], &state->search[original_cursor], length - original_cursor + 1); - } - } - -@@ -178,13 +193,19 @@ static void action_next(tty_interface_t *state) { - } - - static void action_left(tty_interface_t *state) { -- if (state->cursor > 0) -+ if (state->cursor > 0){ - state->cursor--; -+ while(!is_boundary(state->search[state->cursor]) && state->cursor) -+ state->cursor--; -+ } - } - - static void action_right(tty_interface_t *state) { -- if (state->cursor < strlen(state->search)) -+ if (state->cursor < strlen(state->search)){ - state->cursor++; -+ while(!is_boundary(state->search[state->cursor])) -+ state->cursor++; -+ } - } - - static void action_beginning(tty_interface_t *state) { -@@ -315,7 +336,7 @@ static void handle_input(tty_interface_t *state, const char *s) { - - /* No matching keybinding, add to search */ - for (int i = 0; input[i]; i++) -- if (isprint(input[i])) -+ if (isprint_unicode(input[i])) - append_search(state, input[i]); - - /* We have processed the input, so clear it */
