From e0d0eedc905679e941f35b0a03fd593a8aee9b15 Mon Sep 17 00:00:00 2001
From: Bertrik Sikken <bertrik@sikken.nl>
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 +++++++-
 .../bitmaps/native/pegbox_header.96x32x16.bmp    | Bin 0 -> 9270 bytes
 .../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
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp b/apps/plugins/bitmaps/native/pegbox_pieces.8x8x16.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..ca80fb8a43c2aafe4f5f29dca9ebd68ebd4e751c
GIT binary patch
literal 1398
zcmZ?rEn{T>12Z700mK|YYyrfK3=%++fx!VNFT@SOU;!ZU9}NEe|G!}M#)Yfb0U2mO
z!ope1)DbQSQIJ^KB4O?%YHpuc-U^fgX<xfR+`>cL#97?j34~0Y#VuWdW-eH@LB>5w
zx3EvIdL|I*7WK)vM=n^k7Gh3ZS!4C?>(zU1#1+>=%z<0vRW;e8q8rZr_Ydl{RhxFL
z-n1Pe4ir3k^e7t}8_YK#8ps6-3JVJ&3qsgf1u>OTA|fEbi>VzbxOwwtOmUzf&?Bd>
zU6XQhVz;$rcXR|YfLx&9sVi3)%*}aAN?6U!S&fZ(Gcy@1EP#T#iSc|{SqxlUJoWYb
zZEZ}VqTI>JKtXm}J0?|C{*Dg*#ft?NFXo><ok>!X-PMuJ){a$OU3kL=VPKd5(c!~P
zva&#N?Z|NM2@_atY>d8rGx_s}*UgQ)rba6|^615j0_Ein>(?`=sxs*6nk`%?P+bia
z1Ul*HnKL%iXC$3IlXCd5?erN(&!30H!owR^^PNqs1(>V_nSl%-7byPl#uZ%_26Hhk
zUs)a?vK8l2U|;|WX1STBXb2h!bLMJ^0#Sqlzl|7Ij+?2qBxi$xSb!Y=8b?JS>M)k{
zl;Lra=Cl^$nqwuNpeArGKnaKz+e$?%^Epd%McL`CcTrFg6-Y5t1)?Bz$wXy=7(2bo
zCytgVu-)#-xzUmeM0a{}vJ{wrf<PyoJAQn2yvLc&d>~qw<Z<@cafth`TzTx~(IYBd
zEGAvz=FxZM$|ImSP*6gmSX+CYy81L_<t`na_2S~iKtUImR-mAP!BGW;W*M16L&M{G
zdK-X(GV)m(8dFqNr%6fWNJu28s!rF?m?p27C#R4vC6y;Go*^t8DkS75E}khRm8+ms
zWMfyJn0UXb>7l3RL`}`^wzfwpDG%)&%TAoQZeTEV&z|@3@e?g9+7BLlZ(uO%`0?vN
zCmlU{E+Tw+b>;Pnvg?uI%Yj^o`)@tEl-=)So6Q15Kn9Qt6u<rCvV93#=2r2F({exr
zWZ0Ln-F|#IuEk8xliMJWOUH*($D7kIh}$HBH@VByDud6XMj)V5wBfo^^Bra52;Rh1
z64se~cIkW_k5rXx+1u}_<!@K8Oy%x;s^*Z%7g1?2=cQZwDQmYvX>Bj&MK7b~z4QVK
zo;-gfVXpk0U%TAWWlL7rUH`TvVZJ<25a^^!SI_lsiJg4eckPn`AOpw+3Q9<bNl8g5
zDJm<-sR9v@0pv<ZNSK+K+1c6IqXH8X6QH=IrKJ@rFf=qILmXs=H3|ZnV{Bq#XK80=
Wg@i2a%#6+A<0B_d>_tO~iLn5qN($8g

literal 0
HcmV?d00001

diff --git a/apps/plugins/bitmaps/native/star_tiles.6x6.bmp b/apps/plugins/bitmaps/native/star_tiles.6x6.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..da047d87fb037ebc66517474208a87cf32a17152
GIT binary patch
literal 654
zcmZ?r?PFp912Z700mN)TEC<Al3=%++fgu7YFU$?WU;!Wj6tWWFm~N}JA<#BPTaks4
zk%2*-jiFIr_E@~<yVkthl_}vGKtrs!7;1E+55&4ZZOpz>nlR1Th=D<mogqYwbCRvj
zx?qRJe%8f0vJ4E8EDUPw4DNz#@e0CWvI43cK=YUx8KfB)^w}8<*g*_tnB9kWGnkn$
z7#lGh*a;J2Si6kj|924Duo5E1%*=5A8pHo@Aaw641CYzW&``zj=qAJ8&kX;*Fg&@<
zP+tYterOlNL4;utVS9T9Yb%%vX$4_Z8)aKtB?o&|S2ryKLn#IZ6>V9!V8f6Y)7V6d
zq!b%xXJFvTC`nqm=y-)0MkJUerdl~VsWUJLNs8;4Y1(_}`9&GWB%3=rt1&R}ii*l>
zsv22oyZ9Ic$D7(ZsW32b@$(5th)c>#tLw-aStu!Mh{0@U5a5S1ks17a42?Aq0d{s|
z31l`G7XuFuTmYyA4mda%1O?zc2!n}<0Th=LCiHi8b~H6MR8*7~6y#@RWil{yc6Ky2
zHda(r6ciL>WMrhKrZ6z{_4c&1wA9qpl$4a@<m6;!0@Y2LII*LnqoDz)7o;>lKaYW7
o>g372y}b~nrKP1M#YI4|DN`m*n%L9b)!f`vQ&U}5TEf5p01#$|CIA2c

literal 0
HcmV?d00001

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