From e587264b3de4f8d6de9db83eb7861a79738ac8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sun, 5 Mar 2017 11:54:08 +0100 Subject: [PATCH] (OSK) Ascii symbol page --- menu/widgets/menu_osk.c | 19 ++++++++++++++----- menu/widgets/menu_osk.h | 1 + menu/widgets/menu_osk_utf8_pages.h | 16 +++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/menu/widgets/menu_osk.c b/menu/widgets/menu_osk.c index c8bbd4787d..1ad5cb4d9a 100644 --- a/menu/widgets/menu_osk.c +++ b/menu/widgets/menu_osk.c @@ -42,17 +42,23 @@ static enum osk_type osk_idx = OSK_LOWERCASE_LATIN; #include "menu_osk_utf8_pages.h" #else /* Otherwise define some ascii-friendly pages. */ +static const char *symbols_page1_grid[] = { + "1","2","3","4","5","6","7","8","9","0","Bksp", + "!","\"","#","$","%","&","'","*","(",")","Enter", + "+",",","-","~","/",":",";","=","<",">","Lower", + "?","@","[","\\","]","^","_","|","{","}","Next"}; + static const char *uppercase_grid[] = { - "!","@","#","$","%","^","&","*","(",")","Bksp", + "1","2","3","4","5","6","7","8","9","0","Bksp", "Q","W","E","R","T","Y","U","I","O","P","Enter", - "A","S","D","F","G","H","J","K","L",":","Lower", - "Z","X","C","V","B","N","M"," ","<",">","Next"}; + "A","S","D","F","G","H","J","K","L","+","Lower", + "Z","X","C","V","B","N","M"," ","_","/","Next"}; static const char *lowercase_grid[] = { "1","2","3","4","5","6","7","8","9","0","Bksp", "q","w","e","r","t","y","u","i","o","p","Enter", - "a","s","d","f","g","h","j","k","l",";","Upper", - "z","x","c","v","b","n","m"," ",",",".","Next"}; + "a","s","d","f","g","h","j","k","l","@","Upper", + "z","x","c","v","b","n","m"," ","-",".","Next"}; #endif void menu_event_set_osk_idx(enum osk_type idx) @@ -129,6 +135,9 @@ void menu_event_osk_iterate(void) memcpy(osk_grid, katakana_page2_grid, sizeof(katakana_page2_grid)); break; #endif + case OSK_SYMBOLS_PAGE1: + memcpy(osk_grid, symbols_page1_grid, sizeof(uppercase_grid)); + break; case OSK_UPPERCASE_LATIN: memcpy(osk_grid, uppercase_grid, sizeof(uppercase_grid)); break; diff --git a/menu/widgets/menu_osk.h b/menu/widgets/menu_osk.h index 08ed23f030..be11d86e7f 100644 --- a/menu/widgets/menu_osk.h +++ b/menu/widgets/menu_osk.h @@ -37,6 +37,7 @@ enum osk_type OSK_TYPE_UNKNOWN = 0U, OSK_LOWERCASE_LATIN, OSK_UPPERCASE_LATIN, + OSK_SYMBOLS_PAGE1, #ifdef HAVE_LANGEXTRA OSK_HIRAGANA_PAGE1, OSK_HIRAGANA_PAGE2, diff --git a/menu/widgets/menu_osk_utf8_pages.h b/menu/widgets/menu_osk_utf8_pages.h index ffe8b10896..bcd7481918 100644 --- a/menu/widgets/menu_osk_utf8_pages.h +++ b/menu/widgets/menu_osk_utf8_pages.h @@ -19,17 +19,23 @@ #pragma execution_character_set("utf-8") #endif +static const char *symbols_page1_grid[] = { + "1","2","3","4","5","6","7","8","9","0","⇦", + "!","\"","#","$","%","&","'","*","(",")","⏎", + "+",",","-","~","/",":",";","=","<",">","⇩", + "?","@","[","\\","]","^","_","|","{","}","⊕"}; + static const char *uppercase_grid[] = { - "!","@","#","$","%","^","&","*","(",")","⇦", + "1","2","3","4","5","6","7","8","9","0","⇦", "Q","W","E","R","T","Y","U","I","O","P","⏎", - "A","S","D","F","G","H","J","K","L",":","⇩", - "Z","X","C","V","B","N","M"," ","<",">","⊕"}; + "A","S","D","F","G","H","J","K","L","+","⇩", + "Z","X","C","V","B","N","M"," ","_","/","⊕"}; static const char *lowercase_grid[] = { "1","2","3","4","5","6","7","8","9","0","⇦", "q","w","e","r","t","y","u","i","o","p","⏎", - "a","s","d","f","g","h","j","k","l",";","⇧", - "z","x","c","v","b","n","m"," ",",",".","⊕"}; + "a","s","d","f","g","h","j","k","l","@","⇧", + "z","x","c","v","b","n","m"," ","-",".","⊕"}; static const char *hiragana_page1_grid[] = { "あ","い","う","え","お","ら","り","る","れ","ろ","⇦",