--- BasiliskII/src/SDL/video_sdl.cpp	2004/06/24 22:38:42	1.6
+++ BasiliskII/src/SDL/video_sdl.cpp	2004/06/29 21:50:22	1.10
@@ -99,7 +99,7 @@ static volatile bool redraw_thread_cance
 static SDL_Thread *redraw_thread = NULL;			// Redraw thread
 
 #ifdef ENABLE_VOSF
-static bool use_vosf = true;						// Flag: VOSF enabled
+static bool use_vosf = false;						// Flag: VOSF enabled
 #else
 static const bool use_vosf = false;					// VOSF not possible
 #endif
@@ -260,6 +260,12 @@ static void ErrorAlert(int error)
 {
 	ErrorAlert(GetString(error));
 }
+
+// Display warning alert
+static void WarningAlert(int warning)
+{
+	WarningAlert(GetString(warning));
+}
 #endif
 
 
@@ -407,7 +413,7 @@ static void add_mode(int type, int width
 	VIDEO_MODE_Y = height;
 	VIDEO_MODE_RESOLUTION = resolution_id;
 	VIDEO_MODE_ROW_BYTES = bytes_per_row;
-	VIDEO_MODE_DEPTH = depth;
+	VIDEO_MODE_DEPTH = (video_depth)depth;
 	VideoModes.push_back(mode);
 }
 
@@ -581,7 +587,7 @@ void driver_base::update_palette(void)
 {
 	const VIDEO_MODE &mode = monitor.get_current_mode();
 
-	if (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
+	if ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT)
 		SDL_SetPalette(s, SDL_PHYSPAL, sdl_palette, 0, 256);
 }
 
