Merge lp:~der-treba/stratagus/stratagus into lp:stratagus

[treba]

Hello,

i made some small changes to the engine that allow us to get the native resolution of the screen within lua and let's us determine all available resolutions.

examples:

local defaultPreferences = {
    ...
    VideoWidth = GetCurrentResolutionsWidth(),
    VideoHeight = GetCurrentResolutionsHeight(),
    ...
}

for i=0,GetVideoResolutionsNr()-1 do
 print(GetResolutionsWidth(i), GetResolutionsHeight(i))
end

i hope the code quality is ok. i only tested it on linux, but to me, it seems to be quite solid.

[lp:~der-treba/stratagus/stratagus]

8698. By treba on 2013-04-23

- removed declarations of lua bindings from video.h
- replaced resolution calls with the following two:
 GetCurrentResolution() -- array with width and height of current resolution. if called at startup, the optimal resolution is given
 GetAvailableResolutions() -- two dimensional array with available resolutions. in window mode gives nil

[treba (der-treba)]

ok, i removed the stuff from the header and replaced the calls with two simple ones:

GetCurrentResolution() -- array with width and height of current resolution. if called at startup, the optimal resolution is given

GetAvailableResolutions() -- two dimensional array with available resolutions. in window mode gives nil

i guess it's ready now

[Travis (dinky-dye-aussie)]

So where do I put this code to make it work in the game? I would like to see what this code does so how can we get it working?

[Joris Dauphin (joris-dauphin)]

Look better.
Maybe GetCurrentResolution may return two int instead of a table to allow:

videoWidth, videoHeight = GetCurrentResolution()

It seems that atexit(SDL_Quit) may be called twice.

[treba (der-treba)]

> So where do I put this code to make it work in the game? I would like to see
> what this code does so how can we get it working?

i'm not sure if i'm getting your question, but if it is about how you can use it inside the game:

well, you can use it for example in the stratagus.lua:
...
local defaultPreferences = {
    ...
    VideoWidth = GetCurrentResolution()[1],
    VideoHeight = GetCurrentResolution()[2],
    ...
}
...

that will give you your native resolution as default. so if the game supports it and you don't specify a particular resolution, you will always have the native one, regardles what monitor you are using.

GetAvailableResolutions allows to build a dynamic list of resolutions in the options menu.
this will print them to stdout:

if GetAvailableResolutions() then
 for _,v in ipairs(GetAvailableResolutions()) do
  print(v[1]..'x'..v[2])
 end
end

[treba (der-treba)]

> Look better.
> Maybe GetCurrentResolution may return two int instead of a table to allow:
>
> videoWidth, videoHeight = GetCurrentResolution()
>
>
>
> It seems that atexit(SDL_Quit) may be called twice.

for the first part: good idea.

the second one: i didn't really get what atexit(SDL_Quit) actually does (and when). can you help me with that one?

[Travis (dinky-dye-aussie)]

Yeah this things isn't working. I got an stderr output for you. I placed the lines you detailed treba in the stratagus.lua file in the preferences sectoion, as follows.

local defaultPreferences = {
 CampaignHuman = 1,
 CampaignHumanX = 1,
 CampaignOrc = 1,
 CampaignOrcX = 1,
 DoubleClickDelayInMs = 300,
 EffectsEnabled = true,
 EffectsVolume = 128,
 EnableKeyboardScrolling = true,
 EnableMouseScrolling = true,
 FogOfWar = true,
 FogOfWarOpacity = 128,
 GameSpeed = 30,
 GameTranslation = "",
 GrabMouse = false,
 GroupKeys = "0123456789`",
 HoldClickDelayInMs = 1000,
 LeaveStopScrolling = true,
 MaxOpenGLTexture = 0,
 MinimapWithTerrain = true,
 MouseScrollSpeed = 1,
 MouseScrollSpeedControl = 15,
 MouseScrollSpeedDefault = 4,
 MusicEnabled = true,
 MusicVolume = 128,
 PlayerName = "Player",
 ServerIP = "localhost",
 ShowCommandKey = true,
 ShowTips = true,
 StratagusTranslation = "",
 TipNumber = 0,
 UseFancyBuildings = true,
 UseOpenGL = false,
 VideoFullScreen = true,
 VideoWidth = GetCurrentResolution(),
        VideoHeight = GetCurrentResolution(),
}

