ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/SDL/video_sdl.cpp

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.37 by asvitkine, 2008-07-20T07:33:09Z vs.
Revision 1.44 by asvitkine, 2011-12-30T15:11:08Z

#	Line 63 | Line 63
63		#include "video_blit.h"
64		#include "vm_alloc.h"
65
66	+	#if (defined(__APPLE__) && defined(__MACH__))
67	+	#include "utils_macosx.h"
68	+	#endif
69	+
70		#define DEBUG 0
71		#include "debug.h"
72
69	–
73		// Supported video modes
74		using std::vector;
75		static vector<VIDEO_MODE> VideoModes;
#	Line 625 | Line 628 | public:
628		class driver_window;
629		static void update_display_window_vosf(driver_window *drv);
630		static void update_display_dynamic(int ticker, driver_window *drv);
631	<	static void update_display_static(driver_window *drv);
631	>	static void update_display_static(driver_base *drv);
632
633		class driver_window : public driver_base {
634		friend void update_display_window_vosf(driver_window *drv);
635		friend void update_display_dynamic(int ticker, driver_window *drv);
636	<	friend void update_display_static(driver_window *drv);
636	>	friend void update_display_static(driver_base *drv);
637
638		public:
639		driver_window(SDL_monitor_desc &monitor);
#	Line 1238 | Line 1241 | bool VideoInit(bool classic)
1241		continue;
1242		if (w == 512 && h == 384)
1243		continue;
1241	–	#ifdef ENABLE_VOSF
1244		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++)
1245		add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1244	–	#else
1245	–	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1246	–	#endif
1246		}
1247		}
1248
#	Line 1553 | Line 1552 | bool video_can_change_cursor(void)
1552		if (SDL_VideoDriverName(driver, sizeof driver) == NULL || strncmp(driver, "Quartz", sizeof driver))
1553		quartzok = true;
1554		else {
1555	<	// Quartz driver bug prevents cursor changing in SDL 1.2.11 and later
1555	>	// Quartz driver bug prevents cursor changing in SDL 1.2.11 to 1.2.14.
1556		const SDL_version *vp = SDL_Linked_Version();
1557	<	quartzok = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch) <= SDL_VERSIONNUM(1, 2, 10);
1557	>	int version = SDL_VERSIONNUM(vp->major, vp->minor, vp->patch);
1558	>	quartzok = (version <= SDL_VERSIONNUM(1, 2, 10) || version >= SDL_VERSIONNUM(1, 2, 15));
1559		}
1560		}
1561
#	Line 1897 | Line 1897 | static void handle_events(void)
1897		*/
1898
1899		// Static display update (fixed frame rate, but incremental)
1900	<	static void update_display_static(driver_window *drv)
1900	>	static void update_display_static(driver_base *drv)
1901		{
1902		// Incremental update code
1903		int wide = 0, high = 0, x1, x2, y1, y2, i, j;
#	Line 1986 | Line 1986 | static void update_display_static(driver
1986
1987		} else {
1988		const int bytes_per_pixel = VIDEO_MODE_ROW_BYTES / VIDEO_MODE_X;
1989	+	const int dst_bytes_per_row = drv->s->pitch;
1990
1991		x1 = VIDEO_MODE_X;
1992		for (j=y1; j<=y2; j++) {
#	Line 2026 | Line 2027 | static void update_display_static(driver
2027		// Blit to screen surface
2028		for (j=y1; j<=y2; j++) {
2029		i = j * bytes_per_row + x1 * bytes_per_pixel;
2030	+	int dst_i = j * dst_bytes_per_row + x1 * bytes_per_pixel;
2031		memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
2032	<	Screen_blit((uint8 *)drv->s->pixels + i, the_buffer + i, bytes_per_pixel * wide);
2032	>	Screen_blit((uint8 *)drv->s->pixels + dst_i, the_buffer + i, bytes_per_pixel * wide);
2033		}
2034
2035		// Unlock surface, if required
#	Line 2043 | Line 2045 | static void update_display_static(driver
2045
2046		// Static display update (fixed frame rate, bounding boxes based)
2047		// XXX use NQD bounding boxes to help detect dirty areas?
2048	<	static void update_display_static_bbox(driver_window *drv)
2048	>	static void update_display_static_bbox(driver_base *drv)
2049		{
2050		const VIDEO_MODE &mode = drv->mode;
2051
#	Line 2061 | Line 2063 | static void update_display_static_bbox(d
2063		// Update the surface from Mac screen
2064		const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2065		const int bytes_per_pixel = bytes_per_row / VIDEO_MODE_X;
2066	+	const int dst_bytes_per_row = drv->s->pitch;
2067		int x, y;
2068		for (y = 0; y < VIDEO_MODE_Y; y += N_PIXELS) {
2069		int h = N_PIXELS;
#	Line 2075 | Line 2078 | static void update_display_static_bbox(d
2078		bool dirty = false;
2079		for (int j = y; j < (y + h); j++) {
2080		const int yb = j * bytes_per_row;
2081	+	const int dst_yb = j * dst_bytes_per_row;
2082		if (memcmp(&the_buffer[yb + xb], &the_buffer_copy[yb + xb], xs) != 0) {
2083		memcpy(&the_buffer_copy[yb + xb], &the_buffer[yb + xb], xs);
2084	<	Screen_blit((uint8 *)drv->s->pixels + yb + xb, the_buffer + yb + xb, xs);
2084	>	Screen_blit((uint8 *)drv->s->pixels + dst_yb + xb, the_buffer + yb + xb, xs);
2085		dirty = true;
2086		}
2087		}
#	Line 2141 | Line 2145 | static inline void handle_palette_change
2145		UNLOCK_PALETTE;
2146		}
2147
2148	+	static void video_refresh_window_static(void);
2149	+
2150		static void video_refresh_dga(void)
2151		{
2152		// Quit DGA mode if requested
2153		possibly_quit_dga_mode();
2154	+	video_refresh_window_static();
2155		}
2156
2157		#ifdef ENABLE_VOSF
#	Line 2196 | Line 2203 | static void video_refresh_window_static(
2203		tick_counter = 0;
2204		const VIDEO_MODE &mode = drv->mode;
2205		if ((int)VIDEO_MODE_DEPTH >= VIDEO_DEPTH_8BIT)
2206	<	update_display_static_bbox(static_cast<driver_window *>(drv));
2206	>	update_display_static_bbox(drv);
2207		else
2208	<	update_display_static(static_cast<driver_window *>(drv));
2208	>	update_display_static(drv);
2209		}
2210		}
2211
#	Line 2234 | Line 2241 | static inline void do_video_refresh(void
2241		handle_events();
2242
2243		// Update display
2244	+	#if (defined(__APPLE__) && defined(__MACH__))
2245	+	// SDL expects an auto-release pool to be present.
2246	+	NSAutoReleasePool_wrap(video_refresh);
2247	+	#else
2248		video_refresh();
2249	+	#endif
2250
2251		#ifdef SHEEPSHAVER
2252		// Set new cursor image if it was changed
#	Line 2324 | Line 2336 | static int redraw_func(void *arg)
2336		#ifdef SHEEPSHAVER
2337		void video_set_dirty_area(int x, int y, int w, int h)
2338		{
2339	+	#ifdef ENABLE_VOSF
2340		const VIDEO_MODE &mode = drv->mode;
2341		const int screen_width = VIDEO_MODE_X;
2342		const int screen_height = VIDEO_MODE_Y;
2343		const int bytes_per_row = VIDEO_MODE_ROW_BYTES;
2344
2332	–	#ifdef ENABLE_VOSF
2345		if (use_vosf) {
2346		vosf_set_dirty_area(x, y, w, h, screen_width, screen_height, bytes_per_row);
2347		return;

Diff Legend

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