ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix UI rendering in VGA devices. use last saved screen orientation 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1309 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
knakos 2007-01-27 10:48:57 +00:00
parent afcaca1c60
commit 33d4d57a02
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
stella/src/wince/FrameBufferWinCE.cpp
View File

@ -14,7 +14,7 @@
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// Windows CE Port by Kostas Nakos // Windows CE Port by Kostas Nakos
// $Id: FrameBufferWinCE.cpp,v 1.12 2007-01-23 09:40:57 knakos Exp $ // $Id: FrameBufferWinCE.cpp,v 1.13 2007-01-27 10:48:57 knakos Exp $
//============================================================================ //============================================================================
#include <windows.h> #include <windows.h>
@ -27,9 +27,11 @@
FrameBufferWinCE::FrameBufferWinCE(OSystem *osystem) FrameBufferWinCE::FrameBufferWinCE(OSystem *osystem)
: FrameBuffer(osystem), myDstScreen(NULL), SubsystemInited(false), displacement(0), : FrameBuffer(osystem), myDstScreen(NULL), SubsystemInited(false), displacement(0),
issmartphone(true), islandscape(false), displaymode(0), legacygapi(true), devres(SM_LOW), screenlocked(false) issmartphone(true), islandscape(false), legacygapi(true), devres(SM_LOW), screenlocked(false)
{ {
gxdp.cxWidth = gxdp.cyHeight = gxdp.cbxPitch = gxdp.cbyPitch = gxdp.cBPP = gxdp.ffFormat = 0; gxdp.cxWidth = gxdp.cyHeight = gxdp.cbxPitch = gxdp.cbyPitch = gxdp.cBPP = gxdp.ffFormat = 0;
displaymode = myOSystem->settings().getInt("wince_orientation");
if (displaymode > 2) displaymode = 0;
} }
FrameBufferWinCE::~FrameBufferWinCE() FrameBufferWinCE::~FrameBufferWinCE()
@ -213,6 +215,7 @@ uInt8 FrameBufferWinCE::rotatedisplay(void)
} }
setmode(displaymode); setmode(displaymode);
wipescreen(); wipescreen();
myOSystem->settings().setInt("wince_orientation", displaymode);
return displaymode; return displaymode;
} }
@ -326,7 +329,7 @@ void FrameBufferWinCE::preFrameUpdate()
void FrameBufferWinCE::drawMediaSource() void FrameBufferWinCE::drawMediaSource()
{ {
static uInt8 *sc, *sp, *sc_n, *sp_n; static uInt8 *sc, *sp, *sc_n, *sp_n;
static uInt8 *d, *pl, *p, *nl; static uInt8 *d, *pl, *nl;
static uInt16 pix1, pix2, pix3, x, y; static uInt16 pix1, pix2, pix3, x, y;
uInt32 pix1d, pix2d, pix3d; uInt32 pix1d, pix2d, pix3d;
@ -343,9 +346,8 @@ void FrameBufferWinCE::drawMediaSource()
if (theRedrawTIAIndicator) if (theRedrawTIAIndicator)
{ {
p = sp; memset(sp, 0, myWidth*myHeight-1);
for (uInt16 y=0; y<myHeight; y++) memset(myDstScreen, 0, scrwidth*scrheight*2);
for (uInt16 x=0; x<myWidth; x += 4, *p = *p + 1, p += 4);
theRedrawTIAIndicator = false; theRedrawTIAIndicator = false;
} }
@ -694,9 +696,9 @@ void FrameBufferWinCE::drawChar(const GUI::Font* myfont, uInt8 c, uInt32 x, uInt
else else
{ {
if (displaymode != 2) if (displaymode != 2)
d = myDstScreen + ((scrheight>>1)-x-1) * (scrlinestep<<1) + (y-1) * (scrpixelstep << 1); d = myDstScreen + ((scrheight>>1)-x-1) * (scrlinestep<<1) + y * (scrpixelstep << 1);
else else
d = myDstScreen + x * (scrlinestep<<1) + ((scrwidth>>1)-y-1) * (scrpixelstep<<1); d = myDstScreen + x * (scrlinestep<<1) + ((scrwidth>>1)-y) * (scrpixelstep<<1);
} }
uInt16 col = pal[color]; uInt16 col = pal[color];
@ -763,13 +765,13 @@ void FrameBufferWinCE::hLine(uInt32 x, uInt32 y, uInt32 x2, int color)
else else
if (displaymode != 2) if (displaymode != 2)
{ {
PlotvLine((y<<1), ((scrheight>>1)-x)<<1, ((scrheight>>1)-x2-1)<<1, color); PlotvLine((y<<1), (((scrheight>>1)-x)<<1)-1, (((scrheight>>1)-x2)<<1)-1, color);
PlotvLine((y<<1)+1, ((scrheight>>1)-x)<<1, ((scrheight>>1)-x2-1)<<1, color); PlotvLine((y<<1)+1, (((scrheight>>1)-x)<<1)-1, (((scrheight>>1)-x2)<<1)-1, color);
} }
else else
{ {
PlotvLine(((scrwidth>>1)-y-1)<<1, x<<1, (x2+1)<<1, color); PlotvLine(((scrwidth>>1)-y)<<1, x<<1, x2<<1, color);
PlotvLine((((scrwidth>>1)-y-1)<<1)+1, x<<1, (x2+1)<<1, color); PlotvLine((((scrwidth>>1)-y)<<1)+1, x<<1, x2<<1, color);
} }
} }
@ -794,8 +796,8 @@ void FrameBufferWinCE::vLine(uInt32 x, uInt32 y, uInt32 y2, int color)
else else
if (displaymode != 2) if (displaymode != 2)
{ {
PlothLine(y<<1, ((scrheight>>1)-x-1)<<1, y2<<1, color); PlothLine(y<<1, (((scrheight>>1)-x)<<1)-2, y2<<1, color);
PlothLine(y<<1, (((scrheight>>1)-x-1)<<1)+1, y2<<1, color); PlothLine(y<<1, (((scrheight>>1)-x)<<1)-1, y2<<1, color);
} }
else else
{ {
@ -835,9 +837,9 @@ void FrameBufferWinCE::fillRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h, int colo
if ((int)x>(scrheight>>1)) return; if ((int)y>(scrwidth>>1)) return; if ((int)x>(scrheight>>1)) return; if ((int)y>(scrwidth>>1)) return;
if ((int)(x+w)>(scrheight>>1)) w=(scrheight>>1)-x; if ((int)(y+h)>(scrwidth>>1)) h=(scrwidth>>1)-y; if ((int)(x+w)>(scrheight>>1)) w=(scrheight>>1)-x; if ((int)(y+h)>(scrwidth>>1)) h=(scrwidth>>1)-y;
if (displaymode != 2) if (displaymode != 2)
PlotfillRect(y<<1, ((scrheight>>1)-x-w)<<1, (h-1)<<1, (w-1)<<1, color); PlotfillRect(y<<1, (((scrheight>>1)-x-w+1)<<1)-2, h<<1, w<<1, color);
else else
PlotfillRect(((scrwidth>>1)-y-h)<<1, x<<1, (h-1)<<1, (w-1)<<1, color); PlotfillRect(((scrwidth>>1)-y-h+1)<<1, x<<1, h<<1, w<<1, color);
} }
} }
@ -871,7 +873,7 @@ void FrameBufferWinCE::drawBitmap(uInt32* bitmap, Int32 x, Int32 y, int color, I
if (displaymode != 2) if (displaymode != 2)
d = myDstScreen + ((scrheight>>1)-x-1) * (scrlinestep<<1) + y * (scrpixelstep<<1); d = myDstScreen + ((scrheight>>1)-x-1) * (scrlinestep<<1) + y * (scrpixelstep<<1);
else else
d = myDstScreen + x * (scrlinestep<<1) + ((scrwidth>>1)-y-1) * (scrpixelstep<<1); d = myDstScreen + x * (scrlinestep<<1) + ((scrwidth>>1)-y) * (scrpixelstep<<1);
col = pal[color]; col = pal[color];
cold = paldouble[color]; cold = paldouble[color];
@ -933,7 +935,7 @@ void FrameBufferWinCE::translateCoords(Int32* x, Int32* y)
{ {
if (!issmartphone) if (!issmartphone)
{ {
if ((displaymode == 1) || (displaymode==0 && myOSystem->eventHandler().state() != 1)) if ((displaymode == 1) || (displaymode==0 && myOSystem->eventHandler().state() != EventHandler::S_EMULATE))
{ {
Int32 x2 = *x; Int32 x2 = *x;
*x = scrheight - *y; *x = scrheight - *y;
@ -958,14 +960,11 @@ void FrameBufferWinCE::addDirtyRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h)
{ {
static bool initflag = false; static bool initflag = false;
if (myOSystem->eventHandler().state() == 3) if (myOSystem->eventHandler().state() == EventHandler::S_MENU)
initflag = true; initflag = true;
if (myOSystem->eventHandler().state()==1 && initflag) if (myOSystem->eventHandler().state() == EventHandler::S_EMULATE && initflag)
{ theRedrawTIAIndicator = true; // TODO: optimize here
// TODO: optimize here
theRedrawTIAIndicator = true;
}
return; return;
} }