From 4caa8326abd590eb01279dde3f4dc6611a9255c8 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Mon, 6 Sep 2010 13:33:49 +0000
Subject: 2 new touch region options... "settings_inc" and "settings_dec" which
 will increase or decrease most of the available settings. To use it put the
 config name of the setting as the next param after settings_inc... i.e %T(0,
 0, 32, 32, settings_inc, repeat)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28009 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/skin_engine/skin_engine.h       |  3 ++-
 apps/gui/skin_engine/skin_parser.c       | 25 +++++++++++++++++++++++++
 apps/gui/skin_engine/skin_touchsupport.c |  7 ++++++-
 apps/gui/skin_engine/wps_internals.h     |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'apps/gui/skin_engine')

diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index 9845d8ca8a..6beedd90a2 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -67,7 +67,8 @@ enum skinnable_screens {
 
 
 #ifdef HAVE_TOUCHSCREEN
-int skin_get_touchaction(struct wps_data *data, int* edge_offset);
+int skin_get_touchaction(struct wps_data *data, int* edge_offset,
+                         struct touchregion **retregion);
 void skin_disarm_touchregions(struct wps_data *data);
 #endif
 
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index a486436816..3d796f8032 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -826,6 +826,9 @@ static const struct touchaction touchactions[] = {
     {"contextmenu", ACTION_STD_CONTEXT},{"quickscreen", ACTION_STD_QUICKSCREEN },
     /* not really WPS specific, but no equivilant ACTION_STD_* */
     {"voldown", ACTION_WPS_VOLDOWN},    {"volup", ACTION_WPS_VOLUP},
+    
+    /* generic settings changers */
+    {"setting_inc", ACTION_SETTINGS_INC}, {"setting_dec", ACTION_SETTINGS_DEC}, 
 
     /* WPS specific actions */
     {"browse", ACTION_WPS_BROWSE },
@@ -888,6 +891,7 @@ static int parse_touchregion(struct skin_element *element,
     region->wvp = curr_vp;
     region->armed = false;
     region->reverse_bar = false;
+    region->extradata = NULL;
     action = element->params[4].data.text;
 
     strcpy(temp, action);
@@ -922,6 +926,27 @@ static int parse_touchregion(struct skin_element *element,
             if (!strcmp(touchactions[i].s, action))
             {
                 region->action = touchactions[i].action;
+                if (region->action == ACTION_SETTINGS_INC ||
+                    region->action == ACTION_SETTINGS_DEC)
+                {
+                    if (element->params_count < 6)
+                    {
+                        return WPS_ERROR_INVALID_PARAM;
+                    }
+                    else
+                    {
+                        char *name = element->params[5].data.text;
+                        int j;
+                        /* Find the setting */
+                        for (j=0; j<nb_settings; j++)
+                            if (settings[j].cfg_name &&
+                                !strcmp(settings[j].cfg_name, name))
+                                break;
+                        if (j==nb_settings)
+                            return WPS_ERROR_INVALID_PARAM;
+                        region->extradata = &settings[j];
+                    }
+                }
                 break;
             }
         }
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 09fbd86acd..850c1c0647 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -40,7 +40,8 @@ void skin_disarm_touchregions(struct wps_data *data)
  * egde_offset is a percentage value for the position of the touch
  * inside the bar for regions which arnt WPS_TOUCHREGION_ACTION type.
  */
-int skin_get_touchaction(struct wps_data *data, int* edge_offset)
+int skin_get_touchaction(struct wps_data *data, int* edge_offset,
+                         struct touchregion **retregion)
 {
     int returncode = ACTION_NONE;
     short x,y;
@@ -84,6 +85,8 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset)
                         {
                             last_action = r->action;
                             returncode = r->action;
+                            if (retregion)
+                                *retregion = r;
                         }
                         if (pressed)
                             r->armed = true;
@@ -99,6 +102,8 @@ int skin_get_touchaction(struct wps_data *data, int* edge_offset)
                                 *edge_offset = 100 - *edge_offset;
                         }
                         returncode = r->type;
+                        if (retregion)
+                            *retregion = r;
                         break;
                 }
             }
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 81958c7966..0767f50279 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -196,6 +196,7 @@ struct touchregion {
     int action;              /* action this button will return */
     bool armed;              /* A region is armed on press. Only armed regions are triggered
                                 on repeat or release. */
+    void* extradata;
 };
 #endif
 
-- 
cgit v1.2.3