aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Attempted fix for #236, no check for KEY_CODE_YES on unicode char 127 (delete)

Browse Source
This commit is contained in:
James Booth 2013-09-08 16:14:26 +01:00
parent 03d266d2a8
commit d6f4a97d7d
1 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/ui/inputwin.c
View File

@ -50,6 +50,7 @@ static int rows, cols;
static int _handle_edit(int result, const wint_t ch, char *input, int *size); static int _handle_edit(int result, const wint_t ch, char *input, int *size);
static int _handle_alt_key(char *input, int *size, int key); static int _handle_alt_key(char *input, int *size, int key);
static void _handle_backspace(int display_size, int inp_x, int *size, char *input);
static int _printable(const wint_t ch); static int _printable(const wint_t ch);
static void _clear_input(void); static void _clear_input(void);
static void _go_to_end(int display_size); static void _go_to_end(int display_size);
@ -371,58 +372,13 @@ _handle_edit(int result, const wint_t ch, char *input, int *size)
} }
case 127: case 127:
_handle_backspace(display_size, inp_x, size, input);
return 1;
case KEY_BACKSPACE: case KEY_BACKSPACE:
if (result != KEY_CODE_YES) { if (result != KEY_CODE_YES) {
return 0; return 0;
} }
roster_reset_search_attempts(); _handle_backspace(display_size, inp_x, size, input);
if (display_size > 0) {
// if at end, delete last char
if (inp_x >= display_size) {
gchar *start = g_utf8_substring(input, 0, inp_x-1);
for (*size = 0; *size < strlen(start); (*size)++) {
input[*size] = start[*size];
}
input[*size] = '\0';
g_free(start);
_clear_input();
waddstr(inp_win, input);
wmove(inp_win, 0, inp_x -1);
// if in middle, delete and shift chars left
} else if (inp_x > 0 && inp_x < display_size) {
gchar *start = g_utf8_substring(input, 0, inp_x - 1);
gchar *end = g_utf8_substring(input, inp_x, *size);
GString *new = g_string_new(start);
g_string_append(new, end);
for (*size = 0; *size < strlen(new->str); (*size)++) {
input[*size] = new->str[*size];
}
input[*size] = '\0';
g_free(start);
g_free(end);
g_string_free(new, FALSE);
_clear_input();
waddstr(inp_win, input);
wmove(inp_win, 0, inp_x -1);
}
// if gone off screen to left, jump left (half a screen worth)
if (inp_x <= pad_start) {
pad_start = pad_start - (cols / 2);
if (pad_start < 0) {
pad_start = 0;
}
_inp_win_refresh();
}
}
return 1; return 1;
case KEY_DC: // DEL case KEY_DC: // DEL
@ -541,6 +497,60 @@ _handle_edit(int result, const wint_t ch, char *input, int *size)
} }
} }
static void
_handle_backspace(int display_size, int inp_x, int *size, char *input)
{
roster_reset_search_attempts();
if (display_size > 0) {
// if at end, delete last char
if (inp_x >= display_size) {
gchar *start = g_utf8_substring(input, 0, inp_x-1);
for (*size = 0; *size < strlen(start); (*size)++) {
input[*size] = start[*size];
}
input[*size] = '\0';
g_free(start);
_clear_input();
waddstr(inp_win, input);
wmove(inp_win, 0, inp_x -1);
// if in middle, delete and shift chars left
} else if (inp_x > 0 && inp_x < display_size) {
gchar *start = g_utf8_substring(input, 0, inp_x - 1);
gchar *end = g_utf8_substring(input, inp_x, *size);
GString *new = g_string_new(start);
g_string_append(new, end);
for (*size = 0; *size < strlen(new->str); (*size)++) {
input[*size] = new->str[*size];
}
input[*size] = '\0';
g_free(start);
g_free(end);
g_string_free(new, FALSE);
_clear_input();
waddstr(inp_win, input);
wmove(inp_win, 0, inp_x -1);
}
// if gone off screen to left, jump left (half a screen worth)
if (inp_x <= pad_start) {
pad_start = pad_start - (cols / 2);
if (pad_start < 0) {
pad_start = 0;
}
_inp_win_refresh();
}
}
}
static int static int
_handle_alt_key(char *input, int *size, int key) _handle_alt_key(char *input, int *size, int key)
{ {