X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fserverlist.qc;h=c6ee15a6b3ace79108014ad267170da13b47faf9;hb=49dd3844a37bb91e3c48654dead867b15ce94638;hp=c6c53cc8e01f4afa88df9f5ac838840b7ed1120c;hpb=82dbcadfd0556053b74638f2e3ae2e57103ddf26;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc
index c6c53cc8e0..503a975c32 100644
--- a/qcsrc/menu/xonotic/serverlist.qc
+++ b/qcsrc/menu/xonotic/serverlist.qc
@@ -1,168 +1,10 @@
-#ifdef INTERFACE
-CLASS(XonoticServerList) EXTENDS(XonoticListBox)
-	METHOD(XonoticServerList, configureXonoticServerList, void(entity))
-	ATTRIB(XonoticServerList, rowsPerItem, float, 1)
-	METHOD(XonoticServerList, draw, void(entity))
-	METHOD(XonoticServerList, drawListBoxItem, void(entity, float, vector, float))
-	METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector))
-	METHOD(XonoticServerList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticServerList, keyDown, float(entity, float, float, float))
-	METHOD(XonoticServerList, toggleFavorite, void(entity, string))
-
-	ATTRIB(XonoticServerList, iconsSizeFactor, float, 0.85)
-
-	ATTRIB(XonoticServerList, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticServerList, realUpperMargin, float, 0)
-	ATTRIB(XonoticServerList, columnIconsOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnIconsSize, float, 0)
-	ATTRIB(XonoticServerList, columnPingOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnPingSize, float, 0)
-	ATTRIB(XonoticServerList, columnNameOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnNameSize, float, 0)
-	ATTRIB(XonoticServerList, columnMapOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnMapSize, float, 0)
-	ATTRIB(XonoticServerList, columnTypeOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnTypeSize, float, 0)
-	ATTRIB(XonoticServerList, columnPlayersOrigin, float, 0)
-	ATTRIB(XonoticServerList, columnPlayersSize, float, 0)
-
-	ATTRIB(XonoticServerList, selectedServer, string, string_null) // to restore selected server when needed
-	METHOD(XonoticServerList, setSelected, void(entity, float))
-	METHOD(XonoticServerList, setSortOrder, void(entity, float, float))
-	ATTRIB(XonoticServerList, filterShowEmpty, float, 1)
-	ATTRIB(XonoticServerList, filterShowFull, float, 1)
-	ATTRIB(XonoticServerList, filterString, string, string_null)
-	ATTRIB(XonoticServerList, controlledTextbox, entity, NULL)
-	ATTRIB(XonoticServerList, ipAddressBox, entity, NULL)
-	ATTRIB(XonoticServerList, favoriteButton, entity, NULL)
-	ATTRIB(XonoticServerList, nextRefreshTime, float, 0)
-	METHOD(XonoticServerList, refreshServerList, void(entity, float)) // refresh mode: REFRESHSERVERLIST_*
-	ATTRIB(XonoticServerList, needsRefresh, float, 1)
-	METHOD(XonoticServerList, focusEnter, void(entity))
-	METHOD(XonoticServerList, positionSortButton, void(entity, entity, float, float, string, void(entity, entity)))
-	ATTRIB(XonoticServerList, sortButton1, entity, NULL)
-	ATTRIB(XonoticServerList, sortButton2, entity, NULL)
-	ATTRIB(XonoticServerList, sortButton3, entity, NULL)
-	ATTRIB(XonoticServerList, sortButton4, entity, NULL)
-	ATTRIB(XonoticServerList, sortButton5, entity, NULL)
-	ATTRIB(XonoticServerList, connectButton, entity, NULL)
-	ATTRIB(XonoticServerList, infoButton, entity, NULL)
-	ATTRIB(XonoticServerList, currentSortOrder, float, 0)
-	ATTRIB(XonoticServerList, currentSortField, float, -1)
-
-	ATTRIB(XonoticServerList, ipAddressBoxFocused, float, -1)
-
-	ATTRIB(XonoticServerList, seenIPv4, float, 0)
-	ATTRIB(XonoticServerList, seenIPv6, float, 0)
-	ATTRIB(XonoticServerList, categoriesHeight, float, 1.25)
-
-	METHOD(XonoticServerList, getTotalHeight, float(entity))
-	METHOD(XonoticServerList, getItemAtPos, float(entity, float))
-	METHOD(XonoticServerList, getItemStart, float(entity, float))
-	METHOD(XonoticServerList, getItemHeight, float(entity, float))
-ENDCLASS(XonoticServerList)
-entity makeXonoticServerList();
-
-#ifndef IMPLEMENTATION
-float autocvar_menu_slist_categories;
-float autocvar_menu_slist_categories_onlyifmultiple;
-float autocvar_menu_slist_purethreshold;
-float autocvar_menu_slist_modimpurity;
-float autocvar_menu_slist_recommendations;
-float autocvar_menu_slist_recommendations_maxping;
-float autocvar_menu_slist_recommendations_minfreeslots;
-float autocvar_menu_slist_recommendations_minhumans;
-float autocvar_menu_slist_recommendations_purethreshold;
-
-// server cache fields
-#define SLIST_FIELDS \
-	SLIST_FIELD(CNAME,       "cname") \
-	SLIST_FIELD(PING,        "ping") \
-	SLIST_FIELD(GAME,        "game") \
-	SLIST_FIELD(MOD,         "mod") \
-	SLIST_FIELD(MAP,         "map") \
-	SLIST_FIELD(NAME,        "name") \
-	SLIST_FIELD(MAXPLAYERS,  "maxplayers") \
-	SLIST_FIELD(NUMPLAYERS,  "numplayers") \
-	SLIST_FIELD(NUMHUMANS,   "numhumans") \
-	SLIST_FIELD(NUMBOTS,     "numbots") \
-	SLIST_FIELD(PROTOCOL,    "protocol") \
-	SLIST_FIELD(FREESLOTS,   "freeslots") \
-	SLIST_FIELD(PLAYERS,     "players") \
-	SLIST_FIELD(QCSTATUS,    "qcstatus") \
-	SLIST_FIELD(CATEGORY,    "category") \
-	SLIST_FIELD(ISFAVORITE,  "isfavorite")
-
-#define SLIST_FIELD(suffix,name) float SLIST_FIELD_##suffix;
-SLIST_FIELDS
-#undef SLIST_FIELD
-
-const float REFRESHSERVERLIST_RESORT = 0;    // sort the server list again to update for changes to e.g. favorite status, categories
-const float REFRESHSERVERLIST_REFILTER = 1;  // ..., also update filter and sort criteria
-const float REFRESHSERVERLIST_ASK = 2;       // ..., also suggest querying servers now
-const float REFRESHSERVERLIST_RESET = 3;     // ..., also clear the list first
-
-// function declarations
-float IsServerInList(string list, string srv);
-#define IsFavorite(srv) IsServerInList(cvar_string("net_slist_favorites"), srv)
-#define IsPromoted(srv) IsServerInList(_Nex_ExtResponseSystem_PromotedServers, srv)
-#define IsRecommended(srv) IsServerInList(_Nex_ExtResponseSystem_RecommendedServers, srv)
-
-entity RetrieveCategoryEnt(float catnum);
-
-float CheckCategoryOverride(float cat);
-float CheckCategoryForEntry(float entry);
-float m_gethostcachecategory(float entry) { return CheckCategoryOverride(CheckCategoryForEntry(entry)); }
-
-void RegisterSLCategories();
-
-void ServerList_Connect_Click(entity btn, entity me);
-void ServerList_Categories_Click(entity box, entity me);
-void ServerList_ShowEmpty_Click(entity box, entity me);
-void ServerList_ShowFull_Click(entity box, entity me);
-void ServerList_Filter_Change(entity box, entity me);
-void ServerList_Favorite_Click(entity btn, entity me);
-void ServerList_Info_Click(entity btn, entity me);
-void ServerList_Update_favoriteButton(entity btn, entity me);
-
-// fields for category entities
-const float MAX_CATEGORIES = 9;
-const float CATEGORY_FIRST = 1;
-entity categories[MAX_CATEGORIES];
-float category_ent_count;
-.string cat_name;
-.string cat_string;
-.string cat_enoverride_string;
-.string cat_dioverride_string;
-.float cat_enoverride;
-.float cat_dioverride;
-
-// fields for drawing categories
-float category_name[MAX_CATEGORIES];
-float category_item[MAX_CATEGORIES];
-float category_draw_count;
-
-#define SLIST_CATEGORIES \
-	SLIST_CATEGORY(CAT_FAVORITED,    "",            "",             ZCTX(_("SLCAT^Favorites"))) \
-	SLIST_CATEGORY(CAT_RECOMMENDED,  "",            "",             ZCTX(_("SLCAT^Recommended"))) \
-	SLIST_CATEGORY(CAT_NORMAL,       "",            "CAT_SERVERS",  ZCTX(_("SLCAT^Normal Servers"))) \
-	SLIST_CATEGORY(CAT_SERVERS,      "CAT_NORMAL",  "CAT_SERVERS",  ZCTX(_("SLCAT^Servers"))) \
-	SLIST_CATEGORY(CAT_XPM,          "CAT_NORMAL",  "CAT_SERVERS",  ZCTX(_("SLCAT^Competitive Mode"))) \
-	SLIST_CATEGORY(CAT_MODIFIED,     "",            "CAT_SERVERS",  ZCTX(_("SLCAT^Modified Servers"))) \
-	SLIST_CATEGORY(CAT_OVERKILL,     "",            "CAT_SERVERS",  ZCTX(_("SLCAT^Overkill Mode"))) \
-	SLIST_CATEGORY(CAT_INSTAGIB,     "",            "CAT_SERVERS",  ZCTX(_("SLCAT^InstaGib Mode"))) \
-	SLIST_CATEGORY(CAT_DEFRAG,       "",            "CAT_SERVERS",  ZCTX(_("SLCAT^Defrag Mode")))
-
-#define SLIST_CATEGORY_AUTOCVAR(name) autocvar_menu_slist_categories_##name##_override
-#define SLIST_CATEGORY(name,enoverride,dioverride,str) \
-	float name; \
-	string SLIST_CATEGORY_AUTOCVAR(name) = enoverride;
-SLIST_CATEGORIES
-#undef SLIST_CATEGORY
+#include "serverlist.qh"
 
-#endif
-#endif
-#ifdef IMPLEMENTATION
+#include "checkbox.qh"
+#include "inputbox.qh"
+#include "mainwindow.qh"
+#include "dialog_multiplayer_join_serverinfo.qh"
+#include <common/mapinfo.qh>
 
 void RegisterSLCategories()
 {
@@ -170,17 +12,15 @@ void RegisterSLCategories()
 	#define SLIST_CATEGORY(name,enoverride,dioverride,str) \
 		SET_FIELD_COUNT(name, CATEGORY_FIRST, category_ent_count) \
 		CHECK_MAX_COUNT(name, MAX_CATEGORIES, category_ent_count, "SLIST_CATEGORY") \
-		cat = spawn(); \
-		categories[name - 1] = cat; \
-		cat.classname = "slist_category"; \
-		cat.cat_name = strzone(#name); \
+		cat = categories[name - 1] = new(slist_category); \
+		cat.cat_name = #name; \
 		cat.cat_enoverride_string = strzone(SLIST_CATEGORY_AUTOCVAR(name)); \
 		cat.cat_dioverride_string = strzone(dioverride); \
 		cat.cat_string = strzone(str);
 	SLIST_CATEGORIES
 	#undef SLIST_CATEGORY
 
-	float i, x, catnum;
+	int i, x, catnum;
 	string s;
 
 	#define PROCESS_OVERRIDE(override_string,override_field) \
@@ -197,20 +37,20 @@ void RegisterSLCategories()
 				} } \
 				if(catnum) \
 				{ \
-					strunzone(categories[i].override_string); \
+					strfree(categories[i].override_string); \
 					categories[i].override_field = catnum; \
 					continue; \
 				} \
 				else \
 				{ \
-					printf( \
-						"RegisterSLCategories(): Improper override '%s' for category '%s'!\n", \
+					LOG_INFOF( \
+						"RegisterSLCategories(): Improper override '%s' for category '%s'!", \
 						s, \
 						categories[i].cat_name \
 					); \
 				} \
 			} \
-			strunzone(categories[i].override_string); \
+			strfree(categories[i].override_string); \
 			categories[i].override_field = 0; \
 		}
 	PROCESS_OVERRIDE(cat_enoverride_string, cat_enoverride)
@@ -219,7 +59,7 @@ void RegisterSLCategories()
 }
 
 // Supporting Functions
-entity RetrieveCategoryEnt(float catnum)
+entity RetrieveCategoryEnt(int catnum)
 {
 	if((catnum > 0) && (catnum <= category_ent_count))
 	{
@@ -228,14 +68,14 @@ entity RetrieveCategoryEnt(float catnum)
 	else
 	{
 		error(sprintf("RetrieveCategoryEnt(%d): Improper category number!\n", catnum));
-		return world;
+		return NULL;
 	}
 }
 
-float IsServerInList(string list, string srv)
+bool IsServerInList(string list, string srv)
 {
 	string p;
-	float i, n;
+	int i, n;
 	if(srv == "")
 		return false;
 	srv = netaddress_resolve(srv, 26000);
@@ -260,12 +100,12 @@ float IsServerInList(string list, string srv)
 	return false;
 }
 
-float CheckCategoryOverride(float cat)
+int CheckCategoryOverride(int cat)
 {
 	entity catent = RetrieveCategoryEnt(cat);
 	if(catent)
 	{
-		float override = (autocvar_menu_slist_categories ? catent.cat_enoverride : catent.cat_dioverride);
+		int override = (autocvar_menu_slist_categories ? catent.cat_enoverride : catent.cat_dioverride);
 		if(override) { return override; }
 		else { return cat; }
 	}
@@ -276,10 +116,10 @@ float CheckCategoryOverride(float cat)
 	}
 }
 
-float CheckCategoryForEntry(float entry)
+int CheckCategoryForEntry(int entry)
 {
 	string s, k, v, modtype = "";
-	float j, m, impure = 0, freeslots = 0, sflags = 0;
+	int j, m, impure = 0, freeslots = 0, sflags = 0;
 	s = gethostcachestring(SLIST_FIELD_QCSTATUS, entry);
 	m = tokenizebyseparator(s, ":");
 
@@ -370,7 +210,7 @@ float CheckCategoryForEntry(float entry)
 			case "cts":
 			case "xdf": { return CAT_DEFRAG; }
 
-			default: { dprintf("Found strange mod type: %s\n", modtype); return CAT_MODIFIED; }
+			default: { LOG_TRACEF("Found strange mod type: %s", modtype); return CAT_MODIFIED; }
 		}
 	}
 
@@ -378,69 +218,65 @@ float CheckCategoryForEntry(float entry)
 	return ((impure > autocvar_menu_slist_purethreshold) ? CAT_MODIFIED : CAT_NORMAL);
 }
 
