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" |
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" |
97 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
98 |
|
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
99 |
|
static SDL_Thread *redraw_thread = NULL; // Redraw thread |
100 |
+ |
static volatile bool thread_stop_req = false; |
101 |
+ |
static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req |
102 |
|
|
103 |
|
#ifdef ENABLE_VOSF |
104 |
< |
static bool use_vosf = true; // Flag: VOSF enabled |
104 |
> |
static bool use_vosf = false; // Flag: VOSF enabled |
105 |
|
#else |
106 |
|
static const bool use_vosf = false; // VOSF not possible |
107 |
|
#endif |
119 |
|
|
120 |
|
// SDL variables |
121 |
|
static int screen_depth; // Depth of current screen |
122 |
+ |
static SDL_Cursor *sdl_cursor; // Copy of Mac cursor |
123 |
+ |
static volatile bool cursor_changed = false; // Flag: cursor changed, redraw_func must update the cursor |
124 |
|
static SDL_Color sdl_palette[256]; // Color palette to be used as CLUT and gamma table |
125 |
|
static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
126 |
|
static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK; |
148 |
|
|
149 |
|
|
150 |
|
/* |
151 |
+ |
* Framebuffer allocation routines |
152 |
+ |
*/ |
153 |
+ |
|
154 |
+ |
static void *vm_acquire_framebuffer(uint32 size) |
155 |
+ |
{ |
156 |
+ |
#ifdef SHEEPSHAVER |
157 |
+ |
#ifdef DIRECT_ADDRESSING_HACK |
158 |
+ |
const uint32 FRAME_BUFFER_BASE = 0x61000000; |
159 |
+ |
uint8 *fb = Mac2HostAddr(FRAME_BUFFER_BASE); |
160 |
+ |
if (vm_acquire_fixed(fb, size) < 0) |
161 |
+ |
fb = VM_MAP_FAILED; |
162 |
+ |
return fb; |
163 |
+ |
#endif |
164 |
+ |
#endif |
165 |
+ |
return vm_acquire(size); |
166 |
+ |
} |
167 |
+ |
|
168 |
+ |
static inline void vm_release_framebuffer(void *fb, uint32 size) |
169 |
+ |
{ |
170 |
+ |
vm_release(fb, size); |
171 |
+ |
} |
172 |
+ |
|
173 |
+ |
|
174 |
+ |
/* |
175 |
|
* SheepShaver glue |
176 |
|
*/ |
177 |
|
|
286 |
|
{ |
287 |
|
ErrorAlert(GetString(error)); |
288 |
|
} |
289 |
+ |
|
290 |
+ |
// Display warning alert |
291 |
+ |
static void WarningAlert(int warning) |
292 |
+ |
{ |
293 |
+ |
WarningAlert(GetString(warning)); |
294 |
+ |
} |
295 |
|
#endif |
296 |
|
|
297 |
|
|
351 |
|
} |
352 |
|
|
353 |
|
// Map video_mode depth ID to numerical depth value |
354 |
< |
static int sdl_depth_of_video_depth(int video_depth) |
354 |
> |
static int mac_depth_of_video_depth(int video_depth) |
355 |
|
{ |
356 |
|
int depth = -1; |
357 |
|
switch (video_depth) { |
379 |
|
return depth; |
380 |
|
} |
381 |
|
|
382 |
< |
// Add mode to list of supported modes |
383 |
< |
static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth) |
382 |
> |
// Map video_mode depth ID to SDL screen depth |
383 |
> |
static int sdl_depth_of_video_depth(int video_depth) |
384 |
|
{ |
385 |
< |
VIDEO_MODE mode; |
385 |
> |
return (video_depth <= VIDEO_DEPTH_8BIT) ? 8 : mac_depth_of_video_depth(video_depth); |
386 |
> |
} |
387 |
> |
|
388 |
> |
// Check wether specified mode is available |
389 |
> |
static bool has_mode(int type, int width, int height) |
390 |
> |
{ |
391 |
> |
// FIXME: no fullscreen support yet |
392 |
> |
if (type == DISPLAY_SCREEN) |
393 |
> |
return false; |
394 |
> |
|
395 |
|
#ifdef SHEEPSHAVER |
396 |
< |
// Don't add 512x384 modes |
396 |
> |
// Filter out Classic resolutiosn |
397 |
|
if (width == 512 && height == 384) |
398 |
+ |
return false; |
399 |
+ |
|
400 |
+ |
// Read window modes prefs |
401 |
+ |
static uint32 window_modes = 0; |
402 |
+ |
static uint32 screen_modes = 0; |
403 |
+ |
if (window_modes == 0 || screen_modes == 0) { |
404 |
+ |
window_modes = PrefsFindInt32("windowmodes"); |
405 |
+ |
screen_modes = PrefsFindInt32("screenmodes"); |
406 |
+ |
if (window_modes == 0 || screen_modes == 0) |
407 |
+ |
window_modes |= 3; // Allow at least 640x480 and 800x600 window modes |
408 |
+ |
} |
409 |
+ |
|
410 |
+ |
if (type == DISPLAY_WINDOW) { |
411 |
+ |
int apple_mask, apple_id = find_apple_resolution(width, height); |
412 |
+ |
switch (apple_id) { |
413 |
+ |
case APPLE_640x480: apple_mask = 0x01; break; |
414 |
+ |
case APPLE_800x600: apple_mask = 0x02; break; |
415 |
+ |
case APPLE_1024x768: apple_mask = 0x04; break; |
416 |
+ |
case APPLE_1152x768: apple_mask = 0x40; break; |
417 |
+ |
case APPLE_1152x900: apple_mask = 0x08; break; |
418 |
+ |
case APPLE_1280x1024: apple_mask = 0x10; break; |
419 |
+ |
case APPLE_1600x1200: apple_mask = 0x20; break; |
420 |
+ |
default: apple_mask = 0x00; break; |
421 |
+ |
} |
422 |
+ |
return (window_modes & apple_mask); |
423 |
+ |
} |
424 |
+ |
#else |
425 |
+ |
return true; |
426 |
+ |
#endif |
427 |
+ |
return false; |
428 |
+ |
} |
429 |
+ |
|
430 |
+ |
// Add mode to list of supported modes |
431 |
+ |
static void add_mode(int type, int width, int height, int resolution_id, int bytes_per_row, int depth) |
432 |
+ |
{ |
433 |
+ |
// Filter out unsupported modes |
434 |
+ |
if (!has_mode(type, width, height)) |
435 |
|
return; |
436 |
|
|
437 |
+ |
// Fill in VideoMode entry |
438 |
+ |
VIDEO_MODE mode; |
439 |
+ |
#ifdef SHEEPSHAVER |
440 |
|
// Recalculate dimensions to fit Apple modes |
441 |
|
resolution_id = match_apple_resolution(width, height); |
442 |
|
mode.viType = type; |
445 |
|
VIDEO_MODE_Y = height; |
446 |
|
VIDEO_MODE_RESOLUTION = resolution_id; |
447 |
|
VIDEO_MODE_ROW_BYTES = bytes_per_row; |
448 |
< |
VIDEO_MODE_DEPTH = depth; |
448 |
> |
VIDEO_MODE_DEPTH = (video_depth)depth; |
449 |
|
VideoModes.push_back(mode); |
450 |
|
} |
451 |
|
|
581 |
|
if (s) |
582 |
|
SDL_FreeSurface(s); |
583 |
|
|
584 |
+ |
// the_buffer shall always be mapped through vm_acquire_framebuffer() |
585 |
+ |
if (the_buffer != VM_MAP_FAILED) { |
586 |
+ |
D(bug(" releasing the_buffer at %p (%d bytes)\n", the_buffer, the_buffer_size)); |
587 |
+ |
vm_release_framebuffer(the_buffer, the_buffer_size); |
588 |
+ |
the_buffer = NULL; |
589 |
+ |
} |
590 |
+ |
|
591 |
|
// Free frame buffer(s) |
592 |
|
if (!use_vosf) { |
500 |
– |
if (the_buffer) { |
501 |
– |
free(the_buffer); |
502 |
– |
the_buffer = NULL; |
503 |
– |
} |
593 |
|
if (the_buffer_copy) { |
594 |
|
free(the_buffer_copy); |
595 |
|
the_buffer_copy = NULL; |
597 |
|
} |
598 |
|
#ifdef ENABLE_VOSF |
599 |
|
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 |
– |
} |
600 |
|
if (the_host_buffer) { |
601 |
|
D(bug(" freeing the_host_buffer at %p\n", the_host_buffer)); |
602 |
|
free(the_host_buffer); |
607 |
|
free(the_buffer_copy); |
608 |
|
the_buffer_copy = NULL; |
609 |
|
} |
610 |
+ |
|
611 |
+ |
// Deinitialize VOSF |
612 |
+ |
video_vosf_exit(); |
613 |
|
} |
614 |
|
#endif |
615 |
|
} |
619 |
|
{ |
620 |
|
const VIDEO_MODE &mode = monitor.get_current_mode(); |
621 |
|
|
622 |
< |
if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT) |
622 |
> |
if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT) |
623 |
|
SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256); |
624 |
|
} |
625 |
|
|
650 |
|
ADBSetRelMouseMode(mouse_grabbed); |
651 |
|
|
652 |
|
// Create surface |
653 |
< |
int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth); |
653 |
> |
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
654 |
|
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL) |
655 |
|
return; |
656 |
|
|
659 |
|
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
660 |
|
the_host_buffer = (uint8 *)s->pixels; |
661 |
|
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); |
662 |
< |
the_buffer = (uint8 *)vm_acquire(the_buffer_size); |
662 |
> |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
663 |
|
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
664 |
|
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
665 |
+ |
|
666 |
+ |
// Check whether we can initialize the VOSF subsystem and it's profitable |
667 |
+ |
if (!video_vosf_init(m)) { |
668 |
+ |
WarningAlert(STR_VOSF_INIT_ERR); |
669 |
+ |
use_vosf = false; |
670 |
+ |
} |
671 |
+ |
else if (!video_vosf_profitable()) { |
672 |
+ |
video_vosf_exit(); |
673 |
+ |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
674 |
+ |
use_vosf = false; |
675 |
+ |
} |
676 |
+ |
if (!use_vosf) { |
677 |
+ |
free(the_buffer_copy); |
678 |
+ |
vm_release(the_buffer, the_buffer_size); |
679 |
+ |
the_host_buffer = NULL; |
680 |
+ |
} |
681 |
+ |
#endif |
682 |
+ |
if (!use_vosf) { |
683 |
+ |
// Allocate memory for frame buffer |
684 |
+ |
the_buffer_size = (aligned_height + 2) * s->pitch; |
685 |
+ |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
686 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
687 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
688 |
+ |
} |
689 |
+ |
|
690 |
+ |
#ifdef SHEEPSHAVER |
691 |
+ |
// Create cursor |
692 |
+ |
if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) { |
693 |
+ |
SDL_SetCursor(sdl_cursor); |
694 |
+ |
cursor_changed = false; |
695 |
+ |
} |
696 |
|
#else |
697 |
< |
// Allocate memory for frame buffer |
698 |
< |
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)); |
697 |
> |
// Hide cursor |
698 |
> |
SDL_ShowCursor(0); |
699 |
|
#endif |
700 |
|
|
701 |
|
// Set window name/class |
702 |
|
set_window_name(STR_WINDOW_TITLE); |
703 |
|
|
590 |
– |
// Hide cursor |
591 |
– |
SDL_ShowCursor(0); |
592 |
– |
|
704 |
|
// Init blitting routines |
705 |
|
SDL_PixelFormat *f = s->format; |
706 |
|
VisualFormat visualFormat; |
708 |
|
visualFormat.Rmask = f->Rmask; |
709 |
|
visualFormat.Gmask = f->Gmask; |
710 |
|
visualFormat.Bmask = f->Bmask; |
711 |
< |
Screen_blitter_init(visualFormat, true, sdl_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
711 |
> |
Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
712 |
|
|
713 |
|
// Load gray ramp to 8->16/32 expand map |
714 |
|
if (!IsDirectMode(mode)) |
806 |
|
SDL_VideoDriverName(video_driver, sizeof(video_driver)); |
807 |
|
bool video_driver_found = false; |
808 |
|
char line[256]; |
809 |
+ |
int n_keys = 0; |
810 |
|
while (fgets(line, sizeof(line) - 1, f)) { |
811 |
|
// Read line |
812 |
|
int len = strlen(line); |
819 |
|
continue; |
820 |
|
|
821 |
|
if (video_driver_found) { |
822 |
< |
// Skip aliases |
823 |
< |
static const char alias_str[] = "alias"; |
824 |
< |
if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0) |
822 |
> |
// Skip aliases as long as we have read keycodes yet |
823 |
> |
// Otherwise, it's another mapping and we have to stop |
824 |
> |
static const char sdl_str[] = "sdl"; |
825 |
> |
if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0) |
826 |
|
continue; |
827 |
|
|
828 |
|
// Read keycode |
829 |
|
int x_code, mac_code; |
830 |
|
if (sscanf(line, "%d %d", &x_code, &mac_code) == 2) |
831 |
< |
keycode_table[x_code & 0xff] = mac_code; |
831 |
> |
keycode_table[x_code & 0xff] = mac_code, n_keys++; |
832 |
|
else |
833 |
|
break; |
834 |
|
} else { |
835 |
|
// Search for SDL video driver string |
836 |
< |
static const char alias_sdl_str[] = "alias SDL"; |
837 |
< |
if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) { |
838 |
< |
char *p = line + sizeof(alias_sdl_str); |
836 |
> |
static const char sdl_str[] = "sdl"; |
837 |
> |
if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) { |
838 |
> |
char *p = line + sizeof(sdl_str); |
839 |
|
if (strstr(video_driver, p) == video_driver) |
840 |
|
video_driver_found = true; |
841 |
|
} |
853 |
|
WarningAlert(str); |
854 |
|
return; |
855 |
|
} |
856 |
+ |
|
857 |
+ |
D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys)); |
858 |
|
} |
859 |
|
} |
860 |
|
|
863 |
|
{ |
864 |
|
D(bug("video_open()\n")); |
865 |
|
const VIDEO_MODE &mode = get_current_mode(); |
866 |
+ |
#if DEBUG |
867 |
+ |
D(bug("Current video mode:\n")); |
868 |
+ |
D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH & 0x0f))); |
869 |
+ |
#endif |
870 |
|
|
871 |
|
// Create display driver object of requested type |
872 |
|
switch (display_type) { |
882 |
|
return false; |
883 |
|
} |
884 |
|
|
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 |
– |
|
885 |
|
// Initialize VideoRefresh function |
886 |
|
VideoRefreshInit(); |
887 |
|
|
929 |
|
mouse_wheel_lines = PrefsFindInt32("mousewheellines"); |
930 |
|
|
931 |
|
// Get screen mode from preferences |
932 |
< |
const char *mode_str; |
932 |
> |
const char *mode_str = NULL; |
933 |
> |
#ifndef SHEEPSHAVER |
934 |
|
if (classic_mode) |
935 |
|
mode_str = "win/512/342"; |
936 |
|
else |
937 |
|
mode_str = PrefsFindString("screen"); |
938 |
+ |
#endif |
939 |
|
|
940 |
|
// Determine display type and default dimensions |
941 |
|
int default_width, default_height; |
953 |
|
display_type = DISPLAY_WINDOW; |
954 |
|
} |
955 |
|
int max_width = 640, max_height = 480; |
956 |
< |
if (display_type == DISPLAY_SCREEN) { |
957 |
< |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
958 |
< |
if (modes && modes != (SDL_Rect **)-1) { |
959 |
< |
max_width = modes[0]->w; |
960 |
< |
max_height = modes[0]->h; |
961 |
< |
} |
956 |
> |
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
957 |
> |
if (modes && modes != (SDL_Rect **)-1) { |
958 |
> |
max_width = modes[0]->w; |
959 |
> |
max_height = modes[0]->h; |
960 |
> |
if (default_width > max_width) |
961 |
> |
default_width = max_width; |
962 |
> |
if (default_height > max_height) |
963 |
> |
default_height = max_height; |
964 |
|
} |
965 |
|
if (default_width <= 0) |
966 |
|
default_width = max_width; |
991 |
|
add_mode(display_type, 512, 342, 0x80, 64, VIDEO_DEPTH_1BIT); |
992 |
|
else { |
993 |
|
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { |
994 |
< |
int bpp = (d <= VIDEO_DEPTH_8BIT ? 8 : sdl_depth_of_video_depth(d)); |
994 |
> |
int bpp = sdl_depth_of_video_depth(d); |
995 |
|
if (SDL_VideoModeOK(max_width, max_height, bpp, SDL_HWSURFACE)) |
996 |
|
add_window_modes(video_depth(d)); |
997 |
|
} |
1027 |
|
} |
1028 |
|
|
1029 |
|
#ifdef SHEEPSHAVER |
1030 |
< |
for (int i = 0; i < VideoModes.size(); ++i) |
1030 |
> |
for (int i = 0; i < VideoModes.size(); i++) |
1031 |
|
VModes[i] = VideoModes[i]; |
1032 |
< |
|
1033 |
< |
const VIDEO_MODE & mode = VideoModes[cur_mode]; |
1034 |
< |
D(bug("Current video mode\n")); |
1035 |
< |
D(bug(" %dx%d (ID %02x), %d bpp\n", VIDEO_MODE_X, VIDEO_MODE_Y, VIDEO_MODE_RESOLUTION, 1 << (VIDEO_MODE_DEPTH - 0x80))); |
1032 |
> |
VideoInfo *p = &VModes[VideoModes.size()]; |
1033 |
> |
p->viType = DIS_INVALID; // End marker |
1034 |
> |
p->viRowBytes = 0; |
1035 |
> |
p->viXsize = p->viYsize = 0; |
1036 |
> |
p->viAppleMode = 0; |
1037 |
> |
p->viAppleID = 0; |
1038 |
|
#endif |
1039 |
|
|
1040 |
|
#if DEBUG |
1079 |
|
UNLOCK_FRAME_BUFFER; |
1080 |
|
D(bug(" frame buffer unlocked\n")); |
1081 |
|
|
967 |
– |
#ifdef ENABLE_VOSF |
968 |
– |
if (use_vosf) { |
969 |
– |
// Deinitialize VOSF |
970 |
– |
video_vosf_exit(); |
971 |
– |
} |
972 |
– |
#endif |
973 |
– |
|
1082 |
|
// Close display |
1083 |
|
delete drv; |
1084 |
|
drv = NULL; |
1176 |
|
const VIDEO_MODE &mode = get_current_mode(); |
1177 |
|
|
1178 |
|
// FIXME: how can we handle the gamma ramp? |
1179 |
< |
if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT) |
1179 |
> |
if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT) |
1180 |
|
return; |
1181 |
|
|
1182 |
|
LOCK_PALETTE; |
1201 |
|
} |
1202 |
|
|
1203 |
|
#ifdef ENABLE_VOSF |
1204 |
< |
// We have to redraw everything because the interpretation of pixel values changed |
1205 |
< |
LOCK_VOSF; |
1206 |
< |
PFLAG_SET_ALL; |
1207 |
< |
UNLOCK_VOSF; |
1208 |
< |
memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y); |
1204 |
> |
if (use_vosf) { |
1205 |
> |
// We have to redraw everything because the interpretation of pixel values changed |
1206 |
> |
LOCK_VOSF; |
1207 |
> |
PFLAG_SET_ALL; |
1208 |
> |
UNLOCK_VOSF; |
1209 |
> |
memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y); |
1210 |
> |
} |
1211 |
|
#endif |
1212 |
|
} |
1213 |
|
|
1237 |
|
csSave->saveData = ReadMacInt32(ParamPtr + csData); |
1238 |
|
csSave->savePage = ReadMacInt16(ParamPtr + csPage); |
1239 |
|
|
1240 |
< |
// Disable interrupts |
1240 |
> |
// Disable interrupts and pause redraw thread |
1241 |
|
DisableInterrupt(); |
1242 |
+ |
thread_stop_ack = false; |
1243 |
+ |
thread_stop_req = true; |
1244 |
+ |
while (!thread_stop_ack) ; |
1245 |
|
|
1246 |
|
cur_mode = i; |
1247 |
|
monitor_desc *monitor = VideoMonitors[0]; |
1252 |
|
csSave->saveData=VModes[cur_mode].viAppleID;/* First mode ... */ |
1253 |
|
csSave->saveMode=VModes[cur_mode].viAppleMode; |
1254 |
|
|
1255 |
< |
// Enable interrupts |
1255 |
> |
// Enable interrupts and resume redraw thread |
1256 |
> |
thread_stop_req = false; |
1257 |
|
EnableInterrupt(); |
1258 |
|
return noErr; |
1259 |
|
} |
1282 |
|
#ifdef SHEEPSHAVER |
1283 |
|
bool video_can_change_cursor(void) |
1284 |
|
{ |
1285 |
< |
// return hw_mac_cursor_accl && (display_type != DISPLAY_SCREEN); |
1172 |
< |
return false; |
1285 |
> |
return (display_type == DISPLAY_WINDOW); |
1286 |
|
} |
1287 |
|
#endif |
1288 |
|
|
1294 |
|
#ifdef SHEEPSHAVER |
1295 |
|
void video_set_cursor(void) |
1296 |
|
{ |
1297 |
< |
// cursor_changed = true; |
1297 |
> |
cursor_changed = true; |
1298 |
|
} |
1299 |
|
#endif |
1300 |
|
|
1301 |
|
|
1302 |
|
/* |
1303 |
< |
* Install graphics acceleration |
1303 |
> |
* Keyboard-related utilify functions |
1304 |
|
*/ |
1305 |
|
|
1306 |
< |
#ifdef SHEEPSHAVER |
1194 |
< |
// Rectangle inversion |
1195 |
< |
template< int bpp > |
1196 |
< |
static inline void do_invrect(uint8 *dest, uint32 length) |
1306 |
> |
static bool is_modifier_key(SDL_KeyboardEvent const & e) |
1307 |
|
{ |
1308 |
< |
#define INVERT_1(PTR, OFS) ((uint8 *)(PTR))[OFS] = ~((uint8 *)(PTR))[OFS] |
1309 |
< |
#define INVERT_2(PTR, OFS) ((uint16 *)(PTR))[OFS] = ~((uint16 *)(PTR))[OFS] |
1310 |
< |
#define INVERT_4(PTR, OFS) ((uint32 *)(PTR))[OFS] = ~((uint32 *)(PTR))[OFS] |
1311 |
< |
#define INVERT_8(PTR, OFS) ((uint64 *)(PTR))[OFS] = ~((uint64 *)(PTR))[OFS] |
1312 |
< |
|
1313 |
< |
#ifndef UNALIGNED_PROFITABLE |
1314 |
< |
// Align on 16-bit boundaries |
1315 |
< |
if (bpp < 16 && (((uintptr)dest) & 1)) { |
1316 |
< |
INVERT_1(dest, 0); |
1317 |
< |
dest += 1; length -= 1; |
1318 |
< |
} |
1319 |
< |
|
1320 |
< |
// Align on 32-bit boundaries |
1321 |
< |
if (bpp < 32 && (((uintptr)dest) & 2)) { |
1322 |
< |
INVERT_2(dest, 0); |
1323 |
< |
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)); |
1308 |
> |
switch (e.keysym.sym) { |
1309 |
> |
case SDLK_NUMLOCK: |
1310 |
> |
case SDLK_CAPSLOCK: |
1311 |
> |
case SDLK_SCROLLOCK: |
1312 |
> |
case SDLK_RSHIFT: |
1313 |
> |
case SDLK_LSHIFT: |
1314 |
> |
case SDLK_RCTRL: |
1315 |
> |
case SDLK_LCTRL: |
1316 |
> |
case SDLK_RALT: |
1317 |
> |
case SDLK_LALT: |
1318 |
> |
case SDLK_RMETA: |
1319 |
> |
case SDLK_LMETA: |
1320 |
> |
case SDLK_LSUPER: |
1321 |
> |
case SDLK_RSUPER: |
1322 |
> |
case SDLK_MODE: |
1323 |
> |
case SDLK_COMPOSE: |
1324 |
|
return true; |
1325 |
|
} |
1326 |
|
return false; |
1327 |
|
} |
1328 |
|
|
1329 |
< |
// 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) |
1329 |
> |
static bool is_ctrl_down(SDL_keysym const & ks) |
1330 |
|
{ |
1331 |
< |
// 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 |
< |
} |
1331 |
> |
return ctrl_down || (ks.mod & KMOD_CTRL); |
1332 |
|
} |
1548 |
– |
#endif |
1333 |
|
|
1334 |
|
|
1335 |
|
/* |
1337 |
|
* and -2 if the key was recognized as a hotkey |
1338 |
|
*/ |
1339 |
|
|
1556 |
– |
static bool is_ctrl_down(SDL_keysym const & ks) |
1557 |
– |
{ |
1558 |
– |
return ctrl_down || (ks.mod & KMOD_CTRL); |
1559 |
– |
} |
1560 |
– |
|
1340 |
|
static int kc_decode(SDL_keysym const & ks, bool key_down) |
1341 |
|
{ |
1342 |
|
switch (ks.sym) { |
1406 |
|
case SDLK_RCTRL: return 0x36; |
1407 |
|
case SDLK_LSHIFT: return 0x38; |
1408 |
|
case SDLK_RSHIFT: return 0x38; |
1409 |
+ |
#if (defined(__APPLE__) && defined(__MACH__)) |
1410 |
+ |
case SDLK_LALT: return 0x3a; |
1411 |
+ |
case SDLK_RALT: return 0x3a; |
1412 |
+ |
case SDLK_LMETA: return 0x37; |
1413 |
+ |
case SDLK_RMETA: return 0x37; |
1414 |
+ |
#else |
1415 |
|
case SDLK_LALT: return 0x37; |
1416 |
|
case SDLK_RALT: return 0x37; |
1417 |
|
case SDLK_LMETA: return 0x3a; |
1418 |
|
case SDLK_RMETA: return 0x3a; |
1419 |
+ |
#endif |
1420 |
|
case SDLK_MENU: return 0x32; |
1421 |
|
case SDLK_CAPSLOCK: return 0x39; |
1422 |
|
case SDLK_NUMLOCK: return 0x47; |
1523 |
|
// Keyboard |
1524 |
|
case SDL_KEYDOWN: { |
1525 |
|
int code = -1; |
1526 |
< |
if (use_keycodes) { |
1526 |
> |
if (use_keycodes && !is_modifier_key(event.key)) { |
1527 |
|
if (event2keycode(event.key, true) != -2) // This is called to process the hotkeys |
1528 |
|
code = keycode_table[event.key.keysym.scancode & 0xff]; |
1529 |
|
} else |
1551 |
|
} |
1552 |
|
case SDL_KEYUP: { |
1553 |
|
int code = -1; |
1554 |
< |
if (use_keycodes) { |
1554 |
> |
if (use_keycodes && !is_modifier_key(event.key)) { |
1555 |
|
if (event2keycode(event.key, false) != -2) // This is called to process the hotkeys |
1556 |
|
code = keycode_table[event.key.keysym.scancode & 0xff]; |
1557 |
|
} else |
1558 |
|
code = event2keycode(event.key, false); |
1559 |
< |
if (code >= 0 && code != 0x39) { // Don't propagate Caps Lock releases |
1560 |
< |
ADBKeyUp(code); |
1559 |
> |
if (code >= 0) { |
1560 |
> |
if (code == 0x39) { // Caps Lock released |
1561 |
> |
if (caps_on) { |
1562 |
> |
ADBKeyUp(code); |
1563 |
> |
caps_on = false; |
1564 |
> |
} else { |
1565 |
> |
ADBKeyDown(code); |
1566 |
> |
caps_on = true; |
1567 |
> |
} |
1568 |
> |
} else |
1569 |
> |
ADBKeyUp(code); |
1570 |
|
if (code == 0x36) |
1571 |
|
ctrl_down = false; |
1572 |
|
} |
1633 |
|
|
1634 |
|
// Check for first column from left and first column from right that have changed |
1635 |
|
if (high) { |
1636 |
< |
if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) { |
1636 |
> |
if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) { |
1637 |
|
const int src_bytes_per_row = bytes_per_row; |
1638 |
|
const int dst_bytes_per_row = drv->s->pitch; |
1639 |
|
const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row; |
1894 |
|
next = GetTicks_usec(); |
1895 |
|
ticks++; |
1896 |
|
|
1897 |
+ |
#ifdef SHEEPSHAVER |
1898 |
+ |
// Pause if requested (during video mode switches) |
1899 |
+ |
if (thread_stop_req) { |
1900 |
+ |
thread_stop_ack = true; |
1901 |
+ |
continue; |
1902 |
+ |
} |
1903 |
+ |
#endif |
1904 |
+ |
|
1905 |
|
// Handle SDL events |
1906 |
|
handle_events(); |
1907 |
|
|
1908 |
|
// Refresh display |
1909 |
|
video_refresh(); |
1910 |
|
|
1911 |
+ |
#ifdef SHEEPSHAVER |
1912 |
+ |
// Set new cursor image if it was changed |
1913 |
+ |
if (cursor_changed && sdl_cursor) { |
1914 |
+ |
cursor_changed = false; |
1915 |
+ |
SDL_FreeCursor(sdl_cursor); |
1916 |
+ |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
1917 |
+ |
if (sdl_cursor) |
1918 |
+ |
SDL_SetCursor(sdl_cursor); |
1919 |
+ |
} |
1920 |
+ |
#endif |
1921 |
+ |
|
1922 |
|
// Set new palette if it was changed |
1923 |
|
handle_palette_changes(); |
1924 |
|
} |