apps/action.h | 2 + apps/keymaps/keymap-e200.c | 8 +- apps/keymaps/keymap-fuze.c | 9 +- apps/recorder/keyboard.c | 544 ++++++++++---------------------------------- 4 files changed, 130 insertions(+), 433 deletions(-) diff --git a/apps/action.h b/apps/action.h index 0738b11..375652f 100644 --- a/apps/action.h +++ b/apps/action.h @@ -236,6 +236,8 @@ enum { ACTION_KBD_DOWN, ACTION_KBD_MORSE_INPUT, ACTION_KBD_MORSE_SELECT, + ACTION_KBD_SCROLL_FWD, + ACTION_KBD_SCROLL_BACK, #ifdef HAVE_TOUCHSCREEN /* the following are helper actions for touchscreen targets, diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 487fb11..3b23872 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c @@ -255,10 +255,10 @@ static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_SCROLL_BACK, BUTTON_SCROLL_BACK, BUTTON_NONE }, + { ACTION_KBD_SCROLL_BACK, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_SCROLL_FWD, BUTTON_SCROLL_FWD, BUTTON_NONE }, + { ACTION_KBD_SCROLL_FWD, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_PAGE_FLIP, BUTTON_REC|BUTTON_SELECT, BUTTON_REC }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c index e44ee51..d3f3262 100644 --- a/apps/keymaps/keymap-fuze.c +++ b/apps/keymaps/keymap-fuze.c @@ -255,11 +255,10 @@ static const struct button_mapping button_context_keyboard[] = { { ACTION_KBD_CURSOR_LEFT, BUTTON_HOME|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_HOME|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_HOME|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_KBD_UP, BUTTON_SCROLL_BACK, BUTTON_NONE }, - { ACTION_KBD_UP, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE }, - { ACTION_KBD_DOWN, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_SCROLL_BACK, BUTTON_SCROLL_BACK, BUTTON_NONE }, + { ACTION_KBD_SCROLL_BACK, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_KBD_SCROLL_FWD, BUTTON_SCROLL_FWD, BUTTON_NONE }, + { ACTION_KBD_SCROLL_FWD, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_PAGE_FLIP, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index f2f5d28..08e99b8 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -114,9 +114,7 @@ struct keyboard_parameters int page; int x; int y; -#ifdef KBD_MODES bool line_edit; -#endif bool hangul; unsigned short hlead, hvowel, htail; }; @@ -124,18 +122,7 @@ struct keyboard_parameters static struct keyboard_parameters kbd_param[NB_SCREENS]; static bool kbd_loaded = false; -#ifdef KBD_MORSE_INPUT -/* FIXME: We should put this to a configuration file. */ -static const char *morse_alphabets = - "abcdefghijklmnopqrstuvwxyz1234567890,.?-@ "; -static const unsigned char morse_codes[] = { - 0x05,0x18,0x1a,0x0c,0x02,0x12,0x0e,0x10,0x04,0x17,0x0d,0x14,0x07, - 0x06,0x0f,0x16,0x1d,0x0a,0x08,0x03,0x09,0x11,0x0b,0x19,0x1b,0x1c, - 0x2f,0x27,0x23,0x21,0x20,0x30,0x38,0x3c,0x3e,0x3f, - 0x73,0x55,0x4c,0x61,0x5a,0x80 }; - -static bool morse_mode = false; -#endif + /* Loads a custom keyboard into memory call with NULL to reset keyboard */ @@ -220,13 +207,13 @@ static void kbd_spellchar(unsigned short c) } } -#ifdef KBD_MODES + static void say_edit(void) { if(global_settings.talk_menu) talk_id(VOICE_EDIT, false); } -#endif + static void kbd_inschar(unsigned char* text, int buflen, int* editpos, unsigned short ch) @@ -292,6 +279,7 @@ static unsigned short get_kbd_ch(const struct keyboard_parameters *pm) int kbd_input(char* text, int buflen) { + int prev_button=0; bool done = false; #ifdef CPU_ARM /* This seems to keep the sizes for ARM way down */ @@ -306,11 +294,7 @@ int kbd_input(char* text, int buflen) unsigned char *utf8; bool cur_blink = true; /* Cursor on/off flag */ int ret = 0; /* assume success */ -#ifdef KBD_MORSE_INPUT - bool morse_reading = false; - unsigned char morse_code = 0; - int morse_tick = 0; -#endif + int oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL); FOR_NB_SCREENS(l) { @@ -320,6 +304,7 @@ int kbd_input(char* text, int buflen) if (sc->getwidth() >= 160 && sc->getheight() >= 96) { +#if 0 pm->default_kbd = "ABCDEFG abcdefg !?\" @#$%+'\n" "HIJKLMN hijklmn 789 &_()-`\n" @@ -331,6 +316,20 @@ int kbd_input(char* text, int buflen) "òóôõöø çðþýÿ ùúûü ¼½¾¬¶¨:;"; pm->DEFAULT_LINES = 8; +#endif + pm->default_kbd = + " \n" + " abcdefg 0+-×() \n" + " hijklmn 123÷[] \n" + " opqrstu 456|{} \n" + " vwxyz., 789 <> \n" + " ABCDEFG !@#?/\\ \n" + " HIJKLMN $%^~`' \n" + " OPQRSTU &*'\" \n" + " VWXYZ;: \n"; + + pm->DEFAULT_LINES = 9; +#define MAX_CHARS 16 } else #endif /* LCD_WIDTH >= 160 && LCD_HEIGHT >= 96 */ @@ -388,6 +387,7 @@ int kbd_input(char* text, int buflen) { pm->curfont = FONT_UI; } + pm->x = pm->y = 0; } FOR_NB_SCREENS(l) @@ -429,7 +429,8 @@ int kbd_input(char* text, int buflen) struct screen *sc = &screens[l]; int i = 0; - pm->max_chars = sc->getwidth() / pm->font_w; + //pm->max_chars = sc->getwidth() / pm->font_w; + pm->max_chars = MAX_CHARS; /* Pad lines with spaces */ while (i < pm->nchars) @@ -534,11 +535,7 @@ int kbd_input(char* text, int buflen) pm->main_x = 0; pm->keyboard_margin -= pm->keyboard_margin/2; -#ifdef KBD_MORSE_INPUT - pm->old_main_y = pm->main_y; - if (morse_mode) - pm->main_y = sc_h - pm->font_h; -#endif + } /* Initial edit position is after last character */ @@ -567,55 +564,7 @@ int kbd_input(char* text, int buflen) FOR_NB_SCREENS(l) screens[l].clear_display(); -#ifdef KBD_MORSE_INPUT - if (morse_mode) - { - FOR_NB_SCREENS(l) - { - /* declare scoped pointers inside screen loops - hide the - declarations from previous block level */ - const int w = 6; /* sysfixed font width */ - struct screen *sc = &screens[l]; - int i, x, y; - - /* Draw morse code screen with sysfont */ - sc->setfont(FONT_SYSFIXED); - x = 0; - y = statusbar_size; - outline[1] = '\0'; - - /* Draw morse code table with code descriptions. */ - for (i = 0; morse_alphabets[i] != '\0'; i++) - { - int morse_len; - int j; - - outline[0] = morse_alphabets[i]; - sc->putsxy(x, y, outline); - - for (j = 0; (morse_codes[i] >> j) > 0x01; j++) ; - morse_len = j; - x += w + 3; - for (j = 0; j < morse_len; j++) - { - if ((morse_codes[i] >> (morse_len-j-1)) & 0x01) - sc->fillrect(x + j*4, y + 2, 3, 4); - else - sc->fillrect(x + j*4, y + 3, 1, 2); - } - - x += w*5 - 3; - if (x + w*6 >= sc->getwidth()) - { - x = 0; - y += 8; /* sysfixed font height */ - } - } - } - } - else -#endif /* KBD_MORSE_INPUT */ { /* draw page */ FOR_NB_SCREENS(l) @@ -746,20 +695,24 @@ int kbd_input(char* text, int buflen) struct screen *sc = &screens[l]; sc->set_drawmode(DRMODE_COMPLEMENT); -#ifdef KBD_MODES + if (pm->line_edit) sc->fillrect(0, pm->main_y - pm->keyboard_margin + 2, sc->getwidth(), pm->font_h + 2); - else /* highlight the key that has focus */ -#endif -#ifdef KBD_MORSE_INPUT - if(!morse_mode) -#endif + else { +#if 0 + /* add a vertical guide line for rolling columns */ + if ( prev_button != ACTION_KBD_SCROLL_BACK ) + sc->vline(pm->font_w*(pm->x+1), statusbar_size, + pm->DEFAULT_LINES*pm->font_h); +#endif + /* highlight the key that has focus */ sc->fillrect(pm->font_w*pm->x, - statusbar_size + pm->font_h*pm->y, - pm->font_w, pm->font_h); + statusbar_size + pm->font_h*pm->y, + pm->font_w, pm->font_h); + } sc->set_drawmode(DRMODE_SOLID); - } + } FOR_NB_SCREENS(l) screens[l].update(); @@ -771,16 +724,7 @@ int kbd_input(char* text, int buflen) pm = ¶m[button_screen]; sc = &screens[button_screen]; -#if defined KBD_MORSE_INPUT && !defined KBD_MODES - if (morse_mode) - { - /* Remap some buttons for morse mode. */ - if (button == ACTION_KBD_LEFT) - button = ACTION_KBD_CURSOR_LEFT; - if (button == ACTION_KBD_RIGHT) - button = ACTION_KBD_CURSOR_RIGHT; - } -#endif + switch ( button ) { @@ -790,311 +734,100 @@ int kbd_input(char* text, int buflen) break; case ACTION_KBD_PAGE_FLIP: - { -#ifdef KBD_MORSE_INPUT - if (morse_mode) - break; -#endif if (++pm->page >= pm->pages) pm->page = 0; ch = get_kbd_ch(pm); kbd_spellchar(ch); break; - } - -#ifdef KBD_MORSE_INPUT - case ACTION_KBD_MORSE_INPUT: - morse_mode = !morse_mode; - - FOR_NB_SCREENS(l) - { - struct keyboard_parameters *pm = ¶m[l]; - struct screen *sc = &screens[l]; - - if (morse_mode) - { - pm->old_main_y = pm->main_y; - pm->main_y = sc->getheight() - pm->font_h; - } - else - { - pm->main_y = pm->old_main_y; - } - } - /* FIXME: We should talk something like Morse mode.. */ - break; -#endif /* KBD_MORSE_INPUT */ case ACTION_KBD_RIGHT: -#ifdef KBD_MODES -#ifdef KBD_MORSE_INPUT - /* allow cursor change in non line edit morse mode */ - if (pm->line_edit || morse_mode) -#else /* right doubles as cursor_right in line_edit */ - if (pm->line_edit) -#endif - { - pm->hangul = false; + pm->hangul = false; - if (editpos < len_utf8) - { - int c = utf8seek(text, ++editpos); - kbd_spellchar(text[c]); - } -#if CONFIG_CODEC == SWCODEC - else if (global_settings.talk_menu) - pcmbuf_beep(1000, 150, 1500); -#endif + if (editpos < len_utf8) { + int c = utf8seek(text, ++editpos); + kbd_spellchar(text[c]); } - else -#endif /* KBD_MODES */ - { -#ifdef KBD_MORSE_INPUT - if (morse_mode) - break; -#endif - if (++pm->x >= pm->max_chars) - { -#ifndef KBD_PAGE_FLIP - /* no dedicated flip key - flip page on wrap */ - if (++pm->page >= pm->pages) - pm->page = 0; +#if CONFIG_CODEC == SWCODEC + else if (global_settings.talk_menu) + pcmbuf_beep(1000, 150, 1500); #endif - pm->x = 0; - } - - ch = get_kbd_ch(pm); - kbd_spellchar(ch); - } break; case ACTION_KBD_LEFT: -#ifdef KBD_MODES -#ifdef KBD_MORSE_INPUT - /* allow cursor change in non line edit morse mode */ - if (pm->line_edit || morse_mode) -#else - /* left doubles as cursor_left in line_edit */ - if (pm->line_edit) -#endif - { - pm->hangul = false; + /* left doubles as cursor_left in line_edit */ + pm->hangul = false; - if (editpos > 0) - { - int c = utf8seek(text, --editpos); - kbd_spellchar(text[c]); - } -#if CONFIG_CODEC == SWCODEC - else if (global_settings.talk_menu) - pcmbuf_beep(1000, 150, 1500); -#endif + if (editpos > 0) { + int c = utf8seek(text, --editpos); + kbd_spellchar(text[c]); } - else -#endif /* KBD_MODES */ - { -#ifdef KBD_MORSE_INPUT - if (morse_mode) - break; -#endif - if (--pm->x < 0) - { -#ifndef KBD_PAGE_FLIP - /* no dedicated flip key - flip page on wrap */ - if (--pm->page < 0) - pm->page = pm->pages - 1; +#if CONFIG_CODEC == SWCODEC + else if (global_settings.talk_menu) + pcmbuf_beep(1000, 150, 1500); #endif - pm->x = pm->max_chars - 1; - } - - ch = get_kbd_ch(pm); - kbd_spellchar(ch); - } break; case ACTION_KBD_DOWN: -#ifdef KBD_MORSE_INPUT -#ifdef KBD_MODES - if (morse_mode) - { - pm->line_edit = !pm->line_edit; - if(pm->line_edit) - say_edit(); - } + if (pm->line_edit) { + pm->y = 0; + pm->line_edit = false; + } else -#else - if (morse_mode) - break; -#endif -#endif /* KBD_MORSE_INPUT */ - { -#ifdef KBD_MODES - if (pm->line_edit) - { - pm->y = 0; - pm->line_edit = false; - } - else -#endif - if (++pm->y >= pm->lines) -#ifdef KBD_MODES - { + if (++pm->y >= pm->lines) { pm->line_edit = true; say_edit(); } -#else - pm->y = 0; -#endif - } -#ifdef KBD_MODES - if (!pm->line_edit) -#endif - { + if (!pm->line_edit) { ch = get_kbd_ch(pm); kbd_spellchar(ch); } break; case ACTION_KBD_UP: -#ifdef KBD_MORSE_INPUT -#ifdef KBD_MODES - if (morse_mode) - { - pm->line_edit = !pm->line_edit; - if(pm->line_edit) - say_edit(); + if (pm->line_edit) { + pm->y = pm->lines - 1; + pm->line_edit = false; } else -#else - if (morse_mode) - break; -#endif -#endif /* KBD_MORSE_INPUT */ - { -#ifdef KBD_MODES - if (pm->line_edit) - { - pm->y = pm->lines - 1; - pm->line_edit = false; - } - else -#endif - if (--pm->y < 0) -#ifdef KBD_MODES - { + if (--pm->y < 0) { pm->line_edit = true; say_edit(); - } -#else - pm->y = pm->lines - 1; -#endif } -#ifdef KBD_MODES - if (!pm->line_edit) -#endif - { + if (!pm->line_edit) { ch = get_kbd_ch(pm); kbd_spellchar(ch); } break; - case ACTION_KBD_DONE: - /* accepts what was entered and continues */ - ret = 0; - done = true; - break; - -#ifdef KBD_MORSE_INPUT - case ACTION_KBD_MORSE_SELECT: - if (morse_mode && morse_reading) - { - morse_code <<= 1; - if ((current_tick - morse_tick) > HZ/5) - morse_code |= 0x01; - } - - break; -#endif /* KBD_MORSE_INPUT */ - - case ACTION_KBD_SELECT: - case ACTION_KBD_SELECT_REM: -#ifdef KBD_MORSE_INPUT -#ifdef KBD_MODES - if (morse_mode && !pm->line_edit) -#else - if (morse_mode) -#endif - { - morse_tick = current_tick; - - if (!morse_reading) - { - morse_reading = true; - morse_code = 1; - } - break; - } -#endif /* KBD_MORSE_INPUT */ - - /* inserts the selected char */ -#ifdef KBD_MODES - if (pm->line_edit) - { /* select doubles as backspace in line_edit */ - if (pm->hangul) - { - if (pm->htail) - pm->htail = 0; - else if (pm->hvowel) - pm->hvowel = 0; - else - pm->hangul = false; - } - - kbd_delchar(text, &editpos); - - if (pm->hangul) - { - if (pm->hvowel) - ch = hangul_join(pm->hlead, pm->hvowel, pm->htail); - else - ch = pm->hlead; - kbd_inschar(text, buflen, &editpos, ch); - } - } - else -#endif /* KBD_MODES */ - { + case ACTION_KBD_SCROLL_FWD: + if ( prev_button == ACTION_KBD_SCROLL_BACK ) { + /* Insert current char */ /* find input char */ ch = get_kbd_ch(pm); /* check for hangul input */ - if (ch >= 0x3131 && ch <= 0x3163) - { + if (ch >= 0x3131 && ch <= 0x3163) { unsigned short tmp; - if (!pm->hangul) - { + if (!pm->hangul) { pm->hlead = pm->hvowel = pm->htail = 0; pm->hangul = true; } - if (!pm->hvowel) - { + if (!pm->hvowel) { pm->hvowel = ch; } - else if (!pm->htail) - { + else if (!pm->htail) { pm->htail = ch; } - else - { /* previous hangul complete */ + else { + /* previous hangul complete */ /* check whether tail is actually lead of next char */ tmp = hangul_join(pm->htail, ch, 0); - if (tmp != 0xfffd) - { + if (tmp != 0xfffd) { tmp = hangul_join(pm->hlead, pm->hvowel, 0); kbd_delchar(text, &editpos); kbd_inschar(text, buflen, &editpos, tmp); @@ -1103,9 +836,7 @@ int kbd_input(char* text, int buflen) pm->hlead = pm->htail; pm->hvowel = ch; pm->htail = 0; - } - else - { + } else { pm->hvowel = pm->htail = 0; pm->hlead = ch; } @@ -1114,36 +845,62 @@ int kbd_input(char* text, int buflen) /* combine into hangul */ tmp = hangul_join(pm->hlead, pm->hvowel, pm->htail); - if (tmp != 0xfffd) - { + if (tmp != 0xfffd) { kbd_delchar(text, &editpos); ch = tmp; } - else - { + else { pm->hvowel = pm->htail = 0; pm->hlead = ch; } } - else - { + else { pm->hangul = false; } - /* insert char */ kbd_inschar(text, buflen, &editpos, ch); + /* reset position */ + pm->x=0; + pm->y=0; } + + else { + /* Select next column to right */ + if (++pm->x >= pm->max_chars) { +#ifndef KBD_PAGE_FLIP + /* no dedicated flip key - flip page on wrap */ + if (++pm->page >= pm->pages) + pm->page = 0; +#endif + pm->x = 0; + } + ch = get_kbd_ch(pm); + kbd_spellchar(ch); + } + prev_button = ACTION_KBD_SCROLL_FWD; + break; - if (global_settings.talk_menu) /* voice UI? */ - talk_spell(text, false); + case ACTION_KBD_SCROLL_BACK: + /* Select next row down */ + if (++pm->y >= pm->lines) { + pm->y=0; + if (--pm->x < 0 ) + pm->x = pm->max_chars-1; + say_edit(); + } + prev_button = ACTION_KBD_SCROLL_BACK; + break; - /* speak revised text */ + case ACTION_KBD_DONE: + /* accepts what was entered and continues */ + ret = 0; + done = true; break; -#if !defined (KBD_MODES) || defined (KBD_CURSOR_KEYS) - case ACTION_KBD_BACKSPACE: - if (pm->hangul) - { + case ACTION_KBD_SELECT: + case ACTION_KBD_SELECT_REM: + /* delete */ + if (pm->hangul) { if (pm->htail) pm->htail = 0; else if (pm->hvowel) @@ -1151,85 +908,25 @@ int kbd_input(char* text, int buflen) else pm->hangul = false; } - kbd_delchar(text, &editpos); - if (pm->hangul) - { + if (pm->hangul) { if (pm->hvowel) ch = hangul_join(pm->hlead, pm->hvowel, pm->htail); else ch = pm->hlead; kbd_inschar(text, buflen, &editpos, ch); } - if (global_settings.talk_menu) /* voice UI? */ - talk_spell(text, false); /* speak revised text */ - break; - - case ACTION_KBD_CURSOR_RIGHT: - pm->hangul = false; - - if (editpos < len_utf8) - { - int c = utf8seek(text, ++editpos); - kbd_spellchar(text[c]); - } -#if CONFIG_CODEC == SWCODEC - else if (global_settings.talk_menu) - pcmbuf_beep(1000, 150, 1500); -#endif - break; - - case ACTION_KBD_CURSOR_LEFT: - pm->hangul = false; - - if (editpos > 0) - { - int c = utf8seek(text, --editpos); - kbd_spellchar(text[c]); - } -#if CONFIG_CODEC == SWCODEC - else if (global_settings.talk_menu) - pcmbuf_beep(1000, 150, 1500); -#endif + talk_spell(text, false); + /* speak revised text */ break; -#endif /* !defined (KBD_MODES) || defined (KBD_CURSOR_KEYS) */ case BUTTON_NONE: -#ifdef KBD_MORSE_INPUT - if (morse_reading) - { - int j; - logf("Morse: 0x%02x", morse_code); - morse_reading = false; - - for (j = 0; morse_alphabets[j] != '\0'; j++) - { - if (morse_codes[j] == morse_code) - break ; - } - - if (morse_alphabets[j] == '\0') - { - logf("Morse code not found"); - break ; - } - - /* turn off hangul input */ - FOR_NB_SCREENS(l) - param[l].hangul = false; - kbd_inschar(text, buflen, &editpos, morse_alphabets[j]); - - if (global_settings.talk_menu) /* voice UI? */ - talk_spell(text, false); /* speak revised text */ - } -#endif /* KBD_MORSE_INPUT */ break; default: - if (default_event_handler(button) == SYS_USB_CONNECTED) - { + if (default_event_handler(button) == SYS_USB_CONNECTED) { FOR_NB_SCREENS(l) screens[l].setfont(FONT_SYSFIXED); } @@ -1237,8 +934,7 @@ int kbd_input(char* text, int buflen) } /* end switch */ - if (button != BUTTON_NONE) - { + if (button != BUTTON_NONE) { cur_blink = true; } }