-void XonoticServerList_toggleFavorite(entity me, string srv)
+METHOD(XonoticServerList, toggleFavorite, void(XonoticServerList this, string srv))
 {
-	string s, s0, s1, s2, srv_resolved, p;
-	float i, n, f;
-	srv_resolved = netaddress_resolve(srv, 26000);
-	p = crypto_getidfp(srv_resolved);
-	s = cvar_string("net_slist_favorites");
-	n = tokenize_console(s);
-	f = 0;
-	for(i = 0; i < n; ++i)
+	bool adding = true;
+	string srv_resolved = netaddress_resolve(srv, 26000);
+	string p = crypto_getidfp(srv_resolved);
+	string s = cvar_string("net_slist_favorites");
+	string ret = s;
+	for (int i = 0, n = tokenize_console(s); i < n; ++i)
 	{
-		if(substring(argv(i), 0, 1) != "[" && strlen(argv(i)) == 44 && strstrofs(argv(i), ".", 0) < 0)
+		bool match;
+		if (substring(argv(i), 0, 1) != "[" && strlen(argv(i)) == 44 && strstrofs(argv(i), ".", 0) < 0)
 		{
-			if(p)
-				if(argv(i) != p)
-					continue;
+			// it's a pubkey hash
+			match = (p && p == argv(i));
 		}
 		else
 		{
-			if(srv_resolved != netaddress_resolve(argv(i), 26000))
-				continue;
+			// it's an ip
+			match = (srv_resolved == netaddress_resolve(argv(i), 26000));
 		}
-		s0 = s1 = s2 = "";
-		if(i > 0)
-			s0 = substring(s, 0, argv_end_index(i - 1));
-		if(i < n-1)
-			s2 = substring(s, argv_start_index(i + 1), -1);
-		if(s0 != "" && s2 != "")
-			s1 = " ";
-		cvar_set("net_slist_favorites", strcat(s0, s1, s2));
-		s = cvar_string("net_slist_favorites");
+		if (!match) continue;
+		// on match: remove
+		adding = false;
+		string before = (i > 0) ? substring(s, 0, argv_end_index(i - 1)) : "";
+		string after = (i < n - 1) ? substring(s, argv_start_index(i + 1), -1) : "";
+		s = strcat(before, (before != "" && after != "" ? " " : ""), after);
+		ret = s;
+		// keep searching
+		// TODO: why not break here?
 		n = tokenize_console(s);
-		f = 1;
-		--i;
+		--i; // offset the increment that is about to happen
 	}
-
-	if(!f)
+	if (adding)
 	{
-		s1 = "";
-		if(s != "")
-			s1 = " ";
-		if(p)
-			cvar_set("net_slist_favorites", strcat(s, s1, p));
-		else
-			cvar_set("net_slist_favorites", strcat(s, s1, srv));
+		ret = strcat(s, (s != "" ? " " : ""), p ? p : srv);
 	}
-
-	me.refreshServerList(me, REFRESHSERVERLIST_RESORT);
+	cvar_set("net_slist_favorites", ret);
+	this.refreshServerList(this, REFRESHSERVERLIST_RESORT);
 }
 
 void ServerList_Update_favoriteButton(entity btn, entity me)
 {
-	me.favoriteButton.setText(me.favoriteButton,
-		(IsFavorite(me.ipAddressBox.text) ?
-			_("Remove") : _("Favorite")
-		)
-	);
+	entity e = me.favoriteButton;
+	if(IsFavorite(me.ipAddressBox.text))
+	{
+		e.setText(e, _("Remove"));
+		clearTooltip(e);
+	}
+	else
+	{
+		e.setText(e, _("Favorite"));
+		setZonedTooltip(e, _("Bookmark the currently highlighted server so that it's faster to find in the future"), string_null);
+	}
 }
 
 entity makeXonoticServerList()
 {
 	entity me;
-	me = spawnXonoticServerList();
+	me = NEW(XonoticServerList);
 	me.configureXonoticServerList(me);
 	return me;
 }
@@ -456,10 +292,10 @@ void XonoticServerList_configureXonoticServerList(entity me)
 	// clear list
 	me.nItems = 0;
 }
