Merge branch 'master' into wip/landscape

CMakeLists.txt

@@ -309,7 +309,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}")
   if (USE_APPIMAGE)
     include (LinuxAppImageBuild)
     set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX})
-    APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF})
+    APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF} SIGN_APP)
   elseif (MINGW)
     set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}")
     set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}")

cmake/LinuxAppImageBuild.cmake

@@ -6,7 +6,7 @@ set (APPIMAGE_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/deploy/linux-appimage" CACH
 set (APPIMAGE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/package/linux-appimage" CACHE PATH "AppImage output directory")
 set (APPIMAGE_FOLLOW_STANDARD OFF CACHE BOOL "Whether generator should follow the spec")
 
-macro (APPIMAGE_PACKAGE TARGET APPIMAGE_TITLE APPIMAGE_DISPLAYNAME CONFIGDIR DATA LIBRARIES LIBRARY_FILES ICON_REF)
+macro (APPIMAGE_PACKAGE TARGET APPIMAGE_TITLE APPIMAGE_DISPLAYNAME CONFIGDIR DATA LIBRARIES LIBRARY_FILES ICON_REF SIGN_APP)
   string (TOLOWER "${APPIMAGE_TITLE}" APPIMAGE_INTERNALNAME)
   string (MAKE_C_IDENTIFIER "${APPIMAGE_INTERNALNAME}" APPIMAGE_INTERNALNAME)
 
@@ -133,11 +133,17 @@ macro (APPIMAGE_PACKAGE TARGET APPIMAGE_TITLE APPIMAGE_DISPLAYNAME CONFIGDIR DAT
     COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${TARGET}>" "${APPIMAGE_BINARY_DIR}"
   )
 
+  if (SIGN_APP)
+    set (APPIMGKITARGS "-s")
+  else ()
+    set (APPIMGKITARGS "")
+  endif ()
+
   # Do the actual packaging step with AppImageKit
   add_custom_command (
     TARGET ${TARGET}
     POST_BUILD
-    COMMAND "${APPIMAGE_ASSISTANT_PROGRAM}" -s "${APPIMAGE_INTERMEDIATE_DIR}" "${APPIMAGE_FINAL_NAME}"
+    COMMAND "${APPIMAGE_ASSISTANT_PROGRAM}" "${APPIMGKITARGS}" "${APPIMAGE_INTERMEDIATE_DIR}" "${APPIMAGE_FINAL_NAME}"
   )
 
   install (

resources/nsis/bootstrap.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-mv /C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in /C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in.orig
+CMAKE_VERSION=3.11
-mv /C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in /C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in.orig
+
-cp $(dirname $0)/NSIS.template.in /C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in
+mv /C/msys64/mingw64/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in /C/msys64/mingw64/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in.orig
-cp $(dirname $0)/NSIS.template.in /C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in
+mv /C/msys64/mingw32/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in /C/msys64/mingw32/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in.orig
+cp $(dirname $0)/NSIS.template.in /C/msys64/mingw64/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in
+cp $(dirname $0)/NSIS.template.in /C/msys64/mingw32/share/cmake-$CMAKE_VERSION/Modules/NSIS.template.in

src/blupi.cxx

@@ -385,6 +385,11 @@ HandleEvent (const SDL_Event & event)
     }
     break;
 
+  case SDL_RENDER_DEVICE_RESET:
+  case SDL_RENDER_TARGETS_RESET:
+    g_pPixmap->ReloadTargetTextures ();
+    break;
+
   case SDL_USEREVENT:
   {
     switch (event.user.code)

src/event.cxx

@@ -1727,7 +1727,10 @@ CEvent::SetFullScreen (bool bFullScreen)
 
   g_bFullScreen = bFullScreen;
 
-  int displayIndex = SDL_GetWindowDisplayIndex (g_window);
+  int displayIndex = 0;
+#ifndef _WIN32
+  displayIndex = SDL_GetWindowDisplayIndex (g_window);
+#endif /* _WIN32 */
 
   if (g_bFullScreen)
   {
@@ -1757,7 +1760,6 @@ CEvent::SetFullScreen (bool bFullScreen)
       SDL_WINDOWPOS_CENTERED_DISPLAY (displayIndex));
 
   m_pPixmap->LoadCursors (g_zoom);
-  m_pPixmap->ReloadTargetTextures ();
 
   /* Force this update before otherwise the coordinates retrieved with
    * the Warp SDL function are corresponding to the previous size.
@@ -1816,7 +1818,6 @@ CEvent::SetWindowSize (Uint8 prevScale, Uint8 newScale)
     SDL_WINDOWPOS_CENTERED_DISPLAY (displayIndex));
 
   m_pPixmap->LoadCursors (newScale);
-  m_pPixmap->ReloadTargetTextures ();
 
   /* Force this update before otherwise the coordinates retrieved with
    * the Warp SDL function are corresponding to the previous size.

src/pixmap.cxx

@@ -314,8 +314,9 @@ CPixmap::Cache (
       return false;
     }
 
-    SDL_SetTextureBlendMode (
+    if (channel != CHBACK)
-      m_SDLTextureInfo[channel].texture, SDL_BLENDMODE_BLEND);
+      SDL_SetTextureBlendMode (
+        m_SDLTextureInfo[channel].texture, SDL_BLENDMODE_BLEND);
   }
 
   SDL_SetRenderTarget (g_renderer, m_SDLTextureInfo[channel].texture);