Ticket #8778: scummvm-0.11.0-maemo.patch
File scummvm-0.11.0-maemo.patch, 24.8 KB (added by , 16 years ago) |
---|
-
debian/changelog
diff -Naur scummvm-0.11.orig/debian/changelog scummvm-0.11/debian/changelog
old new 1 scummvm (0.11.0-0) unstable; urgency=low 2 3 * upstream 0.11 release 4 5 -- Frantisek Dufka <dufkaf@seznam.cz> Sat, 12 Jan 2008 22:26:34 +0100 6 scummvm (0.10.0-5) unstable; urgency=low 7 8 * fixed for chinook, menu selection postinst script added 9 10 -- Frantisek Dufka <dufkaf@seznam.cz> Thu, 25 Oct 2007 09:56:32 +0200 11 scummvm (0.10.0-4) unstable; urgency=low 12 13 * AGI - added pred.dic to DATA_PATH (=/usr/share/scummvm) to enable 14 predictive input 15 16 -- Frantisek Dufka <dufkaf@seznam.cz> Tue, 28 Aug 2007 09:58:29 +0200 17 scummvm (0.10.0-3) unstable; urgency=low 18 19 * SCUMM - added mapping also for key up events (may fix right button in FT?) 20 * SWORD2 - added right button press mapping (not tested) 21 22 -- Frantisek Dufka <dufkaf@seznam.cz> Mon, 20 Aug 2007 22:39:07 +0200 23 scummvm (0.10.0-2) unstable; urgency=low 24 25 * Future Wars - add mapping for left/up/down/right,zoom +/- 26 * fix SDL backend to set mouse position on button down event 27 as we may not have mousemove events with touchscreen 28 29 -- Frantisek Dufka <dufkaf@seznam.cz> Fri, 13 Jul 2007 09:56:37 +0200 30 scummvm (0.10.0-1) unstable; urgency=low 31 32 * mapped F10 in Future Wars to menu key 33 34 -- Frantisek Dufka <dufkaf@seznam.cz> Wed, 11 Jul 2007 22:20:00 +0200 35 scummvm (0.10.0) unstable; urgency=low 36 37 * upstream 0.10 release, enabled FLAC too 38 39 -- Frantisek Dufka <dufkaf@seznam.cz> Wed, 4 Jul 2007 12:48:48 +0200 40 scummvm (0.9.1-1) unstable; urgency=low 41 42 * 0.9.1 mapped right mouse button in sword1 43 44 -- Frantisek Dufka <dufkaf@seznam.cz> Mon, 18 Jun 2007 21:15:31 +0200 45 scummvm (0.9.1) unstable; urgency=low 46 47 * 0.9.1 upstream release 48 49 -- Frantisek Dufka <dufkaf@seznam.cz> Wed, 1 Nov 2006 20:40:51 +0100 50 scummvm (0.9.0-3) unstable; urgency=low 51 52 * merged fixes in 0.9.0 upstream branch 53 54 -- Frantisek Dufka <dufkaf@seznam.cz> Mon, 9 Oct 2006 15:40:59 +0200 55 scummvm (0.9.0-2) unstable; urgency=low 56 57 * merged fixes in 0.9.0 upstream branch 58 59 -- Frantisek Dufka <dufkaf@seznam.cz> Sat, 12 Aug 2006 20:10:47 +0200 60 scummvm (0.9.0-1) unstable; urgency=low 61 62 * merged changes in 0.9.0 upstream release 63 64 -- Frantisek Dufka <dufkaf@seznam.cz> Sun, 23 Jul 2006 22:29:51 +0200 65 scummvm (0.9.0) unstable; urgency=low 66 67 * 0.9.0 upstream release 68 69 -- Frantisek Dufka <dufkaf@seznam.cz> Tue, 27 Jun 2006 20:30:54 +0200 -
debian/compat
diff -Naur scummvm-0.11.orig/debian/compat scummvm-0.11/debian/compat
old new 1 4 -
debian/control
diff -Naur scummvm-0.11.orig/debian/control scummvm-0.11/debian/control
old new 1 Source: scummvm 2 Section: user/games 3 Priority: optional 4 Maintainer: Frantisek Dufka <dufkaf@seznam.cz> 5 Build-Depends: debhelper (>> 4.0.0), libsdl1.2-dev 6 7 Standards-Version: 3.6.1.1 8 Package: scummvm 9 Pre-Depends: maemo-select-menu-location 10 Depends: ${shlibs:Depends} 11 Architecture: any 12 Section: user/games 13 Description: free implementation of LucasArts' S.C.U.M.M interpreter 14 ScummVM is a virtual machine for classic graphical adventure games. 15 This package does not contain any actual games. 16 XBS-Maemo-Icon-26: 17 iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAC/VBMVEUICwcH 18 CQUKDAgLDQoMDwsOEAwREAUPEQ0QEg8PFQoRExAUEwoVFAwPGAcTFBIRFg0W 19 FQ0XFg4RGgkTGA8XGQsTGwwUHA0aGRIWGxMXHQkVHQ8aGhMbGxQcHQocGxUZ 20 HwsYIgcfHxgeIRUbJQwhIBofJAweJwgfKQocKwwgKgshKw0gLggfLg8jLQ8n 21 LwwpLhEmMwcoMRQjNgotLCYmNwQlNwwqOBQtOQgsOQ8xNh4sPQswNyQqQAUw 22 PAsuOiAsQgcwOyIqRgIsSAQvRgs0PyY1Rg06RA0+PDAwSwg2RxUzTQE4TQsz 23 VAc/SSo6VAk4VwE6VRM2XAVAUC85XwlJVCNEXQo+YwJGXwxMWS1JXC5AagBI 24 awJUagRIcQBSbwpHeAJTaD9OdwNXcwJKewZNfABacRlOfQBPfgBQfwBMggBW 25 fgBNgwNSgQJOhAVecUJjdSZefwNUiABZhgBjeDZieDxhezFQjQBgghZkhQ5j 26 iQJUkAZcixJmgDZnhCtckQpblgBekw5clwBqgkthlQBdmAJriz90hz5omgBs 27 mAhxlgd0mAB5lgBpnA16khdzmAtxnABooQBtnwB4jUpzngBkpQR5nQF8j0Vr 28 pQduoRZ4nRR3k014oQBzpAt8oAh/ogBvqA5trACBmypwqRF1pw+GogCAow+D 29 pQB8phJ/nUNurxh0rRd4rwmHqQd6qDOArwCJqwyDsgCMrgB8ryiFtAB7uQN8 30 sDKBuAWOsBWJqFR8ti2IsiOSswaBuRt6vxCOtgqXsgePrjR9wQCFuw2KuQyB 31 uSeSuACEux6JuR2OvACAxACEvCuSuhOHujSMwQGTtiqfuACRvwGOvRWHuz2T 32 wASPwwmYvwaLvTebuxiWvhmSwBqZwAmNu0aevgiKvkCVviaMvE6bwQycuTid 33 vhylvQyZwB2cwg+QywCawR6fwB+bwyGI0gaewCudxCOjwyOT1ACmwjiX0g+j 34 xTqmxzOd1gCV0i6kyyuoyTah1Sif2h6tzjukzF+pz1uq1Eeg2Uml3U1kaLAB 35 AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAHrSURBVCjPY2BAAC5ubkFB 36 BkzAzggDfKgSUFEmKCmOIsPvktA0aVpbSYQ+FwsjkwpMBsi2m/X7z89v3759 37 +ngg1UqIlZEVponJYcW/rw9unH/04u2bc0vbo+WZWGCahEv/fj+6Yc2SZfv3 38 b5w6+eACHVYWmCazMz+unN44b3ZfV3dnx5yDiaKsUAOZGD2/fL58+PSGg3Gu 39 buEVWyZacLCzw6S8X324fOHqibMxWpKy5okBIjAZoNOt9r47e+HOnafbe/ND 40 DNWkOGAyDKwsCtXPTly4eufqm+fvHy4M1RRggsnJMLI6z9x99Oqtx7cuPP/2 41 ele5LjtCGyObbcHcDfuevHn+5s319RuSpOByrEwcwsqhlcvXHbp38+LxiXP6 42 DeBSTKzWvkrCun5Zq04dO7S6p67ZHibFziiRt6PYUk5YtfbUqSMTGnKyHaFS 43 rMDA3fHr7tqayKDWa0dWVmXHp5lCpRgZ2QI2HTl25NLt+1t3rppRFJ8SrwGX 44 4g9rmbJo0cpVqxZNaK5OS0nzF4NLMWkHZ1TVN9bXlxXmAo2L0uNgZITaxcjI 45 axAYH5+RATQrPtZHk5udA+Z2cIpQN3Hy8vOwMVLmYGTidoenDSawLAsnJz8L 46 kMUiY4ySpviYoKmKRVAcIyXKyIiLyygi+ADqVqrAkApevwAAAABJRU5ErkJg 47 gg== -
debian/copyright
diff -Naur scummvm-0.11.orig/debian/copyright scummvm-0.11/debian/copyright
old new 1 ScummVM was debianized by Bastien Nocera <hadess@hadess.net> the 5th Apr 2002. 2 It was adopted by Tore Anderson <tore@linpro.no> the 4th Oct 2002. 3 Packaged for the Maemo platform by Tomas Junnoen <tomas@fs-security.com> Oct 2005 4 Since 0.8.2 packaging for Maemo done by Frantisek Dufka <dufkaf@seznam.cz> 5 6 It was downloaded from <http://www.scummvm.org/>. 7 8 Upstream Authors: see AUTHORS file of the ScummVM source distribution. 9 10 Copyright: 11 12 This program is free software; you can redistribute it and/or modify it 13 under the terms of the GNU General Public License as published by the 14 Free Software Foundation; either version 2, or (at your option) any 15 later version. 16 17 On Debian GNU/Linux systems, the complete text of the GNU General 18 Public License can be found in `/usr/share/common-licenses/GPL'. 19 20 This copyright also applies to the Debian-related build scripts. -
debian/files
diff -Naur scummvm-0.11.orig/debian/files scummvm-0.11/debian/files
old new 1 scummvm_0.11.0-0_armel.deb user/games optional -
debian/postinst
diff -Naur scummvm-0.11.orig/debian/postinst scummvm-0.11/debian/postinst
old new 1 #! /bin/sh 2 maemo-select-menu-location scummvm.desktop tana_fi_games 3 exit 0 -
debian/rules
diff -Naur scummvm-0.11.orig/debian/rules scummvm-0.11/debian/rules
old new 1 #!/usr/bin/make -f 2 3 build: scummvm 4 5 scummvm: 6 dh_testdir 7 # CXXFLAGS="-Os -mcpu=arm926ej-s -fomit-frame-pointer -DMAEMO_SDL" ./configure --host=arm-linux --prefix=/usr --disable-debug --disable-mt32emu --disable-hq-scalers --with-tremor-prefix=/usr --enable-tremor --with-zlib-prefix=/usr --enable-zlib --with-mad-prefix=/usr --enable-mad --enable-flac --disable-fluidsynth 8 ## --enable-plugins --disable-scumm-7-8 9 $(MAKE) 10 11 clean: 12 dh_testdir 13 dh_testroot 14 -$(MAKE) distclean 15 dh_clean 16 17 install: build 18 dh_testdir 19 dh_testroot 20 dh_clean 21 dh_installdirs 22 install -m0755 scummvm debian/scummvm/usr/games/scummvm.bin 23 install -m0755 dists/maemo/scummvm.wrapper debian/scummvm/usr/games/scummvm 24 install -m0644 dists/maemo/scummvm.desktop debian/scummvm/usr/share/applications/hildon 25 install -m0644 icons/scummvm.xpm debian/scummvm/usr/share/icons 26 # install -m0644 -d debian/scummvm/usr/lib/scummvm 27 # install -m0644 plugins/lib*.so debian/scummvm/usr/lib/scummvm 28 install -m0644 -d debian/scummvm/usr/share/scummvm 29 install -m0644 dists/pred.dic debian/scummvm/usr/share/scummvm 30 # install -m0644 gui/themes/modern.ini gui/themes/modern.zip gui/themes/classic080.ini debian/scummvm/usr/share/scummvm 31 32 binary: binary-arch 33 34 binary-arch: build install 35 dh_testdir 36 dh_testroot 37 dh_installchangelogs NEWS 38 dh_link 39 dh_strip 40 dh_fixperms 41 dh_installdeb 42 dh_shlibdeps 43 dh_gencontrol 44 dh_md5sums 45 dh_builddeb 46 47 binary-indep: 48 49 .PHONY: build clean binary install binary-arch binary-indep -
debian/scummvm.dirs
diff -Naur scummvm-0.11.orig/debian/scummvm.dirs scummvm-0.11/debian/scummvm.dirs
old new 1 usr/games 2 usr/share/icons 3 usr/share/applications/hildon 4 No newline at end of file -
debian/scummvm.links
diff -Naur scummvm-0.11.orig/debian/scummvm.links scummvm-0.11/debian/scummvm.links
old new 1 /var/lib/install/usr/share/applications/scummvm.desktop /etc/others-menu/extra_applications/scummvm.desktop -
debian/scummvm.substvars
diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummvm.substvars
old new 1 shlibs:Depends=libc6 (>= 2.3.5-1), libgcc1 (>= 1:3.4.4), libsdl1.2, libstdc++6 (>= 3.4.4), zlib1g (>= 1:1.2.1) -
engines/sword1/sword1.cpp
old new 722 722 while (_eventMan->pollEvent(event)) { 723 723 switch (event.type) { 724 724 case Common::EVENT_KEYDOWN: 725 #ifdef MAEMO_SDL 726 // map center to right button 727 if (event.kbd.keycode == 13) { 728 _mouseState |= BS1R_BUTTON_DOWN; 729 } else 730 #endif 725 731 _keyPressed = event.kbd; 726 732 break; 733 #ifdef MAEMO_SDL 734 case Common::EVENT_KEYUP: 735 if (event.kbd.keycode == 13) { 736 _mouseState |= BS1R_BUTTON_UP; 737 } 738 break; 739 #endif 727 740 case Common::EVENT_MOUSEMOVE: 728 741 _mouseCoord = event.mouse; 729 742 break; -
engines/sword2/sword2.cpp
old new 552 552 _gameSpeed = 1; 553 553 } 554 554 } 555 #ifdef MAEMO_SDL 556 // map center to right button 557 else if (event.kbd.keycode == 13 && !(_inputEventFilter & RD_RIGHTBUTTONDOWN)) { 558 _mouseEvent.pending = true; 559 _mouseEvent.buttons = RD_RIGHTBUTTONDOWN; 560 } else 561 #endif 555 562 if (!(_inputEventFilter & RD_KEYDOWN)) { 556 563 _keyboardEvent.pending = true; 557 564 _keyboardEvent.kbd = event.kbd; 558 565 } 566 567 break; 568 #ifdef MAEMO_SDL 569 case Common::EVENT_KEYUP: 570 // map center to right button 571 if (event.kbd.keycode == 13 && !(_inputEventFilter & RD_RIGHTBUTTONUP)) { 572 _mouseEvent.pending = true; 573 _mouseEvent.buttons = RD_RIGHTBUTTONUP; 574 } 559 575 break; 576 #endif 560 577 case Common::EVENT_LBUTTONDOWN: 561 578 if (!(_inputEventFilter & RD_LEFTBUTTONDOWN)) { 562 579 _mouseEvent.pending = true; -
engines/scumm/input.cpp
old new 89 89 _keyPressed = event.kbd; 90 90 } 91 91 92 #ifdef MAEMO_SDL 93 switch (_keyPressed.keycode) { 94 case Common::KEYCODE_F8: _fastMode ^= 1; break ;// Map F8 (zoom out) to toggle fast mode 95 case Common::KEYCODE_F4: _keyPressed.keycode = Common::KEYCODE_F5; _keyPressed.ascii=Common::ASCII_F5 ; break; // map F4 to F5 (menu key) 96 case Common::KEYCODE_RETURN: _keyPressed.keycode = Common::KEYCODE_TAB; _keyPressed.ascii=Common::ASCII_TAB ; break; // map Select (return) to Tab (right mouse button) 97 case Common::KEYCODE_F7: if(_game.id == GID_MONKEY2){ _keyPressed.ascii = '1';_keyPressed.keycode=Common::KEYCODE_1;} break; // map F7 (zoom in) to 1 (to bypass Monkey2 copy protection) 98 default: ; 99 } 100 if (_game.version < 7) switch(event.kbd.keycode){ 101 case Common::KEYCODE_UP: _keyPressed.ascii = ' '; _keyPressed.keycode=Common::KEYCODE_SPACE; break ;// map Up to space (pause game) 102 case Common::KEYCODE_DOWN: _keyPressed.ascii ='.'; _keyPressed.keycode=Common::KEYCODE_PERIOD; break ;// map Down to . (skip one line of dialog) 103 default: ; 104 } 105 #endif 92 106 if (_game.heversion >= 80) { 93 107 // FIXME: Move this code & VAR_KEY_STATE to class ScummEngine_v80he 94 108 … … 131 145 break; 132 146 133 147 case Common::EVENT_KEYUP: 148 #ifdef MAEMO_SDL 149 // map keyup with similar rules as keydown 150 switch (event.kbd.keycode) { 151 152 case Common::KEYCODE_F4: event.kbd.keycode = Common::KEYCODE_F5; event.kbd.ascii=Common::ASCII_F5 ; break; // map F4 to F5 (menu key) 153 case Common::KEYCODE_RETURN: event.kbd.keycode = Common::KEYCODE_TAB; event.kbd.ascii=Common::ASCII_TAB ; break; // map Select (return) to Tab (right mouse button) 154 case Common::KEYCODE_F7: if(_game.id == GID_MONKEY2){ event.kbd.ascii = '1';event.kbd.keycode=Common::KEYCODE_1;} break; // map F7 (zoom in) to 1 (to bypass Monkey2 copy protection) 155 default: ; 156 } 157 if (_game.version < 7) switch(event.kbd.keycode){ 158 case Common::KEYCODE_UP: event.kbd.ascii = ' '; event.kbd.keycode=Common::KEYCODE_SPACE; break ;// map Up to space (pause game) 159 case Common::KEYCODE_DOWN: event.kbd.ascii ='.'; event.kbd.keycode=Common::KEYCODE_PERIOD; break ;// map Down to . (skip one line of dialog) 160 default: ; 161 } 162 #endif 134 163 if (event.kbd.ascii >= 512) { 135 164 debugC(DEBUG_GENERAL, "keyPressed > 512 (%d)", event.kbd.ascii); 136 165 } else { … … 480 509 if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0) 481 510 runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0); 482 511 512 #ifndef MAEMO_SDL 483 513 } else if (restartKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F8 && lastKeyHit.flags == 0)) { 484 514 confirmRestartDialog(); 485 515 #endif 486 516 } else if (pauseKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_SPACE && lastKeyHit.flags == 0)) { 487 517 pauseGame(); 488 518 -
engines/scumm/dialogs.cpp
old new 818 818 } 819 819 820 820 void PauseDialog::handleKeyDown(Common::KeyState state) { 821 #ifdef MAEMO_SDL 822 if (state.ascii == ' ' || state.keycode==273 ) // Close pause dialog if space or UP key is pressed 823 #else 821 824 if (state.ascii == ' ') // Close pause dialog if space key is pressed 825 #endif 822 826 close(); 823 827 else 824 828 ScummDialog::handleKeyDown(state); … … 885 889 } 886 890 887 891 void ValueDisplayDialog::handleKeyDown(Common::KeyState state) { 892 #ifdef MAEMO_SDL 893 if (state.ascii == _incKey || state.ascii == _decKey || state.keycode == 275 || state.keycode == 276) { 894 if ((state.ascii == _incKey || state.keycode == 275 ) && _value < _max) 895 _value++; 896 else if ((state.ascii == _decKey || state.keycode == 276) && _value > _min) 897 _value--; 898 #else 888 899 if (state.ascii == _incKey || state.ascii == _decKey) { 889 900 if (state.ascii == _incKey && _value < _max) 890 901 _value++; 891 902 else if (state.ascii == _decKey && _value > _min) 892 903 _value--; 893 904 #endif 894 905 setResult(_value); 895 906 _timer = getMillis() + kDisplayDelay; 896 907 draw(); -
engines/touche/touche.cpp
old new 294 294 _flagsTable[611] = 1; 295 295 break; 296 296 case Common::EVENT_KEYDOWN: 297 #ifdef MAEMO_SDL 298 if (event.kbd.keycode == 13) { // select button simulates righ button toggle 299 _inp_rightMouseButtonPressed=!_inp_rightMouseButtonPressed; 300 } else { 301 _inp_rightMouseButtonPressed = false; 302 } 303 #endif 297 304 if (!handleKeyEvents) { 298 305 break; 299 306 } … … 302 309 if (_displayQuitDialog) { 303 310 _flagsTable[611] = displayQuitDialog(); 304 311 } 312 #ifdef MAEMO_SDL 313 } else if (event.kbd.keycode == Common::KEYCODE_F4) { 314 #else 305 315 } else if (event.kbd.keycode == Common::KEYCODE_F5) { 316 #endif 306 317 if (_flagsTable[618] == 0 && !_hideInventoryTexts) { 307 318 handleOptions(0); 308 319 } 320 #ifdef MAEMO_SDL 321 } else if (event.kbd.keycode == Common::KEYCODE_F8) { 322 _fastWalkMode = !_fastWalkMode; 323 } 324 #else 309 325 } else if (event.kbd.keycode == Common::KEYCODE_F9) { 310 326 _fastWalkMode = true; 311 327 } else if (event.kbd.keycode == Common::KEYCODE_F10) { 312 328 _fastWalkMode = false; 313 329 } 330 #endif 314 331 if (event.kbd.flags == Common::KBD_CTRL) { 315 332 if (event.kbd.keycode == Common::KEYCODE_d) { 316 333 // enable debugging stuff ? … … 333 350 case Common::EVENT_LBUTTONDOWN: 334 351 _inp_leftMouseButtonPressed = true; 335 352 break; 353 case Common::EVENT_LBUTTONUP: 354 // this is done elsewhere _inp_leftMouseButtonPressed = false; 355 _inp_rightMouseButtonPressed = false; // simulate rbutton up to close menu 356 break; 336 357 case Common::EVENT_RBUTTONDOWN: 337 358 _inp_rightMouseButtonPressed = true; 338 359 break; -
engines/sky/sky.cpp
old new 524 524 switch (event.type) { 525 525 case Common::EVENT_KEYDOWN: 526 526 _keyPressed = event.kbd; 527 #ifdef MAEMO_SDL 528 // Maemo platform keybindings 529 if (_keyPressed.keycode == Common::KEYCODE_F4) // Map F4 (menu) to F5 (access main menu) 530 _keyPressed.keycode = Common::KEYCODE_F5; 531 if (_keyPressed.ascii == 13) // Map Select=Enter to right mouse button 532 _skyMouse->buttonPressed(1); 533 if (_keyPressed.keycode == Common::KEYCODE_F8) // Map F8 (zoom out) to toggle fast mode 534 _fastMode ^= 1; 535 if (_keyPressed.keycode == Common::KEYCODE_DOWN) // Map Down to . (skip one line of dialog) 536 _keyPressed.ascii = '.'; 537 #endif 527 538 break; 528 539 case Common::EVENT_MOUSEMOVE: 529 540 if (!(_systemVars.systemFlags & SF_MOUSE_LOCKED)) -
engines/gob/util.cpp
old new 107 107 _mouseButtons &= ~2; 108 108 break; 109 109 case Common::EVENT_KEYDOWN: 110 #ifdef MAEMO_SDL 111 if (event.kbd.keycode==285){ 112 _mouseButtons |= 2; 113 break; 114 } 115 #endif 110 116 if (event.kbd.flags == Common::KBD_CTRL) { 111 117 if (event.kbd.keycode == Common::KEYCODE_f) 112 118 _fastMode ^= 1; … … 117 123 addKeyToBuffer(event.kbd); 118 124 break; 119 125 case Common::EVENT_KEYUP: 126 #ifdef MAEMO_SDL 127 if (event.kbd.keycode==285) 128 _mouseButtons &= ~2; 129 #endif 120 130 break; 121 131 case Common::EVENT_QUIT: 122 132 _vm->_quitRequested = true; -
engines/lure/menu.cpp
old new 34 34 #include "lure/events.h" 35 35 #include "lure/lure.h" 36 36 37 #if defined(_WIN32_WCE) 37 #if defined(_WIN32_WCE) || defined(MAEMO_SDL) 38 38 #define LURE_CLICKABLE_MENUS 39 39 #endif 40 40 -
engines/queen/input.cpp
old new 174 174 } 175 175 break; 176 176 case Common::KEYCODE_F1: // use Journal 177 #ifdef MAEMO_SDL 178 case Common::KEYCODE_F4: // menu key on N770 179 #else 177 180 case Common::KEYCODE_F5: 181 #endif 178 182 if (_cutawayRunning) { 179 183 if (_canQuit) { 180 184 _keyVerb = VERB_USE_JOURNAL; -
engines/cine/main_loop.cpp
old new 78 78 mouseRight = 1; 79 79 } 80 80 break; 81 #ifdef MAEMO_SDL 82 case Common::KEYCODE_UP: 83 #else 81 84 case Common::KEYCODE_F1: 85 #endif 82 86 if (allowPlayerInput) { 83 87 playerCommand = 0; // EXAMINE 84 88 makeCommandLine(); 85 89 } 86 90 break; 91 #ifdef MAEMO_SDL 92 case Common::KEYCODE_DOWN: 93 #else 87 94 case Common::KEYCODE_F2: 95 #endif 88 96 if (allowPlayerInput) { 89 97 playerCommand = 1; // TAKE 90 98 makeCommandLine(); 91 99 } 92 100 break; 101 #ifndef MAEMO_SDL 93 102 case Common::KEYCODE_F3: 94 103 if (allowPlayerInput) { 95 104 playerCommand = 2; // INVENTORY … … 102 111 makeCommandLine(); 103 112 } 104 113 break; 114 #else 115 //map f3, f4 to f8,f7 = zoom +- keys, when in menu generate keypresses for savegame 116 case Common::KEYCODE_F8: 117 if (inMenu) 118 lastKeyStroke = '1'; 119 else if (allowPlayerInput) { 120 playerCommand = 2; // INVENTORY 121 makeCommandLine(); 122 } 123 break; 124 case Common::KEYCODE_F7: 125 if (inMenu) 126 lastKeyStroke = '2'; 127 else 128 if (allowPlayerInput) { 129 playerCommand = 3; // USE 130 makeCommandLine(); 131 } 132 break; 133 #endif 134 #ifdef MAEMO_SDL 135 case Common::KEYCODE_LEFT: 136 #else 105 137 case Common::KEYCODE_F5: 138 #endif 106 139 if (allowPlayerInput) { 107 140 playerCommand = 4; // ACTIVATE 108 141 makeCommandLine(); 109 142 } 110 143 break; 144 #ifdef MAEMO_SDL 145 case Common::KEYCODE_RIGHT: 146 #else 111 147 case Common::KEYCODE_F6: 148 #endif 112 149 if (allowPlayerInput) { 113 150 playerCommand = 5; // SPEAK 114 151 makeCommandLine(); … … 120 157 makeCommandLine(); 121 158 } 122 159 break; 160 #ifdef MAEMO_SDL 161 case Common::KEYCODE_F4: // Menu key 162 #else 123 163 case Common::KEYCODE_F10: 164 #endif 124 165 if (!disableSystemMenu && !inMenu) { 125 166 g_cine->makeSystemMenu(); 126 167 } -
backends/plugins/sdl/sdl-provider.cpp
old new 31 31 32 32 #include "SDL.h" 33 33 #include "SDL_loadso.h" 34 #define PLUGIN_DIRECTORY "plugins/"35 34 35 #ifdef PLUGIN_PATH 36 #define PLUGIN_DIRECTORY PLUGIN_PATH 37 #else 38 #define PLUGIN_DIRECTORY "plugins/" 39 #endif 36 40 37 41 class SDLPlugin : public DynamicPlugin { 38 42 protected: -
backends/platform/sdl/events.cpp
old new 26 26 #include "backends/platform/sdl/sdl.h" 27 27 #include "common/util.h" 28 28 #include "common/events.h" 29 29 #ifdef MAEMO_SDL 30 #include "common/config-manager.h" 31 #endif 30 32 // FIXME move joystick defines out and replace with confile file options 31 33 // we should really allow users to map any key to a joystick button 32 34 #define JOY_DEADZONE 3200 … … 192 194 case SDL_KEYDOWN:{ 193 195 b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); 194 196 197 #ifdef MAEMO_SDL 198 if (ev.key.keysym.sym == SDLK_F6) { 199 #else 195 200 // Alt-Return and Alt-Enter toggle full screen mode 196 201 if (b == Common::KBD_ALT && (ev.key.keysym.sym == SDLK_RETURN 197 || ev.key.keysym.sym == SDLK_KP_ENTER)) { 202 || ev.key.keysym.sym == SDLK_KP_ENTER)) { 203 #endif 198 204 setFullscreenMode(!_fullscreen); 199 205 #ifdef USE_OSD 200 206 if (_fullscreen) … … 311 317 break; 312 318 313 319 fillMouseEvent(event, ev.button.x, ev.button.y); 314 320 #ifdef MAEMO_SDL 321 // we have touchscreen so we may have no mousemotion events between taps 322 setMousePos(event.mouse.x, event.mouse.y); 323 #endif 315 324 return true; 316 325 317 326 case SDL_MOUSEBUTTONUP: … … 444 453 return false; 445 454 } 446 455 456 // called on SDL KEYUP and KEYDOWN events 447 457 bool OSystem_SDL::remapKey(SDL_Event &ev, Common::Event &event) { 458 #ifdef MAEMO_SDL 459 static int engine=0; 460 #define ENG_OTHER -1 461 //#define ENG_SCUMM 1 462 static int game=0; 463 #define GAME_OTHER -1 464 #define GAME_LURE 1 465 //#define GAME_SWORD1 2 466 //#define GAME_SWORD2 3 467 if (!engine){ 468 // one time initialization 469 Common::String gameid(ConfMan.get("gameid")); 470 if (gameid == "lure") { 471 game=GAME_LURE; 472 engine=ENG_OTHER; 473 } else { 474 game=GAME_OTHER; 475 engine=ENG_OTHER; 476 } 477 } 478 // engine specific mappings 479 switch (engine){ 480 481 } 482 // game specific mapping 483 switch (game) { 484 case GAME_LURE: 485 switch(ev.key.keysym.sym){ 486 case SDLK_F5: // map F5 (home key) to f9 = restart game 487 ev.key.keysym.sym=SDLK_F9; 488 break; 489 case SDLK_F8: // map F8 (zoom key) to F5 (save dialog) in game 490 ev.key.keysym.sym=SDLK_F5; 491 break; 492 case SDLK_F4: // map menu to right click 493 event.type = ((ev.type==SDL_KEYUP) ? Common::EVENT_RBUTTONUP : Common::EVENT_RBUTTONDOWN ); 494 event.mouse.x = _mouseCurState.x; 495 event.mouse.y = _mouseCurState.y; 496 return true; 497 default: 498 ; 499 } 500 break; 501 } 502 #endif //SDL_MAEMO 503 448 504 #ifdef LINUPY 449 505 // On Yopy map the End button to quit 450 506 if ((ev.key.keysym.sym == 293)) {