-void XonoticServerList_setSelected(entity me, float i)
+void XonoticServerList_setSelected(entity me, int i)
 {
-	float save;
-	save = me.selectedItem;
+	me.lockedSelectedItem = false;
+	//int save = me.selectedItem;
 	SUPER(XonoticServerList).setSelected(me, i);
 	/*
 	if(me.selectedItem == save)
@@ -470,22 +306,21 @@ void XonoticServerList_setSelected(entity me, float i)
 	if(gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT) != me.nItems)
 		return; // sorry, it would be wrong
 
-	if(me.selectedServer)
-		strunzone(me.selectedServer);
-	me.selectedServer = strzone(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem));
+	strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem));
 
 	me.ipAddressBox.setText(me.ipAddressBox, me.selectedServer);
 	me.ipAddressBox.cursorPos = strlen(me.selectedServer);
 	me.ipAddressBoxFocused = -1;
 }
-void XonoticServerList_refreshServerList(entity me, float mode)
+void XonoticServerList_refreshServerList(entity me, int mode)
 {
 	//print("refresh of type ", ftos(mode), "\n");
 
 	if(mode >= REFRESHSERVERLIST_REFILTER)
 	{
-		float m, i, n;
-		float listflags = 0;
+		float m;
+		int i, n;
+		int listflags = 0;
 		string s, typestr, modstr;
 
 		s = me.filterString;
@@ -573,7 +408,8 @@ void XonoticServerList_focusEnter(entity me)
 
 void XonoticServerList_draw(entity me)
 {
-	float i, found, owned;
+	int i;
+	bool found = false, owned;
 
 	if(_Nex_ExtResponseSystem_BannedServersNeedsRefresh)
 	{
@@ -631,9 +467,8 @@ void XonoticServerList_draw(entity me)
 		// entire list, otherwise there is no way to know which item is first in its category.
 
 		// binary search method suggested by div
-		float x;
 		float begin = 0;
-		for(x = 1; x <= category_ent_count; ++x) {
+		for(int j = 1; j <= category_ent_count; ++j) {
 			float first = begin;
 			float last = (itemcount - 1);
 			if (first > last) {
@@ -642,42 +477,42 @@ void XonoticServerList_draw(entity me)
 			}
 			float catf = gethostcachenumber(SLIST_FIELD_CATEGORY, first);
 			float catl = gethostcachenumber(SLIST_FIELD_CATEGORY, last);
-			if (catf > x) {
-				// The first one is already > x.
-				// Therefore, category x does not exist.
+			if (catf > j) {
+				// The first one is already > j.
+				// Therefore, category j does not exist.
 				// Higher numbered categories do exist though.
-			} else if (catl < x) {
-				// The last one is < x.
+			} else if (catl < j) {
+				// The last one is < j.
 				// Thus this category - and any following -
 				// don't exist.
 				break;
-			} else if (catf == x) {
+			} else if (catf == j) {
 				// Starts at first. This breaks the loop
 				// invariant in the binary search and thus has
 				// to be handled separately.
-				if(gethostcachenumber(SLIST_FIELD_CATEGORY, first) != x)
+				if(gethostcachenumber(SLIST_FIELD_CATEGORY, first) != j)
 					error("Category mismatch I");
 				if(first > 0)
-					if(gethostcachenumber(SLIST_FIELD_CATEGORY, first - 1) == x)
+					if(gethostcachenumber(SLIST_FIELD_CATEGORY, first - 1) == j)
 						error("Category mismatch II");
-				category_name[category_draw_count] = x;
+				category_name[category_draw_count] = j;
 				category_item[category_draw_count] = first;
 				++category_draw_count;
 				begin = first + 1;
 			} else {
-				// At this point, catf <= x < catl, thus
+				// At this point, catf <= j < catl, thus
 				// catf < catl, thus first < last.
 				// INVARIANTS:
 				// last - first >= 1
 				// catf == gethostcachenumber(SLIST_FIELD_CATEGORY(first)
 				// catl == gethostcachenumber(SLIST_FIELD_CATEGORY(last)
-				// catf < x
-				// catl >= x
+				// catf < j
+				// catl >= j
 				while (last - first > 1) {
 					float middle = floor((first + last) / 2);
 					// By loop condition, middle != first && middle != last.
 					float cat = gethostcachenumber(SLIST_FIELD_CATEGORY, middle);
-					if (cat >= x) {
+					if (cat >= j) {
 						last = middle;
 						catl = cat;
 					} else {
@@ -685,13 +520,13 @@ void XonoticServerList_draw(entity me)
 						catf = cat;
 					}
 				}
-				if (catl == x) {
-					if(gethostcachenumber(SLIST_FIELD_CATEGORY, last) != x)
+				if (catl == j) {
+					if(gethostcachenumber(SLIST_FIELD_CATEGORY, last) != j)
 						error("Category mismatch III");
 					if(last > 0)
-						if(gethostcachenumber(SLIST_FIELD_CATEGORY, last - 1) == x)
+						if(gethostcachenumber(SLIST_FIELD_CATEGORY, last - 1) == j)
 							error("Category mismatch IV");
-					category_name[category_draw_count] = x;
+					category_name[category_draw_count] = j;
 					category_item[category_draw_count] = last;
 					++category_draw_count;
 					begin = last + 1; // already scanned through these, skip 'em
@@ -710,19 +545,30 @@ void XonoticServerList_draw(entity me)
 	}
 	else { me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT); }
 
-	me.connectButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == ""));
-	me.infoButton.disabled = ((me.nItems == 0) || !owned);
-	me.favoriteButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == ""));
+	me.connectButton.disabled = (me.lockedSelectedItem || (me.nItems == 0 && me.ipAddressBox.text == ""));
+	me.infoButton.disabled = (me.lockedSelectedItem || me.nItems == 0 || !owned);
+	me.favoriteButton.disabled = (me.lockedSelectedItem || (me.nItems == 0 && me.ipAddressBox.text == ""));
 
-	found = 0;
-	if(me.selectedServer)
+	if(me.lockedSelectedItem)
+	{
+		if(me.nItems > 0)
+		{
+			if(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem) != me.selectedServer)
+			{
+				strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem));
+			}
+			found = true;
+		}
+	}
+	else if(me.selectedServer)
 	{
 		for(i = 0; i < me.nItems; ++i)
 		{
 			if(gethostcachestring(SLIST_FIELD_CNAME, i) == me.selectedServer)
 			{
+				// don't follow the selected item with SUPER(XonoticServerList).setSelected(me, i);
 				me.selectedItem = i;
-				found = 1;
+				found = true;
 				break;
 			}
 		}
@@ -731,11 +577,10 @@ void XonoticServerList_draw(entity me)
 	{
 		if(me.nItems > 0)
 		{
+			// selected server disappeared, select the last server (scrolling to it)
 			if(me.selectedItem >= me.nItems)
-				me.selectedItem = me.nItems - 1;
-			if(me.selectedServer)
-				strunzone(me.selectedServer);
-			me.selectedServer = strzone(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem));
+				SUPER(XonoticServerList).setSelected(me, me.nItems - 1);
+			strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem));
 		}
 	}
 
@@ -776,10 +621,8 @@ void ServerList_PlayerSort_Click(entity btn, entity me)
 }
 void ServerList_TypeSort_Click(entity btn, entity me)
 {
-	string s, t;
-	float i, m;
-	s = me.filterString;
-	m = strstrofs(s, ":", 0);
+	string s = me.filterString;
+	int m = strstrofs(s, ":", 0);
 	if(m >= 0)
 	{
 		s = substring(s, 0, m);
@@ -789,30 +632,23 @@ void ServerList_TypeSort_Click(entity btn, entity me)
 	else
 		s = "";
 
-	for(i = 1; ; i *= 2) // 20 modes ought to be enough for anyone
-	{
-		t = MapInfo_Type_ToString(i);
-		if(i > 1)
-			if(t == "") // it repeats (default case)
-			{
-				// no type was found
-				// choose the first one
-				s = MapInfo_Type_ToString(1);
-				break;
-			}
-		if(s == t)
-		{
-			// the type was found
-			// choose the next one
-			s = MapInfo_Type_ToString(i * 2);
-			if(s == "")
-				s = MapInfo_Type_ToString(1);
-			break;
-		}
+	Gametype first = NULL; FOREACH(Gametypes, !first, first = it; break);
+	bool flag = false;
+	FOREACH(Gametypes, s == MapInfo_Type_ToString(it), {
+		// the type was found
+		// choose the next one
+		flag = true;
+		s = MapInfo_Type_ToString(Gametypes_from(it.m_id + 1));
+		if (s == "") s = MapInfo_Type_ToString(first);
+		break;
+	});
+	if (!flag) {
+		// no type was found
+		// choose the first one
+		s = MapInfo_Type_ToString(first);
 	}
 
-	if(s != "")
-		s = strcat(s, ":");
+	if(s != "") s = strcat(s, ":");
 	s = strcat(s, substring(me.filterString, m+1, strlen(me.filterString) - m - 1));
 
 	me.controlledTextbox.setText(me.controlledTextbox, s);
@@ -822,12 +658,9 @@ void ServerList_TypeSort_Click(entity btn, entity me)
 }
 void ServerList_Filter_Change(entity box, entity me)
 {
-	if(me.filterString)
-		strunzone(me.filterString);
+	strfree(me.filterString);
 	if(box.text != "")
 		me.filterString = strzone(box.text);
-	else
-		me.filterString = string_null;
 	me.refreshServerList(me, REFRESHSERVERLIST_REFILTER);
 
 	me.ipAddressBox.setText(me.ipAddressBox, "");
@@ -861,7 +694,7 @@ void ServerList_ShowFull_Click(entity box, entity me)
 	me.ipAddressBox.cursorPos = 0;
 	me.ipAddressBoxFocused = -1;
 }
-void XonoticServerList_setSortOrder(entity me, float fld, float direction)
+void XonoticServerList_setSortOrder(entity me, int fld, int direction)
 {
 	if(me.currentSortField == fld)
 		direction = -me.currentSortOrder;
@@ -873,9 +706,7 @@ void XonoticServerList_setSortOrder(entity me, float fld, float direction)
 	me.sortButton4.forcePressed = 0;
 	me.sortButton5.forcePressed = (fld == SLIST_FIELD_NUMHUMANS);
 	me.selectedItem = 0;
-	if(me.selectedServer)
-		strunzone(me.selectedServer);
-	me.selectedServer = string_null;
+	strfree(me.selectedServer);
 	me.refreshServerList(me, REFRESHSERVERLIST_REFILTER);
 }
 void XonoticServerList_positionSortButton(entity me, entity btn, float theOrigin, float theSize, string theTitle, void(entity, entity) theFunc)
@@ -917,13 +748,12 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize,
 	me.columnPlayersOrigin = me.columnTypeOrigin + me.columnTypeSize + me.realFontSize.x;
 
 	me.positionSortButton(me, me.sortButton1, me.columnPingOrigin, me.columnPingSize, _("Ping"), ServerList_PingSort_Click);
-	me.positionSortButton(me, me.sortButton2, me.columnNameOrigin, me.columnNameSize, _("Host name"), ServerList_NameSort_Click);
+	me.positionSortButton(me, me.sortButton2, me.columnNameOrigin, me.columnNameSize, _("Hostname"), ServerList_NameSort_Click);
 	me.positionSortButton(me, me.sortButton3, me.columnMapOrigin, me.columnMapSize, _("Map"), ServerList_MapSort_Click);
 	me.positionSortButton(me, me.sortButton4, me.columnTypeOrigin, me.columnTypeSize, _("Type"), ServerList_TypeSort_Click);
 	me.positionSortButton(me, me.sortButton5, me.columnPlayersOrigin, me.columnPlayersSize, _("Players"), ServerList_PlayerSort_Click);
 
-	float f;
-	f = me.currentSortField;
+	int f = me.currentSortField;
 	if(f >= 0)
 	{
 		me.currentSortField = -1;
@@ -932,22 +762,19 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize,
 }
 void ServerList_Connect_Click(entity btn, entity me)
 {
-	localcmd(sprintf("connect %s\n",
-		((me.ipAddressBox.text != "") ?
-			me.ipAddressBox.text : me.selectedServer
-		)
-	));
+	if (me.lockedSelectedItem)
+		return;
+	string sv = (me.ipAddressBox.text != "") ? me.ipAddressBox.text : me.selectedServer;
+	localcmd(sprintf("connect %s\n", sv));
 }
-void ServerList_Favorite_Click(entity btn, entity me)
+void ServerList_Favorite_Click(entity btn, entity this)
 {
-	string ipstr;
-	ipstr = netaddress_resolve(me.ipAddressBox.text, 26000);
-	if(ipstr != "")
-	{
-		m_play_click_sound(MENU_SOUND_SELECT);
-		me.toggleFavorite(me, me.ipAddressBox.text);
-		me.ipAddressBoxFocused = -1;
-	}
+	string addr = this.ipAddressBox.text;
+	string ipstr = netaddress_resolve(addr, 26000);
+	if (ipstr == "") return;
+	m_play_click_sound(MENU_SOUND_SELECT);
+	this.toggleFavorite(this, addr);
+	this.ipAddressBoxFocused = -1;
 }
 void ServerList_Info_Click(entity btn, entity me)
 {
@@ -958,18 +785,20 @@ void ServerList_Info_Click(entity btn, entity me)
 	vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
 	DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
 }
-void XonoticServerList_doubleClickListBoxItem(entity me, float i, vector where)
+void XonoticServerList_doubleClickListBoxItem(entity me, int i, vector where)
 {
 	ServerList_Connect_Click(NULL, me);
 }
-void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
+void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
 	// layout: Ping, Server name, Map name, NP, TP, MP
-	float p, q;
-	float isv4, isv6;
+	float p;
+	int q;
+	bool isv4, isv6;
 	vector theColor;
 	float theAlpha;
-	float m, pure, freeslots, j, sflags;
+	bool pure = false, pure_available = false;
+	int freeslots = -1, sflags = -1, j, m;
 	string s, typestr, versionstr, k, v, modname;
 
 	//printf("time: %f, i: %d, item: %d, nitems: %d\n", time, i, item, me.nItems);
@@ -1014,8 +843,13 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		}
 	}
 
-	if(isSelected)
+	if(isSelected && !me.lockedSelectedItem)
 		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(isFocused)
+	{
+		me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+	}
 
 	s = gethostcachestring(SLIST_FIELD_QCSTATUS, i);
 	m = tokenizebyseparator(s, ":");
@@ -1026,9 +860,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		versionstr = argv(1);
 	}
 	freeslots = -1;
-	sflags = -1;
 	modname = "";
-	pure = 0;
 	for(j = 2; j < m; ++j)
 	{
 		if(argv(j) == "")
@@ -1036,11 +868,14 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		k = substring(argv(j), 0, 1);
 		v = substring(argv(j), 1, -1);
 		if(k == "P")
-			pure = stof(v);
+		{
+			pure = (stof(v) == 0);
+			pure_available = true;
+		}
 		else if(k == "S")
 			freeslots = stof(v);
 		else if(k == "F")
-			sflags = stof(v);
+			sflags = stoi(v);
 		else if(k == "M")
 			modname = v;
 	}
@@ -1050,21 +885,24 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		modname = "Xonotic";
 #endif
 
+	string original_modname = modname;
+	modname = strtolower(modname);
+
 	/*
 	SLIST_FIELD_MOD = gethostcacheindexforkey("mod");
 	s = gethostcachestring(SLIST_FIELD_MOD, i);
 	if(s != "data")
-		if(modname == "Xonotic")
+		if(modname == "xonotic")
 			modname = s;
 	*/
 
 	// list the mods here on which the pure server check actually works
-	if(modname != "Xonotic")
-	if(modname != "InstaGib" || modname != "MinstaGib")
-	if(modname != "CTS")
-	if(modname != "NIX")
-	if(modname != "NewToys")
-		pure = 0;
+	if(modname != "xonotic")
+	if(modname != "instagib" || modname != "minstagib")
+	if(modname != "cts")
+	if(modname != "nix")
+	if(modname != "newtoys")
+		pure_available = false;
 
 	if(gethostcachenumber(SLIST_FIELD_FREESLOTS, i) <= 0)
 		theAlpha = SKINALPHA_SERVERLIST_FULL;
@@ -1076,9 +914,9 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 		theAlpha = 1;
 
 	p = gethostcachenumber(SLIST_FIELD_PING, i);
-	const float PING_LOW = 75;
-	const float PING_MED = 200;
-	const float PING_HIGH = 500;
+	const int PING_LOW = 75;
+	const int PING_MED = 200;
+	const int PING_HIGH = 500;
 	if(p < PING_LOW)
 		theColor = SKINCOLOR_SERVERLIST_LOWPING + (SKINCOLOR_SERVERLIST_MEDPING - SKINCOLOR_SERVERLIST_LOWPING) * (p / PING_LOW);
 	else if(p < PING_MED)
@@ -1102,15 +940,15 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 
 	s = gethostcachestring(SLIST_FIELD_CNAME, i);
 
-	isv4 = isv6 = 0;
+	isv4 = isv6 = false;
 	if(substring(s, 0, 1) == "[")
 	{
-		isv6 = 1;
+		isv6 = true;
 		me.seenIPv6 += 1;
 	}
-	else if(strstrofs("0123456789", substring(s, 0, 1), 0) >= 0)
+	else if(IS_DIGIT(substring(s, 0, 1)))
 	{
-		isv4 = 1;
+		isv4 = true;
 		me.seenIPv4 += 1;
 	}
 
@@ -1154,58 +992,65 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 	iconPos_x = (me.columnIconsSize - 3 * iconSize.x) * 0.5;
 	iconPos_y = (1 - iconSize.y) * 0.5;
 
-	string n;
-
-	if (!(me.seenIPv4 && me.seenIPv6))
+	// IP
+	if(me.seenIPv4 && me.seenIPv6)
 	{
-		iconPos.x += iconSize.x * 0.5;
-	}
-	else if(me.seenIPv4 && me.seenIPv6)
-	{
-		n = string_null;
 		if(isv6)
-			draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), 0); // PRECACHE_PIC_MIPMAP
+			draw_Picture(iconPos, "icon_ipv6", iconSize, '1 1 1', 1);
 		else if(isv4)
