[Scummvm-cvs-logs] SF.net SVN: scummvm:[43442] scummvm/branches/branch-1-0-0

[mthreepwood at users.sourceforge.net]

Revision: 43442
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43442&view=rev
Author:   mthreepwood
Date:     2009-08-16 14:11:20 +0000 (Sun, 16 Aug 2009)

Log Message:
-----------
Backport r43441 (backspace fix on Mac OS X) which also fixes bug #2838517.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/events/default/default-events.cpp
    scummvm/branches/branch-1-0-0/engines/agos/event.cpp
    scummvm/branches/branch-1-0-0/engines/scumm/input.cpp

Modified: scummvm/branches/branch-1-0-0/backends/events/default/default-events.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/events/default/default-events.cpp	2009-08-16 14:04:54 UTC (rev 43441)
+++ scummvm/branches/branch-1-0-0/backends/events/default/default-events.cpp	2009-08-16 14:11:20 UTC (rev 43442)
@@ -497,6 +497,12 @@
 				}
 			}
 #endif
+			else if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) {
+				// WORKAROUND: On Mac OS X, the ascii value for backspace
+				// has to be set to the backspace keycode in order to work
+				// properly.
+				event.kbd.ascii = Common::KEYCODE_BACKSPACE;
+			}
 			break;
 
 		case Common::EVENT_KEYUP:

Modified: scummvm/branches/branch-1-0-0/engines/agos/event.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/agos/event.cpp	2009-08-16 14:04:54 UTC (rev 43441)
+++ scummvm/branches/branch-1-0-0/engines/agos/event.cpp	2009-08-16 14:11:20 UTC (rev 43442)
@@ -498,7 +498,6 @@
 						_variableArray[41] = 1;
 				}
 
-				// Make sure backspace works right (this fixes a small issue on OS X)
 				_keyPressed = event.kbd;
 				break;
 			case Common::EVENT_MOUSEMOVE:

Modified: scummvm/branches/branch-1-0-0/engines/scumm/input.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/input.cpp	2009-08-16 14:04:54 UTC (rev 43441)
+++ scummvm/branches/branch-1-0-0/engines/scumm/input.cpp	2009-08-16 14:11:20 UTC (rev 43442)
@@ -135,13 +135,6 @@
 			// Normal key press, pass on to the game.
 			_keyPressed = event.kbd;
 		}
-		
-		// WORKAROUND: On Mac OS X, the ascii value has to be set to the
-		// backspace keycode in order for the backspace to work in HE games.
-		// This includes using the backspace when entering coach names
-		// in the backyard games. 
-		if (_keyPressed.keycode == Common::KEYCODE_BACKSPACE)
-			_keyPressed.ascii = Common::KEYCODE_BACKSPACE;
 
 		// FIXME: We are using ASCII values to index the _keyDownMap here,
 		// yet later one code which checks _keyDownMap will use KEYCODEs


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.