[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src skin.cpp,1.4,1.5 skin.h,1.4,1.5
Chris Apers
chrilith at users.sourceforge.net
Sun Sep 12 05:52:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv440
Modified Files:
skin.cpp skin.h
Log Message:
16bit skin support + Palm API only redraw (=skins can now be compressed) + cleanup
Index: skin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/skin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- skin.cpp 20 Jan 2004 14:22:42 -0000 1.4
+++ skin.cpp 12 Sep 2004 12:50:52 -0000 1.5
@@ -22,6 +22,7 @@
#include <PalmOS.h>
#include <PalmOSGlue.h>
+#include <SonyClie.h>
#include "start.h"
#include "games.h"
@@ -30,8 +31,45 @@
#include "StarterRsc.h"
UInt16 lastIndex = dmMaxRecordIndex; // last select index in the list to prevent flash
+static WinHandle winLockH = NULL;
-static void SknGetListColors(DmOpenRef skinDBP, DmResID resID, UInt8 *text, UInt8 *selected, UInt8 *background) {
+MemPtr SknScreenLock(WinLockInitType initMode) {
+ if (!OPTIONS_TST(kOptDeviceZodiac)) {
+ WinSetDrawWindow(WinGetDisplayWindow());
+ // WARNING : this doesn't work on < OS5 with 16bit mode
+ return WinScreenLock(initMode);
+ }
+
+ Err e;
+ RectangleType r;
+
+ WinGetBounds(WinGetDisplayWindow(), &r);
+ winLockH = WinCreateOffscreenWindow(r.extent.x, r.extent.y, nativeFormat, &e);
+ WinSetDrawWindow(winLockH);
+
+ if (initMode == winLockCopy)
+ WinCopyRectangle(WinGetDisplayWindow(), winLockH, &r, 0, 0, winPaint);
+
+ return BmpGetBits(WinGetBitmap(winLockH));
+}
+
+void SknScreenUnlock() {
+ if (!OPTIONS_TST(kOptDeviceZodiac)) {
+ WinSetDrawWindow(WinGetDisplayWindow());
+ WinScreenUnlock();
+ return;
+ }
+
+ RectangleType r;
+
+ WinGetBounds(winLockH, &r);
+ WinCopyRectangle(winLockH, WinGetDisplayWindow(), &r, 0, 0, winPaint);
+ WinSetDrawWindow(WinGetDisplayWindow());
+ WinDeleteWindow(winLockH, false);
+ winLockH = NULL;
+}
+
+static void SknGetListColors(DmOpenRef skinDBP, UInt8 *text, UInt8 *selected, UInt8 *background) {
UInt16 colIndex;
MemHandle colH;
UInt8 *colTemp;
@@ -42,7 +80,7 @@
*background = UIColorGetTableEntryIndex (UIMenuSelectedFill);
if (skinDBP) {
- colIndex = DmFindResource (skinDBP, sknColorsRsc, resID, NULL);
+ colIndex = DmFindResource (skinDBP, sknColorsRsc, skinColors, NULL);
if (colIndex != (UInt16)-1) {
colH = DmGetResourceIndex(skinDBP, colIndex);
@@ -61,14 +99,13 @@
}
}
-static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType *srcRect, Coord destX, Coord destY, Boolean standard) {
+static void SknCopyBits(DmOpenRef skinDBP, DmResID bitmapID, const RectangleType *srcRect, Coord destX, Coord destY) {
MemHandle hTemp;
BitmapPtr bmpTemp;
UInt16 index;
- UInt8 *bmpData;
Coord cx, cy, cw, ch, bw, bh;
- UInt8 *dst, *src;
+ RectangleType copy, old;
if (skinDBP) {
// find the bitmap
@@ -92,20 +129,41 @@
cw = srcRect->extent.x;
ch = srcRect->extent.y;
}
-
- if (ch) {
- Coord picth = gVars->screenPitch;
- dst = (UInt8 *)BmpGetBits(WinGetBitmap(WinGetDisplayWindow()));
- dst+= destX + destY * picth;
- bmpData = (UInt8 *)BmpGetBits(bmpTemp);
- src = bmpData + cx + cy * bw;
+ if (ch) {
+ WinGetClip(&old);
+ if (gVars->HRrefNum != sysInvalidRefNum) {
+ copy.topLeft.x = destX;
+ copy.topLeft.y = destY;
+ copy.extent.x = cw;
+ copy.extent.y = ch;
- do {
- MemMove(dst, src, cw);
- dst += picth;
- src += bw;
- } while (--ch);
+ HRWinSetClip(gVars->HRrefNum, ©);
+ HRWinDrawBitmap(gVars->HRrefNum, bmpTemp, destX - cx, destY - cy);
+ } else {
+ Err e;
+ BitmapTypeV3 *bmp2P;
+
+ // create an uncompressed version of the bitmap
+ WinHandle win = WinCreateOffscreenWindow(bw, bh, screenFormat, &e);
+ WinHandle old = WinGetDrawWindow();
+ WinSetDrawWindow(win);
+ WinDrawBitmap(bmpTemp, 0, 0);
+ WinSetDrawWindow(old);
+
+ bmp2P = BmpCreateBitmapV3(WinGetBitmap(win), kDensityDouble, BmpGetBits(WinGetBitmap(win)), NULL);
+
+ copy.topLeft.x = destX / 2;
+ copy.topLeft.y = destY / 2;
+ copy.extent.x = cw / 2;
+ copy.extent.y = ch / 2;
+
+ WinSetClip(©);
+ WinDrawBitmap((BitmapPtr)bmp2P, (destX - cx) / 2, (destY - cy) / 2);
+ BmpDelete((BitmapPtr)bmp2P);
+ WinDeleteWindow(win, false);
+ }
+ WinSetClip(&old);
}
MemPtrUnlock(bmpTemp);
@@ -120,13 +178,12 @@
RectangleType r;
FormPtr frmP = FrmGetActiveForm();
- WinSetDrawWindow(WinGetDisplayWindow());
- WinScreenLock(winLockDontCare);
- //SknSetPalette();
- RctSetRectangle(&r,0,0,160,160);
- WinEraseRectangle(&r,0);
+ // draw skin
FrmDrawForm(frmP);
+ SknScreenLock(winLockCopy);
+ skinDBP = SknOpenSkin();
+
if (gPrefs->card.volRefNum != sysInvalidRefNum)
FrmShowObject(frmP, FrmGetObjectIndex (frmP, MainMSBitMap));
else
@@ -137,19 +194,18 @@
WinDrawLine (0, 14, 159, 14);
WinDrawLine (0, 13, 159, 13);
- skinDBP = SknOpenSkin();
SknGetObjectBounds(skinDBP, skinBackgroundImageTop, &r);
- SknCopyBits(skinDBP, skinBackgroundImageTop, 0, r.topLeft.x, r.topLeft.y, 0);
+ SknCopyBits(skinDBP, skinBackgroundImageTop, 0, r.topLeft.x, r.topLeft.y);
SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &r);
- SknCopyBits(skinDBP, skinBackgroundImageBottom, 0, r.topLeft.x, r.topLeft.y, 0);
-
+ SknCopyBits(skinDBP, skinBackgroundImageBottom, 0, r.topLeft.x, r.topLeft.y);
+
for (UInt16 resID = 1100; resID <= 7000; resID += 100) {
SknSetState(skinDBP, resID, sknStateNormal);
SknShowObject(skinDBP, resID);
}
SknCloseSkin(skinDBP);
- WinScreenUnlock();
+ SknScreenUnlock();
SknUpdateList();
gVars->skinSet = true; // for winDisplayChangedEvent redraw
@@ -237,6 +293,30 @@
return oldState;
}
+UInt8 SknGetDepth(DmOpenRef skinDBP) {
+ UInt16 index;
+ MemHandle hStr;
+ UInt8 *strTemp;
+ UInt8 depth = 8;
+
+ if (skinDBP) {
+ index = DmFindResource (skinDBP, sknDepthRsc, skinDepth, NULL);
+
+ if (index != (UInt16)-1) {
+ hStr = DmGetResourceIndex(skinDBP, index);
+
+ if (hStr) {
+ strTemp = (UInt8 *)MemHandleLock(hStr);
+ depth = *strTemp;
+ MemPtrUnlock(strTemp);
+ DmReleaseResource(hStr);
+ }
+ }
+ }
+
+ return depth;
+}
+
UInt8 SknGetState(DmOpenRef skinDBP, DmResID resID) {
UInt16 index;
@@ -267,7 +347,7 @@
RectangleType r;
UInt8 state = SknGetState(skinDBP, resID);
SknGetObjectBounds(skinDBP, resID, &r);
- SknCopyBits(skinDBP, resID + state, NULL, r.topLeft.x, r.topLeft.y, 0);
+ SknCopyBits(skinDBP, resID + state, NULL, r.topLeft.x, r.topLeft.y);
}
void SknGetListBounds(RectangleType *rAreaP, RectangleType *rArea2xP) {
@@ -352,35 +432,6 @@
}
}
-/*
-static void SknSetPalette() {
-
- UInt16 palIndex;
- ColorTableType *palTemp;
- MemHandle palH;
-
- DmOpenRef skinDBP = SknOpenSkin();
-
- if (skinDBP) {
- palIndex = DmFindResource (skinDBP, colorTableRsc, skinPalette, NULL);
-
- if (palIndex != 0xFFFF) {
- palH = DmGetResourceIndex(skinDBP, palIndex);
-
- if (palH) {
- palTemp = (ColorTableType *)MemHandleLock(palH);
- WinPalette(winPaletteSet, 0, 256, ColorTableEntries(palTemp));
- MemPtrUnlock(palTemp);
- DmReleaseResource(palH);
- }
- }
- }
-
- SknCloseSkin(skinDBP);
-
-}
-*/
-
void SknUpdateList() {
MemHandle record;
Int32 index, maxIndex, maxView;
@@ -391,9 +442,7 @@
UInt8 txtColor, norColor, selColor, bkgColor;
UInt16 x,y;
- // prevent flashing screen on Zodiac ?
- if (!OPTIONS_TST(kOptDeviceZodiac))
- WinScreenLock(winLockCopy);
+ SknScreenLock(winLockCopy);
SknGetListBounds(&rArea, &rArea2x);
skinDBP = SknOpenSkin();
@@ -407,7 +456,7 @@
y = rCopy.topLeft.y;
rCopy.topLeft.x -= rField.topLeft.x;
rCopy.topLeft.y -= rField.topLeft.y;
- SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y, 0);
+ SknCopyBits(skinDBP, skinBackgroundImageTop, &rCopy, x, y);
// copy bottom bg
SknGetObjectBounds(skinDBP, skinBackgroundImageBottom, &rField);
RctGetIntersection(&rArea2x, &rField, &rCopy);
@@ -415,7 +464,7 @@
y = rCopy.topLeft.y;
rCopy.topLeft.x -= rField.topLeft.x;
rCopy.topLeft.y -= rField.topLeft.y;
- SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y, 0);
+ SknCopyBits(skinDBP, skinBackgroundImageBottom, &rCopy, x, y);
FntSetFont(stdFont);
@@ -433,7 +482,7 @@
SknRedrawSlider(skinDBP, index, maxIndex, maxView);
SknRedrawTools(skinDBP);
- SknGetListColors(skinDBP, skinColors, &norColor, &selColor, &bkgColor);
+ SknGetListColors(skinDBP, &norColor, &selColor, &bkgColor);
SknCloseSkin(skinDBP);
@@ -475,9 +524,7 @@
RctSetRectangle(&rArea,0,0,160,160);
WinSetClip(&rArea);
-
- if (!OPTIONS_TST(kOptDeviceZodiac))
- WinScreenUnlock();
+ SknScreenUnlock();
}
UInt16 SknCheckClick(DmOpenRef skinDBP, Coord mx, Coord my) {
Index: skin.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/skin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- skin.h 6 Jan 2004 12:45:25 -0000 1.4
+++ skin.h 12 Sep 2004 12:50:52 -0000 1.5
@@ -39,6 +39,7 @@
#define sknPosRsc 'sPos'
#define sknColorsRsc 'sCol'
+#define sknDepthRsc 'sDep'
#define sknStateNormal 0
#define sknStateSelected 10
@@ -49,8 +50,9 @@
// skin elements
#define skinList 500
-#define skinColors 600
-#define skinPalette 610
+#define skinColors 600
+#define skinDepth 700
+
#define skinButtonNone 0
#define skinSliderUpArrow 2000
@@ -62,8 +64,8 @@
#define skinButtonGameDelete 4000
#define skinButtonGameStart 7000
-#define skinBackgroundImageTop 1000
-#define skinBackgroundImageBottom 1010
+#define skinBackgroundImageTop 1000
+#define skinBackgroundImageBottom 1010
///
@@ -117,6 +119,7 @@
UInt16 SknCheckClick(DmOpenRef skinDBP, Coord mx, Coord my);
void SknSelect(Coord x, Coord y);
Boolean SknProcessArrowAction(UInt16 button);
+UInt8 SknGetDepth(DmOpenRef skinDBP);
extern UInt16 lastIndex;
More information about the Scummvm-git-logs
mailing list