menu: don't assume onoff vars are int

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@933 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/menu.c b/common/menu.c
index f55b48d..1513d39 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1,5 +1,5 @@
 /*\r
- * (C) Gražvydas "notaz" Ignotas, 2006-2010\r
+ * (C) Gražvydas "notaz" Ignotas, 2006-2011\r
  *\r
  * This work is licensed under the terms of any of these licenses\r
  * (at your option):\r
@@ -372,6 +372,28 @@ static int me_count(const menu_entry *ent)
        return ret;\r
 }\r
 \r
+static unsigned int me_read_onoff(const menu_entry *ent)\r
+{\r
+       // guess var size based on mask to avoid reading too much\r
+       if (ent->mask & 0xffff0000)\r
+               return *(unsigned int *)ent->var & ent->mask;\r
+       else if (ent->mask & 0xff00)\r
+               return *(unsigned short *)ent->var & ent->mask;\r
+       else\r
+               return *(unsigned char *)ent->var & ent->mask;\r
+}\r
+\r
+static void me_toggle_onoff(menu_entry *ent)\r
+{\r
+       // guess var size based on mask to avoid reading too much\r
+       if (ent->mask & 0xffff0000)\r
+               *(unsigned int *)ent->var ^= ent->mask;\r
+       else if (ent->mask & 0xff00)\r
+               *(unsigned short *)ent->var ^= ent->mask;\r
+       else\r
+               *(unsigned char *)ent->var ^= ent->mask;\r
+}\r
+\r
 static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))\r
 {\r
        const menu_entry *ent, *ent_sel = entries;\r
@@ -477,7 +499,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                case MB_NONE:\r
                        break;\r
                case MB_OPT_ONOFF:\r
-                       text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");\r
+                       text_out16(x + col2_offs, y, me_read_onoff(ent) ? "ON" : "OFF");\r
                        break;\r
                case MB_OPT_RANGE:\r
                        text_out16(x + col2_offs, y, "%i", *(int *)ent->var);\r
@@ -545,7 +567,7 @@ static int me_process(menu_entry *entry, int is_next, int is_lr)
        {\r
                case MB_OPT_ONOFF:\r
                case MB_OPT_CUSTONOFF:\r
-                       *(int *)entry->var ^= entry->mask;\r
+                       me_toggle_onoff(entry);\r
                        return 1;\r
                case MB_OPT_RANGE:\r
                case MB_OPT_CUSTRANGE:\r
@@ -560,11 +582,11 @@ static int me_process(menu_entry *entry, int is_next, int is_lr)
                        names = (const char **)entry->data;\r
                        for (c = 0; names[c] != NULL; c++)\r
                                ;\r
-                       *(int *)entry->var += is_next ? 1 : -1;\r
-                       if (*(int *)entry->var < 0)\r
-                               *(int *)entry->var = 0;\r
-                       if (*(int *)entry->var >= c)\r
-                               *(int *)entry->var = c - 1;\r
+                       *(signed char *)entry->var += is_next ? 1 : -1;\r
+                       if (*(signed char *)entry->var < 0)\r
+                               *(signed char *)entry->var = 0;\r
+                       if (*(signed char *)entry->var >= c)\r
+                               *(signed char *)entry->var = c - 1;\r
                        return 1;\r
                default:\r
                        return 0;\r

diff --git a/common/menu.h b/common/menu.h
index f34d5a8..79b8278 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -61,8 +61,11 @@ typedef struct
 #define mee_onoff(name, id, var, mask) \
        mee_onoff_h(name, id, var, mask, NULL)
 
+#define mee_range_h(name, id, var, min, max, help) \
+       { name, MB_OPT_RANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, NULL, NULL, help }
+
 #define mee_range(name, id, var, min, max) \
-       { name, MB_OPT_RANGE, id, &(var), 0, min, max, 1, 1, 1, NULL, NULL, NULL, NULL }
+       mee_range_h(name, id, var, min, max, NULL)
 
 #define mee_range_hide(name, id, var, min, max) \
        { name, MB_OPT_RANGE, id, &(var), 0, min, max, 0, 1, 0, NULL, NULL, NULL, NULL }