added text input setup option to configure network server hostname

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index b57af4a9e1726fdfdebfac9d96a40c9bf160e824..c5359b80b86e8979c4ad4baf5111440b13e7f462 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -7132,6 +7132,14 @@ struct ConfigInfo image_config[] =
   { "gfx.editor.input.level_number.height",    "16"                    },
   { "gfx.editor.input.level_number.border_size","1"                    },
 
+  { "setup.input.text",                                "RocksSP.png"           },
+  { "setup.input.text.x",                      "0"                     },
+  { "setup.input.text.y",                      "0"                     },
+  { "setup.input.text.width",                  "32"                    },
+  { "setup.input.text.height",                 "32"                    },
+  { "setup.input.text.active_xoffset",         "0"                     },
+  { "setup.input.text.border_size",            "0"                     },
+
   { "global.border",                           "RocksScreen.png"       },
   { "global.border.MAIN",                      UNDEFINED_FILENAME      },
   { "global.border.SCORES",                    UNDEFINED_FILENAME      },

diff --git a/src/files.c b/src/files.c
index a7a8420a94889760fb4e54e67aa171868d6a148f..9e4db60cde8fabb739f415d60c304bc1b9f14923 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -8374,6 +8374,7 @@ enum
   SETUP_TOKEN_VOLUME_MUSIC,
   SETUP_TOKEN_NETWORK_MODE,
   SETUP_TOKEN_NETWORK_PLAYER_NR,
+  SETUP_TOKEN_NETWORK_SERVER_HOSTNAME,
   SETUP_TOKEN_TOUCH_CONTROL_TYPE,
   SETUP_TOKEN_TOUCH_MOVE_DISTANCE,
   SETUP_TOKEN_TOUCH_DROP_DISTANCE,
@@ -8616,6 +8617,7 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_INTEGER,&si.volume_music,            "volume_music"           },
   { TYPE_SWITCH, &si.network_mode,            "network_mode"           },
   { TYPE_PLAYER, &si.network_player_nr,       "network_player"         },
+  { TYPE_STRING, &si.network_server_hostname, "network_server_hostname"        },
   { TYPE_STRING, &si.touch.control_type,      "touch.control_type"     },
   { TYPE_INTEGER,&si.touch.move_distance,     "touch.move_distance"    },
   { TYPE_INTEGER,&si.touch.drop_distance,     "touch.drop_distance"    },
@@ -8841,6 +8843,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->network_mode = FALSE;
   si->network_player_nr = 0;           /* first player */
+  si->network_server_hostname = getStringCopy(STR_NETWORK_AUTO_DETECT);
 
   si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
   si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT;       /* percent */

