Change a "magic number" to a preprocessor macro. Also don't store and

[neverball] / ball / st_name.c

diff --git a/ball/st_name.c b/ball/st_name.c
index 7204985..2978210 100644 (file)
--- a/ball/st_name.c
+++ b/ball/st_name.c
@@ -1,5 +1,6 @@
-/*   
- * Copyright (C) 2003 Robert Kooima
+/*
+ * 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
@@ -13,12 +14,14 @@
  */
 
 #include <string.h>
+#include <ctype.h>
 
 #include "gui.h"
 #include "util.h"
 #include "audio.h"
 #include "config.h"
 #include "game.h"
+#include "st_shared.h"
 
 #include "st_name.h"
 
@@ -26,15 +29,31 @@
 
 extern struct state st_name;
 
-static struct state * next_state;
+static struct state *ok_state, *cancel_state;
 static char player[MAXNAM];
 
-int goto_name(struct state * nextstate)
+void name_default(void)
 {
-    next_state = nextstate;
-    return goto_state(&st_name);
+    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]);
 }
 
+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
@@ -53,18 +72,14 @@ static int name_action(int i)
     switch (i)
     {
     case NAME_OK:
-       if (l == 0)
-          return 1;
+        if (l == 0)
+           return 1;
         config_set_s(CONFIG_PLAYER, player);
-       /* no break, thus continue */
-       
+        return goto_state(ok_state);
+
     case NAME_BACK:
     case NAME_CANCEL:
-       return goto_state(next_state);
-       
-    case GUI_CL:
-        gui_keyboard_lock();
-        break;
+        return goto_state(cancel_state);
 
     case GUI_BS:
         if (l > 0)
@@ -77,7 +92,7 @@ static int name_action(int i)
     default:
         if (l < MAXNAM - 1)
         {
-            player[l + 0] = gui_keyboard_char((char) i);
+            player[l + 0] = (char) i;
             player[l + 1] = '\0';
             gui_set_label(name_id, player);
         }
@@ -85,72 +100,56 @@ static int name_action(int i)
     return 1;
 }
 
+static int enter_id;
+
 static int name_enter(void)
 {
     int id, jd;
 
-    config_get_s(CONFIG_PLAYER, player, MAXNAM);
-
     if ((id = gui_vstack(0)))
     {
-        int gid;
+        gui_label(id, _("Player Name"), GUI_MED, GUI_ALL, 0, 0);
 
-       gid = gui_label(id, _("Player Name"), GUI_MED, GUI_ALL, 0, 0);
-
-       gui_space(id);
         gui_space(id);
-       
-       name_id = gui_label(id, player, GUI_MED, GUI_ALL, gui_yel, gui_yel);
+        gui_space(id);
+
+        name_id = gui_label(id, player, GUI_MED, GUI_ALL, gui_yel, gui_yel);
 
         gui_space(id);
 
-       if ((jd = gui_harray(id)))
-       {
-           gui_state(jd, _("Cancel"), GUI_SML, NAME_CANCEL, 0);
-           gui_start(jd, _("OK"),     GUI_SML, NAME_OK,     0);
-       }
-       gui_keyboard(id);
+        gui_keyboard(id);
+        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;
 }
 
 static void name_leave(int id)
 {
+    SDL_EnableUNICODE(0);
     gui_delete(id);
 }
 
-static void name_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
-static void name_timer(int id, float dt)
+static int name_keybd(int c, int d)
 {
-    gui_timer(id, dt);
-    audio_timer(dt);
-}
-
-static void name_point(int id, int x, int y, int dx, int dy)
-{
-    gui_pulse(gui_point(id, x, y), 1.2f);
-}
-
-static void name_stick(int id, int a, int v)
-{
-    if (config_tst_d(CONFIG_JOYSTICK_AXIS_X, a))
-        gui_pulse(gui_stick(id, v, 0), 1.2f);
-    if (config_tst_d(CONFIG_JOYSTICK_AXIS_Y, a))
-        gui_pulse(gui_stick(id, 0, v), 1.2f);
-}
-
-static int name_click(int b, int d)
-{
-    if (b <= 0 && d == 1)
-        return name_action(gui_token(gui_click()));
+    if (d)
+        if ((c & 0xFF80) == 0)
+        {
+            gui_focus(enter_id);
+            c &= 0x7F;
+            if (c == '\b' || c == 0x7F)
+                return name_action(GUI_BS);
+            else if (c > ' ')
+                return name_action(c);
+        }
     return 1;
 }
 
@@ -159,9 +158,9 @@ static int name_buttn(int b, int d)
     if (d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
-            return name_click(0, 1);
+            return name_action(gui_token(gui_click()));
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-           name_action(NAME_BACK);
+            name_action(NAME_BACK);
     }
     return 1;
 }
@@ -171,12 +170,12 @@ static int name_buttn(int b, int d)
 struct state st_name = {
     name_enter,
     name_leave,
-    name_paint,
-    name_timer,
-    name_point,
-    name_stick,
-    name_click,
-    NULL,
+    shared_paint,
+    shared_timer,
+    shared_point,
+    shared_stick,
+    shared_click,
+    name_keybd,
     name_buttn,
     1, 0
 };