Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy

Browse source
This commit is contained in:
eehouse@eehouse.org 2010-11-03 21:00:43 -07:00 • committed by Andy2
commit d04a5870af
8 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/wince/cemain.c
View file

@ -84,7 +84,8 @@ static XP_S16 ce_send_proc( const XP_U8* buf, XP_U16 len,
void* closure ); void* closure );
static void ce_relay_status( void* closure, static void ce_relay_status( void* closure,
CommsRelayState newState ); CommsRelayState newState );
static void ce_relay_connd( void* closure, XP_Bool allHere, static void ce_relay_connd( void* closure, XP_UCHAR* const room,
XP_U16 devOrder, XP_Bool allHere,
XP_U16 nMissing ); XP_U16 nMissing );
static void ce_relay_error( void* closure, XWREASON relayErr ); static void ce_relay_error( void* closure, XWREASON relayErr );
@ -1569,7 +1570,7 @@ ceSetDictName( const wchar_t* XP_UNUSED(wPath), XP_U16 XP_UNUSED_DBG(index),
} /* ceSetDictName */ } /* ceSetDictName */
static XP_Bool static XP_Bool
ceHandleHintRequest( CEAppGlobals* globals ) ceHandleHintRequest( CEAppGlobals* globals, int wmId )
{ {
XP_Bool notDone; XP_Bool notDone;
XP_Bool draw; XP_Bool draw;
@ -1579,10 +1580,10 @@ ceHandleHintRequest( CEAppGlobals* globals )
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
globals->askTrayLimits, globals->askTrayLimits,
#endif #endif
&notDone ); wmId == ID_MOVE_PREVHINT, &notDone );
globals->hintPending = notDone; globals->hintPending = notDone;
if ( draw ) { /* don't turn on if disallowed */ if ( draw ) { /* don't turn on if disallowed */
ceSetLeftSoftkey( globals, ID_MOVE_NEXTHINT ); ceSetLeftSoftkey( globals, wmId );
} }
return draw; return draw;
} /* ceHandleHintRequest */ } /* ceHandleHintRequest */
@ -2640,7 +2641,8 @@ WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
board_resetEngine( globals->game.board ); board_resetEngine( globals->game.board );
/* fallthru */ /* fallthru */
case ID_MOVE_NEXTHINT: case ID_MOVE_NEXTHINT:
draw = ceHandleHintRequest( globals ); case ID_MOVE_PREVHINT:
draw = ceHandleHintRequest( globals, wmId );
break; break;
case ID_FILE_EXIT: case ID_FILE_EXIT:
@ -3179,7 +3181,10 @@ ce_relay_status( void* closure, CommsRelayState newState )
} }
static void static void
ce_relay_connd( void* closure, XP_Bool allHere, XP_U16 nMissing ) ce_relay_connd( void* closure, XP_UCHAR* const XP_UNUSED(room),
XP_U16 XP_UNUSED(devOrder), /* 1 means created room, etc. */
XP_Bool allHere,
XP_U16 nMissing )
{ {
CEAppGlobals* globals = (CEAppGlobals*)closure; CEAppGlobals* globals = (CEAppGlobals*)closure;
XP_U16 strID = 0; XP_U16 strID = 0;

1
xwords4/wince/l10n/xwords4_caps.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "HINT" // <- translate POPUP "HINT" // <- translate
BEGIN BEGIN
MENUITEM "NEXT HINT", ID_MOVE_NEXTHINT // <- translate MENUITEM "NEXT HINT", ID_MOVE_NEXTHINT // <- translate
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "HINT", ID_MOVE_HINT // <- translate MENUITEM "HINT", ID_MOVE_HINT // <- translate
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "LIMITED HINT...", ID_MOVE_LIMITEDHINT // <- translate MENUITEM "LIMITED HINT...", ID_MOVE_LIMITEDHINT // <- translate

1
xwords4/wince/l10n/xwords4_catalan.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "Pista" POPUP "Pista"
BEGIN BEGIN
MENUITEM "Pista següent", ID_MOVE_NEXTHINT MENUITEM "Pista següent", ID_MOVE_NEXTHINT
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "Pista", ID_MOVE_HINT MENUITEM "Pista", ID_MOVE_HINT
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Límits de pistes...", ID_MOVE_LIMITEDHINT MENUITEM "Límits de pistes...", ID_MOVE_LIMITEDHINT

1
xwords4/wince/l10n/xwords4_czech.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "Nápověda" POPUP "Nápověda"
BEGIN BEGIN
MENUITEM "Další nápověda", ID_MOVE_NEXTHINT MENUITEM "Další nápověda", ID_MOVE_NEXTHINT
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "Nápověda", ID_MOVE_HINT MENUITEM "Nápověda", ID_MOVE_HINT
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Omezená nápověda...", ID_MOVE_LIMITEDHINT MENUITEM "Omezená nápověda...", ID_MOVE_LIMITEDHINT

1
xwords4/wince/l10n/xwords4_english.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "Hint" POPUP "Hint"
BEGIN BEGIN
MENUITEM "Next hint", ID_MOVE_NEXTHINT MENUITEM "Next hint", ID_MOVE_NEXTHINT
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "Hint", ID_MOVE_HINT MENUITEM "Hint", ID_MOVE_HINT
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Limited hint...", ID_MOVE_LIMITEDHINT MENUITEM "Limited hint...", ID_MOVE_LIMITEDHINT

1
xwords4/wince/l10n/xwords4_french.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "Conseil" POPUP "Conseil"
BEGIN BEGIN
MENUITEM "Conseil suivant", ID_MOVE_NEXTHINT MENUITEM "Conseil suivant", ID_MOVE_NEXTHINT
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "Conseil", ID_MOVE_HINT MENUITEM "Conseil", ID_MOVE_HINT
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Conseil limité...", ID_MOVE_LIMITEDHINT MENUITEM "Conseil limité...", ID_MOVE_LIMITEDHINT

1
xwords4/wince/l10n/xwords4_polish.rc
View file

@ -83,6 +83,7 @@ BEGIN
POPUP "Podpowiedź" POPUP "Podpowiedź"
BEGIN BEGIN
MENUITEM "Następna podp.", ID_MOVE_NEXTHINT MENUITEM "Następna podp.", ID_MOVE_NEXTHINT
MENUITEM "Previous hint", ID_MOVE_PREVHINT
MENUITEM "Podpowiedź", ID_MOVE_HINT MENUITEM "Podpowiedź", ID_MOVE_HINT
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
MENUITEM "Podp. ograniczona...", ID_MOVE_LIMITEDHINT MENUITEM "Podp. ograniczona...", ID_MOVE_LIMITEDHINT

29
xwords4/wince/resource.h
View file

@ -244,20 +244,21 @@
# define ID_MOVE_LIMITEDHINT 40011 # define ID_MOVE_LIMITEDHINT 40011
#endif #endif
#define ID_MOVE_NEXTHINT 40012 #define ID_MOVE_NEXTHINT 40012
#define ID_MOVE_UNDOCURRENT 40013 #define ID_MOVE_PREVHINT 40013
#define ID_MOVE_UNDOLAST 40014 #define ID_MOVE_UNDOCURRENT 40014
#define ID_MOVE_TRADE 40015 #define ID_MOVE_UNDOLAST 40015
#define ID_MOVE_JUGGLE 40016 #define ID_MOVE_TRADE 40016
#define ID_MOVE_HIDETRAY 40017 #define ID_MOVE_JUGGLE 40017
#define ID_MOVE_TURNDONE 40018 #define ID_MOVE_HIDETRAY 40018
#define ID_MOVE_FLIP 40019 #define ID_MOVE_TURNDONE 40019
#define ID_MOVE_VALUES 40027 #define ID_MOVE_FLIP 40020
#define ID_FILE_NEWGAME 40020 #define ID_MOVE_VALUES 40021
#define ID_FILE_SAVEDGAMES 40021 #define ID_FILE_NEWGAME 40022
#define ID_EDITTEXT 40022 #define ID_FILE_SAVEDGAMES 40023
#define ID_FILE_PREFERENCES 40023 #define ID_EDITTEXT 40024
#define ID_GAME_RESENDMSGS 40025 #define ID_FILE_PREFERENCES 40025
#define ID_FILE_FULLSCREEN 40026 #define ID_GAME_RESENDMSGS 40026
#define ID_FILE_FULLSCREEN 40027
#define ID_INITIAL_SOFTID ID_MOVE_TURNDONE #define ID_INITIAL_SOFTID ID_MOVE_TURNDONE