[PATCH 06/20] Add Jaguar screen functions

[Thomas Huth <huth@xxxxxxxxxxxxx>]

---
 src/jaguar/jagScreen.c | 83 ++++++++++++++++++++++++++++++++++++++++++
 src/jaguar/jagScreen.h | 23 ++++++++++++
 src/jaguar/jaguar.c    |  2 +-
 src/jaguar/joystick.c  | 10 ++---
 src/jaguar/tom.c       |  8 ++--
 5 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 src/jaguar/jagScreen.c
 create mode 100644 src/jaguar/jagScreen.h

diff --git a/src/jaguar/jagScreen.c b/src/jaguar/jagScreen.c
new file mode 100644
index 00000000..e0b16e34
--- /dev/null
+++ b/src/jaguar/jagScreen.c
@@ -0,0 +1,83 @@
+/*
+ * jagScreen.c: Host screen specific video routines
+ */
+
+#include <SDL.h>
+#include <SDL_opengl.h>
+
+#include "jagScreen.h"
+#include "log.h"
+#include "tom.h"
+#include "settings.h"
+
+#include "../includes/configuration.h"
+#include "../includes/resolution.h"
+#include "../includes/screen.h"
+
+#define VIRTUAL_SCREEN_WIDTH		320
+#define VIRTUAL_SCREEN_HEIGHT_NTSC	240
+#define VIRTUAL_SCREEN_HEIGHT_PAL	256
+
+uint32_t *backbuffer;
+
+
+/**
+ * Initialize the SDL for rendering the Jaguar screens
+ */
+void JagScreen_Init(void)
+{
+	Resolution_Init();
+	ConfigureParams.Screen.nZoomFactor = 2.0;
+	Screen_SetSDLVideoSize(320, 240, true);
+
+	backbuffer = (uint32_t *)malloc(1280 * 625 * sizeof(uint32_t));
+	memset(backbuffer, 0x44, VIRTUAL_SCREEN_WIDTH *
+		(vjs.hardwareTypeNTSC ? VIRTUAL_SCREEN_HEIGHT_NTSC : VIRTUAL_SCREEN_HEIGHT_PAL)
+		* sizeof(uint32_t));
+}
+
+/**
+ * Free the screen resources again
+ */
+void JagScreen_UnInit(void)
+{
+	Screen_UnInit();
+	free(backbuffer);
+}
+
+/**
+ * Render the backbuffer to the primary screen surface
+ */
+void RenderBackbuffer(void)
+{
+	SDL_Surface *surface = sdlscrn;
+
+	Screen_Lock();
+
+	if (vjs.renderType == RT_NORMAL)
+		memcpy(surface->pixels, backbuffer, TOMGetVideoModeWidth() * TOMGetVideoModeHeight() * 4);
+	else if (vjs.renderType == RT_TV)
+		memcpy(surface->pixels, backbuffer, 1280 * TOMGetVideoModeHeight() * 4);
+
+	Screen_UnLock();
+
+	Screen_UpdateRect(surface, 0, 0, TOMGetVideoModeWidth(), TOMGetVideoModeHeight());
+}
+
+/**
+ * Resize the main SDL screen & backbuffer
+ */
+void ResizeScreen(unsigned int width, unsigned int height)
+{
+	Screen_SetSDLVideoSize(width, height, false);
+	tomDeviceWidth = width;
+}
+
+/**
+ * Fullscreen <-> window switching
+ */
+void ToggleFullscreen(void)
+{
+	bInFullScreen = !bInFullScreen;
+	Screen_SetSDLVideoSize(sdlscrn->w, sdlscrn->h, true);
+}
diff --git a/src/jaguar/jagScreen.h b/src/jaguar/jagScreen.h
new file mode 100644
index 00000000..f215d749
--- /dev/null
+++ b/src/jaguar/jagScreen.h
@@ -0,0 +1,23 @@
+/*
+  Hatari - jagScreen.h
+
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
+
+  Header file for Jaguar screen functions and definitions
+*/
+
+#ifndef JAGSCREEN_H
+#define JAGSCREEN_H
+
+#include <stdbool.h>
+
+void JagScreen_Init(void);
+void JagScreen_UnInit(void);
+void RenderBackbuffer(void);
+void ResizeScreen(unsigned int width, unsigned int height);
+void ToggleFullscreen(void);
+
+extern uint32_t *backbuffer;
+
+#endif	/* JAGSCREEN_H */
diff --git a/src/jaguar/jaguar.c b/src/jaguar/jaguar.c
index 957bb80c..9a400b9f 100644
--- a/src/jaguar/jaguar.c
+++ b/src/jaguar/jaguar.c
@@ -31,7 +31,7 @@
 #include "m68k.h"
 #include "settings.h"
 #include "tom.h"
-#include "video.h"
+#include "jagScreen.h"
 
 #define CPU_DEBUG
 //Do this in makefile??? Yes! Could, but it's easier to define here...
diff --git a/src/jaguar/joystick.c b/src/jaguar/joystick.c
index 0a391b0b..935a9891 100644
--- a/src/jaguar/joystick.c
+++ b/src/jaguar/joystick.c
@@ -18,11 +18,10 @@
 #include <SDL.h>
 #include <time.h>
 #include "gpu.h"
-//#include "gui.h"
 #include "jaguar.h"
 #include "log.h"
 #include "settings.h"
-#include "video.h"
+#include "jagScreen.h"
 
 #if 0
 #define BUTTON_U		0
@@ -51,6 +50,8 @@
 
 // Global vars
 
+static SDL_Joystick * joystick1;
+
 static uint8 joystick_ram[4];
 uint8 joypad_0_buttons[21];
 uint8 joypad_1_buttons[21];
@@ -310,9 +311,8 @@ void JoystickExec(void)
 
 	// Joystick support [nwagenaar]
 
-    if (vjs.useJoystick)
-    {
-		extern SDL_Joystick * joystick1;
+	if (vjs.useJoystick)
+	{
 		int16 x = SDL_JoystickGetAxis(joystick1, 0),
 			y = SDL_JoystickGetAxis(joystick1, 1);
 
diff --git a/src/jaguar/tom.c b/src/jaguar/tom.c
index 6f4fe1e3..7ce102bd 100644
--- a/src/jaguar/tom.c
+++ b/src/jaguar/tom.c
@@ -267,7 +267,7 @@
 //#include "memory.h"
 #include "objectp.h"
 #include "settings.h"
-#include "video.h"
+#include "jagScreen.h"
 
 #define NEW_TIMER_SYSTEM
 
@@ -1349,10 +1349,8 @@ if (offset == VMODE)
 		{
 			tomWidth = width, tomHeight = height;
 
-#warning "!!! TOM: ResizeScreen commented out !!!"
-// No need to resize anything, since we're prepared for this...
-//			if (vjs.renderType == RT_NORMAL)
-//				ResizeScreen(tomWidth, tomHeight);
+			if (vjs.renderType == RT_NORMAL)
+				ResizeScreen(tomWidth, tomHeight);
 		}
 	}
 }
-- 
2.48.1


--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0007-Adjust-settings.c-to-make-it-compilable-in-Hatari.patch