@@ -612,7 +618,7 @@ driver_window::driver_window(SDL_monitor
 	ADBSetRelMouseMode(mouse_grabbed);
 
 	// Create surface
-	int depth = (VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
+	int depth = ((int)VIDEO_MODE_DEPTH <= VIDEO_DEPTH_8BIT ? 8 : screen_depth);
 	if ((s = SDL_SetVideoMode(width, height, depth, SDL_HWSURFACE)) == NULL)
 		return;
 
@@ -624,14 +630,31 @@ driver_window::driver_window(SDL_monitor
 	the_buffer = (uint8 *)vm_acquire(the_buffer_size);
 	the_buffer_copy = (uint8 *)malloc(the_buffer_size);
 	D(bug("the_buffer = %p, the_buffer_copy = %p, the_host_buffer = %p\n", the_buffer, the_buffer_copy, the_host_buffer));
-#else
-	// Allocate memory for frame buffer
-	the_buffer_size = (aligned_height + 2) * s->pitch;
-	the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
-	the_buffer = (uint8 *)calloc(1, the_buffer_size);
-	D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
-#endif
 
+	// Check whether we can initialize the VOSF subsystem and it's profitable
+	if (!video_vosf_init(m)) {
+		WarningAlert(STR_VOSF_INIT_ERR);
+		use_vosf = false;
+	}
+	else if (!video_vosf_profitable()) {
+		video_vosf_exit();
+		printf("VOSF acceleration is not profitable on this platform, disabling it\n");
+		use_vosf = false;
+	}
+	if (!use_vosf) {
+		free(the_buffer_copy);
+		vm_release(the_buffer, the_buffer_size);
+		the_host_buffer = NULL;
+	}
+#endif
+	if (!use_vosf) {
+		// Allocate memory for frame buffer
+		the_buffer_size = (aligned_height + 2) * s->pitch;
+		the_buffer_copy = (uint8 *)calloc(1, the_buffer_size);
+		the_buffer = (uint8 *)calloc(1, the_buffer_size);
+		D(bug("the_buffer = %p, the_buffer_copy = %p\n", the_buffer, the_buffer_copy));
+	}
+	
 #ifdef SHEEPSHAVER
 	// Create cursor
 	if ((sdl_cursor = SDL_CreateCursor(MacCursor + 4, MacCursor + 36, 16, 16, 0, 0)) != NULL) {
@@ -764,8 +787,8 @@ static void keycode_init(void)
 
 			if (video_driver_found) {
 				// Skip aliases
-				static const char alias_str[] = "alias";
-				if (strncmp(line, alias_str, sizeof(alias_str) - 1) == 0)
+				static const char sdl_str[] = "sdl";
+				if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
 					continue;
 
 				// Read keycode
@@ -776,9 +799,9 @@ static void keycode_init(void)
 					break;
 			} else {
 				// Search for SDL video driver string
-				static const char alias_sdl_str[] = "alias SDL";
-				if (strncmp(line, alias_sdl_str, sizeof(alias_sdl_str) - 1) == 0) {
-					char *p = line + sizeof(alias_sdl_str);
+				static const char sdl_str[] = "sdl";
+				if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0) {
+					char *p = line + sizeof(sdl_str);
 					if (strstr(video_driver, p) == video_driver)
 						video_driver_found = true;
 				}
@@ -823,16 +846,6 @@ bool SDL_monitor_desc::video_open(void)
 		return false;
 	}
 
-#ifdef ENABLE_VOSF
-	if (use_vosf) {
-		// Initialize the VOSF system
-		if (!video_vosf_init(*this)) {
-			ErrorAlert(STR_VOSF_INIT_ERR);
-        	return false;
-		}
-	}
-#endif
-	
 	// Initialize VideoRefresh function
 	VideoRefreshInit();
 
@@ -1134,7 +1147,7 @@ void SDL_monitor_desc::set_palette(uint8
 	const VIDEO_MODE &mode = get_current_mode();
 
 	// FIXME: how can we handle the gamma ramp?
-	if (VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
+	if ((int)VIDEO_MODE_DEPTH > VIDEO_DEPTH_8BIT)
 		return;
 
 	LOCK_PALETTE;
@@ -1159,11 +1172,13 @@ void SDL_monitor_desc::set_palette(uint8
 		}
 
 #ifdef ENABLE_VOSF
-		// We have to redraw everything because the interpretation of pixel values changed
-		LOCK_VOSF;
-		PFLAG_SET_ALL;
-		UNLOCK_VOSF;
-		memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
+		if (use_vosf) {
+			// We have to redraw everything because the interpretation of pixel values changed
+			LOCK_VOSF;
+			PFLAG_SET_ALL;
+			UNLOCK_VOSF;
+			memset(the_buffer_copy, 0, VIDEO_MODE_ROW_BYTES * VIDEO_MODE_Y);
+		}
 #endif
 	}
 
@@ -1614,15 +1629,43 @@ void VideoInstallAccel(void)
 
 
 /*
- *  Translate key event to Mac keycode, returns -1 if no keycode was found
- *  and -2 if the key was recognized as a hotkey
+ *  Keyboard-related utilify functions
  */
 
+static bool is_modifier_key(SDL_KeyboardEvent const & e)
+{
+	switch (e.keysym.sym) {
+	case SDLK_NUMLOCK:
+	case SDLK_CAPSLOCK:
+	case SDLK_SCROLLOCK:
+	case SDLK_RSHIFT:
+	case SDLK_LSHIFT:
+	case SDLK_RCTRL:
+	case SDLK_LCTRL:
+	case SDLK_RALT:
+	case SDLK_LALT:
+	case SDLK_RMETA:
+	case SDLK_LMETA:
+	case SDLK_LSUPER:
+	case SDLK_RSUPER:
+	case SDLK_MODE:
+	case SDLK_COMPOSE:
+		return true;
+	}
+	return false;
+}
+
 static bool is_ctrl_down(SDL_keysym const & ks)
 {
 	return ctrl_down || (ks.mod & KMOD_CTRL);
 }
 
+
+/*
+ *  Translate key event to Mac keycode, returns -1 if no keycode was found
+ *  and -2 if the key was recognized as a hotkey
+ */
+
 static int kc_decode(SDL_keysym const & ks, bool key_down)
 {
 	switch (ks.sym) {
@@ -1692,10 +1735,17 @@ static int kc_decode(SDL_keysym const &
 	case SDLK_RCTRL: return 0x36;
 	case SDLK_LSHIFT: return 0x38;
 	case SDLK_RSHIFT: return 0x38;
+#if (defined(__APPLE__) && defined(__MACH__))
+	case SDLK_LALT: return 0x3a;
+	case SDLK_RALT: return 0x3a;
+	case SDLK_LMETA: return 0x37;
+	case SDLK_RMETA: return 0x37;
+#else
 	case SDLK_LALT: return 0x37;
 	case SDLK_RALT: return 0x37;
 	case SDLK_LMETA: return 0x3a;
 	case SDLK_RMETA: return 0x3a;
+#endif
 	case SDLK_MENU: return 0x32;
 	case SDLK_CAPSLOCK: return 0x39;
 	case SDLK_NUMLOCK: return 0x47;
@@ -1802,7 +1852,7 @@ static void handle_events(void)
 			// Keyboard
 			case SDL_KEYDOWN: {
 				int code = -1;
-				if (use_keycodes) {
+				if (use_keycodes && !is_modifier_key(event.key)) {
 					if (event2keycode(event.key, true) != -2)	// This is called to process the hotkeys
 						code = keycode_table[event.key.keysym.scancode & 0xff];
 				} else
@@ -1830,13 +1880,22 @@ static void handle_events(void)
 			}
 			case SDL_KEYUP: {
 				int code = -1;
-				if (use_keycodes) {
+				if (use_keycodes && !is_modifier_key(event.key)) {
 					if (event2keycode(event.key, false) != -2)	// This is called to process the hotkeys
 						code = keycode_table[event.key.keysym.scancode & 0xff];
 				} else
 					code = event2keycode(event.key, false);
-				if (code >= 0 && code != 0x39) {	// Don't propagate Caps Lock releases
-					ADBKeyUp(code);
+				if (code >= 0) {
+					if (code == 0x39) {	// Caps Lock released
+						if (caps_on) {
+							ADBKeyUp(code);
+							caps_on = false;
+						} else {
+							ADBKeyDown(code);
+							caps_on = true;
+						}
+					} else
+						ADBKeyUp(code);
 					if (code == 0x36)
 						ctrl_down = false;
 				}
@@ -1903,7 +1962,7 @@ static void update_display_static(driver
 
 	// Check for first column from left and first column from right that have changed
 	if (high) {
-		if (VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
+		if ((int)VIDEO_MODE_DEPTH < VIDEO_DEPTH_8BIT) {
 			const int src_bytes_per_row = bytes_per_row;
 			const int dst_bytes_per_row = drv->s->pitch;
 			const int pixels_per_byte = VIDEO_MODE_X / src_bytes_per_row;