See, right at the bottom ^^^^ I tried running wargus. didn't even start. Here's the stderr readout.

[string "C:/Games/Wargus/scripts/stratagus.lua"]:312: attempt to call global 'GetCurrentResolution' (a nil value)
stack traceback:
 [string "C:/Games/Wargus/scripts/stratagus.lua"]:312: in main chunk

I'll try the "GetAvailableResolutions()" parameter see if that works...

...Nope, no luck with that either.

[treba (der-treba)]

> Yeah this things isn't working. I got an stderr output for you. I placed the
> lines you detailed treba in the stratagus.lua file in the preferences
> sectoion, as follows.
>

ahm yeah, that's the point of the merge. i implemented this calls in the c code i want to merge. you have to compile my branch to test it. if it was already in the engine, i wouldn't have to merge new code for it^^

[Kyran Jackson (erstmap)]

That's our Travis!

[Travis (dinky-dye-aussie)]

I downloaded your trunk code and the code isn't in the files you list it being in...sooooo I dunno where it is...

Kyran man...You burned me good mate :)

[Joris Dauphin (joris-dauphin)]

@treba:
atexit is the global c Raii.
atexit(SDL_Quit) mean that SDL_Quit will be called when program exits.
Call it twice means that SQL_Quit will be invoked twice when program exits.
So, I think you may remove the other atexit(SDL_Quit).

[treba (der-treba)]

> @treba:
> atexit is the global c Raii.
> atexit(SDL_Quit) mean that SDL_Quit will be called when program exits.
> Call it twice means that SQL_Quit will be invoked twice when program exits.
> So, I think you may remove the other atexit(SDL_Quit).

no, the second call is done in the if (SDL_WasInit(SDL_INIT_VIDEO) == 0) block. so it's only called once (just checked it again)

> I downloaded your trunk code and the code isn't in the files you list it being in...sooooo I dunno where it is...

well it's even listed at the very end of this comment page (the last 5 lines register the functions)
are you sure got the right branch?

[Travis (dinky-dye-aussie)]

Yep, I downloaded from your trunk, several times, and each time I compiled and tried to run the game using you're script code, it wouldn't work, because the code wasn't there.

I'll try again :)

[Travis (dinky-dye-aussie)]

OK so now it works. I don't know what I did differently, but it works...How do I zoom tho? My native resolution is 1680x1050, and the game looks sick on this resolution...How do I zoom in though?

[treba (der-treba)]

> OK so now it works. I don't know what I did differently, but it works...How do
> I zoom tho? My native resolution is 1680x1050, and the game looks sick on this
> resolution...How do I zoom in though?

afaik that's possible with the other proposed merge. probably a good combination of merges =)

[Pali (pali)]

There is duplicate code for SDL video flags. One in function GetVideoFlags (src/video/video.cpp) and one in InitVideoSdl (src/video/sdl.cpp). There is also duplicate function call SDL_Init() in src/video/sdl.cpp

And please squash that two commits into one because second commit deleting code which was added by first. You can do that with command: bzr uncommit

review: Needs Fixing

Unmerged revisions

8698. By treba on 2013-04-23

- removed declarations of lua bindings from video.h
- replaced resolution calls with the following two:
 GetCurrentResolution() -- array with width and height of current resolution. if called at startup, the optimal resolution is given
 GetAvailableResolutions() -- two dimensional array with available resolutions. in window mode gives nil

8697. By treba on 2013-04-20

added lua queries to determine the default resolution of a screen aswell as queries to for supported resolutions.

GetVideoResolutionsNr() - get number of available resolutions
GetResolutionsWidth(i) - get width of resolution i
GetResolutionsHeight(i) - see above
GetCurrentResolutionsWidth() - get current resolution width. if queried on startup, it's the default/optimal resolution
GetCurrentResolutionsHeight() - see above

=== modified file 'src/game/game.cpp'
--- src/game/game.cpp	2013-04-23 13:45:52 +0000
+++ src/game/game.cpp	2013-04-23 18:34:43 +0000
@@ -1490,6 +1490,7 @@
 	UpgradesCclRegister();
 	UserInterfaceCclRegister();
 	VideoCclRegister();
