[Scummvm-cvs-logs] SF.net SVN: scummvm:[41226] scummvm/trunk/backends/platform/gp2xwiz
djwillis at users.sourceforge.net
djwillis at users.sourceforge.net
Sat Jun 6 17:41:17 CEST 2009
Revision: 41226
http://scummvm.svn.sourceforge.net/scummvm/?rev=41226&view=rev
Author: djwillis
Date: 2009-06-06 15:41:17 +0000 (Sat, 06 Jun 2009)
Log Message:
-----------
GP2XWiz: Cleanup and start to work on virtual keyboard support for the backend.
Modified Paths:
--------------
scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
scummvm/trunk/backends/platform/gp2xwiz/build/config-alleng.sh
scummvm/trunk/backends/platform/gp2xwiz/build/config.sh
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.h
Modified: scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/bundle.sh 2009-06-06 15:41:17 UTC (rev 41226)
@@ -22,6 +22,7 @@
cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
+cp ../../../../backends/vkeybd/vkeybd.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
Modified: scummvm/trunk/backends/platform/gp2xwiz/build/config-alleng.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/config-alleng.sh 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/config-alleng.sh 2009-06-06 15:41:17 UTC (rev 41226)
@@ -17,6 +17,6 @@
# Edit the configure line to suit.
cd ../../../..
-./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-all-engines --enable-plugins --default-dynamic
+./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
echo Generating config for GP2X Wiz complete. Check for errors.
Modified: scummvm/trunk/backends/platform/gp2xwiz/build/config.sh
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/build/config.sh 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/build/config.sh 2009-06-06 15:41:17 UTC (rev 41226)
@@ -17,6 +17,6 @@
# Edit the configure line to suit.
cd ../../../..
-./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-plugins --default-dynamic
+./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-vkeybd --enable-plugins --default-dynamic
echo Generating config for GP2X Wiz complete. Check for errors.
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp 2009-06-06 15:41:17 UTC (rev 41226)
@@ -30,7 +30,7 @@
#include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
#include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
-#include "backends/keymapper/keymapper.h"
+
#include "common/util.h"
#include "common/events.h"
@@ -41,6 +41,28 @@
#define JOY_XAXIS 0
#define JOY_YAXIS 1
+/* GP2X Wiz: Main Joystick Mappings */
+enum {
+ GP2X_BUTTON_UP = 0,
+ GP2X_BUTTON_UPLEFT = 1,
+ GP2X_BUTTON_LEFT = 2,
+ GP2X_BUTTON_DOWNLEFT = 3,
+ GP2X_BUTTON_DOWN = 4,
+ GP2X_BUTTON_DOWNRIGHT = 5,
+ GP2X_BUTTON_RIGHT = 6,
+ GP2X_BUTTON_UPRIGHT = 7,
+ GP2X_BUTTON_MENU = 8,
+ GP2X_BUTTON_SELECT = 9,
+ GP2X_BUTTON_L = 10,
+ GP2X_BUTTON_R = 11,
+ GP2X_BUTTON_A = 12,
+ GP2X_BUTTON_B = 13,
+ GP2X_BUTTON_X = 14,
+ GP2X_BUTTON_Y = 15,
+ GP2X_BUTTON_VOLUP = 16,
+ GP2X_BUTTON_VOLDOWN = 17
+};
+
static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
if (key >= SDLK_F1 && key <= SDLK_F9) {
return key - SDLK_F1 + Common::ASCII_F1;
@@ -173,8 +195,8 @@
GP2X_BUTTON_Y Space Bar
GP2X_BUTTON_X Right Mouse Click
GP2X_BUTTON_L Combo Modifier (Left Trigger)
- GP2X_BUTTON_R F5 (Right Trigger)
- GP2X_BUTTON_MENU Return
+ GP2X_BUTTON_R Return (Right Trigger)
+ GP2X_BUTTON_MENU F5 (Game Menu)
GP2X_BUTTON_SELECT Escape
GP2X_BUTTON_VOLUP /dev/mixer Global Volume Up
GP2X_BUTTON_VOLDOWN /dev/mixer Global Volume Down
@@ -291,8 +313,13 @@
break;
case GP2X_BUTTON_R:
if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+ event.kbd.keycode = Common::KEYCODE_F7;
+ event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
event.kbd.keycode = Common::KEYCODE_0;
event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
} else {
event.kbd.keycode = Common::KEYCODE_RETURN;
event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
@@ -388,8 +415,13 @@
break;
case GP2X_BUTTON_R:
if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+ event.kbd.keycode = Common::KEYCODE_F7;
+ event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
event.kbd.keycode = Common::KEYCODE_0;
event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
} else {
event.kbd.keycode = Common::KEYCODE_RETURN;
event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp 2009-06-06 15:41:17 UTC (rev 41226)
@@ -42,6 +42,16 @@
namespace WIZ_HW {
+enum {
+ VOLUME_NOCHG = 0,
+ VOLUME_DOWN = 1,
+ VOLUME_UP = 2,
+ VOLUME_CHANGE_RATE = 8,
+ VOLUME_MIN = 0,
+ VOLUME_INITIAL = 70,
+ VOLUME_MAX = 100
+};
+
int volumeLevel = VOLUME_INITIAL;
void deviceInit() {
Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.h
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.h 2009-06-06 15:32:42 UTC (rev 41225)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.h 2009-06-06 15:41:17 UTC (rev 41226)
@@ -31,37 +31,8 @@
#ifndef GP2XWIZ_HW_H
#define GP2XWIZ_HW_H
-/* GP2X Wiz: Main Joystick Mappings */
-
-#define GP2X_BUTTON_UP (0)
-#define GP2X_BUTTON_UPLEFT (1)
-#define GP2X_BUTTON_LEFT (2)
-#define GP2X_BUTTON_DOWNLEFT (3)
-#define GP2X_BUTTON_DOWN (4)
-#define GP2X_BUTTON_DOWNRIGHT (5)
-#define GP2X_BUTTON_RIGHT (6)
-#define GP2X_BUTTON_UPRIGHT (7)
-#define GP2X_BUTTON_MENU (8)
-#define GP2X_BUTTON_SELECT (9)
-#define GP2X_BUTTON_L (10)
-#define GP2X_BUTTON_R (11)
-#define GP2X_BUTTON_A (12)
-#define GP2X_BUTTON_B (13)
-#define GP2X_BUTTON_X (14)
-#define GP2X_BUTTON_Y (15)
-#define GP2X_BUTTON_VOLUP (16)
-#define GP2X_BUTTON_VOLDOWN (17)
-
namespace WIZ_HW {
-#define VOLUME_MIN 0
-#define VOLUME_INITIAL 70 /* Default volume if you call mixerMoveVolume(0) without setting the global var. */
-#define VOLUME_MAX 100
-#define VOLUME_CHANGE_RATE 8
-#define VOLUME_NOCHG 0
-#define VOLUME_DOWN 1
-#define VOLUME_UP 2
-
extern int volumeLevel;
extern void deviceInit();
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