frontend: menu: limit enum text length

[pcsx_rearmed.git] / frontend / common / menu.c

diff --git a/frontend/common/menu.c b/frontend/common/menu.c
index cf31610..d76eda4 100644 (file)
--- a/frontend/common/menu.c
+++ b/frontend/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
@@ -460,7 +482,7 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
        for (ent = entries; ent->name; ent++)\r
        {\r
                const char **names;\r
-               int len;\r
+               int len, leftname_end = 0;\r
 \r
                if (!ent->enabled)\r
                        continue;\r
@@ -470,14 +492,16 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                        if (ent->generate_name)\r
                                name = ent->generate_name(ent->id, &offs);\r
                }\r
-               if (name != NULL)\r
+               if (name != NULL) {\r
                        text_out16(x, y, name);\r
+                       leftname_end = x + (strlen(name) + 1) * me_mfont_w;\r
+               }\r
 \r
                switch (ent->beh) {\r
                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
@@ -494,13 +518,15 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                        break;\r
                case MB_OPT_ENUM:\r
                        names = (const char **)ent->data;\r
-                       offs = 0;\r
                        for (i = 0; names[i] != NULL; i++) {\r
+                               offs = x + col2_offs;\r
                                len = strlen(names[i]);\r
                                if (len > 10)\r
-                                       offs = 10 - len - 2;\r
+                                       offs += (10 - len - 2) * me_mfont_w;\r
+                               if (offs < leftname_end)\r
+                                       offs = leftname_end;\r
                                if (i == *(unsigned char *)ent->var) {\r
-                                       text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", names[i]);\r
+                                       text_out16(offs, y, "%s", names[i]);\r
                                        break;\r
                                }\r
                        }\r
@@ -545,7 +571,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