[Scummvm-cvs-logs] SF.net SVN: scummvm: [23719] scummvm/branches/branch-0-9-0/backends/wince/wince-sdl.cpp

knakos at users.sourceforge.net knakos at users.sourceforge.net
Fri Aug 18 22:52:39 CEST 2006


Revision: 23719
Author:   knakos
Date:     2006-08-18 13:52:28 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23719&view=rev

Log Message:
-----------
fix smartphone cursor hiding when keyboard up, more logical zone function, got rid of higher sound thread priority by default.

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/backends/wince/wince-sdl.cpp
Modified: scummvm/branches/branch-0-9-0/backends/wince/wince-sdl.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/backends/wince/wince-sdl.cpp	2006-08-16 20:52:43 UTC (rev 23718)
+++ scummvm/branches/branch-0-9-0/backends/wince/wince-sdl.cpp	2006-08-18 20:52:28 UTC (rev 23719)
@@ -532,13 +532,12 @@
 
     for (i=0; i<TOTAL_ZONES; i++)
 		if (x >= _zones[i].x && y >= _zones[i].y &&
-			x <= _zones[i].x + _zones[i].width && y <= _zones[i].y + _zones[i].height
-		   ) {
+			x <= _zones[i].x + _zones[i].width && y <= _zones[i].y + _zones[i].height) {
 				_mouseXZone[i] = x;
 				_mouseYZone[i] = y;
 				break;
 		}
-	_currentZone++;
+	_currentZone = i + 1;
 	if (_currentZone >= TOTAL_ZONES)
 		_currentZone = 0;
 
@@ -697,11 +696,7 @@
 
 	// Add sound thread priority
 	if (!ConfMan.hasKey("sound_thread_priority")) {
-#ifdef SH3
 		thread_priority = THREAD_PRIORITY_NORMAL;
-#else
-		thread_priority = THREAD_PRIORITY_ABOVE_NORMAL;
-#endif
 	}
 	else
 		thread_priority = ConfMan.getInt("sound_thread_priority");
@@ -1974,7 +1969,7 @@
 
 void OSystem_WINCE3::drawMouse() {
 	// FIXME
-	if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset()) && !_forceHideMouse)
+	if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset() && !_usesEmulatedMouse) && !_forceHideMouse)
 		internDrawMouse();		
 }
 


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





More information about the Scummvm-git-logs mailing list