mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-03 23:04:08 +01:00
code to use bitmaps instead of letters to show bt conn status.
This commit is contained in:
parent
13c425f005
commit
f273e93c86
3 changed files with 51 additions and 5 deletions
|
@ -1533,10 +1533,40 @@ static void
|
||||||
showBTState( PalmAppGlobals* globals )
|
showBTState( PalmAppGlobals* globals )
|
||||||
{
|
{
|
||||||
CommsCtxt* comms = globals->game.comms;
|
CommsCtxt* comms = globals->game.comms;
|
||||||
char ch[] = { ' ', ' ' };
|
|
||||||
if ( comms != NULL ) {
|
if ( comms != NULL ) {
|
||||||
|
|
||||||
if ( COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) {
|
if ( COMMS_CONN_BT == comms_getConType( globals->game.comms ) ) {
|
||||||
|
#ifdef BTSTATUS_ICONS
|
||||||
|
Int16 resID = 0;
|
||||||
|
|
||||||
|
switch( globals->btUIState ) {
|
||||||
|
case BTUI_NONE:
|
||||||
|
resID = BTSTATUS_NONE_RES_ID; break;
|
||||||
|
case BTUI_LISTENING:
|
||||||
|
resID = BTSTATUS_LISTENING_RES_ID; break;
|
||||||
|
case BTUI_CONNECTING:
|
||||||
|
resID = BTSTATUS_SEEKING_RES_ID; break;
|
||||||
|
case BTUI_CONNECTED:
|
||||||
|
case BTUI_SERVING:
|
||||||
|
resID = BTSTATUS_CONNECTED_RES_ID; break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( globals->lastBTStatusRes != resID ) {
|
||||||
|
RectangleType bounds;
|
||||||
|
getObjectBounds( XW_BTSTATUS_GADGET_ID, &bounds );
|
||||||
|
if ( resID != 0 ) {
|
||||||
|
XP_LOGF( "%s: resID = %d", __func__, resID );
|
||||||
|
/* XP_LOGF( "%s: bounds: %d,%d,%d,%d", __func__, bounds.topLeft.x, */
|
||||||
|
/* bounds.topLeft.y, bounds.extent.x, bounds.extent.y ); */
|
||||||
|
draw_drawBitmapAt( globals->draw, resID,
|
||||||
|
bounds.topLeft.x, bounds.topLeft.y );
|
||||||
|
} else {
|
||||||
|
WinEraseRectangle( &bounds, 0 );
|
||||||
|
}
|
||||||
|
globals->lastBTStatusRes = resID;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
XP_U16 yy = 160 - 27;
|
||||||
|
char ch[] = { ' ', ' ' };
|
||||||
switch( globals->btUIState ) {
|
switch( globals->btUIState ) {
|
||||||
case BTUI_NONE:
|
case BTUI_NONE:
|
||||||
ch[0] = 'x'; break;
|
ch[0] = 'x'; break;
|
||||||
|
@ -1549,11 +1579,10 @@ showBTState( PalmAppGlobals* globals )
|
||||||
case BTUI_SERVING:
|
case BTUI_SERVING:
|
||||||
ch[0] = 'S'; break;
|
ch[0] = 'S'; break;
|
||||||
}
|
}
|
||||||
|
WinDrawChars( ch, sizeof(ch), 160-7, yy );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Looks ok on T650, bad on lowres. Need to replace with gadget or icon
|
|
||||||
or something long before ship. */
|
|
||||||
WinDrawChars( ch, sizeof(ch), 160-7, 160-27 );
|
|
||||||
} /* showBTState */
|
} /* showBTState */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1977,6 +2006,9 @@ updateForLefty( PalmAppGlobals* globals, FormPtr form )
|
||||||
XW_MAIN_JUGGLE_BUTTON_ID, TRAY_BUTTON_WIDTH-1,
|
XW_MAIN_JUGGLE_BUTTON_ID, TRAY_BUTTON_WIDTH-1,
|
||||||
XW_MAIN_TRADE_BUTTON_ID, -1,
|
XW_MAIN_TRADE_BUTTON_ID, -1,
|
||||||
XW_MAIN_DONE_BUTTON_ID, TRAY_BUTTON_WIDTH-1,
|
XW_MAIN_DONE_BUTTON_ID, TRAY_BUTTON_WIDTH-1,
|
||||||
|
#endif
|
||||||
|
#ifdef BTSTATUS_ICONS
|
||||||
|
XW_BTSTATUS_GADGET_ID, 0,
|
||||||
#endif
|
#endif
|
||||||
0,
|
0,
|
||||||
};
|
};
|
||||||
|
|
|
@ -331,6 +331,9 @@ struct PalmAppGlobals {
|
||||||
|
|
||||||
#ifdef XWFEATURE_BLUETOOTH
|
#ifdef XWFEATURE_BLUETOOTH
|
||||||
struct PalmBTStuff* btStuff;
|
struct PalmBTStuff* btStuff;
|
||||||
|
# ifdef BTSTATUS_ICONS
|
||||||
|
XP_U16 lastBTStatusRes;
|
||||||
|
# endif
|
||||||
BtUIState btUIState; /* For showing user what's up */
|
BtUIState btUIState; /* For showing user what's up */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,10 @@
|
||||||
#define XW_MAIN_SHOWTRAY_BUTTON_ID 1026
|
#define XW_MAIN_SHOWTRAY_BUTTON_ID 1026
|
||||||
//#define XW_MAIN_OK_BUTTON_ID 1026
|
//#define XW_MAIN_OK_BUTTON_ID 1026
|
||||||
|
|
||||||
|
#ifdef XWFEATURE_BLUETOOTH
|
||||||
|
# define XW_BTSTATUS_GADGET_ID 1099 /* change later */
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef FOR_GREMLINS
|
#ifdef FOR_GREMLINS
|
||||||
# define GREMLIN_BOARD_GADGET_IDAUTOID 1027
|
# define GREMLIN_BOARD_GADGET_IDAUTOID 1027
|
||||||
# define GREMLIN_TRAY_GADGET_IDAUTOID 1028
|
# define GREMLIN_TRAY_GADGET_IDAUTOID 1028
|
||||||
|
@ -405,6 +409,13 @@
|
||||||
#define SHOWTRAY_BUTTON_BMP_RES_ID 1008
|
#define SHOWTRAY_BUTTON_BMP_RES_ID 1008
|
||||||
#define STAR_BMP_RES_ID 1009
|
#define STAR_BMP_RES_ID 1009
|
||||||
|
|
||||||
|
#ifdef BTSTATUS_ICONS
|
||||||
|
# define BTSTATUS_NONE_RES_ID 1010
|
||||||
|
# define BTSTATUS_LISTENING_RES_ID 1011
|
||||||
|
# define BTSTATUS_SEEKING_RES_ID 1012
|
||||||
|
# define BTSTATUS_CONNECTED_RES_ID 1013
|
||||||
|
#endif
|
||||||
|
|
||||||
#define STRL_RES_TYPE 'StrL'
|
#define STRL_RES_TYPE 'StrL'
|
||||||
#define STRL_RES_ID 0x03e8
|
#define STRL_RES_ID 0x03e8
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue