an other proposition for #81

[neverball] / ball / st_save.c

diff --git a/ball/st_save.c b/ball/st_save.c
index c5ebea4..59dea2c 100644 (file)
--- a/ball/st_save.c
+++ b/ball/st_save.c
@@ -1,4 +1,4 @@
-/*   
+/*
  * Copyright (C) 2003 Robert Kooima
  *
  * NEVERBALL is  free software; you can redistribute  it and/or modify
@@ -20,6 +20,7 @@
 #include "audio.h"
 #include "config.h"
 #include "demo.h"
+#include "st_shared.h"
 
 #include "st_save.h"
 
@@ -29,10 +30,10 @@ static char filename[MAXNAM];
 
 /*---------------------------------------------------------------------------*/
 
-static struct state * ok_state;
-static struct state * cancel_state;
+static struct state *ok_state;
+static struct state *cancel_state;
 
-int goto_save(struct state * ok, struct state * cancel)
+int goto_save(struct state *ok, struct state *cancel)
 {
     demo_unique(filename);
     ok_state     = ok;
@@ -45,7 +46,7 @@ int goto_save(struct state * ok, struct state * cancel)
 #define SAVE_SAVE   2
 #define SAVE_CANCEL 3
 
-static int  file_id;
+static int file_id;
 
 static int save_action(int i)
 {
@@ -56,18 +57,18 @@ static int save_action(int i)
     switch (i)
     {
     case SAVE_SAVE:
-       if (strcmp(filename, "") == 0)
-           return 1;
+        if (strcmp(filename, "") == 0)
+            return 1;
         if (demo_exists(filename))
             return goto_state(&st_clobber);
         else
         {
-           demo_play_save(filename);
-           return goto_state(ok_state);
+            demo_play_save(filename);
+            return goto_state(ok_state);
         }
 
     case SAVE_CANCEL:
-       return goto_state(cancel_state);
+        return goto_state(cancel_state);
 
     case GUI_BS:
         if (l > 0)
@@ -88,31 +89,33 @@ static int save_action(int i)
     return 1;
 }
 
+static int enter_id;
+
 static int save_enter(void)
 {
     int id, jd;
 
     if ((id = gui_vstack(0)))
     {
-       gui_label(id, _("Replay Name"), GUI_MED, GUI_ALL, 0, 0);
-        
-       gui_space(id);
+        gui_label(id, _("Replay Name"), GUI_MED, GUI_ALL, 0, 0);
+
+        gui_space(id);
         gui_space(id);
-       
+
         file_id = gui_label(id, filename, GUI_MED, GUI_ALL, gui_yel, gui_yel);
-       
+
         gui_space(id);
 
         gui_keyboard(id);
         if ((jd = gui_harray(id)))
         {
+            enter_id = gui_start(jd, _("Save"), GUI_SML, SAVE_SAVE, 0);
             gui_state(jd, _("Cancel"), GUI_SML, SAVE_CANCEL, 0);
-            gui_start(jd, _("Save"),   GUI_SML, SAVE_SAVE,   0);
         }
-        
+
         gui_layout(id, 0, 0);
     }
-    
+
     SDL_EnableUNICODE(1);
 
     return id;
@@ -124,49 +127,18 @@ static void save_leave(int id)
     gui_delete(id);
 }
 
-static void save_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
-static void save_timer(int id, float dt)
-{
-    gui_timer(id, dt);
-    audio_timer(dt);
-}
-
-static void save_point(int id, int x, int y, int dx, int dy)
-{
-    gui_pulse(gui_point(id, x, y), 1.2f);
-}
-
-static void save_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 save_click(int b, int d)
-{
-    if (b <= 0 && d == 1)
-        return save_action(gui_token(gui_click()));
-    return 1;
-}
-
 static int save_keybd(int c, int d)
 {
     if (d)
-       if ((c & 0xFF80) == 0)
-       {
-           c &= 0x7F;
-           if (c == '\b')
-               return save_action(GUI_BS);
-           else if (c > ' ')
-               return save_action(c);
-       }
+        if ((c & 0xFF80) == 0)
+        {
+            gui_focus(enter_id);
+            c &= 0x7F;
+            if (c == '\b')
+                return save_action(GUI_BS);
+            else if (c > ' ')
+                return save_action(c);
+        }
     return 1;
 }
 
@@ -175,9 +147,9 @@ static int save_buttn(int b, int d)
     if (d)
     {
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
-            return save_click(0, 1);
+            return save_action(gui_token(gui_click()));
         if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
-           return save_action(SAVE_CANCEL);
+            return save_action(SAVE_CANCEL);
     }
     return 1;
 }
@@ -190,8 +162,8 @@ static int clobber_action(int i)
 
     if (i == SAVE_SAVE)
     {
-       demo_play_save(filename);
-       return goto_state(ok_state);    
+        demo_play_save(filename);
+        return goto_state(ok_state);
     }
     return goto_state(&st_save);
 }
@@ -208,8 +180,8 @@ static int clobber_enter(void)
 
         if ((jd = gui_harray(id)))
         {
-            gui_state(jd, _("Yes"), GUI_SML, SAVE_SAVE,   0);
             gui_start(jd, _("No"),  GUI_SML, SAVE_CANCEL, 1);
+            gui_state(jd, _("Yes"), GUI_SML, SAVE_SAVE,   0);
         }
 
         gui_pulse(kd, 1.2f);
@@ -219,43 +191,6 @@ static int clobber_enter(void)
     return id;
 }
 
-static void clobber_leave(int id)
-{
-    gui_delete(id);
-}
-
-static void clobber_paint(int id, float st)
-{
-    game_draw(0, st);
-    gui_paint(id);
-}
-
-static void clobber_timer(int id, float dt)
-{
-    gui_timer(id, dt);
-    audio_timer(dt);
-}
-
-static void clobber_point(int id, int x, int y, int dx, int dy)
-{
-    gui_pulse(gui_point(id, x, y), 1.2f);
-}
-
-static void clobber_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 clobber_click(int b, int d)
-{
-    if (d && b < 0)
-        return clobber_action(gui_token(gui_click()));
-    return 1;
-}
-
 static int clobber_buttn(int b, int d)
 {
     if (d)
@@ -273,11 +208,11 @@ static int clobber_buttn(int b, int d)
 struct state st_save = {
     save_enter,
     save_leave,
-    save_paint,
-    save_timer,
-    save_point,
-    save_stick,
-    save_click,
+    shared_paint,
+    shared_timer,
+    shared_point,
+    shared_stick,
+    shared_click,
     save_keybd,
     save_buttn,
     1, 0
@@ -285,12 +220,12 @@ struct state st_save = {
 
 struct state st_clobber = {
     clobber_enter,
-    clobber_leave,
-    clobber_paint,
-    clobber_timer,
-    clobber_point,
-    clobber_stick,
-    clobber_click,
+    shared_leave,
+    shared_paint,
+    shared_timer,
+    shared_point,
+    shared_stick,
+    shared_click,
     NULL,
     clobber_buttn,
     1, 0