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.4 by gbeauche, 2004-06-24T15:25:57Z vs.
Revision 1.16 by gbeauche, 2005-03-17T00:19:39Z

#	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 79 | Line 82 | static int display_type = DISPLAY_WINDOW
82		#endif
83
84		// Constants
85	+	#ifdef WIN32
86	+	const char KEYCODE_FILE_NAME[] = "BasiliskII_keycodes";
87	+	#else
88		const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes";
89	+	#endif
90
91
92		// Global variables
#	Line 94 | Line 101 | static uint32 the_buffer_size;                                         // S
101		static bool redraw_thread_active = false;                       // Flag: Redraw thread installed
102		static volatile bool redraw_thread_cancel;                      // Flag: Cancel Redraw thread
103		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
104	+	static volatile bool thread_stop_req = false;
105	+	static volatile bool thread_stop_ack = false;           // Acknowledge for thread_stop_req
106
107		#ifdef ENABLE_VOSF
108	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
108	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
109		#else
110		static const bool use_vosf = false;                                     // VOSF not possible
111		#endif
#	Line 114 | Line 123 | static int keycode_table[256];                                         // X
123
124		// SDL variables
125		static int screen_depth;                                                        // Depth of current screen
126	+	static SDL_Cursor *sdl_cursor;                                          // Copy of Mac cursor
127	+	static volatile bool cursor_changed = false;            // Flag: cursor changed, redraw_func must update the cursor
128		static SDL_Color sdl_palette[256];                                      // Color palette to be used as CLUT and gamma table
129		static bool sdl_palette_changed = false;                        // Flag: Palette changed, redraw thread must set new colors
130		static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK;
#	Line 141 | Line 152 | extern void SysMountFirstFloppy(void);
152
153
154		/*
155	+	*  Framebuffer allocation routines
156	+	*/
157	+
158	+	static void *vm_acquire_framebuffer(uint32 size)
159	+	{
160	+	#ifdef SHEEPSHAVER
161	+	#ifdef DIRECT_ADDRESSING_HACK
162	+	const uint32 FRAME_BUFFER_BASE = 0x61000000;
163	+	uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE);
164	+	if (vm_acquire_fixed(fb, size) < 0)
165	+	fb = VM_MAP_FAILED;
166	+	return fb;
167	+	#endif
168	+	#endif
169	+	return vm_acquire(size);
170	+	}
171	+
172	+	static inline void vm_release_framebuffer(void *fb, uint32 size)
173	+	{
174	+	vm_release(fb, size);
175	+	}
176	+
177	+
178	+	/*
179		*  SheepShaver glue
180		*/
181
#	Line 255 | Line 290 | static void ErrorAlert(int error)
290		{
291		ErrorAlert(GetString(error));
292		}
293	+
294	+	// Display warning alert
295	+	static void WarningAlert(int warning)
296	+	{
297	+	WarningAlert(GetString(warning));
298	+	}
299		#endif
300
301
#	Line 314 | Line 355 | static inline int bytes_per_pixel(int de
355		}
356
357		// Map video_mode depth ID to numerical depth value
358	<	static int sdl_depth_of_video_depth(int video_depth)
358	>	static int mac_depth_of_video_depth(int video_depth)
359		{
360		int depth = -1;
361		switch (video_depth) {
#	Line 342 | Line 383 | static int sdl_depth_of_video_depth(int
383		return depth;
384		}
385
386	<	// Add mode to list of supported modes
387	<	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
386	>	// Map video_mode depth ID to SDL screen depth
387	>	static int sdl_depth_of_video_depth(int video_depth)
388		{
389	<	VIDEO_MODE mode;
389	>	return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth);
390	>	}
391	>
392	>	// Check wether specified mode is available
393	>	static bool has_mode(int type, int width, int height)
394	>	{
395	>	// FIXME: no fullscreen support yet
396	>	if (type == DISPLAY_SCREEN)
397	>	return false;
398	>
399		#ifdef SHEEPSHAVER
400	<	// Don't add 512x384 modes
400	>	// Filter out Classic resolutiosn
401		if (width == 512 && height == 384)
402	+	return false;
403	+
404	+	// Read window modes prefs
405	+	static uint32 window_modes = 0;
406	+	static uint32 screen_modes = 0;
407	+	if (window_modes == 0 || screen_modes == 0) {
408	+	window_modes = PrefsFindInt32("windowmodes");
409	+	screen_modes = PrefsFindInt32("screenmodes");
410	+	if (window_modes == 0 || screen_modes == 0)
411	+	window_modes |= 3;                      // Allow at least 640x480 and 800x600 window modes
412	+	}
413	+
414	+	if (type == DISPLAY_WINDOW) {
415	+	int apple_mask, apple_id = find_apple_resolution(width, height);
416	+	switch (apple_id) {
417	+	case APPLE_640x480:             apple_mask = 0x01; break;
418	+	case APPLE_800x600:             apple_mask = 0x02; break;
419	+	case APPLE_1024x768:    apple_mask = 0x04; break;
420	+	case APPLE_1152x768:    apple_mask = 0x40; break;
421	+	case APPLE_1152x900:    apple_mask = 0x08; break;
422	+	case APPLE_1280x1024:   apple_mask = 0x10; break;
423	+	case APPLE_1600x1200:   apple_mask = 0x20; break;
424	+	default:                                apple_mask = 0x00; break;
425	+	}
426	+	return (window_modes & apple_mask);
427	+	}
428	+	#else
429	+	return true;
430	+	#endif
431	+	return false;
432	+	}
433	+
434	+	// Add mode to list of supported modes
435	+	static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth)
436	+	{
437	+	// Filter out unsupported modes
438	+	if (!has_mode(type, width, height))
439		return;
440
441	+	// Fill in VideoMode entry
442	+	VIDEO_MODE mode;
443	+	#ifdef SHEEPSHAVER
444		// Recalculate dimensions to fit Apple modes
445		resolution_id = match_apple_resolution(width, height);
446		mode.viType = type;
#	Line 359 | Line 449 | static void add_mode(int type, int width
449		VIDEO_MODE_Y = height;
450		VIDEO_MODE_RESOLUTION = resolution_id;
451		VIDEO_MODE_ROW_BYTES = bytes_per_row;
452	<	VIDEO_MODE_DEPTH = depth;
452	>	VIDEO_MODE_DEPTH = (video_depth)depth;
453		VideoModes.push_back(mode);
454		}
455
#	Line 495 | Line 585 | driver_base::~driver_base()
585		if (s)
586		SDL_FreeSurface(s);
587
588	+	// the_buffer shall always be mapped through vm_acquire_framebuffer()
589	+	if (the_buffer != VM_MAP_FAILED) {
590	+	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
591	+	vm_release_framebuffer(the_buffer, the_buffer_size);
592	+	the_buffer = NULL;
593	+	}
594	+
595		// Free frame buffer(s)
596		if (!use_vosf) {
500	–	if (the_buffer) {
501	–	free(the_buffer);
502	–	the_buffer = NULL;
503	–	}
597		if (the_buffer_copy) {
598		free(the_buffer_copy);
599		the_buffer_copy = NULL;
#	Line 508 | Line 601 | driver_base::~driver_base()
601		}
602		#ifdef ENABLE_VOSF
603		else {
511	–	// the_buffer shall always be mapped through vm_acquire() so that we can vm_protect() it at will
512	–	if (the_buffer != VM_MAP_FAILED) {
513	–	D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size));
514	–	vm_release(the_buffer, the_buffer_size);
515	–	the_buffer = NULL;
516	–	}
604		if (the_host_buffer) {
605		D(bug(" freeing the_host_buffer at %p\n", the_host_buffer));
606		free(the_host_buffer);
#	Line 524 | Line 611 | driver_base::~driver_base()
611		free(the_buffer_copy);
612		the_buffer_copy = NULL;
613		}
614	+
615	+	// Deinitialize VOSF
616	+	video_vosf_exit();
617		}
618		#endif
619		}
#	Line 533 | Line 623 | void driver_base::update_palette(void)
623		{
624		const VIDEO_MODE &mode = monitor.get_current_mode();
625
626	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
626	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
627		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
628		}
629
#	Line 564 | Line 654 | driver_window::driver_window(SDL_monitor
654		ADBSetRelMouseMode(mouse_grabbed);
655
656		// Create surface
657	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
657	>	int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH);
658		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
659		return;
660
#	Line 573 | Line 663 | driver_window::driver_window(SDL_monitor
663		// Allocate memory for frame buffer (SIZE is extended to page-boundary)
664		the_host_buffer = (uint8 *)s->pixels;
665		the_buffer_size = page_extend((aligned_height + 2) * s->pitch);
666	<	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
666	>	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
667		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
668		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
669	+
670	+	// Check whether we can initialize the VOSF subsystem and it's profitable
671	+	if (!video_vosf_init(m)) {
672	+	WarningAlert(STR_VOSF_INIT_ERR);
673	+	use_vosf = false;
674	+	}
675	+	else if (!video_vosf_profitable()) {
676	+	video_vosf_exit();
677	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
678	+	use_vosf = false;
679	+	}
680	+	if (!use_vosf) {
681	+	free(the_buffer_copy);
682	+	vm_release(the_buffer, the_buffer_size);
683	+	the_host_buffer = NULL;
684	+	}
685	+	#endif
686	+	if (!use_vosf) {
687	+	// Allocate memory for frame buffer
688	+	the_buffer_size = (aligned_height + 2) * s->pitch;
689	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
690	+	the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size);
691	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
692	+	}
693	+
694	+	#ifdef SHEEPSHAVER
695	+	// Create cursor
696	+	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
697	+	SDL_SetCursor(sdl_cursor);
698	+	cursor_changed = false;
699	+	}
700		#else
701	<	// Allocate memory for frame buffer
702	<	the_buffer_size = (aligned_height + 2) * s->pitch;
582	<	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
583	<	the_buffer = (uint8 *)calloc(1, the_buffer_size);
584	<	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
701	>	// Hide cursor
702	>	SDL_ShowCursor(0);
703		#endif
704
705		// Set window name/class
706		set_window_name(STR_WINDOW_TITLE);
707
590	–	// Hide cursor
591	–	SDL_ShowCursor(0);
592	–
708		// Init blitting routines
709		SDL_PixelFormat *f = s->format;
710		VisualFormat visualFormat;
#	Line 597 | Line 712 | driver_window::driver_window(SDL_monitor
712		visualFormat.Rmask = f->Rmask;
713		visualFormat.Gmask = f->Gmask;
714		visualFormat.Bmask = f->Bmask;
715	<	Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH));
715	>	Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH));
716
717		// Load gray ramp to 8->16/32 expand map
718		if (!IsDirectMode(mode))
#	Line 695 | Line 810 | static void keycode_init(void)
810		SDL_VideoDriverName(video_driver, sizeof(video_driver));
811		bool video_driver_found = false;
812		char line[256];
813	+	int n_keys = 0;
814		while (fgets(line, sizeof(line) - 1, f)) {
815		// Read line
816		int len = strlen(line);
#	Line 707 | Line 823 | static void keycode_init(void)
823		continue;
824
825		if (video_driver_found) {
826	<	// Skip aliases
827	<	static const char alias_str[] = "alias";
828	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
826	>	// Skip aliases as long as we have read keycodes yet
827	>	// Otherwise, it's another mapping and we have to stop
828	>	static const char sdl_str[] = "sdl";
829	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
830		continue;
831
832		// Read keycode
833		int x_code, mac_code;
834		if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
835	<	keycode_table[x_code & 0xff] = mac_code;
835	>	keycode_table[x_code & 0xff] = mac_code, n_keys++;
836		else
837		break;
838		} else {
839		// Search for SDL video driver string
840	<	static const char alias_sdl_str[] = "alias SDL";
841	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
842	<	char *p = line + sizeof(alias_sdl_str);
840	>	static const char sdl_str[] = "sdl";
841	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
842	>	char *p = line + sizeof(sdl_str);
843		if (strstr(video_driver, p) == video_driver)
844		video_driver_found = true;
845		}
#	Line 740 | Line 857 | static void keycode_init(void)
857		WarningAlert(str);
858		return;
859		}
860	+
861	+	D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
862		}
863		}
864
#	Line 748 | Line 867 | bool SDL_monitor_desc::video_open(void)
867		{
868		D(bug("video_open()\n"));
869		const VIDEO_MODE &mode = get_current_mode();
870	+	#if DEBUG
871	+	D(bug("Current video mode:\n"));
872	+	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f)));
873	+	#endif
874
875		// Create display driver object of requested type
876		switch (display_type) {
#	Line 763 | Line 886 | bool SDL_monitor_desc::video_open(void)
886		return false;
887		}
888
766	–	#ifdef ENABLE_VOSF
767	–	if (use_vosf) {
768	–	// Initialize the VOSF system
769	–	if (!video_vosf_init(*this)) {
770	–	ErrorAlert(STR_VOSF_INIT_ERR);
771	–	return false;
772	–	}
773	–	}
774	–	#endif
775	–
889		// Initialize VideoRefresh function
890		VideoRefreshInit();
891
#	Line 820 | Line 933 | bool VideoInit(bool classic)
933		mouse_wheel_lines = PrefsFindInt32("mousewheellines");
934
935		// Get screen mode from preferences
936	<	const char *mode_str;
936	>	const char *mode_str = NULL;
937	>	#ifndef SHEEPSHAVER
938		if (classic_mode)
939		mode_str = "win/512/342";
940		else
941		mode_str = PrefsFindString("screen");
942	+	#endif
943
944		// Determine display type and default dimensions
945		int default_width, default_height;
#	Line 842 | Line 957 | bool VideoInit(bool classic)
957		display_type = DISPLAY_WINDOW;
958		}
959		int max_width = 640, max_height = 480;
960	<	if (display_type == DISPLAY_SCREEN) {
961	<	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
962	<	if (modes && modes != (SDL_Rect **)-1) {
963	<	max_width = modes[0]->w;
964	<	max_height = modes[0]->h;
965	<	}
960	>	SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
961	>	if (modes && modes != (SDL_Rect **)-1) {
962	>	max_width = modes[0]->w;
963	>	max_height = modes[0]->h;
964	>	if (default_width > max_width)
965	>	default_width = max_width;
966	>	if (default_height > max_height)
967	>	default_height = max_height;
968		}
969		if (default_width <= 0)
970		default_width = max_width;
#	Line 878 | Line 995 | bool VideoInit(bool classic)
995		add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT);
996		else {
997		for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) {
998	<	int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d));
998	>	int bpp = sdl_depth_of_video_depth(d);
999		if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE))
1000		add_window_modes(video_depth(d));
1001		}
#	Line 914 | Line 1031 | bool VideoInit(bool classic)
1031		}
1032
1033		#ifdef SHEEPSHAVER
1034	<	for (int i = 0; i < VideoModes.size(); ++i)
1034	>	for (int i = 0; i < VideoModes.size(); i++)
1035		VModes[i] = VideoModes[i];
1036	<
1037	<	const VIDEO_MODE & mode = VideoModes[cur_mode];
1038	<	D(bug("Current video mode\n"));
1039	<	D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH - 0x80)));
1036	>	VideoInfo *p = &VModes[VideoModes.size()];
1037	>	p->viType = DIS_INVALID;        // End marker
1038	>	p->viRowBytes = 0;
1039	>	p->viXsize = p->viYsize = 0;
1040	>	p->viAppleMode = 0;
1041	>	p->viAppleID = 0;
1042		#endif
1043
1044		#if DEBUG
#	Line 964 | Line 1083 | void SDL_monitor_desc::video_close(void)
1083		UNLOCK_FRAME_BUFFER;
1084		D(bug(" frame buffer unlocked\n"));
1085
967	–	#ifdef ENABLE_VOSF
968	–	if (use_vosf) {
969	–	// Deinitialize VOSF
970	–	video_vosf_exit();
971	–	}
972	–	#endif
973	–
1086		// Close display
1087		delete drv;
1088		drv = NULL;
#	Line 1068 | Line 1180 | void SDL_monitor_desc::set_palette(uint8
1180		const VIDEO_MODE &mode = get_current_mode();
1181
1182		// FIXME: how can we handle the gamma ramp?
1183	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1183	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1184		return;
1185
1186		LOCK_PALETTE;
#	Line 1093 | Line 1205 | void SDL_monitor_desc::set_palette(uint8
1205		}
1206
1207		#ifdef ENABLE_VOSF
1208	<	// We have to redraw everything because the interpretation of pixel values changed
1209	<	LOCK_VOSF;
1210	<	PFLAG_SET_ALL;
1211	<	UNLOCK_VOSF;
1212	<	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1208	>	if (use_vosf) {
1209	>	// We have to redraw everything because the interpretation of pixel values changed
1210	>	LOCK_VOSF;
1211	>	PFLAG_SET_ALL;
1212	>	UNLOCK_VOSF;
1213	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1214	>	}
1215		#endif
1216		}
1217
#	Line 1127 | Line 1241 | int16 video_mode_change(VidLocals *csSav
1241		csSave->saveData = ReadMacInt32(ParamPtr + csData);
1242		csSave->savePage = ReadMacInt16(ParamPtr + csPage);
1243
1244	<	// Disable interrupts
1244	>	// Disable interrupts and pause redraw thread
1245		DisableInterrupt();
1246	+	thread_stop_ack = false;
1247	+	thread_stop_req = true;
1248	+	while (!thread_stop_ack) ;
1249
1250		cur_mode = i;
1251		monitor_desc *monitor = VideoMonitors[0];
#	Line 1139 | Line 1256 | int16 video_mode_change(VidLocals *csSav
1256		csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */
1257		csSave->saveMode=VModes[cur_mode].viAppleMode;
1258
1259	<	// Enable interrupts
1259	>	// Enable interrupts and resume redraw thread
1260	>	thread_stop_req = false;
1261		EnableInterrupt();
1262		return noErr;
1263		}
#	Line 1168 | Line 1286 | void SDL_monitor_desc::switch_to_current
1286		#ifdef SHEEPSHAVER
1287		bool video_can_change_cursor(void)
1288		{
1289	<	//      return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN);
1172	<	return false;
1289	>	return (display_type == DISPLAY_WINDOW);
1290		}
1291		#endif
1292
#	Line 1181 | Line 1298 | bool video_can_change_cursor(void)
1298		#ifdef SHEEPSHAVER
1299		void video_set_cursor(void)
1300		{
1301	<	//      cursor_changed = true;
1301	>	cursor_changed = true;
1302		}
1303		#endif
1304
1305
1306		/*
1307	<	*  Install graphics acceleration
1307	>	*  Keyboard-related utilify functions
1308		*/
1309
1310	<	#ifdef SHEEPSHAVER
1194	<	// Rectangle inversion
1195	<	template< int bpp >
1196	<	static inline void do_invrect(uint8 *dest, uint32 length)
1310	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1311		{
1312	<	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1313	<	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1314	<	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1315	<	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1316	<
1317	<	#ifndef UNALIGNED_PROFITABLE
1318	<	// Align on 16-bit boundaries
1319	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1320	<	INVERT_1(dest, 0);
1321	<	dest += 1; length -= 1;
1322	<	}
1323	<
1324	<	// Align on 32-bit boundaries
1325	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1326	<	INVERT_2(dest, 0);
1327	<	dest += 2; length -= 2;
1214	<	}
1215	<	#endif
1216	<
1217	<	// Invert 8-byte words
1218	<	if (length >= 8) {
1219	<	const int r = (length / 8) % 8;
1220	<	dest += r * 8;
1221	<
1222	<	int n = ((length / 8) + 7) / 8;
1223	<	switch (r) {
1224	<	case 0: do {
1225	<	dest += 64;
1226	<	INVERT_8(dest, -8);
1227	<	case 7: INVERT_8(dest, -7);
1228	<	case 6: INVERT_8(dest, -6);
1229	<	case 5: INVERT_8(dest, -5);
1230	<	case 4: INVERT_8(dest, -4);
1231	<	case 3: INVERT_8(dest, -3);
1232	<	case 2: INVERT_8(dest, -2);
1233	<	case 1: INVERT_8(dest, -1);
1234	<	} while (--n > 0);
1235	<	}
1236	<	}
1237	<
1238	<	// 32-bit cell to invert?
1239	<	if (length & 4) {
1240	<	INVERT_4(dest, 0);
1241	<	if (bpp <= 16)
1242	<	dest += 4;
1243	<	}
1244	<
1245	<	// 16-bit cell to invert?
1246	<	if (bpp <= 16 && (length & 2)) {
1247	<	INVERT_2(dest, 0);
1248	<	if (bpp <= 8)
1249	<	dest += 2;
1250	<	}
1251	<
1252	<	// 8-bit cell to invert?
1253	<	if (bpp <= 8 && (length & 1))
1254	<	INVERT_1(dest, 0);
1255	<
1256	<	#undef INVERT_1
1257	<	#undef INVERT_2
1258	<	#undef INVERT_4
1259	<	#undef INVERT_8
1260	<	}
1261	<
1262	<	void NQD_invrect(uint32 p)
1263	<	{
1264	<	D(bug("accl_invrect %08x\n", p));
1265	<
1266	<	// Get inversion parameters
1267	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1268	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1269	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1270	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1271	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1272	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1273	<
1274	<	//!!?? pen_mode == 14
1275	<
1276	<	// And perform the inversion
1277	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1278	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1279	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1280	<	width *= bpp;
1281	<	switch (bpp) {
1282	<	case 1:
1283	<	for (int i = 0; i < height; i++) {
1284	<	do_invrect<8>(dest, width);
1285	<	dest += dest_row_bytes;
1286	<	}
1287	<	break;
1288	<	case 2:
1289	<	for (int i = 0; i < height; i++) {
1290	<	do_invrect<16>(dest, width);
1291	<	dest += dest_row_bytes;
1292	<	}
1293	<	break;
1294	<	case 4:
1295	<	for (int i = 0; i < height; i++) {
1296	<	do_invrect<32>(dest, width);
1297	<	dest += dest_row_bytes;
1298	<	}
1299	<	break;
1300	<	}
1301	<	}
1302	<
1303	<	// Rectangle filling
1304	<	template< int bpp >
1305	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1306	<	{
1307	<	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1308	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1309	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1310	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1311	<
1312	<	#ifndef UNALIGNED_PROFITABLE
1313	<	// Align on 16-bit boundaries
1314	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1315	<	FILL_1(dest, 0, color);
1316	<	dest += 1; length -= 1;
1317	<	}
1318	<
1319	<	// Align on 32-bit boundaries
1320	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1321	<	FILL_2(dest, 0, color);
1322	<	dest += 2; length -= 2;
1323	<	}
1324	<	#endif
1325	<
1326	<	// Fill 8-byte words
1327	<	if (length >= 8) {
1328	<	const uint64 c = (((uint64)color) << 32) | color;
1329	<	const int r = (length / 8) % 8;
1330	<	dest += r * 8;
1331	<
1332	<	int n = ((length / 8) + 7) / 8;
1333	<	switch (r) {
1334	<	case 0: do {
1335	<	dest += 64;
1336	<	FILL_8(dest, -8, c);
1337	<	case 7: FILL_8(dest, -7, c);
1338	<	case 6: FILL_8(dest, -6, c);
1339	<	case 5: FILL_8(dest, -5, c);
1340	<	case 4: FILL_8(dest, -4, c);
1341	<	case 3: FILL_8(dest, -3, c);
1342	<	case 2: FILL_8(dest, -2, c);
1343	<	case 1: FILL_8(dest, -1, c);
1344	<	} while (--n > 0);
1345	<	}
1346	<	}
1347	<
1348	<	// 32-bit cell to fill?
1349	<	if (length & 4) {
1350	<	FILL_4(dest, 0, color);
1351	<	if (bpp <= 16)
1352	<	dest += 4;
1353	<	}
1354	<
1355	<	// 16-bit cell to fill?
1356	<	if (bpp <= 16 && (length & 2)) {
1357	<	FILL_2(dest, 0, color);
1358	<	if (bpp <= 8)
1359	<	dest += 2;
1360	<	}
1361	<
1362	<	// 8-bit cell to fill?
1363	<	if (bpp <= 8 && (length & 1))
1364	<	FILL_1(dest, 0, color);
1365	<
1366	<	#undef FILL_1
1367	<	#undef FILL_2
1368	<	#undef FILL_4
1369	<	#undef FILL_8
1370	<	}
1371	<
1372	<	void NQD_fillrect(uint32 p)
1373	<	{
1374	<	D(bug("accl_fillrect %08x\n", p));
1375	<
1376	<	// Get filling parameters
1377	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1378	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1379	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1380	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1381	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1382	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1383	<	D(bug(" width %d, height %d\n", width, height));
1384	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1385	<
1386	<	// And perform the fill
1387	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1388	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1389	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1390	<	width *= bpp;
1391	<	switch (bpp) {
1392	<	case 1:
1393	<	for (int i = 0; i < height; i++) {
1394	<	memset(dest, color, width);
1395	<	dest += dest_row_bytes;
1396	<	}
1397	<	break;
1398	<	case 2:
1399	<	for (int i = 0; i < height; i++) {
1400	<	do_fillrect<16>(dest, color, width);
1401	<	dest += dest_row_bytes;
1402	<	}
1403	<	break;
1404	<	case 4:
1405	<	for (int i = 0; i < height; i++) {
1406	<	do_fillrect<32>(dest, color, width);
1407	<	dest += dest_row_bytes;
1408	<	}
1409	<	break;
1410	<	}
1411	<	}
1412	<
1413	<	bool NQD_fillrect_hook(uint32 p)
1414	<	{
1415	<	D(bug("accl_fillrect_hook %08x\n", p));
1416	<
1417	<	// Check if we can accelerate this fillrect
1418	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1419	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1420	<	if (transfer_mode == 8) {
1421	<	// Fill
1422	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1423	<	return true;
1424	<	}
1425	<	else if (transfer_mode == 10) {
1426	<	// Invert
1427	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1428	<	return true;
1429	<	}
1430	<	}
1431	<	return false;
1432	<	}
1433	<
1434	<	// Rectangle blitting
1435	<	// TODO: optimize for VOSF and target pixmap == screen
1436	<	void NQD_bitblt(uint32 p)
1437	<	{
1438	<	D(bug("accl_bitblt %08x\n", p));
1439	<
1440	<	// Get blitting parameters
1441	<	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1442	<	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1443	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1444	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1445	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1446	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1447	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1448	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1449	<	D(bug(" width %d, height %d\n", width, height));
1450	<
1451	<	// And perform the blit
1452	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1453	<	width *= bpp;
1454	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1455	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1456	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1457	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1458	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1459	<	for (int i = 0; i < height; i++) {
1460	<	memmove(dst, src, width);
1461	<	src += src_row_bytes;
1462	<	dst += dst_row_bytes;
1463	<	}
1464	<	}
1465	<	else {
1466	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1467	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1468	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1469	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1470	<	for (int i = height - 1; i >= 0; i--) {
1471	<	memmove(dst, src, width);
1472	<	src -= src_row_bytes;
1473	<	dst -= dst_row_bytes;
1474	<	}
1475	<	}
1476	<	}
1477	<
1478	<	/*
1479	<	BitBlt transfer modes:
1480	<	0 : srcCopy
1481	<	1 : srcOr
1482	<	2 : srcXor
1483	<	3 : srcBic
1484	<	4 : notSrcCopy
1485	<	5 : notSrcOr
1486	<	6 : notSrcXor
1487	<	7 : notSrcBic
1488	<	32 : blend
1489	<	33 : addPin
1490	<	34 : addOver
1491	<	35 : subPin
1492	<	36 : transparent
1493	<	37 : adMax
1494	<	38 : subOver
1495	<	39 : adMin
1496	<	50 : hilite
1497	<	*/
1498	<
1499	<	bool NQD_bitblt_hook(uint32 p)
1500	<	{
1501	<	D(bug("accl_draw_hook %08x\n", p));
1502	<
1503	<	// Check if we can accelerate this bitblt
1504	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1505	<	ReadMacInt32(p + 0x130) == 0 &&
1506	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1507	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1508	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1509	<	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1510	<	ReadMacInt32(p + 0x15c) > 0) {
1511	<
1512	<	// Yes, set function pointer
1513	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1312	>	switch (e.keysym.sym) {
1313	>	case SDLK_NUMLOCK:
1314	>	case SDLK_CAPSLOCK:
1315	>	case SDLK_SCROLLOCK:
1316	>	case SDLK_RSHIFT:
1317	>	case SDLK_LSHIFT:
1318	>	case SDLK_RCTRL:
1319	>	case SDLK_LCTRL:
1320	>	case SDLK_RALT:
1321	>	case SDLK_LALT:
1322	>	case SDLK_RMETA:
1323	>	case SDLK_LMETA:
1324	>	case SDLK_LSUPER:
1325	>	case SDLK_RSUPER:
1326	>	case SDLK_MODE:
1327	>	case SDLK_COMPOSE:
1328		return true;
1329		}
1330		return false;
1331		}
1332
1333	<	// Wait for graphics operation to finish
1520	<	bool NQD_sync_hook(uint32 arg)
1521	<	{
1522	<	D(bug("accl_sync_hook %08x\n", arg));
1523	<	return true;
1524	<	}
1525	<
1526	<	void VideoInstallAccel(void)
1333	>	static bool is_ctrl_down(SDL_keysym const & ks)
1334		{
1335	<	// Install acceleration hooks
1529	<	if (PrefsFindBool("gfxaccel")) {
1530	<	D(bug("Video: Installing acceleration hooks\n"));
1531	<	uint32 base;
1532	<
1533	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1534	<	base = bitblt_hook_info.addr();
1535	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1536	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1537	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1538	<	NQDMisc(6, bitblt_hook_info.ptr());
1539	<
1540	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1541	<	base = fillrect_hook_info.addr();
1542	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1543	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1544	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1545	<	NQDMisc(6, fillrect_hook_info.ptr());
1546	<	}
1335	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1336		}
1548	–	#endif
1337
1338
1339		/*
#	Line 1553 | Line 1341 | void VideoInstallAccel(void)
1341		*  and -2 if the key was recognized as a hotkey
1342		*/
1343
1556	–	static bool is_ctrl_down(SDL_keysym const & ks)
1557	–	{
1558	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1559	–	}
1560	–
1344		static int kc_decode(SDL_keysym const & ks, bool key_down)
1345		{
1346		switch (ks.sym) {
#	Line 1627 | Line 1410 | static int kc_decode(SDL_keysym const &
1410		case SDLK_RCTRL: return 0x36;
1411		case SDLK_LSHIFT: return 0x38;
1412		case SDLK_RSHIFT: return 0x38;
1413	+	#if (defined(__APPLE__) && defined(__MACH__))
1414	+	case SDLK_LALT: return 0x3a;
1415	+	case SDLK_RALT: return 0x3a;
1416	+	case SDLK_LMETA: return 0x37;
1417	+	case SDLK_RMETA: return 0x37;
1418	+	#else
1419		case SDLK_LALT: return 0x37;
1420		case SDLK_RALT: return 0x37;
1421		case SDLK_LMETA: return 0x3a;
1422		case SDLK_RMETA: return 0x3a;
1423	+	#endif
1424		case SDLK_MENU: return 0x32;
1425		case SDLK_CAPSLOCK: return 0x39;
1426		case SDLK_NUMLOCK: return 0x47;
#	Line 1737 | Line 1527 | static void handle_events(void)
1527		// Keyboard
1528		case SDL_KEYDOWN: {
1529		int code = -1;
1530	<	if (use_keycodes) {
1530	>	if (use_keycodes && !is_modifier_key(event.key)) {
1531		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1532		code = keycode_table[event.key.keysym.scancode & 0xff];
1533		} else
#	Line 1765 | Line 1555 | static void handle_events(void)
1555		}
1556		case SDL_KEYUP: {
1557		int code = -1;
1558	<	if (use_keycodes) {
1558	>	if (use_keycodes && !is_modifier_key(event.key)) {
1559		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1560		code = keycode_table[event.key.keysym.scancode & 0xff];
1561		} else
1562		code = event2keycode(event.key, false);
1563	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1564	<	ADBKeyUp(code);
1563	>	if (code >= 0) {
1564	>	if (code == 0x39) {     // Caps Lock released
1565	>	if (caps_on) {
1566	>	ADBKeyUp(code);
1567	>	caps_on = false;
1568	>	} else {
1569	>	ADBKeyDown(code);
1570	>	caps_on = true;
1571	>	}
1572	>	} else
1573	>	ADBKeyUp(code);
1574		if (code == 0x36)
1575		ctrl_down = false;
1576		}
#	Line 1838 | Line 1637 | static void update_display_static(driver
1637
1638		// Check for first column from left and first column from right that have changed
1639		if (high) {
1640	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1640	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1641		const int src_bytes_per_row = bytes_per_row;
1642		const int dst_bytes_per_row = drv->s->pitch;
1643		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;
#	Line 2099 | Line 1898 | static int redraw_func(void *arg)
1898		next = GetTicks_usec();
1899		ticks++;
1900
1901	+	#ifdef SHEEPSHAVER
1902	+	// Pause if requested (during video mode switches)
1903	+	if (thread_stop_req) {
1904	+	thread_stop_ack = true;
1905	+	continue;
1906	+	}
1907	+	#endif
1908	+
1909		// Handle SDL events
1910		handle_events();
1911
1912		// Refresh display
1913		video_refresh();
1914
1915	+	#ifdef SHEEPSHAVER
1916	+	// Set new cursor image if it was changed
1917	+	if (cursor_changed && sdl_cursor) {
1918	+	cursor_changed = false;
1919	+	SDL_FreeCursor(sdl_cursor);
1920	+	sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]);
1921	+	if (sdl_cursor)
1922	+	SDL_SetCursor(sdl_cursor);
1923	+	}
1924	+	#endif
1925	+
1926		// Set new palette if it was changed
1927		handle_palette_changes();
1928		}

Diff Legend

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