+	VideoModesRegister();
 }
 
 

=== modified file 'src/include/video.h'
--- src/include/video.h	2013-04-13 00:57:39 +0000
+++ src/include/video.h	2013-04-23 18:34:43 +0000
@@ -400,9 +400,11 @@
 
 /// register lua function
 extern void VideoCclRegister();
+extern void VideoModesRegister();
 
 /// initialize the video part
 extern void InitVideo();
+extern void PreInitVideoSdl();
 
 /// deinitliaize the video part
 void DeInitVideo();

=== modified file 'src/stratagus/stratagus.cpp'
--- src/stratagus/stratagus.cpp	2013-04-14 08:42:04 +0000
+++ src/stratagus/stratagus.cpp	2013-04-23 18:34:43 +0000
@@ -649,6 +649,9 @@
 
 	makedir(parameters.GetUserDirectory().c_str(), 0777);
 
+	// Preinit SDL_Video so video infos can be queried
+	PreInitVideoSdl();
+
 	// Init Lua and register lua functions!
 	InitLua();
 	LuaRegisterModules();

=== modified file 'src/video/sdl.cpp'
--- src/video/sdl.cpp	2013-04-13 00:57:39 +0000
+++ src/video/sdl.cpp	2013-04-23 18:34:43 +0000
@@ -453,17 +453,40 @@
 }
 
 /**
+ *	Preinit Sdl so sdl infos can be queried by lua
+ */
+
+void PreInitVideoSdl()
+{
+	int res = SDL_Init(
+#ifdef DEBUG
+				  SDL_INIT_NOPARACHUTE |
+#endif
+				  SDL_INIT_AUDIO | SDL_INIT_VIDEO |
+				  SDL_INIT_TIMER);
+	if (res < 0) {
+		fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
+		exit(1);
+	}
+	
+	// Clean up on exit
+	atexit(SDL_Quit);
+}
+
+/**
 **  Initialize the video part for SDL.
 */
 void InitVideoSdl()
 {
 	Uint32 flags = 0;
 
+#ifndef USE_WIN32
+	// Fix tablet input in full-screen mode
+	SDL_putenv(strdup("SDL_MOUSE_RELATIVE=0"));
+#endif
+
 	if (SDL_WasInit(SDL_INIT_VIDEO) == 0) {
-#ifndef USE_WIN32
-		// Fix tablet input in full-screen mode
-		SDL_putenv(strdup("SDL_MOUSE_RELATIVE=0"));
-#endif
+
 		int res = SDL_Init(
 #ifdef DEBUG
 					  SDL_INIT_NOPARACHUTE |
@@ -477,106 +500,106 @@
 
 		// Clean up on exit
 		atexit(SDL_Quit);
+	}
 
 #ifdef USE_MAEMO
-		maemo_init();
+	maemo_init();
 #endif
 
-		// If debug is enabled, Stratagus disable SDL Parachute.
-		// So we need gracefully handle segfaults and aborts.
+	// If debug is enabled, Stratagus disable SDL Parachute.
+	// So we need gracefully handle segfaults and aborts.
 #if defined(DEBUG) && !defined(USE_WIN32)
-		signal(SIGSEGV, CleanExit);
-		signal(SIGABRT, CleanExit);
+	signal(SIGSEGV, CleanExit);
+	signal(SIGABRT, CleanExit);
 #endif
-		// Set WindowManager Title
-		if (!FullGameName.empty()) {
-			SDL_WM_SetCaption(FullGameName.c_str(), FullGameName.c_str());
-		} else if (!Parameters::Instance.applicationName.empty()) {
-			SDL_WM_SetCaption(Parameters::Instance.applicationName.c_str(), Parameters::Instance.applicationName.c_str());
-		} else {
-			SDL_WM_SetCaption("Stratagus", "Stratagus");
-		}
+	// Set WindowManager Title
+	if (!FullGameName.empty()) {
+		SDL_WM_SetCaption(FullGameName.c_str(), FullGameName.c_str());
+	} else if (!Parameters::Instance.applicationName.empty()) {
+		SDL_WM_SetCaption(Parameters::Instance.applicationName.c_str(), Parameters::Instance.applicationName.c_str());
+	} else {
+		SDL_WM_SetCaption("Stratagus", "Stratagus");
+	}
 
 #if ! defined(USE_WIN32) && ! defined(USE_MAEMO)
 
 #if defined(USE_OPENGL) || defined(USE_GLES)
-		// Make sure, that we not create OpenGL textures (and do not call OpenGL functions), when creating icon surface
-		bool UseOpenGL_orig = UseOpenGL;
-		UseOpenGL = false;
+	// Make sure, that we not create OpenGL textures (and do not call OpenGL functions), when creating icon surface
+	bool UseOpenGL_orig = UseOpenGL;
+	UseOpenGL = false;
 #endif
 
-		SDL_Surface *icon = NULL;
-		CGraphic *g = NULL;
-		struct stat st;
-
-		std::string FullGameNameL = FullGameName;
-		for (size_t i = 0; i < FullGameNameL.size(); ++i) {
-			FullGameNameL[i] = tolower(FullGameNameL[i]);
-		}
-
-		std::string ApplicationName = Parameters::Instance.applicationName;
-		std::string ApplicationNameL = ApplicationName;
-		for (size_t i = 0; i < ApplicationNameL.size(); ++i) {
-			ApplicationNameL[i] = tolower(ApplicationNameL[i]);
-		}
-
-		std::vector <std::string> pixmaps;
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + FullGameName + ".png");
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + FullGameNameL + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + FullGameName + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + FullGameNameL + ".png");
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + ApplicationName + ".png");
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + ApplicationNameL + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + ApplicationName + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + ApplicationNameL + ".png");
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + "Stratagus" + ".png");
-		pixmaps.push_back(std::string() + PIXMAPS + "/" + "stratagus" + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + "Stratagus" + ".png");
-		pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + "stratagus" + ".png");
-
-		for (size_t i = 0; i < pixmaps.size(); ++i) {
-			if (stat(pixmaps[i].c_str(), &st) == 0) {
-				if (g) { CGraphic::Free(g); }
-				g = CGraphic::New(pixmaps[i].c_str());
-				g->Load();
-				icon = g->Surface;
-				if (icon) { break; }
-			}
-		}
-
-		if (icon) {
-			SDL_WM_SetIcon(icon, 0);
-		}
-
-		if (g) {
-			CGraphic::Free(g);
-		}
+	SDL_Surface *icon = NULL;
+	CGraphic *g = NULL;
+	struct stat st;
+
+	std::string FullGameNameL = FullGameName;
+	for (size_t i = 0; i < FullGameNameL.size(); ++i) {
+		FullGameNameL[i] = tolower(FullGameNameL[i]);
+	}
+
+	std::string ApplicationName = Parameters::Instance.applicationName;
+	std::string ApplicationNameL = ApplicationName;
+	for (size_t i = 0; i < ApplicationNameL.size(); ++i) {
+		ApplicationNameL[i] = tolower(ApplicationNameL[i]);
+	}
+
+	std::vector <std::string> pixmaps;
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + FullGameName + ".png");
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + FullGameNameL + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + FullGameName + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + FullGameNameL + ".png");
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + ApplicationName + ".png");
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + ApplicationNameL + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + ApplicationName + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + ApplicationNameL + ".png");
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + "Stratagus" + ".png");
+	pixmaps.push_back(std::string() + PIXMAPS + "/" + "stratagus" + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + "Stratagus" + ".png");
+	pixmaps.push_back(std::string() + "/usr/share/pixmaps" + "/" + "stratagus" + ".png");
+
+	for (size_t i = 0; i < pixmaps.size(); ++i) {
+		if (stat(pixmaps[i].c_str(), &st) == 0) {
+			if (g) { CGraphic::Free(g); }
+			g = CGraphic::New(pixmaps[i].c_str());
+			g->Load();
+			icon = g->Surface;
+			if (icon) { break; }
+		}
+	}
+
+	if (icon) {
+		SDL_WM_SetIcon(icon, 0);
+	}
+
+	if (g) {
+		CGraphic::Free(g);
+	}
 
 #if defined(USE_OPENGL) || defined(USE_GLES)
