[ViewVC] Diff of: cebix/BasiliskII/src/SDL/video

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z vs.
Revision 1.45 by asvitkine, 2012-01-04T22:52:05Z

#	Line 1 \| Line 1
1		/*
2		* video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	* Basilisk II (C) 1997-2005 Christian Bauer
4	>	* Basilisk II (C) 1997-2008 Christian Bauer
5		*
6		* This program is free software; you can redistribute it and/or modify
7		* it under the terms of the GNU General Public License as published by
#	Line 66 \| Line 66
66		#define DEBUG 0
67		#include "debug.h"
68
69	–
69		// Supported video modes
70		using std::vector;
71		static vector<VIDEO_MODE> VideoModes;
#	Line 136 \| Line 135 \| *static SDL_Cursor sdl_cursor; // C**
135		static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor
136		static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table
137		static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors
138	<	static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK \| SDL_MOUSEBUTTONUPMASK \| SDL_MOUSEMOTIONMASK \| SDL_KEYUPMASK \| SDL_KEYDOWNMASK \| SDL_VIDEOEXPOSEMASK \| SDL_QUITMASK;
138	>	static const int sdl_eventmask = SDL_MOUSEEVENTMASK \| SDL_KEYEVENTMASK \| SDL_VIDEOEXPOSEMASK \| SDL_QUITMASK \| SDL_ACTIVEEVENTMASK;
139
140		// Mutex to protect SDL events
141		static SDL_mutex *sdl_events_lock = NULL;
#	Line 197 \| Line 196 \| extern void SysMountFirstFloppy(void);
196
197		static void *vm_acquire_framebuffer(uint32 size)
198		{
199	<	return vm_acquire(size);
199	>	// always try to reallocate framebuffer at the same address
200	>	static void *fb = VM_MAP_FAILED;
201	>	if (fb != VM_MAP_FAILED) {
202	>	if (vm_acquire_fixed(fb, size) < 0) {
203	>	#ifndef SHEEPSHAVER
204	>	printf("FATAL: Could not reallocate framebuffer at previous address\n");
205	>	#endif
206	>	fb = VM_MAP_FAILED;
207	>	}
208	>	}
209	>	if (fb == VM_MAP_FAILED)
210	>	fb = vm_acquire(size, VM_MAP_DEFAULT \| VM_MAP_32BIT);
211	>	return fb;
212		}
213
214		static inline void vm_release_framebuffer(void *fb, uint32 size)
#	Line 613 \| Line 624 \| public:
624		class driver_window;
625		static void update_display_window_vosf(driver_window *drv);
626		static void update_display_dynamic(int ticker, driver_window *drv);
627	<	static void update_display_static(driver_window *drv);
627	>	static void update_display_static(driver_base *drv);
628
629		class driver_window : public driver_base {
630		friend void update_display_window_vosf(driver_window *drv);
631		friend void update_display_dynamic(int ticker, driver_window *drv);
632	<	friend void update_display_static(driver_window *drv);
632	>	friend void update_display_static(driver_base *drv);
633
634		public:
635		driver_window(SDL_monitor_desc &monitor);
#	Line 719 \| Line 730 \| void driver_base::restore_mouse_accel(vo
730		* Windowed display driver
731		*/
732
733	+	static bool SDL_display_opened = false;
734	+
735		// Open display
736		driver_window::driver_window(SDL_monitor_desc &m)
737		: driver_base(m), mouse_grabbed(false)
#	Line 730 \| Line 743 \| driver_window::driver_window(SDL_monitor
743		// Set absolute mouse mode
744		ADBSetRelMouseMode(mouse_grabbed);
745
746	+	// This is ugly:
747	+	// If we're switching resolutions (ie, not setting it for the first time),
748	+	// there's a bug in SDL where the SDL_Surface created will not be properly
749	+	// setup. The solution is to SDL_QuitSubSystem(SDL_INIT_VIDEO) before calling
750	+	// SDL_SetVideoMode for the second time (SDL_SetVideoMode will call SDL_Init()
751	+	// and all will be well). Without this, the video becomes corrupted (at least
752	+	// on Mac OS X), after the resolution switch.
753	+	if (SDL_display_opened)
754	+	SDL_QuitSubSystem(SDL_INIT_VIDEO);
755	+
756		// Create surface
757		int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
758		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
759		return;
760
761	+	SDL_display_opened = true;
762	+
763		#ifdef ENABLE_VOSF
764		use_vosf = true;
765		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
#	Line 1212 \| Line 1237 \| bool VideoInit(bool classic)
1237		continue;
1238		if (w == 512 && h == 384)
1239		continue;
1215	–	#ifdef ENABLE_VOSF
1240		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1241		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1218	–	#else
1219	–	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1220	–	#endif
1242		}
1243		}
1244
#	Line 1517 \| Line 1538 \| void SDL_monitor_desc::switch_to_current
1538		#ifdef SHEEPSHAVER
1539		bool video_can_change_cursor(void)
1540		{
1541	<	return (display_type == DISPLAY_WINDOW);
1541	>	static char driver[] = "Quartz?";
1542	>	static int quartzok = -1;
1543	>
1544	>	if (display_type != DISPLAY_WINDOW)
1545	>	return false;
1546	>
1547	>	if (quartzok < 0) {
1548	>	if (SDL_VideoDriverName(driver, sizeof driver) == NULL \|\| strncmp(driver, "Quartz", sizeof driver))
1549	>	quartzok = true;
1550	>	else {
1551	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.14.
1552	>	const SDL_version *vp = SDL_Linked_Version();
1553	>	int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch);
1554	>	quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) \|\| version >= SDL_VERSIONNUM(1, 2, 15));
1555	>	}
1556	>	}
1557	>
1558	>	return quartzok;
1559		}
1560		#endif
1561
#	Line 1728 \| Line 1766 \| static void handle_events(void)
1766		// Mouse button
1767		case SDL_MOUSEBUTTONDOWN: {
1768		unsigned int button = event.button.button;
1769	<	if (button < 4)
1770	<	ADBMouseDown(button - 1);
1769	>	if (button == SDL_BUTTON_LEFT)
1770	>	ADBMouseDown(0);
1771	>	else if (button == SDL_BUTTON_RIGHT)
1772	>	ADBMouseDown(1);
1773	>	else if (button == SDL_BUTTON_MIDDLE)
1774	>	ADBMouseDown(2);
1775		else if (button < 6) { // Wheel mouse
1776		if (mouse_wheel_mode == 0) {
1777		int key = (button == 5) ? 0x79 : 0x74; // Page up/down
#	Line 1747 \| Line 1789 \| static void handle_events(void)
1789		}
1790		case SDL_MOUSEBUTTONUP: {
1791		unsigned int button = event.button.button;
1792	<	if (button < 4)
1793	<	ADBMouseUp(button - 1);
1792	>	if (button == SDL_BUTTON_LEFT)
1793	>	ADBMouseUp(0);
1794	>	else if (button == SDL_BUTTON_RIGHT)
1795	>	ADBMouseUp(1);
1796	>	else if (button == SDL_BUTTON_MIDDLE)
1797	>	ADBMouseUp(2);
1798		break;
1799		}
1800
#	Line 1832 \| Line 1878 \| static void handle_events(void)
1878		ADBKeyDown(0x7f); // Power key
1879		ADBKeyUp(0x7f);
1880		break;
1881	+
1882	+	// Application activate/deactivate; consume the event but otherwise ignore it
1883	+	case SDL_ACTIVEEVENT:
1884	+	break;
1885		}
1886		}
1887		}
#	Line 1843 \| Line 1893 \| static void handle_events(void)
1893		*/
1894
1895		// Static display update (fixed frame rate, but incremental)
1896	<	static void update_display_static(driver_window *drv)
1896	>	static void update_display_static(driver_base *drv)
1897		{
1898		// Incremental update code
1899		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1932 \| Line 1982 \| static void update_display_static(driver
1982
1983		} else {
1984		const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1985	+	const int dst_bytes_per_row = drv->s->pitch;
1986
1987		x1 = VIDEO_MODE_X;
1988		for (j=y1; j<=y2; j++) {
#	Line 1972 \| Line 2023 \| static void update_display_static(driver
2023		// Blit to screen surface
2024		for (j=y1; j<=y2; j++) {
2025		i = j * bytes_per_row + x1 * bytes_per_pixel;
2026	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2027		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2028	<	Screen_blit((uint8 )drv->s->pixels + i, the_buffer + i, bytes_per_pixel wide);
2028	>	Screen_blit((uint8 )drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel wide);
2029		}
2030
2031		// Unlock surface, if required
#	Line 1989 \| Line 2041 \| static void update_display_static(driver
2041
2042		// Static display update (fixed frame rate, bounding boxes based)
2043		// XXX use NQD bounding boxes to help detect dirty areas?
2044	<	static void update_display_static_bbox(driver_window *drv)
2044	>	static void update_display_static_bbox(driver_base *drv)
2045		{
2046		const VIDEO_MODE &mode = drv->mode;
2047
#	Line 2007 \| Line 2059 \| static void update_display_static_bbox(d
2059		// Update the surface from Mac screen
2060		const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2061		const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2062	+	const int dst_bytes_per_row = drv->s->pitch;
2063		int x, y;
2064		for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2065		int h = N_PIXELS;
#	Line 2021 \| Line 2074 \| static void update_display_static_bbox(d
2074		bool dirty = false;
2075		for (int j = y; j < (y + h); j++) {
2076		const int yb = j * bytes_per_row;
2077	+	const int dst_yb = j * dst_bytes_per_row;
2078		if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2079		memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2080	<	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2080	>	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2081		dirty = true;
2082		}
2083		}
#	Line 2087 \| Line 2141 \| static inline void handle_palette_change
2141		UNLOCK_PALETTE;
2142		}
2143
2144	+	static void video_refresh_window_static(void);
2145	+
2146		static void video_refresh_dga(void)
2147		{
2148		// Quit DGA mode if requested
2149		possibly_quit_dga_mode();
2150	+	video_refresh_window_static();
2151		}
2152
2153		#ifdef ENABLE_VOSF
#	Line 2142 \| Line 2199 \| static void video_refresh_window_static(
2199		tick_counter = 0;
2200		const VIDEO_MODE &mode = drv->mode;
2201		if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2202	<	update_display_static_bbox(static_cast<driver_window *>(drv));
2202	>	update_display_static_bbox(drv);
2203		else
2204	<	update_display_static(static_cast<driver_window *>(drv));
2204	>	update_display_static(drv);
2205		}
2206		}
2207
#	Line 2190 \| Line 2247 \| static inline void do_video_refresh(void
2247		SDL_FreeCursor(sdl_cursor);
2248		sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2249		if (sdl_cursor) {
2250	+	SDL_ShowCursor(private_data == NULL \|\| private_data->cursorVisible);
2251		SDL_SetCursor(sdl_cursor);
2252		#ifdef WIN32
2253		// XXX Windows apparently needs an extra mouse event to
#	Line 2269 \| Line 2327 \| *static int redraw_func(void arg)**
2327		#ifdef SHEEPSHAVER
2328		void video_set_dirty_area(int x, int y, int w, int h)
2329		{
2330	+	#ifdef ENABLE_VOSF
2331		const VIDEO_MODE &mode = drv->mode;
2332		const int screen_width = VIDEO_MODE_X;
2333		const int screen_height = VIDEO_MODE_Y;
2334		const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2335
2277	–	#ifdef ENABLE_VOSF
2336		if (use_vosf) {
2337		vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2338		return;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents): Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z vs. Revision 1.45 by asvitkine, 2012-01-04T22:52:05Z

Diff Legend

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.29 by gbeauche, 2006-05-14T14:11:46Z vs.
Revision 1.45 by asvitkine, 2012-01-04T22:52:05Z