Various fixes

Author: complexlogic

src/CMakeLists.txt

@@ -1,11 +1,23 @@
 #Build main launcher executable file
+set(SOURCES 
+  launcher.c
+  launcher.h
+  util.c
+  util.h
+  image.c
+  image.h
+  debug.c
+  debug.h
+  clock.c
+  clock.h
+)
 if (UNIX)
-  add_executable(${EXECUTABLE_TITLE} "launcher.c" "util.c" "image.c" "debug.c" "clock.c")
+  add_executable(${EXECUTABLE_TITLE} ${SOURCES})
 endif ()
 if (WIN32)
   set(APP_ICON_RESOURCE_WINDOWS "${PROJECT_SOURCE_DIR}/config/${EXECUTABLE_TITLE}.rc")
   set(MANIFEST_FILE "${PROJECT_BINARY_DIR}/${EXECUTABLE_TITLE}.manifest")
-  add_executable(${EXECUTABLE_TITLE} WIN32 "launcher.c" "util.c" "image.c" "debug.c" "clock.c" ${MANIFEST_FILE} ${APP_ICON_RESOURCE_WINDOWS})
+  add_executable(${EXECUTABLE_TITLE} WIN32 ${SOURCES} ${MANIFEST_FILE} ${APP_ICON_RESOURCE_WINDOWS})
   set_property(TARGET ${EXECUTABLE_TITLE} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_BINARY_DIR}")
 endif()
 

src/launcher.c

@@ -806,6 +806,8 @@ static void draw_screen()
         if (state.screensaver_active)
             SDL_RenderCopy(renderer, screensaver->texture, NULL, NULL);
     }
+    else
+        SDL_RenderFillRect(renderer, NULL);
 
     // Output to screen
     SDL_RenderPresent(renderer);
@@ -1243,6 +1245,7 @@ int main(int argc, char *argv[])
     // Initialize timing
     ticks.main = SDL_GetTicks();
     ticks.last_input = ticks.main;
+    ticks.program_start = ticks.main;
 
     // Load gamepad overrides
     if (config.gamepad_enabled && config.gamepad_mappings_file != NULL) {
@@ -1397,7 +1400,10 @@ int main(int argc, char *argv[])
                             pre_launch();
                         }
 #ifdef _WIN32
-                        else // Sometimes the launcher loses focus when autostarting on Windows
+                        // Sometimes the launcher will lose focus on Windows when autostarting
+                        // So if we lose the window focus within 10 seconds of the launcher starting
+                        // we will grab back th Window focus. This is a bit of a hack
+                        else if (ticks.main - ticks.program_start < 10000)
                             set_foreground_window();
 #endif
                     }

src/launcher.h

@@ -127,6 +127,7 @@ typedef struct {
 // Timing information
 typedef struct {
     Uint32 main;
+    Uint32 program_start;
     Uint32 application_launched;
     Uint32 slideshow_load;
     Uint32 last_input;

src/platform/CMakeLists.txt

@@ -1,9 +1,12 @@
 # Build platform-specific library
 if (UNIX)
-  add_library(platform "unix.c")
+  add_library(platform unix.c unix.h platform.h)
   target_link_libraries(platform PkgConfig::SDL2)
 endif ()
 if (WIN32)
-  add_library(platform "win32.c")
-  target_link_libraries(platform SDL2::SDL2main)
+  add_library(platform win32.c platform.h)
+  target_link_libraries(platform
+    $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
+    $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
+  )
 endif ()