From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 16 Jan 2011 21:22:02 +0000 (+0100)
Subject: reject resolutions with aspect ratio > 2:1 (broken X.org xinerama stuff); if no resol... 
X-Git-Tag: xonotic-v0.5.0~318^2~88^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a13232cc795c78134c9692dc07c6ceaa343f3bac;p=xonotic%2Fxonotic-data.pk3dir.git

reject resolutions with aspect ratio > 2:1 (broken X.org xinerama stuff); if no resolution got added at all, use a standard list
---

diff --git a/qcsrc/menu/xonotic/slider_resolution.c b/qcsrc/menu/xonotic/slider_resolution.c
index 0cfa6ad2a..06991f35a 100644
--- a/qcsrc/menu/xonotic/slider_resolution.c
+++ b/qcsrc/menu/xonotic/slider_resolution.c
@@ -85,9 +85,22 @@ void XonoticResolutionSlider_configureXonoticResolutionSlider(entity me)
 		r0 = r;
 		if(r_x < 640 || r_y < 480)
 			continue;
+		if(r_x > 2 * r_y) // likely dualscreen resolution, skip this one
+			continue;
 		me.addResolution(me, r_x, r_y, r_z);
 	}
 
+	if(me.nValues == 0)
+	{
+		me.addResolution(me, 640, 480, 1);
+		me.addResolution(me, 800, 600, 1);
+		me.addResolution(me, 1024, 768, 1);
+		me.addResolution(me, 1280, 960, 1);
+		me.addResolution(me, 1280, 1024, 1);
+		me.addResolution(me, 1650, 1080, 1);
+		me.addResolution(me, 1920, 1080, 1);
+	}
+
 	me.configureXonoticTextSliderValues(me);
 }
 void XonoticResolutionSlider_loadCvars(entity me)