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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.8 by gbeauche, 2004-06-26T17:20:35Z vs.
Revision 1.21 by gbeauche, 2005-11-21T23:38:46Z

#	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 21 \| Line 21
21		/*
22		* NOTES:
23		* The Ctrl key works like a qualifier for special actions:
24	<	* Ctrl-Tab = suspend DGA mode
24	>	* Ctrl-Tab = suspend DGA mode (TODO)
25		* Ctrl-Esc = emergency quit
26		* Ctrl-F1 = mount floppy
27		* Ctrl-F5 = grab mouse (in windowed mode)
28		*
29		* FIXMEs and TODOs:
30	+	* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux
31		* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?)
32		* - Mouse acceleration, there is no API in SDL yet for that
33		* - Force relative mode in Grab mode even if SDL provides absolute coordinates?
#	Line 37 \| Line 38
38		* Besides, there can't seem to be a way to call SetVideoMode() from a child thread.
39		* - Refresh performance is still slow. Use SDL_CreateRGBSurface()?
40		* - Backport hw cursor acceleration to Basilisk II?
41	<	* - Move generic Native QuickDraw acceleration routines to gfxaccel.cpp
41	>	* - Factor out code
42		*/
43
44		#include "sysdeps.h"
#	Line 57 \| Line 58
58		#include "video.h"
59		#include "video_defs.h"
60		#include "video_blit.h"
61	+	#include "vm_alloc.h"
62
63		#define DEBUG 0
64		#include "debug.h"
#	Line 82 \| Line 84 \| static int display_type = DISPLAY_WINDOW
84		#endif
85
86		// Constants
87	+	#ifdef WIN32
88	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
89	+	#else
90		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
91	+	#endif
92
93
94		// Global variables
#	Line 95 \| Line 101 \| *static uint8 the_buffer_copy = NULL;**
101		static uint32 the_buffer_size; // Size of allocated the_buffer
102
103		static bool redraw_thread_active = false; // Flag: Redraw thread installed
104	+	#ifndef USE_CPU_EMUL_SERVICES
105		static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread
106		static SDL_Thread *redraw_thread = NULL; // Redraw thread
107	+	#ifdef SHEEPSHAVER
108	+	static volatile bool thread_stop_req = false;
109	+	static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req
110	+	#endif
111	+	#endif
112
113		#ifdef ENABLE_VOSF
114		static bool use_vosf = false; // Flag: VOSF enabled
#	Line 146 \| Line 158 \| extern void SysMountFirstFloppy(void);
158
159
160		/*
161	+	* SDL surface locking glue
162	+	*/
163	+
164	+	#ifdef ENABLE_VOSF
165	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \
166	+	if ((SURFACE)->flags & (SDL_HWSURFACE \| SDL_FULLSCREEN)) \
167	+	the_host_buffer = (uint8 *)(SURFACE)->pixels; \
168	+	} while (0)
169	+	#else
170	+	#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE)
171	+	#endif
172	+
173	+	#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \
174	+	if (SDL_MUSTLOCK(SURFACE)) { \
175	+	SDL_LockSurface(SURFACE); \
176	+	SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \
177	+	} \
178	+	} while (0)
179	+
180	+	#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \
181	+	if (SDL_MUSTLOCK(SURFACE)) \
182	+	SDL_UnlockSurface(SURFACE); \
183	+	} while (0)
184	+
185	+
186	+	/*
187	+	* Framebuffer allocation routines
188	+	*/
189	+
190	+	static void *vm_acquire_framebuffer(uint32 size)
191	+	{
192	+	return vm_acquire(size);
193	+	}
194	+
195	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
196	+	{
197	+	vm_release(fb, size);
198	+	}
199	+
200	+
201	+	/*
202		* SheepShaver glue
203		*/
204
#	Line 325 \| Line 378 \| static inline int bytes_per_pixel(int de
378		}
379
380		// Map video_mode depth ID to numerical depth value
381	<	static int sdl_depth_of_video_depth(int video_depth)
381	>	static int mac_depth_of_video_depth(int video_depth)
382		{
383		int depth = -1;
384		switch (video_depth) {
#	Line 353 \| Line 406 \| static int sdl_depth_of_video_depth(int
406		return depth;
407		}
408
409	+	// Map video_mode depth ID to SDL screen depth
410	+	static int sdl_depth_of_video_depth(int video_depth)
411	+	{
412	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
413	+	}
414	+
415		// Check wether specified mode is available
416		static bool has_mode(int type, int width, int height)
417		{
359	–	// FIXME: no fullscreen support yet
360	–	if (type == DISPLAY_SCREEN)
361	–	return false;
362	–
418		#ifdef SHEEPSHAVER
419		// Filter out Classic resolutiosn
420		if (width == 512 && height == 384)
421		return false;
422
423	<	// Read window modes prefs
423	>	// "screen" prefs items always succeeds
424	>	if (PrefsFindString("screen"))
425	>	return true;
426	>
427	>	// Read window & screen modes prefs
428		static uint32 window_modes = 0;
429		static uint32 screen_modes = 0;
430		if (window_modes == 0 \|\| screen_modes == 0) {
#	Line 375 \| Line 434 \| static bool has_mode(int type, int width
434		window_modes \|= 3; // Allow at least 640x480 and 800x600 window modes
435		}
436
437	<	if (type == DISPLAY_WINDOW) {
438	<	int apple_mask, apple_id = find_apple_resolution(width, height);
439	<	switch (apple_id) {
440	<	case APPLE_640x480: apple_mask = 0x01; break;
441	<	case APPLE_800x600: apple_mask = 0x02; break;
442	<	case APPLE_1024x768: apple_mask = 0x04; break;
443	<	case APPLE_1152x768: apple_mask = 0x40; break;
444	<	case APPLE_1152x900: apple_mask = 0x08; break;
445	<	case APPLE_1280x1024: apple_mask = 0x10; break;
446	<	case APPLE_1600x1200: apple_mask = 0x20; break;
447	<	default: apple_mask = 0x00; break;
389	<	}
390	<	return (window_modes & apple_mask);
437	>	int test_modes;
438	>	switch (type) {
439	>	case DISPLAY_WINDOW:
440	>	test_modes = window_modes;
441	>	break;
442	>	case DISPLAY_SCREEN:
443	>	test_modes = screen_modes;
444	>	break;
445	>	default:
446	>	test_modes = 0;
447	>	break;
448		}
449	<	#else
450	<	return true;
449	>
450	>	int apple_mask;
451	>	switch (find_apple_resolution(width, height)) {
452	>	case APPLE_640x480: apple_mask = 0x01; break;
453	>	case APPLE_800x600: apple_mask = 0x02; break;
454	>	case APPLE_1024x768: apple_mask = 0x04; break;
455	>	case APPLE_1152x768: apple_mask = 0x40; break;
456	>	case APPLE_1152x900: apple_mask = 0x08; break;
457	>	case APPLE_1280x1024: apple_mask = 0x10; break;
458	>	case APPLE_1600x1200: apple_mask = 0x20; break;
459	>	default: apple_mask = 0x00; break;
460	>	}
461	>	return (test_modes & apple_mask);
462		#endif
463	<	return false;
463	>	return true;
464		}
465
466		// Add mode to list of supported modes
#	Line 413 \| Line 481 \| static void add_mode(int type, int width
481		VIDEO_MODE_Y = height;
482		VIDEO_MODE_RESOLUTION = resolution_id;
483		VIDEO_MODE_ROW_BYTES = bytes_per_row;
484	<	VIDEO_MODE_DEPTH = depth;
484	>	VIDEO_MODE_DEPTH = (video_depth)depth;
485		VideoModes.push_back(mode);
486		}
487
#	Line 469 \| Line 537 \| static void set_window_name(int name)
537		// Set mouse grab mode
538		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
539		{
540	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
540	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
541		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
542		}
543
#	Line 528 \| Line 596 \| private:
596		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
597		};
598
599	+	class driver_fullscreen : public driver_base {
600	+	public:
601	+	driver_fullscreen(SDL_monitor_desc &monitor);
602	+	~driver_fullscreen();
603	+	};
604	+
605		static driver_base *drv = NULL; // Pointer to currently used driver object
606
607		#ifdef ENABLE_VOSF
#	Line 549 \| Line 623 \| driver_base::~driver_base()
623		if (s)
624		SDL_FreeSurface(s);
625
626	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
627	+	if (the_buffer != VM_MAP_FAILED) {
628	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
629	+	vm_release_framebuffer(the_buffer, the_buffer_size);
630	+	the_buffer = NULL;
631	+	}
632	+
633		// Free frame buffer(s)
634		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
635		if (the_buffer_copy) {
636		free(the_buffer_copy);
637		the_buffer_copy = NULL;
#	Line 562 \| Line 639 \| driver_base::~driver_base()
639		}
640		#ifdef ENABLE_VOSF
641		else {
565	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
566	–	if (the_buffer != VM_MAP_FAILED) {
567	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
568	–	vm_release(the_buffer, the_buffer_size);
569	–	the_buffer = NULL;
570	–	}
642		if (the_host_buffer) {
643		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
644		free(the_host_buffer);
#	Line 578 \| Line 649 \| driver_base::~driver_base()
649		free(the_buffer_copy);
650		the_buffer_copy = NULL;
651		}
652	+
653	+	// Deinitialize VOSF
654	+	video_vosf_exit();
655		}
656		#endif
657		}
#	Line 587 \| Line 661 \| void driver_base::update_palette(void)
661		{
662		const VIDEO_MODE &mode = monitor.get_current_mode();
663
664	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
664	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
665		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
666		}
667
#	Line 618 \| Line 692 \| driver_window::driver_window(SDL_monitor
692		ADBSetRelMouseMode(mouse_grabbed);
693
694		// Create surface
695	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
695	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
696		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
697		return;
698
#	Line 627 \| Line 701 \| driver_window::driver_window(SDL_monitor
701		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
702		the_host_buffer = (uint8 *)s->pixels;
703		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
704	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
704	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
705		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
706		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
707
#	Line 651 \| Line 725 \| driver_window::driver_window(SDL_monitor
725		// Allocate memory for frame buffer
726		the_buffer_size = (aligned_height + 2) * s->pitch;
727		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
728	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
728	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
729		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
730		}
731
#	Line 676 \| Line 750 \| driver_window::driver_window(SDL_monitor
750		visualFormat.Rmask = f->Rmask;
751		visualFormat.Gmask = f->Gmask;
752		visualFormat.Bmask = f->Bmask;
753	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
753	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
754
755		// Load gray ramp to 8->16/32 expand map
756		if (!IsDirectMode(mode))
#	Line 743 \| Line 817 \| void driver_window::mouse_moved(int x, i
817		ADBMouseMoved(x, y);
818		}
819
820	+
821	+	/*
822	+	* Full-screen display driver
823	+	*/
824	+
825	+	// Open display
826	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
827	+	: driver_base(m)
828	+	{
829	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
830	+	int aligned_width = (width + 15) & ~15;
831	+	int aligned_height = (height + 15) & ~15;
832	+
833	+	// Set absolute mouse mode
834	+	ADBSetRelMouseMode(false);
835	+
836	+	// Create surface
837	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
838	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE \| SDL_FULLSCREEN)) == NULL)
839	+	return;
840	+
841	+	#ifdef ENABLE_VOSF
842	+	use_vosf = true;
843	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
844	+	the_host_buffer = (uint8 *)s->pixels;
845	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
846	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
847	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
848	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
849	+
850	+	// Check whether we can initialize the VOSF subsystem and it's profitable
851	+	if (!video_vosf_init(m)) {
852	+	WarningAlert(STR_VOSF_INIT_ERR);
853	+	use_vosf = false;
854	+	}
855	+	else if (!video_vosf_profitable()) {
856	+	video_vosf_exit();
857	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
858	+	use_vosf = false;
859	+	}
860	+	if (!use_vosf) {
861	+	free(the_buffer_copy);
862	+	vm_release(the_buffer, the_buffer_size);
863	+	the_host_buffer = NULL;
864	+	}
865	+	#endif
866	+	if (!use_vosf) {
867	+	// Allocate memory for frame buffer
868	+	the_buffer_size = (aligned_height + 2) * s->pitch;
869	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
870	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
871	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
872	+	}
873	+
874	+	// Hide cursor
875	+	SDL_ShowCursor(0);
876	+
877	+	// Init blitting routines
878	+	SDL_PixelFormat *f = s->format;
879	+	VisualFormat visualFormat;
880	+	visualFormat.depth = depth;
881	+	visualFormat.Rmask = f->Rmask;
882	+	visualFormat.Gmask = f->Gmask;
883	+	visualFormat.Bmask = f->Bmask;
884	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
885	+
886	+	// Load gray ramp to 8->16/32 expand map
887	+	if (!IsDirectMode(mode))
888	+	for (int i=0; i<256; i++)
889	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
890	+
891	+	// Set frame buffer base
892	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
893	+
894	+	// Everything went well
895	+	init_ok = true;
896	+	}
897	+
898	+	// Close display
899	+	driver_fullscreen::~driver_fullscreen()
900	+	{
901	+	#ifdef ENABLE_VOSF
902	+	if (use_vosf)
903	+	the_host_buffer = NULL; // don't free() in driver_base dtor
904	+	#endif
905	+	if (s)
906	+	SDL_FreeSurface(s);
907	+
908	+	// Show cursor
909	+	SDL_ShowCursor(1);
910	+	}
911	+
912	+
913		/*
914		* Initialization
915		*/
#	Line 774 \| Line 941 \| static void keycode_init(void)
941		SDL_VideoDriverName(video_driver, sizeof(video_driver));
942		bool video_driver_found = false;
943		char line[256];
944	+	int n_keys = 0;
945		while (fgets(line, sizeof(line) - 1, f)) {
946		// Read line
947		int len = strlen(line);
#	Line 786 \| Line 954 \| static void keycode_init(void)
954		continue;
955
956		if (video_driver_found) {
957	<	// Skip aliases
958	<	static const char alias_str[] = "alias";
959	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
957	>	// Skip aliases as long as we have read keycodes yet
958	>	// Otherwise, it's another mapping and we have to stop
959	>	static const char sdl_str[] = "sdl";
960	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
961		continue;
962
963		// Read keycode
964		int x_code, mac_code;
965		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
966	<	keycode_table[x_code & 0xff] = mac_code;
966	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
967		else
968		break;
969		} else {
970		// Search for SDL video driver string
971	<	static const char alias_sdl_str[] = "alias SDL";
972	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
973	<	char *p = line + sizeof(alias_sdl_str);
971	>	static const char sdl_str[] = "sdl";
972	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
973	>	char *p = line + sizeof(sdl_str);
974		if (strstr(video_driver, p) == video_driver)
975		video_driver_found = true;
976		}
#	Line 819 \| Line 988 \| static void keycode_init(void)
988		WarningAlert(str);
989		return;
990		}
991	+
992	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
993		}
994		}
995
#	Line 837 \| Line 1008 \| bool SDL_monitor_desc::video_open(void)
1008		case DISPLAY_WINDOW:
1009		drv = new(std::nothrow) driver_window(*this);
1010		break;
1011	+	case DISPLAY_SCREEN:
1012	+	drv = new(std::nothrow) driver_fullscreen(*this);
1013	+	break;
1014		}
1015		if (drv == NULL)
1016		return false;
#	Line 853 \| Line 1027 \| bool SDL_monitor_desc::video_open(void)
1027		LOCK_FRAME_BUFFER;
1028
1029		// Start redraw/input thread
1030	+	#ifndef USE_CPU_EMUL_SERVICES
1031		redraw_thread_cancel = false;
1032		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1033		if (!redraw_thread_active) {
1034		printf("FATAL: cannot create redraw thread\n");
1035		return false;
1036		}
1037	+	#else
1038	+	redraw_thread_active = true;
1039	+	#endif
1040		return true;
1041		}
1042
#	Line 894 \| Line 1072 \| bool VideoInit(bool classic)
1072
1073		// Get screen mode from preferences
1074		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1075		if (classic_mode)
1076		mode_str = "win/512/342";
1077		else
1078		mode_str = PrefsFindString("screen");
902	–	#endif
1079
1080		// Determine display type and default dimensions
1081		int default_width, default_height;
#	Line 915 \| Line 1091 \| bool VideoInit(bool classic)
1091		if (mode_str) {
1092		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1093		display_type = DISPLAY_WINDOW;
1094	+	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1095	+	display_type = DISPLAY_SCREEN;
1096		}
1097		int max_width = 640, max_height = 480;
1098		SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN \| SDL_HWSURFACE);
1099		if (modes && modes != (SDL_Rect **)-1) {
1100	<	max_width = modes[0]->w;
1101	<	max_height = modes[0]->h;
1100	>	// It turns out that on some implementations, and contrary to the documentation,
1101	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
1102	>	for (int i = 0; modes[i] != NULL; i++) {
1103	>	const int w = modes[i]->w;
1104	>	const int h = modes[i]->h;
1105	>	if (w > max_width && h > max_height) {
1106	>	max_width = w;
1107	>	max_height = h;
1108	>	}
1109	>	}
1110		if (default_width > max_width)
1111		default_width = max_width;
1112		if (default_height > max_height)
#	Line 955 \| Line 1141 \| bool VideoInit(bool classic)
1141		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1142		else {
1143		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1144	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1144	>	int bpp = sdl_depth_of_video_depth(d);
1145		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1146		add_window_modes(video_depth(d));
1147		}
1148		}
1149	<	} else
1150	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1149	>	} else if (display_type == DISPLAY_SCREEN) {
1150	>	struct {
1151	>	int w;
1152	>	int h;
1153	>	int resolution_id;
1154	>	}
1155	>	video_modes[] = {
1156	>	{ -1, -1, 0x80 },
1157	>	{ 640, 480, 0x81 },
1158	>	{ 800, 600, 0x82 },
1159	>	{ 1024, 768, 0x83 },
1160	>	{ 1152, 870, 0x84 },
1161	>	{ 1280, 1024, 0x85 },
1162	>	{ 1600, 1200, 0x86 },
1163	>	{ 0, }
1164	>	};
1165	>	video_modes[0].w = default_width;
1166	>	video_modes[0].h = default_height;
1167	>
1168	>	for (int i = 0; video_modes[i].w != 0; i++) {
1169	>	const int w = video_modes[i].w;
1170	>	const int h = video_modes[i].h;
1171	>	if (i > 0 && (w >= default_width \|\| h >= default_height))
1172	>	continue;
1173	>	#ifdef ENABLE_VOSF
1174	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1175	>	int bpp = sdl_depth_of_video_depth(d);
1176	>	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE \| SDL_FULLSCREEN))
1177	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1178	>	}
1179	>	#else
1180	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1181	>	#endif
1182	>	}
1183	>	}
1184	>
1185		if (VideoModes.empty()) {
1186		ErrorAlert(STR_NO_XVISUAL_ERR);
1187		return false;
#	Line 1033 \| Line 1253 \| void SDL_monitor_desc::video_close(void)
1253		D(bug("video_close()\n"));
1254
1255		// Stop redraw thread
1256	+	#ifndef USE_CPU_EMUL_SERVICES
1257		if (redraw_thread_active) {
1258		redraw_thread_cancel = true;
1259		SDL_WaitThread(redraw_thread, NULL);
1260		}
1261	+	#endif
1262		redraw_thread_active = false;
1263
1264		// Unlock frame buffer
1265		UNLOCK_FRAME_BUFFER;
1266		D(bug(" frame buffer unlocked\n"));
1267
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1268		// Close display
1269		delete drv;
1270		drv = NULL;
#	Line 1147 \| Line 1362 \| void SDL_monitor_desc::set_palette(uint8
1362		const VIDEO_MODE &mode = get_current_mode();
1363
1364		// FIXME: how can we handle the gamma ramp?
1365	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1365	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1366		return;
1367
1368		LOCK_PALETTE;
#	Line 1208 \| Line 1423 \| *int16 video_mode_change(VidLocals csSav**
1423		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1424		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1425
1426	<	// Disable interrupts
1426	>	// Disable interrupts and pause redraw thread
1427		DisableInterrupt();
1428	+	thread_stop_ack = false;
1429	+	thread_stop_req = true;
1430	+	while (!thread_stop_ack) ;
1431
1432		cur_mode = i;
1433		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 \| Line 1438 \| *int16 video_mode_change(VidLocals csSav**
1438		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1439		csSave->saveMode=VModes[cur_mode].viAppleMode;
1440
1441	<	// Enable interrupts
1441	>	// Enable interrupts and resume redraw thread
1442	>	thread_stop_req = false;
1443		EnableInterrupt();
1444		return noErr;
1445		}
#	Line 1267 \| Line 1486 \| void video_set_cursor(void)
1486
1487
1488		/*
1489	<	* Install graphics acceleration
1489	>	* Keyboard-related utilify functions
1490		*/
1491
1492	<	#ifdef SHEEPSHAVER
1274	<	// Rectangle inversion
1275	<	template< int bpp >
1276	<	static inline void do_invrect(uint8 *dest, uint32 length)
1492	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1493		{
1494	<	#define INVERT_1(PTR, OFS) ((uint8 )(PTR))[OFS] = ~((uint8 )(PTR))[OFS]
1495	<	#define INVERT_2(PTR, OFS) ((uint16 )(PTR))[OFS] = ~((uint16 )(PTR))[OFS]
1496	<	#define INVERT_4(PTR, OFS) ((uint32 )(PTR))[OFS] = ~((uint32 )(PTR))[OFS]
1497	<	#define INVERT_8(PTR, OFS) ((uint64 )(PTR))[OFS] = ~((uint64 )(PTR))[OFS]
1498	<
1499	<	#ifndef UNALIGNED_PROFITABLE
1500	<	// Align on 16-bit boundaries
1501	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1502	<	INVERT_1(dest, 0);
1503	<	dest += 1; length -= 1;
1504	<	}
1505	<
1506	<	// Align on 32-bit boundaries
1507	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1508	<	INVERT_2(dest, 0);
1509	<	dest += 2; length -= 2;
1294	<	}
1295	<	#endif
1296	<
1297	<	// Invert 8-byte words
1298	<	if (length >= 8) {
1299	<	const int r = (length / 8) % 8;
1300	<	dest += r * 8;
1301	<
1302	<	int n = ((length / 8) + 7) / 8;
1303	<	switch (r) {
1304	<	case 0: do {
1305	<	dest += 64;
1306	<	INVERT_8(dest, -8);
1307	<	case 7: INVERT_8(dest, -7);
1308	<	case 6: INVERT_8(dest, -6);
1309	<	case 5: INVERT_8(dest, -5);
1310	<	case 4: INVERT_8(dest, -4);
1311	<	case 3: INVERT_8(dest, -3);
1312	<	case 2: INVERT_8(dest, -2);
1313	<	case 1: INVERT_8(dest, -1);
1314	<	} while (--n > 0);
1315	<	}
1316	<	}
1317	<
1318	<	// 32-bit cell to invert?
1319	<	if (length & 4) {
1320	<	INVERT_4(dest, 0);
1321	<	if (bpp <= 16)
1322	<	dest += 4;
1323	<	}
1324	<
1325	<	// 16-bit cell to invert?
1326	<	if (bpp <= 16 && (length & 2)) {
1327	<	INVERT_2(dest, 0);
1328	<	if (bpp <= 8)
1329	<	dest += 2;
1330	<	}
1331	<
1332	<	// 8-bit cell to invert?
1333	<	if (bpp <= 8 && (length & 1))
1334	<	INVERT_1(dest, 0);
1335	<
1336	<	#undef INVERT_1
1337	<	#undef INVERT_2
1338	<	#undef INVERT_4
1339	<	#undef INVERT_8
1340	<	}
1341	<
1342	<	void NQD_invrect(uint32 p)
1343	<	{
1344	<	D(bug("accl_invrect %08x\n", p));
1345	<
1346	<	// Get inversion parameters
1347	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1348	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1349	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1350	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1351	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1352	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1353	<
1354	<	//!!?? pen_mode == 14
1355	<
1356	<	// And perform the inversion
1357	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1358	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1359	<	uint8 dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dest_row_bytes) + (dest_X * bpp));
1360	<	width *= bpp;
1361	<	switch (bpp) {
1362	<	case 1:
1363	<	for (int i = 0; i < height; i++) {
1364	<	do_invrect<8>(dest, width);
1365	<	dest += dest_row_bytes;
1366	<	}
1367	<	break;
1368	<	case 2:
1369	<	for (int i = 0; i < height; i++) {
1370	<	do_invrect<16>(dest, width);
1371	<	dest += dest_row_bytes;
1372	<	}
1373	<	break;
1374	<	case 4:
1375	<	for (int i = 0; i < height; i++) {
1376	<	do_invrect<32>(dest, width);
1377	<	dest += dest_row_bytes;
1378	<	}
1379	<	break;
1380	<	}
1381	<	}
1382	<
1383	<	// Rectangle filling
1384	<	template< int bpp >
1385	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1386	<	{
1387	<	#define FILL_1(PTR, OFS, VAL) ((uint8 *)(PTR))[OFS] = (VAL)
1388	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1389	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1390	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1391	<
1392	<	#ifndef UNALIGNED_PROFITABLE
1393	<	// Align on 16-bit boundaries
1394	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1395	<	FILL_1(dest, 0, color);
1396	<	dest += 1; length -= 1;
1397	<	}
1398	<
1399	<	// Align on 32-bit boundaries
1400	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1401	<	FILL_2(dest, 0, color);
1402	<	dest += 2; length -= 2;
1403	<	}
1404	<	#endif
1405	<
1406	<	// Fill 8-byte words
1407	<	if (length >= 8) {
1408	<	const uint64 c = (((uint64)color) << 32) \| color;
1409	<	const int r = (length / 8) % 8;
1410	<	dest += r * 8;
1411	<
1412	<	int n = ((length / 8) + 7) / 8;
1413	<	switch (r) {
1414	<	case 0: do {
1415	<	dest += 64;
1416	<	FILL_8(dest, -8, c);
1417	<	case 7: FILL_8(dest, -7, c);
1418	<	case 6: FILL_8(dest, -6, c);
1419	<	case 5: FILL_8(dest, -5, c);
1420	<	case 4: FILL_8(dest, -4, c);
1421	<	case 3: FILL_8(dest, -3, c);
1422	<	case 2: FILL_8(dest, -2, c);
1423	<	case 1: FILL_8(dest, -1, c);
1424	<	} while (--n > 0);
1425	<	}
1426	<	}
1427	<
1428	<	// 32-bit cell to fill?
1429	<	if (length & 4) {
1430	<	FILL_4(dest, 0, color);
1431	<	if (bpp <= 16)
1432	<	dest += 4;
1433	<	}
1434	<
1435	<	// 16-bit cell to fill?
1436	<	if (bpp <= 16 && (length & 2)) {
1437	<	FILL_2(dest, 0, color);
1438	<	if (bpp <= 8)
1439	<	dest += 2;
1440	<	}
1441	<
1442	<	// 8-bit cell to fill?
1443	<	if (bpp <= 8 && (length & 1))
1444	<	FILL_1(dest, 0, color);
1445	<
1446	<	#undef FILL_1
1447	<	#undef FILL_2
1448	<	#undef FILL_4
1449	<	#undef FILL_8
1450	<	}
1451	<
1452	<	void NQD_fillrect(uint32 p)
1453	<	{
1454	<	D(bug("accl_fillrect %08x\n", p));
1455	<
1456	<	// Get filling parameters
1457	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1458	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1459	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1460	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1461	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1462	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1463	<	D(bug(" width %d, height %d\n", width, height));
1464	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1465	<
1466	<	// And perform the fill
1467	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1468	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1469	<	uint8 dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dest_row_bytes) + (dest_X * bpp));
1470	<	width *= bpp;
1471	<	switch (bpp) {
1472	<	case 1:
1473	<	for (int i = 0; i < height; i++) {
1474	<	memset(dest, color, width);
1475	<	dest += dest_row_bytes;
1476	<	}
1477	<	break;
1478	<	case 2:
1479	<	for (int i = 0; i < height; i++) {
1480	<	do_fillrect<16>(dest, color, width);
1481	<	dest += dest_row_bytes;
1482	<	}
1483	<	break;
1484	<	case 4:
1485	<	for (int i = 0; i < height; i++) {
1486	<	do_fillrect<32>(dest, color, width);
1487	<	dest += dest_row_bytes;
1488	<	}
1489	<	break;
1490	<	}
1491	<	}
1492	<
1493	<	bool NQD_fillrect_hook(uint32 p)
1494	<	{
1495	<	D(bug("accl_fillrect_hook %08x\n", p));
1496	<
1497	<	// Check if we can accelerate this fillrect
1498	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1499	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1500	<	if (transfer_mode == 8) {
1501	<	// Fill
1502	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1503	<	return true;
1504	<	}
1505	<	else if (transfer_mode == 10) {
1506	<	// Invert
1507	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1508	<	return true;
1509	<	}
1510	<	}
1511	<	return false;
1512	<	}
1513	<
1514	<	// Rectangle blitting
1515	<	// TODO: optimize for VOSF and target pixmap == screen
1516	<	void NQD_bitblt(uint32 p)
1517	<	{
1518	<	D(bug("accl_bitblt %08x\n", p));
1519	<
1520	<	// Get blitting parameters
1521	<	int16 src_X = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1522	<	int16 src_Y = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1523	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1524	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1525	<	int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1526	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1527	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1528	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1529	<	D(bug(" width %d, height %d\n", width, height));
1530	<
1531	<	// And perform the blit
1532	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1533	<	width *= bpp;
1534	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1535	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1536	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1537	<	uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y src_row_bytes) + (src_X * bpp));
1538	<	uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y dst_row_bytes) + (dest_X * bpp));
1539	<	for (int i = 0; i < height; i++) {
1540	<	memmove(dst, src, width);
1541	<	src += src_row_bytes;
1542	<	dst += dst_row_bytes;
1543	<	}
1544	<	}
1545	<	else {
1546	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1547	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1548	<	uint8 src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) src_row_bytes) + (src_X * bpp));
1549	<	uint8 dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) dst_row_bytes) + (dest_X * bpp));
1550	<	for (int i = height - 1; i >= 0; i--) {
1551	<	memmove(dst, src, width);
1552	<	src -= src_row_bytes;
1553	<	dst -= dst_row_bytes;
1554	<	}
1555	<	}
1556	<	}
1557	<
1558	<	/*
1559	<	BitBlt transfer modes:
1560	<	0 : srcCopy
1561	<	1 : srcOr
1562	<	2 : srcXor
1563	<	3 : srcBic
1564	<	4 : notSrcCopy
1565	<	5 : notSrcOr
1566	<	6 : notSrcXor
1567	<	7 : notSrcBic
1568	<	32 : blend
1569	<	33 : addPin
1570	<	34 : addOver
1571	<	35 : subPin
1572	<	36 : transparent
1573	<	37 : adMax
1574	<	38 : subOver
1575	<	39 : adMin
1576	<	50 : hilite
1577	<	*/
1578	<
1579	<	bool NQD_bitblt_hook(uint32 p)
1580	<	{
1581	<	D(bug("accl_draw_hook %08x\n", p));
1582	<
1583	<	// Check if we can accelerate this bitblt
1584	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1585	<	ReadMacInt32(p + 0x130) == 0 &&
1586	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1587	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1588	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1589	<	ReadMacInt32(p + acclTransferMode) == 0 && // srcCopy?
1590	<	ReadMacInt32(p + 0x15c) > 0) {
1591	<
1592	<	// Yes, set function pointer
1593	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1494	>	switch (e.keysym.sym) {
1495	>	case SDLK_NUMLOCK:
1496	>	case SDLK_CAPSLOCK:
1497	>	case SDLK_SCROLLOCK:
1498	>	case SDLK_RSHIFT:
1499	>	case SDLK_LSHIFT:
1500	>	case SDLK_RCTRL:
1501	>	case SDLK_LCTRL:
1502	>	case SDLK_RALT:
1503	>	case SDLK_LALT:
1504	>	case SDLK_RMETA:
1505	>	case SDLK_LMETA:
1506	>	case SDLK_LSUPER:
1507	>	case SDLK_RSUPER:
1508	>	case SDLK_MODE:
1509	>	case SDLK_COMPOSE:
1510		return true;
1511		}
1512		return false;
1513		}
1514
1515	<	// Wait for graphics operation to finish
1600	<	bool NQD_sync_hook(uint32 arg)
1601	<	{
1602	<	D(bug("accl_sync_hook %08x\n", arg));
1603	<	return true;
1604	<	}
1605	<
1606	<	void VideoInstallAccel(void)
1515	>	static bool is_ctrl_down(SDL_keysym const & ks)
1516		{
1517	<	// Install acceleration hooks
1609	<	if (PrefsFindBool("gfxaccel")) {
1610	<	D(bug("Video: Installing acceleration hooks\n"));
1611	<	uint32 base;
1612	<
1613	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1614	<	base = bitblt_hook_info.addr();
1615	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1616	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1617	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1618	<	NQDMisc(6, bitblt_hook_info.ptr());
1619	<
1620	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1621	<	base = fillrect_hook_info.addr();
1622	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1623	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1624	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1625	<	NQDMisc(6, fillrect_hook_info.ptr());
1626	<	}
1517	>	return ctrl_down \|\| (ks.mod & KMOD_CTRL);
1518		}
1628	–	#endif
1519
1520
1521		/*
#	Line 1633 \| Line 1523 \| void VideoInstallAccel(void)
1523		* and -2 if the key was recognized as a hotkey
1524		*/
1525
1636	–	static bool is_ctrl_down(SDL_keysym const & ks)
1637	–	{
1638	–	return ctrl_down \|\| (ks.mod & KMOD_CTRL);
1639	–	}
1640	–
1526		static int kc_decode(SDL_keysym const & ks, bool key_down)
1527		{
1528		switch (ks.sym) {
#	Line 1670 \| Line 1555 \| static int kc_decode(SDL_keysym const &
1555
1556		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1557		case SDLK_2: case SDLK_AT: return 0x13;
1558	<	// case SDLK_3: case SDLK_numbersign: return 0x14;
1558	>	case SDLK_3: case SDLK_HASH: return 0x14;
1559		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1560	<	// case SDLK_5: case SDLK_percent: return 0x17;
1560	>	case SDLK_5: return 0x17;
1561		case SDLK_6: return 0x16;
1562		case SDLK_7: return 0x1a;
1563		case SDLK_8: return 0x1c;
1564		case SDLK_9: return 0x19;
1565		case SDLK_0: return 0x1d;
1566
1567	<	// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1567	>	case SDLK_BACKQUOTE: return 0x0a;
1568		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1569		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1570	<	// case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1571	<	// case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1572	<	// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1570	>	case SDLK_LEFTBRACKET: return 0x21;
1571	>	case SDLK_RIGHTBRACKET: return 0x1e;
1572	>	case SDLK_BACKSLASH: return 0x2a;
1573		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1574	<	// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1574	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1575		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1576		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1577		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1707 \| Line 1592 \| static int kc_decode(SDL_keysym const &
1592		case SDLK_RCTRL: return 0x36;
1593		case SDLK_LSHIFT: return 0x38;
1594		case SDLK_RSHIFT: return 0x38;
1595	+	#if (defined(__APPLE__) && defined(__MACH__))
1596	+	case SDLK_LALT: return 0x3a;
1597	+	case SDLK_RALT: return 0x3a;
1598	+	case SDLK_LMETA: return 0x37;
1599	+	case SDLK_RMETA: return 0x37;
1600	+	#else
1601		case SDLK_LALT: return 0x37;
1602		case SDLK_RALT: return 0x37;
1603		case SDLK_LMETA: return 0x3a;
1604		case SDLK_RMETA: return 0x3a;
1605	+	#endif
1606	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1607	+	case SDLK_RSUPER: return 0x3a;
1608		case SDLK_MENU: return 0x32;
1609		case SDLK_CAPSLOCK: return 0x39;
1610		case SDLK_NUMLOCK: return 0x47;
#	Line 1817 \| Line 1711 \| static void handle_events(void)
1711		// Keyboard
1712		case SDL_KEYDOWN: {
1713		int code = -1;
1714	<	if (use_keycodes) {
1714	>	if (use_keycodes && !is_modifier_key(event.key)) {
1715		if (event2keycode(event.key, true) != -2) // This is called to process the hotkeys
1716		code = keycode_table[event.key.keysym.scancode & 0xff];
1717		} else
#	Line 1845 \| Line 1739 \| static void handle_events(void)
1739		}
1740		case SDL_KEYUP: {
1741		int code = -1;
1742	<	if (use_keycodes) {
1742	>	if (use_keycodes && !is_modifier_key(event.key)) {
1743		if (event2keycode(event.key, false) != -2) // This is called to process the hotkeys
1744		code = keycode_table[event.key.keysym.scancode & 0xff];
1745		} else
1746		code = event2keycode(event.key, false);
1747	<	if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases
1748	<	ADBKeyUp(code);
1747	>	if (code >= 0) {
1748	>	if (code == 0x39) { // Caps Lock released
1749	>	if (caps_on) {
1750	>	ADBKeyUp(code);
1751	>	caps_on = false;
1752	>	} else {
1753	>	ADBKeyDown(code);
1754	>	caps_on = true;
1755	>	}
1756	>	} else
1757	>	ADBKeyUp(code);
1758		if (code == 0x36)
1759		ctrl_down = false;
1760		}
#	Line 1918 \| Line 1821 \| static void update_display_static(driver
1821
1822		// Check for first column from left and first column from right that have changed
1823		if (high) {
1824	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1824	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1825		const int src_bytes_per_row = bytes_per_row;
1826		const int dst_bytes_per_row = drv->s->pitch;
1827		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2095 \| Line 1998 \| static void video_refresh_dga_vosf(void)
1998		tick_counter = 0;
1999		if (mainBuffer.dirty) {
2000		LOCK_VOSF;
2001	<	update_display_dga_vosf();
2001	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
2002		UNLOCK_VOSF;
2003		}
2004		}
#	Line 2159 \| Line 2062 \| static void VideoRefreshInit(void)
2062		}
2063		}
2064
2065	+	static inline void do_video_refresh(void)
2066	+	{
2067	+	// Handle SDL events
2068	+	handle_events();
2069	+
2070	+	// Update display
2071	+	video_refresh();
2072	+
2073	+	#ifdef SHEEPSHAVER
2074	+	// Set new cursor image if it was changed
2075	+	if (cursor_changed && sdl_cursor) {
2076	+	cursor_changed = false;
2077	+	SDL_FreeCursor(sdl_cursor);
2078	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2079	+	if (sdl_cursor)
2080	+	SDL_SetCursor(sdl_cursor);
2081	+	}
2082	+	#endif
2083	+
2084	+	// Set new palette if it was changed
2085	+	handle_palette_changes();
2086	+	}
2087	+
2088	+	// This function is called on non-threaded platforms from a timer interrupt
2089	+	void VideoRefresh(void)
2090	+	{
2091	+	// We need to check redraw_thread_active to inhibit refreshed during
2092	+	// mode changes on non-threaded platforms
2093	+	if (!redraw_thread_active)
2094	+	return;
2095	+
2096	+	// Process pending events and update display
2097	+	do_video_refresh();
2098	+	}
2099	+
2100		const int VIDEO_REFRESH_HZ = 60;
2101		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2102
2103	+	#ifndef USE_CPU_EMUL_SERVICES
2104		static int redraw_func(void *arg)
2105		{
2106		uint64 start = GetTicks_usec();
#	Line 2179 \| Line 2118 \| *static int redraw_func(void arg)**
2118		next = GetTicks_usec();
2119		ticks++;
2120
2182	–	// Handle SDL events
2183	–	handle_events();
2184	–
2185	–	// Refresh display
2186	–	video_refresh();
2187	–
2121		#ifdef SHEEPSHAVER
2122	<	// Set new cursor image if it was changed
2123	<	if (cursor_changed && sdl_cursor) {
2124	<	cursor_changed = false;
2125	<	SDL_FreeCursor(sdl_cursor);
2193	<	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2194	<	if (sdl_cursor)
2195	<	SDL_SetCursor(sdl_cursor);
2122	>	// Pause if requested (during video mode switches)
2123	>	if (thread_stop_req) {
2124	>	thread_stop_ack = true;
2125	>	continue;
2126		}
2127		#endif
2128
2129	<	// Set new palette if it was changed
2130	<	handle_palette_changes();
2129	>	// Process pending events and update display
2130	>	do_video_refresh();
2131		}
2132
2133		uint64 end = GetTicks_usec();
2134		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2135		return 0;
2136		}
2137	+	#endif

Diff Legend

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

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents): Revision 1.8 by gbeauche, 2004-06-26T17:20:35Z vs. Revision 1.21 by gbeauche, 2005-11-21T23:38:46Z

Diff Legend

Comparing BasiliskII/src/SDL/video_sdl.cpp (file contents):
Revision 1.8 by gbeauche, 2004-06-26T17:20:35Z vs.
Revision 1.21 by gbeauche, 2005-11-21T23:38:46Z