threaded mode fixes

Author: nesbox

src/studio/screens/mainmenu.c

@@ -90,14 +90,13 @@ bool studio_mainmenu_keyboard(StudioMainMenu* main)
 
 static s32 optionFullscreenGet(void* data)
 {
-    StudioMainMenu* main = data;
-    return tic_sys_fullscreen_get(studioUserdata(main->studio)) ? 1 : 0;
+    return tic_sys_fullscreen_get() ? 1 : 0;
 }
 
 static void optionFullscreenSet(void* data, s32 pos)
 {
     StudioMainMenu* main = data;
-    tic_sys_fullscreen_set(main->options->fullscreen = (pos == 1), studioUserdata(main->studio));
+    tic_sys_fullscreen_set(main->options->fullscreen = (pos == 1));
 }
 
 static const char OffValue[] =  "OFF";

src/studio/studio.c

@@ -1778,7 +1778,7 @@ static inline bool keyWasPressedOnce(Studio* studio, s32 key)
 
 static void gotoFullscreen(Studio* studio)
 {
-    tic_sys_fullscreen_set(studio->config->data.options.fullscreen = !tic_sys_fullscreen_get(studioUserdata(studio)), studio->userdata);
+    tic_sys_fullscreen_set(studio->config->data.options.fullscreen = !tic_sys_fullscreen_get());
 }
 
 static void switchCrtMonitor(Studio* studio)

src/studio/system.h

@@ -57,8 +57,8 @@ char*   tic_sys_clipboard_get();
 void    tic_sys_clipboard_free(char* text);
 u64     tic_sys_counter_get();
 u64     tic_sys_freq_get();
-bool    tic_sys_fullscreen_get(void *userdata);
-void    tic_sys_fullscreen_set(bool value, void *userdata);
+bool    tic_sys_fullscreen_get();
+void    tic_sys_fullscreen_set(bool value);
 void    tic_sys_title(const char* title);
 void    tic_sys_addfile(void(*callback)(void* userdata, const char* name, const u8* buffer, s32 size), void* userdata);
 void    tic_sys_getfile(const char* name, const void* buffer, s32 size);

src/system/baremetalpi/kernel.cpp

@@ -111,11 +111,11 @@ u64 tic_sys_freq_get()
     return HZ;
 }
 
-void tic_sys_fullscreen_set(bool value, void *userdata)
+void tic_sys_fullscreen_set(bool value)
 {
 }
 
-bool tic_sys_fullscreen_get(void *userdata)
+bool tic_sys_fullscreen_get()
 {
     return false;
 }

src/system/n3ds/main.c

@@ -191,11 +191,11 @@ u64 tic_sys_freq_get()
     return SYSCLOCK_ARM11;
 }
 
-void tic_sys_fullscreen_set(bool value, void *userdata)
+void tic_sys_fullscreen_set(bool value)
 {
 }
 
-bool tic_sys_fullscreen_get(void *userdata)
+bool tic_sys_fullscreen_get()
 {
     return false;
 }

src/system/sdl/main.c

@@ -1411,7 +1411,7 @@ u64 tic_sys_freq_get()
     return SDL_GetPerformanceFrequency();
 }
 
-bool tic_sys_fullscreen_get(void* userdata)
+bool tic_sys_fullscreen_get()
 {
 #if defined(CRT_SHADER_SUPPORT)
     if(!studio_config(platform.studio)->soft)
@@ -1426,7 +1426,7 @@ bool tic_sys_fullscreen_get(void* userdata)
     }
 }
 
-void tic_sys_fullscreen_set(bool value, void *userdata)
+void tic_sys_fullscreen_set(bool value)
 {
 #if defined(CRT_SHADER_SUPPORT)
     if(!studio_config(platform.studio)->soft)
@@ -2000,7 +2000,7 @@ static s32 start(s32 argc, char **argv, const char* folder)
 #endif
 
                 if(studio_config(platform.studio)->options.fullscreen)
-                    tic_sys_fullscreen_set(true, platform.studio);
+                    tic_sys_fullscreen_set(true);
             }
 
             SDL_PauseAudioDevice(platform.audio.device, 0);

src/system/sokol/main.c

@@ -83,9 +83,9 @@ typedef struct
 
     struct
     {
-        char title[TICNAME_MAX];
+        char data[TICNAME_MAX];
         bool async;
-    } window;
+    } title;
 
 } App;
 
@@ -148,24 +148,24 @@ u64 tic_sys_freq_get()
     return 1e9;
 }
 
-void tic_sys_fullscreen_set(bool value, void *userdata)
+void tic_sys_fullscreen_set(bool value)
 {
-    App *app = userdata;
+    App *app = sapp_userdata();
     app->fullscreen.async = true;
     app->fullscreen.set = !app->fullscreen.set;
 }
 
-bool tic_sys_fullscreen_get(void *userdata)
+bool tic_sys_fullscreen_get()
 {
-    App *app = userdata;
+    App *app = sapp_userdata();
     return app->fullscreen.set;
 }
 
 void tic_sys_title(const char* title)
 {
     App *app = sapp_userdata();
-    app->window.async = true;
-    strcpy(app->window.title, title);
+    app->title.async = true;
+    strcpy(app->title.data, title);
 }
 
 void tic_sys_addfile(void(*callback)(void* userdata, const char* name, const u8* buffer, s32 size), void* userdata)
@@ -576,22 +576,23 @@ static void drawImage(Rect r,sg_image image, sg_sampler sampler)
     sgl_disable_texture();
 }
 
-static void checkrate(App* app)
+static void threadedMode(App* app)
 {
-    if(app->threaded)
+    #if defined(__TIC_EMSCRIPTEN__)
+    emscripten_set_main_loop_timing(EM_TIMING_SETTIMEOUT, 1000 / TIC80_FRAMERATE);
+    #else
+    // use separate thread to call tick
+    if(!app->thread)
     {
-        #if defined(__TIC_EMSCRIPTEN__)
-        emscripten_set_main_loop_timing(EM_TIMING_SETTIMEOUT, 1000 / TIC80_FRAMERATE);
-        #else
-        // use separate thread to call tick
-        if(!app->thread)
-        {
-            mutex_init(&app->lock);
-            thread_create(&app->thread, loop, app);
-        }
-        #endif
+        mutex_init(&app->lock);
+        thread_create(&app->thread, loop, app);
     }
-    else
+    #endif
+}
+
+static void checkrate(App* app)
+{
+    if(!app->threaded)
     {
         float refresh_rate = 1.0f / sapp_frame_duration();
         float target = refresh_rate / (float)TIC80_FRAMERATE;
@@ -606,17 +607,9 @@ static void checkrate(App* app)
             app->divider = div;
     #endif
         }
-        else
-        {
-    #if defined(__TIC_EMSCRIPTEN__)
-            emscripten_set_main_loop_timing(EM_TIMING_SETTIMEOUT, 1000 / TIC80_FRAMERATE);
-    #else
-            // use separate thread to call tick
-            mutex_init(&app->lock);
-            thread_create(&app->thread, loop, app);
-    #endif
-        }
+        else threadedMode(app);
     }
+    else threadedMode(app);
 }
 
 static void frame(void *userdata)
@@ -966,10 +959,10 @@ static void event(const sapp_event* event, void *userdata)
 #endif
     }
 
-    if(app->window.async)
+    if(app->title.async)
     {
-        app->window.async = false;
-        sapp_set_window_title(app->window.title);
+        app->title.async = false;
+        sapp_set_window_title(app->title.data);
     }
 }