-		UseOpenGL = UseOpenGL_orig;
+	UseOpenGL = UseOpenGL_orig;
 #endif
 
 #endif
 #ifdef USE_WIN32
-		HWND hwnd = NULL;
-		HICON hicon = NULL;
-		SDL_SysWMinfo info;
-		SDL_VERSION(&info.version);
-
-		if (SDL_GetWMInfo(&info)) {
-			hwnd = info.window;
-		}
-
-		if (hwnd) {
-			hicon = ExtractIcon(GetModuleHandle(NULL), Parameters::Instance.applicationName.c_str(), 0);
-		}
-
-		if (hicon) {
-			SendMessage(hwnd, (UINT)WM_SETICON, ICON_SMALL, (LPARAM)hicon);
-			SendMessage(hwnd, (UINT)WM_SETICON, ICON_BIG, (LPARAM)hicon);
-		}
+	HWND hwnd = NULL;
+	HICON hicon = NULL;
+	SDL_SysWMinfo info;
+	SDL_VERSION(&info.version);
+
+	if (SDL_GetWMInfo(&info)) {
+		hwnd = info.window;
+	}
+
+	if (hwnd) {
+		hicon = ExtractIcon(GetModuleHandle(NULL), Parameters::Instance.applicationName.c_str(), 0);
+	}
+
+	if (hicon) {
+		SendMessage(hwnd, (UINT)WM_SETICON, ICON_SMALL, (LPARAM)hicon);
+		SendMessage(hwnd, (UINT)WM_SETICON, ICON_BIG, (LPARAM)hicon);
+	}
 #endif
