From 10a28d17da407a802677c34879e3da28021b469b Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 16 Nov 2003 17:17:04 +0000
Subject: [PATCH] util_userPickTile replaces util_askBlankFace

---
 linux/cursesmain.c | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/linux/cursesmain.c b/linux/cursesmain.c
index f5b4ebc77..6ed1c428e 100644
--- a/linux/cursesmain.c
+++ b/linux/cursesmain.c
@@ -40,6 +40,7 @@
 #include "linuxmain.h"
 #include "cursesmain.h"
 #include "cursesask.h"
+#include "cursesletterask.h"
 #include "model.h"
 #include "draw.h"
 #include "board.h"
@@ -92,6 +93,22 @@ curses_util_listenPortChange( XW_UtilCtxt* uc, XP_U16 newPort )
     XP_ASSERT( newPort == globals->cGlobals.params->defaultListenPort );
 } /* curses_util_listenPortChange */
 
+static XP_S16 
+curses_util_userPickTile( XW_UtilCtxt* uc, PickInfo* pi, XP_U16 playerNum,
+                          XP_UCHAR4* texts, XP_U16 nTiles )
+{
+    CursesAppGlobals* globals = (CursesAppGlobals*)uc->closure;
+    char query[128];
+    XP_S16 index;
+    char* playerName = globals->cGlobals.params->gi.players[playerNum].name;
+
+    sprintf( query, "Pick tile for %s! (Tab or type letter to select\n"
+             "then hit <cr>.)", playerName );
+
+    index = curses_askLetter( globals, query, texts, nTiles );
+    return index;
+} /* util_userPickTile */
+
 static void
 curses_util_userError( XW_UtilCtxt* uc, UtilErrID id )
 {
@@ -145,14 +162,6 @@ curses_util_userQuery( XW_UtilCtxt* uc, UtilQueryID id, XWStreamCtxt* stream )
     return result;
 } /* curses_util_userQuery */
 
-static void
-curses_util_askBlankFace(XW_UtilCtxt* uc, DictionaryCtxt* dict, 
-			 XP_UCHAR* buf )
-{
-    buf[0] = 'A';
-    buf[1] = '\0';
-} /* curses_util_askBlankFace */
-
 static void
 curses_util_trayHiddenChange( XW_UtilCtxt* uc, XW_TrayVisState state )
 {
@@ -794,7 +803,7 @@ setupCursesUtilCallbacks( CursesAppGlobals* globals, XW_UtilCtxt* util )
     util->vtable->m_util_makeStreamFromAddr = curses_util_makeStreamFromAddr;
 
     util->vtable->m_util_userQuery = curses_util_userQuery;
-    util->vtable->m_util_askBlankFace = curses_util_askBlankFace;
+    util->vtable->m_util_userPickTile = curses_util_userPickTile;
     util->vtable->m_util_trayHiddenChange = curses_util_trayHiddenChange;
     util->vtable->m_util_notifyGameOver = curses_util_notifyGameOver;
     util->vtable->m_util_hiliteCell = curses_util_hiliteCell;
@@ -805,8 +814,6 @@ setupCursesUtilCallbacks( CursesAppGlobals* globals, XW_UtilCtxt* util )
 
     util->vtable->m_util_listenPortChange = curses_util_listenPortChange;
 
-    util->vtable->m_util_requestTime = curses_util_requestTime;
-
     util->closure = globals;
 } /* setupCursesUtilCallbacks */
 
@@ -823,12 +830,12 @@ static XP_Bool
 handleKeyEvent( CursesAppGlobals* globals, MenuList* list, char ch )
 {
     while ( list->handler != NULL ) {
-	if ( list->key == ch ) {
-	    if ( (*list->handler)(globals) ) {
-		return XP_TRUE;
-	    }
-	}
-	++list;
+        if ( list->key == ch ) {
+            if ( (*list->handler)(globals) ) {
+                return XP_TRUE;
+            }
+        }
+        ++list;
     }
     return XP_FALSE;
 } /* handleKeyEvent */
@@ -838,8 +845,8 @@ passKeyToBoard( CursesAppGlobals* globals, char ch )
 {
     XP_Bool handled = ch >= 'a' && ch <= 'z';
     if ( handled ) {
-	ch += 'A' - 'a';
-	globals->doDraw = board_handleKey( globals->cGlobals.game.board, ch );
+        ch += 'A' - 'a';
+        globals->doDraw = board_handleKey( globals->cGlobals.game.board, ch );
     }
     XP_LOGF( "passKeyToBoard: handled=%d on %x (%c)", handled, ch, ch );
     return handled;