From e0d0eedc905679e941f35b0a03fd593a8aee9b15 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sun, 13 Nov 2011 21:25:27 +0000 Subject: [PATCH] Sansa clip zip: update plugins (jewels, pegbox, rockpaint, star) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30976 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bitmaps/native/SOURCES | 8 +++++++- apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp | Bin 0 -> 9270 bytes apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp | Bin 0 -> 1398 bytes apps/plugins/bitmaps/native/star_tiles.6x6.bmp | Bin 0 -> 654 bytes apps/plugins/pegbox.c | 8 ++++++++ apps/plugins/rockpaint.c | 11 +++++++++++ 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp create mode 100644 apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp create mode 100644 apps/plugins/bitmaps/native/star_tiles.6x6.bmp diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 65b1a3828e..8eaf623fda 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -386,7 +386,8 @@ jewels.112x64x1.bmp jewels.128x128x16.bmp #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160) jewels.128x128x16.bmp -#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) +#elif ((LCD_WIDTH == 132) && (LCD_HEIGHT == 80)) || \ + ((LCD_WIDTH == 96) && (LCD_HEIGHT == 96)) jewels.132x80x16.bmp #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) jewels.128x96x2.bmp @@ -453,6 +454,9 @@ pegbox_header.22x80x16.bmp #elif LCD_WIDTH >= 128 pegbox_pieces.10x10x16.bmp pegbox_header.128x42x16.bmp +#elif LCD_WIDTH >= 96 +pegbox_pieces.8x8x16.bmp +pegbox_header.96x32x16.bmp #endif /* different colour displays */ #elif LCD_DEPTH > 1 #if LCD_WIDTH >= 160 @@ -692,6 +696,8 @@ star_tiles.11x11.bmp star_tiles.10x10.bmp #elif (STAR_TILESIZE >= 8) star_tiles.8x8.bmp +#elif (STAR_TILESIZE >= 6) +star_tiles.6x6.bmp #endif #elif LCD_DEPTH > 1 /* grey */ #if LCD_WIDTH >= 160 && LCD_HEIGHT >= 98 diff --git a/apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp b/apps/plugins/bitmaps/native/pegbox_header.96x32x16.bmp new file mode 100644 index 0000000000000000000000000000000000000000..d83494b679bb44456af5fbbfc4390139b7fd7e72 GIT binary patch literal 9270 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 literal 0 HcwPel00001 diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 635335a91c..babe653e93 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c @@ -638,6 +638,10 @@ CONFIG_KEYPAD == MROBE500_PAD #define LEVEL_TEXT_X 25 #define PEGS_TEXT_X 90 #define TEXT_Y 0 +#elif LCD_WIDTH >= 96 +#define LEVEL_TEXT_X 25 +#define PEGS_TEXT_X 86 +#define TEXT_Y 22 #endif /* LCD_WIDTH */ #endif /* WIDE_LAYOUT */ @@ -843,7 +847,11 @@ static void pegbox_draw_board(struct game_context* pb) #ifdef HAVE_LCD_COLOR rb->lcd_set_foreground(LCD_WHITE); +#if ((BOARD_HEIGHT + HEADER_HEIGHT + 2) <= LCD_HEIGHT) rb->lcd_fillrect(BOARD_X-1,BOARD_Y-1,BOARD_WIDTH+2,BOARD_HEIGHT+2); +#else + rb->lcd_fillrect(BOARD_X,BOARD_Y,BOARD_WIDTH,BOARD_HEIGHT); +#endif rb->lcd_set_foreground(LCD_BLACK); rb->lcd_set_background(TEXT_BG); #endif diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index ac9f5dab5e..9ec289fce4 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -221,6 +221,17 @@ #define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_RIGHT BUTTON_RIGHT +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define ROCKPAINT_QUIT BUTTON_POWER +#define ROCKPAINT_DRAW BUTTON_SELECT +#define ROCKPAINT_MENU BUTTON_HOME +#define ROCKPAINT_TOOLBAR BUTTON_VOL_UP +#define ROCKPAINT_TOOLBAR2 BUTTON_VOL_DOWN +#define ROCKPAINT_UP BUTTON_UP +#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_LEFT BUTTON_LEFT +#define ROCKPAINT_RIGHT BUTTON_RIGHT + #else #error "Please define keys for this keypad" #endif -- 2.11.4.GIT