Windows: Call the updater; added a missing resources

7 files changed, 32 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41c1b392..b0d8f70c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ option (ENABLE_RELATIVE_EMBED   "Resources should always be found via relative p
 option (ENABLE_RESIZE_DRAW      "Force window to redraw during resizing" ${DEFAULT_RESIZE_DRAW})
 option (ENABLE_WEBP             "Use libwebp to decode .webp images (via pkg-config)" ON)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
+option (ENABLE_WINSPARKLE       "Use WinSparkle for automatic updates" OFF)
 option (ENABLE_X11_SWRENDER     "Use software rendering (X11)" OFF)
 
 include (BuildType.cmake)
@@ -149,6 +150,8 @@ set (SOURCES
     src/stb_image.h
     src/stb_image_resize.h
     src/stb_truetype.h
+    src/updater.c
+    src/updater.h
     src/visited.c
     src/visited.h
     # Audio playback:
@@ -403,6 +406,10 @@ if (APPLE)
 endif ()
 if (MSYS)
     target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI
+    if (ENABLE_WINSPARKLE)
+        target_link_libraries (app PUBLIC winsparkle)
+        target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINSPARKLE=1)
+    endif ()
 endif ()
 if (UNIX)
     target_link_libraries (app PUBLIC m)
diff --git a/Depends.cmake b/Depends.cmake
index 3af9102d..3faeca75 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -146,6 +146,17 @@ else ()
     endif ()
 endif ()
 
+if (ENABLE_WINSPARKLE)
+    # We're assuming this is Windows.
+    add_library (winsparkle INTERFACE)
+    target_include_directories (winsparkle INTERFACE ${WINSPARKLE_DIR}/include)
+    target_link_libraries (winsparkle INTERFACE ${WINSPARKLE_DIR}/x64/Release/WinSparkle.dll)
+    install (
+        PROGRAMS ${WINSPARKLE_DIR}/x64/Release/WinSparkle.dll
+        DESTINATION .
+    )
+endif ()
+
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (SDL2 REQUIRED sdl2)
 pkg_check_modules (MPG123 IMPORTED_TARGET libmpg123)
diff --git a/src/app.c b/src/app.c
index 9e636651..78754d5d 100644
--- a/src/app.c
+++ b/src/app.c
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "ipc.h"
 #include "periodic.h"
 #include "sitespec.h"
+#include "updater.h"
 #include "ui/certimportwidget.h"
 #include "ui/color.h"
 #include "ui/command.h"
@@ -3121,6 +3122,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "updater.check")) {
+        checkNow_Updater();
+        return iTrue;
+    }
     else if (equal_Command(cmd, "fontpack.enable")) {
         const iString *packId = collect_String(suffix_Command(cmd, "id"));
         enablePack_Fonts(packId, arg_Command(cmd));
diff --git a/src/main.c b/src/main.c
index f7ac6522..6e5e99e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "app.h"
+#include "updater.h"
 
 #if defined (iPlatformAppleDesktop)
 #  include "macos.h"
@@ -82,11 +83,13 @@ int main(int argc, char **argv) {
     if (SDL_Init(SDL_INIT_AUDIO)) {
         fprintf(stderr, "[SDL] audio init failed: %s\n", SDL_GetError());
     }
+    init_Updater();
     run_App(argc, argv);
     SDL_Quit();
 #if defined (LAGRANGE_ENABLE_MPG123)
     mpg123_exit();
 #endif
+    deinit_Updater();
     deinit_Foundation();
     return 0;
 }
diff --git a/src/resources.c b/src/resources.c
index 4cf9b85c..4138c035 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -54,6 +54,7 @@ iBlock blobUk_Resources;
 iBlock blobZh_Hans_Resources;
 iBlock blobZh_Hant_Resources;
 iBlock imageShadow_Resources;
+iBlock imageLagrange64_Resources;
 
 static struct {
     iBlock *data;
@@ -86,6 +87,7 @@ static struct {
     { &blobZh_Hans_Resources, "lang/zh_Hans.bin" },
     { &blobZh_Hant_Resources, "lang/zh_Hant.bin" },
     { &imageShadow_Resources, "shadow.png" },
+    { &imageLagrange64_Resources, "lagrange-64.png" },
 };
 
 iBool init_Resources(const char *path) {
diff --git a/src/resources.h b/src/resources.h
index c3ee1b53..6133a1eb 100644
--- a/src/resources.h
+++ b/src/resources.h
@@ -59,3 +59,4 @@ extern iBlock blobZh_Hans_Resources;
 extern iBlock blobZh_Hant_Resources;
 extern iBlock imageShadow_Resources;
 extern iBlock fontpackDefault_Resources;
+extern iBlock imageLagrange64_Resources;
diff --git a/src/ui/root.c b/src/ui/root.c
index f66e0f29..114ab040 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -78,6 +78,9 @@ static const iMenuItem navMenuItems_[] = {
     { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "${menu.help}", SDLK_F1, 0, "!open url:about:help" },
     { "${menu.releasenotes}", 0, 0, "!open url:about:version" },
+ #if defined (LAGRANGE_ENABLE_WINSPARKLE)
+    { "${menu.update}", 0, 0, "updater.check" },
+ #endif
     { "---" },
     { "${menu.quit}", 'q', KMOD_PRIMARY, "quit" }
 };