update to SDL-2.0.0-6302 (hg)

git-svn-id: http://svn.net-core.org/repos/t-engine4@5147 51575b47-30f0-44d4-a5cc-537603b46e54

@@ -57,8 +57,8 @@ project "TEngine"
 
 
 	configuration "linux"
-		libdirs {"/opt/SDL-1.3/lib/"}
-		links { "dl", "SDL-1.3", "SDL_ttf", "SDL_image", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" }
+		libdirs {"/opt/SDL-2.0/lib/"}
+		links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" }
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' }
 
 	configuration {"Debug"}

@@ -18,7 +18,7 @@ solution "TEngine"
 		"src/physfs",
 		"src/physfs/zlib123",
 		"src/bzip2",
-		"/opt/SDL-1.3/include/SDL/",
+		"/opt/SDL-2.0/include/SDL2/",
 		"/usr/include/GL",
 	}
 	if _OPTIONS.lua == "default" then includedirs{"src/lua"}

@@ -41,6 +41,141 @@
 
 extern SDL_Window *window;
 
+#define SDL_SRCALPHA        0x00010000
+int SDL_SetAlpha(SDL_Surface * surface, Uint32 flag, Uint8 value)
+{
+    if (flag & SDL_SRCALPHA) {
+        /* According to the docs, value is ignored for alpha surfaces */
+        if (surface->format->Amask) {
+            value = 0xFF;
+        }
+        SDL_SetSurfaceAlphaMod(surface, value);
+        SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
+    } else {
+        SDL_SetSurfaceAlphaMod(surface, 0xFF);
+        SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
+    }
+    SDL_SetSurfaceRLE(surface, (flag & SDL_RLEACCEL));
+
+    return 0;
+}
+
+typedef struct SDL_VideoInfo
+{
+    Uint32 hw_available:1;
+    Uint32 wm_available:1;
+    Uint32 UnusedBits1:6;
+    Uint32 UnusedBits2:1;
+    Uint32 blit_hw:1;
+    Uint32 blit_hw_CC:1;
+    Uint32 blit_hw_A:1;
+    Uint32 blit_sw:1;
+    Uint32 blit_sw_CC:1;
+    Uint32 blit_sw_A:1;
+    Uint32 blit_fill:1;
+    Uint32 UnusedBits3:16;
+    Uint32 video_mem;
+
+    SDL_PixelFormat *vfmt;
+
+    int current_w;
+    int current_h;
+} SDL_VideoInfo;
+
+static int
+GetVideoDisplay()
+{
+    const char *variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_DISPLAY");
+    if ( !variable ) {
+        variable = SDL_getenv("SDL_VIDEO_FULLSCREEN_HEAD");
+    }
+    if ( variable ) {
+        return SDL_atoi(variable);
+    } else {
+        return 0;
+    }
+}
+
+const SDL_VideoInfo *SDL_GetVideoInfo(void)
+{
+    static SDL_VideoInfo info;
+    SDL_DisplayMode mode;
+
+    /* Memory leak, compatibility code, who cares? */
+    if (!info.vfmt && SDL_GetDesktopDisplayMode(GetVideoDisplay(), &mode) == 0) {
+        info.vfmt = SDL_AllocFormat(mode.format);
+        info.current_w = mode.w;
+        info.current_h = mode.h;
+    }
+    return &info;
+}
+
+SDL_Rect **
+SDL_ListModes(const SDL_PixelFormat * format, Uint32 flags)
+{
+    int i, nmodes;
+    SDL_Rect **modes;
+
+/*    if (!SDL_GetVideoDevice()) {
+        return NULL;
+    }
+  */
+/*    if (!(flags & SDL_FULLSCREEN)) {
+        return (SDL_Rect **) (-1);
+    }
+*/
+    if (!format) {
+        format = SDL_GetVideoInfo()->vfmt;
+    }
+
+    /* Memory leak, but this is a compatibility function, who cares? */
+    nmodes = 0;
+    modes = NULL;
+    for (i = 0; i < SDL_GetNumDisplayModes(GetVideoDisplay()); ++i) {
+        SDL_DisplayMode mode;
+        int bpp;
+
+        SDL_GetDisplayMode(GetVideoDisplay(), i, &mode);
+        if (!mode.w || !mode.h) {
+            return (SDL_Rect **) (-1);
+        }
+
+        /* Copied from src/video/SDL_pixels.c:SDL_PixelFormatEnumToMasks */
+        if (SDL_BYTESPERPIXEL(mode.format) <= 2) {
+            bpp = SDL_BITSPERPIXEL(mode.format);
+        } else {
+            bpp = SDL_BYTESPERPIXEL(mode.format) * 8;
+        }
+
+        if (bpp != format->BitsPerPixel) {
+            continue;
+        }
+        if (nmodes > 0 && modes[nmodes - 1]->w == mode.w
+            && modes[nmodes - 1]->h == mode.h) {
+            continue;
+        }
+
+        modes = SDL_realloc(modes, (nmodes + 2) * sizeof(*modes));
+        if (!modes) {
+            return NULL;
+        }
+        modes[nmodes] = (SDL_Rect *) SDL_malloc(sizeof(SDL_Rect));
+        if (!modes[nmodes]) {
+            return NULL;
+        }
+        modes[nmodes]->x = 0;
+        modes[nmodes]->y = 0;
+        modes[nmodes]->w = mode.w;
+        modes[nmodes]->h = mode.h;
+        ++nmodes;
+    }
+    if (modes) {
+        modes[nmodes] = NULL;
+    }
+    return modes;
+}
+
+
 /***** Helpers *****/
 static GLenum sdl_gl_texture_format(SDL_Surface *s) {
 	// get the number of channels in the SDL surface
@@ -180,12 +315,12 @@ static int lua_set_current_keyhandler(lua_State *L)
 static int lua_get_mod_state(lua_State *L)
 {
 	const char *mod = luaL_checkstring(L, 1);
-	SDLMod smod = SDL_GetModState();
+	SDL_Keymod smod = SDL_GetModState();
 
 	if (!strcmp(mod, "shift")) lua_pushboolean(L, smod & KMOD_SHIFT);
 	else if (!strcmp(mod, "ctrl")) lua_pushboolean(L, smod & KMOD_CTRL);
 	else if (!strcmp(mod, "alt")) lua_pushboolean(L, smod & KMOD_ALT);
-	else if (!strcmp(mod, "meta")) lua_pushboolean(L, smod & KMOD_META);
+	else if (!strcmp(mod, "meta")) lua_pushboolean(L, smod & KMOD_GUI);
 	else if (!strcmp(mod, "caps")) lua_pushboolean(L, smod & KMOD_CAPS);
 	else lua_pushnil(L);
 
@@ -354,12 +489,6 @@ static const struct luaL_reg gamelib[] =
  ******************************************************************/
 static bool no_text_aa = FALSE;
 
-static int sdl_fullscreen(lua_State *L)
-{
-	SDL_WM_ToggleFullScreen(screen);
-	return 0;
-}
-
 extern bool is_fullscreen;
 static int sdl_screen_size(lua_State *L)
 {
@@ -639,7 +768,7 @@ static int sdl_font_draw(lua_State *L)
 #else
 	rmask = 0x000000ff; gmask = 0x0000ff00; bmask = 0x00ff0000; amask = 0xff000000;
 #endif
-	SDL_Surface *s = SDL_CreateRGBSurface(SDL_SWSURFACE | SDL_SRCALPHA, max_width, h, 32, rmask, gmask, bmask, amask);
+	SDL_Surface *s = SDL_CreateRGBSurface(SDL_SWSURFACE, max_width, h, 32, rmask, gmask, bmask, amask);
 	SDL_FillRect(s, NULL, SDL_MapRGBA(s->format, 0, 0, 0, 0));
 
 	int id_dduid = 1;
@@ -916,7 +1045,7 @@ static int sdl_new_tile(lua_State *L)
 #endif
 
 	*s = SDL_CreateRGBSurface(
-		SDL_SWSURFACE | SDL_SRCALPHA,
+		SDL_SWSURFACE,
 		w,
 		h,
 		32,
@@ -957,7 +1086,7 @@ static int sdl_new_surface(lua_State *L)
 #endif
 
 	*s = SDL_CreateRGBSurface(
-		SDL_SWSURFACE | SDL_SRCALPHA,
+		SDL_SWSURFACE,
 		w,
 		h,
 		32,
@@ -1011,7 +1140,7 @@ int init_blank_surface()
 	amask = 0xff000000;
 #endif
 	SDL_Surface *s = SDL_CreateRGBSurface(
-		SDL_SWSURFACE | SDL_SRCALPHA,
+		SDL_SWSURFACE,
 		4,
 		4,
 		32,
@@ -1417,7 +1546,7 @@ static int sdl_surface_alpha(lua_State *L)
 	if (lua_isnumber(L, 2))
 	{
 		int a = luaL_checknumber(L, 2);
-		SDL_SetAlpha(*s, SDL_SRCALPHA | SDL_RLEACCEL, (a < 0) ? 0 : (a > 255) ? 255 : a);
+		SDL_SetAlpha(*s, /*SDL_SRCALPHA | */SDL_RLEACCEL, (a < 0) ? 0 : (a > 255) ? 255 : a);
 	}
 	else
 	{
@@ -2219,7 +2348,7 @@ static int get_text_aa(lua_State *L)
 static int sdl_get_modes_list(lua_State *L)
 {
 	SDL_PixelFormat format;
-	SDL_Rect **modes;
+	SDL_Rect **modes = NULL;
 	int loops = 0;
 	int bpp = 0;
 	int nb = 1;
@@ -2244,7 +2373,7 @@ static int sdl_get_modes_list(lua_State *L)
 		}
 
 		//get available fullscreen/hardware modes
-		modes = SDL_ListModes(&format, SDL_FULLSCREEN);
+		modes = SDL_ListModes(&format, 0);
 		if (modes)
 		{
 			int i;
@@ -2388,7 +2517,6 @@ static const struct luaL_reg displaylib[] =
 	{"setTextBlended", set_text_aa},
 	{"getTextBlended", get_text_aa},
 	{"forceRedraw", sdl_redraw_screen},
-	{"fullscreen", sdl_fullscreen},
 	{"size", sdl_screen_size},
 	{"newFont", sdl_new_font},
 	{"newSurface", sdl_new_surface},

@@ -72,8 +72,8 @@ int mouse_drag_tex = 0, mouse_drag_tex_ref = LUA_NOREF;
 int mousex = 0, mousey = 0;
 float gamma_correction = 1;
 int requested_fps = 30;
-SDL_TimerID display_timer_id = NULL;
-SDL_TimerID realtime_timer_id = NULL;
+SDL_TimerID display_timer_id = 0;
+SDL_TimerID realtime_timer_id = 0;
 
 /* OpenGL capabilities */
 GLint max_texture_size = 1024;
@@ -337,12 +337,6 @@ void on_event(SDL_Event *event)
 			case SDL_BUTTON_RIGHT:
 				lua_pushstring(L, "right");
 				break;
-			case SDL_BUTTON_WHEELUP:
-				lua_pushstring(L, "wheelup");
-				break;
-			case SDL_BUTTON_WHEELDOWN:
-				lua_pushstring(L, "wheeldown");
-				break;
 			default:
 				lua_pushstring(L, "button");
 				lua_pushnumber(L, event->button.button);
@@ -650,7 +644,7 @@ void setupRealtime(float freq)
 	if (!freq)
 	{
 		if (realtime_timer_id) SDL_RemoveTimer(realtime_timer_id);
-		realtime_timer_id = NULL;
+		realtime_timer_id = 0;
 		printf("[ENGINE] Switching to turn based\n");
 	}
 	else
@@ -726,7 +720,7 @@ int resizeWindow(int width, int height)
 	/* Reset The View */
 	glLoadIdentity( );
 
-	SDL_SetGamma(gamma_correction, gamma_correction, gamma_correction);
+//TSDL2	SDL_SetGamma(gamma_correction, gamma_correction, gamma_correction);
 
 	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
 	printf("OpenGL max texture size: %d\n", max_texture_size);
@@ -869,7 +863,7 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
 	}
 	else if (state == 2)
 	{
-		SDL_WM_SetCaption("T-Engine4", NULL);
+		SDL_SetWindowTitle(window, "T-Engine4");
 
 		// Now we can open lua lanes, the physfs paths are set and it can load it's lanes-keeper.lua file
 		//		luaopen_lanes(L);
@@ -1001,7 +995,6 @@ int main(int argc, char *argv[])
 	}
 	SDL_SetWindowIcon(window, IMG_Load_RW(PHYSFSRWOPS_openRead("/engines/default/data/gfx/te4-icon.png"), TRUE));
 	SDL_SetWindowTitle(window, "T4Engine");
-	SDL_EnableKeyRepeat(300, 10);
 	TTF_Init();
 
 	/* Sets up OpenGL double buffering */

@@ -275,7 +275,7 @@ static int loadsoundLua(lua_State *L) {
 		if (sound->mutex == NULL) luaL_error(L, "out of memory");
 		sound->cond = SDL_CreateCond();
 		if (sound->cond == NULL) luaL_error(L, "out of memory");
-		sound->loaderThread = SDL_CreateThread(streamingLoader, sound);
+		sound->loaderThread = SDL_CreateThread(streamingLoader, "steamer", sound);
 	}
 	else {
 		sound->static_source = 0;

@@ -876,6 +876,7 @@ void create_particles_thread()
 
 	MAX_THREADS = nb_cpus - 1;
 	MAX_THREADS = (MAX_THREADS < 1) ? 1 : MAX_THREADS;
+	MAX_THREADS = 1;
 	threads = calloc(MAX_THREADS, sizeof(particle_thread));
 
 	cur_thread = 0;
@@ -890,7 +891,7 @@ void create_particles_thread()
 		pt->keyframes = SDL_CreateSemaphore(0);
 		pt->running = TRUE;
 
-		thread = SDL_CreateThread(thread_particles, pt);
+		thread = SDL_CreateThread(thread_particles, "particles", pt);
 		if (thread == NULL) {
 			printf("Unable to create particle thread: %s\n", SDL_GetError());
 			continue;

@@ -24,11 +24,7 @@
 #define _INCLUDE_PHYSFSRWOPS_H_
 
 #include "physfs.h"
-#ifdef __APPLE__
-#include <SDL/SDL.h>
-#else
-#include "SDL.h"
-#endif
+#include "tSDL.h"
 
 #ifdef __cplusplus
 extern "C" {

@@ -207,7 +207,7 @@ int create_profile_thread(lua_State *L)
 	profile->lock_oqueue = SDL_CreateMutex();
 	profile->wait_oqueue = SDL_CreateSemaphore(0);
 
-	thread = SDL_CreateThread(thread_profile, profile);
+	thread = SDL_CreateThread(thread_profile, "profile", profile);
 	if (thread == NULL) {
 		printf("Unable to create profile thread: %s\n", SDL_GetError());
 		return -1;