diff --git a/src/init.c b/src/init.c
index 5fc105b6b563859e470c965f7d585aec23421a05..1e8d7e825db985c41cbb9526562890a5ef137f0e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5636,10 +5636,17 @@ static void InitArtworkDone(void)
 
 static void InitNetworkSettings(void)
 {
-  InitNetworkInfo(options.network || setup.network_mode,
+  boolean network_enabled = (options.network || setup.network_mode);
+  char *network_server = (options.server_host != NULL ? options.server_host :
+                         setup.network_server_hostname);
+
+  if (strEqual(network_server, STR_NETWORK_AUTO_DETECT))
+    network_server = NULL;
+
+  InitNetworkInfo(network_enabled,
                  FALSE,
                  options.serveronly,
-                 options.server_host,
+                 network_server,
                  options.server_port);
 }
 

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 278269ab354acced5172a2b88cd9d0686aa9b02c..fdda5d5c603770fc62fcd7f884c972c110e11e9f 100644 (file)
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -38,18 +38,19 @@
 #define TYPE_LEAVE_MENU                        (1 << 16)
 #define TYPE_ENTER_LIST                        (1 << 17)
 #define TYPE_LEAVE_LIST                        (1 << 18)
-#define TYPE_EMPTY                     (1 << 19)
-#define TYPE_SKIPPABLE                 (1 << 20)
-#define TYPE_KEYTEXT                   (1 << 21)
+#define TYPE_TEXT_INPUT                        (1 << 19)
+#define TYPE_EMPTY                     (1 << 20)
+#define TYPE_SKIPPABLE                 (1 << 21)
+#define TYPE_KEYTEXT                   (1 << 22)
 
-#define TYPE_GHOSTED                   (1 << 22)
-#define TYPE_QUERY                     (1 << 23)
+#define TYPE_GHOSTED                   (1 << 23)
+#define TYPE_QUERY                     (1 << 24)
 
 /* additional values for internal purposes */
-#define TYPE_BITFIELD                  (1 << 24)
-#define TYPE_CONTENT                   (1 << 25)
-#define TYPE_ELEMENT_LIST              (1 << 26)
-#define TYPE_CONTENT_LIST              (1 << 27)
+#define TYPE_BITFIELD                  (1 << 25)
+#define TYPE_CONTENT                   (1 << 26)
+#define TYPE_ELEMENT_LIST              (1 << 27)
+#define TYPE_CONTENT_LIST              (1 << 28)
 
 /* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE             (TYPE_BOOLEAN | \

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 464cb761ca340f53b76663526b644f19cda65092..ae23c9240cddb235b0cc4333cfa9d97fb3bcb18c 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -95,6 +95,10 @@
 
 #define VSYNC_MODE_DEFAULT             VSYNC_MODE_OFF
 
+/* values for network server settings */
+#define STR_NETWORK_AUTO_DETECT                "auto_detect_network_server"
+#define STR_NETWORK_AUTO_DETECT_SETUP  "(auto detect network server)"
+
 /* values for touch control */
 #define TOUCH_CONTROL_OFF              "off"
 #define TOUCH_CONTROL_VIRTUAL_BUTTONS  "virtual_buttons"
@@ -1303,6 +1307,7 @@ struct SetupInfo
 
   boolean network_mode;
   int network_player_nr;
+  char *network_server_hostname;
 
   struct SetupAutoSetupInfo auto_setup;
   struct SetupEditorInfo editor;

diff --git a/src/screens.c b/src/screens.c
index b339ced690cbe546f406d7702b9800bf8c462978..7771f24ed7fd853ffef061927a2a04f1c01b76ad 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -130,6 +130,8 @@
 #define MENU_SETUP_FONT_TITLE          FONT_TEXT_1
 #define MENU_SETUP_FONT_TEXT           FONT_TITLE_2
 
+#define MAX_SETUP_TEXT_INPUT_LEN       28
+
 /* for various menu stuff  */
 #define MENU_SCREEN_START_XPOS         1
 #define MENU_SCREEN_START_YPOS         2
@@ -169,7 +171,7 @@
 #define MAX_MENU_TEXT_LENGTH_BIG       13
 #define MAX_MENU_TEXT_LENGTH_MEDIUM    (MAX_MENU_TEXT_LENGTH_BIG * 2)
 
-/* buttons and scrollbars identifiers */
+/* screen gadget identifiers */
 #define SCREEN_CTRL_ID_PREV_LEVEL      0
 #define SCREEN_CTRL_ID_NEXT_LEVEL      1
 #define SCREEN_CTRL_ID_PREV_PLAYER     2
@@ -179,12 +181,14 @@
 #define SCREEN_CTRL_ID_SCROLL_UP       6
 #define SCREEN_CTRL_ID_SCROLL_DOWN     7
 #define SCREEN_CTRL_ID_SCROLL_VERTICAL 8
+#define SCREEN_CTRL_ID_NETWORK_SERVER  9
 
-#define NUM_SCREEN_GADGETS             9
+#define NUM_SCREEN_GADGETS             10
 
 #define NUM_SCREEN_MENUBUTTONS         6
 #define NUM_SCREEN_SCROLLBUTTONS       2
 #define NUM_SCREEN_SCROLLBARS          1
+#define NUM_SCREEN_TEXTINPUT           1
 
 #define SCREEN_MASK_MAIN               (1 << 0)
 #define SCREEN_MASK_MAIN_HAS_SOLUTION  (1 << 1)
@@ -670,6 +674,8 @@ static char str_main_text_first_level[10];
 static char str_main_text_last_level[10];
 static char str_main_text_level_number[10];
 
+static char network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN + 1];
+
 static char *main_text_name                    = str_main_text_name;
 static char *main_text_first_level             = str_main_text_first_level;
 static char *main_text_last_level              = str_main_text_last_level;
@@ -2236,7 +2242,8 @@ static int getMenuTextFont(int type)
              TYPE_PLAYER       |
              TYPE_ECS_AGA      |
              TYPE_KEYTEXT      |
-             TYPE_ENTER_LIST))
+             TYPE_ENTER_LIST   |
+             TYPE_TEXT_INPUT))
     return FONT_MENU_2;
   else
     return FONT_MENU_1;
