diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-15 19:40:55 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (patch) | |
tree | 98ec96946eeb2ae709cb0528cc6998e21bb9b290 /apps/plugins/zxbox/zxbox_keyb.c | |
parent | 17f7cc92c258bc456a27c3e7c5a19c9409851879 (diff) | |
download | rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.tar.gz rockbox-092c340a2062fa98b7387fc5fd63578ddae7d0b6.zip |
[1/4] Remove SH support and all archos targets
This removes all code specific to SH targets
Change-Id: I7980523785d2596e65c06430f4638eec74a06061
Diffstat (limited to 'apps/plugins/zxbox/zxbox_keyb.c')
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 046f07379d..4dc50e2ae8 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -7,12 +7,6 @@ | |||
7 | #define O_BINARY 0 | 7 | #define O_BINARY 0 |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
11 | #define BUTTONBAR_HEIGHT 8 | ||
12 | #else | ||
13 | #define BUTTONBAR_HEIGHT 0 | ||
14 | #endif | ||
15 | |||
16 | #define DEFAULT_MARGIN 6 | 10 | #define DEFAULT_MARGIN 6 |
17 | #define KBD_BUF_SIZE 500 | 11 | #define KBD_BUF_SIZE 500 |
18 | #define kbd_loaded false | 12 | #define kbd_loaded false |
@@ -27,22 +21,6 @@ | |||
27 | #define KBD_UP BUTTON_UP | 21 | #define KBD_UP BUTTON_UP |
28 | #define KBD_DOWN BUTTON_DOWN | 22 | #define KBD_DOWN BUTTON_DOWN |
29 | 23 | ||
30 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
31 | #define KBD_SELECT BUTTON_PLAY | ||
32 | #define KBD_ABORT BUTTON_OFF | ||
33 | #define KBD_LEFT BUTTON_LEFT | ||
34 | #define KBD_RIGHT BUTTON_RIGHT | ||
35 | #define KBD_UP BUTTON_UP | ||
36 | #define KBD_DOWN BUTTON_DOWN | ||
37 | |||
38 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted Ondio keypad */ | ||
39 | #define KBD_SELECT BUTTON_MENU | ||
40 | #define KBD_ABORT BUTTON_OFF | ||
41 | #define KBD_LEFT BUTTON_LEFT | ||
42 | #define KBD_RIGHT BUTTON_RIGHT | ||
43 | #define KBD_UP BUTTON_UP | ||
44 | #define KBD_DOWN BUTTON_DOWN | ||
45 | |||
46 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 24 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
47 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 25 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
48 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 26 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -412,7 +390,7 @@ int zx_kbd_input(char* text/*, int buflen*/) | |||
412 | param[l].font_h = param[l].font->height; | 390 | param[l].font_h = param[l].font->height; |
413 | 391 | ||
414 | /* check if FONT_UI fits the screen */ | 392 | /* check if FONT_UI fits the screen */ |
415 | if (2*param[l].font_h+3 + BUTTONBAR_HEIGHT > | 393 | if (2*param[l].font_h+3 > |
416 | rb->screens[l]->getheight()) { | 394 | rb->screens[l]->getheight()) { |
417 | param[l].font = rb->font_get(FONT_SYSFIXED); | 395 | param[l].font = rb->font_get(FONT_SYSFIXED); |
418 | param[l].font_h = param[l].font->height; | 396 | param[l].font_h = param[l].font->height; |
@@ -492,10 +470,10 @@ int zx_kbd_input(char* text/*, int buflen*/) | |||
492 | param[l].lines = param[l].DEFAULT_LINES; | 470 | param[l].lines = param[l].DEFAULT_LINES; |
493 | param[l].keyboard_margin = DEFAULT_MARGIN; | 471 | param[l].keyboard_margin = DEFAULT_MARGIN; |
494 | } else { | 472 | } else { |
495 | param[l].lines = (rb->screens[l]->lcdheight - BUTTONBAR_HEIGHT - | 473 | param[l].lines = (rb->screens[l]->lcdheight - |
496 | statusbar_size) / param[l].font_h - 1; | 474 | statusbar_size) / param[l].font_h - 1; |
497 | param[l].keyboard_margin = rb->screens[l]->lcdheight - | 475 | param[l].keyboard_margin = rb->screens[l]->lcdheight - |
498 | BUTTONBAR_HEIGHT - statusbar_size - | 476 | statusbar_size - |
499 | (param[l].lines+1)*param[l].font_h; | 477 | (param[l].lines+1)*param[l].font_h; |
500 | if (param[l].keyboard_margin < 3) { | 478 | if (param[l].keyboard_margin < 3) { |
501 | param[l].lines--; | 479 | param[l].lines--; |