-	}
 
 	// Initialize the display
 

=== modified file 'src/video/video.cpp'
--- src/video/video.cpp	2013-04-13 00:57:39 +0000
+++ src/video/video.cpp	2013-04-23 18:34:43 +0000
@@ -480,3 +480,77 @@
 #endif
 
 //@}
+
+/*
+ * Lua queries for video information
+ */
+ 
+static Uint32 GetVideoFlags(){
+	Uint32 flags = 0;
+	
+#if !defined(USE_OPENGL) && !defined(USE_GLES)
+	flags = SDL_HWSURFACE | SDL_HWPALETTE;
+#endif
+
+	if (Video.FullScreen) {
+		flags |= SDL_FULLSCREEN;
+	}
+
+#if defined(USE_OPENGL) || defined(USE_GLES)
+#ifdef USE_GLES_NATIVE
+	flags |= SDL_OPENGLES;
+#endif
+#ifdef USE_GLES_MAEMO
+	flags |= SDL_SWSURFACE;
+#endif
+#ifdef USE_OPENGL
+	flags |= SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+#endif
+#endif
+	
+	return flags;
+}
+
+int GetAvailableResolutions(lua_State *l)
+{
+	SDL_Rect** modes = SDL_ListModes(NULL, GetVideoFlags());
+	if (modes == (SDL_Rect**)-1 || modes == (SDL_Rect**)0) {
+		lua_pushnil(l);
+	}
+	else {
+		lua_newtable(l);
+		int mainTable = lua_gettop(l);
+		int index = 0;
+		
+		for(int i=0;modes[i];++i){
+			lua_newtable(l);
+			int subTable = lua_gettop(l);
+			lua_pushnumber(l, lua_Number(modes[i]->w));
+			lua_rawseti(l, subTable, 1);
+			lua_pushnumber(l, lua_Number(modes[i]->h));
+			lua_rawseti(l, subTable, 2);
+			
+			lua_rawseti(l, mainTable, ++index);
+		}
+	}
+	
+	return 1;
+}
+
+int GetCurrentResolution(lua_State *l)
+{
+	lua_newtable(l);
+	int mainTable = lua_gettop(l);
+	lua_pushnumber(l, lua_Number(SDL_GetVideoInfo()->current_w));
+	lua_rawseti(l, mainTable, 1);
+	lua_pushnumber(l, lua_Number(SDL_GetVideoInfo()->current_h));
+	lua_rawseti(l, mainTable, 2);
+	
+	return 1;
+}
+
+void VideoModesRegister()
+{
+	lua_register(Lua, "GetAvailableResolutions", GetAvailableResolutions);
+	lua_register(Lua, "GetCurrentResolution", GetCurrentResolution);
+}