Fixed a problem with Makefile.mingw where make wasn't rebuilding targets

[neverball] / ball / st_name.c

diff --git a/ball/st_name.c b/ball/st_name.c
index b6690e8..828b170 100644 (file)
--- a/ball/st_name.c
+++ b/ball/st_name.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2003 Robert Kooima - 2006 Jean Privat
- * Part of the Neverball Project http://icculus.org/neverball/
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
  * it under the  terms of the GNU General  Public License as published
@@ -21,65 +20,58 @@
 #include "audio.h"
 #include "config.h"
 #include "game.h"
-#include "st_shared.h"
 
 #include "st_name.h"
+#include "st_shared.h"
 
 /*---------------------------------------------------------------------------*/
 
-extern struct state st_name;
-
-static struct state * ok_state, * cancel_state;
 static char player[MAXNAM];
 
-void name_default(void)
-{
-    char * login = getenv("LOGNAME");
-    if (login == NULL || login[0] == '\0')
-       login =  _("Player");
-    
-    strncpy(player, login, MAXNAM);
-    player[MAXNAM-1] = '\0';
-    player[0] = toupper(player[0]);
-}
+/*---------------------------------------------------------------------------*/
+
+static struct state *ok_state, *cancel_state;
 
-int goto_name(struct state * ok, struct state * cancel)
+int goto_name(struct state *ok, struct state *cancel)
 {
     config_get_s(CONFIG_PLAYER, player, MAXNAM);
-    if (player[0] == '\0')
-       name_default();
-    
+
     ok_state     = ok;
     cancel_state = cancel;
+
     return goto_state(&st_name);
 }
 
-#define NAME_BACK   2
-#define NAME_CANCEL 3
-#define NAME_OK     4
+/*---------------------------------------------------------------------------*/
+
+#define NAME_OK     1
+#define NAME_CANCEL 2
 
 static int name_id;
 
 static int name_action(int i)
 {
-    size_t l;
+    size_t l = strlen(player);
 
     audio_play(AUD_MENU, 1.0f);
 
-    l = strlen(player);
-
     switch (i)
     {
     case NAME_OK:
-       if (l == 0)
-          return 1;
+        if (l == 0)
+           return 1;
+
         config_set_s(CONFIG_PLAYER, player);
-       return goto_state(ok_state);
-       
-    case NAME_BACK:
+
+        return goto_state(ok_state);
+
     case NAME_CANCEL:
-       return goto_state(cancel_state);
-       
+        return goto_state(cancel_state);
+
+    case GUI_CL:
+        gui_keyboard_lock();
+        break;
+
     case GUI_BS:
         if (l > 0)
         {
@@ -93,37 +85,39 @@ static int name_action(int i)
         {
             player[l + 0] = (char) i;
             player[l + 1] = '\0';
+
             gui_set_label(name_id, player);
         }
     }
     return 1;
 }
 
+static int enter_id;
+
 static int name_enter(void)
 {
     int id, jd;
 
     if ((id = gui_vstack(0)))
     {
-       gui_label(id, _("Player Name"), GUI_MED, GUI_ALL, 0, 0);
-
-       gui_space(id);
+        gui_label(id, _("Player Name"), GUI_MED, GUI_ALL, 0, 0);
         gui_space(id);
-       
-       name_id = gui_label(id, player, GUI_MED, GUI_ALL, gui_yel, gui_yel);
+
+        name_id = gui_label(id, strlen(player) == 0 ? " " : player,
+                            GUI_MED, GUI_ALL, gui_yel, gui_yel);
 
         gui_space(id);
+        gui_keyboard(id);
 
-       gui_keyboard(id);
-       if ((jd = gui_harray(id)))
-       {
-           gui_state(jd, _("Cancel"), GUI_SML, NAME_CANCEL, 0);
-           gui_start(jd, _("OK"),     GUI_SML, NAME_OK,     0);
-       }
+        if ((jd = gui_harray(id)))
+        {
+            enter_id = gui_start(jd, _("OK"), GUI_SML, NAME_OK, 0);
+            gui_state(jd, _("Cancel"), GUI_SML, NAME_CANCEL, 0);
+        }
 
-       gui_layout(id, 0, 0);
+        gui_layout(id, 0, 0);
     }
-    
+
     SDL_EnableUNICODE(1);
 
     return id;
@@ -137,15 +131,15 @@ static void name_leave(int id)
 
 static int name_keybd(int c, int d)
 {
-    if (d)
-       if ((c & 0xFF80) == 0)
-       {
-           c &= 0x7F;
-           if (c == '\b' || c == 0x7F)
-               return name_action(GUI_BS);
-           else if (c > ' ')
-               return name_action(c);
-       }
+    if (d && (c & 0xFF80) == 0)
+    {
+        gui_focus(enter_id);
+
+        if (c == '\b' || c == 0x7F)
+            return name_action(GUI_BS);
+        if (c > ' ')
+            return name_action(c);
+    }
     return 1;
 }
 
@@ -154,9 +148,15 @@ static int name_buttn(int b, int d)
     if (d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
-            return name_action(gui_token(gui_click()));
+        {
+            int c = gui_token(gui_click());
+
+            /* Ugh.  This is such a hack. */
+
+            return name_action(isupper(c) ? gui_keyboard_char(c) : c);
+        }
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-           name_action(NAME_BACK);
+            name_action(NAME_CANCEL);
     }
     return 1;
 }