[Scummvm-cvs-logs] CVS: scummvm/wince pocketpc.cpp,1.26,1.27 gapi_keys.cpp,1.5,1.6
Nicolas Bacca
arisme at users.sourceforge.net
Sun Aug 4 23:08:03 CEST 2002
Update of /cvsroot/scummvm/scummvm/wince
In directory usw-pr-cvs1:/tmp/cvs-serv31263
Modified Files:
pocketpc.cpp gapi_keys.cpp
Log Message:
Thought 5 minutes before recoding mute sound *properly*, rewrite hardware keys mapping to be tolerant with unknown keys, added useful Boss/Meeting/Teacher key
Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/pocketpc.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- pocketpc.cpp 22 Jul 2002 21:47:26 -0000 1.26
+++ pocketpc.cpp 5 Aug 2002 06:07:51 -0000 1.27
@@ -23,6 +23,7 @@
#include <assert.h>
#include "scumm.h"
+#include "debug.h"
#include "screen.h"
#include "gui.h"
#include "sound/mididrv.h"
@@ -48,11 +49,12 @@
#define MAX(a,b) (((a)<(b)) ? (b) : (a))
#define MIN(a,b) (((a)>(b)) ? (b) : (a))
-#define POCKETSCUMM_BUILD "070202"
+#define POCKETSCUMM_BUILD "080502"
#define VERSION "Build " POCKETSCUMM_BUILD " (VM " SCUMMVM_CVS ")"
typedef int (*tTimeCallback)(int);
+typedef void SoundProc(void *param, byte *buf, int len);
GameDetector detector;
Gui gui;
@@ -171,6 +173,7 @@
//bool handleMessage();
static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
byte *_gfx_buf;
uint32 _start_time;
Event _event;
@@ -261,6 +264,8 @@
bool get_key_mapping;
static char _directory[MAX_PATH];
+SoundProc *real_soundproc;
+
const char KEYBOARD_MAPPING_ALPHA_HIGH[] = {"ABCDEFGHIJKLM"};
const char KEYBOARD_MAPPING_NUMERIC_HIGH[] = {"12345"};
const char KEYBOARD_MAPPING_ALPHA_LOW[] = {"NOPQRSTUVWXYZ"};
@@ -273,13 +278,18 @@
extern void getSelectedGame(int, char*, TCHAR*);
extern void palette_update();
+
+extern void own_soundProc(void *buffer, byte *samples, int len);
+
//#define SHMenuBar_GetMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
/* Monkey2 keyboard stuff */
bool monkey2_keyboard;
-int monkey2_keyboard_count;
void do_quit() {
+ scummcfg->set("Sound", sound_activated, "wince");
+ scummcfg->set("DisplayMode", GetScreenMode(), "wince");
+ scummcfg->flush();
GXCloseInput();
GXCloseDisplay();
SDL_AudioQuit();
@@ -392,13 +402,19 @@
char* argv[3];
char argdir[MAX_PATH];
char *game_name;
+ const char *sound;
- sound_activated = true;
hide_toolbar = false;
scummcfg = new Config("scummvm.ini", "scummvm");
scummcfg->set_writing(true);
+ sound = scummcfg->get("Sound", "wince");
+ if (sound)
+ sound_activated = (atoi(sound) == 1);
+ else
+ sound_activated = true;
+
game_name = GameSelector();
if (!game_name)
return 0;
@@ -419,8 +435,7 @@
if (strcmp(game_name, "monkey2") == 0) {
draw_keyboard = true;
monkey2_keyboard = true;
- monkey2_keyboard_count = 0;
- }
+ }
if (detector.detectMain(argc, argv))
return (-1);
@@ -476,7 +491,13 @@
{
static SHACTIVATEINFO sai;
- OSystem_WINCE3 *wm = (OSystem_WINCE3*)GetWindowLong(hWnd, GWL_USERDATA);
+ OSystem_WINCE3 *wm = (OSystem_WINCE3*)GetWindowLong(hWnd, GWL_USERDATA);
+
+ if (monkey2_keyboard && g_scumm->_vars[g_scumm->VAR_ROOM] != 108) {
+ monkey2_keyboard = false;
+ draw_keyboard = false;
+ toolbar_drawn = false;
+ }
switch (message)
{
@@ -657,20 +678,26 @@
return 0;
case WM_KEYDOWN:
- if(wParam) { // gets rid of zero that seems to preceed GAPI events.
+ if(wParam && wParam != 0x84) { // WHAT THE ???
+ /*
unsigned char GAPI_key;
GAPI_key = getGAPIKeyMapping((short)wParam);
if (GAPI_key) {
+ */
if (get_key_mapping) {
- wm->_event.kbd.ascii = GAPI_KEY_BASE + GAPI_key;
+ wm->_event.kbd.ascii = GAPI_KEY_BASE + GAPIKeysTranslate((int)wParam);
wm->_event.event_code = EVENT_KEYDOWN;
+ break;
}
+ /*
else
processAction((short)wParam);
- }
- else {
+ */
+ /*}*/
+ if (!processAction(GAPIKeysTranslate((int)wParam)))
+ /*else*/ {
wm->_event.kbd.ascii = mapKey(wParam);
wm->_event.event_code = EVENT_KEYDOWN;
}
@@ -736,14 +763,6 @@
else
if (x>=186 && y>=(200 + offset_y) && x<=255) {
// Numeric selection
- if (monkey2_keyboard) {
- monkey2_keyboard_count++;
- if (monkey2_keyboard_count == 4) {
- monkey2_keyboard = false;
- draw_keyboard = false;
- toolbar_drawn = false;
- }
- }
wm->_event.event_code = EVENT_KEYDOWN;
wm->_event.kbd.ascii =
(y <= (220 + offset_y) ? KEYBOARD_MAPPING_NUMERIC_HIGH[((x - 187 + 10) / 14) - 1] :
@@ -821,17 +840,17 @@
break;
}
/*if (GetScreenMode()) {*/
+ /*
draw_keyboard = true;
if (!hide_toolbar)
toolbar_drawn = false;
+ */
/*}*/
wm->_event.event_code = EVENT_KEYDOWN;
wm->_event.kbd.ascii = mapKey(VK_F5);
break;
case ToolbarMode:
SetScreenMode(!GetScreenMode());
- scummcfg->set("DisplayMode", GetScreenMode(), "wince");
- scummcfg->flush();
if (!hide_toolbar)
toolbar_drawn = false;
break;
@@ -848,12 +867,6 @@
break;
case ToolbarSound:
sound_activated = !sound_activated;
- if (detector._gameId >= GID_SIMON_FIRST &&
- detector._gameId <= GID_SIMON_LAST) {
- g_mixer->pause(!sound_activated);
- }
- else
- g_scumm->pauseSounds(!sound_activated);
redrawSoundItem();
break;
default:
@@ -890,35 +903,39 @@
void load_key_mapping() {
unsigned char actions[NUMBER_ACTIONS];
+ int actions_keys[NUMBER_ACTIONS];
const char *current;
+ const char *version;
int i;
-
- memset(actions, 0, NUMBER_ACTIONS);
+
+ memset(actions_keys, 0, sizeof(actions_keys));
+
+ version = scummcfg->get("KeysVersion", "wince");
current = scummcfg->get("ActionKeys", "wince");
- if (current) {
+ if (current && version) {
for (i=0; i<NUMBER_ACTIONS; i++) {
char x[6];
int j;
memset(x, 0, sizeof(x));
- memcpy(x, current + 3 * i, 2);
+ memcpy(x, current + 5 * i, 4);
sscanf(x, "%x", &j);
- actions[i] = j;
+ actions_keys[i] = j;
}
}
- setActionKeys(actions);
+ setActionKeys(actions_keys);
memset(actions, 0, NUMBER_ACTIONS);
actions[0] = ACTION_PAUSE;
actions[1] = ACTION_SAVE;
- actions[2] = ACTION_QUIT;
+ actions[2] = ACTION_BOSS;
actions[3] = ACTION_SKIP;
actions[4] = ACTION_HIDE;
current = scummcfg->get("ActionTypes", "wince");
- if (current) {
+ if (current && version) {
for (i=0; i<NUMBER_ACTIONS; i++) {
char x[6];
int j;
@@ -930,18 +947,24 @@
}
}
setActionTypes(actions);
+
+ if (!version) {
+ scummcfg->set("KeysVersion", "2", "wince");
+ scummcfg->flush();
+ }
}
void save_key_mapping() {
char tempo[1024];
+ const int *work_keys;
const unsigned char *work;
int i;
tempo[0] = '\0';
- work = getActionKeys();
+ work_keys = getActionKeys();
for (i=0; i<NUMBER_ACTIONS; i++) {
char x[4];
- sprintf(x, "%.2x ", work[i]);
+ sprintf(x, "%.4x ", work_keys[i]);
strcat(tempo, x);
}
scummcfg->set("ActionKeys", tempo, "wince");
@@ -990,9 +1013,11 @@
system = (OSystem_WINCE3*)g_scumm->_system;
/*if (GetScreenMode()) {*/
+ /*
draw_keyboard = true;
if (!hide_toolbar)
toolbar_drawn = false;
+ */
/*}*/
system->addEventKeyPressed(mapKey(VK_F5));
@@ -1002,6 +1027,18 @@
do_quit();
}
+void action_boss() {
+ toolbar_drawn = false;
+ hide_toolbar = true;
+ Cls();
+ g_scumm->_saveLoadSlot = 0;
+ g_scumm->_saveLoadCompatible = false;
+ g_scumm->_saveLoadFlag = 1;
+ strcpy(g_scumm->_saveLoadName, "BOSS");
+ g_scumm->saveState(g_scumm->_saveLoadSlot, g_scumm->_saveLoadCompatible);
+ do_quit();
+}
+
void action_skip() {
OSystem_WINCE3* system;
system = (OSystem_WINCE3*)g_scumm->_system;
@@ -1012,8 +1049,8 @@
system->addEventKeyPressed(g_scumm->_vars[g_scumm->VAR_TALKSTOP_KEY]);
}
-void action_hide() {
- hide_toolbar = !hide_toolbar;
+void do_hide(bool hide_state) {
+ hide_toolbar = hide_state;
if (hide_toolbar)
RestoreScreenGeometry();
else
@@ -1023,6 +1060,10 @@
g_scumm->_system->update_screen();
}
+void action_hide() {
+ do_hide(!hide_toolbar);
+}
+
void action_keyboard() {
/*if (GetScreenMode()) {*/
draw_keyboard = !draw_keyboard;
@@ -1033,7 +1074,6 @@
void action_sound() {
sound_activated = !sound_activated;
- g_scumm->pauseSounds(!sound_activated);
}
void action_cursoronoff() {
@@ -1048,7 +1088,7 @@
static pAction actions[TOTAL_ACTIONS] =
{ action_pause, action_save, action_quit, action_skip, action_hide,
action_keyboard, action_sound, action_right_click, action_cursoronoff,
- action_subtitleonoff
+ action_subtitleonoff, action_boss
};
GAPIKeysInit(actions);
@@ -1376,16 +1416,25 @@
return false;
}
+void own_soundProc(void *buffer, byte *samples, int len) {
+
+ (*real_soundproc)(buffer, samples, len);
+
+ if (!sound_activated)
+ memset(samples, 0, len);
+}
+
bool OSystem_WINCE3::set_sound_proc(void *param, SoundProc *proc, byte format) {
SDL_AudioSpec desired;
/* only one format supported at the moment */
+ real_soundproc = proc;
desired.freq = SAMPLES_PER_SEC;
desired.format = AUDIO_S16SYS;
desired.channels = 2;
desired.samples = 128;
- desired.callback = proc;
+ desired.callback = own_soundProc;
desired.userdata = param;
if (SDL_OpenAudio(&desired, NULL) != 0) {
return false;
Index: gapi_keys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/wince/gapi_keys.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gapi_keys.cpp 22 Jul 2002 21:47:26 -0000 1.5
+++ gapi_keys.cpp 5 Aug 2002 06:07:52 -0000 1.6
@@ -35,7 +35,8 @@
#include "screen.h"
struct oneAction _actions[NUMBER_ACTIONS];
-struct GXKeyList _keys;
+struct GXKeyList _portrait_keys;
+struct GXKeyList _landscape_keys;
pAction *_action_functions;
const char* ActionsText[] = {
@@ -49,7 +50,8 @@
"Sound",
"Right click",
"Cursor on/off",
- "Subtitles on/off"
+ "Subtitles on/off",
+ "Boss"
};
bool _typeExists(int x) {
@@ -95,9 +97,33 @@
}
*/
- _keys = GXGetDefaultKeys(GX_LANDSCAPEKEYS);
+ _portrait_keys = GXGetDefaultKeys(GX_NORMALKEYS);
+ _landscape_keys = GXGetDefaultKeys(GX_LANDSCAPEKEYS);
}
+int GAPIKeysTranslate(int key) {
+/*
+ if (key == _landscape_keys.vkUp)
+ return _portrait_keys.vkUp;
+ if (key == _landscape_keys.vkDown)
+ return _portrait_keys.vkDown;
+ if (key == _landscape_keys.vkLeft)
+ return _portrait_keys.vkLeft;
+ if (key == _landscape_keys.vkRight)
+ return _portrait_keys.vkRight;
+ if (key == _landscape_keys.vkA)
+ return _portrait_keys.vkA;
+ if (key == _landscape_keys.vkB)
+ return _portrait_keys.vkB;
+ if (key == _landscape_keys.vkC)
+ return _portrait_keys.vkC;
+ if (key == _landscape_keys.vkStart)
+ return _portrait_keys.vkStart;
+*/
+ return key;
+}
+
+/*
const unsigned char getGAPIKeyMapping(short key) {
// first the standard GAPI controls
if (key == _keys.vkA)
@@ -138,9 +164,44 @@
return 0;
}
}
+*/
-const char* getGAPIKeyName(unsigned char key) {
+const char* getGAPIKeyName(int key) {
+ static char key_name[50];
+
+ if (!key)
+ return "Not mapped";
+ if (key == _portrait_keys.vkA)
+ return "Button A";
+ if (key == _portrait_keys.vkB)
+ return "Button B";
+ if (key == _portrait_keys.vkC)
+ return "Button C";
+ if (key == _portrait_keys.vkStart)
+ return "Button Start";
+ if (key == _portrait_keys.vkUp)
+ return "Pad Up";
+ if (key == _portrait_keys.vkDown)
+ return "Pad Down";
+ if (key == _portrait_keys.vkLeft)
+ return "Pad Left";
+ if (key == _portrait_keys.vkRight)
+ return "Pad Right";
+ if (key == INTERNAL_KEY_CALENDAR)
+ return "Button Calendar";
+ if (key == INTERNAL_KEY_CONTACTS)
+ return "Button Contacts";
+ if (key == INTERNAL_KEY_INBOX)
+ return "Button Inbox";
+ if (key == INTERNAL_KEY_ITASK)
+ return "Button ITask";
+ sprintf(key_name, "Key %.4x", key);
+ return key_name;
+
+/*
switch(key) {
+ case 0:
+ return "Not mapped";
case GAPI_KEY_VKA:
return "Button A";
case GAPI_KEY_VKB:
@@ -166,27 +227,36 @@
case GAPI_KEY_VKRIGHT:
return "Pad Right";
default:
- return "Not mapped";
+ sprintf(key_name, "Unknown key %.4x", key);
+ return key_name;
}
+*/
}
struct oneAction* getAction(int action) {
return &_actions[action];
}
-void processAction (short key) {
+bool processAction (int key) {
int i;
+ /*
unsigned char GAPI_key;
GAPI_key = getGAPIKeyMapping(key);
if (!GAPI_key)
return;
-
+ */
+
for (i=0; i<NUMBER_ACTIONS; i++)
- if (_actions[i].action_key == GAPI_key &&
+ //if (_actions[i].action_key == GAPI_key &&
+ if (_actions[i].action_key == key &&
_actions[i].action_type != ACTION_NONE &&
- _action_functions[_actions[i].action_type - 1])
+ _action_functions[_actions[i].action_type - 1]) {
_action_functions[_actions[i].action_type - 1]();
+ return true;
+ }
+
+ return false;
}
void clearActionKey (unsigned char key) {
@@ -198,9 +268,9 @@
}
}
-const unsigned char* getActionKeys() {
+const int* getActionKeys() {
int i;
- static unsigned char actionKeys[NUMBER_ACTIONS];
+ static int actionKeys[NUMBER_ACTIONS];
for (i=0; i<NUMBER_ACTIONS; i++)
actionKeys[i] = _actions[i].action_key;
@@ -253,7 +323,7 @@
-void setActionKeys(unsigned char *actionKeys) {
+void setActionKeys(int *actionKeys) {
int i;
for (i=0; i<NUMBER_ACTIONS; i++)
More information about the Scummvm-git-logs
mailing list