summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-05-15 06:02:50 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-05-15 06:02:50 +0000
commit13cc654ceace5ead037b6494813c79a73b0add3e (patch)
treeeeab218aeb98eba4c14a0e4824043d87c50a1609 /apps/gui
parentad5d66562072cc9ca8434355e4e05eee618c6043 (diff)
downloadrockbox-13cc654ceace5ead037b6494813c79a73b0add3e.tar.gz
rockbox-13cc654ceace5ead037b6494813c79a73b0add3e.zip
More touchscreen additions, quickscreen, browser, context menu, skip fwd/back buttons in the mr500 wps (a "button bar" will pop up for 2.5s when the screen is touched.)
icons by Johannes Voggenthaler pitch screen icon is there but not used because that screen isnt fixed for the touhscreen yet git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20939 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/wps_parser.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index d8155d71df..70e13e78a7 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -1163,7 +1163,8 @@ static struct touchaction touchactions[] = {
1163 {"play", ACTION_WPS_PLAY }, {"stop", ACTION_WPS_STOP }, 1163 {"play", ACTION_WPS_PLAY }, {"stop", ACTION_WPS_STOP },
1164 {"prev", ACTION_WPS_SKIPPREV }, {"next", ACTION_WPS_SKIPNEXT }, 1164 {"prev", ACTION_WPS_SKIPPREV }, {"next", ACTION_WPS_SKIPNEXT },
1165 {"menu", ACTION_WPS_MENU }, {"browse", ACTION_WPS_BROWSE }, 1165 {"menu", ACTION_WPS_MENU }, {"browse", ACTION_WPS_BROWSE },
1166 {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE } 1166 {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE },
1167 {"quickscreen", ACTION_WPS_QUICKSCREEN },{"contextmenu", ACTION_WPS_CONTEXT },
1167}; 1168};
1168static int parse_touchregion(const char *wps_bufptr, 1169static int parse_touchregion(const char *wps_bufptr,
1169 struct wps_token *token, struct wps_data *wps_data) 1170 struct wps_token *token, struct wps_data *wps_data)
@@ -1187,6 +1188,8 @@ static int parse_touchregion(const char *wps_bufptr,
1187 * browse - go back to the file/db browser 1188 * browse - go back to the file/db browser
1188 * shuffle - toggle shuffle mode 1189 * shuffle - toggle shuffle mode
1189 * repmode - cycle the repeat mode 1190 * repmode - cycle the repeat mode
1191 * quickscreen - go into the quickscreen
1192 * contextmenu - open the context menu
1190 */ 1193 */
1191 1194
1192 if ((wps_data->touchregion_count +1 >= MAX_TOUCHREGIONS) || (*ptr != '|')) 1195 if ((wps_data->touchregion_count +1 >= MAX_TOUCHREGIONS) || (*ptr != '|'))