#include <X11/Xlib.h>
#include <X11/Xutil.h>
-#include <X11/extensions/Xsp.h>
#include <SDL.h>
#include <SDL_syswm.h>
#include "display.h"
#include "gfx.h"
#include "ppu.h"
+#include "sdlv.h"
#define DIE(format, ...) do { \
fprintf(stderr, "Died at %s:%d: ", __FILE__, __LINE__ ); \
abort(); \
} while (0);
-static SDL_Surface *screen;
+struct gui GUI;
-static void setDoubling(bool enable)
+SDL_Surface* screen;
+
+static SDL_Rect windowSize, screenSize;
+static bool gotWindowSize, gotScreenSize;
+
+/** The current scaler object */
+Scaler* scaler;
+
+static void calculateScreenSize()
{
SDL_SysWMinfo wminfo;
SDL_VERSION(&wminfo.version);
+
if ( SDL_GetWMInfo(&wminfo) ) {
- XSPSetPixelDoubling(wminfo.info.x11.display, 0, enable ? 1 : 0);
+ Display *dpy = wminfo.info.x11.display;
+ Window w;
+ SDL_Rect* size;
+ XWindowAttributes xwa;
+
+ if (Config.fullscreen) {
+ w = wminfo.info.x11.fswindow;
+ size = &screenSize;
+ gotScreenSize = true;
+ } else {
+ w = wminfo.info.x11.wmwindow;
+ size = &windowSize;
+ gotWindowSize = true;
+ }
+
+ XGetWindowAttributes(dpy, w, &xwa);
+ size->x = xwa.x;
+ size->y = xwa.y;
+ size->w = xwa.width;
+ size->h = xwa.height;
}
}
{
screen = 0; // There's no need to free the screen surface.
GFX.Screen = 0;
-
+
free(GFX.SubScreen); GFX.SubScreen = 0;
free(GFX.ZBuffer); GFX.ZBuffer = 0;
free(GFX.SubZBuffer); GFX.SubZBuffer = 0;
+
+ delete scaler; scaler = 0;
}
static void setupVideoSurface()
{
- int w = IMAGE_WIDTH;
- int h = IMAGE_HEIGHT;
-
- // By now, just assume xsp == fullscreen. This has to change.
- Config.xsp = Config.fullscreen;
- if (Config.xsp) {
- w *= 2;
- h *= 2;
+ // Real surface area.
+ const unsigned gameWidth = IMAGE_WIDTH;
+ const unsigned gameHeight = IMAGE_HEIGHT;
+
+#ifdef MAEMO
+ if ((Config.fullscreen && !gotScreenSize) ||
+ (!Config.fullscreen && !gotWindowSize)) {
+ // Do a first try, in order to get window/screen size
+ screen = SDL_SetVideoMode(gameWidth, gameHeight, 16,
+ SDL_SWSURFACE | SDL_RESIZABLE |
+ (Config.fullscreen ? SDL_FULLSCREEN : 0));
+ if (!screen) DIE("SDL_SetVideoMode: %s", SDL_GetError());
+ calculateScreenSize();
+ }
+ if (Config.fullscreen) {
+ GUI.Width = screenSize.w;
+ GUI.Height = screenSize.h;
} else {
- setDoubling(false); // Before switching video modes
+ GUI.Width = windowSize.w;
+ GUI.Height = windowSize.h;
}
-
- screen = SDL_SetVideoMode(w, h,
+#else
+ GUI.Width = gameWidth;
+ GUI.Height = gameHeight;
+#endif
+#if CONF_EXIT_BUTTON
+ ExitBtnReset();
+#endif
+
+ // Safeguard
+ if (gameHeight > GUI.Height || gameWidth > GUI.Width)
+ DIE("Video is larger than window size!");
+
+ const ScalerFactory* sFactory =
+ searchForScaler(Settings.SixteenBit ? 16 : 8, gameWidth, gameHeight);
+
+ screen = SDL_SetVideoMode(GUI.Width, GUI.Height,
Settings.SixteenBit ? 16 : 8,
SDL_SWSURFACE |
(Config.fullscreen ? SDL_FULLSCREEN : 0));
-
if (!screen)
DIE("SDL_SetVideoMode: %s", SDL_GetError());
SDL_ShowCursor(SDL_DISABLE);
- if (Config.xsp) setDoubling(true);
-
- GFX.RealPitch = GFX.Pitch = screen->pitch;
-
- GFX.Screen = (uint8*) screen->pixels;
- GFX.SubScreen = (uint8 *) malloc(GFX.RealPitch * IMAGE_HEIGHT);
- GFX.ZBuffer = (uint8 *) malloc(GFX.RealPitch * IMAGE_HEIGHT);
- GFX.SubZBuffer = (uint8 *) malloc(GFX.RealPitch * IMAGE_HEIGHT);
+ scaler = sFactory->instantiate(screen, gameWidth, gameHeight);
+
+ // We get pitch surface values from SDL
+ GFX.RealPitch = GFX.Pitch = scaler->getDrawBufferPitch();
+ GFX.ZPitch = GFX.Pitch / 2; // gfx & tile.cpp depend on this, unfortunately.
+ GFX.PixSize = screen->format->BitsPerPixel / 8;
+ GFX.Screen = scaler->getDrawBuffer();
+ GFX.SubScreen = (uint8 *) malloc(GFX.Pitch * IMAGE_HEIGHT);
+ GFX.ZBuffer = (uint8 *) malloc(GFX.ZPitch * IMAGE_HEIGHT);
+ GFX.SubZBuffer = (uint8 *) malloc(GFX.ZPitch * IMAGE_HEIGHT);
+
GFX.Delta = (GFX.SubScreen - GFX.Screen) >> 1;
GFX.PPL = GFX.Pitch >> 1;
GFX.PPLx2 = GFX.Pitch;
- GFX.ZPitch = GFX.Pitch >> 1;
-
- printf("Video: %dx%d, %hu bits per pixel, %s %s\n", screen->w, screen->h,
- screen->format->BitsPerPixel,
+
+ scaler->getRenderedGUIArea(GUI.RenderX, GUI.RenderY, GUI.RenderW, GUI.RenderH);
+ scaler->getRatio(GUI.ScaleX, GUI.ScaleY);
+
+ printf("Video: %dx%d (%dx%d output), %hu bits per pixel, %s, %s\n",
+ gameWidth, gameHeight,
+ screen->w, screen->h, screen->format->BitsPerPixel,
Config.fullscreen ? "fullscreen" : "windowed",
- Config.xsp ? "with pixel doubling" : "");
+ scaler->getName());
+}
+
+static void drawOnscreenControls()
+{
+ if (Config.touchscreenInput) {
+ S9xInputScreenChanged();
+ }
+
+ if (Config.touchscreenShow) {
+ scaler->pause();
+ SDL_FillRect(screen, NULL, 0);
+ S9xInputScreenDraw(Settings.SixteenBit ? 2 : 1,
+ screen->pixels, screen->pitch);
+ SDL_Flip(screen);
+ scaler->resume();
+ }
}
void S9xInitDisplay(int argc, const char ** argv)
{
if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
DIE("SDL_InitSubSystem(VIDEO): %s", SDL_GetError());
-
+
setupVideoSurface();
+ drawOnscreenControls();
}
void S9xDeinitDisplay()
void S9xVideoToggleFullscreen()
{
- Config.fullscreen = !Config.fullscreen;
freeVideoSurface();
+ Config.fullscreen = !Config.fullscreen;
setupVideoSurface();
+ drawOnscreenControls();
}
-void S9xVideoOutputFocus(bool hasFocus)
+void processVideoEvent(const SDL_Event& event)
{
- if (Config.xsp) {
- setDoubling(hasFocus);
- }
+ if (scaler)
+ scaler->filter(event);
}
// This is here for completeness, but palette mode is useless on N8x0
bool8_32 S9xInitUpdate ()
{
- if(SDL_MUSTLOCK(screen))
- {
- if(SDL_LockSurface(screen) < 0) {
- DIE("Failed to lock SDL surface: %s", SDL_GetError());
- }
- }
+ scaler->prepare();
return TRUE;
}
bool8_32 S9xDeinitUpdate (int width, int height, bool8_32 sixteenBit)
{
- if(SDL_MUSTLOCK(screen)) SDL_UnlockSurface(screen);
+ scaler->finish();
- if (Config.xsp) {
- width *= 2;
- height *= 2;
+#if CONF_EXIT_BUTTON
+ if (ExitBtnRequiresDraw()) {
+ scaler->pause();
+ ExitBtnDraw(screen);
+ scaler->resume();
}
+#endif
- SDL_UpdateRect(screen, 0, 0, width, height);
-
return TRUE;
}
projects / drnoksnes / blobdiff