Updated to last commit & fixed dbclick window close behavior

Author: Farmer-Markus

CMakeLists.txt

@@ -241,6 +241,9 @@ include(RttrCoverageCfg)
 include(EnableSanitizers)
 
 option(RTTR_USE_SYSTEM_LIBS "Default to using system-wide installed libs for external dependencies that have known system versions." OFF)
+
+# Eg. Only libraries are able to run on android. The java native interface(jni) will call the SDL_main() function which calls main() in libs25client.so
+# https://developer.android.com/studio/projects/add-native-code
 option(RTTR_BUILD_LIB "Executables will be build as shared library." OFF)
 
 ################################################################################

external/glad/openglCfg.hpp.cmake

@@ -8,12 +8,14 @@
 // The OpenGL(ES) major and minor version to be used
 #define RTTR_OGL_MAJOR @RTTR_OGL_MAJOR@
 #define RTTR_OGL_MINOR @RTTR_OGL_MINOR@
-// True(thy) if OpenGL ES should be used
-#define RTTR_OGL_ES @RTTR_OGL_ES@
-// True(thy) if OpenGL compatibility profile should be used
-#define RTTR_OGL_COMPAT @RTTR_OGL_COMPAT@
-// True(thy) if gl4es should be used
-#define RTTR_OGL_GL4ES @RTTR_OGL_GL4ES@
 
+// 1 if OpenGL ES should be used
+#cmakedefine01 RTTR_OGL_ES
+
+// 1 if OpenGL compatibility profile should be used
+#cmakedefine01 RTTR_OGL_COMPAT
+
+// 1 if gl4es should be used
+#cmakedefine01 RTTR_OGL_GL4ES
 
 #endif

extras/videoDrivers/CMakeLists.txt

@@ -6,4 +6,4 @@ rttr_set_output_dir(RUNTIME ${RTTR_DRIVERDIR}/video)
 rttr_set_output_dir(LIBRARY ${RTTR_DRIVERDIR}/video)
 
 add_subdirectory(WinAPI)
-add_subdirectory(SDL2)
+add_subdirectory(SDL2)

extras/videoDrivers/SDL2/CMakeLists.txt

@@ -39,4 +39,4 @@ if(SDL2_FOUND)
       LIBRARY DESTINATION ${RTTR_DRIVERDIR}/video
     )
     add_dependencies(drivers videoSDL2)
-endif()
+endif()

extras/videoDrivers/SDL2/VideoSDL2.cpp

@@ -15,6 +15,7 @@
 #include <boost/nowide/iostream.hpp>
 #include <SDL.h>
 #include <SDL_hints.h>
+#include <SDL_video.h>
 #include <algorithm>
 #include <memory>
 
@@ -47,14 +48,6 @@ struct SDLMemoryDeleter
     void operator()(T* p) const { SDL_free(p); }
 };
 
-#if RTTR_OGL_ES || RTTR_OGL_GL4ES
-constexpr SDL_GLprofile RTTR_SDL_GL_PROFILE = SDL_GL_CONTEXT_PROFILE_ES;
-#elif RTTR_OGL_COMPAT
-constexpr SDL_GLprofile RTTR_SDL_GL_PROFILE = SDL_GL_CONTEXT_PROFILE_COMPATIBILITY;
-#else
-constexpr SDL_GLprofile RTTR_SDL_GL_PROFILE = SDL_GL_CONTEXT_PROFILE_CORE;
-#endif
-
 template<typename T>
 using SDL_memory = std::unique_ptr<T, SDLMemoryDeleter<T>>;
 
@@ -147,7 +140,15 @@ bool VideoSDL2::CreateScreen(const std::string& title, const VideoMode& size, bo
     // GL-Attributes
     CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, RTTR_OGL_MAJOR));
     CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, RTTR_OGL_MINOR));
-    CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, RTTR_SDL_GL_PROFILE));
+    SDL_GLprofile profile;
+    if(RTTR_OGL_ES || RTTR_OGL_GL4ES)
+        profile = SDL_GL_CONTEXT_PROFILE_ES;
+    else if(RTTR_OGL_COMPAT)
+        profile = SDL_GL_CONTEXT_PROFILE_COMPATIBILITY;
+    else
+        profile = SDL_GL_CONTEXT_PROFILE_CORE;
+
+    CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profile));
 
     CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8));
     CHECK_SDL(SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8));

libs/driver/include/driver/MouseCoords.h

@@ -27,4 +27,4 @@ constexpr unsigned DOUBLE_CLICK_INTERVAL = 500;
 constexpr unsigned TOUCH_MAX_CLICK_INTERVAL = 250;
 constexpr unsigned TOUCH_DOUBLE_CLICK_INTERVAL = 175;
 // Max distance between the two clicks to trigger doubleclick
-constexpr unsigned TOUCH_MAX_DOUBLE_CLICK_DISTANCE = 30;
+constexpr unsigned TOUCH_MAX_DOUBLE_CLICK_DISTANCE = 30;

libs/rttrConfig/src/RttrConfig.cpp

@@ -144,11 +144,8 @@ bool RttrConfig::Init()
 bfs::path RttrConfig::getEnvOverride(const std::string& id, const bfs::path& defaultPath)
 {
     bfs::path path = System::getPathFromEnvVar("RTTR_" + id + "_DIR");
-    if(!path.empty())
-    {
-        LOG.write("Note: %1% path manually set to %2%\n", LogTarget::Stdout) % id % path;
-    } else
+    if(path.empty())
         return defaultPath;
-
+    LOG.write("Note: %1% path manually set to %2%\n", LogTarget::Stdout) % id % path;
     return path;
 }

libs/s25main/ingameWindows/IngameWindow.cpp

@@ -212,8 +212,6 @@ bool IngameWindow::Msg_LeftDown(const MouseCoords& mc)
 
 bool IngameWindow::Msg_LeftUp(const MouseCoords& mc)
 {
-    // Was a button pressed
-    bool btnClicked = false;
     isMoving = false;
 
     for(const auto btn : helpers::enumRange<IwButton>())
@@ -230,7 +228,6 @@ bool IngameWindow::Msg_LeftUp(const MouseCoords& mc)
 
         if(IsPointInRect(mc.pos, GetButtonBounds(btn)))
         {
-            btnClicked = true;
             switch(btn)
             {
                 case IwButton::Close: Close(); return true;
@@ -257,9 +254,10 @@ bool IngameWindow::Msg_LeftUp(const MouseCoords& mc)
         }
     }
 
-    // On touch devices dblclick close window
-    if(VIDEODRIVER.IsTouch() && mc.dbl_click && !btnClicked && !IsPinned() && closeBehavior_ == CloseBehavior::Regular)
+    // On touch devices dblclick closes window
+    if(VIDEODRIVER.IsTouch() && mc.dbl_click && closeBehavior_ != CloseBehavior::Custom)
         Close();
+    return false;
 }
 
 bool IngameWindow::Msg_MouseMove(const MouseCoords& mc)