From 8902404318ca02b68b6851892515ba417169fa6c Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Thu, 23 Jul 2009 04:33:10 +0000 Subject: [PATCH] Superdom: Add support for 640x480 and 480x640 screens, simplify screen defines. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22009 a1c6a512-1295-4272-9138-f99709370657 --- .../native/superdom_boarditems.480x640x16.bmp | Bin 0 -> 11718 bytes .../native/superdom_boarditems.640x480x16.bmp | Bin 0 -> 14454 bytes apps/plugins/superdom.c | 50 ++++++------------ 3 files changed, 17 insertions(+), 33 deletions(-) create mode 100644 apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp create mode 100644 apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp diff --git a/apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp b/apps/plugins/bitmaps/native/superdom_boarditems.480x640x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..bc5175cbbda955b0975ec9799f38e527d21bcf24 GIT binary patch literal 11718 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 L%e;R+in0F&u4Qxx literal 0 HcmV?d00001 diff --git a/apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp b/apps/plugins/bitmaps/native/superdom_boarditems.640x480x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..1b4471c48a50de854de39f0616af02e8d43e9a56 GIT binary patch literal 14454 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 k44=Ai>Wq0a=FXZ6fP_VcOK_{VMk4{i0mvH$=8 literal 0 HcmV?d00001 diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 1a44bad518..3e1e23785a 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c @@ -21,6 +21,7 @@ #include "plugin.h" #include "lib/playback_control.h" #include "lib/display_text.h" +#include "pluginbitmaps/superdom_boarditems.h" PLUGIN_HEADER extern const fb_data superdom_boarditems[]; @@ -47,40 +48,23 @@ char buf[255]; #endif -#if LCD_WIDTH == 220 && LCD_HEIGHT == 176 -#define NUM_BOX_HEIGHT 25 -#define NUM_BOX_WIDTH 30 -#define STRIDE 14 -#define ICON_HEIGHT 7 -#define ICON_WIDTH 7 +/* NUM_BOX HEIGHT and WIDTH are used for the number pad in the game. The height + * calculation includes spacing for the text placed above and below the number + * pad (it divides by 6 instead of just 4). The width calculation gives extra + * spacing on the sides of the pad too (divides by 5 instead of 3). + */ +#define NUM_BOX_HEIGHT (LCD_HEIGHT/6) +#define NUM_BOX_WIDTH (LCD_WIDTH/5) -#elif (LCD_WIDTH == 160 && LCD_HEIGHT == 128) || \ - (LCD_WIDTH == 176 && LCD_HEIGHT == 132) || \ - (LCD_WIDTH == 176 && LCD_HEIGHT == 220) -#define NUM_BOX_HEIGHT 20 -#define NUM_BOX_WIDTH 24 -#define STRIDE 8 -#define ICON_HEIGHT 4 -#define ICON_WIDTH 4 +#define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 +#define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 -#elif (LCD_WIDTH == 320 && LCD_HEIGHT == 240) -#define NUM_BOX_HEIGHT 25 -#define NUM_BOX_WIDTH 30 -#define STRIDE 20 -#define ICON_HEIGHT 10 -#define ICON_WIDTH 10 - -#elif (LCD_WIDTH == 240 && (LCD_HEIGHT == 320 || LCD_HEIGHT == 400)) -#define NUM_BOX_HEIGHT 25 -#define NUM_BOX_WIDTH 30 -#define STRIDE 18 -#define ICON_HEIGHT 9 -#define ICON_WIDTH 9 - -#endif - -#define NUM_MARGIN_X (LCD_WIDTH-3*NUM_BOX_WIDTH)/2 -#define NUM_MARGIN_Y (LCD_HEIGHT-4*NUM_BOX_HEIGHT)/2 +/* These parameters define the piece image dimensions, Stride is the total width + * of the bitmap. + */ +#define STRIDE BMPWIDTH_superdom_boarditems +#define ICON_HEIGHT (BMPHEIGHT_superdom_boarditems/6) +#define ICON_WIDTH (BMPWIDTH_superdom_boarditems/2) #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ (CONFIG_KEYPAD == IPOD_1G2G_PAD) @@ -155,7 +139,7 @@ char buf[255]; #define SUPERDOM_RIGHT BUTTON_RIGHT #define SUPERDOM_CANCEL BUTTON_BACK -#elif CONFIG_KEYPAD == ONDAVX747_PAD +#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || (CONFIG_KEYPAD == MROBE500_PAD) #define SUPERDOM_CANCEL BUTTON_POWER #endif