[Scummvm-cvs-logs] SF.net SVN: scummvm:[43809] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Aug 29 22:43:00 CEST 2009
Revision: 43809
http://scummvm.svn.sourceforge.net/scummvm/?rev=43809&view=rev
Author: sev
Date: 2009-08-29 20:43:00 +0000 (Sat, 29 Aug 2009)
Log Message:
-----------
Patch #2845084: "Linuxmoto-backend small update"
Modified Paths:
--------------
scummvm/trunk/backends/platform/linuxmoto/hardwarekeys.cpp
scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
scummvm/trunk/configure
scummvm/trunk/dists/motoezx/scummvm-sm.png
scummvm/trunk/dists/motoezx/scummvm.png
scummvm/trunk/ports.mk
Added Paths:
-----------
scummvm/trunk/dists/motomagx/
scummvm/trunk/dists/motomagx/mpkg/
scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg
scummvm/trunk/dists/motomagx/mpkg/run.sh
scummvm/trunk/dists/motomagx/mpkg/scummvm.desktop
scummvm/trunk/dists/motomagx/mpkg/scummvm_usr.png
scummvm/trunk/dists/motomagx/pep/
scummvm/trunk/dists/motomagx/pep/app/
scummvm/trunk/dists/motomagx/pep/app/scummvm.sh
scummvm/trunk/dists/motomagx/pep/description.ini
scummvm/trunk/dists/motomagx/pep/scummvm_big_usr.png
scummvm/trunk/dists/motomagx/pep/scummvm_small_usr.png
Modified: scummvm/trunk/backends/platform/linuxmoto/hardwarekeys.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/hardwarekeys.cpp 2009-08-29 20:03:02 UTC (rev 43808)
+++ scummvm/trunk/backends/platform/linuxmoto/hardwarekeys.cpp 2009-08-29 20:43:00 UTC (rev 43809)
@@ -48,7 +48,25 @@
{ "CALL", KEYCODE_SPACE, ASCII_SPACE, "Call", kActionKeyType, false },
{ "PLUS", KEYCODE_PLUS, '+', "+", kActionKeyType, false },
{ "MINUS", KEYCODE_MINUS, '-', "-", kActionKeyType, false },
-
+#ifdef MOTOMAGX
+ {"BACKSPACE", KEYCODE_BACKSPACE, ASCII_BACKSPACE, "Backspace", kActionKeyType, false},
+ {"TAB", KEYCODE_TAB, ASCII_TAB, "Tab", kActionKeyType, false},
+ {"HASH", KEYCODE_HASH, '#', "#", kActionKeyType, false},
+ {"ASTERISK", KEYCODE_ASTERISK, '*', "*", kActionKeyType, false},
+ {"LEFTSOFT", KEYCODE_F9, ASCII_F9, "LeftSoft", kActionKeyType, false},
+ {"RIGHTSOFT", KEYCODE_F11, ASCII_F11, "RightSoft", kActionKeyType, false},
+ {"0", KEYCODE_0, '0', "0", kActionKeyType, false},
+ {"1", KEYCODE_1, '1', "1", kActionKeyType, false},
+ {"2", KEYCODE_2, '2', "2", kActionKeyType, false},
+ {"3", KEYCODE_3, '3', "3", kActionKeyType, false},
+ {"4", KEYCODE_4, '4', "4", kActionKeyType, false},
+ {"5", KEYCODE_5, '5', "5", kActionKeyType, false},
+ {"6", KEYCODE_6, '6', "6", kActionKeyType, false},
+ {"7", KEYCODE_7, '7', "7", kActionKeyType, false},
+ {"8", KEYCODE_8, '8', "8", kActionKeyType, false},
+ {"9", KEYCODE_9, '9', "9", kActionKeyType, false},
+#endif
+#ifdef MOTOEZX
{ "a", KEYCODE_a, 'a', "a", kActionKeyType, true },
{ "b", KEYCODE_b, 'b', "b", kActionKeyType, true },
{ "c", KEYCODE_c, 'c', "c", kActionKeyType, true },
@@ -59,7 +77,7 @@
{ "h", KEYCODE_h, 'h', "h", kActionKeyType, true },
{ "i", KEYCODE_i, 'i', "i", kActionKeyType, true },
{ "j", KEYCODE_j, 'j', "j", kActionKeyType, true },
-
+#endif
// Numeric keypad
// Arrows + Home/End pad
Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-08-29 20:03:02 UTC (rev 43808)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-events.cpp 2009-08-29 20:43:00 UTC (rev 43809)
@@ -60,14 +60,38 @@
else if (ev.key.keysym.sym == SDLK_SPACE) {
ev.key.keysym.sym = SDLK_F5;
}
- // Camera to VirtualKeyboard
+ // VirtualKeyboard - Camera key
else if (ev.key.keysym.sym == SDLK_PAUSE) {
ev.key.keysym.sym = SDLK_F7;
}
- // mod+fire to enter
+ // Enter - mod+fire key
else if (ev.key.keysym.sym == SDLK_b) {
ev.key.keysym.sym = SDLK_RETURN;
}
+ // '3' - mod+up key
+ else if (ev.key.keysym.sym == SDLK_j) {
+ ev.key.keysym.sym = SDLK_3;
+ }
+ // '6' - mod+up key
+ else if (ev.key.keysym.sym == SDLK_i) {
+ ev.key.keysym.sym = SDLK_6;
+ }
+ // 'y' - mod+right key
+ else if (ev.key.keysym.sym == SDLK_g) {
+ ev.key.keysym.sym = SDLK_y;
+ }
+ // 'n' - mod+right key
+ else if (ev.key.keysym.sym == SDLK_h) {
+ ev.key.keysym.sym = SDLK_n;
+ }
+ // mod+vol'+' -> volume'+'
+ else if (ev.key.keysym.sym == SDLK_c) {
+ ev.key.keysym.sym = SDLK_RIGHTBRACKET;
+ }
+ // mod+vol'-' -> volume'-'
+ else if (ev.key.keysym.sym == SDLK_d) {
+ ev.key.keysym.sym = SDLK_LEFTBRACKET;
+ }
#endif
// Motorola Z6/V8 remapkey by Ant-On
#ifdef MOTOMAGX
@@ -75,21 +99,35 @@
if (ev.key.keysym.sym == SDLK_ESCAPE) {
event.type = Common::EVENT_QUIT;
return true;
- } else
- // F5 Game Menu - Call key
+ }
+ // F5 Game Menu - Slide Select
if (ev.key.keysym.sym == SDLK_SPACE) {
ev.key.keysym.sym = SDLK_F5;
}
- // 'y' - Mod+Right key
+ // Escape - Dial key
+ else if (ev.key.keysym.sym == SDLK_TAB) {
+ ev.key.keysym.sym = SDLK_ESCAPE;
+ }
+ // Space - Virtual keyboard
+ else if (ev.key.keysym.sym == SDLK_PAUSE) {
+ ev.key.keysym.sym = SDLK_F7;
+ }
// 'y' - Left soft
else if (ev.key.keysym.sym == SDLK_F9) {
ev.key.keysym.sym = SDLK_y;
}
- // 'n' - Mod+Left key
- // 'n' - rigth soft
+ // 'n' - Rigth soft
else if (ev.key.keysym.sym == SDLK_F11) {
ev.key.keysym.sym = SDLK_n;
}
+ // # -> volume'+'
+ else if (ev.key.keysym.sym == SDLK_HASH) {
+ ev.key.keysym.sym = SDLK_RIGHTBRACKET;
+ }
+ // * -> volume'-'
+ else if (ev.key.keysym.sym == SDLK_WORLD_55) {
+ ev.key.keysym.sym = SDLK_LEFTBRACKET;
+ }
#endif
// Joystick to Mouse
@@ -144,9 +182,8 @@
fillMouseEvent(event, _km.x, _km.y);
return true;
- } else if (ev.key.keysym.sym == SDLK_RETURN) { // Joystick center to pressing Left Mouse
- // _km.y_vel = 0;
- // _km.y_down_count = 0;
+ } else if (ev.key.keysym.sym == SDLK_RETURN) {
+ // Joystick center to pressing Left Mouse
if (ev.key.type == SDL_KEYDOWN) {
event.type = Common::EVENT_LBUTTONDOWN;
} else {
@@ -156,9 +193,8 @@
fillMouseEvent(event, _km.x, _km.y);
return true;
- } else if (ev.key.keysym.sym == SDLK_PLUS) { // Volume Up to pressing Right Mouse
- // _km.y_vel = 0;
- // _km.y_down_count = 0;
+ } else if (ev.key.keysym.sym == SDLK_PLUS) {
+ // Volume Up to pressing Right Mouse
if (ev.key.type == SDL_KEYDOWN ) {
event.type = Common::EVENT_RBUTTONDOWN;
} else {
@@ -167,9 +203,8 @@
fillMouseEvent(event, _km.x, _km.y);
return true;
- } else if (ev.key.keysym.sym == SDLK_MINUS) { // Volume Down to pressing Left Mouse
- //_km.y_vel = 0;
- //_km.y_down_count = 0;
+ } else if (ev.key.keysym.sym == SDLK_MINUS) {
+ // Volume Down to pressing Left Mouse
if (ev.key.type == SDL_KEYDOWN) {
event.type = Common::EVENT_LBUTTONDOWN;
} else {
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2009-08-29 20:03:02 UTC (rev 43808)
+++ scummvm/trunk/configure 2009-08-29 20:43:00 UTC (rev 43809)
@@ -1249,7 +1249,7 @@
;;
motoezx)
echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
- DEFINES="$DEFINES -DUNIX -DMOTOEZX -DUSE_ARM_SMUSH_ASM"
+ DEFINES="$DEFINES -DUNIX -DMOTOEZX -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
#not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen
ASFLAGS="$ASFLAGS -mfpu=vfp"
_endian=little
@@ -1259,11 +1259,14 @@
type_4_byte='int'
add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="linuxmoto"
;;
motomagx)
echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
- DEFINES="$DEFINES -DUNIX -DMOTOMAGX -DUSE_ARM_SMUSH_ASM"
+ DEFINES="$DEFINES -DUNIX -DMOTOMAGX -DUSE_ARM_SMUSH_ASM -DUSE_ARM_GFX_ASM -DUSE_ARM_SCALER_ASM -DUSE_ARM_COSTUME_ASM"
#not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen
ASFLAGS="$ASFLAGS -mfpu=vfp"
_endian=little
@@ -1273,6 +1276,9 @@
type_4_byte='int'
add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
+ add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
_backend="linuxmoto"
;;
bfin*)
Modified: scummvm/trunk/dists/motoezx/scummvm-sm.png
===================================================================
(Binary files differ)
Modified: scummvm/trunk/dists/motoezx/scummvm.png
===================================================================
(Binary files differ)
Added: scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg
===================================================================
--- scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg (rev 0)
+++ scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg 2009-08-29 20:43:00 UTC (rev 43809)
@@ -0,0 +1,30 @@
+[SDL]
+LeftSoftkey = F9
+RightSoftkey = F11
+Up = UP
+Down = DOWN
+Left = LEFT
+Right = RIGHT
+Center = RETURN
+VolumeUp = PLUS
+VolumeDown = MINUS
+SideKey = SPACE
+Call = TAB
+Music = F10
+Red = ESCAPE
+C = BACKSPACE
+Camera = PAUSE
+Slider = 0
+0 = 0
+1 = 1
+2 = 2
+3 = 3
+4 = 4
+5 = 5
+6 = 6
+7 = 7
+8 = 8
+9 = 9
+Asterisk = ASTERISK
+Numeral = HASH
+
Property changes on: scummvm/trunk/dists/motomagx/mpkg/mySDL.cfg
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/dists/motomagx/mpkg/run.sh
===================================================================
--- scummvm/trunk/dists/motomagx/mpkg/run.sh (rev 0)
+++ scummvm/trunk/dists/motomagx/mpkg/run.sh 2009-08-29 20:43:00 UTC (rev 43809)
@@ -0,0 +1,10 @@
+#!/bin/sh
+DIR=`busybox dirname "$0"`
+LIBDIR=/mmc/mmca1/.system/lib
+export LD_PRELOAD=$LIBDIR/libz.so:$LIBDIR/libSDL-1.2.so.0:$LIBDIR/libvorbis.so.0:$LIBDIR/libvorbisfile.so.3:$LIBDIR/libogg.so.0:$LIBDIR/libmad.so.0:$LIBDIR/libutil.so.1:$LIBDIR/libtaskman.so
+export SDL_QT_MODIFICATOR=1
+export HOME=/$DIR
+cd $DIR
+rm /mmc/mmca1/.system/mySDL.cfg
+cp $DIR/mySDL.cfg /mmc/mmca1/.system/mySDL.cfg
+./scummvm --path=$DIR --gfx-mode=1x > $DIR/scummvm.log
Property changes on: scummvm/trunk/dists/motomagx/mpkg/run.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/dists/motomagx/mpkg/scummvm.desktop
===================================================================
--- scummvm/trunk/dists/motomagx/mpkg/scummvm.desktop (rev 0)
+++ scummvm/trunk/dists/motomagx/mpkg/scummvm.desktop 2009-08-29 20:43:00 UTC (rev 43809)
@@ -0,0 +1,6 @@
+[Desktop Entry]
+BigIcon = scummvm_usr.png
+Directory = scummvm
+Exec = run.sh
+AniIcon = scummvm_usr.png
+Name = ScummVM
Property changes on: scummvm/trunk/dists/motomagx/mpkg/scummvm.desktop
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/dists/motomagx/mpkg/scummvm_usr.png
===================================================================
(Binary files differ)
Property changes on: scummvm/trunk/dists/motomagx/mpkg/scummvm_usr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: scummvm/trunk/dists/motomagx/pep/app/scummvm.sh
===================================================================
--- scummvm/trunk/dists/motomagx/pep/app/scummvm.sh (rev 0)
+++ scummvm/trunk/dists/motomagx/pep/app/scummvm.sh 2009-08-29 20:43:00 UTC (rev 43809)
@@ -0,0 +1,16 @@
+#!/bin/sh
+GAMES=/mmc/mmca1/.Games
+export DATA_DIR=$GAMES/.data/ScummVM
+export LD_LIBRARY_PATH=$GAMES/.lib:$LD_LIBRARY_PATH
+# uncomment next line if you wanna 270-degrees clockwise rotated screen
+#export SDL_QT_INVERT_ROTATION=1
+
+GAME_PATH=`basename $0`
+GAME_PATH=`echo $0 | sed -e 's/'$GAME_PATH'//g'`
+cd "$GAME_PATH"
+
+export HOME="$GAME_PATH"
+
+export LD_PREADLOAD=/usr/lib/libtaskman.so
+
+exec ./scummvm -g 1x
Property changes on: scummvm/trunk/dists/motomagx/pep/app/scummvm.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/dists/motomagx/pep/description.ini
===================================================================
--- scummvm/trunk/dists/motomagx/pep/description.ini (rev 0)
+++ scummvm/trunk/dists/motomagx/pep/description.ini 2009-08-29 20:43:00 UTC (rev 43809)
@@ -0,0 +1,20 @@
+[Actions]
+Silent=0
+InstallApp = 1
+AddAppToMenu = 1
+
+[InstallApp]
+Name = ScummVM
+Exec = scummvm.sh
+InstallPath = ../../mmc/mmca1/.Games/ScummVM/
+AppLockable = 1
+Author = ScummVM Team
+Version = trunk
+Daemon = 1
+BigIcon= scummvm_big_usr.png
+AniIcon= scummvm_big_usr.png
+Icon= scummvm_small_usr.png
+
+[AddAppToMenu]
+ParentFolder= root
+
Property changes on: scummvm/trunk/dists/motomagx/pep/description.ini
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: scummvm/trunk/dists/motomagx/pep/scummvm_big_usr.png
===================================================================
(Binary files differ)
Property changes on: scummvm/trunk/dists/motomagx/pep/scummvm_big_usr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: scummvm/trunk/dists/motomagx/pep/scummvm_small_usr.png
===================================================================
(Binary files differ)
Property changes on: scummvm/trunk/dists/motomagx/pep/scummvm_small_usr.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk 2009-08-29 20:03:02 UTC (rev 43808)
+++ scummvm/trunk/ports.mk 2009-08-29 20:43:00 UTC (rev 43809)
@@ -205,7 +205,7 @@
$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
#
-# Linuxmoto/motoezx specific
+# Linuxmoto specific
#
# Special target to create a motoezx snapshot
@@ -218,8 +218,27 @@
$(CP) $(srcdir)/dists/motoezx/* motoezx/scummvm/
tar -C motoezx -cvzf motoezx/ScummVM.pkg scummvm
-.PHONY: deb bundle osxsnap win32dist wiidist motoezx install uninstall
+# Special target to create a motomagx snapshot
+motomagx-mpkg: $(EXECUTABLE)
+ $(MKDIR) motomagx/scummvm
+ $(CP) $(EXECUTABLE) motomagx/scummvm/
+ $(STRIP) motomagx/scummvm/$(EXECUTABLE)
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/scummvm/
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/scummvm/
+ $(CP) $(srcdir)/dists/motomagx/mpkg/* motomagx/scummvm/
+ tar -C motomagx -cvzf motomagx/ScummVM.mpkg scummvm
+motomagx-pep: $(EXECUTABLE)
+ $(MKDIR) motomagx/pep
+ $(CP) -r $(srcdir)/dists/motomagx/pep/* motomagx/pep
+ $(CP) $(EXECUTABLE) motomagx/pep/app
+ $(STRIP) motomagx/pep/app/$(EXECUTABLE)
+ $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/pep/app
+ $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/pep/app
+ tar -C motomagx/pep -czvf motomagx/ScummVM.pep app description.ini scummvm_big_usr.png scummvm_small_usr.png
+
+.PHONY: deb bundle osxsnap win32dist wiidist motoezx motomagx-mpkg motomagx-pep install uninstall
+
#
# ARM specific
#
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