Changeset 10895

Timestamp:

Jan 11, 2012, 11:50:39 PM (13 years ago)

Author:

philip

Message:

SDL 1.3 build fixes.
Support SDL_CONFIG environment variable in update-workspaces to pick non-default sdl-config.
Avoid non-standard use of SDL/ in include paths.

Location:

ps/trunk

Files:

• build/premake/extern_libs4.lua (modified) (2 diffs)
• source/lib/external_libraries/sdl.h (modified) (2 diffs)
• source/lib/external_libraries/sdl_fwd.h (modified) (1 diff)
• source/lib/sysdep/os/unix/x/x.cpp (modified) (8 diffs)
• source/lib/sysdep/os/win/wsdl.h (modified) (1 diff)
• source/ps/CConsole.cpp (modified) (1 diff)
• source/ps/Globals.cpp (modified) (1 diff)
• source/ps/Globals.h (modified) (1 diff)
• source/ps/Hotkey.cpp (modified) (6 diffs)
• source/ps/KeyName.h (modified) (1 diff)
• source/ps/VideoMode.cpp (modified) (2 diffs)
• source/tools/atlas/AtlasUI/Misc/KeyMap.cpp (modified) (1 diff)

ps/trunk/build/premake/extern_libs4.lua

@@ -454 +454 @@
         compile_settings = function()
             if os.is("windows") then
-                add_default_include_paths("sdl")
-            else
+                includedirs { libraries_dir .. "sdl/include/SDL" }
+            else
+
+                -- 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"
+                end
+
                 -- "pkg-config sdl --libs" appears to include both static and dynamic libs
                 -- when on MacPorts, which is bad, so use sdl-config instead
