aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Pass pointers to inp_get_char

Browse Source
This commit is contained in:
James Booth 2015-01-15 23:29:48 +00:00
parent 22e9be4a5f
commit 65fc4bcd9f
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ui/core.c
View File

@ -181,19 +181,20 @@ ui_close(void)
char* char*
ui_readline(void) ui_readline(void)
{ {
int result = 0; int key_type;
wint_t ch = inp_get_char(line, &result); wint_t ch;
inp_get_char(line, &key_type, &ch);
_win_handle_switch(ch); _win_handle_switch(ch);
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
win_handle_page(current, ch, result); win_handle_page(current, ch, key_type);
if (ch == KEY_RESIZE) { if (ch == KEY_RESIZE) {
ui_resize(); ui_resize();
} }
if (ch != ERR && result != ERR) { if (ch != ERR && key_type != ERR) {
ui_reset_idle_time(); ui_reset_idle_time();
ui_input_nonblocking(TRUE); ui_input_nonblocking(TRUE);
} else { } else {

44
src/ui/inputwin.c
View File

@ -132,38 +132,38 @@ inp_block(void)
wtimeout(inp_win, -1); wtimeout(inp_win, -1);
} }
wint_t void
inp_get_char(char *input, int *result) inp_get_char(char *result, int *key_type, wint_t *ch)
{ {
wint_t ch;
int display_size = 0; int display_size = 0;
if (inp_size != 0) { if (inp_size != 0) {
display_size = g_utf8_strlen(input, inp_size); display_size = g_utf8_strlen(result, inp_size);
} }
// echo off, and get some more input // echo off, and get some more input
noecho(); noecho();
*result = wget_wch(inp_win, &ch); *key_type = wget_wch(inp_win, ch);
gboolean in_command = FALSE; gboolean in_command = FALSE;
if ((display_size > 0 && input[0] == '/') || if ((display_size > 0 && result[0] == '/') ||
(display_size == 0 && ch == '/')) { (display_size == 0 && *ch == '/')) {
in_command = TRUE; in_command = TRUE;
} }
if (*result == ERR) { if (*key_type == ERR) {
prof_handle_idle(); prof_handle_idle();
} }
if ((*result != ERR) && (*result != KEY_CODE_YES) && !in_command && _printable(ch)) { if ((*key_type != ERR) && (*key_type != KEY_CODE_YES) && !in_command && _printable(*ch)) {
prof_handle_activity(); prof_handle_activity();
} }
// if it wasn't an arrow key etc // if it wasn't an arrow key etc
if (!_handle_edit(*result, ch, input)) { if (!_handle_edit(*key_type, *ch, result)) {
if (_printable(ch) && *result != KEY_CODE_YES) { if (_printable(*ch) && *key_type != KEY_CODE_YES) {
if (inp_size >= INP_WIN_MAX) { if (inp_size >= INP_WIN_MAX) {
return ERR; *ch = ERR;
return;
} }
int inp_x = getcurx(inp_win); int inp_x = getcurx(inp_win);
@ -171,11 +171,11 @@ inp_get_char(char *input, int *result)
// handle insert if not at end of input // handle insert if not at end of input
if (inp_x < display_size) { if (inp_x < display_size) {
char bytes[MB_CUR_MAX]; char bytes[MB_CUR_MAX];
size_t utf_len = wcrtomb(bytes, ch, NULL); size_t utf_len = wcrtomb(bytes, *ch, NULL);
char *next_ch = g_utf8_offset_to_pointer(input, inp_x); char *next_ch = g_utf8_offset_to_pointer(result, inp_x);
char *offset; char *offset;
for (offset = &input[inp_size - 1]; offset >= next_ch; offset--) { for (offset = &result[inp_size - 1]; offset >= next_ch; offset--) {
*(offset + utf_len) = *offset; *(offset + utf_len) = *offset;
} }
int i; int i;
@ -184,7 +184,7 @@ inp_get_char(char *input, int *result)
} }
inp_size += utf_len; inp_size += utf_len;
input[inp_size] = '\0'; result[inp_size] = '\0';
waddstr(inp_win, next_ch); waddstr(inp_win, next_ch);
wmove(inp_win, 0, inp_x + 1); wmove(inp_win, 0, inp_x + 1);
@ -196,15 +196,15 @@ inp_get_char(char *input, int *result)
// otherwise just append // otherwise just append
} else { } else {
char bytes[MB_CUR_MAX+1]; char bytes[MB_CUR_MAX+1];
size_t utf_len = wcrtomb(bytes, ch, NULL); size_t utf_len = wcrtomb(bytes, *ch, NULL);
// wcrtomb can return (size_t) -1 // wcrtomb can return (size_t) -1
if (utf_len < MB_CUR_MAX) { if (utf_len < MB_CUR_MAX) {
int i; int i;
for (i = 0 ; i < utf_len; i++) { for (i = 0 ; i < utf_len; i++) {
input[inp_size++] = bytes[i]; result[inp_size++] = bytes[i];
} }
input[inp_size] = '\0'; result[inp_size] = '\0';
bytes[utf_len] = '\0'; bytes[utf_len] = '\0';
waddstr(inp_win, bytes); waddstr(inp_win, bytes);
@ -226,12 +226,10 @@ inp_get_char(char *input, int *result)
echo(); echo();
if (ch == '\n') { if (*ch == '\n') {
input[inp_size++] = '\0'; result[inp_size++] = '\0';
inp_size = 0; inp_size = 0;
} }
return ch;
} }
void void

2
src/ui/inputwin.h
View File

@ -36,7 +36,7 @@
#define UI_INPUTWIN_H #define UI_INPUTWIN_H
void create_input_window(void); void create_input_window(void);
wint_t inp_get_char(char *input, int *result); void inp_get_char(char *result, int *key_type, wint_t *ch);
void inp_win_reset(void); void inp_win_reset(void);
void inp_win_resize(void); void inp_win_resize(void);
void inp_put_back(void); void inp_put_back(void);