diff options
| author | Kostas Nakos | 2008-08-25 08:48:46 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2008-08-25 08:48:46 +0000 |
| commit | 50b55a6f6f5a77b0d85be5af2247c34d1a79417a (patch) | |
| tree | 25a797946aee0581b41c5b89cad949e8b6747e8e /backends/platform | |
| parent | 2b2bfc04c152aaa1ab4dab7662937f314e3af9f3 (diff) | |
| download | scummvm-rg350-50b55a6f6f5a77b0d85be5af2247c34d1a79417a.tar.gz scummvm-rg350-50b55a6f6f5a77b0d85be5af2247c34d1a79417a.tar.bz2 scummvm-rg350-50b55a6f6f5a77b0d85be5af2247c34d1a79417a.zip | |
patch 1868881: ini option to disable doubletap rmb
svn-id: r34141
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/wince/README-WinCE.txt | 5 | ||||
| -rw-r--r-- | backends/platform/wince/wince-sdl.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/wince/wince-sdl.h | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/backends/platform/wince/README-WinCE.txt b/backends/platform/wince/README-WinCE.txt index ecbf28968a..663e05e5a1 100644 --- a/backends/platform/wince/README-WinCE.txt +++ b/backends/platform/wince/README-WinCE.txt @@ -303,10 +303,13 @@ Game specific sections (f.e. [monkey2]) - performance options 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 diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 1fd221de8e..f09a483086 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -461,7 +461,7 @@ OSystem_WINCE3::OSystem_WINCE3() : OSystem_SDL(), _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 @@ void OSystem_WINCE3::update_game_settings() { _saveToolbarState = true; } + if (ConfMan.hasKey("no_doubletap_rightclick")) + _noDoubleTapRMB = ConfMan.getBool("no_doubletap_rightclick"); + compute_sample_rate(); } @@ -2334,7 +2337,7 @@ bool OSystem_WINCE3::pollEvent(Common::Event &event) { 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; } diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index 8853c156d8..ece8c9b7b1 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -200,6 +200,7 @@ private: 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 |