From fb3f7651fd68bf3b8c7e4dbd62dbb2b3505f929a Mon Sep 17 00:00:00 2001
From: Sebastian Leonhardt <sebastian.leonhardt@web.de>
Date: Tue, 12 Apr 2016 17:20:04 +0200
Subject: [PATCH] pacbox for small screens, up to 75x96

Change-Id: I6e9adf2f6923f4d0078a54e9857fc8eacef259a6
---
 apps/plugins/SUBDIRS                          |   3 +-
 apps/plugins/pacbox/pacbox.h                  |  23 +++++++++++
 apps/plugins/pacbox/pacbox_lcd.c              |  39 ++++++++++++++++++
 manual/plugins/images/ss-pacbox-128x96x16.png | Bin 0 -> 1631 bytes
 manual/plugins/images/ss-pacbox-96x96x16.png  | Bin 0 -> 1226 bytes
 manual/plugins/main.tex                       |   2 +-
 6 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 manual/plugins/images/ss-pacbox-128x96x16.png
 create mode 100644 manual/plugins/images/ss-pacbox-96x96x16.png

diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 07c435123c..055db43b48 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -65,7 +65,8 @@ zxbox
 #endif /* HAVE_LCD_BITMAP */
 
 /* For all big enough colour screens, iriver H1x0 and iAudio M5 */
-#if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 96\
+#if defined(HAVE_LCD_COLOR) && ( (LCD_HEIGHT >= 90 && LCD_WIDTH >=116) \
+                              || (LCD_HEIGHT >= 96 && LCD_WIDTH >=75) ) \
  || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5)
 pacbox
 #endif
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 77a107bec4..58838c7be3 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -123,6 +123,17 @@
 #define PACMAN_COIN     (BUTTON_SELECT | BUTTON_DOWN)
 #define PACMAN_MENU     BUTTON_HOME
 
+#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
+
+#define PACMAN_UP       BUTTON_UP
+#define PACMAN_DOWN     BUTTON_DOWN
+#define PACMAN_LEFT     BUTTON_LEFT
+#define PACMAN_RIGHT    BUTTON_RIGHT
+#define PACMAN_1UP      BUTTON_SELECT
+#define PACMAN_COIN_PRE BUTTON_SELECT
+#define PACMAN_COIN     (BUTTON_SELECT | BUTTON_DOWN)
+#define PACMAN_MENU     BUTTON_HOME
+
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 
 #if defined(IRIVER_H10_5GB)
@@ -418,6 +429,18 @@
 #define YOFS ((LCD_HEIGHT-288/2)/2)
 #endif
 
+#elif (LCD_WIDTH >= 116) && (LCD_HEIGHT >= 90)
+#define LCD_SCALE  40
+#define LCD_ROTATE 1
+#define XOFS  ((LCD_HEIGHT-224*2/5)/2)
+#define YOFS  ((LCD_WIDTH-288*2/5)/2)
+
+#elif (LCD_WIDTH >= 75) && (LCD_HEIGHT >= 96)
+#define LCD_SCALE  33
+#define LCD_ROTATE 0
+#define XOFS  ((LCD_HEIGHT-224/3)/2)
+#define YOFS  ((LCD_WIDTH-288/3)/2)
+
 #else
 #error "unsupported screen resolution"
 #endif
diff --git a/apps/plugins/pacbox/pacbox_lcd.c b/apps/plugins/pacbox/pacbox_lcd.c
index 6bb51a038d..bf4aa9f028 100644
--- a/apps/plugins/pacbox/pacbox_lcd.c
+++ b/apps/plugins/pacbox/pacbox_lcd.c
@@ -124,7 +124,46 @@ void blit_display(fb_data* lcd_framebuffer, unsigned char* vbuf)
             dst += XOFS*2;
             vbuf+=ScreenWidth;
         }
+#elif LCD_SCALE==40 && LCD_ROTATE==1
+        /* 0.4 scaling - rotated = 116x90 */
+        /* show 2 out of 5 pixels: 1st and 3rd anf 4th merged together */
+        next_dst=&lcd_framebuffer[XOFS*LCD_WIDTH+YOFS+ScreenHeight*2/5-1];
+        for (y=(ScreenHeight*2/5)-1;y >= 0; y--) {
+            dst = (next_dst--);
+            for (x=0;x<ScreenWidth*2/5;x++) {
+                *dst = palette[*(vbuf)] | palette[*(vbuf+ScreenWidth+1)];
+                /* every odd row number merge 2 source lines as one */
+                if (y & 1) *dst |= palette[*(vbuf+ScreenWidth*2)];
+                vbuf+=2;
+                dst+=LCD_WIDTH;
+
+                x++;
+                /* every odd column merge 2 colums together */
+                *dst = palette[*(vbuf)] |  palette[*(vbuf+1)] |palette[*(vbuf+ScreenWidth+2)];
+                if (y & 1) *dst |= palette[*(vbuf+ScreenWidth*2+1)];
+                vbuf+=3;
+                dst+=LCD_WIDTH;
+            }
+            vbuf+=ScreenWidth-1;
+            if (y & 1) vbuf+=ScreenWidth;
+        }
+#elif LCD_SCALE==33 && LCD_ROTATE==0
+        /* 1/3 scaling - display every third pixel - 75x96 */
+        (void)next_dst;
+        dst=&lcd_framebuffer[YOFS*LCD_WIDTH+XOFS];
+
+        for (y=0;y<ScreenHeight/3;y++) {
+            for (x=0;x<ScreenWidth/3;x++) {
+                *(dst++) = palette[*(vbuf)]
+                         | palette[*(vbuf+ScreenWidth+1)]
+                         | palette[*(vbuf+ScreenWidth*2+2)];
+                vbuf+=3;
+            }
+            dst += XOFS*2;
+            vbuf+=ScreenWidth*2+2;
+        }
 #endif
