summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/recorder/keyboard.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 4eb99d1eed..7751dac906 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -16,13 +16,9 @@
16 * KIND, either express or implied. 16 * KIND, either express or implied.
17 * 17 *
18 ****************************************************************************/ 18 ****************************************************************************/
19#include "lcd.h"
20#include "button.h"
21#include "kernel.h" 19#include "kernel.h"
22#include "system.h" 20#include "system.h"
23#include "version.h" 21#include "version.h"
24#include "debug_menu.h"
25#include "sprintf.h"
26#include <string.h> 22#include <string.h>
27#include "font.h" 23#include "font.h"
28#include "screens.h" 24#include "screens.h"
@@ -33,8 +29,6 @@
33#include "rbunicode.h" 29#include "rbunicode.h"
34#include "buttonbar.h" 30#include "buttonbar.h"
35#include "logf.h" 31#include "logf.h"
36#include "icons.h"
37#include "file.h"
38#include "hangul.h" 32#include "hangul.h"
39#include "action.h" 33#include "action.h"
40 34
@@ -177,7 +171,7 @@ static void kbd_spellchar(unsigned short c)
177 } 171 }
178} 172}
179 173
180void kbd_inschar(unsigned char* text, int buflen, int* editpos, unsigned short ch) 174static void kbd_inschar(unsigned char* text, int buflen, int* editpos, unsigned short ch)
181{ 175{
182 int i, j, k, len; 176 int i, j, k, len;
183 unsigned char tmp[4]; 177 unsigned char tmp[4];
@@ -202,7 +196,7 @@ void kbd_inschar(unsigned char* text, int buflen, int* editpos, unsigned short c
202 return; 196 return;
203} 197}
204 198
205void kbd_delchar(unsigned char* text, int* editpos) 199static void kbd_delchar(unsigned char* text, int* editpos)
206{ 200{
207 int i = 0; 201 int i = 0;
208 unsigned char* utf8; 202 unsigned char* utf8;
@@ -248,6 +242,7 @@ int kbd_input(char* text, int buflen)
248 242
249 FOR_NB_SCREENS(l) 243 FOR_NB_SCREENS(l)
250 { 244 {
245#if LCD_WIDTH >= 160 && LCD_HEIGHT >=96
251 if ((screens[l].width >= 160) && (screens[l].height >= 96)) 246 if ((screens[l].width >= 160) && (screens[l].height >= 96))
252 { 247 {
253 param[l].default_kbd = 248 param[l].default_kbd =
@@ -258,12 +253,13 @@ int kbd_input(char* text, int buflen)
258 "ÀÁÂÃÄÅÆ ÌÍÎÏ ÈÉÊË ¢£¤¥¦§©®\n" 253 "ÀÁÂÃÄÅÆ ÌÍÎÏ ÈÉÊË ¢£¤¥¦§©®\n"
259 "àáâãäåæ ìíîï èéêë «»°ºª¹²³\n" 254 "àáâãäåæ ìíîï èéêë «»°ºª¹²³\n"
260 "ÓÒÔÕÖØ ÇÐÞÝß ÙÚÛÜ ¯±×÷¡¿µ·\n" 255 "ÓÒÔÕÖØ ÇÐÞÝß ÙÚÛÜ ¯±×÷¡¿µ·\n"
261 "òóôõöø çðþýÿ ùúûü ¼½¾¬¶¨"; 256 "òóôõöø çðþýÿ ùúûü ¼½¾¬¶¨:;";
262 257
263 param[l].DEFAULT_LINES = 8; 258 param[l].DEFAULT_LINES = 8;
264 } 259 }
265 else 260 else
266 { 261 {
262#endif
267 param[l].default_kbd = 263 param[l].default_kbd =
268 "ABCDEFG !?\" @#$%+'\n" 264 "ABCDEFG !?\" @#$%+'\n"
269 "HIJKLMN 789 &_()-`\n" 265 "HIJKLMN 789 &_()-`\n"
@@ -273,7 +269,7 @@ int kbd_input(char* text, int buflen)
273 "abcdefg ¢£¤¥¦§©®¬\n" 269 "abcdefg ¢£¤¥¦§©®¬\n"
274 "hijklmn «»°ºª¹²³¶\n" 270 "hijklmn «»°ºª¹²³¶\n"
275 "opqrstu ¯±×÷¡¿µ·¨\n" 271 "opqrstu ¯±×÷¡¿µ·¨\n"
276 "vwxyz., ¼½¾ \n" 272 "vwxyz., :;¼½¾ \n"
277 273
278 "ÀÁÂÃÄÅÆ ÌÍÎÏ ÈÉÊË\n" 274 "ÀÁÂÃÄÅÆ ÌÍÎÏ ÈÉÊË\n"
279 "àáâãäåæ ìíîï èéêë\n" 275 "àáâãäåæ ìíîï èéêë\n"
@@ -281,7 +277,9 @@ int kbd_input(char* text, int buflen)
281 "òóôõöø çðþýÿ ùúûü"; 277 "òóôõöø çðþýÿ ùúûü";
282 278
283 param[l].DEFAULT_LINES = 4; 279 param[l].DEFAULT_LINES = 4;
280#if LCD_WIDTH >= 160
284 } 281 }
282#endif
285 } 283 }
286#ifdef KBD_MODES 284#ifdef KBD_MODES
287 bool line_edit = false; 285 bool line_edit = false;