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.8 by gbeauche, 2004-06-26T17:20:35Z vs.
Revision 1.20 by gbeauche, 2005-06-14T22:35:42Z

#	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	+	*  Framebuffer allocation routines
162	+	*/
163	+
164	+	static void *vm_acquire_framebuffer(uint32 size)
165	+	{
166	+	#ifdef SHEEPSHAVER
167	+	#ifdef DIRECT_ADDRESSING_HACK
168	+	const uint32 FRAME_BUFFER_BASE = 0x61000000;
169	+	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
170	+	if (vm_acquire_fixed(fb, size) < 0)
171	+	fb = VM_MAP_FAILED;
172	+	return fb;
173	+	#endif
174	+	#endif
175	+	return vm_acquire(size);
176	+	}
177	+
178	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
179	+	{
180	+	vm_release(fb, size);
181	+	}
182	+
183	+
184	+	/*
185		*  SheepShaver glue
186		*/
187
#	Line 325 | Line 361 | static inline int bytes_per_pixel(int de
361		}
362
363		// Map video_mode depth ID to numerical depth value
364	<	static int sdl_depth_of_video_depth(int video_depth)
364	>	static int mac_depth_of_video_depth(int video_depth)
365		{
366		int depth = -1;
367		switch (video_depth) {
#	Line 353 | Line 389 | static int sdl_depth_of_video_depth(int
389		return depth;
390		}
391
392	+	// Map video_mode depth ID to SDL screen depth
393	+	static int sdl_depth_of_video_depth(int video_depth)
394	+	{
395	+	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
396	+	}
397	+
398		// Check wether specified mode is available
399		static bool has_mode(int type, int width, int height)
400		{
359	–	// FIXME: no fullscreen support yet
360	–	if (type == DISPLAY_SCREEN)
361	–	return false;
362	–
401		#ifdef SHEEPSHAVER
402		// Filter out Classic resolutiosn
403		if (width == 512 && height == 384)
404		return false;
405
406	<	// Read window modes prefs
406	>	// "screen" prefs items always succeeds
407	>	if (PrefsFindString("screen"))
408	>	return true;
409	>
410	>	// Read window & screen modes prefs
411		static uint32 window_modes = 0;
412		static uint32 screen_modes = 0;
413		if (window_modes == 0 || screen_modes == 0) {
#	Line 375 | Line 417 | static bool has_mode(int type, int width
417		window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
418		}
419
420	<	if (type == DISPLAY_WINDOW) {
421	<	int apple_mask, apple_id = find_apple_resolution(width, height);
422	<	switch (apple_id) {
423	<	case APPLE_640x480:             apple_mask = 0x01; break;
424	<	case APPLE_800x600:             apple_mask = 0x02; break;
425	<	case APPLE_1024x768:    apple_mask = 0x04; break;
426	<	case APPLE_1152x768:    apple_mask = 0x40; break;
427	<	case APPLE_1152x900:    apple_mask = 0x08; break;
428	<	case APPLE_1280x1024:   apple_mask = 0x10; break;
429	<	case APPLE_1600x1200:   apple_mask = 0x20; break;
430	<	default:                                apple_mask = 0x00; break;
389	<	}
390	<	return (window_modes & apple_mask);
420	>	int test_modes;
421	>	switch (type) {
422	>	case DISPLAY_WINDOW:
423	>	test_modes = window_modes;
424	>	break;
425	>	case DISPLAY_SCREEN:
426	>	test_modes = screen_modes;
427	>	break;
428	>	default:
429	>	test_modes = 0;
430	>	break;
431		}
432	<	#else
433	<	return true;
432	>
433	>	int apple_mask;
434	>	switch (find_apple_resolution(width, height)) {
435	>	case APPLE_640x480:             apple_mask = 0x01; break;
436	>	case APPLE_800x600:             apple_mask = 0x02; break;
437	>	case APPLE_1024x768:    apple_mask = 0x04; break;
438	>	case APPLE_1152x768:    apple_mask = 0x40; break;
439	>	case APPLE_1152x900:    apple_mask = 0x08; break;
440	>	case APPLE_1280x1024:   apple_mask = 0x10; break;
441	>	case APPLE_1600x1200:   apple_mask = 0x20; break;
442	>	default:                                apple_mask = 0x00; break;
443	>	}
444	>	return (test_modes & apple_mask);
445		#endif
446	<	return false;
446	>	return true;
447		}
448
449		// Add mode to list of supported modes
#	Line 413 | Line 464 | static void add_mode(int type, int width
464		VIDEO_MODE_Y = height;
465		VIDEO_MODE_RESOLUTION = resolution_id;
466		VIDEO_MODE_ROW_BYTES = bytes_per_row;
467	<	VIDEO_MODE_DEPTH = depth;
467	>	VIDEO_MODE_DEPTH = (video_depth)depth;
468		VideoModes.push_back(mode);
469		}
470
#	Line 469 | Line 520 | static void set_window_name(int name)
520		// Set mouse grab mode
521		static SDL_GrabMode set_grab_mode(SDL_GrabMode mode)
522		{
523	<	const SDL_VideoInfo *vi =SDL_GetVideoInfo();
523	>	const SDL_VideoInfo *vi = SDL_GetVideoInfo();
524		return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF);
525		}
526
#	Line 528 | Line 579 | private:
579		int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode)
580		};
581
582	+	class driver_fullscreen : public driver_base {
583	+	public:
584	+	driver_fullscreen(SDL_monitor_desc &monitor);
585	+	~driver_fullscreen();
586	+	};
587	+
588		static driver_base *drv = NULL; // Pointer to currently used driver object
589
590		#ifdef ENABLE_VOSF
#	Line 549 | Line 606 | driver_base::~driver_base()
606		if (s)
607		SDL_FreeSurface(s);
608
609	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
610	+	if (the_buffer != VM_MAP_FAILED) {
611	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
612	+	vm_release_framebuffer(the_buffer, the_buffer_size);
613	+	the_buffer = NULL;
614	+	}
615	+
616		// Free frame buffer(s)
617		if (!use_vosf) {
554	–	if (the_buffer) {
555	–	free(the_buffer);
556	–	the_buffer = NULL;
557	–	}
618		if (the_buffer_copy) {
619		free(the_buffer_copy);
620		the_buffer_copy = NULL;
#	Line 562 | Line 622 | driver_base::~driver_base()
622		}
623		#ifdef ENABLE_VOSF
624		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	–	}
625		if (the_host_buffer) {
626		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
627		free(the_host_buffer);
#	Line 578 | Line 632 | driver_base::~driver_base()
632		free(the_buffer_copy);
633		the_buffer_copy = NULL;
634		}
635	+
636	+	// Deinitialize VOSF
637	+	video_vosf_exit();
638		}
639		#endif
640		}
#	Line 587 | Line 644 | void driver_base::update_palette(void)
644		{
645		const VIDEO_MODE &mode = monitor.get_current_mode();
646
647	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
647	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
648		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
649		}
650
#	Line 618 | Line 675 | driver_window::driver_window(SDL_monitor
675		ADBSetRelMouseMode(mouse_grabbed);
676
677		// Create surface
678	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
678	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
679		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
680		return;
681
#	Line 627 | Line 684 | driver_window::driver_window(SDL_monitor
684		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
685		the_host_buffer = (uint8 *)s->pixels;
686		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
687	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
687	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
688		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
689		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
690
#	Line 651 | Line 708 | driver_window::driver_window(SDL_monitor
708		// Allocate memory for frame buffer
709		the_buffer_size = (aligned_height + 2) * s->pitch;
710		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
711	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
711	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
712		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
713		}
714
#	Line 676 | Line 733 | driver_window::driver_window(SDL_monitor
733		visualFormat.Rmask = f->Rmask;
734		visualFormat.Gmask = f->Gmask;
735		visualFormat.Bmask = f->Bmask;
736	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
736	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
737
738		// Load gray ramp to 8->16/32 expand map
739		if (!IsDirectMode(mode))
#	Line 743 | Line 800 | void driver_window::mouse_moved(int x, i
800		ADBMouseMoved(x, y);
801		}
802
803	+
804	+	/*
805	+	*  Full-screen display driver
806	+	*/
807	+
808	+	// Open display
809	+	driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
810	+	: driver_base(m)
811	+	{
812	+	int width = VIDEO_MODE_X, height = VIDEO_MODE_Y;
813	+	int aligned_width = (width + 15) & ~15;
814	+	int aligned_height = (height + 15) & ~15;
815	+
816	+	// Set absolute mouse mode
817	+	ADBSetRelMouseMode(false);
818	+
819	+	// Create surface
820	+	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
821	+	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL)
822	+	return;
823	+
824	+	#ifdef ENABLE_VOSF
825	+	use_vosf = true;
826	+	// Allocate memory for frame buffer (SIZE is extended to page-boundary)
827	+	the_host_buffer = (uint8 *)s->pixels;
828	+	the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
829	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
830	+	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
831	+	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
832	+
833	+	// Check whether we can initialize the VOSF subsystem and it's profitable
834	+	if (!video_vosf_init(m)) {
835	+	WarningAlert(STR_VOSF_INIT_ERR);
836	+	use_vosf = false;
837	+	}
838	+	else if (!video_vosf_profitable()) {
839	+	video_vosf_exit();
840	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
841	+	use_vosf = false;
842	+	}
843	+	if (!use_vosf) {
844	+	free(the_buffer_copy);
845	+	vm_release(the_buffer, the_buffer_size);
846	+	the_host_buffer = NULL;
847	+	}
848	+	#endif
849	+	if (!use_vosf) {
850	+	// Allocate memory for frame buffer
851	+	the_buffer_size = (aligned_height + 2) * s->pitch;
852	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
853	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
854	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
855	+	}
856	+
857	+	// Hide cursor
858	+	SDL_ShowCursor(0);
859	+
860	+	// Init blitting routines
861	+	SDL_PixelFormat *f = s->format;
862	+	VisualFormat visualFormat;
863	+	visualFormat.depth = depth;
864	+	visualFormat.Rmask = f->Rmask;
865	+	visualFormat.Gmask = f->Gmask;
866	+	visualFormat.Bmask = f->Bmask;
867	+	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
868	+
869	+	// Load gray ramp to 8->16/32 expand map
870	+	if (!IsDirectMode(mode))
871	+	for (int i=0; i<256; i++)
872	+	ExpandMap[i] = SDL_MapRGB(f, i, i, i);
873	+
874	+	// Set frame buffer base
875	+	set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true);
876	+
877	+	// Everything went well
878	+	init_ok = true;
879	+	}
880	+
881	+	// Close display
882	+	driver_fullscreen::~driver_fullscreen()
883	+	{
884	+	#ifdef ENABLE_VOSF
885	+	if (use_vosf)
886	+	the_host_buffer = NULL; // don't free() in driver_base dtor
887	+	#endif
888	+	if (s)
889	+	SDL_FreeSurface(s);
890	+
891	+	// Show cursor
892	+	SDL_ShowCursor(1);
893	+	}
894	+
895	+
896		/*
897		*  Initialization
898		*/
#	Line 774 | Line 924 | static void keycode_init(void)
924		SDL_VideoDriverName(video_driver, sizeof(video_driver));
925		bool video_driver_found = false;
926		char line[256];
927	+	int n_keys = 0;
928		while (fgets(line, sizeof(line) - 1, f)) {
929		// Read line
930		int len = strlen(line);
#	Line 786 | Line 937 | static void keycode_init(void)
937		continue;
938
939		if (video_driver_found) {
940	<	// Skip aliases
941	<	static const char alias_str[] = "alias";
942	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
940	>	// Skip aliases as long as we have read keycodes yet
941	>	// Otherwise, it's another mapping and we have to stop
942	>	static const char sdl_str[] = "sdl";
943	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
944		continue;
945
946		// Read keycode
947		int x_code, mac_code;
948		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
949	<	keycode_table[x_code & 0xff] = mac_code;
949	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
950		else
951		break;
952		} else {
953		// Search for SDL video driver string
954	<	static const char alias_sdl_str[] = "alias SDL";
955	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
956	<	char *p = line + sizeof(alias_sdl_str);
954	>	static const char sdl_str[] = "sdl";
955	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
956	>	char *p = line + sizeof(sdl_str);
957		if (strstr(video_driver, p) == video_driver)
958		video_driver_found = true;
959		}
#	Line 819 | Line 971 | static void keycode_init(void)
971		WarningAlert(str);
972		return;
973		}
974	+
975	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
976		}
977		}
978
#	Line 837 | Line 991 | bool SDL_monitor_desc::video_open(void)
991		case DISPLAY_WINDOW:
992		drv = new(std::nothrow) driver_window(*this);
993		break;
994	+	case DISPLAY_SCREEN:
995	+	drv = new(std::nothrow) driver_fullscreen(*this);
996	+	break;
997		}
998		if (drv == NULL)
999		return false;
#	Line 853 | Line 1010 | bool SDL_monitor_desc::video_open(void)
1010		LOCK_FRAME_BUFFER;
1011
1012		// Start redraw/input thread
1013	+	#ifndef USE_CPU_EMUL_SERVICES
1014		redraw_thread_cancel = false;
1015		redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL);
1016		if (!redraw_thread_active) {
1017		printf("FATAL: cannot create redraw thread\n");
1018		return false;
1019		}
1020	+	#else
1021	+	redraw_thread_active = true;
1022	+	#endif
1023		return true;
1024		}
1025
#	Line 894 | Line 1055 | bool VideoInit(bool classic)
1055
1056		// Get screen mode from preferences
1057		const char *mode_str = NULL;
897	–	#ifndef SHEEPSHAVER
1058		if (classic_mode)
1059		mode_str = "win/512/342";
1060		else
1061		mode_str = PrefsFindString("screen");
902	–	#endif
1062
1063		// Determine display type and default dimensions
1064		int default_width, default_height;
#	Line 915 | Line 1074 | bool VideoInit(bool classic)
1074		if (mode_str) {
1075		if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2)
1076		display_type = DISPLAY_WINDOW;
1077	+	else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2)
1078	+	display_type = DISPLAY_SCREEN;
1079		}
1080		int max_width = 640, max_height = 480;
1081		SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
1082		if (modes && modes != (SDL_Rect **)-1) {
1083	<	max_width = modes[0]->w;
1084	<	max_height = modes[0]->h;
1083	>	// It turns out that on some implementations, and contrary to the documentation,
1084	>	// the returned list is not sorted from largest to smallest (e.g. Windows)
1085	>	for (int i = 0; modes[i] != NULL; i++) {
1086	>	const int w = modes[i]->w;
1087	>	const int h = modes[i]->h;
1088	>	if (w > max_width && h > max_height) {
1089	>	max_width = w;
1090	>	max_height = h;
1091	>	}
1092	>	}
1093		if (default_width > max_width)
1094		default_width = max_width;
1095		if (default_height > max_height)
#	Line 955 | Line 1124 | bool VideoInit(bool classic)
1124		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
1125		else {
1126		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1127	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
1127	>	int bpp = sdl_depth_of_video_depth(d);
1128		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1129		add_window_modes(video_depth(d));
1130		}
1131		}
1132	<	} else
1133	<	add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth);
1132	>	} else if (display_type == DISPLAY_SCREEN) {
1133	>	struct {
1134	>	int w;
1135	>	int h;
1136	>	int resolution_id;
1137	>	}
1138	>	video_modes[] = {
1139	>	{   -1,   -1, 0x80 },
1140	>	{  640,  480, 0x81 },
1141	>	{  800,  600, 0x82 },
1142	>	{ 1024,  768, 0x83 },
1143	>	{ 1152,  870, 0x84 },
1144	>	{ 1280, 1024, 0x85 },
1145	>	{ 1600, 1200, 0x86 },
1146	>	{ 0, }
1147	>	};
1148	>	video_modes[0].w = default_width;
1149	>	video_modes[0].h = default_height;
1150	>
1151	>	for (int i = 0; video_modes[i].w != 0; i++) {
1152	>	const int w = video_modes[i].w;
1153	>	const int h = video_modes[i].h;
1154	>	if (i > 0 && (w >= default_width || h >= default_height))
1155	>	continue;
1156	>	#ifdef ENABLE_VOSF
1157	>	for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
1158	>	int bpp = sdl_depth_of_video_depth(d);
1159	>	if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN))
1160	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d);
1161	>	}
1162	>	#else
1163	>	add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth);
1164	>	#endif
1165	>	}
1166	>	}
1167	>
1168		if (VideoModes.empty()) {
1169		ErrorAlert(STR_NO_XVISUAL_ERR);
1170		return false;
#	Line 1033 | Line 1236 | void SDL_monitor_desc::video_close(void)
1236		D(bug("video_close()\n"));
1237
1238		// Stop redraw thread
1239	+	#ifndef USE_CPU_EMUL_SERVICES
1240		if (redraw_thread_active) {
1241		redraw_thread_cancel = true;
1242		SDL_WaitThread(redraw_thread, NULL);
1243		}
1244	+	#endif
1245		redraw_thread_active = false;
1246
1247		// Unlock frame buffer
1248		UNLOCK_FRAME_BUFFER;
1249		D(bug(" frame buffer unlocked\n"));
1250
1046	–	#ifdef ENABLE_VOSF
1047	–	if (use_vosf) {
1048	–	// Deinitialize VOSF
1049	–	video_vosf_exit();
1050	–	}
1051	–	#endif
1052	–
1251		// Close display
1252		delete drv;
1253		drv = NULL;
#	Line 1147 | Line 1345 | void SDL_monitor_desc::set_palette(uint8
1345		const VIDEO_MODE &mode = get_current_mode();
1346
1347		// FIXME: how can we handle the gamma ramp?
1348	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1348	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1349		return;
1350
1351		LOCK_PALETTE;
#	Line 1208 | Line 1406 | int16 video_mode_change(VidLocals *csSav
1406		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1407		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1408
1409	<	// Disable interrupts
1409	>	// Disable interrupts and pause redraw thread
1410		DisableInterrupt();
1411	+	thread_stop_ack = false;
1412	+	thread_stop_req = true;
1413	+	while (!thread_stop_ack) ;
1414
1415		cur_mode = i;
1416		monitor_desc *monitor = VideoMonitors[0];
#	Line 1220 | Line 1421 | int16 video_mode_change(VidLocals *csSav
1421		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1422		csSave->saveMode=VModes[cur_mode].viAppleMode;
1423
1424	<	// Enable interrupts
1424	>	// Enable interrupts and resume redraw thread
1425	>	thread_stop_req = false;
1426		EnableInterrupt();
1427		return noErr;
1428		}
#	Line 1267 | Line 1469 | void video_set_cursor(void)
1469
1470
1471		/*
1472	<	*  Install graphics acceleration
1472	>	*  Keyboard-related utilify functions
1473		*/
1474
1475	<	#ifdef SHEEPSHAVER
1274	<	// Rectangle inversion
1275	<	template< int bpp >
1276	<	static inline void do_invrect(uint8 *dest, uint32 length)
1277	<	{
1278	<	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1279	<	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1280	<	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1281	<	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1282	<
1283	<	#ifndef UNALIGNED_PROFITABLE
1284	<	// Align on 16-bit boundaries
1285	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1286	<	INVERT_1(dest, 0);
1287	<	dest += 1; length -= 1;
1288	<	}
1289	<
1290	<	// Align on 32-bit boundaries
1291	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1292	<	INVERT_2(dest, 0);
1293	<	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)
1475	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1476		{
1477	<	D(bug("accl_fillrect %08x\n", p));
1478	<
1479	<	// Get filling parameters
1480	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1481	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1482	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1483	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1484	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1485	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1486	<	D(bug(" width %d, height %d\n", width, height));
1487	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1488	<
1489	<	// And perform the fill
1490	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1491	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1492	<	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));
1477	>	switch (e.keysym.sym) {
1478	>	case SDLK_NUMLOCK:
1479	>	case SDLK_CAPSLOCK:
1480	>	case SDLK_SCROLLOCK:
1481	>	case SDLK_RSHIFT:
1482	>	case SDLK_LSHIFT:
1483	>	case SDLK_RCTRL:
1484	>	case SDLK_LCTRL:
1485	>	case SDLK_RALT:
1486	>	case SDLK_LALT:
1487	>	case SDLK_RMETA:
1488	>	case SDLK_LMETA:
1489	>	case SDLK_LSUPER:
1490	>	case SDLK_RSUPER:
1491	>	case SDLK_MODE:
1492	>	case SDLK_COMPOSE:
1493		return true;
1494		}
1495		return false;
1496		}
1497
1498	<	// 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)
1498	>	static bool is_ctrl_down(SDL_keysym const & ks)
1499		{
1500	<	// 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	<	}
1500	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1501		}
1628	–	#endif
1502
1503
1504		/*
#	Line 1633 | Line 1506 | void VideoInstallAccel(void)
1506		*  and -2 if the key was recognized as a hotkey
1507		*/
1508
1636	–	static bool is_ctrl_down(SDL_keysym const & ks)
1637	–	{
1638	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1639	–	}
1640	–
1509		static int kc_decode(SDL_keysym const & ks, bool key_down)
1510		{
1511		switch (ks.sym) {
#	Line 1670 | Line 1538 | static int kc_decode(SDL_keysym const &
1538
1539		case SDLK_1: case SDLK_EXCLAIM: return 0x12;
1540		case SDLK_2: case SDLK_AT: return 0x13;
1541	<	//      case SDLK_3: case SDLK_numbersign: return 0x14;
1541	>	case SDLK_3: case SDLK_HASH: return 0x14;
1542		case SDLK_4: case SDLK_DOLLAR: return 0x15;
1543	<	//      case SDLK_5: case SDLK_percent: return 0x17;
1543	>	case SDLK_5: return 0x17;
1544		case SDLK_6: return 0x16;
1545		case SDLK_7: return 0x1a;
1546		case SDLK_8: return 0x1c;
1547		case SDLK_9: return 0x19;
1548		case SDLK_0: return 0x1d;
1549
1550	<	//      case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a;
1550	>	case SDLK_BACKQUOTE: return 0x0a;
1551		case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b;
1552		case SDLK_EQUALS: case SDLK_PLUS: return 0x18;
1553	<	//      case SDLK_bracketleft: case SDLK_braceleft: return 0x21;
1554	<	//      case SDLK_bracketright: case SDLK_braceright: return 0x1e;
1555	<	//      case SDLK_BACKSLASH: case SDLK_bar: return 0x2a;
1553	>	case SDLK_LEFTBRACKET: return 0x21;
1554	>	case SDLK_RIGHTBRACKET: return 0x1e;
1555	>	case SDLK_BACKSLASH: return 0x2a;
1556		case SDLK_SEMICOLON: case SDLK_COLON: return 0x29;
1557	<	//      case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27;
1557	>	case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27;
1558		case SDLK_COMMA: case SDLK_LESS: return 0x2b;
1559		case SDLK_PERIOD: case SDLK_GREATER: return 0x2f;
1560		case SDLK_SLASH: case SDLK_QUESTION: return 0x2c;
#	Line 1707 | Line 1575 | static int kc_decode(SDL_keysym const &
1575		case SDLK_RCTRL: return 0x36;
1576		case SDLK_LSHIFT: return 0x38;
1577		case SDLK_RSHIFT: return 0x38;
1578	+	#if (defined(__APPLE__) && defined(__MACH__))
1579	+	case SDLK_LALT: return 0x3a;
1580	+	case SDLK_RALT: return 0x3a;
1581	+	case SDLK_LMETA: return 0x37;
1582	+	case SDLK_RMETA: return 0x37;
1583	+	#else
1584		case SDLK_LALT: return 0x37;
1585		case SDLK_RALT: return 0x37;
1586		case SDLK_LMETA: return 0x3a;
1587		case SDLK_RMETA: return 0x3a;
1588	+	#endif
1589	+	case SDLK_LSUPER: return 0x3a; // "Windows" key
1590	+	case SDLK_RSUPER: return 0x3a;
1591		case SDLK_MENU: return 0x32;
1592		case SDLK_CAPSLOCK: return 0x39;
1593		case SDLK_NUMLOCK: return 0x47;
#	Line 1817 | Line 1694 | static void handle_events(void)
1694		// Keyboard
1695		case SDL_KEYDOWN: {
1696		int code = -1;
1697	<	if (use_keycodes) {
1697	>	if (use_keycodes && !is_modifier_key(event.key)) {
1698		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1699		code = keycode_table[event.key.keysym.scancode & 0xff];
1700		} else
#	Line 1845 | Line 1722 | static void handle_events(void)
1722		}
1723		case SDL_KEYUP: {
1724		int code = -1;
1725	<	if (use_keycodes) {
1725	>	if (use_keycodes && !is_modifier_key(event.key)) {
1726		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1727		code = keycode_table[event.key.keysym.scancode & 0xff];
1728		} else
1729		code = event2keycode(event.key, false);
1730	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1731	<	ADBKeyUp(code);
1730	>	if (code >= 0) {
1731	>	if (code == 0x39) {     // Caps Lock released
1732	>	if (caps_on) {
1733	>	ADBKeyUp(code);
1734	>	caps_on = false;
1735	>	} else {
1736	>	ADBKeyDown(code);
1737	>	caps_on = true;
1738	>	}
1739	>	} else
1740	>	ADBKeyUp(code);
1741		if (code == 0x36)
1742		ctrl_down = false;
1743		}
#	Line 1918 | Line 1804 | static void update_display_static(driver
1804
1805		// Check for first column from left and first column from right that have changed
1806		if (high) {
1807	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1807	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1808		const int src_bytes_per_row = bytes_per_row;
1809		const int dst_bytes_per_row = drv->s->pitch;
1810		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2095 | Line 1981 | static void video_refresh_dga_vosf(void)
1981		tick_counter = 0;
1982		if (mainBuffer.dirty) {
1983		LOCK_VOSF;
1984	<	update_display_dga_vosf();
1984	>	update_display_dga_vosf(static_cast<driver_fullscreen *>(drv));
1985		UNLOCK_VOSF;
1986		}
1987		}
#	Line 2159 | Line 2045 | static void VideoRefreshInit(void)
2045		}
2046		}
2047
2048	+	static inline void do_video_refresh(void)
2049	+	{
2050	+	// Handle SDL events
2051	+	handle_events();
2052	+
2053	+	// Update display
2054	+	video_refresh();
2055	+
2056	+	#ifdef SHEEPSHAVER
2057	+	// Set new cursor image if it was changed
2058	+	if (cursor_changed && sdl_cursor) {
2059	+	cursor_changed = false;
2060	+	SDL_FreeCursor(sdl_cursor);
2061	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
2062	+	if (sdl_cursor)
2063	+	SDL_SetCursor(sdl_cursor);
2064	+	}
2065	+	#endif
2066	+
2067	+	// Set new palette if it was changed
2068	+	handle_palette_changes();
2069	+	}
2070	+
2071	+	// This function is called on non-threaded platforms from a timer interrupt
2072	+	void VideoRefresh(void)
2073	+	{
2074	+	// We need to check redraw_thread_active to inhibit refreshed during
2075	+	// mode changes on non-threaded platforms
2076	+	if (!redraw_thread_active)
2077	+	return;
2078	+
2079	+	// Process pending events and update display
2080	+	do_video_refresh();
2081	+	}
2082	+
2083		const int VIDEO_REFRESH_HZ = 60;
2084		const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ;
2085
2086	+	#ifndef USE_CPU_EMUL_SERVICES
2087		static int redraw_func(void *arg)
2088		{
2089		uint64 start = GetTicks_usec();
#	Line 2179 | Line 2101 | static int redraw_func(void *arg)
2101		next = GetTicks_usec();
2102		ticks++;
2103
2182	–	// Handle SDL events
2183	–	handle_events();
2184	–
2185	–	// Refresh display
2186	–	video_refresh();
2187	–
2104		#ifdef SHEEPSHAVER
2105	<	// Set new cursor image if it was changed
2106	<	if (cursor_changed && sdl_cursor) {
2107	<	cursor_changed = false;
2108	<	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);
2105	>	// Pause if requested (during video mode switches)
2106	>	if (thread_stop_req) {
2107	>	thread_stop_ack = true;
2108	>	continue;
2109		}
2110		#endif
2111
2112	<	// Set new palette if it was changed
2113	<	handle_palette_changes();
2112	>	// Process pending events and update display
2113	>	do_video_refresh();
2114		}
2115
2116		uint64 end = GetTicks_usec();
2117		D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start)));
2118		return 0;
2119		}
2120	+	#endif

Diff Legend

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