@@ -2283,6 +2290,7 @@ static void DrawCursorAndText_Setup(int screen_pos, int menu_info_pos_raw,
 
 static char *window_size_text;
 static char *scaling_type_text;
+static char *network_server_text;
 
 static void drawSetupValue(int, int);
 
@@ -2320,6 +2328,25 @@ static void drawMenuInfoList(int first_entry, int num_page_entries,
 
     DrawCursorAndText_Menu(i, menu_info_pos, FALSE);
 
+    if (si->type & TYPE_STRING)
+    {
+      int gadget_id = -1;
+
+      if (value_ptr == &network_server_text)
+       gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER;
+
+      if (gadget_id != -1)
+      {
+       struct GadgetInfo *gi = screen_gadget[gadget_id];
+       int xpos = MENU_SCREEN_START_XPOS;
+       int ypos = MENU_SCREEN_START_YPOS + i;
+       int x = mSX + xpos * 32;
+       int y = mSY + ypos * 32;
+
+       ModifyGadget(gi, GDI_X, x, GDI_Y, y, GDI_END);
+      }
+    }
+
     if (si->type & TYPE_VALUE &&
        menu_info == setup_info)
       drawSetupValue(i, menu_info_pos);
@@ -2665,6 +2692,11 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
          menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST)
        y--;
 
+      /* when selecting string value, execute function for text input gadget */
+      if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 &&
+         menu_info[first_entry + y - 1].type & TYPE_TEXT_INPUT)
+       y--;
+
       if (menu_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE)
       {
        void (*menu_callback_function)(void) =
@@ -2674,6 +2706,13 @@ static void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
 
        menu_callback_function();
       }
+      else if (menu_info[first_entry + y].type & TYPE_TEXT_INPUT)
+      {
+       void (*gadget_callback_function)(void) =
+         menu_info[first_entry + y].value;
+
+       gadget_callback_function();
+      }
       else if (menu_info[first_entry + y].type & TYPE_VALUE &&
               menu_info == setup_info)
       {
@@ -4692,6 +4731,7 @@ static char *vsync_mode_text;
 static char *scroll_delay_text;
 static char *snapshot_mode_text;
 static char *game_speed_text;
+static char *network_server_text;
 static char *graphics_set_name;
 static char *sounds_set_name;
 static char *music_set_name;
@@ -4861,12 +4901,31 @@ static void execSetupGame_setSnapshotModes(void)
   snapshot_mode_text = snapshot_mode_current->name;
 }
 
+static void execSetupGame_setNetworkServerText(void)
+{
+  if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT))
+  {
+    strcpy(network_server_hostname, STR_NETWORK_AUTO_DETECT_SETUP);
+  }
+  else
+  {
+    strncpy(network_server_hostname, setup.network_server_hostname,
+           MAX_SETUP_TEXT_INPUT_LEN);
+    network_server_hostname[MAX_SETUP_TEXT_INPUT_LEN] = '\0';
+  }
+
+  /* needed for displaying network server text instead of identifier */
+  network_server_text = network_server_hostname;
+}
+
 static void execSetupGame(void)
 {
   execSetupGame_setGameSpeeds();
   execSetupGame_setScrollDelays();
   execSetupGame_setSnapshotModes();
 
+  execSetupGame_setNetworkServerText();
+
   setup_mode = SETUP_MODE_GAME;
 
   DrawSetupScreen();
@@ -5877,6 +5936,21 @@ static void execSaveAndExitSetup(void)
   execExitSetup();
 }
 
+static void execGadgetNetworkServer(void)
+{
+  int gadget_id = SCREEN_CTRL_ID_NETWORK_SERVER;
+  struct GadgetInfo *gi = screen_gadget[gadget_id];
+
+  if (strEqual(setup.network_server_hostname, STR_NETWORK_AUTO_DETECT))
+    network_server_hostname[0] = '\0';
+
+  ModifyGadget(gi, GDI_TEXT_VALUE, network_server_hostname, GDI_END);
+
+  MapGadget(gi);
+
+  ClickOnGadget(gi, MB_LEFTBUTTON);
+}
+
 static struct
 {
   void *value;
@@ -5980,6 +6054,8 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_SWITCH,       &setup.team_mode,       "Team-Mode (Multi-Player):" },
   { TYPE_SWITCH,       &setup.network_mode,    "Network Multi-Player Mode:" },
   { TYPE_PLAYER,       &setup.network_player_nr,"Preferred Network Player:" },
