[Scummvm-cvs-logs] SF.net SVN: scummvm:[34141] scummvm/trunk/backends/platform/wince

knakos at users.sourceforge.net knakos at users.sourceforge.net
Mon Aug 25 10:48:47 CEST 2008


Revision: 34141
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34141&view=rev
Author:   knakos
Date:     2008-08-25 08:48:46 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
patch 1868881: ini option to disable doubletap rmb

Modified Paths:
--------------
    scummvm/trunk/backends/platform/wince/README-WinCE.txt
    scummvm/trunk/backends/platform/wince/wince-sdl.cpp
    scummvm/trunk/backends/platform/wince/wince-sdl.h

Modified: scummvm/trunk/backends/platform/wince/README-WinCE.txt
===================================================================
--- scummvm/trunk/backends/platform/wince/README-WinCE.txt	2008-08-25 08:21:59 UTC (rev 34140)
+++ scummvm/trunk/backends/platform/wince/README-WinCE.txt	2008-08-25 08:48:46 UTC (rev 34141)
@@ -303,11 +303,14 @@
 
 Game specific sections (f.e. [monkey2]) - game options
 
- *  landscape              int      0: Portrait, 1: Landscape, 2: Inverse Landscape
+ *  landscape                int    0: Portrait, 1: Landscape, 2: Inverse Landscape
                                     You can also use this in the [scummvm] section
                                     in QVGA Pocket PCs to display the launcher in
                                     landscape, for example, at startup.
+ *  no_doubletap_rightclick  int    1: Turn off the default behaviour of simulating
+                                    a right-click when the screen is double-tapped. 
 
+
 [scummvm] section - keys definition
 
 You usually do not wish to modify these values directly, as they are set

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2008-08-25 08:21:59 UTC (rev 34140)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp	2008-08-25 08:48:46 UTC (rev 34141)
@@ -461,7 +461,7 @@
 	_orientationLandscape(0), _newOrientation(0), _panelInitialized(false),
 	_panelVisible(true), _panelStateForced(false), _forceHideMouse(false), _unfilteredkeys(false),
 	_freeLook(false), _forcePanelInvisible(false), _toolbarHighDrawn(false), _zoomUp(false), _zoomDown(false),
-	_scalersChanged(false), _lastKeyPressed(0), _tapTime(0), _closeClick(false),
+	_scalersChanged(false), _lastKeyPressed(0), _tapTime(0), _closeClick(false), _noDoubleTapRMB(false),
 	_saveToolbarState(false), _saveActiveToolbar(NAME_MAIN_PANEL), _rbutton(false), _hasfocus(true),
 	_usesEmulatedMouse(false), _mouseBackupOld(NULL), _mouseBackupToolbar(NULL), _mouseBackupDim(0)
 {
@@ -1061,6 +1061,9 @@
 		_saveToolbarState = true;
 	}
 
+	if (ConfMan.hasKey("no_doubletap_rightclick"))
+		_noDoubleTapRMB = ConfMan.getBool("no_doubletap_rightclick");
+
 	compute_sample_rate();
 }
 
@@ -2334,7 +2337,7 @@
 					if (_closeClick && (GetTickCount() - _tapTime < 1000)) {
 						if (event.mouse.y <= 20 && _panelInitialized) {		// top of screen (show panel)
 							swap_panel_visibility();
-						} else {		// right click
+						} else if (!_noDoubleTapRMB) {		// right click
 							event.type = Common::EVENT_RBUTTONDOWN;
 							_rbutton = true;
 						}

Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h	2008-08-25 08:21:59 UTC (rev 34140)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h	2008-08-25 08:48:46 UTC (rev 34141)
@@ -200,6 +200,7 @@
 	bool _zoomUp;			// zooming up mode
 	bool _zoomDown;			// zooming down mode
 
+	bool _noDoubleTapRMB;	// disable double tap -> rmb click 
 	bool _rbutton;			// double tap -> right button simulation
 	bool _closeClick;		// flag when taps are spatially close together
 


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