diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2011-12-26 17:45:54 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2011-12-26 17:45:54 +0000 |
commit | 84b97dd1ea4b674455092a7e2f0ba3fc10f9de70 (patch) | |
tree | ee87694b09d48986ca763c73d765c63346f3b457 /apps/keymaps | |
parent | 4fe6963e4044fd25e5c6b14dea31b0e0b60910c6 (diff) | |
download | rockbox-84b97dd1ea4b674455092a7e2f0ba3fc10f9de70.tar.gz rockbox-84b97dd1ea4b674455092a7e2f0ba3fc10f9de70.zip |
fuze+: remove two_finger pseudo touchpad button because it was unrealiable, update keymap to remove akward mappings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31444 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-fuzeplus.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c index 8a2cd9c3c8..0a4db76f03 100644 --- a/apps/keymaps/keymap-fuzeplus.c +++ b/apps/keymaps/keymap-fuzeplus.c | |||
@@ -39,7 +39,7 @@ static const struct button_mapping button_context_standard[] = { | |||
39 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 39 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
40 | 40 | ||
41 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 41 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
42 | { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | 42 | { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, |
43 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 43 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
44 | 44 | ||
45 | 45 | ||
@@ -57,7 +57,6 @@ static const struct button_mapping button_context_standard[] = { | |||
57 | { ACTION_TREE_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 57 | { ACTION_TREE_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
58 | 58 | ||
59 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | 59 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, |
60 | { ACTION_STD_KEYLOCK, BUTTON_TWO_FINGERS|BUTTON_REL, BUTTON_TWO_FINGERS|BUTTON_REPEAT }, | ||
61 | 60 | ||
62 | LAST_ITEM_IN_LIST | 61 | LAST_ITEM_IN_LIST |
63 | }; /* button_context_standard */ | 62 | }; /* button_context_standard */ |
@@ -69,9 +68,9 @@ static const struct button_mapping button_context_list[] = { | |||
69 | { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | 68 | { ACTION_LISTTREE_PGUP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, |
70 | { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, | 69 | { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, |
71 | { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, | 70 | { ACTION_LISTTREE_PGDOWN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, |
72 | #ifdef HAVE_HOTKEY | 71 | /*#ifdef HAVE_HOTKEY on some gesture later? |
73 | { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_BACK|BUTTON_REPEAT }, | 72 | { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_BACK|BUTTON_REPEAT }, |
74 | #endif | 73 | #endif*/ |
75 | 74 | ||
76 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 75 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
77 | }; /* button_context_list */ | 76 | }; /* button_context_list */ |
@@ -80,7 +79,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_WPS_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, | 79 | { ACTION_WPS_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, |
81 | { ACTION_WPS_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, | 80 | { ACTION_WPS_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
82 | 81 | ||
83 | { ACTION_WPS_MENU, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | 82 | { ACTION_WPS_MENU, BUTTON_BACK, BUTTON_NONE }, |
84 | 83 | ||
85 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 84 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
86 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 85 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -102,7 +101,6 @@ static const struct button_mapping button_context_wps[] = { | |||
102 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 101 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
103 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 102 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
104 | 103 | ||
105 | { ACTION_WPS_REC, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, | ||
106 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | 104 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, |
107 | { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, | 105 | { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, |
108 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, | 106 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, |