Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -u -r apps/keymaps/keymap-clip.c apps/keymaps/keymap-clip.c
- --- apps/keymaps/keymap-clip.c 2013-04-05 14:46:20.000000000 -0400
- +++ apps/keymaps/keymap-clip.c 2013-04-05 15:07:12.849469168 -0400
- @@ -40,7 +40,7 @@
- { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
- - { ACTION_STD_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
- + { ACTION_STD_QUICKSCREEN, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
- { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
- { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
- @@ -55,7 +55,7 @@
- static const struct button_mapping button_context_wps[] = {
- { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
- - { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
- + { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
- { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
- @@ -77,7 +77,7 @@
- { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
- { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
- - { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
- + { ACTION_WPS_QUICKSCREEN, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
- { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
- { ACTION_WPS_PITCHSCREEN, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
- @@ -90,7 +90,7 @@
- #endif
- #ifndef HAS_BUTTON_HOLD /* Clip+ */
- - { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE },
- + { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
- #endif /* HAS_BUTTON_HOLD */
- LAST_ITEM_IN_LIST
- @@ -134,8 +134,8 @@
- }; /* button_context_list */
- static const struct button_mapping button_context_tree[] = {
- - { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME },
- - { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
- + { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
- + { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
- #ifdef HAVE_HOTKEY
- // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE },
- #endif
- @@ -165,12 +165,6 @@
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
- }; /* button_context_listtree_scroll_with_combo */
- -static const struct button_mapping button_context_mainmenu[] = {
- - { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
- -
- - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
- -}; /* button_context_mainmenu */
- -
- static const struct button_mapping button_context_yesno[] = {
- { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE },
- @@ -405,12 +399,11 @@
- case CONTEXT_LIST:
- return button_context_list;
- case CONTEXT_TREE:
- + case CONTEXT_MAINMENU:
- if (global_settings.hold_lr_for_scroll_in_list)
- return button_context_listtree_scroll_without_combo;
- else
- return button_context_listtree_scroll_with_combo;
- - case CONTEXT_MAINMENU:
- - return button_context_mainmenu;
- case CONTEXT_CUSTOM|CONTEXT_TREE:
- return button_context_tree;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement