Hardcode the default window size on Emscripten

Also minor cleanups to the main function and related things...

Author: rollerozxa

src/main.cc

@@ -363,105 +363,105 @@ init_framebuffers(void)
 void
 tproject_set_args(int argc, char **argv)
 {
-    if (argc > 1) {
-
-        char *s = argv[1];
-        int n;
-
-        do {
-            if (strncmp(s, "principia://", 12) != 0)
-                break;
+    if (argc <= 1)
+        return;
 
-            s+=12;
+    char *s = argv[1];
+    int n;
 
-            /* extract the host */
-            _community_host[0] = '\0';
-            for (n=0; n<511; n++) {
-                if (*(s+n) == '/' || *(s+n) == '\0') {
-                    break;
-                }
-            }
+    do {
+        if (strncmp(s, "principia://", 12) != 0)
+            break;
 
-            strncpy(_community_host, s, n);
-            _community_host[n] = '\0';
-            s += n;
+        s+=12;
 
-            if (*s == '\0') {
+        /* extract the host */
+        _community_host[0] = '\0';
+        for (n=0; n<511; n++) {
+            if (*(s+n) == '/' || *(s+n) == '\0') {
                 break;
             }
+        }
 
-            s ++;
+        strncpy(_community_host, s, n);
+        _community_host[n] = '\0';
+        s += n;
 
-            /* backwards compatibility, if the "host" equals any of the reserved words below we default to the
-             * currently signed-in community host instead and backset the pointer */
-            if (strcmp(_community_host, "play") == 0 ||
-                strcmp(_community_host, "sandbox") == 0 ||
-                strcmp(_community_host, "edit") == 0) {
-                s -= strlen(_community_host) + 1;
-                _community_host[0] = '\0';
-            }
+        if (*s == '\0') {
+            break;
+        }
 
-            if (strncmp(s, "play/", 5) == 0) {
-                s+=5;
+        s ++;
 
-                int action = ACTION_IGNORE;
+        /* backwards compatibility, if the "host" equals any of the reserved words below we default to the
+            * currently signed-in community host instead and backset the pointer */
+        if (strcmp(_community_host, "play") == 0 ||
+            strcmp(_community_host, "sandbox") == 0 ||
+            strcmp(_community_host, "edit") == 0) {
+            s -= strlen(_community_host) + 1;
+            _community_host[0] = '\0';
+        }
 
-                if (strncmp(s, "lvl/", 4) == 0)
-                    action = ACTION_OPEN_PLAY;
-                else if (strncmp(s, "pkg/", 4) == 0)
-                    action = ACTION_PLAY_PKG;
+        if (strncmp(s, "play/", 5) == 0) {
+            s+=5;
 
-                s+=4;
+            int action = ACTION_IGNORE;
 
-                if (strncmp(s, "local/", 6) == 0) {
-                    s+=6;
-                    _play_type = LEVEL_LOCAL;
-                } else if (strncmp(s, "db/", 3) == 0) {
-                    s+=3;
-                    _play_type = LEVEL_DB;
-                } else if (strncmp(s, "main/", 5) == 0) {
-                    s+=5;
-                    _play_type = LEVEL_MAIN;
-                } else {
-                    break;
-                }
+            if (strncmp(s, "lvl/", 4) == 0)
+                action = ACTION_OPEN_PLAY;
+            else if (strncmp(s, "pkg/", 4) == 0)
+                action = ACTION_PLAY_PKG;
 
-                _play_id = atoi(s);
-                P.add_action(action, 0);
-            } else if (strncmp(s, "sandbox/", 8) == 0) {
-                s+=8;
-
-                int action = ACTION_IGNORE;
-
-                if (strncmp(s, "local/", 6) == 0) {
-                    s+=6;
-                    _play_type = LEVEL_LOCAL;
-                    action = ACTION_OPEN;
-                } else if (strncmp(s, "db/", 3) == 0) {
-                    s+=3;
-                    _play_type = LEVEL_DB;
-                    action = ACTION_DERIVE;
-                }
+            s+=4;
 
-                _play_id = atoi(s);
-                P.add_action(action, _play_id);
-            } else if (strncmp(s, "edit/", 5) == 0) {
+            if (strncmp(s, "local/", 6) == 0) {
+                s+=6;
+                _play_type = LEVEL_LOCAL;
+            } else if (strncmp(s, "db/", 3) == 0) {
+                s+=3;
+                _play_type = LEVEL_DB;
+            } else if (strncmp(s, "main/", 5) == 0) {
                 s+=5;
+                _play_type = LEVEL_MAIN;
+            } else {
+                break;
+            }
+
+            _play_id = atoi(s);
+            P.add_action(action, 0);
+        } else if (strncmp(s, "sandbox/", 8) == 0) {
+            s+=8;
+
+            int action = ACTION_IGNORE;
+
+            if (strncmp(s, "local/", 6) == 0) {
+                s+=6;
+                _play_type = LEVEL_LOCAL;
+                action = ACTION_OPEN;
+            } else if (strncmp(s, "db/", 3) == 0) {
+                s+=3;
+                _play_type = LEVEL_DB;
+                action = ACTION_DERIVE;
+            }
 
-                int action = ACTION_IGNORE;
+            _play_id = atoi(s);
+            P.add_action(action, _play_id);
+        } else if (strncmp(s, "edit/", 5) == 0) {
+            s+=5;
 
-                if (strncmp(s, "db/", 3) == 0) {
-                    s+=3;
-                    _play_type = LEVEL_DB;
-                    action = ACTION_EDIT;
-                }
+            int action = ACTION_IGNORE;
 
-                _play_id = atoi(s);
-                P.add_action(action, _play_id);
+            if (strncmp(s, "db/", 3) == 0) {
+                s+=3;
+                _play_type = LEVEL_DB;
+                action = ACTION_EDIT;
             }
 
-        } while (0);
-    }
+            _play_id = atoi(s);
+            P.add_action(action, _play_id);
+        }
+
+    } while (0);
 }
 
 void

src/tms/backend/main.cc

@@ -27,7 +27,7 @@
     #include <pwd.h>
 #endif
 
-#ifdef __EMSCRIPTEN__
+#ifdef TMS_BACKEND_EMSCRIPTEN
     #include <emscripten.h>
 #endif
 
@@ -66,6 +66,21 @@ to reproduce it, if possible.
     exit(1);
 }
 
+void redirect_log_output() {
+#if !defined(DEBUG) && !defined(TMS_BACKEND_EMSCRIPTEN)
+    char logfile[1024];
+    snprintf(logfile, 1023, "%s/run.log", tms_storage_path());
+
+    tms_infof("Redirecting log output to %s", logfile);
+    FILE *log = fopen(logfile, "w+");
+    if (log) {
+        _f_out = log;
+    } else {
+        tms_errorf("Could not open log file for writing! Nevermind.");
+    }
+#endif
+}
+
 void print_log_header() {
     tms_printf( \
         "            _            _       _       \n"
@@ -77,11 +92,35 @@ void print_log_header() {
         "Version %s, commit %s\n", principia_version_string(), principia_version_hash());
 }
 
+static void find_data_dir() {
+#ifndef TMS_BACKEND_ANDROID
+    // Check if we're in the right place
+    struct stat st{};
+    if (stat("data", &st) != 0) {
+        // We're in the build dir, go up
+        tms_infof("chdirring to ../");
+        chdir("../");
+
+        // How about now?
+        if (stat("data", &st) != 0) {
+            // If that doesn't work we're assuming a system install.
+            tms_infof("chdirring to ./share/principia/");
+            chdir("./share/principia/");
+
+            if (stat("data", &st) != 0) {
+                // We're doomed, better just fail.
+                tms_fatalf("Could not find data directories.");
+            }
+        }
+    }
+#endif
+}
+
 int main(int argc, char **argv)
 {
     int done = 0;
 
-#ifndef __ANDROID__
+#ifndef TMS_BACKEND_ANDROID
     signal(SIGSEGV, _catch_signal);
 
 #ifdef TMS_BACKEND_WINDOWS
@@ -93,6 +132,7 @@ int main(int argc, char **argv)
     char* exedir = SDL_GetBasePath();
     tms_infof("chdirring to %s", exedir);
     chdir(exedir);
+#endif
 
     // Switch to portable if ./portable.txt exists next to binary
     if (access("portable.txt", F_OK) == 0) {
@@ -102,44 +142,15 @@ int main(int argc, char **argv)
 
     tms_storage_create_dirs();
 
-#if defined(SDL_HINT_APP_NAME)
+#ifdef SDL_HINT_APP_NAME
     SDL_SetHint(SDL_HINT_APP_NAME, "Principia");
 #endif
 
-#if !defined(DEBUG) && !defined(__EMSCRIPTEN__)
-    char logfile[1024];
-    snprintf(logfile, 1023, "%s/run.log", tms_storage_path());
-
-    tms_infof("Redirecting log output to %s", logfile);
-    FILE *log = fopen(logfile, "w+");
-    if (log) {
-        _f_out = log;
-    } else {
-        tms_errorf("Could not open log file for writing! Nevermind.");
-    }
-#endif
+    redirect_log_output();
 
     print_log_header();
 
-    // Check if we're in the right place
-    struct stat st{};
-    if (stat("data", &st) != 0) {
-        // We're in the build dir, go up
-        tms_infof("chdirring to ../");
-        chdir("../");
-
-        // How about now?
-        if (stat("data", &st) != 0) {
-            // If that doesn't work we're assuming a system install.
-            tms_infof("chdirring to ./share/principia/");
-            chdir("./share/principia/");
-
-            if (stat("data", &st) != 0) {
-                // We're doomed, better just fail.
-                tms_fatalf("Could not find data directories.");
-            }
-        }
-    }
+    find_data_dir();
 
     SDL_version compiled;
     SDL_VERSION(&compiled);
@@ -153,9 +164,14 @@ int main(int argc, char **argv)
 
     tms_infof("Initializing SDL...");
     SDL_Init(SDL_INIT_VIDEO);
+
+#ifdef TMS_BACKEND_EMSCRIPTEN
+    _tms.window_width = 1280;
+    _tms.window_height = 720;
+
+#elif !defined(TMS_BACKEND_ANDROID)
     SDL_DisplayMode mode;
     SDL_GetCurrentDisplayMode(0, &mode);
-
     _tms.window_width = 1280;
 
     if (mode.w <= 1280)
@@ -166,22 +182,16 @@ int main(int argc, char **argv)
     _tms.window_height = (int)((double)_tms.window_width * .5625);
 
     tms_infof("set initial res to %dx%d", _tms.window_width, _tms.window_height);
+#endif
 
     tproject_set_args(argc, argv);
 
-#else // ANDROID
-
-    tms_storage_create_dirs();
-    SDL_Init(SDL_INIT_VIDEO);
-
-#endif
-
     tms_init();
 
     if (_tms.screen == 0)
         tms_fatalf("Context has no initial screen!");
 
-#ifdef __EMSCRIPTEN__
+#ifdef TMS_BACKEND_EMSCRIPTEN
     emscripten_set_main_loop(mainloop, 0, 1);
 #else
     do {
@@ -292,17 +302,17 @@ static void mainloop()
 int
 tbackend_init_surface()
 {
-#ifndef __ANDROID__
+    uint32_t flags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN;
+
+#ifdef TMS_BACKEND_ANDROID
+    flags |= SDL_WINDOW_FULLSCREEN;
+#else
     _tms.window_width = settings["window_width"]->v.i;
     _tms.window_height = settings["window_height"]->v.i;
 
     _tms.xppcm = 108.f/2.54f * 1.5f;
     _tms.yppcm = 107.f/2.54f * 1.5f;
-#endif
 
-    uint32_t flags = SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN;
-
-#ifndef __ANDROID__
     if (settings["window_maximized"]->v.b)
         flags |= SDL_WINDOW_MAXIMIZED;
 
@@ -311,8 +321,6 @@ tbackend_init_surface()
 
     if (settings["window_resizable"]->v.b)
         flags |= SDL_WINDOW_RESIZABLE;
-#else
-    flags |= SDL_WINDOW_FULLSCREEN;
 #endif
 
     tms_infof("Creating window...");
@@ -326,10 +334,9 @@ tbackend_init_surface()
 
     _tms._window = _window;
 
-#ifdef __ANDROID__
+#ifdef TMS_BACKEND_ANDROID
     SDL_GL_GetDrawableSize(_window, &_tms.window_width, &_tms.window_height);
 
-    _tms._window = _window;
     float density_x, density_y;
     SDL_GetDisplayDPI(0, NULL, &density_x, &density_y);
     _tms.xppcm = density_x / 2.54f;