+
 #else  /* Greyscale LCDs */
 #if LCD_SCALE==50 && LCD_ROTATE==1
 #if LCD_PIXELFORMAT == VERTICAL_PACKING
diff --git a/manual/plugins/images/ss-pacbox-128x96x16.png b/manual/plugins/images/ss-pacbox-128x96x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..7940aea453149faad1f170a2dcd4c579a2fae4dd
GIT binary patch
literal 1631
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

literal 0
HcmV?d00001

diff --git a/manual/plugins/images/ss-pacbox-96x96x16.png b/manual/plugins/images/ss-pacbox-96x96x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..782f87eeee608df132166234a92fb9e5c1bc7280
GIT binary patch
literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq003YB003YJ0ssI2ZTjGE00009a7bBm000ie
z000ie0hKEb8vp<Vd`Uz>RCwC$T`_i~Fbq}lC^&|TDSV76QsgL8q{vaW*dj-vNReYu
zq~I7XD7J9o^}rY;Su$n@y*wVncqIEHTi?PaPf$ww@7|tlIL2Rv>%JILp)ap3&rnd}
z#>dS|fnra#3<^~MG-+*cnaTBV?%gUbR?=~TJjwb+zW*<H(_TGjUiJAXlc|t2Hq|J;
z_P$5tHzw92qVSMIwiE0iZOnZ-`7l@kfQq3Ls$0h5Dmqx-DF%=?RM?zYn0MWu$%*Xs
z+U#;XNU4h9<HUosp^<Ub2k&AHsf)F*?+dEKm={Ve*I-^gWs#}}Sv~nKw(L{XJ3lYa
z^B`pTlsOp>3cc53j|`B;^dg~@s%N46q#^Q?RZIw=hKW>pDLo}-^8s%R@YEijDlerc
zM`y#R!7$k6Q4rbBQ{|=f2*SkVL3{6F`{O}{MSZH_PxgCViw7MZbO<+!F}Qpjl~yM!
z$n*_Qf6=K%=G1}LXEXKdPBmiSNjwPO+W6-h`ftv<H|9a9{7&ZBnW?`b9z>m;YnQK!
z2c<M@RlY_Z^jIEr@Sr6Ef&n{4G?b#=Ttg<$VgiImCvdiT5G7?c*d?jxV01Q8ik9m{
z${!)~JFB&ld2p&qm&!cGxoKC*sLCKM$x|tAt6^6KAdTetR(AL8K?Up{JV-PjM4k8J
zgIfPFEn_d_z$83PM*_qM2aH<U%MFY&?UKlC2@j&O!O8XZb^SiMu8+!FkbAmaS2RKL
z6k~eVojoZ2CvJ@Xy8fY~nCs5nC&0_cZ~`~}V(}Rr_Z!8e?xgv?z~{vu|6fgGbnu|7
z(Wi{v1}c{J^~-f<e`3rPG%1WW00<xESD#x^(FsRnCWMg>5?Dx%w=~DXU%7c*gh}M<
z7vMqooK|f;RD>UGGu2R{b{bQSV>Z8M9#n(el?UwxpnH;S25HD!A5<Mc)W%@YVYHU9
z-aa336()^omDKv6?ejs5zK|Kk_P66uyo>FKj#so!I%Sc%-shgzN$-18@4<rz1c$Uv
zdNt~;Zpj3R-9GiMlg4{EZ(Vim>!g=y$X5Hs7JjwaI%)QLWzK%Fv4^qG9PG800k2w8
z-;z1@-d;a)NG$38JyX$%4QS_m7Wj(+==~A#?xl$yQq7+kH<`4-H$Sg*(_9N+{n7lk
z8Nea*C~oSlISuBblUB4LoORM9LZPu=3;>|9elRj87y#hA9{>!%0N_s6viOu3AE)w{
z0{g`rfQycTb~y<%k-Uujelh=T^bV_4J|*@BDt6vSX}=hW@3=8(S3Msj{^|(v0m6*{
z0PynubE29L(&IHsd@2T|ZI1n7ss1%W%6*P}&~0y0%m+~i3m+y{_lvQgqb=(P0DHRn
zv~fO2kk@Do-s<_F6tQNDR6d9iD|9_bDY})H-3-z-PlI<5#g6v}Z6*f~5)jFK^LHtA
zy>Pp*VA36&|Em#bd)r)HX{+AX0R7)H0NA%L^(Z#MC4au79tXMTJj5XF^ZDlO%jk_k
otG#UA=_<tNr-nyh#=wM^f3Sm|U$skxLjV8(07*qoM6N<$g5J?k)&Kwi

literal 0
HcmV?d00001

diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 60dce0457c..83a37eda9a 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -68,7 +68,7 @@ text files%
 
 \opt{archosplayer}{\input{plugins/nim.tex}}
 
-\opt{iriverh100,iaudiom5,lcd_color}{\nopt{c200,c200v2,clipzip,samsungyh820}{\input{plugins/pacbox.tex}}}
+\opt{iriverh100,iaudiom5,lcd_color}{\nopt{c200,c200v2}{\input{plugins/pacbox.tex}}}
 
 \opt{lcd_bitmap}{\input{plugins/pegbox.tex}}