-			draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), 0); // PRECACHE_PIC_MIPMAP
-		if(n)
-			draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
-		iconPos.x += iconSize.x;
+			draw_Picture(iconPos, "icon_ipv4", iconSize, '1 1 1', 1);
 	}
 
+	iconPos.x += iconSize.x;
+
+	// AES
 	if(q > 0)
-	{
-		draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), 0); // PRECACHE_PIC_MIPMAP
-		draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
-	}
+		draw_Picture(iconPos, strcat("icon_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
+
 	iconPos.x += iconSize.x;
 
-	if(modname == "Xonotic")
+	// Mod
+	if(modname == "xonotic")
 	{
-		if(pure == 0)
-		{
-			draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_pure1"), PRECACHE_PIC_MIPMAP);
-			draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
-		}
+		// Here, pure_available should always be set. If not, consider
+		// it an impurity.
+		if(pure_available && pure)
+			draw_Picture(iconPos, "icon_pure1", iconSize, '1 1 1', 1);
 	}
 	else
 	{
-		draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_mod_", modname), PRECACHE_PIC_MIPMAP);
-		if(draw_PictureSize(n) == '0 0 0')
-			draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_mod_"), PRECACHE_PIC_MIPMAP);
-		if(pure == 0)
-			draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
+		string icon = strcat("icon_mod_", modname);
+		if(draw_PictureSize(icon) == '0 0 0')
+			icon = "icon_mod_";
+
+		// In mods, pure_available not being present indicates
+		// non-support of the feature. Just show the mod icon as is
+		// then.
+		if(pure_available && !pure)
+			draw_Picture(iconPos, icon, iconSize, '1 1 1', SKINALPHA_SERVERLIST_ICON_NONPURE);
 		else
-			draw_Picture(iconPos, n, iconSize, '1 1 1', SKINALPHA_SERVERLIST_ICON_NONPURE);
+			draw_Picture(iconPos, icon, iconSize, '1 1 1', 1);
 	}
+
 	iconPos.x += iconSize.x;
 
+	// Stats
 	if(sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS))
+		draw_Picture(iconPos, "icon_stats1", iconSize, '1 1 1', 1);
+
+	if(isFocused && me.mouseOverIcons && !me.tooltip)
 	{
-		draw_PreloadPictureWithFlags(n = strcat(SKINGFX_SERVERLIST_ICON, "_stats1"), 0); // PRECACHE_PIC_MIPMAP
-		draw_Picture(iconPos, n, iconSize, '1 1 1', 1);
+		string t = "";
+		if(me.seenIPv4 && me.seenIPv6)
+			t = strcat(t, (isv6) ? "IPv6, " : "IPv4, ");
+		t = strcat(t, _("encryption:"), " ", (q ? sprintf(_("AES level %d"), q) : ZCTX(_("ENC^none"))), ", ");
+		t = strcat(t, sprintf(_("mod: %s"), ((modname == "xonotic") ? ZCTX(_("MOD^Default")) : original_modname)));
+		if(pure_available)
+			t = strcat(t, sprintf(" (%s)", (pure) ? _("official settings") : _("modified settings")));
+		t = strcat(t, ", ");
+		t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? _("stats enabled") : _("stats disabled")));
+		setZonedTooltip(me, t, string_null);
 	}
