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.5 by gbeauche, 2004-06-24T21:46:55Z vs.
Revision 1.15 by gbeauche, 2005-01-30T21:42:14Z

#	Line 1 | Line 1
1		/*
2		*  video_sdl.cpp - Video/graphics emulation, SDL specific stuff
3		*
4	<	*  Basilisk II (C) 1997-2004 Christian Bauer
4	>	*  Basilisk II (C) 1997-2005 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 35 | Line 35
35		*  - Events processing is bound to the general emulation thread as SDL requires
36		*    to PumpEvents() within the same thread as the one that called SetVideoMode().
37		*    Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
38	+	*  - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
39	+	*  - Backport hw cursor acceleration to Basilisk II?
40		*/
41
42		#include "sysdeps.h"
#	Line 54 | Line 56
56		#include "video.h"
57		#include "video_defs.h"
58		#include "video_blit.h"
59	+	#include "vm_alloc.h"
60
61		#define DEBUG 0
62		#include "debug.h"
#	Line 94 | Line 97 | static uint32 the_buffer_size;                                         // S
97		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
98		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
99		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
100	+	static volatile bool thread_stop_req = false;
101	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
102
103		#ifdef ENABLE_VOSF
104	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
104	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
105		#else
106		static const bool use_vosf = false;                                     // VOSF not possible
107		#endif
#	Line 114 | Line 119 | static int keycode_table[256];                                         // X
119
120		// SDL variables
121		static int screen_depth;                                                        // Depth of current screen
122	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
123	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
124		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
125		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
126		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
#	Line 141 | Line 148 | extern void SysMountFirstFloppy(void);
148
149
150		/*
151	+	*  Framebuffer allocation routines
152	+	*/
153	+
154	+	static void *vm_acquire_framebuffer(uint32 size)
155	+	{
156	+	#ifdef SHEEPSHAVER
157	+	#ifdef DIRECT_ADDRESSING_HACK
158	+	const uint32 FRAME_BUFFER_BASE = 0x61000000;
159	+	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
160	+	if (vm_acquire_fixed(fb, size) < 0)
161	+	fb = VM_MAP_FAILED;
162	+	return fb;
163	+	#endif
164	+	#endif
165	+	return vm_acquire(size);
166	+	}
167	+
168	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
169	+	{
170	+	vm_release(fb, size);
171	+	}
172	+
173	+
174	+	/*
175		*  SheepShaver glue
176		*/
177
#	Line 255 | Line 286 | static void ErrorAlert(int error)
286		{
287		ErrorAlert(GetString(error));
288		}
289	+
290	+	// Display warning alert
291	+	static void WarningAlert(int warning)
292	+	{
293	+	WarningAlert(GetString(warning));
294	+	}
295		#endif
296
297
#	Line 314 | Line 351 | static inline int bytes_per_pixel(int de
351		}
352
353		// Map video_mode depth ID to numerical depth value
354	<	static int sdl_depth_of_video_depth(int video_depth)
354	>	static int mac_depth_of_video_depth(int video_depth)
355		{
356		int depth = -1;
357		switch (video_depth) {
#	Line 342 | Line 379 | static int sdl_depth_of_video_depth(int
379		return depth;
380		}
381
382	+	// Map video_mode depth ID to SDL screen depth
383	+	static int sdl_depth_of_video_depth(int video_depth)
384	+	{
385	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
386	+	}
387	+
388		// Check wether specified mode is available
389		static bool has_mode(int type, int width, int height)
390		{
#	Line 402 | Line 445 | static void add_mode(int type, int width
445		VIDEO_MODE_Y = height;
446		VIDEO_MODE_RESOLUTION = resolution_id;
447		VIDEO_MODE_ROW_BYTES = bytes_per_row;
448	<	VIDEO_MODE_DEPTH = depth;
448	>	VIDEO_MODE_DEPTH = (video_depth)depth;
449		VideoModes.push_back(mode);
450		}
451
#	Line 538 | Line 581 | driver_base::~driver_base()
581		if (s)
582		SDL_FreeSurface(s);
583
584	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
585	+	if (the_buffer != VM_MAP_FAILED) {
586	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
587	+	vm_release_framebuffer(the_buffer, the_buffer_size);
588	+	the_buffer = NULL;
589	+	}
590	+
591		// Free frame buffer(s)
592		if (!use_vosf) {
543	–	if (the_buffer) {
544	–	free(the_buffer);
545	–	the_buffer = NULL;
546	–	}
593		if (the_buffer_copy) {
594		free(the_buffer_copy);
595		the_buffer_copy = NULL;
#	Line 551 | Line 597 | driver_base::~driver_base()
597		}
598		#ifdef ENABLE_VOSF
599		else {
554	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
555	–	if (the_buffer != VM_MAP_FAILED) {
556	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
557	–	vm_release(the_buffer, the_buffer_size);
558	–	the_buffer = NULL;
559	–	}
600		if (the_host_buffer) {
601		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
602		free(the_host_buffer);
#	Line 567 | Line 607 | driver_base::~driver_base()
607		free(the_buffer_copy);
608		the_buffer_copy = NULL;
609		}
610	+
611	+	// Deinitialize VOSF
612	+	video_vosf_exit();
613		}
614		#endif
615		}
#	Line 576 | Line 619 | void driver_base::update_palette(void)
619		{
620		const VIDEO_MODE &mode = monitor.get_current_mode();
621
622	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
622	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
623		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
624		}
625
#	Line 607 | Line 650 | driver_window::driver_window(SDL_monitor
650		ADBSetRelMouseMode(mouse_grabbed);
651
652		// Create surface
653	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
653	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
654		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
655		return;
656
#	Line 616 | Line 659 | driver_window::driver_window(SDL_monitor
659		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
660		the_host_buffer = (uint8 *)s->pixels;
661		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
662	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
662	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
663		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
664		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
665	+
666	+	// Check whether we can initialize the VOSF subsystem and it's profitable
667	+	if (!video_vosf_init(m)) {
668	+	WarningAlert(STR_VOSF_INIT_ERR);
669	+	use_vosf = false;
670	+	}
671	+	else if (!video_vosf_profitable()) {
672	+	video_vosf_exit();
673	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
674	+	use_vosf = false;
675	+	}
676	+	if (!use_vosf) {
677	+	free(the_buffer_copy);
678	+	vm_release(the_buffer, the_buffer_size);
679	+	the_host_buffer = NULL;
680	+	}
681	+	#endif
682	+	if (!use_vosf) {
683	+	// Allocate memory for frame buffer
684	+	the_buffer_size = (aligned_height + 2) * s->pitch;
685	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
686	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
687	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
688	+	}
689	+
690	+	#ifdef SHEEPSHAVER
691	+	// Create cursor
692	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
693	+	SDL_SetCursor(sdl_cursor);
694	+	cursor_changed = false;
695	+	}
696		#else
697	<	// Allocate memory for frame buffer
698	<	the_buffer_size = (aligned_height + 2) * s->pitch;
625	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
626	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
627	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
697	>	// Hide cursor
698	>	SDL_ShowCursor(0);
699		#endif
700
701		// Set window name/class
702		set_window_name(STR_WINDOW_TITLE);
703
633	–	// Hide cursor
634	–	SDL_ShowCursor(0);
635	–
704		// Init blitting routines
705		SDL_PixelFormat *f = s->format;
706		VisualFormat visualFormat;
#	Line 640 | Line 708 | driver_window::driver_window(SDL_monitor
708		visualFormat.Rmask = f->Rmask;
709		visualFormat.Gmask = f->Gmask;
710		visualFormat.Bmask = f->Bmask;
711	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
711	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
712
713		// Load gray ramp to 8->16/32 expand map
714		if (!IsDirectMode(mode))
#	Line 738 | Line 806 | static void keycode_init(void)
806		SDL_VideoDriverName(video_driver, sizeof(video_driver));
807		bool video_driver_found = false;
808		char line[256];
809	+	int n_keys = 0;
810		while (fgets(line, sizeof(line) - 1, f)) {
811		// Read line
812		int len = strlen(line);
#	Line 750 | Line 819 | static void keycode_init(void)
819		continue;
820
821		if (video_driver_found) {
822	<	// Skip aliases
823	<	static const char alias_str[] = "alias";
824	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
822	>	// Skip aliases as long as we have read keycodes yet
823	>	// Otherwise, it's another mapping and we have to stop
824	>	static const char sdl_str[] = "sdl";
825	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
826		continue;
827
828		// Read keycode
829		int x_code, mac_code;
830		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
831	<	keycode_table[x_code & 0xff] = mac_code;
831	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
832		else
833		break;
834		} else {
835		// Search for SDL video driver string
836	<	static const char alias_sdl_str[] = "alias SDL";
837	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
838	<	char *p = line + sizeof(alias_sdl_str);
836	>	static const char sdl_str[] = "sdl";
837	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
838	>	char *p = line + sizeof(sdl_str);
839		if (strstr(video_driver, p) == video_driver)
840		video_driver_found = true;
841		}
#	Line 783 | Line 853 | static void keycode_init(void)
853		WarningAlert(str);
854		return;
855		}
856	+
857	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
858		}
859		}
860
#	Line 810 | Line 882 | bool SDL_monitor_desc::video_open(void)
882		return false;
883		}
884
813	–	#ifdef ENABLE_VOSF
814	–	if (use_vosf) {
815	–	// Initialize the VOSF system
816	–	if (!video_vosf_init(*this)) {
817	–	ErrorAlert(STR_VOSF_INIT_ERR);
818	–	return false;
819	–	}
820	–	}
821	–	#endif
822	–
885		// Initialize VideoRefresh function
886		VideoRefreshInit();
887
#	Line 929 | Line 991 | bool VideoInit(bool classic)
991		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
992		else {
993		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
994	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
994	>	int bpp = sdl_depth_of_video_depth(d);
995		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
996		add_window_modes(video_depth(d));
997		}
#	Line 1017 | Line 1079 | void SDL_monitor_desc::video_close(void)
1079		UNLOCK_FRAME_BUFFER;
1080		D(bug(" frame buffer unlocked\n"));
1081
1020	–	#ifdef ENABLE_VOSF
1021	–	if (use_vosf) {
1022	–	// Deinitialize VOSF
1023	–	video_vosf_exit();
1024	–	}
1025	–	#endif
1026	–
1082		// Close display
1083		delete drv;
1084		drv = NULL;
#	Line 1121 | Line 1176 | void SDL_monitor_desc::set_palette(uint8
1176		const VIDEO_MODE &mode = get_current_mode();
1177
1178		// FIXME: how can we handle the gamma ramp?
1179	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1179	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1180		return;
1181
1182		LOCK_PALETTE;
#	Line 1146 | Line 1201 | void SDL_monitor_desc::set_palette(uint8
1201		}
1202
1203		#ifdef ENABLE_VOSF
1204	<	// We have to redraw everything because the interpretation of pixel values changed
1205	<	LOCK_VOSF;
1206	<	PFLAG_SET_ALL;
1207	<	UNLOCK_VOSF;
1208	<	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1204	>	if (use_vosf) {
1205	>	// We have to redraw everything because the interpretation of pixel values changed
1206	>	LOCK_VOSF;
1207	>	PFLAG_SET_ALL;
1208	>	UNLOCK_VOSF;
1209	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1210	>	}
1211		#endif
1212		}
1213
#	Line 1180 | Line 1237 | int16 video_mode_change(VidLocals *csSav
1237		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1238		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1239
1240	<	// Disable interrupts
1240	>	// Disable interrupts and pause redraw thread
1241		DisableInterrupt();
1242	+	thread_stop_ack = false;
1243	+	thread_stop_req = true;
1244	+	while (!thread_stop_ack) ;
1245
1246		cur_mode = i;
1247		monitor_desc *monitor = VideoMonitors[0];
#	Line 1192 | Line 1252 | int16 video_mode_change(VidLocals *csSav
1252		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1253		csSave->saveMode=VModes[cur_mode].viAppleMode;
1254
1255	<	// Enable interrupts
1255	>	// Enable interrupts and resume redraw thread
1256	>	thread_stop_req = false;
1257		EnableInterrupt();
1258		return noErr;
1259		}
#	Line 1221 | Line 1282 | void SDL_monitor_desc::switch_to_current
1282		#ifdef SHEEPSHAVER
1283		bool video_can_change_cursor(void)
1284		{
1285	<	//      return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN);
1225	<	return false;
1285	>	return (display_type == DISPLAY_WINDOW);
1286		}
1287		#endif
1288
#	Line 1234 | Line 1294 | bool video_can_change_cursor(void)
1294		#ifdef SHEEPSHAVER
1295		void video_set_cursor(void)
1296		{
1297	<	//      cursor_changed = true;
1297	>	cursor_changed = true;
1298		}
1299		#endif
1300
1301
1302		/*
1303	<	*  Install graphics acceleration
1303	>	*  Keyboard-related utilify functions
1304		*/
1305
1306	<	#ifdef SHEEPSHAVER
1247	<	// Rectangle inversion
1248	<	template< int bpp >
1249	<	static inline void do_invrect(uint8 *dest, uint32 length)
1306	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1307		{
1308	<	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1309	<	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1310	<	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1311	<	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1312	<
1313	<	#ifndef UNALIGNED_PROFITABLE
1314	<	// Align on 16-bit boundaries
1315	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1316	<	INVERT_1(dest, 0);
1317	<	dest += 1; length -= 1;
1318	<	}
1319	<
1320	<	// Align on 32-bit boundaries
1321	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1322	<	INVERT_2(dest, 0);
1323	<	dest += 2; length -= 2;
1267	<	}
1268	<	#endif
1269	<
1270	<	// Invert 8-byte words
1271	<	if (length >= 8) {
1272	<	const int r = (length / 8) % 8;
1273	<	dest += r * 8;
1274	<
1275	<	int n = ((length / 8) + 7) / 8;
1276	<	switch (r) {
1277	<	case 0: do {
1278	<	dest += 64;
1279	<	INVERT_8(dest, -8);
1280	<	case 7: INVERT_8(dest, -7);
1281	<	case 6: INVERT_8(dest, -6);
1282	<	case 5: INVERT_8(dest, -5);
1283	<	case 4: INVERT_8(dest, -4);
1284	<	case 3: INVERT_8(dest, -3);
1285	<	case 2: INVERT_8(dest, -2);
1286	<	case 1: INVERT_8(dest, -1);
1287	<	} while (--n > 0);
1288	<	}
1289	<	}
1290	<
1291	<	// 32-bit cell to invert?
1292	<	if (length & 4) {
1293	<	INVERT_4(dest, 0);
1294	<	if (bpp <= 16)
1295	<	dest += 4;
1296	<	}
1297	<
1298	<	// 16-bit cell to invert?
1299	<	if (bpp <= 16 && (length & 2)) {
1300	<	INVERT_2(dest, 0);
1301	<	if (bpp <= 8)
1302	<	dest += 2;
1303	<	}
1304	<
1305	<	// 8-bit cell to invert?
1306	<	if (bpp <= 8 && (length & 1))
1307	<	INVERT_1(dest, 0);
1308	<
1309	<	#undef INVERT_1
1310	<	#undef INVERT_2
1311	<	#undef INVERT_4
1312	<	#undef INVERT_8
1313	<	}
1314	<
1315	<	void NQD_invrect(uint32 p)
1316	<	{
1317	<	D(bug("accl_invrect %08x\n", p));
1318	<
1319	<	// Get inversion parameters
1320	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1321	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1322	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1323	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1324	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1325	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1326	<
1327	<	//!!?? pen_mode == 14
1328	<
1329	<	// And perform the inversion
1330	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1331	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1332	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1333	<	width *= bpp;
1334	<	switch (bpp) {
1335	<	case 1:
1336	<	for (int i = 0; i < height; i++) {
1337	<	do_invrect<8>(dest, width);
1338	<	dest += dest_row_bytes;
1339	<	}
1340	<	break;
1341	<	case 2:
1342	<	for (int i = 0; i < height; i++) {
1343	<	do_invrect<16>(dest, width);
1344	<	dest += dest_row_bytes;
1345	<	}
1346	<	break;
1347	<	case 4:
1348	<	for (int i = 0; i < height; i++) {
1349	<	do_invrect<32>(dest, width);
1350	<	dest += dest_row_bytes;
1351	<	}
1352	<	break;
1353	<	}
1354	<	}
1355	<
1356	<	// Rectangle filling
1357	<	template< int bpp >
1358	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1359	<	{
1360	<	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1361	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1362	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1363	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1364	<
1365	<	#ifndef UNALIGNED_PROFITABLE
1366	<	// Align on 16-bit boundaries
1367	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1368	<	FILL_1(dest, 0, color);
1369	<	dest += 1; length -= 1;
1370	<	}
1371	<
1372	<	// Align on 32-bit boundaries
1373	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1374	<	FILL_2(dest, 0, color);
1375	<	dest += 2; length -= 2;
1376	<	}
1377	<	#endif
1378	<
1379	<	// Fill 8-byte words
1380	<	if (length >= 8) {
1381	<	const uint64 c = (((uint64)color) << 32) | color;
1382	<	const int r = (length / 8) % 8;
1383	<	dest += r * 8;
1384	<
1385	<	int n = ((length / 8) + 7) / 8;
1386	<	switch (r) {
1387	<	case 0: do {
1388	<	dest += 64;
1389	<	FILL_8(dest, -8, c);
1390	<	case 7: FILL_8(dest, -7, c);
1391	<	case 6: FILL_8(dest, -6, c);
1392	<	case 5: FILL_8(dest, -5, c);
1393	<	case 4: FILL_8(dest, -4, c);
1394	<	case 3: FILL_8(dest, -3, c);
1395	<	case 2: FILL_8(dest, -2, c);
1396	<	case 1: FILL_8(dest, -1, c);
1397	<	} while (--n > 0);
1398	<	}
1399	<	}
1400	<
1401	<	// 32-bit cell to fill?
1402	<	if (length & 4) {
1403	<	FILL_4(dest, 0, color);
1404	<	if (bpp <= 16)
1405	<	dest += 4;
1406	<	}
1407	<
1408	<	// 16-bit cell to fill?
1409	<	if (bpp <= 16 && (length & 2)) {
1410	<	FILL_2(dest, 0, color);
1411	<	if (bpp <= 8)
1412	<	dest += 2;
1413	<	}
1414	<
1415	<	// 8-bit cell to fill?
1416	<	if (bpp <= 8 && (length & 1))
1417	<	FILL_1(dest, 0, color);
1418	<
1419	<	#undef FILL_1
1420	<	#undef FILL_2
1421	<	#undef FILL_4
1422	<	#undef FILL_8
1423	<	}
1424	<
1425	<	void NQD_fillrect(uint32 p)
1426	<	{
1427	<	D(bug("accl_fillrect %08x\n", p));
1428	<
1429	<	// Get filling parameters
1430	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1431	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1432	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1433	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1434	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1435	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1436	<	D(bug(" width %d, height %d\n", width, height));
1437	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1438	<
1439	<	// And perform the fill
1440	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1441	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1442	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1443	<	width *= bpp;
1444	<	switch (bpp) {
1445	<	case 1:
1446	<	for (int i = 0; i < height; i++) {
1447	<	memset(dest, color, width);
1448	<	dest += dest_row_bytes;
1449	<	}
1450	<	break;
1451	<	case 2:
1452	<	for (int i = 0; i < height; i++) {
1453	<	do_fillrect<16>(dest, color, width);
1454	<	dest += dest_row_bytes;
1455	<	}
1456	<	break;
1457	<	case 4:
1458	<	for (int i = 0; i < height; i++) {
1459	<	do_fillrect<32>(dest, color, width);
1460	<	dest += dest_row_bytes;
1461	<	}
1462	<	break;
1463	<	}
1464	<	}
1465	<
1466	<	bool NQD_fillrect_hook(uint32 p)
1467	<	{
1468	<	D(bug("accl_fillrect_hook %08x\n", p));
1469	<
1470	<	// Check if we can accelerate this fillrect
1471	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1472	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1473	<	if (transfer_mode == 8) {
1474	<	// Fill
1475	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1476	<	return true;
1477	<	}
1478	<	else if (transfer_mode == 10) {
1479	<	// Invert
1480	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1481	<	return true;
1482	<	}
1483	<	}
1484	<	return false;
1485	<	}
1486	<
1487	<	// Rectangle blitting
1488	<	// TODO: optimize for VOSF and target pixmap == screen
1489	<	void NQD_bitblt(uint32 p)
1490	<	{
1491	<	D(bug("accl_bitblt %08x\n", p));
1492	<
1493	<	// Get blitting parameters
1494	<	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1495	<	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1496	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1497	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1498	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1499	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1500	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1501	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1502	<	D(bug(" width %d, height %d\n", width, height));
1503	<
1504	<	// And perform the blit
1505	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1506	<	width *= bpp;
1507	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1508	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1509	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1510	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1511	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1512	<	for (int i = 0; i < height; i++) {
1513	<	memmove(dst, src, width);
1514	<	src += src_row_bytes;
1515	<	dst += dst_row_bytes;
1516	<	}
1517	<	}
1518	<	else {
1519	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1520	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1521	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1522	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1523	<	for (int i = height - 1; i >= 0; i--) {
1524	<	memmove(dst, src, width);
1525	<	src -= src_row_bytes;
1526	<	dst -= dst_row_bytes;
1527	<	}
1528	<	}
1529	<	}
1530	<
1531	<	/*
1532	<	BitBlt transfer modes:
1533	<	0 : srcCopy
1534	<	1 : srcOr
1535	<	2 : srcXor
1536	<	3 : srcBic
1537	<	4 : notSrcCopy
1538	<	5 : notSrcOr
1539	<	6 : notSrcXor
1540	<	7 : notSrcBic
1541	<	32 : blend
1542	<	33 : addPin
1543	<	34 : addOver
1544	<	35 : subPin
1545	<	36 : transparent
1546	<	37 : adMax
1547	<	38 : subOver
1548	<	39 : adMin
1549	<	50 : hilite
1550	<	*/
1551	<
1552	<	bool NQD_bitblt_hook(uint32 p)
1553	<	{
1554	<	D(bug("accl_draw_hook %08x\n", p));
1555	<
1556	<	// Check if we can accelerate this bitblt
1557	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1558	<	ReadMacInt32(p + 0x130) == 0 &&
1559	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1560	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1561	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1562	<	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1563	<	ReadMacInt32(p + 0x15c) > 0) {
1564	<
1565	<	// Yes, set function pointer
1566	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1308	>	switch (e.keysym.sym) {
1309	>	case SDLK_NUMLOCK:
1310	>	case SDLK_CAPSLOCK:
1311	>	case SDLK_SCROLLOCK:
1312	>	case SDLK_RSHIFT:
1313	>	case SDLK_LSHIFT:
1314	>	case SDLK_RCTRL:
1315	>	case SDLK_LCTRL:
1316	>	case SDLK_RALT:
1317	>	case SDLK_LALT:
1318	>	case SDLK_RMETA:
1319	>	case SDLK_LMETA:
1320	>	case SDLK_LSUPER:
1321	>	case SDLK_RSUPER:
1322	>	case SDLK_MODE:
1323	>	case SDLK_COMPOSE:
1324		return true;
1325		}
1326		return false;
1327		}
1328
1329	<	// Wait for graphics operation to finish
1573	<	bool NQD_sync_hook(uint32 arg)
1574	<	{
1575	<	D(bug("accl_sync_hook %08x\n", arg));
1576	<	return true;
1577	<	}
1578	<
1579	<	void VideoInstallAccel(void)
1329	>	static bool is_ctrl_down(SDL_keysym const & ks)
1330		{
1331	<	// Install acceleration hooks
1582	<	if (PrefsFindBool("gfxaccel")) {
1583	<	D(bug("Video: Installing acceleration hooks\n"));
1584	<	uint32 base;
1585	<
1586	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1587	<	base = bitblt_hook_info.addr();
1588	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1589	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1590	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1591	<	NQDMisc(6, bitblt_hook_info.ptr());
1592	<
1593	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1594	<	base = fillrect_hook_info.addr();
1595	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1596	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1597	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1598	<	NQDMisc(6, fillrect_hook_info.ptr());
1599	<	}
1331	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1332		}
1601	–	#endif
1333
1334
1335		/*
#	Line 1606 | Line 1337 | void VideoInstallAccel(void)
1337		*  and -2 if the key was recognized as a hotkey
1338		*/
1339
1609	–	static bool is_ctrl_down(SDL_keysym const & ks)
1610	–	{
1611	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1612	–	}
1613	–
1340		static int kc_decode(SDL_keysym const & ks, bool key_down)
1341		{
1342		switch (ks.sym) {
#	Line 1680 | Line 1406 | static int kc_decode(SDL_keysym const &
1406		case SDLK_RCTRL: return 0x36;
1407		case SDLK_LSHIFT: return 0x38;
1408		case SDLK_RSHIFT: return 0x38;
1409	+	#if (defined(__APPLE__) && defined(__MACH__))
1410	+	case SDLK_LALT: return 0x3a;
1411	+	case SDLK_RALT: return 0x3a;
1412	+	case SDLK_LMETA: return 0x37;
1413	+	case SDLK_RMETA: return 0x37;
1414	+	#else
1415		case SDLK_LALT: return 0x37;
1416		case SDLK_RALT: return 0x37;
1417		case SDLK_LMETA: return 0x3a;
1418		case SDLK_RMETA: return 0x3a;
1419	+	#endif
1420		case SDLK_MENU: return 0x32;
1421		case SDLK_CAPSLOCK: return 0x39;
1422		case SDLK_NUMLOCK: return 0x47;
#	Line 1790 | Line 1523 | static void handle_events(void)
1523		// Keyboard
1524		case SDL_KEYDOWN: {
1525		int code = -1;
1526	<	if (use_keycodes) {
1526	>	if (use_keycodes && !is_modifier_key(event.key)) {
1527		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1528		code = keycode_table[event.key.keysym.scancode & 0xff];
1529		} else
#	Line 1818 | Line 1551 | static void handle_events(void)
1551		}
1552		case SDL_KEYUP: {
1553		int code = -1;
1554	<	if (use_keycodes) {
1554	>	if (use_keycodes && !is_modifier_key(event.key)) {
1555		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1556		code = keycode_table[event.key.keysym.scancode & 0xff];
1557		} else
1558		code = event2keycode(event.key, false);
1559	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1560	<	ADBKeyUp(code);
1559	>	if (code >= 0) {
1560	>	if (code == 0x39) {     // Caps Lock released
1561	>	if (caps_on) {
1562	>	ADBKeyUp(code);
1563	>	caps_on = false;
1564	>	} else {
1565	>	ADBKeyDown(code);
1566	>	caps_on = true;
1567	>	}
1568	>	} else
1569	>	ADBKeyUp(code);
1570		if (code == 0x36)
1571		ctrl_down = false;
1572		}
#	Line 1891 | Line 1633 | static void update_display_static(driver
1633
1634		// Check for first column from left and first column from right that have changed
1635		if (high) {
1636	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1636	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1637		const int src_bytes_per_row = bytes_per_row;
1638		const int dst_bytes_per_row = drv->s->pitch;
1639		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2152 | Line 1894 | static int redraw_func(void *arg)
1894		next = GetTicks_usec();
1895		ticks++;
1896
1897	+	#ifdef SHEEPSHAVER
1898	+	// Pause if requested (during video mode switches)
1899	+	if (thread_stop_req) {
1900	+	thread_stop_ack = true;
1901	+	continue;
1902	+	}
1903	+	#endif
1904	+
1905		// Handle SDL events
1906		handle_events();
1907
1908		// Refresh display
1909		video_refresh();
1910
1911	+	#ifdef SHEEPSHAVER
1912	+	// Set new cursor image if it was changed
1913	+	if (cursor_changed && sdl_cursor) {
1914	+	cursor_changed = false;
1915	+	SDL_FreeCursor(sdl_cursor);
1916	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
1917	+	if (sdl_cursor)
1918	+	SDL_SetCursor(sdl_cursor);
1919	+	}
1920	+	#endif
1921	+
1922		// Set new palette if it was changed
1923		handle_palette_changes();
1924		}

Diff Legend

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