21 |
|
/* |
22 |
|
* NOTES: |
23 |
|
* The Ctrl key works like a qualifier for special actions: |
24 |
< |
* Ctrl-Tab = suspend DGA mode |
24 |
> |
* Ctrl-Tab = suspend DGA mode (TODO) |
25 |
|
* Ctrl-Esc = emergency quit |
26 |
|
* Ctrl-F1 = mount floppy |
27 |
|
* Ctrl-F5 = grab mouse (in windowed mode) |
28 |
|
* |
29 |
|
* FIXMEs and TODOs: |
30 |
+ |
* - Ctr-Tab for suspend/resume but how? SDL does not support that for non-Linux |
31 |
|
* - Ctrl-Fn doesn't generate SDL_KEYDOWN events (SDL bug?) |
32 |
|
* - Mouse acceleration, there is no API in SDL yet for that |
33 |
|
* - Force relative mode in Grab mode even if SDL provides absolute coordinates? |
38 |
|
* Besides, there can't seem to be a way to call SetVideoMode() from a child thread. |
39 |
|
* - Refresh performance is still slow. Use SDL_CreateRGBSurface()? |
40 |
|
* - Backport hw cursor acceleration to Basilisk II? |
41 |
+ |
* - Factor out code |
42 |
|
*/ |
43 |
|
|
44 |
|
#include "sysdeps.h" |
101 |
|
static uint32 the_buffer_size; // Size of allocated the_buffer |
102 |
|
|
103 |
|
static bool redraw_thread_active = false; // Flag: Redraw thread installed |
104 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
105 |
|
static volatile bool redraw_thread_cancel; // Flag: Cancel Redraw thread |
106 |
|
static SDL_Thread *redraw_thread = NULL; // Redraw thread |
107 |
+ |
#ifdef SHEEPSHAVER |
108 |
|
static volatile bool thread_stop_req = false; |
109 |
|
static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req |
110 |
+ |
#endif |
111 |
+ |
#endif |
112 |
|
|
113 |
|
#ifdef ENABLE_VOSF |
114 |
|
static bool use_vosf = false; // Flag: VOSF enabled |
135 |
|
static bool sdl_palette_changed = false; // Flag: Palette changed, redraw thread must set new colors |
136 |
|
static const int sdl_eventmask = SDL_MOUSEBUTTONDOWNMASK | SDL_MOUSEBUTTONUPMASK | SDL_MOUSEMOTIONMASK | SDL_KEYUPMASK | SDL_KEYDOWNMASK | SDL_VIDEOEXPOSEMASK | SDL_QUITMASK; |
137 |
|
|
138 |
+ |
// Mutex to protect SDL events |
139 |
+ |
static SDL_mutex *sdl_events_lock = NULL; |
140 |
+ |
#define LOCK_EVENTS SDL_LockMutex(sdl_events_lock) |
141 |
+ |
#define UNLOCK_EVENTS SDL_UnlockMutex(sdl_events_lock) |
142 |
+ |
|
143 |
|
// Mutex to protect palette |
144 |
|
static SDL_mutex *sdl_palette_lock = NULL; |
145 |
|
#define LOCK_PALETTE SDL_LockMutex(sdl_palette_lock) |
163 |
|
|
164 |
|
|
165 |
|
/* |
166 |
+ |
* SDL surface locking glue |
167 |
+ |
*/ |
168 |
+ |
|
169 |
+ |
#ifdef ENABLE_VOSF |
170 |
+ |
#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) do { \ |
171 |
+ |
if ((SURFACE)->flags & (SDL_HWSURFACE | SDL_FULLSCREEN)) \ |
172 |
+ |
the_host_buffer = (uint8 *)(SURFACE)->pixels; \ |
173 |
+ |
} while (0) |
174 |
+ |
#else |
175 |
+ |
#define SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE) |
176 |
+ |
#endif |
177 |
+ |
|
178 |
+ |
#define SDL_VIDEO_LOCK_SURFACE(SURFACE) do { \ |
179 |
+ |
if (SDL_MUSTLOCK(SURFACE)) { \ |
180 |
+ |
SDL_LockSurface(SURFACE); \ |
181 |
+ |
SDL_VIDEO_LOCK_VOSF_SURFACE(SURFACE); \ |
182 |
+ |
} \ |
183 |
+ |
} while (0) |
184 |
+ |
|
185 |
+ |
#define SDL_VIDEO_UNLOCK_SURFACE(SURFACE) do { \ |
186 |
+ |
if (SDL_MUSTLOCK(SURFACE)) \ |
187 |
+ |
SDL_UnlockSurface(SURFACE); \ |
188 |
+ |
} while (0) |
189 |
+ |
|
190 |
+ |
|
191 |
+ |
/* |
192 |
|
* Framebuffer allocation routines |
193 |
|
*/ |
194 |
|
|
195 |
|
static void *vm_acquire_framebuffer(uint32 size) |
196 |
|
{ |
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 |
197 |
|
return vm_acquire(size); |
198 |
|
} |
199 |
|
|
204 |
|
|
205 |
|
|
206 |
|
/* |
207 |
+ |
* Windows message handler |
208 |
+ |
*/ |
209 |
+ |
|
210 |
+ |
#ifdef WIN32 |
211 |
+ |
#include <dbt.h> |
212 |
+ |
static WNDPROC sdl_window_proc = NULL; // Window proc used by SDL |
213 |
+ |
|
214 |
+ |
extern void SysMediaArrived(void); |
215 |
+ |
extern void SysMediaRemoved(void); |
216 |
+ |
extern HWND GetMainWindowHandle(void); |
217 |
+ |
|
218 |
+ |
static LRESULT CALLBACK windows_message_handler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) |
219 |
+ |
{ |
220 |
+ |
switch (msg) { |
221 |
+ |
case WM_DEVICECHANGE: |
222 |
+ |
if (wParam == DBT_DEVICEREMOVECOMPLETE) { |
223 |
+ |
DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam; |
224 |
+ |
if (p->dbch_devicetype == DBT_DEVTYP_VOLUME) |
225 |
+ |
SysMediaRemoved(); |
226 |
+ |
} |
227 |
+ |
else if (wParam == DBT_DEVICEARRIVAL) { |
228 |
+ |
DEV_BROADCAST_HDR *p = (DEV_BROADCAST_HDR *)lParam; |
229 |
+ |
if (p->dbch_devicetype == DBT_DEVTYP_VOLUME) |
230 |
+ |
SysMediaArrived(); |
231 |
+ |
} |
232 |
+ |
return 0; |
233 |
+ |
|
234 |
+ |
default: |
235 |
+ |
if (sdl_window_proc) |
236 |
+ |
return CallWindowProc(sdl_window_proc, hwnd, msg, wParam, lParam); |
237 |
+ |
} |
238 |
+ |
|
239 |
+ |
return DefWindowProc(hwnd, msg, wParam, lParam); |
240 |
+ |
} |
241 |
+ |
#endif |
242 |
+ |
|
243 |
+ |
|
244 |
+ |
/* |
245 |
|
* SheepShaver glue |
246 |
|
*/ |
247 |
|
|
458 |
|
// Check wether specified mode is available |
459 |
|
static bool has_mode(int type, int width, int height) |
460 |
|
{ |
395 |
– |
// FIXME: no fullscreen support yet |
396 |
– |
if (type == DISPLAY_SCREEN) |
397 |
– |
return false; |
398 |
– |
|
461 |
|
#ifdef SHEEPSHAVER |
462 |
|
// Filter out Classic resolutiosn |
463 |
|
if (width == 512 && height == 384) |
464 |
|
return false; |
465 |
|
|
466 |
< |
// Read window modes prefs |
466 |
> |
// "screen" prefs items always succeeds |
467 |
> |
if (PrefsFindString("screen")) |
468 |
> |
return true; |
469 |
> |
|
470 |
> |
// Read window & screen modes prefs |
471 |
|
static uint32 window_modes = 0; |
472 |
|
static uint32 screen_modes = 0; |
473 |
|
if (window_modes == 0 || screen_modes == 0) { |
477 |
|
window_modes |= 3; // Allow at least 640x480 and 800x600 window modes |
478 |
|
} |
479 |
|
|
480 |
< |
if (type == DISPLAY_WINDOW) { |
481 |
< |
int apple_mask, apple_id = find_apple_resolution(width, height); |
482 |
< |
switch (apple_id) { |
483 |
< |
case APPLE_640x480: apple_mask = 0x01; break; |
484 |
< |
case APPLE_800x600: apple_mask = 0x02; break; |
485 |
< |
case APPLE_1024x768: apple_mask = 0x04; break; |
486 |
< |
case APPLE_1152x768: apple_mask = 0x40; break; |
487 |
< |
case APPLE_1152x900: apple_mask = 0x08; break; |
488 |
< |
case APPLE_1280x1024: apple_mask = 0x10; break; |
489 |
< |
case APPLE_1600x1200: apple_mask = 0x20; break; |
490 |
< |
default: apple_mask = 0x00; break; |
425 |
< |
} |
426 |
< |
return (window_modes & apple_mask); |
480 |
> |
int test_modes; |
481 |
> |
switch (type) { |
482 |
> |
case DISPLAY_WINDOW: |
483 |
> |
test_modes = window_modes; |
484 |
> |
break; |
485 |
> |
case DISPLAY_SCREEN: |
486 |
> |
test_modes = screen_modes; |
487 |
> |
break; |
488 |
> |
default: |
489 |
> |
test_modes = 0; |
490 |
> |
break; |
491 |
|
} |
492 |
< |
#else |
493 |
< |
return true; |
492 |
> |
|
493 |
> |
int apple_mask; |
494 |
> |
switch (find_apple_resolution(width, height)) { |
495 |
> |
case APPLE_640x480: apple_mask = 0x01; break; |
496 |
> |
case APPLE_800x600: apple_mask = 0x02; break; |
497 |
> |
case APPLE_1024x768: apple_mask = 0x04; break; |
498 |
> |
case APPLE_1152x768: apple_mask = 0x40; break; |
499 |
> |
case APPLE_1152x900: apple_mask = 0x08; break; |
500 |
> |
case APPLE_1280x1024: apple_mask = 0x10; break; |
501 |
> |
case APPLE_1600x1200: apple_mask = 0x20; break; |
502 |
> |
default: apple_mask = 0x00; break; |
503 |
> |
} |
504 |
> |
return (test_modes & apple_mask); |
505 |
|
#endif |
506 |
< |
return false; |
506 |
> |
return true; |
507 |
|
} |
508 |
|
|
509 |
|
// Add mode to list of supported modes |
580 |
|
// Set mouse grab mode |
581 |
|
static SDL_GrabMode set_grab_mode(SDL_GrabMode mode) |
582 |
|
{ |
583 |
< |
const SDL_VideoInfo *vi =SDL_GetVideoInfo(); |
583 |
> |
const SDL_VideoInfo *vi = SDL_GetVideoInfo(); |
584 |
|
return (vi && vi->wm_available ? SDL_WM_GrabInput(mode) : SDL_GRAB_OFF); |
585 |
|
} |
586 |
|
|
639 |
|
int mouse_last_x, mouse_last_y; // Last mouse position (for relative mode) |
640 |
|
}; |
641 |
|
|
642 |
+ |
class driver_fullscreen : public driver_base { |
643 |
+ |
public: |
644 |
+ |
driver_fullscreen(SDL_monitor_desc &monitor); |
645 |
+ |
~driver_fullscreen(); |
646 |
+ |
}; |
647 |
+ |
|
648 |
|
static driver_base *drv = NULL; // Pointer to currently used driver object |
649 |
|
|
650 |
|
#ifdef ENABLE_VOSF |
860 |
|
ADBMouseMoved(x, y); |
861 |
|
} |
862 |
|
|
863 |
+ |
|
864 |
+ |
/* |
865 |
+ |
* Full-screen display driver |
866 |
+ |
*/ |
867 |
+ |
|
868 |
+ |
// Open display |
869 |
+ |
driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m) |
870 |
+ |
: driver_base(m) |
871 |
+ |
{ |
872 |
+ |
int width = VIDEO_MODE_X, height = VIDEO_MODE_Y; |
873 |
+ |
int aligned_width = (width + 15) & ~15; |
874 |
+ |
int aligned_height = (height + 15) & ~15; |
875 |
+ |
|
876 |
+ |
// Set absolute mouse mode |
877 |
+ |
ADBSetRelMouseMode(false); |
878 |
+ |
|
879 |
+ |
// Create surface |
880 |
+ |
int depth = sdl_depth_of_video_depth(VIDEO_MODE_DEPTH); |
881 |
+ |
if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE | SDL_FULLSCREEN)) == NULL) |
882 |
+ |
return; |
883 |
+ |
|
884 |
+ |
#ifdef ENABLE_VOSF |
885 |
+ |
use_vosf = true; |
886 |
+ |
// Allocate memory for frame buffer (SIZE is extended to page-boundary) |
887 |
+ |
the_host_buffer = (uint8 *)s->pixels; |
888 |
+ |
the_buffer_size = page_extend((aligned_height + 2) * s->pitch); |
889 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
890 |
+ |
the_buffer_copy = (uint8 *)malloc(the_buffer_size); |
891 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer)); |
892 |
+ |
|
893 |
+ |
// Check whether we can initialize the VOSF subsystem and it's profitable |
894 |
+ |
if (!video_vosf_init(m)) { |
895 |
+ |
WarningAlert(STR_VOSF_INIT_ERR); |
896 |
+ |
use_vosf = false; |
897 |
+ |
} |
898 |
+ |
else if (!video_vosf_profitable()) { |
899 |
+ |
video_vosf_exit(); |
900 |
+ |
printf("VOSF acceleration is not profitable on this platform, disabling it\n"); |
901 |
+ |
use_vosf = false; |
902 |
+ |
} |
903 |
+ |
if (!use_vosf) { |
904 |
+ |
free(the_buffer_copy); |
905 |
+ |
vm_release(the_buffer, the_buffer_size); |
906 |
+ |
the_host_buffer = NULL; |
907 |
+ |
} |
908 |
+ |
#endif |
909 |
+ |
if (!use_vosf) { |
910 |
+ |
// Allocate memory for frame buffer |
911 |
+ |
the_buffer_size = (aligned_height + 2) * s->pitch; |
912 |
+ |
the_buffer_copy = (uint8 *)calloc(1, the_buffer_size); |
913 |
+ |
the_buffer = (uint8 *)vm_acquire_framebuffer(the_buffer_size); |
914 |
+ |
D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy)); |
915 |
+ |
} |
916 |
+ |
|
917 |
+ |
// Hide cursor |
918 |
+ |
SDL_ShowCursor(0); |
919 |
+ |
|
920 |
+ |
// Init blitting routines |
921 |
+ |
SDL_PixelFormat *f = s->format; |
922 |
+ |
VisualFormat visualFormat; |
923 |
+ |
visualFormat.depth = depth; |
924 |
+ |
visualFormat.Rmask = f->Rmask; |
925 |
+ |
visualFormat.Gmask = f->Gmask; |
926 |
+ |
visualFormat.Bmask = f->Bmask; |
927 |
+ |
Screen_blitter_init(visualFormat, true, mac_depth_of_video_depth(VIDEO_MODE_DEPTH)); |
928 |
+ |
|
929 |
+ |
// Load gray ramp to 8->16/32 expand map |
930 |
+ |
if (!IsDirectMode(mode)) |
931 |
+ |
for (int i=0; i<256; i++) |
932 |
+ |
ExpandMap[i] = SDL_MapRGB(f, i, i, i); |
933 |
+ |
|
934 |
+ |
// Set frame buffer base |
935 |
+ |
set_mac_frame_buffer(monitor, VIDEO_MODE_DEPTH, true); |
936 |
+ |
|
937 |
+ |
// Everything went well |
938 |
+ |
init_ok = true; |
939 |
+ |
} |
940 |
+ |
|
941 |
+ |
// Close display |
942 |
+ |
driver_fullscreen::~driver_fullscreen() |
943 |
+ |
{ |
944 |
+ |
#ifdef ENABLE_VOSF |
945 |
+ |
if (use_vosf) |
946 |
+ |
the_host_buffer = NULL; // don't free() in driver_base dtor |
947 |
+ |
#endif |
948 |
+ |
if (s) |
949 |
+ |
SDL_FreeSurface(s); |
950 |
+ |
|
951 |
+ |
// Show cursor |
952 |
+ |
SDL_ShowCursor(1); |
953 |
+ |
} |
954 |
+ |
|
955 |
+ |
|
956 |
|
/* |
957 |
|
* Initialization |
958 |
|
*/ |
1051 |
|
case DISPLAY_WINDOW: |
1052 |
|
drv = new(std::nothrow) driver_window(*this); |
1053 |
|
break; |
1054 |
+ |
case DISPLAY_SCREEN: |
1055 |
+ |
drv = new(std::nothrow) driver_fullscreen(*this); |
1056 |
+ |
break; |
1057 |
|
} |
1058 |
|
if (drv == NULL) |
1059 |
|
return false; |
1063 |
|
return false; |
1064 |
|
} |
1065 |
|
|
1066 |
+ |
#ifdef WIN32 |
1067 |
+ |
// Chain in a new message handler for WM_DEVICECHANGE |
1068 |
+ |
HWND the_window = GetMainWindowHandle(); |
1069 |
+ |
sdl_window_proc = (WNDPROC)GetWindowLongPtr(the_window, GWLP_WNDPROC); |
1070 |
+ |
SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)windows_message_handler); |
1071 |
+ |
#endif |
1072 |
+ |
|
1073 |
|
// Initialize VideoRefresh function |
1074 |
|
VideoRefreshInit(); |
1075 |
|
|
1077 |
|
LOCK_FRAME_BUFFER; |
1078 |
|
|
1079 |
|
// Start redraw/input thread |
1080 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
1081 |
|
redraw_thread_cancel = false; |
1082 |
|
redraw_thread_active = ((redraw_thread = SDL_CreateThread(redraw_func, NULL)) != NULL); |
1083 |
|
if (!redraw_thread_active) { |
1084 |
|
printf("FATAL: cannot create redraw thread\n"); |
1085 |
|
return false; |
1086 |
|
} |
1087 |
+ |
#else |
1088 |
+ |
redraw_thread_active = true; |
1089 |
+ |
#endif |
1090 |
|
return true; |
1091 |
|
} |
1092 |
|
|
1107 |
|
#endif |
1108 |
|
|
1109 |
|
// Create Mutexes |
1110 |
+ |
if ((sdl_events_lock = SDL_CreateMutex()) == NULL) |
1111 |
+ |
return false; |
1112 |
|
if ((sdl_palette_lock = SDL_CreateMutex()) == NULL) |
1113 |
|
return false; |
1114 |
|
if ((frame_buffer_lock = SDL_CreateMutex()) == NULL) |
1124 |
|
|
1125 |
|
// Get screen mode from preferences |
1126 |
|
const char *mode_str = NULL; |
937 |
– |
#ifndef SHEEPSHAVER |
1127 |
|
if (classic_mode) |
1128 |
|
mode_str = "win/512/342"; |
1129 |
|
else |
1130 |
|
mode_str = PrefsFindString("screen"); |
942 |
– |
#endif |
1131 |
|
|
1132 |
|
// Determine display type and default dimensions |
1133 |
|
int default_width, default_height; |
1143 |
|
if (mode_str) { |
1144 |
|
if (sscanf(mode_str, "win/%d/%d", &default_width, &default_height) == 2) |
1145 |
|
display_type = DISPLAY_WINDOW; |
1146 |
+ |
else if (sscanf(mode_str, "dga/%d/%d", &default_width, &default_height) == 2) |
1147 |
+ |
display_type = DISPLAY_SCREEN; |
1148 |
|
} |
1149 |
|
int max_width = 640, max_height = 480; |
1150 |
|
SDL_Rect **modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); |
1198 |
|
add_window_modes(video_depth(d)); |
1199 |
|
} |
1200 |
|
} |
1201 |
< |
} else |
1202 |
< |
add_mode(display_type, default_width, default_height, 0x80, TrivialBytesPerRow(default_width, (video_depth)default_depth), default_depth); |
1201 |
> |
} else if (display_type == DISPLAY_SCREEN) { |
1202 |
> |
struct { |
1203 |
> |
int w; |
1204 |
> |
int h; |
1205 |
> |
int resolution_id; |
1206 |
> |
} |
1207 |
> |
video_modes[] = { |
1208 |
> |
{ -1, -1, 0x80 }, |
1209 |
> |
{ 640, 480, 0x81 }, |
1210 |
> |
{ 800, 600, 0x82 }, |
1211 |
> |
{ 1024, 768, 0x83 }, |
1212 |
> |
{ 1152, 870, 0x84 }, |
1213 |
> |
{ 1280, 1024, 0x85 }, |
1214 |
> |
{ 1600, 1200, 0x86 }, |
1215 |
> |
{ 0, } |
1216 |
> |
}; |
1217 |
> |
video_modes[0].w = default_width; |
1218 |
> |
video_modes[0].h = default_height; |
1219 |
> |
|
1220 |
> |
for (int i = 0; video_modes[i].w != 0; i++) { |
1221 |
> |
const int w = video_modes[i].w; |
1222 |
> |
const int h = video_modes[i].h; |
1223 |
> |
if (i > 0 && (w >= default_width || h >= default_height)) |
1224 |
> |
continue; |
1225 |
> |
#ifdef ENABLE_VOSF |
1226 |
> |
for (int d = VIDEO_DEPTH_1BIT; d <= default_depth; d++) { |
1227 |
> |
int bpp = sdl_depth_of_video_depth(d); |
1228 |
> |
if (SDL_VideoModeOK(w, h, bpp, SDL_HWSURFACE | SDL_FULLSCREEN)) |
1229 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)d), d); |
1230 |
> |
} |
1231 |
> |
#else |
1232 |
> |
add_mode(display_type, w, h, video_modes[i].resolution_id, TrivialBytesPerRow(w, (video_depth)default_depth), default_depth); |
1233 |
> |
#endif |
1234 |
> |
} |
1235 |
> |
} |
1236 |
> |
|
1237 |
|
if (VideoModes.empty()) { |
1238 |
|
ErrorAlert(STR_NO_XVISUAL_ERR); |
1239 |
|
return false; |
1304 |
|
{ |
1305 |
|
D(bug("video_close()\n")); |
1306 |
|
|
1307 |
+ |
#ifdef WIN32 |
1308 |
+ |
// Remove message handler for WM_DEVICECHANGE |
1309 |
+ |
HWND the_window = GetMainWindowHandle(); |
1310 |
+ |
SetWindowLongPtr(the_window, GWLP_WNDPROC, (LONG_PTR)sdl_window_proc); |
1311 |
+ |
#endif |
1312 |
+ |
|
1313 |
|
// Stop redraw thread |
1314 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
1315 |
|
if (redraw_thread_active) { |
1316 |
|
redraw_thread_cancel = true; |
1317 |
|
SDL_WaitThread(redraw_thread, NULL); |
1318 |
|
} |
1319 |
+ |
#endif |
1320 |
|
redraw_thread_active = false; |
1321 |
|
|
1322 |
|
// Unlock frame buffer |
1340 |
|
SDL_DestroyMutex(frame_buffer_lock); |
1341 |
|
if (sdl_palette_lock) |
1342 |
|
SDL_DestroyMutex(sdl_palette_lock); |
1343 |
+ |
if (sdl_events_lock) |
1344 |
+ |
SDL_DestroyMutex(sdl_events_lock); |
1345 |
|
} |
1346 |
|
|
1347 |
|
|
1511 |
|
void SDL_monitor_desc::switch_to_current_mode(void) |
1512 |
|
{ |
1513 |
|
// Close and reopen display |
1514 |
+ |
LOCK_EVENTS; |
1515 |
|
video_close(); |
1516 |
|
video_open(); |
1517 |
+ |
UNLOCK_EVENTS; |
1518 |
|
|
1519 |
|
if (drv == NULL) { |
1520 |
|
ErrorAlert(STR_OPEN_WINDOW_ERR); |
1617 |
|
|
1618 |
|
case SDLK_1: case SDLK_EXCLAIM: return 0x12; |
1619 |
|
case SDLK_2: case SDLK_AT: return 0x13; |
1620 |
< |
// case SDLK_3: case SDLK_numbersign: return 0x14; |
1620 |
> |
case SDLK_3: case SDLK_HASH: return 0x14; |
1621 |
|
case SDLK_4: case SDLK_DOLLAR: return 0x15; |
1622 |
< |
// case SDLK_5: case SDLK_percent: return 0x17; |
1622 |
> |
case SDLK_5: return 0x17; |
1623 |
|
case SDLK_6: return 0x16; |
1624 |
|
case SDLK_7: return 0x1a; |
1625 |
|
case SDLK_8: return 0x1c; |
1626 |
|
case SDLK_9: return 0x19; |
1627 |
|
case SDLK_0: return 0x1d; |
1628 |
|
|
1629 |
< |
// case SDLK_BACKQUOTE: case SDLK_asciitilde: return 0x0a; |
1629 |
> |
case SDLK_BACKQUOTE: return 0x0a; |
1630 |
|
case SDLK_MINUS: case SDLK_UNDERSCORE: return 0x1b; |
1631 |
|
case SDLK_EQUALS: case SDLK_PLUS: return 0x18; |
1632 |
< |
// case SDLK_bracketleft: case SDLK_braceleft: return 0x21; |
1633 |
< |
// case SDLK_bracketright: case SDLK_braceright: return 0x1e; |
1634 |
< |
// case SDLK_BACKSLASH: case SDLK_bar: return 0x2a; |
1632 |
> |
case SDLK_LEFTBRACKET: return 0x21; |
1633 |
> |
case SDLK_RIGHTBRACKET: return 0x1e; |
1634 |
> |
case SDLK_BACKSLASH: return 0x2a; |
1635 |
|
case SDLK_SEMICOLON: case SDLK_COLON: return 0x29; |
1636 |
< |
// case SDLK_apostrophe: case SDLK_QUOTEDBL: return 0x27; |
1636 |
> |
case SDLK_QUOTE: case SDLK_QUOTEDBL: return 0x27; |
1637 |
|
case SDLK_COMMA: case SDLK_LESS: return 0x2b; |
1638 |
|
case SDLK_PERIOD: case SDLK_GREATER: return 0x2f; |
1639 |
|
case SDLK_SLASH: case SDLK_QUESTION: return 0x2c; |
1665 |
|
case SDLK_LMETA: return 0x3a; |
1666 |
|
case SDLK_RMETA: return 0x3a; |
1667 |
|
#endif |
1668 |
+ |
case SDLK_LSUPER: return 0x3a; // "Windows" key |
1669 |
+ |
case SDLK_RSUPER: return 0x3a; |
1670 |
|
case SDLK_MENU: return 0x32; |
1671 |
|
case SDLK_CAPSLOCK: return 0x39; |
1672 |
|
case SDLK_NUMLOCK: return 0x47; |
2060 |
|
tick_counter = 0; |
2061 |
|
if (mainBuffer.dirty) { |
2062 |
|
LOCK_VOSF; |
2063 |
< |
update_display_dga_vosf(); |
2063 |
> |
update_display_dga_vosf(static_cast<driver_fullscreen *>(drv)); |
2064 |
|
UNLOCK_VOSF; |
2065 |
|
} |
2066 |
|
} |
2124 |
|
} |
2125 |
|
} |
2126 |
|
|
2127 |
+ |
static inline void do_video_refresh(void) |
2128 |
+ |
{ |
2129 |
+ |
// Handle SDL events |
2130 |
+ |
handle_events(); |
2131 |
+ |
|
2132 |
+ |
// Update display |
2133 |
+ |
video_refresh(); |
2134 |
+ |
|
2135 |
+ |
#ifdef SHEEPSHAVER |
2136 |
+ |
// Set new cursor image if it was changed |
2137 |
+ |
if (cursor_changed && sdl_cursor) { |
2138 |
+ |
cursor_changed = false; |
2139 |
+ |
LOCK_EVENTS; |
2140 |
+ |
SDL_FreeCursor(sdl_cursor); |
2141 |
+ |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
2142 |
+ |
if (sdl_cursor) |
2143 |
+ |
SDL_SetCursor(sdl_cursor); |
2144 |
+ |
UNLOCK_EVENTS; |
2145 |
+ |
} |
2146 |
+ |
#endif |
2147 |
+ |
|
2148 |
+ |
// Set new palette if it was changed |
2149 |
+ |
handle_palette_changes(); |
2150 |
+ |
} |
2151 |
+ |
|
2152 |
+ |
// This function is called on non-threaded platforms from a timer interrupt |
2153 |
+ |
void VideoRefresh(void) |
2154 |
+ |
{ |
2155 |
+ |
// We need to check redraw_thread_active to inhibit refreshed during |
2156 |
+ |
// mode changes on non-threaded platforms |
2157 |
+ |
if (!redraw_thread_active) |
2158 |
+ |
return; |
2159 |
+ |
|
2160 |
+ |
// Process pending events and update display |
2161 |
+ |
do_video_refresh(); |
2162 |
+ |
} |
2163 |
+ |
|
2164 |
|
const int VIDEO_REFRESH_HZ = 60; |
2165 |
|
const int VIDEO_REFRESH_DELAY = 1000000 / VIDEO_REFRESH_HZ; |
2166 |
|
|
2167 |
+ |
#ifndef USE_CPU_EMUL_SERVICES |
2168 |
|
static int redraw_func(void *arg) |
2169 |
|
{ |
2170 |
|
uint64 start = GetTicks_usec(); |
2190 |
|
} |
2191 |
|
#endif |
2192 |
|
|
2193 |
< |
// Handle SDL events |
2194 |
< |
handle_events(); |
1919 |
< |
|
1920 |
< |
// Refresh display |
1921 |
< |
video_refresh(); |
1922 |
< |
|
1923 |
< |
#ifdef SHEEPSHAVER |
1924 |
< |
// Set new cursor image if it was changed |
1925 |
< |
if (cursor_changed && sdl_cursor) { |
1926 |
< |
cursor_changed = false; |
1927 |
< |
SDL_FreeCursor(sdl_cursor); |
1928 |
< |
sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, MacCursor[2], MacCursor[3]); |
1929 |
< |
if (sdl_cursor) |
1930 |
< |
SDL_SetCursor(sdl_cursor); |
1931 |
< |
} |
1932 |
< |
#endif |
1933 |
< |
|
1934 |
< |
// Set new palette if it was changed |
1935 |
< |
handle_palette_changes(); |
2193 |
> |
// Process pending events and update display |
2194 |
> |
do_video_refresh(); |
2195 |
|
} |
2196 |
|
|
2197 |
|
uint64 end = GetTicks_usec(); |
2198 |
|
D(bug("%lld refreshes in %lld usec = %f refreshes/sec\n", ticks, end - start, ticks * 1000000.0 / (end - start))); |
2199 |
|
return 0; |
2200 |
|
} |
2201 |
+ |
#endif |