X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=platform%2Fsdlv.cpp;h=513a93eee630fdcc215dc79295ceb78093c71382;hb=ddb501ac9ad7510c09b4c0f6986ec6dd68bb3458;hp=586e828cf03c8bbe2e841f1be96710dd9345f885;hpb=2d01df51d7a3fd4158f8c73724745738bc2fed9c;p=drnoksnes

diff --git a/platform/sdlv.cpp b/platform/sdlv.cpp
index 586e828..513a93e 100644
--- a/platform/sdlv.cpp
+++ b/platform/sdlv.cpp
@@ -5,15 +5,13 @@
 #include <SDL.h>
 #include <SDL_syswm.h>
 
-#if CONF_XSP
-#	include <X11/extensions/Xsp.h>
-#endif
-
 #include "snes9x.h"
 #include "platform.h"
 #include "display.h"
 #include "gfx.h"
 #include "ppu.h"
+#include "sdlv.h"
+#include "scaler.h"
 
 #define DIE(format, ...) do { \
 		fprintf(stderr, "Died at %s:%d: ", __FILE__, __LINE__ ); \
@@ -23,533 +21,14 @@
 
 struct gui GUI;
 
-static SDL_Surface* screen;
+SDL_Surface* screen;
 
 static SDL_Rect windowSize, screenSize;
 static bool gotWindowSize, gotScreenSize;
 
-class Scaler;
 /** The current scaler object */
 static Scaler* scaler;
 
