1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-08 19:34:14 -04:00

Revert "Temp fix for handling printable characters"

This reverts commit 8f5826b256.
This commit is contained in:
James Booth 2013-01-07 20:31:24 +00:00
parent 8f5826b256
commit 268a2f553b

View File

@ -51,6 +51,7 @@ static int rows, cols;
static int _handle_edit(const wint_t ch, char *input, int *size); static int _handle_edit(const wint_t ch, char *input, int *size);
static int _printable(const wint_t ch); static int _printable(const wint_t ch);
static gboolean _special_key(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);
@ -464,10 +465,19 @@ _go_to_end(int display_size)
static int static int
_printable(const wint_t ch) _printable(const wint_t ch)
{ {
char bytes[MB_CUR_MAX+1]; return (ch != ERR && ch != '\n' &&
size_t utf_len = wcrtomb(bytes, ch, NULL); ch != KEY_PPAGE && ch != KEY_NPAGE && ch != KEY_MOUSE &&
bytes[utf_len] = '\0'; ch != KEY_F(1) && ch != KEY_F(2) && ch != KEY_F(3) &&
ch != KEY_F(4) && ch != KEY_F(5) && ch != KEY_F(6) &&
gunichar unichar = g_utf8_get_char(bytes); ch != KEY_F(7) && ch != KEY_F(8) && ch != KEY_F(9) &&
return g_unichar_isprint(unichar) && (ch != KEY_MOUSE); ch != KEY_F(10) && ch!= KEY_F(11) && ch != KEY_F(12) &&
ch != KEY_IC && ch != KEY_EIC && ch != KEY_RESIZE &&
!_special_key(ch));
}
static gboolean
_special_key(const wint_t ch)
{
char *str = unctrl(ch);
return ((strlen(str) > 1) && g_str_has_prefix(str, "^"));
} }