-	iconPos.x += iconSize.x;
-
 	// --------------
 	//  RENDER TEXT
 	// --------------
@@ -1231,7 +1076,27 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 	draw_Text(me.realUpperMargin * eY + (me.columnPlayersOrigin + (me.columnPlayersSize - draw_TextWidth(s, 0, me.realFontSize)) * 0.5) * eX, s, me.realFontSize, theColor, theAlpha, 0);
 }
 
-float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
+void XonoticServerList_focusedItemChangeNotify(entity me)
+{
+	clearTooltip(me);
+}
+
+float XonoticServerList_mouseMove(entity me, vector pos)
+{
+	if(!SUPER(XonoticServerList).mouseMove(me, pos))
+	{
+		me.mouseOverIcons = false;
+		clearTooltip(me);
+		return 1;
+	}
+
+	me.mouseOverIcons = (pos_x <= me.columnIconsSize);
+	if(!me.mouseOverIcons)
+		clearTooltip(me);
+	return 1;
+}
+
+bool XonoticServerList_keyDown(entity me, int scan, bool ascii, bool shift)
 {
 	vector org, sz;
 
@@ -1241,7 +1106,7 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
 	if(scan == K_ENTER || scan == K_KP_ENTER)
 	{
 		ServerList_Connect_Click(NULL, me);
-		return 1;
+		return true;
 	}
 	else if(scan == K_MOUSE2 || scan == K_SPACE)
 	{
@@ -1250,9 +1115,9 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
 			m_play_click_sound(MENU_SOUND_OPEN);
 			main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
 			DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
-			return 1;
+			return true;
 		}
-		return 0;
+		return false;
 	}
 	else if(scan == K_INS || scan == K_MOUSE3 || scan == K_KP_INS)
 	{
@@ -1260,28 +1125,30 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
 		{
 			me.toggleFavorite(me, me.selectedServer);
 			me.ipAddressBoxFocused = -1;
-			return 1;
+			return true;
 		}
-		return 0;
+		return false;
 	}
 	else if(SUPER(XonoticServerList).keyDown(me, scan, ascii, shift))
