aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/maemo
diff options
context:
space:
mode:
Diffstat (limited to 'backends/platform/maemo')
-rw-r--r--backends/platform/maemo/hildon.cpp10
-rw-r--r--backends/platform/maemo/main.cpp10
-rw-r--r--backends/platform/maemo/portdefs.h2
-rw-r--r--backends/platform/maemo/scummvm-0.11.0-maemo.patch22
4 files changed, 22 insertions, 22 deletions
diff --git a/backends/platform/maemo/hildon.cpp b/backends/platform/maemo/hildon.cpp
index d4f2aa122d..697e4d8b70 100644
--- a/backends/platform/maemo/hildon.cpp
+++ b/backends/platform/maemo/hildon.cpp
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
-
+
#include <hildon-widgets/hildon-app.h>
#include <gtk/gtk.h>
#include <libosso.h>
@@ -108,9 +108,9 @@ int main(int argc, char *argv[]) {
gtk_box_pack_start(GTK_BOX(main_vbox), label, FALSE, TRUE, 0);
// Add handler for hello D-BUS messages
- result = osso_rpc_set_cb_f(appdata->osso_context,
- OSSO_APP_SERVICE,
- OSSO_APP_OBJECT,
+ result = osso_rpc_set_cb_f(appdata->osso_context,
+ OSSO_APP_SERVICE,
+ OSSO_APP_OBJECT,
OSSO_APP_IFACE,
dbus_req_handler, appdata);
if (result != OSSO_OK) {
diff --git a/backends/platform/maemo/main.cpp b/backends/platform/maemo/main.cpp
index af5c6b4c10..cbf271b970 100644
--- a/backends/platform/maemo/main.cpp
+++ b/backends/platform/maemo/main.cpp
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
-
+
#include <common/scummsys.h>
-#include <X11/Xlib.h>
+#include <X11/Xlib.h>
#include <X11/extensions/Xsp.h>
#include <SDL/SDL.h>
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
// return OSSO_ERROR;
//}
- // Maemo task navigator priority inheritance fix
+ // Maemo task navigator priority inheritance fix
setpriority(PRIO_PROCESS, 0, 0);
set_doubling(0);
@@ -79,6 +79,6 @@ int main(int argc, char *argv[]) {
//osso_deinitialize(osso_context);
set_doubling(0);
-
+
return res;
}
diff --git a/backends/platform/maemo/portdefs.h b/backends/platform/maemo/portdefs.h
index eec82858c5..52d16fd820 100644
--- a/backends/platform/maemo/portdefs.h
+++ b/backends/platform/maemo/portdefs.h
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
diff --git a/backends/platform/maemo/scummvm-0.11.0-maemo.patch b/backends/platform/maemo/scummvm-0.11.0-maemo.patch
index 35cb162a2b..9014a326cb 100644
--- a/backends/platform/maemo/scummvm-0.11.0-maemo.patch
+++ b/backends/platform/maemo/scummvm-0.11.0-maemo.patch
@@ -197,7 +197,7 @@ diff -Naur scummvm-0.11.orig/debian/rules scummvm-0.11/debian/rules
+ install -m0644 -d debian/scummvm/usr/share/scummvm
+ install -m0644 dists/pred.dic debian/scummvm/usr/share/scummvm
+# install -m0644 gui/themes/modern.ini gui/themes/modern.zip gui/themes/classic080.ini debian/scummvm/usr/share/scummvm
-+
++
+binary: binary-arch
+
+binary-arch: build install
@@ -275,7 +275,7 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
_keyboardEvent.pending = true;
_keyboardEvent.kbd = event.kbd;
}
-+
++
+ break;
+#ifdef MAEMO_SDL
+ case Common::EVENT_KEYUP:
@@ -297,7 +297,7 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
+#ifdef MAEMO_SDL
+ switch (_keyPressed.keycode) {
-+ case Common::KEYCODE_F8: _fastMode ^= 1; break ;// Map F8 (zoom out) to toggle fast mode
++ case Common::KEYCODE_F8: _fastMode ^= 1; break ;// Map F8 (zoom out) to toggle fast mode
+ case Common::KEYCODE_F4: _keyPressed.keycode = Common::KEYCODE_F5; _keyPressed.ascii=Common::ASCII_F5 ; break; // map F4 to F5 (menu key)
+ case Common::KEYCODE_RETURN: _keyPressed.keycode = Common::KEYCODE_TAB; _keyPressed.ascii=Common::ASCII_TAB ; break; // map Select (return) to Tab (right mouse button)
+ 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)
@@ -552,7 +552,7 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
+ case Common::KEYCODE_F7:
+ if (inMenu)
+ lastKeyStroke = '2';
-+ else
++ else
+ if (allowPlayerInput) {
+ playerCommand = 3; // USE
+ makeCommandLine();
@@ -656,13 +656,13 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
+#define ENG_OTHER -1
+//#define ENG_SCUMM 1
+ static int game=0;
-+#define GAME_OTHER -1
++#define GAME_OTHER -1
+#define GAME_LURE 1
+//#define GAME_SWORD1 2
+//#define GAME_SWORD2 3
+ if (!engine){
+ // one time initialization
-+ Common::String gameid(ConfMan.get("gameid"));
++ Common::String gameid(ConfMan.get("gameid"));
+ if (gameid == "lure") {
+ game=GAME_LURE;
+ engine=ENG_OTHER;
@@ -673,7 +673,7 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
+ }
+ // engine specific mappings
+ switch (engine){
-+
++
+ }
+ // game specific mapping
+ switch (game) {
@@ -687,13 +687,13 @@ diff -Naur scummvm-0.11.orig/debian/scummvm.substvars scummvm-0.11/debian/scummv
+ break;
+ case SDLK_F4: // map menu to right click
+ event.type = ((ev.type==SDL_KEYUP) ? Common::EVENT_RBUTTONUP : Common::EVENT_RBUTTONDOWN );
-+ event.mouse.x = _mouseCurState.x;
-+ event.mouse.y = _mouseCurState.y;
-+ return true;
++ event.mouse.x = _mouseCurState.x;
++ event.mouse.y = _mouseCurState.y;
++ return true;
+ default:
+ ;
+ }
-+ break;
++ break;
+ }
+#endif //SDL_MAEMO
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 00:20:21 +0000