-static void centerRectangle(SDL_Rect& result, int areaW, int areaH, int w, int h)
-{
-	result.x = areaW / 2 - w / 2;
-	result.w = w;
-	result.y = areaH / 2 - h / 2;
-	result.h = h;
-}
-
-class Scaler
-{
-public:
-	Scaler() { };
-	virtual ~Scaler() { };
-
-	virtual const char * getName() const = 0;
-
-	virtual uint8* getDrawBuffer() const = 0;
-	virtual unsigned int getDrawBufferPitch() const = 0;
-	virtual void getRenderedGUIArea(unsigned short & x, unsigned short & y,
-									unsigned short & w, unsigned short & h)
-									const = 0;
-	virtual int getRatio() const = 0;
-	virtual void prepare() = 0;
-	virtual void finish() = 0;
-	virtual void pause() = 0;
-	virtual void resume() = 0;
-};
-
-class ScalerFactory
-{
-public:
-	ScalerFactory() { };
-	virtual ~ScalerFactory() { };
-	virtual const char * getName() const = 0;
-	virtual bool canEnable(int bpp, int w, int h) const = 0;
-	virtual Scaler* instantiate(SDL_Surface* screen, int w, int h) const = 0;
-};
-
-class DummyScaler : public Scaler
-{
-	SDL_Surface * m_screen;
-	SDL_Rect m_area;
-
-	DummyScaler(SDL_Surface* screen, int w, int h)
-	: m_screen(screen)
-	{
-		centerRectangle(m_area, GUI.Width, GUI.Height, w, h);
-	}
-public:
-
-	~DummyScaler()
-	{
-	};
-
-	class Factory : public ScalerFactory
-	{
-		const char * getName() const
-		{
-			return "none";
-		}
-
-		bool canEnable(int bpp, int w, int h) const
-		{
-			return true;
-		}
-
-		Scaler* instantiate(SDL_Surface* screen, int w, int h) const
-		{
-			return new DummyScaler(screen, w, h);
-		}
-	};
-
-	static const Factory factory;
-
-	const char * getName() const
-	{
-		return "no scaling";
-	}
-
-	uint8* getDrawBuffer() const
-	{
-		const int Bpp = screen->format->BitsPerPixel / 8;
-		const int pitch = screen->pitch;
-		return ((uint8*) screen->pixels)
-			+ (m_area.x * Bpp)
-			+ (m_area.y * pitch);
-	};
-
-	unsigned int getDrawBufferPitch() const
-	{
-		return screen->pitch;
-	};
-
-	void getRenderedGUIArea(unsigned short & x, unsigned short & y,
-							unsigned short & w, unsigned short & h) const
-	{
-		x = m_area.x; y = m_area.y; w = m_area.w; h = m_area.h;
-	};
-
-	int getRatio() const
-	{
-		return 1;
-	};
-
-	void prepare() { };
-
-	void finish()
-	{
-		SDL_UpdateRects(m_screen, 1, &m_area);
-	};
-
-	void pause() { };
-	void resume() { };
-};
-const DummyScaler::Factory DummyScaler::factory;
-
-#ifdef __arm__
-class ARMScaler : public Scaler
-{
-	SDL_Surface * m_screen;
-	SDL_Rect m_area;
-	uint8 * m_surface;
-	const int m_w, m_h, m_Bpp;
-
-	ARMScaler(SDL_Surface* screen, int w, int h)
-	: m_screen(screen), m_w(w), m_h(h),
-	 m_Bpp(m_screen->format->BitsPerPixel / 8)
-	{
-		centerRectangle(m_area, GUI.Width, GUI.Height, w * 2, h * 2);
-		m_surface = reinterpret_cast<uint8*>(malloc(w * h * m_Bpp));
-	}
-public:
-	~ARMScaler()
-	{
-		free(m_surface);
-	};
-
-	class Factory : public ScalerFactory
-	{
-		const char * getName() const
-		{
-			return "2x";
-		}
-
-		bool canEnable(int bpp, int w, int h) const
-		{
-			return bpp == 16 && w * 2 < GUI.Width && h * 2 < GUI.Height &&
-				w % 16 == 0 /* asm assumes w div by 16 */;
-		}
-
-		Scaler* instantiate(SDL_Surface* screen, int w, int h) const
-		{
-			return new ARMScaler(screen, w, h);
-		}
-	};
-
-	static const Factory factory;
-
-	const char * getName() const
-	{
-		return "software ARM 2x scaling";
-	}
-
-	uint8* getDrawBuffer() const
-	{
-		return m_surface;
-	};
-
-	unsigned int getDrawBufferPitch() const
-	{
-		return m_w * m_Bpp;
-	};
-
-	void getRenderedGUIArea(unsigned short & x, unsigned short & y,
-							unsigned short & w, unsigned short & h) const
-	{
-		x = m_area.x; y = m_area.y; w = m_area.w; h = m_area.h;
-	};
-
-	int getRatio() const
-	{
-		return 2;
-	};
-
-	void prepare() { };
-
-	void finish()
-	{
-		uint16 * src = reinterpret_cast<uint16*>(m_surface);
-		uint16 * dst = reinterpret_cast<uint16*>(
-			((uint8*) m_screen->pixels)
-			+ (m_area.x * m_Bpp)
-			+ (m_area.y * m_screen->pitch));
-		const int src_pitch = m_w;
-		const int dst_pitch = m_screen->pitch / m_Bpp;
-		int y;
-
-		for (y = 0; y < m_h*2; y++) {
-			asm volatile
-			(
-				"mov r0, %0; mov r1, %1; mov r2, %2;"
-				"stmdb r13!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,r14};"
-				"1:	ldmia r1!,{r3,r4,r5,r6,r7,r8,r9,r10};"
-				"mov r14,r5,lsr #16;"
-				"mov r12,r5,lsl #16;"
-				"orr r14,r14,r14,lsl #16;"
-				"orr r12,r12,r12,lsr #16;"
-				"mov r11,r4,lsr #16;"
-				"mov r5,r4,lsl #16;"
-				"orr r11,r11,r11,lsl #16;"
-				"orr r5,r5,r5,lsr #16;"
-				"mov r4,r3,lsr #16;"
-				"mov r3,r3,lsl #16;"
-				"orr r4,r4,r4,lsl #16;"
-				"orr r3,r3,r3,lsr #16;"
-				"stmia r0!,{r3,r4,r5,r11,r12,r14};"
-				"mov r3,r6,lsl #16;"
-				"mov r4,r6,lsr #16;"
-				"orr r3,r3,r3,lsr #16;"
-				"orr r4,r4,r4,lsl #16;"
-				"mov r5,r7,lsl #16;"
-				"mov r6,r7,lsr #16;"
-				"orr r5,r5,r5,lsr #16;"
-				"orr r6,r6,r6,lsl #16;"
-				"mov r7,r8,lsl #16;"
-				"mov r8,r8,lsr #16;"
-				"orr r7,r7,r7,lsr #16;"
-				"orr r8,r8,r8,lsl #16;"
-				"mov r12,r10,lsr #16;"
-				"mov r11,r10,lsl #16;"
-				"orr r12,r12,r12,lsl #16;"
-				"orr r11,r11,r11,lsr #16;"
-				"mov r10,r9,lsr #16;"
-				"mov r9,r9,lsl #16;"
-				"orr r10,r10,r10,lsl #16;"
-				"orr r9,r9,r9,lsr #16;"
-				"stmia r0!,{r3,r4,r5,r6,r7,r8,r9,r10,r11,r12};"
-				"subs r2,r2,#16;"
-				"bhi 1b;"
-				"ldmia r13!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,r14};"
-			:
-			: "r" (dst), "r" (src), "r" (m_w)
-			: "r0", "r1", "r2", "r3"
-			);
-			dst += dst_pitch;
-			if (y&1) src += src_pitch;
-		}
-
-		SDL_UpdateRects(m_screen, 1, &m_area);
-	};
-
-	void pause() { };
-	void resume() { };
-};
-const ARMScaler::Factory ARMScaler::factory;
-#endif
-
-class SWScaler : public Scaler
-{
-	SDL_Surface * m_screen;
-	SDL_Rect m_area;
-	uint8 * m_surface;
-	const int m_w, m_h, m_Bpp;
-
-	SWScaler(SDL_Surface* screen, int w, int h)
-	: m_screen(screen), m_w(w), m_h(h),
-	 m_Bpp(m_screen->format->BitsPerPixel / 8)
-	{
-		centerRectangle(m_area, GUI.Width, GUI.Height, w * 2, h * 2);
-		m_surface = reinterpret_cast<uint8*>(malloc(w * h * m_Bpp));
-	}
-public:
-	~SWScaler()
-	{
-		free(m_surface);
-	};
-
-	class Factory : public ScalerFactory
-	{
-		const char * getName() const
-		{
-			return "soft2x";
-		}
-
-		bool canEnable(int bpp, int w, int h) const
-		{
-			return w * 2 < GUI.Width && h * 2 < GUI.Height;
-		}
-
-		Scaler* instantiate(SDL_Surface* screen, int w, int h) const
-		{
-			return new SWScaler(screen, w, h);
-		}
-	};
-
-	static const Factory factory;
-
-	const char * getName() const
-	{
-		return "software 2x scaling";
-	}
-
-	uint8* getDrawBuffer() const
-	{
-		return m_surface;
-	};
-
-	unsigned int getDrawBufferPitch() const
-	{
-		return m_w * m_Bpp;
-	};
-
-	void getRenderedGUIArea(unsigned short & x, unsigned short & y,
-							unsigned short & w, unsigned short & h) const
-	{
-		x = m_area.x; y = m_area.y; w = m_area.w; h = m_area.h;
-	};
-
-	int getRatio() const
-	{
-		return 2;
-	};
-
-	void prepare() { };
-
-	void finish()
-	{
-		uint16 * src = reinterpret_cast<uint16*>(m_surface);
-		uint16 * dst = reinterpret_cast<uint16*>(
-			((uint8*) m_screen->pixels)
-			+ (m_area.x * m_Bpp)
-			+ (m_area.y * m_screen->pitch));
-		const int src_pitch = m_w;
-		const int dst_pitch = m_screen->pitch / m_Bpp;
-		int x, y;
-
-		for (y = 0; y < m_h*2; y++) {
-			for (x = 0; x < m_w*2; x+=2) {
-				dst[x] = src[x/2];
-				dst[x + 1] = src[x/2];
-			}
-			dst += dst_pitch;
-			if (y&1) src += src_pitch;
-		}
-
-		SDL_UpdateRects(m_screen, 1, &m_area);
-	};
-
-	void pause() { };
-	void resume() { };
-};
-const SWScaler::Factory SWScaler::factory;
-
-#if CONF_XSP
-class XSPScaler : public Scaler
-{
-	SDL_Surface* m_screen;
-	SDL_Rect m_area;
-	SDL_Rect m_real_area;
-	bool m_should_enable, m_enabled; // Try to avoid flicker.
-
-	static void setDoubling(bool enable)
-	{
-		SDL_SysWMinfo wminfo;
-		SDL_VERSION(&wminfo.version);
-		if ( SDL_GetWMInfo(&wminfo) ) {
-			Display *dpy = wminfo.info.x11.display;
-			XSPSetPixelDoubling(dpy, 0, enable ? 1 : 0);
-			XFlush(dpy);
-		}
-	}
-
-	XSPScaler(SDL_Surface* screen, int w, int h)
-	: m_screen(screen), m_should_enable(true), m_enabled(false)
-	{
-		centerRectangle(m_area, GUI.Width, GUI.Height,
-			w * 2, h * 2);
-
-		m_real_area.x = m_area.x;
-		m_real_area.y = m_area.y;
-		m_real_area.w = m_area.w / 2;
-		m_real_area.h = m_area.h / 2;
-	};
-public:
-	~XSPScaler()
-	{
-		if (m_enabled) setDoubling(false);
-	};
-
-	class Factory : public ScalerFactory
-	{
-		const char * getName() const
-		{
-			return "xsp";
-		}
-
-		bool canEnable(int bpp, int w, int h) const
-		{
-			return w * 2 < GUI.Width && h * 2 < GUI.Height;
-		};
-
-		Scaler* instantiate(SDL_Surface* screen, int w, int h) const
-		{
-			return new XSPScaler(screen, w, h);
-		}
-	};
-
-	static const Factory factory;
-
-	const char * getName() const
-	{
-		return "XSP pixel doubling";
-	}
-
-	uint8* getDrawBuffer() const
-	{
-		const int Bpp = screen->format->BitsPerPixel / 8;
-		const int pitch = screen->pitch;
-		return ((uint8*) screen->pixels)
-			+ (m_area.x * Bpp)
-			+ (m_area.y * pitch);
-	};
-
-	unsigned int getDrawBufferPitch() const
-	{
-		return screen->pitch;
-	};
-
-	void getRenderedGUIArea(unsigned short & x, unsigned short & y,
-							unsigned short & w, unsigned short & h) const
-	{
-		x = m_area.x; y = m_area.y; w = m_area.w; h = m_area.h;
-	};
-
-	int getRatio() const
-	{
-		return 2;
-	};
-
-	void prepare() 
-	{
-		if (m_should_enable && !m_enabled) {
-			setDoubling(true);
-			m_enabled = true;
-		}
-	};
-
-	void finish()
-	{
-		SDL_UpdateRects(m_screen, 1, &m_real_area);
-	};
-
-	void pause()
-	{
-		m_should_enable = false;
-		if (m_enabled) {
-			setDoubling(false);
-			m_enabled = false;
-		}
-	};
-
-	void resume()
-	{
-		m_should_enable = true; // Will enable later
-	};
-};
-const XSPScaler::Factory XSPScaler::factory;
-#endif
-
-static const ScalerFactory* scalers[] = {
-#if CONF_XSP
-	&XSPScaler::factory,
-#endif
-#ifdef __arm__
-	&ARMScaler::factory,
-#endif
-	&SWScaler::factory,
-	&DummyScaler::factory
-};
-
-static const ScalerFactory* searchForScaler(int bpp, int w, int h)
-{
-	const int n = sizeof(scalers) / sizeof(ScalerFactory*);
-	int i;
-
-	if (Config.scaler && strcasecmp(Config.scaler, "help") == 0 ) {
-		// List scalers
-		printf("Scalers list:\n");
-		for (i = 0; i < n; i++) {
-			printf(" %s\n", scalers[i]->getName());
-		}
-		DIE("End of scalers list");
-	} else if (Config.scaler && strcasecmp(Config.scaler, "auto") != 0 ) {
-		// We prefer a specific scaler
-		for (i = 0; i < n; i++) {
-			if (strcasecmp(scalers[i]->getName(), Config.scaler) == 0) {
-				if (scalers[i]->canEnable(bpp, w, h)) {
-					// Found the scaler selected by the user, and we can use it.
-					return scalers[i];
-				} else {
-					fprintf(stderr, "Selected scaler '%s' cannot be enabled\n",
-						Config.scaler);
-				}
-			}
-		}
-		fprintf(stderr, "Selected scaler '%s' does not exist\n", Config.scaler);
-	}
-
-	// Just try them all now, in a set priority.
-	for (i = 0; i < n; i++) {
-		if (scalers[i]->canEnable(bpp, w, h)) {
-			return scalers[i];
-		}
-	}
-
-	DIE("Can't use any scaler; this shouldn't happen.");
-}
-
 static void calculateScreenSize()
 {
 	SDL_SysWMinfo wminfo;
@@ -683,6 +162,7 @@ static void drawOnscreenControls()
 		S9xInputScreenChanged();
 		if (Config.touchscreenShow) {
 			scaler->pause();
+			SDL_FillRect(screen, NULL, 0);
 			S9xInputScreenDraw(Settings.SixteenBit ? 2 : 1,
 								screen->pixels, screen->pitch);
 			SDL_Flip(screen);
@@ -696,6 +176,10 @@ void S9xInitDisplay(int argc, const char ** argv)
 	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) 
 		DIE("SDL_InitSubSystem(VIDEO): %s", SDL_GetError());
 
+#if CONF_HD
+	hd_setup();
+#endif
+
 	setupVideoSurface();
 	drawOnscreenControls();
 }
@@ -708,18 +192,22 @@ void S9xDeinitDisplay()
 
 void S9xVideoToggleFullscreen()
 {
-	Config.fullscreen = !Config.fullscreen;
 	freeVideoSurface();
+	Config.fullscreen = !Config.fullscreen;
 	setupVideoSurface();
 	drawOnscreenControls();
 }
 
 void S9xVideoOutputFocus(bool hasFocus)
 {
-#if 0 // TODO
-	if (Config.xsp) {
-		setDoubling(hasFocus);
-	} 
+#if MAEMO
+	if (scaler) {
+		if (hasFocus) {
+			scaler->resume();
+		} else {
+			scaler->pause();
+		}
+	}
 #endif
 }