summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-09-12 05:03:12 -0400
committerWilliam Wilgus <me.theuser@yahoo.com>2020-09-13 16:23:24 +0000
commitc62493e98adfd27c16eb2adb2ecd22716813b705 (patch)
treec5d2a0fbdcf145584518289885e7676f82b20a29 /apps/plugins
parent6b674a6a0a347bd4cb946b37b6e075dc2715f7ac (diff)
downloadrockbox-c62493e98adfd27c16eb2adb2ecd22716813b705.tar.gz
rockbox-c62493e98adfd27c16eb2adb2ecd22716813b705.zip
Xduoo X3 Add tree scrolling FS#13240, Emulate Multibutton presses
Fixes deficiencies with the button system on the X3 The x3 has an interesting button layout. Multiple key presses are NOT supported unless [BUTTON_POWER] is one of the combined keys As you can imagine this causes problems as the power button takes precedence in the button system and initiates a shutdown if the key is held too long instead of BUTTON_POWER use BUTTON_PWRALT in combination with other keys IF using as a prerequsite button then BUTTON_POWER should be used Multiple buttons are emulated by button_read_device but there are a few caveats to be aware of: Button Order Matters! different keys have different priorities, higher priority keys 'overide' the lower priority keys VOLUP[7] VOLDN[6] PREV[5] NEXT[4] PLAY[3] OPTION[2] HOME[1] There will be no true release or repeat events, the user can let off the button pressed initially and it will still continue to appear to be pressed as long as the second key is held Tree scrolling is PLAY+NEXT or PLAY+PREV Change-Id: I88dfee1c70a6a99659e8227f5becacc50cc43910
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/doom/i_video.c2
-rw-r--r--apps/plugins/fft/fft.c2
-rw-r--r--apps/plugins/goban/goban.h2
-rw-r--r--apps/plugins/imageviewer/imageviewer_button.h2
-rw-r--r--apps/plugins/pegbox.c2
-rw-r--r--apps/plugins/rockpaint.c2
-rw-r--r--apps/plugins/sliding_puzzle.c2
-rw-r--r--apps/plugins/sokoban.c2
-rw-r--r--apps/plugins/sudoku/sudoku.h2
-rw-r--r--apps/plugins/text_viewer/tv_button.h2
-rw-r--r--apps/plugins/wormlet.c2
11 files changed, 11 insertions, 11 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 9f367d7d76..fb328639bf 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -561,7 +561,7 @@ void I_ShutdownGraphics(void)
561#define DOOMBUTTON_LEFT BUTTON_PREV 561#define DOOMBUTTON_LEFT BUTTON_PREV
562#define DOOMBUTTON_RIGHT BUTTON_NEXT 562#define DOOMBUTTON_RIGHT BUTTON_NEXT
563#define DOOMBUTTON_SHOOT BUTTON_PLAY 563#define DOOMBUTTON_SHOOT BUTTON_PLAY
564#define DOOMBUTTON_OPEN (BUTTON_HOME | BUTTON_POWER) 564#define DOOMBUTTON_OPEN (BUTTON_HOME | BUTTON_PWRALT)
565#define DOOMBUTTON_ESC BUTTON_POWER 565#define DOOMBUTTON_ESC BUTTON_POWER
566#define DOOMBUTTON_ENTER BUTTON_PLAY 566#define DOOMBUTTON_ENTER BUTTON_PLAY
567#define DOOMBUTTON_WEAPON BUTTON_VOL_UP 567#define DOOMBUTTON_WEAPON BUTTON_VOL_UP
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 9edb02a15e..2ed0263d75 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -330,7 +330,7 @@ GREY_INFO_STRUCT
330# define FFT_NEXT_GRAPH BUTTON_NEXT 330# define FFT_NEXT_GRAPH BUTTON_NEXT
331# define FFT_ORIENTATION BUTTON_HOME 331# define FFT_ORIENTATION BUTTON_HOME
332# define FFT_FREQ_SCALE BUTTON_OPTION 332# define FFT_FREQ_SCALE BUTTON_OPTION
333# define FFT_WINDOW (BUTTON_HOME|BUTTON_POWER) 333# define FFT_WINDOW (BUTTON_HOME|BUTTON_PWRALT)
334# define FFT_AMP_SCALE BUTTON_PLAY 334# define FFT_AMP_SCALE BUTTON_PLAY
335# define FFT_QUIT BUTTON_POWER 335# define FFT_QUIT BUTTON_POWER
336 336
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 8406b540b7..ac02d74f50 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -441,7 +441,7 @@
441#define GBN_BUTTON_MENU BUTTON_POWER 441#define GBN_BUTTON_MENU BUTTON_POWER
442#define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL 442#define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL
443#define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT 443#define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT
444#define GBN_BUTTON_NEXT_VAR BUTTON_HOME | BUTTON_POWER 444#define GBN_BUTTON_NEXT_VAR BUTTON_HOME | BUTTON_PWRALT
445 445
446#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) 446#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
447#define GBN_BUTTON_UP BUTTON_HOME 447#define GBN_BUTTON_UP BUTTON_HOME
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 46813d5e69..7aa96023c6 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -474,7 +474,7 @@
474#define IMGVIEW_PREVIOUS BUTTON_VOL_DOWN 474#define IMGVIEW_PREVIOUS BUTTON_VOL_DOWN
475#define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT) 475#define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
476#define IMGVIEW_MENU BUTTON_POWER 476#define IMGVIEW_MENU BUTTON_POWER
477#define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) 477#define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_PWRALT)
478 478
479#elif CONFIG_KEYPAD == XDUOO_X3II_PAD 479#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
480#define IMGVIEW_ZOOM_PRE BUTTON_PLAY 480#define IMGVIEW_ZOOM_PRE BUTTON_PLAY
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 4622d2a10e..0a299c995f 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -612,7 +612,7 @@ CONFIG_KEYPAD == MROBE500_PAD
612#elif CONFIG_KEYPAD == XDUOO_X3_PAD 612#elif CONFIG_KEYPAD == XDUOO_X3_PAD
613#define PEGBOX_SELECT BUTTON_PLAY 613#define PEGBOX_SELECT BUTTON_PLAY
614#define PEGBOX_QUIT BUTTON_POWER 614#define PEGBOX_QUIT BUTTON_POWER
615#define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) 615#define PEGBOX_RESTART (BUTTON_PWRALT | BUTTON_HOME)
616#define PEGBOX_LVL_UP BUTTON_VOL_UP 616#define PEGBOX_LVL_UP BUTTON_VOL_UP
617#define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN 617#define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN
618#define PEGBOX_UP BUTTON_HOME 618#define PEGBOX_UP BUTTON_HOME
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 35d2f21ba7..8e4df10280 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -330,7 +330,7 @@
330#elif CONFIG_KEYPAD == XDUOO_X3_PAD 330#elif CONFIG_KEYPAD == XDUOO_X3_PAD
331#define ROCKPAINT_QUIT BUTTON_POWER 331#define ROCKPAINT_QUIT BUTTON_POWER
332#define ROCKPAINT_DRAW BUTTON_PLAY 332#define ROCKPAINT_DRAW BUTTON_PLAY
333#define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_POWER) 333#define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_PWRALT)
334#define ROCKPAINT_TOOLBAR BUTTON_VOL_UP 334#define ROCKPAINT_TOOLBAR BUTTON_VOL_UP
335#define ROCKPAINT_TOOLBAR2 BUTTON_VOL_DOWN 335#define ROCKPAINT_TOOLBAR2 BUTTON_VOL_DOWN
336#define ROCKPAINT_UP BUTTON_HOME 336#define ROCKPAINT_UP BUTTON_HOME
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 1a77eda721..e8d349defd 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -309,7 +309,7 @@ CONFIG_KEYPAD == MROBE500_PAD
309#define PUZZLE_RIGHT BUTTON_NEXT 309#define PUZZLE_RIGHT BUTTON_NEXT
310#define PUZZLE_UP BUTTON_HOME 310#define PUZZLE_UP BUTTON_HOME
311#define PUZZLE_DOWN BUTTON_OPTION 311#define PUZZLE_DOWN BUTTON_OPTION
312#define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER) 312#define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_PWRALT)
313#define PUZZLE_PICTURE BUTTON_PLAY 313#define PUZZLE_PICTURE BUTTON_PLAY
314 314
315#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD) 315#elif (CONFIG_KEYPAD == XDUOO_X3II_PAD)
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 3cc1555e83..08359d9fcc 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -623,7 +623,7 @@
623#define SOKOBAN_MENU BUTTON_POWER 623#define SOKOBAN_MENU BUTTON_POWER
624#define SOKOBAN_UNDO_PRE BUTTON_PLAY 624#define SOKOBAN_UNDO_PRE BUTTON_PLAY
625#define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL) 625#define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REL)
626#define SOKOBAN_REDO (BUTTON_POWER | BUTTON_PLAY) 626#define SOKOBAN_REDO (BUTTON_PWRALT | BUTTON_PLAY)
627#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN 627#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN
628#define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_NEXT) 628#define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_NEXT)
629#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP 629#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index d1eca7fcd4..434223ef68 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -402,7 +402,7 @@
402#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_PLAY 402#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_PLAY
403#define SUDOKU_BUTTON_MENU_PRE BUTTON_POWER 403#define SUDOKU_BUTTON_MENU_PRE BUTTON_POWER
404#define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) 404#define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL)
405#define SUDOKU_BUTTON_POSSIBLE (BUTTON_HOME | BUTTON_POWER) 405#define SUDOKU_BUTTON_POSSIBLE (BUTTON_HOME | BUTTON_PWRALT)
406 406
407#elif CONFIG_KEYPAD == XDUOO_X3II_PAD 407#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
408#define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER 408#define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index 4f7634e844..6fcfc24e4f 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -504,7 +504,7 @@
504#define TV_SCREEN_LEFT BUTTON_PREV 504#define TV_SCREEN_LEFT BUTTON_PREV
505#define TV_SCREEN_RIGHT BUTTON_NEXT 505#define TV_SCREEN_RIGHT BUTTON_NEXT
506#define TV_MENU BUTTON_PLAY 506#define TV_MENU BUTTON_PLAY
507#define TV_AUTOSCROLL (BUTTON_POWER | BUTTON_HOME) 507#define TV_AUTOSCROLL (BUTTON_PWRALT | BUTTON_HOME)
508#define TV_LINE_UP BUTTON_HOME 508#define TV_LINE_UP BUTTON_HOME
509#define TV_LINE_DOWN BUTTON_OPTION 509#define TV_LINE_DOWN BUTTON_OPTION
510#define TV_BOOKMARK (BUTTON_OPTION | BUTTON_PLAY) 510#define TV_BOOKMARK (BUTTON_OPTION | BUTTON_PLAY)
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 419b258fe5..59f3138c0a 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -360,7 +360,7 @@ CONFIG_KEYPAD == MROBE500_PAD
360#define BTN_DIR_RIGHT BUTTON_NEXT 360#define BTN_DIR_RIGHT BUTTON_NEXT
361#define BTN_STARTPAUSE BUTTON_PLAY 361#define BTN_STARTPAUSE BUTTON_PLAY
362#define BTN_QUIT BUTTON_POWER 362#define BTN_QUIT BUTTON_POWER
363#define BTN_STOPRESET (BUTTON_HOME | BUTTON_POWER) 363#define BTN_STOPRESET (BUTTON_HOME | BUTTON_PWRALT)
364 364
365#elif CONFIG_KEYPAD == XDUOO_X3II_PAD 365#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
366#define BTN_DIR_UP BUTTON_HOME 366#define BTN_DIR_UP BUTTON_HOME