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.6 by gbeauche, 2004-06-24T22:38:42Z vs.
Revision 1.11 by gbeauche, 2004-07-02T06:08:01Z

#	Line 37 | Line 37
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	–	*  - Move generic Native QuickDraw acceleration routines to gfxaccel.cpp
40		*/
41
42		#include "sysdeps.h"
#	Line 99 | Line 98 | static volatile bool redraw_thread_cance
98		static SDL_Thread *redraw_thread = NULL;                        // Redraw thread
99
100		#ifdef ENABLE_VOSF
101	<	static bool use_vosf = true;                                            // Flag: VOSF enabled
101	>	static bool use_vosf = false;                                           // Flag: VOSF enabled
102		#else
103		static const bool use_vosf = false;                                     // VOSF not possible
104		#endif
#	Line 260 | Line 259 | static void ErrorAlert(int error)
259		{
260		ErrorAlert(GetString(error));
261		}
262	+
263	+	// Display warning alert
264	+	static void WarningAlert(int warning)
265	+	{
266	+	WarningAlert(GetString(warning));
267	+	}
268		#endif
269
270
#	Line 407 | Line 412 | static void add_mode(int type, int width
412		VIDEO_MODE_Y = height;
413		VIDEO_MODE_RESOLUTION = resolution_id;
414		VIDEO_MODE_ROW_BYTES = bytes_per_row;
415	<	VIDEO_MODE_DEPTH = depth;
415	>	VIDEO_MODE_DEPTH = (video_depth)depth;
416		VideoModes.push_back(mode);
417		}
418
#	Line 581 | Line 586 | void driver_base::update_palette(void)
586		{
587		const VIDEO_MODE &mode = monitor.get_current_mode();
588
589	<	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
589	>	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
590		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
591		}
592
#	Line 612 | Line 617 | driver_window::driver_window(SDL_monitor
617		ADBSetRelMouseMode(mouse_grabbed);
618
619		// Create surface
620	<	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
620	>	int depth = ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
621		if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
622		return;
623
#	Line 624 | Line 629 | driver_window::driver_window(SDL_monitor
629		the_buffer = (uint8 *)vm_acquire(the_buffer_size);
630		the_buffer_copy = (uint8 *)malloc(the_buffer_size);
631		D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
627	–	#else
628	–	// Allocate memory for frame buffer
629	–	the_buffer_size = (aligned_height + 2) * s->pitch;
630	–	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
631	–	the_buffer = (uint8 *)calloc(1, the_buffer_size);
632	–	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
633	–	#endif
632
633	+	// Check whether we can initialize the VOSF subsystem and it's profitable
634	+	if (!video_vosf_init(m)) {
635	+	WarningAlert(STR_VOSF_INIT_ERR);
636	+	use_vosf = false;
637	+	}
638	+	else if (!video_vosf_profitable()) {
639	+	video_vosf_exit();
640	+	printf("VOSF acceleration is not profitable on this platform, disabling it\n");
641	+	use_vosf = false;
642	+	}
643	+	if (!use_vosf) {
644	+	free(the_buffer_copy);
645	+	vm_release(the_buffer, the_buffer_size);
646	+	the_host_buffer = NULL;
647	+	}
648	+	#endif
649	+	if (!use_vosf) {
650	+	// Allocate memory for frame buffer
651	+	the_buffer_size = (aligned_height + 2) * s->pitch;
652	+	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
653	+	the_buffer = (uint8 *)calloc(1, the_buffer_size);
654	+	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
655	+	}
656	+
657		#ifdef SHEEPSHAVER
658		// Create cursor
659		if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
#	Line 764 | Line 786 | static void keycode_init(void)
786
787		if (video_driver_found) {
788		// Skip aliases
789	<	static const char alias_str[] = "alias";
790	<	if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
789	>	static const char sdl_str[] = "sdl";
790	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
791		continue;
792
793		// Read keycode
#	Line 776 | Line 798 | static void keycode_init(void)
798		break;
799		} else {
800		// Search for SDL video driver string
801	<	static const char alias_sdl_str[] = "alias SDL";
802	<	if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
803	<	char *p = line + sizeof(alias_sdl_str);
801	>	static const char sdl_str[] = "sdl";
802	>	if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
803	>	char *p = line + sizeof(sdl_str);
804		if (strstr(video_driver, p) == video_driver)
805		video_driver_found = true;
806		}
#	Line 823 | Line 845 | bool SDL_monitor_desc::video_open(void)
845		return false;
846		}
847
826	–	#ifdef ENABLE_VOSF
827	–	if (use_vosf) {
828	–	// Initialize the VOSF system
829	–	if (!video_vosf_init(*this)) {
830	–	ErrorAlert(STR_VOSF_INIT_ERR);
831	–	return false;
832	–	}
833	–	}
834	–	#endif
835	–
848		// Initialize VideoRefresh function
849		VideoRefreshInit();
850
#	Line 1134 | Line 1146 | void SDL_monitor_desc::set_palette(uint8
1146		const VIDEO_MODE &mode = get_current_mode();
1147
1148		// FIXME: how can we handle the gamma ramp?
1149	<	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1149	>	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
1150		return;
1151
1152		LOCK_PALETTE;
#	Line 1159 | Line 1171 | void SDL_monitor_desc::set_palette(uint8
1171		}
1172
1173		#ifdef ENABLE_VOSF
1174	<	// We have to redraw everything because the interpretation of pixel values changed
1175	<	LOCK_VOSF;
1176	<	PFLAG_SET_ALL;
1177	<	UNLOCK_VOSF;
1178	<	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1174	>	if (use_vosf) {
1175	>	// We have to redraw everything because the interpretation of pixel values changed
1176	>	LOCK_VOSF;
1177	>	PFLAG_SET_ALL;
1178	>	UNLOCK_VOSF;
1179	>	memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
1180	>	}
1181		#endif
1182		}
1183
#	Line 1252 | Line 1266 | void video_set_cursor(void)
1266
1267
1268		/*
1269	<	*  Install graphics acceleration
1269	>	*  Keyboard-related utilify functions
1270		*/
1271
1272	<	#ifdef SHEEPSHAVER
1259	<	// Rectangle inversion
1260	<	template< int bpp >
1261	<	static inline void do_invrect(uint8 *dest, uint32 length)
1262	<	{
1263	<	#define INVERT_1(PTR, OFS) ((uint8  *)(PTR))[OFS] = ~((uint8  *)(PTR))[OFS]
1264	<	#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS]
1265	<	#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS]
1266	<	#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS]
1267	<
1268	<	#ifndef UNALIGNED_PROFITABLE
1269	<	// Align on 16-bit boundaries
1270	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1271	<	INVERT_1(dest, 0);
1272	<	dest += 1; length -= 1;
1273	<	}
1274	<
1275	<	// Align on 32-bit boundaries
1276	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1277	<	INVERT_2(dest, 0);
1278	<	dest += 2; length -= 2;
1279	<	}
1280	<	#endif
1281	<
1282	<	// Invert 8-byte words
1283	<	if (length >= 8) {
1284	<	const int r = (length / 8) % 8;
1285	<	dest += r * 8;
1286	<
1287	<	int n = ((length / 8) + 7) / 8;
1288	<	switch (r) {
1289	<	case 0: do {
1290	<	dest += 64;
1291	<	INVERT_8(dest, -8);
1292	<	case 7: INVERT_8(dest, -7);
1293	<	case 6: INVERT_8(dest, -6);
1294	<	case 5: INVERT_8(dest, -5);
1295	<	case 4: INVERT_8(dest, -4);
1296	<	case 3: INVERT_8(dest, -3);
1297	<	case 2: INVERT_8(dest, -2);
1298	<	case 1: INVERT_8(dest, -1);
1299	<	} while (--n > 0);
1300	<	}
1301	<	}
1302	<
1303	<	// 32-bit cell to invert?
1304	<	if (length & 4) {
1305	<	INVERT_4(dest, 0);
1306	<	if (bpp <= 16)
1307	<	dest += 4;
1308	<	}
1309	<
1310	<	// 16-bit cell to invert?
1311	<	if (bpp <= 16 && (length & 2)) {
1312	<	INVERT_2(dest, 0);
1313	<	if (bpp <= 8)
1314	<	dest += 2;
1315	<	}
1316	<
1317	<	// 8-bit cell to invert?
1318	<	if (bpp <= 8 && (length & 1))
1319	<	INVERT_1(dest, 0);
1320	<
1321	<	#undef INVERT_1
1322	<	#undef INVERT_2
1323	<	#undef INVERT_4
1324	<	#undef INVERT_8
1325	<	}
1326	<
1327	<	void NQD_invrect(uint32 p)
1328	<	{
1329	<	D(bug("accl_invrect %08x\n", p));
1330	<
1331	<	// Get inversion parameters
1332	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1333	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1334	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1335	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1336	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1337	<	D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes)));
1338	<
1339	<	//!!?? pen_mode == 14
1340	<
1341	<	// And perform the inversion
1342	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1343	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1344	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1345	<	width *= bpp;
1346	<	switch (bpp) {
1347	<	case 1:
1348	<	for (int i = 0; i < height; i++) {
1349	<	do_invrect<8>(dest, width);
1350	<	dest += dest_row_bytes;
1351	<	}
1352	<	break;
1353	<	case 2:
1354	<	for (int i = 0; i < height; i++) {
1355	<	do_invrect<16>(dest, width);
1356	<	dest += dest_row_bytes;
1357	<	}
1358	<	break;
1359	<	case 4:
1360	<	for (int i = 0; i < height; i++) {
1361	<	do_invrect<32>(dest, width);
1362	<	dest += dest_row_bytes;
1363	<	}
1364	<	break;
1365	<	}
1366	<	}
1367	<
1368	<	// Rectangle filling
1369	<	template< int bpp >
1370	<	static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length)
1371	<	{
1372	<	#define FILL_1(PTR, OFS, VAL) ((uint8  *)(PTR))[OFS] = (VAL)
1373	<	#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL)
1374	<	#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL)
1375	<	#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL)
1376	<
1377	<	#ifndef UNALIGNED_PROFITABLE
1378	<	// Align on 16-bit boundaries
1379	<	if (bpp < 16 && (((uintptr)dest) & 1)) {
1380	<	FILL_1(dest, 0, color);
1381	<	dest += 1; length -= 1;
1382	<	}
1383	<
1384	<	// Align on 32-bit boundaries
1385	<	if (bpp < 32 && (((uintptr)dest) & 2)) {
1386	<	FILL_2(dest, 0, color);
1387	<	dest += 2; length -= 2;
1388	<	}
1389	<	#endif
1390	<
1391	<	// Fill 8-byte words
1392	<	if (length >= 8) {
1393	<	const uint64 c = (((uint64)color) << 32) | color;
1394	<	const int r = (length / 8) % 8;
1395	<	dest += r * 8;
1396	<
1397	<	int n = ((length / 8) + 7) / 8;
1398	<	switch (r) {
1399	<	case 0: do {
1400	<	dest += 64;
1401	<	FILL_8(dest, -8, c);
1402	<	case 7: FILL_8(dest, -7, c);
1403	<	case 6: FILL_8(dest, -6, c);
1404	<	case 5: FILL_8(dest, -5, c);
1405	<	case 4: FILL_8(dest, -4, c);
1406	<	case 3: FILL_8(dest, -3, c);
1407	<	case 2: FILL_8(dest, -2, c);
1408	<	case 1: FILL_8(dest, -1, c);
1409	<	} while (--n > 0);
1410	<	}
1411	<	}
1412	<
1413	<	// 32-bit cell to fill?
1414	<	if (length & 4) {
1415	<	FILL_4(dest, 0, color);
1416	<	if (bpp <= 16)
1417	<	dest += 4;
1418	<	}
1419	<
1420	<	// 16-bit cell to fill?
1421	<	if (bpp <= 16 && (length & 2)) {
1422	<	FILL_2(dest, 0, color);
1423	<	if (bpp <= 8)
1424	<	dest += 2;
1425	<	}
1426	<
1427	<	// 8-bit cell to fill?
1428	<	if (bpp <= 8 && (length & 1))
1429	<	FILL_1(dest, 0, color);
1430	<
1431	<	#undef FILL_1
1432	<	#undef FILL_2
1433	<	#undef FILL_4
1434	<	#undef FILL_8
1435	<	}
1436	<
1437	<	void NQD_fillrect(uint32 p)
1438	<	{
1439	<	D(bug("accl_fillrect %08x\n", p));
1440	<
1441	<	// Get filling parameters
1442	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1443	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1444	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1445	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1446	<	uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen));
1447	<	D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y));
1448	<	D(bug(" width %d, height %d\n", width, height));
1449	<	D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color));
1450	<
1451	<	// And perform the fill
1452	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize));
1453	<	const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1454	<	uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp));
1455	<	width *= bpp;
1456	<	switch (bpp) {
1457	<	case 1:
1458	<	for (int i = 0; i < height; i++) {
1459	<	memset(dest, color, width);
1460	<	dest += dest_row_bytes;
1461	<	}
1462	<	break;
1463	<	case 2:
1464	<	for (int i = 0; i < height; i++) {
1465	<	do_fillrect<16>(dest, color, width);
1466	<	dest += dest_row_bytes;
1467	<	}
1468	<	break;
1469	<	case 4:
1470	<	for (int i = 0; i < height; i++) {
1471	<	do_fillrect<32>(dest, color, width);
1472	<	dest += dest_row_bytes;
1473	<	}
1474	<	break;
1475	<	}
1476	<	}
1477	<
1478	<	bool NQD_fillrect_hook(uint32 p)
1272	>	static bool is_modifier_key(SDL_KeyboardEvent const & e)
1273		{
1274	<	D(bug("accl_fillrect_hook %08x\n", p));
1275	<
1276	<	// Check if we can accelerate this fillrect
1277	<	if (ReadMacInt32(p + 0x284) != 0 && ReadMacInt32(p + acclDestPixelSize) >= 8) {
1278	<	const int transfer_mode = ReadMacInt32(p + acclTransferMode);
1279	<	if (transfer_mode == 8) {
1280	<	// Fill
1281	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_FILLRECT));
1282	<	return true;
1283	<	}
1284	<	else if (transfer_mode == 10) {
1285	<	// Invert
1286	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_INVRECT));
1287	<	return true;
1288	<	}
1289	<	}
1496	<	return false;
1497	<	}
1498	<
1499	<	// Rectangle blitting
1500	<	// TODO: optimize for VOSF and target pixmap == screen
1501	<	void NQD_bitblt(uint32 p)
1502	<	{
1503	<	D(bug("accl_bitblt %08x\n", p));
1504	<
1505	<	// Get blitting parameters
1506	<	int16 src_X  = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2);
1507	<	int16 src_Y  = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0);
1508	<	int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2);
1509	<	int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0);
1510	<	int16 width  = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2);
1511	<	int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0);
1512	<	D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr)));
1513	<	D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y));
1514	<	D(bug(" width %d, height %d\n", width, height));
1515	<
1516	<	// And perform the blit
1517	<	const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize));
1518	<	width *= bpp;
1519	<	if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) {
1520	<	const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes);
1521	<	const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes);
1522	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp));
1523	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp));
1524	<	for (int i = 0; i < height; i++) {
1525	<	memmove(dst, src, width);
1526	<	src += src_row_bytes;
1527	<	dst += dst_row_bytes;
1528	<	}
1529	<	}
1530	<	else {
1531	<	const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes);
1532	<	const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes);
1533	<	uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp));
1534	<	uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp));
1535	<	for (int i = height - 1; i >= 0; i--) {
1536	<	memmove(dst, src, width);
1537	<	src -= src_row_bytes;
1538	<	dst -= dst_row_bytes;
1539	<	}
1540	<	}
1541	<	}
1542	<
1543	<	/*
1544	<	BitBlt transfer modes:
1545	<	0 : srcCopy
1546	<	1 : srcOr
1547	<	2 : srcXor
1548	<	3 : srcBic
1549	<	4 : notSrcCopy
1550	<	5 : notSrcOr
1551	<	6 : notSrcXor
1552	<	7 : notSrcBic
1553	<	32 : blend
1554	<	33 : addPin
1555	<	34 : addOver
1556	<	35 : subPin
1557	<	36 : transparent
1558	<	37 : adMax
1559	<	38 : subOver
1560	<	39 : adMin
1561	<	50 : hilite
1562	<	*/
1563	<
1564	<	bool NQD_bitblt_hook(uint32 p)
1565	<	{
1566	<	D(bug("accl_draw_hook %08x\n", p));
1567	<
1568	<	// Check if we can accelerate this bitblt
1569	<	if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 &&
1570	<	ReadMacInt32(p + 0x130) == 0 &&
1571	<	ReadMacInt32(p + acclSrcPixelSize) >= 8 &&
1572	<	ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) &&
1573	<	(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign?
1574	<	ReadMacInt32(p + acclTransferMode) == 0 &&                                                                               // srcCopy?
1575	<	ReadMacInt32(p + 0x15c) > 0) {
1576	<
1577	<	// Yes, set function pointer
1578	<	WriteMacInt32(p + acclDrawProc, NativeTVECT(NATIVE_BITBLT));
1274	>	switch (e.keysym.sym) {
1275	>	case SDLK_NUMLOCK:
1276	>	case SDLK_CAPSLOCK:
1277	>	case SDLK_SCROLLOCK:
1278	>	case SDLK_RSHIFT:
1279	>	case SDLK_LSHIFT:
1280	>	case SDLK_RCTRL:
1281	>	case SDLK_LCTRL:
1282	>	case SDLK_RALT:
1283	>	case SDLK_LALT:
1284	>	case SDLK_RMETA:
1285	>	case SDLK_LMETA:
1286	>	case SDLK_LSUPER:
1287	>	case SDLK_RSUPER:
1288	>	case SDLK_MODE:
1289	>	case SDLK_COMPOSE:
1290		return true;
1291		}
1292		return false;
1293		}
1294
1295	<	// Wait for graphics operation to finish
1585	<	bool NQD_sync_hook(uint32 arg)
1586	<	{
1587	<	D(bug("accl_sync_hook %08x\n", arg));
1588	<	return true;
1589	<	}
1590	<
1591	<	void VideoInstallAccel(void)
1295	>	static bool is_ctrl_down(SDL_keysym const & ks)
1296		{
1297	<	// Install acceleration hooks
1594	<	if (PrefsFindBool("gfxaccel")) {
1595	<	D(bug("Video: Installing acceleration hooks\n"));
1596	<	uint32 base;
1597	<
1598	<	SheepVar bitblt_hook_info(sizeof(accl_hook_info));
1599	<	base = bitblt_hook_info.addr();
1600	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK));
1601	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1602	<	WriteMacInt32(base + 8, ACCL_BITBLT);
1603	<	NQDMisc(6, bitblt_hook_info.ptr());
1604	<
1605	<	SheepVar fillrect_hook_info(sizeof(accl_hook_info));
1606	<	base = fillrect_hook_info.addr();
1607	<	WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK));
1608	<	WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK));
1609	<	WriteMacInt32(base + 8, ACCL_FILLRECT);
1610	<	NQDMisc(6, fillrect_hook_info.ptr());
1611	<	}
1297	>	return ctrl_down || (ks.mod & KMOD_CTRL);
1298		}
1613	–	#endif
1299
1300
1301		/*
#	Line 1618 | Line 1303 | void VideoInstallAccel(void)
1303		*  and -2 if the key was recognized as a hotkey
1304		*/
1305
1621	–	static bool is_ctrl_down(SDL_keysym const & ks)
1622	–	{
1623	–	return ctrl_down || (ks.mod & KMOD_CTRL);
1624	–	}
1625	–
1306		static int kc_decode(SDL_keysym const & ks, bool key_down)
1307		{
1308		switch (ks.sym) {
#	Line 1692 | Line 1372 | static int kc_decode(SDL_keysym const &
1372		case SDLK_RCTRL: return 0x36;
1373		case SDLK_LSHIFT: return 0x38;
1374		case SDLK_RSHIFT: return 0x38;
1375	+	#if (defined(__APPLE__) && defined(__MACH__))
1376	+	case SDLK_LALT: return 0x3a;
1377	+	case SDLK_RALT: return 0x3a;
1378	+	case SDLK_LMETA: return 0x37;
1379	+	case SDLK_RMETA: return 0x37;
1380	+	#else
1381		case SDLK_LALT: return 0x37;
1382		case SDLK_RALT: return 0x37;
1383		case SDLK_LMETA: return 0x3a;
1384		case SDLK_RMETA: return 0x3a;
1385	+	#endif
1386		case SDLK_MENU: return 0x32;
1387		case SDLK_CAPSLOCK: return 0x39;
1388		case SDLK_NUMLOCK: return 0x47;
#	Line 1802 | Line 1489 | static void handle_events(void)
1489		// Keyboard
1490		case SDL_KEYDOWN: {
1491		int code = -1;
1492	<	if (use_keycodes) {
1492	>	if (use_keycodes && !is_modifier_key(event.key)) {
1493		if (event2keycode(event.key, true) != -2)       // This is called to process the hotkeys
1494		code = keycode_table[event.key.keysym.scancode & 0xff];
1495		} else
#	Line 1830 | Line 1517 | static void handle_events(void)
1517		}
1518		case SDL_KEYUP: {
1519		int code = -1;
1520	<	if (use_keycodes) {
1520	>	if (use_keycodes && !is_modifier_key(event.key)) {
1521		if (event2keycode(event.key, false) != -2)      // This is called to process the hotkeys
1522		code = keycode_table[event.key.keysym.scancode & 0xff];
1523		} else
1524		code = event2keycode(event.key, false);
1525	<	if (code >= 0 && code != 0x39) {        // Don't propagate Caps Lock releases
1526	<	ADBKeyUp(code);
1525	>	if (code >= 0) {
1526	>	if (code == 0x39) {     // Caps Lock released
1527	>	if (caps_on) {
1528	>	ADBKeyUp(code);
1529	>	caps_on = false;
1530	>	} else {
1531	>	ADBKeyDown(code);
1532	>	caps_on = true;
1533	>	}
1534	>	} else
1535	>	ADBKeyUp(code);
1536		if (code == 0x36)
1537		ctrl_down = false;
1538		}
#	Line 1903 | Line 1599 | static void update_display_static(driver
1599
1600		// Check for first column from left and first column from right that have changed
1601		if (high) {
1602	<	if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1602	>	if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
1603		const int src_bytes_per_row = bytes_per_row;
1604		const int dst_bytes_per_row = drv->s->pitch;
1605		const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;

Diff Legend

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