Add launcher dialog for win32 port

Author: fis

Makefile.win

@@ -1,46 +1,32 @@
-# mcmap/Makefile.win
+# mcmap/Makefile.win  -*- mode: makefile -*-
 
-sources := cmd.c console.c main.c map.c protocol.c world.c
+sources := cmd.c console.c main.c map.c protocol.c world.c win32.c
 
-objs := $(sources:.c=.o)
+objs := $(sources:.c=.o) win32-res.o
 deps := $(sources:.c=.d)
 
 CC := i586-mingw32msvc-gcc
+WINDRES := i586-mingw32msvc-windres
 
 CFLAGS := $(CFLAGS)
 CFLAGS += -Wall -Werror -std=gnu99
 CFLAGS += -Iwin/glib/include -Iwin/glib/include/glib-2.0 -Iwin/glib/lib/glib-2.0/include
 CFLAGS += -Iwin/SDL-1.2.14/include/SDL
-
-ifndef EXTCFLAGS
-	ifdef DEBUG
-		EXTCFLAGS := -g
-	else
-		EXTCFLAGS := -O3 -funroll-loops
-	endif
-endif
-
-CFLAGS += $(EXTCFLAGS)
+CFLAGS += -O2
 
 LDFLAGS := $(LDFLAGS)
 LDFLAGS += -Lwin/glib/lib -lglib-2.0 -lgobject-2.0 -lgthread-2.0 -lgio-2.0 -lz
 LDFLAGS += -Lwin/SDL-1.2.14/lib -lSDL
 
-.PHONY: all opt debug diet clean
+.PHONY: all clean
 
 all: mcmap.exe
 
 mcmap.exe: $(objs)
 	$(CC) -Wl,--subsystem,console -o $@ $^ $(LDFLAGS)
 
-opt: $(sources)
-	$(CC) -o mcmap $(CFLAGS) -combine -fwhole-program $(sources) $(LDFLAGS)
-
-debug:
-	@$(MAKE) --no-print-directory DEBUG=1
-
-diet:
-	@$(MAKE) --no-print-directory CC="diet -Os $(CC)" EXTCFLAGS=""
+win32-res.o: win32.rc win32-res.h
+	$(WINDRES) -O coff $< $@
 
 -include $(deps)
 

main.c

@@ -5,10 +5,6 @@
 
 #include <gio/gio.h>
 #include <SDL.h>
-#ifdef WIN32
-#undef main
-#include <windows.h>
-#endif
 
 #include "cmd.h"
 #include "common.h"
@@ -17,6 +13,12 @@
 #include "protocol.h"
 #include "world.h"
 
+#ifdef WIN32
+#undef main
+#include <windows.h>
+#include "win32.h"
+#endif
+
 /* default command-line options */
 
 struct options opt = {
@@ -157,6 +159,11 @@ int main(int argc, char **argv)
 
 	/* command line option grokking */
 
+#ifdef WIN32
+	if (argc <= 1)
+		win32_splash(&argc, &argv);
+#endif
+
 	static GOptionEntry gopt_entries[] = {
 		{ "nocolor", 'c', 0, G_OPTION_ARG_NONE, &opt.noansi, "Disable ANSI color escapes" },
 		{ "nomap", 'm', 0, G_OPTION_ARG_NONE, &opt.nomap, "Disable the map" },

win32-res.h

@@ -0,0 +1,7 @@
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#define IDD_SPLASH                              101
+#define IDC_SPLASH_SERVER                       1003
+#define IDC_SPLASH_SIZE                         1005

win32.c

@@ -0,0 +1,84 @@
+#include <windows.h>
+#include <glib.h>
+
+#include "win32.h"
+#include "win32-res.h"
+
+static int splash_argc = 0;
+static char** splash_argv = 0;
+
+static void splash_setargs(HWND hWnd)
+{
+	splash_argc = 4;
+	splash_argv = g_new0(char *, 5);
+
+	char buf_server[256] = {0}, buf_size[256] = {0};
+	GetWindowText(GetDlgItem(hWnd, IDC_SPLASH_SERVER), buf_server, sizeof buf_server);
+	GetWindowText(GetDlgItem(hWnd, IDC_SPLASH_SIZE), buf_size, sizeof buf_size);
+
+	splash_argv[0] = "mcmap";
+	splash_argv[1] = "-c";
+
+	if (strcmp(buf_size, "nomap") == 0)
+		splash_argv[2] = "-m";
+	else
+		splash_argv[2] = g_strdup_printf("--size=%s", buf_size);
+
+	splash_argv[3] = g_strdup(buf_server);
+	splash_argv[4] = 0;
+}
+
+static INT_PTR CALLBACK splash_proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	if (uMsg == WM_INITDIALOG)
+	{
+		/* initialize the server name control */
+
+		SetWindowText(GetDlgItem(hWnd, IDC_SPLASH_SERVER), "example.org");
+
+		/* initialize the screen size control */
+
+		HWND sc = GetDlgItem(hWnd, IDC_SPLASH_SIZE);
+		SendMessage(sc, CB_RESETCONTENT, 0, 0);
+		SendMessage(sc, CB_ADDSTRING, 0, (LPARAM)"nomap");
+		SendMessage(sc, CB_ADDSTRING, 0, (LPARAM)"512x512");
+		SendMessage(sc, CB_ADDSTRING, 0, (LPARAM)"resizable");
+		SetWindowText(sc, "nomap");
+
+		/* finish up */
+
+		SetFocus(GetDlgItem(hWnd, IDOK));
+
+		return FALSE;
+	}
+
+	if (uMsg == WM_COMMAND)
+	{
+		switch (LOWORD(wParam))
+		{
+		case IDOK:
+			splash_setargs(hWnd);
+			EndDialog(hWnd, 1);
+			break;
+
+		case IDCANCEL:
+			EndDialog(hWnd, 0);
+			break;
+		}
+
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+void win32_splash(int *argc, char ***argv)
+{
+	INT_PTR ret = DialogBox(NULL, MAKEINTRESOURCE(IDD_SPLASH), NULL, splash_proc);
+
+	if (ret <= 0)
+		exit(0);
+
+	*argc = splash_argc;
+	*argv = splash_argv;
+}

win32.h

@@ -0,0 +1,6 @@
+#ifndef MCMAP_WIN32_H
+#define MCMAP_WIN32_H 1
+
+void win32_splash(int *argc, char ***argv);
+
+#endif /* MCMAP_WIN32_H */

win32.rc

@@ -0,0 +1,19 @@
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include "win32-res.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_SPLASH DIALOG 0, 0, 286, 95
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP | WS_SYSMENU
+CAPTION "Mcmap Launcher"
+FONT 8, "Ms Shell Dlg"
+{
+    DEFPUSHBUTTON   "Start", IDOK, 5, 75, 75, 15
+    PUSHBUTTON      "Cancel", IDCANCEL, 85, 75, 75, 15
+    GROUPBOX        "Minecraft server:", IDC_STATIC, 5, 5, 275, 30
+    EDITTEXT        IDC_SPLASH_SERVER, 10, 15, 265, 15, ES_AUTOHSCROLL
+    GROUPBOX        "Mcmap graphics:", IDC_STATIC, 5, 40, 275, 30
+    LTEXT           "Screen size:", IDC_STATIC, 10, 50, 45, 10, SS_LEFT
+    COMBOBOX        IDC_SPLASH_SIZE, 60, 50, 215, 17, CBS_DROPDOWN | CBS_HASSTRINGS
+}