+  { TYPE_TEXT_INPUT,   execGadgetNetworkServer, "Network Server Hostname:" },
+  { TYPE_STRING,       &network_server_text,   ""                      },
   { TYPE_YES_NO,       &setup.input_on_focus,  "Only Move Focussed Player:" },
   { TYPE_SWITCH,       &setup.time_limit,      "Time Limit:"           },
   { TYPE_SWITCH,       &setup.handicap,        "Handicap:"             },
@@ -8188,6 +8264,26 @@ static struct
   }
 };
 
+static struct
+{
+  int graphic;
+  int gadget_id;
+  int x, y;
+  int size;
+  char *value;
+  char *infotext;
+} textinput_info[NUM_SCREEN_TEXTINPUT] =
+{
+  {
+    IMG_SETUP_INPUT_TEXT,
+    SCREEN_CTRL_ID_NETWORK_SERVER,
+    -1, -1,    /* these values are not constant, but can change at runtime */
+    MAX_SETUP_TEXT_INPUT_LEN,
+    network_server_hostname,
+    "Network Server Hostname / IP"
+  },
+};
+
 static void CreateScreenMenubuttons(void)
 {
   struct GadgetInfo *gi;
@@ -8402,12 +8498,60 @@ static void CreateScreenScrollbars(void)
   }
 }
 
+static void CreateScreenTextInputGadgets(void)
+{
+  int i;
+
+  for (i = 0; i < NUM_SCREEN_TEXTINPUT; i++)
+  {
+    int graphic = textinput_info[i].graphic;
+    struct GraphicInfo *gd = &graphic_info[graphic];
+    int gd_x1 = gd->src_x;
+    int gd_y1 = gd->src_y;
+    int gd_x2 = gd->src_x + gd->active_xoffset;
+    int gd_y2 = gd->src_y + gd->active_yoffset;
+    struct GadgetInfo *gi;
+    unsigned int event_mask;
+    int id = textinput_info[i].gadget_id;
+    int x = textinput_info[i].x;
+    int y = textinput_info[i].y;
+
+    event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_CUSTOM_TYPE_ID, i,
+                     GDI_INFO_TEXT, textinput_info[i].infotext,
+                     GDI_X, SX + x,
+                     GDI_Y, SY + y,
+                     GDI_TYPE, GD_TYPE_TEXT_INPUT_ALPHANUMERIC,
+                     GDI_TEXT_VALUE, textinput_info[i].value,
+                     GDI_TEXT_SIZE, textinput_info[i].size,
+                     GDI_TEXT_FONT, getSetupValueFont(TYPE_STRING, NULL),
+                     GDI_TEXT_FONT_ACTIVE, FONT_TEXT_1,
+                     GDI_DESIGN_UNPRESSED, gd->bitmap, gd_x1, gd_y1,
+                     GDI_DESIGN_PRESSED, gd->bitmap, gd_x2, gd_y2,
+                     GDI_BORDER_SIZE, gd->border_size, gd->border_size,
+                     GDI_DESIGN_WIDTH, gd->width,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleScreenGadgets,
+                     GDI_CALLBACK_ACTION_ALWAYS, TRUE,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    screen_gadget[id] = gi;
+  }
+}
+
 void CreateScreenGadgets(void)
 {
   CreateScreenMenubuttons();
 
   CreateScreenScrollbuttons();
   CreateScreenScrollbars();
+
+  CreateScreenTextInputGadgets();
 }
 
 void FreeScreenGadgets(void)
@@ -8540,6 +8684,31 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
        HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE);
       break;
 
+    case SCREEN_CTRL_ID_NETWORK_SERVER:
+    {
+      if (!strEqual(gi->textinput.value, ""))
+      {
+       setString(&setup.network_server_hostname, gi->textinput.value);
+
+       network.server_host = setup.network_server_hostname;
+      }
+      else
+      {
+       setString(&setup.network_server_hostname, STR_NETWORK_AUTO_DETECT);
+
+       network.server_host = NULL;
+      }
+
+      if (strEqual(network.server_host, STR_NETWORK_AUTO_DETECT))
+       network.server_host = NULL;
+
+      execSetupGame_setNetworkServerText();
+
+      DrawSetupScreen();
+
+      break;
+    }
+
     default:
       break;
   }