-                pkgconfig_cflags(nil, "sdl-config --cflags")
+                pkgconfig_cflags(nil,  --cflags")
             end
         end,
@@ -465 +472 @@
                 add_default_lib_paths("sdl")
             else
-                pkgconfig_libs(nil, "sdl-config --libs")
+                sdl_config_path = os.getenv("SDL_CONFIG")
+                if not sdl_config_path then
+                    sdl_config_path = "sdl-config"
+                end
+                pkgconfig_libs(nil, sdl_config_path.." --libs")
             end
         end,

ps/trunk/source/lib/external_libraries/sdl.h

@@ -35 +35 @@
 #else
 
-# include <SDL/SDL.h>
-# include <SDL/SDL_thread.h>
+# include 
+# include 
 
 // if the compiler doesn't support inlining, this header will pull
@@ -42 +42 @@
 // will strip them if unused, and this is more convenient than
 // another header that toggles between wsdl and SDL_endian.h.
-# include <SDL/SDL_endian.h>
+# include 
 
 # if MSC_VERSION

ps/trunk/source/lib/external_libraries/sdl_fwd.h

@@ -30 +30 @@
 // 2006-08-26 SDL is dragged into 6 of our 7 static library components.
 // it must be specified in each of their "extern_libs" so that the
-// include path is set and <SDL/sdl.h> can be found.
+// include path is set and <SDL.h> can be found.
 //
 // obviously this is bad, so we work around the root cause. mostly only

ps/trunk/source/lib/sysdep/os/unix/x/x.cpp

@@ -42 +42 @@
 #include <Xatom.h>
 
-#include "SDL/SDL.h"
-#include "SDL/SDL_syswm.h"
+#include "SDL.h"
+#include "SDL_syswm.h"
 
 #include <algorithm>
@@ -49 +49 @@
 #undef Status
 
-static Display *SDL_Display;
-static Window SDL_Window;
-static void (*Lock_Display)(void);
-static void (*Unlock_Display)(void);
+static Display *g_SDL_Display;
+static Window g_SDL_Window;
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+static void (*g_Lock_Display)(void);
+static void (*g_Unlock_Display)(void);
+#endif
 static wchar_t *selection_data=NULL;
 static size_t selection_size=0;
@@ -228 +230 @@
  * @see sys_clipboard_set
  */
-int clipboard_filter(const SDL_Event *event)
+#if SDL_VERSION_ATLEAST(1, 3, 0)
+int clipboard_filter(void* UNUSED(userdata), SDL_Event* event)
+#else
+int clipboard_filter(const SDL_Event* event)
+#endif
 {
     /* Pass on all non-window manager specific events immediately */
@@ -238 +244 @@
     /* (Note: libsdl must be compiled with X11 support (SDL_VIDEO_DRIVER_X11 in SDL_config.h) -
        else you'll get errors like "'struct SDL_SysWMmsg' has no member named 'xevent'") */
-    switch (event->syswm.msg->event.xevent.type) {
+#if SDL_VERSION_ATLEAST(1, 3, 0)
+    XEvent* xevent = &event->syswm.msg->msg.x11.event;
+#else
+    XEvent* xevent = &event->syswm.msg->event.xevent;
+#endif
+    switch (xevent->type) {
         /* Copy the selection from our buffer to the requested property, and
         convert to the requested target format */
@@ -245 +256 @@
             XEvent sevent;
 
-            req = &event->syswm.msg->event.xevent.xselectionrequest;
+            req = &xselectionrequest;
             sevent.xselection.type = SelectionNotify;
             sevent.xselection.display = req->display;
@@ -258 +269 @@
             {
                 size_t size = wcslen(selection_data);
-                u8 *buf = (u8 *)alloca(size);
+                u8*)alloca(size);
                 
-                for (size_t i=0;i<size;i++)
+                for (size_t ii++)
                 {
-                    buf[i] = selection_data[i]<0x100?selection_data[i]:'?';
+                    buf[i] = selection_data[i]'?';
                 }
             
-                XChangeProperty(SDL_Display, req->requestor, req->property,
-                    sevent.xselection.target, 8, PropModeReplace,
+                XChangeProperty(SDL_Display, req->requestor, req->property,
+        sevent.xselection.target, 8, PropModeReplace,
                     buf, size);
                 sevent.xselection.property = req->property;
             }
             // TODO Add more target formats
-            XSendEvent(SDL_Display,req->requestor,False,0,&sevent);
-            XSync(SDL_Display, False);
+            XSendEvent(&sevent);
+            XSync(SDL_Display, False);
         }
         break;
@@ -289 +300 @@
 
     SDL_VERSION(&info.version);
-    if ( SDL_GetWMInfo(&info) )
+    if ()
     {
         /* Save the information for later use */
-        if ( info.subsystem == SDL_SYSWM_X11 )
+        if ()
         {
-            SDL_Display = info.info.x11.display;
-            SDL_Window = info.info.x11.window;
-            Lock_Display = info.info.x11.lock_func;
-            Unlock_Display = info.info.x11.unlock_func;
+            g_SDL_Display = info.info.x11.display;
+            g_SDL_Window = info.info.x11.window;
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+            g_Lock_Display = info.info.x11.lock_func;
+            g_Unlock_Display = info.info.x11.unlock_func;
+#endif
 
             /* Enable the special window hook events */
             SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
+
+
+
             SDL_SetEventFilter(clipboard_filter);
+
 
             return INFO::OK;
@@ -340 +357 @@
     wcscpy(selection_data, str);
 
-    Lock_Display();
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+    g_Lock_Display();
+#endif
+
     // Like for the clipboard_get code above, we rather use CLIPBOARD than
     // PRIMARY - more windows'y behaviour there.
-    Atom clipboard_atom = XInternAtom(SDL_Display, "CLIPBOARD", False);
-    XSetSelectionOwner(SDL_Display, clipboard_atom, SDL_Window, CurrentTime);
-    XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window, CurrentTime);
-    Unlock_Display();
-    
+    Atom clipboard_atom = XInternAtom(g_SDL_Display, "CLIPBOARD", False);
+    XSetSelectionOwner(g_SDL_Display, clipboard_atom, g_SDL_Window, CurrentTime);
+    XSetSelectionOwner(g_SDL_Display, XA_PRIMARY, g_SDL_Window, CurrentTime);
+
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+    g_Unlock_Display();
+#else
+    // SDL 1.3 doesn't have a lockable event thread, so it just uses
+    // XSync directly instead of lock_func/unlock_func
+    XSync(g_SDL_Display, False);
+#endif
+
     return INFO::OK;
 }

ps/trunk/source/lib/sysdep/os/win/wsdl.h

@@ -31 +31 @@
 #include "lib/byte_order.h"
 #ifndef WSDL_NO_KEYSYM
-# include "SDL/SDL_keysym.h"
+# include "SDL_keysym.h"
 #endif
 

ps/trunk/source/ps/CConsole.cpp

@@ -653 +653 @@
 InReaction conInputHandler(const SDL_Event_* ev)
 {
-    if (ev->ev.type == SDL_HOTKEYDOWN)
+    if (ev->ev.type == SDL_HOTKEYDOWN)
     {
         std::string hotkey = static_cast<const char*>(ev->ev.user.data1);

ps/trunk/source/ps/Globals.cpp

@@ -25 +25 @@
 bool g_app_has_focus = true;
 
-bool g_keys[SDLK_LAST] = {0};
+;
 int g_mouse_x = 50, g_mouse_y = 50;
 bool g_mouse_active = true;

ps/trunk/source/ps/Globals.h

@@ -42 +42 @@
  * Updated by GlobalsInputHandler in response to key press/release events.
  */
-extern bool g_keys[];
+extern ;
 
 /**

ps/trunk/source/ps/Hotkey.cpp

@@ -185 +185 @@
 #endif
         {
-            keycode = SDLK_LAST + (int)ev->ev.button.button;
+            keycode =  + (int)ev->ev.button.button;
             break;
         }
@@ -244 +244 @@
     bool consoleCapture = false;
 
-    if( g_Console->IsActive() && keycode < SDLK_LAST )
+    if( g_Console->IsActive() && keycode <  )
         consoleCapture = true;
 
@@ -279 +279 @@
             bool rqdState = !itKey->negated;
 
-            if( (int)itKey->code < SDLK_LAST )
+            if( (int)itKey->code <  )
             {
                 if( g_keys[itKey->code] != rqdState ) accept = false;
@@ -285 +285 @@
             else if( (int)itKey->code < UNIFIED_SHIFT )
             {
-                if( g_mouse_buttons[itKey->code - SDLK_LAST] != rqdState ) accept = false;
+                if( g_mouse_buttons[itKey->code - ] != rqdState ) accept = false;
             }
             else if( (int)itKey->code < UNIFIED_LAST )
@@ -344 +344 @@
             bool rqdState = !itKey->negated;
 
-            if( (int)itKey->code < SDLK_LAST )
+            if( (int)itKey->code <  )
             {
                 if( g_keys[itKey->code] != rqdState ) accept = false;
@@ -350 +350 @@
             else if( (int)itKey->code < UNIFIED_SHIFT )
             {
-                if( g_mouse_buttons[itKey->code - SDLK_LAST] != rqdState ) accept = false;
+                if( g_mouse_buttons[itKey->code - ] != rqdState ) accept = false;
             }
             else if( (int)itKey->code < UNIFIED_LAST )

ps/trunk/source/ps/KeyName.h

@@ -28 +28 @@
 extern int FindKeyCode( const CStr8& keyname );
 
+
+
+
+
+
+
+
 enum {
     // 'Keycodes' for the mouse buttons
-    MOUSE_LEFT = SDLK_LAST + SDL_BUTTON_LEFT,
-    MOUSE_RIGHT = SDLK_LAST + SDL_BUTTON_RIGHT,
-    MOUSE_MIDDLE = SDLK_LAST + SDL_BUTTON_MIDDLE,
-    MOUSE_WHEELUP = SDLK_LAST + SDL_BUTTON_WHEELUP,
-    MOUSE_WHEELDOWN = SDLK_LAST + SDL_BUTTON_WHEELDOWN,
+    MOUSE_LEFT =  + SDL_BUTTON_LEFT,
+    MOUSE_RIGHT =  + SDL_BUTTON_RIGHT,
+    MOUSE_MIDDLE =  + SDL_BUTTON_MIDDLE,
+    MOUSE_WHEELUP =  + SDL_BUTTON_WHEELUP,
+    MOUSE_WHEELDOWN =  + SDL_BUTTON_WHEELDOWN,
 #if SDL_VERSION_ATLEAST(1, 2, 13)
-    MOUSE_X1 = SDLK_LAST + SDL_BUTTON_X1,
-    MOUSE_X2 = SDLK_LAST + SDL_BUTTON_X2,
+    MOUSE_X1 =  + SDL_BUTTON_X1,
+    MOUSE_X2 =  + SDL_BUTTON_X2,
 #else
-    MOUSE_X1 = SDLK_LAST + SDL_BUTTON_WHEELDOWN + 1,
-    MOUSE_X2 = SDLK_LAST + SDL_BUTTON_WHEELDOWN + 2,
+    MOUSE_X1 =  + SDL_BUTTON_WHEELDOWN + 1,
+    MOUSE_X2 =  + SDL_BUTTON_WHEELDOWN + 2,
 #endif
 

ps/trunk/source/ps/VideoMode.cpp

@@ -157 +157 @@
     SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+
     SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, g_VSync ? 1 : 0);
-
+#endif
+    
     if (!SetVideoMode(w, h, bpp, m_ConfigFullscreen))
     {
@@ -168 +170 @@
             return false;
     }
+
+
+
+
 
     // Work around a bug in the proprietary Linux ATI driver (at least versions 8.16.20 and 8.14.13).

ps/trunk/source/tools/atlas/AtlasUI/Misc/KeyMap.cpp

@@ -20 +20 @@
 #include "KeyMap.h"
 
-#include "SDL/SDL_keysym.h"
+#include "SDL_keysym.h"
 
 int GetSDLKeyFromWxKeyCode(int wxkey)