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" |
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 |
|
|
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 |
|
|
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 |
|
|
637 |
|
} |
638 |
|
else if (!video_vosf_profitable()) { |
639 |
|
video_vosf_exit(); |
640 |
< |
// WarningAlert(STR_VOSF_NOT_PROFITABLE_WARN); |
642 |
< |
printf("VOSF acceleration is not profitable on this platform\n"); |
640 |
> |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
641 |
|
use_vosf = false; |
642 |
|
} |
643 |
|
if (!use_vosf) { |
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 |
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 |
|
} |
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; |
1266 |
|
|
1267 |
|
|
1268 |
|
/* |
1269 |
< |
* Install graphics acceleration |
1269 |
> |
* Keyboard-related utilify functions |
1270 |
|
*/ |
1271 |
|
|
1272 |
< |
#ifdef SHEEPSHAVER |
1275 |
< |
// Rectangle inversion |
1276 |
< |
template< int bpp > |
1277 |
< |
static inline void do_invrect(uint8 *dest, uint32 length) |
1278 |
< |
{ |
1279 |
< |
#define INVERT_1(PTR, OFS) ((uint8 *)(PTR))[OFS] = ~((uint8 *)(PTR))[OFS] |
1280 |
< |
#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS] |
1281 |
< |
#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS] |
1282 |
< |
#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS] |
1283 |
< |
|
1284 |
< |
#ifndef UNALIGNED_PROFITABLE |
1285 |
< |
// Align on 16-bit boundaries |
1286 |
< |
if (bpp < 16 && (((uintptr)dest) & 1)) { |
1287 |
< |
INVERT_1(dest, 0); |
1288 |
< |
dest += 1; length -= 1; |
1289 |
< |
} |
1290 |
< |
|
1291 |
< |
// Align on 32-bit boundaries |
1292 |
< |
if (bpp < 32 && (((uintptr)dest) & 2)) { |
1293 |
< |
INVERT_2(dest, 0); |
1294 |
< |
dest += 2; length -= 2; |
1295 |
< |
} |
1296 |
< |
#endif |
1297 |
< |
|
1298 |
< |
// Invert 8-byte words |
1299 |
< |
if (length >= 8) { |
1300 |
< |
const int r = (length / 8) % 8; |
1301 |
< |
dest += r * 8; |
1302 |
< |
|
1303 |
< |
int n = ((length / 8) + 7) / 8; |
1304 |
< |
switch (r) { |
1305 |
< |
case 0: do { |
1306 |
< |
dest += 64; |
1307 |
< |
INVERT_8(dest, -8); |
1308 |
< |
case 7: INVERT_8(dest, -7); |
1309 |
< |
case 6: INVERT_8(dest, -6); |
1310 |
< |
case 5: INVERT_8(dest, -5); |
1311 |
< |
case 4: INVERT_8(dest, -4); |
1312 |
< |
case 3: INVERT_8(dest, -3); |
1313 |
< |
case 2: INVERT_8(dest, -2); |
1314 |
< |
case 1: INVERT_8(dest, -1); |
1315 |
< |
} while (--n > 0); |
1316 |
< |
} |
1317 |
< |
} |
1318 |
< |
|
1319 |
< |
// 32-bit cell to invert? |
1320 |
< |
if (length & 4) { |
1321 |
< |
INVERT_4(dest, 0); |
1322 |
< |
if (bpp <= 16) |
1323 |
< |
dest += 4; |
1324 |
< |
} |
1325 |
< |
|
1326 |
< |
// 16-bit cell to invert? |
1327 |
< |
if (bpp <= 16 && (length & 2)) { |
1328 |
< |
INVERT_2(dest, 0); |
1329 |
< |
if (bpp <= 8) |
1330 |
< |
dest += 2; |
1331 |
< |
} |
1332 |
< |
|
1333 |
< |
// 8-bit cell to invert? |
1334 |
< |
if (bpp <= 8 && (length & 1)) |
1335 |
< |
INVERT_1(dest, 0); |
1336 |
< |
|
1337 |
< |
#undef INVERT_1 |
1338 |
< |
#undef INVERT_2 |
1339 |
< |
#undef INVERT_4 |
1340 |
< |
#undef INVERT_8 |
1341 |
< |
} |
1342 |
< |
|
1343 |
< |
void NQD_invrect(uint32 p) |
1344 |
< |
{ |
1345 |
< |
D(bug("accl_invrect %08x\n", p)); |
1346 |
< |
|
1347 |
< |
// Get inversion parameters |
1348 |
< |
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2); |
1349 |
< |
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0); |
1350 |
< |
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2); |
1351 |
< |
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0); |
1352 |
< |
D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y)); |
1353 |
< |
D(bug(" width %d, height %d, bytes_per_row %d\n", width, height, (int32)ReadMacInt32(p + acclDestRowBytes))); |
1354 |
< |
|
1355 |
< |
//!!?? pen_mode == 14 |
1356 |
< |
|
1357 |
< |
// And perform the inversion |
1358 |
< |
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize)); |
1359 |
< |
const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes); |
1360 |
< |
uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp)); |
1361 |
< |
width *= bpp; |
1362 |
< |
switch (bpp) { |
1363 |
< |
case 1: |
1364 |
< |
for (int i = 0; i < height; i++) { |
1365 |
< |
do_invrect<8>(dest, width); |
1366 |
< |
dest += dest_row_bytes; |
1367 |
< |
} |
1368 |
< |
break; |
1369 |
< |
case 2: |
1370 |
< |
for (int i = 0; i < height; i++) { |
1371 |
< |
do_invrect<16>(dest, width); |
1372 |
< |
dest += dest_row_bytes; |
1373 |
< |
} |
1374 |
< |
break; |
1375 |
< |
case 4: |
1376 |
< |
for (int i = 0; i < height; i++) { |
1377 |
< |
do_invrect<32>(dest, width); |
1378 |
< |
dest += dest_row_bytes; |
1379 |
< |
} |
1380 |
< |
break; |
1381 |
< |
} |
1382 |
< |
} |
1383 |
< |
|
1384 |
< |
// Rectangle filling |
1385 |
< |
template< int bpp > |
1386 |
< |
static inline void do_fillrect(uint8 *dest, uint32 color, uint32 length) |
1387 |
< |
{ |
1388 |
< |
#define FILL_1(PTR, OFS, VAL) ((uint8 *)(PTR))[OFS] = (VAL) |
1389 |
< |
#define FILL_2(PTR, OFS, VAL) ((uint16 *)(PTR))[OFS] = (VAL) |
1390 |
< |
#define FILL_4(PTR, OFS, VAL) ((uint32 *)(PTR))[OFS] = (VAL) |
1391 |
< |
#define FILL_8(PTR, OFS, VAL) ((uint64 *)(PTR))[OFS] = (VAL) |
1392 |
< |
|
1393 |
< |
#ifndef UNALIGNED_PROFITABLE |
1394 |
< |
// Align on 16-bit boundaries |
1395 |
< |
if (bpp < 16 && (((uintptr)dest) & 1)) { |
1396 |
< |
FILL_1(dest, 0, color); |
1397 |
< |
dest += 1; length -= 1; |
1398 |
< |
} |
1399 |
< |
|
1400 |
< |
// Align on 32-bit boundaries |
1401 |
< |
if (bpp < 32 && (((uintptr)dest) & 2)) { |
1402 |
< |
FILL_2(dest, 0, color); |
1403 |
< |
dest += 2; length -= 2; |
1404 |
< |
} |
1405 |
< |
#endif |
1406 |
< |
|
1407 |
< |
// Fill 8-byte words |
1408 |
< |
if (length >= 8) { |
1409 |
< |
const uint64 c = (((uint64)color) << 32) | color; |
1410 |
< |
const int r = (length / 8) % 8; |
1411 |
< |
dest += r * 8; |
1412 |
< |
|
1413 |
< |
int n = ((length / 8) + 7) / 8; |
1414 |
< |
switch (r) { |
1415 |
< |
case 0: do { |
1416 |
< |
dest += 64; |
1417 |
< |
FILL_8(dest, -8, c); |
1418 |
< |
case 7: FILL_8(dest, -7, c); |
1419 |
< |
case 6: FILL_8(dest, -6, c); |
1420 |
< |
case 5: FILL_8(dest, -5, c); |
1421 |
< |
case 4: FILL_8(dest, -4, c); |
1422 |
< |
case 3: FILL_8(dest, -3, c); |
1423 |
< |
case 2: FILL_8(dest, -2, c); |
1424 |
< |
case 1: FILL_8(dest, -1, c); |
1425 |
< |
} while (--n > 0); |
1426 |
< |
} |
1427 |
< |
} |
1428 |
< |
|
1429 |
< |
// 32-bit cell to fill? |
1430 |
< |
if (length & 4) { |
1431 |
< |
FILL_4(dest, 0, color); |
1432 |
< |
if (bpp <= 16) |
1433 |
< |
dest += 4; |
1434 |
< |
} |
1435 |
< |
|
1436 |
< |
// 16-bit cell to fill? |
1437 |
< |
if (bpp <= 16 && (length & 2)) { |
1438 |
< |
FILL_2(dest, 0, color); |
1439 |
< |
if (bpp <= 8) |
1440 |
< |
dest += 2; |
1441 |
< |
} |
1442 |
< |
|
1443 |
< |
// 8-bit cell to fill? |
1444 |
< |
if (bpp <= 8 && (length & 1)) |
1445 |
< |
FILL_1(dest, 0, color); |
1446 |
< |
|
1447 |
< |
#undef FILL_1 |
1448 |
< |
#undef FILL_2 |
1449 |
< |
#undef FILL_4 |
1450 |
< |
#undef FILL_8 |
1451 |
< |
} |
1452 |
< |
|
1453 |
< |
void NQD_fillrect(uint32 p) |
1454 |
< |
{ |
1455 |
< |
D(bug("accl_fillrect %08x\n", p)); |
1456 |
< |
|
1457 |
< |
// Get filling parameters |
1458 |
< |
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2); |
1459 |
< |
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0); |
1460 |
< |
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2); |
1461 |
< |
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0); |
1462 |
< |
uint32 color = htonl(ReadMacInt32(p + acclPenMode) == 8 ? ReadMacInt32(p + acclForePen) : ReadMacInt32(p + acclBackPen)); |
1463 |
< |
D(bug(" dest X %d, dest Y %d\n", dest_X, dest_Y)); |
1464 |
< |
D(bug(" width %d, height %d\n", width, height)); |
1465 |
< |
D(bug(" bytes_per_row %d color %08x\n", (int32)ReadMacInt32(p + acclDestRowBytes), color)); |
1466 |
< |
|
1467 |
< |
// And perform the fill |
1468 |
< |
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclDestPixelSize)); |
1469 |
< |
const int dest_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes); |
1470 |
< |
uint8 *dest = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dest_row_bytes) + (dest_X * bpp)); |
1471 |
< |
width *= bpp; |
1472 |
< |
switch (bpp) { |
1473 |
< |
case 1: |
1474 |
< |
for (int i = 0; i < height; i++) { |
1475 |
< |
memset(dest, color, width); |
1476 |
< |
dest += dest_row_bytes; |
1477 |
< |
} |
1478 |
< |
break; |
1479 |
< |
case 2: |
1480 |
< |
for (int i = 0; i < height; i++) { |
1481 |
< |
do_fillrect<16>(dest, color, width); |
1482 |
< |
dest += dest_row_bytes; |
1483 |
< |
} |
1484 |
< |
break; |
1485 |
< |
case 4: |
1486 |
< |
for (int i = 0; i < height; i++) { |
1487 |
< |
do_fillrect<32>(dest, color, width); |
1488 |
< |
dest += dest_row_bytes; |
1489 |
< |
} |
1490 |
< |
break; |
1491 |
< |
} |
1492 |
< |
} |
1493 |
< |
|
1494 |
< |
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 |
< |
} |
1512 |
< |
return false; |
1513 |
< |
} |
1514 |
< |
|
1515 |
< |
// Rectangle blitting |
1516 |
< |
// TODO: optimize for VOSF and target pixmap == screen |
1517 |
< |
void NQD_bitblt(uint32 p) |
1518 |
< |
{ |
1519 |
< |
D(bug("accl_bitblt %08x\n", p)); |
1520 |
< |
|
1521 |
< |
// Get blitting parameters |
1522 |
< |
int16 src_X = (int16)ReadMacInt16(p + acclSrcRect + 2) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 2); |
1523 |
< |
int16 src_Y = (int16)ReadMacInt16(p + acclSrcRect + 0) - (int16)ReadMacInt16(p + acclSrcBoundsRect + 0); |
1524 |
< |
int16 dest_X = (int16)ReadMacInt16(p + acclDestRect + 2) - (int16)ReadMacInt16(p + acclDestBoundsRect + 2); |
1525 |
< |
int16 dest_Y = (int16)ReadMacInt16(p + acclDestRect + 0) - (int16)ReadMacInt16(p + acclDestBoundsRect + 0); |
1526 |
< |
int16 width = (int16)ReadMacInt16(p + acclDestRect + 6) - (int16)ReadMacInt16(p + acclDestRect + 2); |
1527 |
< |
int16 height = (int16)ReadMacInt16(p + acclDestRect + 4) - (int16)ReadMacInt16(p + acclDestRect + 0); |
1528 |
< |
D(bug(" src addr %08x, dest addr %08x\n", ReadMacInt32(p + acclSrcBaseAddr), ReadMacInt32(p + acclDestBaseAddr))); |
1529 |
< |
D(bug(" src X %d, src Y %d, dest X %d, dest Y %d\n", src_X, src_Y, dest_X, dest_Y)); |
1530 |
< |
D(bug(" width %d, height %d\n", width, height)); |
1531 |
< |
|
1532 |
< |
// And perform the blit |
1533 |
< |
const int bpp = bytes_per_pixel(ReadMacInt32(p + acclSrcPixelSize)); |
1534 |
< |
width *= bpp; |
1535 |
< |
if ((int32)ReadMacInt32(p + acclSrcRowBytes) > 0) { |
1536 |
< |
const int src_row_bytes = (int32)ReadMacInt32(p + acclSrcRowBytes); |
1537 |
< |
const int dst_row_bytes = (int32)ReadMacInt32(p + acclDestRowBytes); |
1538 |
< |
uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + (src_Y * src_row_bytes) + (src_X * bpp)); |
1539 |
< |
uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + (dest_Y * dst_row_bytes) + (dest_X * bpp)); |
1540 |
< |
for (int i = 0; i < height; i++) { |
1541 |
< |
memmove(dst, src, width); |
1542 |
< |
src += src_row_bytes; |
1543 |
< |
dst += dst_row_bytes; |
1544 |
< |
} |
1545 |
< |
} |
1546 |
< |
else { |
1547 |
< |
const int src_row_bytes = -(int32)ReadMacInt32(p + acclSrcRowBytes); |
1548 |
< |
const int dst_row_bytes = -(int32)ReadMacInt32(p + acclDestRowBytes); |
1549 |
< |
uint8 *src = Mac2HostAddr(ReadMacInt32(p + acclSrcBaseAddr) + ((src_Y + height - 1) * src_row_bytes) + (src_X * bpp)); |
1550 |
< |
uint8 *dst = Mac2HostAddr(ReadMacInt32(p + acclDestBaseAddr) + ((dest_Y + height - 1) * dst_row_bytes) + (dest_X * bpp)); |
1551 |
< |
for (int i = height - 1; i >= 0; i--) { |
1552 |
< |
memmove(dst, src, width); |
1553 |
< |
src -= src_row_bytes; |
1554 |
< |
dst -= dst_row_bytes; |
1555 |
< |
} |
1556 |
< |
} |
1557 |
< |
} |
1558 |
< |
|
1559 |
< |
/* |
1560 |
< |
BitBlt transfer modes: |
1561 |
< |
0 : srcCopy |
1562 |
< |
1 : srcOr |
1563 |
< |
2 : srcXor |
1564 |
< |
3 : srcBic |
1565 |
< |
4 : notSrcCopy |
1566 |
< |
5 : notSrcOr |
1567 |
< |
6 : notSrcXor |
1568 |
< |
7 : notSrcBic |
1569 |
< |
32 : blend |
1570 |
< |
33 : addPin |
1571 |
< |
34 : addOver |
1572 |
< |
35 : subPin |
1573 |
< |
36 : transparent |
1574 |
< |
37 : adMax |
1575 |
< |
38 : subOver |
1576 |
< |
39 : adMin |
1577 |
< |
50 : hilite |
1578 |
< |
*/ |
1579 |
< |
|
1580 |
< |
bool NQD_bitblt_hook(uint32 p) |
1581 |
< |
{ |
1582 |
< |
D(bug("accl_draw_hook %08x\n", p)); |
1583 |
< |
|
1584 |
< |
// Check if we can accelerate this bitblt |
1585 |
< |
if (ReadMacInt32(p + 0x018) + ReadMacInt32(p + 0x128) == 0 && |
1586 |
< |
ReadMacInt32(p + 0x130) == 0 && |
1587 |
< |
ReadMacInt32(p + acclSrcPixelSize) >= 8 && |
1588 |
< |
ReadMacInt32(p + acclSrcPixelSize) == ReadMacInt32(p + acclDestPixelSize) && |
1589 |
< |
(ReadMacInt32(p + acclSrcRowBytes) ^ ReadMacInt32(p + acclDestRowBytes)) >= 0 && // same sign? |
1590 |
< |
ReadMacInt32(p + acclTransferMode) == 0 && // srcCopy? |
1591 |
< |
ReadMacInt32(p + 0x15c) > 0) { |
1592 |
< |
|
1593 |
< |
// Yes, set function pointer |
1594 |
< |
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 |
1601 |
< |
bool NQD_sync_hook(uint32 arg) |
1602 |
< |
{ |
1603 |
< |
D(bug("accl_sync_hook %08x\n", arg)); |
1604 |
< |
return true; |
1605 |
< |
} |
1606 |
< |
|
1607 |
< |
void VideoInstallAccel(void) |
1295 |
> |
static bool is_ctrl_down(SDL_keysym const & ks) |
1296 |
|
{ |
1297 |
< |
// Install acceleration hooks |
1610 |
< |
if (PrefsFindBool("gfxaccel")) { |
1611 |
< |
D(bug("Video: Installing acceleration hooks\n")); |
1612 |
< |
uint32 base; |
1613 |
< |
|
1614 |
< |
SheepVar bitblt_hook_info(sizeof(accl_hook_info)); |
1615 |
< |
base = bitblt_hook_info.addr(); |
1616 |
< |
WriteMacInt32(base + 0, NativeTVECT(NATIVE_BITBLT_HOOK)); |
1617 |
< |
WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK)); |
1618 |
< |
WriteMacInt32(base + 8, ACCL_BITBLT); |
1619 |
< |
NQDMisc(6, bitblt_hook_info.ptr()); |
1620 |
< |
|
1621 |
< |
SheepVar fillrect_hook_info(sizeof(accl_hook_info)); |
1622 |
< |
base = fillrect_hook_info.addr(); |
1623 |
< |
WriteMacInt32(base + 0, NativeTVECT(NATIVE_FILLRECT_HOOK)); |
1624 |
< |
WriteMacInt32(base + 4, NativeTVECT(NATIVE_SYNC_HOOK)); |
1625 |
< |
WriteMacInt32(base + 8, ACCL_FILLRECT); |
1626 |
< |
NQDMisc(6, fillrect_hook_info.ptr()); |
1627 |
< |
} |
1297 |
> |
return ctrl_down || (ks.mod & KMOD_CTRL); |
1298 |
|
} |
1629 |
– |
#endif |
1299 |
|
|
1300 |
|
|
1301 |
|
/* |
1303 |
|
* and -2 if the key was recognized as a hotkey |
1304 |
|
*/ |
1305 |
|
|
1637 |
– |
static bool is_ctrl_down(SDL_keysym const & ks) |
1638 |
– |
{ |
1639 |
– |
return ctrl_down || (ks.mod & KMOD_CTRL); |
1640 |
– |
} |
1641 |
– |
|
1306 |
|
static int kc_decode(SDL_keysym const & ks, bool key_down) |
1307 |
|
{ |
1308 |
|
switch (ks.sym) { |
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; |
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 |
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 |
|
} |
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; |