Add Lua function get_video_modes() for main menu

Zeno- · Zeno- · commit 2430b2e9981a · 2015-03-28T13:26:03.000+10:00
Also updates and uses porting::getSupportedVideoModes()
diff --git a/src/porting.cpp b/src/porting.cpp
@@ -570,16 +570,20 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,
 }
 
 #ifndef SERVER
+
 v2u32 getWindowSize()
 {
 	return device->getVideoDriver()->getScreenSize();
 }
 
 
-std::vector<core::vector3d<u32> > getVideoModes()
+std::vector<core::vector3d<u32> > getSupportedVideoModes()
 {
+	IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
+	sanity_check(nulldevice != NULL);
+
 	std::vector<core::vector3d<u32> > mlist;
-	video::IVideoModeList *modelist = device->getVideoModeList();
+	video::IVideoModeList *modelist = nulldevice->getVideoModeList();
 
 	u32 num_modes = modelist->getVideoModeCount();
 	for (u32 i = 0; i != num_modes; i++) {
@@ -588,6 +592,8 @@ std::vector<core::vector3d<u32> > getVideoModes()
 		mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));
 	}
 
+	nulldevice->drop();
+
 	return mlist;
 }
 
diff --git a/src/porting.h b/src/porting.h
@@ -371,6 +371,7 @@ float getDisplayDensity();
 v2u32 getDisplaySize();
 v2u32 getWindowSize();
 
+std::vector<core::vector3d<u32> > getSupportedVideoModes();
 std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers();
 const char *getVideoDriverName(irr::video::E_DRIVER_TYPE type);
 const char *getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type);
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
@@ -1056,6 +1056,28 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
 	return 1;
 }
 
+/******************************************************************************/
+int ModApiMainMenu::l_get_video_modes(lua_State *L)
+{
+	std::vector<core::vector3d<u32> > videomodes
+		= porting::getSupportedVideoModes();
+
+	lua_newtable(L);
+	for (u32 i = 0; i != videomodes.size(); i++) {
+		lua_newtable(L);
+		lua_pushnumber(L, videomodes[i].X);
+		lua_setfield(L, -2, "w");
+		lua_pushnumber(L, videomodes[i].Y);
+		lua_setfield(L, -2, "h");
+		lua_pushnumber(L, videomodes[i].Z);
+		lua_setfield(L, -2, "depth");
+
+		lua_rawseti(L, -2, i + 1);
+	}
+
+	return 1;
+}
+
 /******************************************************************************/
 int ModApiMainMenu::l_gettext(lua_State *L)
 {
@@ -1164,6 +1186,7 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
 	API_FCT(sound_stop);
 	API_FCT(gettext);
 	API_FCT(get_video_drivers);
+	API_FCT(get_video_modes);
 	API_FCT(get_screen_info);
 	API_FCT(get_min_supp_proto);
 	API_FCT(get_max_supp_proto);
diff --git a/src/script/lua_api/l_mainmenu.h b/src/script/lua_api/l_mainmenu.h
@@ -137,6 +137,8 @@ class ModApiMainMenu : public ModApiBase {
 
 	static int l_get_video_drivers(lua_State *L);
 
+	static int l_get_video_modes(lua_State *L);
+
 	//version compatibility
 	static int l_get_min_supp_proto(lua_State *L);
 

Original file line number	Diff line number	Diff line change
`@@ -570,16 +570,20 @@ void setXorgClassHint(const video::SExposedVideoData &video_data,`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`#ifndef SERVER`
	`573`	`+`
`573`	`574`	`v2u32 getWindowSize()`
`574`	`575`	`{`
`575`	`576`	`return device->getVideoDriver()->getScreenSize();`
`576`	`577`	`}`
`577`	`578`
`578`	`579`
`579`		`-std::vector<core::vector3d<u32> > getVideoModes()`
	`580`	`+std::vector<core::vector3d<u32> > getSupportedVideoModes()`
`580`	`581`	`{`
	`582`	`+ IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);`
	`583`	`+ sanity_check(nulldevice != NULL);`
	`584`	`+`
`581`	`585`	`std::vector<core::vector3d<u32> > mlist;`
`582`		`- video::IVideoModeList *modelist = device->getVideoModeList();`
	`586`	`+ video::IVideoModeList *modelist = nulldevice->getVideoModeList();`
`583`	`587`
`584`	`588`	`u32 num_modes = modelist->getVideoModeCount();`
`585`	`589`	`for (u32 i = 0; i != num_modes; i++) {`
`@@ -588,6 +592,8 @@ std::vector<core::vector3d<u32> > getVideoModes()`
`588`	`592`	`mlist.push_back(core::vector3d<u32>(mode_res.Width, mode_res.Height, mode_depth));`
`589`	`593`	`}`
`590`	`594`
	`595`	`+ nulldevice->drop();`
	`596`	`+`
`591`	`597`	`return mlist;`
`592`	`598`	`}`
`593`	`599`