-		return 1;
+		return true;
 	else if(!me.controlledTextbox)
-		return 0;
+		return false;
 	else
 		return me.controlledTextbox.keyDown(me.controlledTextbox, scan, ascii, shift);
 }
 
-float XonoticServerList_getTotalHeight(entity me) {
+float XonoticServerList_getTotalHeight(entity me)
+{
 	float num_normal_rows = me.nItems;
-	float num_headers = category_draw_count;
+	int num_headers = category_draw_count;
 	return me.itemHeight * (num_normal_rows + me.categoriesHeight * num_headers);
 }
-float XonoticServerList_getItemAtPos(entity me, float pos) {
+int XonoticServerList_getItemAtPos(entity me, float pos)
+{
 	pos = pos / me.itemHeight;
-	float i;
+	int i;
 	for (i = category_draw_count - 1; i >= 0; --i) {
-		float itemidx = category_item[i];
+		int itemidx = category_item[i];
 		float itempos = i * me.categoriesHeight + category_item[i];
 		if (pos >= itempos + me.categoriesHeight + 1)
 			return itemidx + 1 + floor(pos - (itempos + me.categoriesHeight + 1));
@@ -1291,10 +1158,11 @@ float XonoticServerList_getItemAtPos(entity me, float pos) {
 	// No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
 	return floor(pos);
 }
-float XonoticServerList_getItemStart(entity me, float item) {
-	float i;
+float XonoticServerList_getItemStart(entity me, int item)
+{
+	int i;
 	for (i = category_draw_count - 1; i >= 0; --i) {
-		float itemidx = category_item[i];
+		int itemidx = category_item[i];
 		float itempos = i * me.categoriesHeight + category_item[i];
 		if (item >= itemidx + 1)
 			return (itempos + me.categoriesHeight + 1 + item - (itemidx + 1)) * me.itemHeight;
@@ -1304,8 +1172,9 @@ float XonoticServerList_getItemStart(entity me, float item) {
 	// No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
 	return item * me.itemHeight;
 }
-float XonoticServerList_getItemHeight(entity me, float item) {
-	float i;
+float XonoticServerList_getItemHeight(entity me, int item)
+{
+	int i;
 	for (i = 0; i < category_draw_count; ++i) {
 		// Matches exactly the headings with increased height.
 		if (item == category_item[i])
@@ -1313,5 +1182,3 @@ float XonoticServerList_getItemHeight(entity me, float item) {
 	}
 	return me.itemHeight;
 }
-
-#endif