Ticket #2041: 0001-First-pass-at-SDL2-support.patch

build/premake/extern_libs4.lua

@@ -535 +535 @@
     sdl = {
         compile_settings = function()
             if os.is("windows") then
-                includedirs { libraries_dir .. "sdl/include/SDL" }
+                includedirs { libraries_dir .. "sdl/include/SDL2" }
             elseif not _OPTIONS["android"] then
                 -- Support SDL_CONFIG for overriding for the default PATH-based sdl-config
                 sdl_config_path = os.getenv("SDL_CONFIG")
                 if not sdl_config_path then
-                    sdl_config_path = "sdl-config"
+                    sdl_config_path = "sdl2-config"
                 end
 
                 -- "pkg-config sdl --libs" appears to include both static and dynamic libs
@@ -554 +554 @@
             elseif not _OPTIONS["android"] then
                 sdl_config_path = os.getenv("SDL_CONFIG")
                 if not sdl_config_path then
-                    sdl_config_path = "sdl-config"
+                    sdl_config_path = "sdl2-config"
                 end
                 pkgconfig_libs(nil, sdl_config_path.." --libs")
             end

build/workspaces/update-workspaces.sh

@@ -67 +67 @@
 if [ "`uname -s`" = "Darwin" ]; then
   # Set *_CONFIG variables on OS X, to override the path to e.g. sdl-config
   export GLOOX_CONFIG=${GLOOX_CONFIG:="$(pwd)/../../libraries/osx/gloox/bin/gloox-config"}
-  export SDL_CONFIG=${SDL_CONFIG:="$(pwd)/../../libraries/osx/sdl/bin/sdl-config"}
+  export SDL_CONFIG=${SDL_CONFIG:="$(pwd)/../../libraries/osx/sdl/bin/sdl2-config"}
   export WX_CONFIG=${WX_CONFIG:="$(pwd)/../../libraries/osx/wxwidgets/bin/wx-config"}
   export XML2_CONFIG=${XML2_CONFIG:="$(pwd)/../../libraries/osx/libxml2/bin/xml2-config"}
 fi

libraries/osx/build-osx-libs.sh

@@ -25 +25 @@
 ICONV_VERSION="libiconv-1.14"
 XML2_VERSION="libxml2-2.9.1"
 # * SDL 1.2.15+ required for Lion support
-SDL_VERSION="SDL-1.2.15"
+SDL_VERSION="SDL2-2.0.1"
 BOOST_VERSION="boost_1_52_0"
 # * wxWidgets 2.9+ is necessary for 64-bit OS X build w/ OpenGL support
 WXWIDGETS_VERSION="wxWidgets-3.0.0"
@@ -277 +277 @@
   pushd $LIB_DIRECTORY
 
 
-  # patch SDL to fix Mavericks build (fixed upstream, see https://bugzilla.libsdl.org/show_bug.cgi?id=2085 )
-  # Don't use X11 - we don't need it and Mountain Lion removed it
-  (patch -p0 -i ../../patches/sdl-mavericks-quartz-fix.diff && ./configure CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --without-x --enable-shared=no && make $JOBS && make install) || die "SDL build failed"
+  (./configure CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" --prefix="$INSTALL_DIR" --without-x --enable-shared=no && make $JOBS && make install) || die "SDL build failed"
   popd
   touch .already-built
 else

source/gui/CInput.cpp

@@ -93 +93 @@
         bool shiftKeyPressed = g_keys[SDLK_RSHIFT] || g_keys[SDLK_LSHIFT];
 
         int szChar = ev->ev.key.keysym.sym;
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+        wchar_t cooked = (wchar_t)ev->ev.key.keysym.sym;
+#else
         wchar_t cooked = (wchar_t)ev->ev.key.keysym.unicode;
+#endif
 
         switch (szChar)
         {

source/gui/scripting/GuiScriptConversions.cpp

@@ -84 +84 @@
         // SET(keysym, "scancode", (int)val.ev.key.keysym.scancode); // (not in wsdl.h)
         SET(keysym, "sym", (int)val.ev.key.keysym.sym);
         // SET(keysym, "mod", (int)val.ev.key.keysym.mod); // (not in wsdl.h)
-        if (val.ev.key.keysym.unicode)
+        if (val.ev.key.keysym.sym)
         {
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+            std::wstring unicode(1, (wchar_t)val.ev.key.keysym.sym);
+#else
             std::wstring unicode(1, (wchar_t)val.ev.key.keysym.unicode);
+#endif
             SET(keysym, "unicode", unicode);
         }
         else

source/ps/CConsole.cpp

@@ -669 +669 @@
 #endif
 {
     // U+0000 to U+001F are control characters
-    if (key.unicode < 0x20)
+    if (key.sym < 0x20)
     {
         switch (key.sym)
         {
@@ -724 +724 @@
     if (!g_Console->IsActive())
         return IN_PASS;
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+
+    if (ev->ev.type == SDL_TEXTINPUT) {
+        if (!HotkeyIsPressed("console.toggle")) {
+            CStr bytes (ev->ev.text.text, strlen(ev->ev.text.text));
+            CStrW str (bytes.FromUTF8());
+            for (CStrW::const_iterator it = str.begin(); it != str.end(); ++it) {
+                wchar_t chr = *it;
+                g_Console->InsertChar(0, (wchar_t)chr);
+            }
+        }
+        return IN_HANDLED;
+    }
+    else if (ev->ev.type == SDL_KEYDOWN) {
+        int sym = ev->ev.key.keysym.sym;
+        // Stop unprintable characters (ctrl+, alt+ and escape),
+        // also prevent ` and/or ~ appearing in console every time it's toggled.
+        if (!isUnprintableChar(ev->ev.key.keysym) && !HotkeyIsPressed("console.toggle")) {
+            g_Console->InsertChar(sym, 0);
+            return IN_HANDLED;
+        }
+        else {
+            return IN_PASS;
+        }
+    }
+    else {
+        return IN_PASS;
+    }
+
+#else // SDL 1.2:
+
     if (ev->ev.type != SDL_KEYDOWN)
         return IN_PASS;
 
@@ -739 +770 @@
     }
 
     return IN_PASS;
+#endif
 }

source/ps/Hotkey.cpp

@@ -227 +227 @@
 
     // Rather ugly hack to make the '"' key work better on a MacBook Pro on Windows so it doesn't
     // always close the console. (Maybe this would be better handled in wsdl or something?)
-    if (keycode == SDLK_BACKQUOTE && (ev->ev.key.keysym.unicode == '\'' || ev->ev.key.keysym.unicode == '"'))
-        keycode = ev->ev.key.keysym.unicode;
+    if (keycode == SDLK_BACKQUOTE && (ev->ev.key.keysym.sym == '\'' || ev->ev.key.keysym.sym == '"'))
+        keycode = ev->ev.key.keysym.sym;
 
     // Somewhat hackish:
     // Create phantom 'unified-modifier' events when left- or right- modifier keys are pressed

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp

@@ -189 +189 @@
     ev.ev.key.keysym.sym = (SDL_Keycode)(int)msg->sdlkey;
 #else
     ev.ev.key.keysym.sym = (SDLKey)(int)msg->sdlkey;
-#endif
     ev.ev.key.keysym.unicode = msg->unichar;
+#endif
     in_dispatch_event(&ev);
 }
 
@@ -206 +206 @@
     ev.ev.key.keysym.sym = (SDL_Keycode)(int)msg->sdlkey;
 #else
     ev.ev.key.keysym.sym = (SDLKey)(int)msg->sdlkey;
-#endif
     ev.ev.key.keysym.unicode = msg->unichar;
+#endif
     in_dispatch_event(&ev);
 
     ev.ev.type = SDL_KEYUP;