X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fserverlist.c;h=3cd3338bc74f5541e31383cf11c09b7f23ee24ae;hb=60a4aa95129e30c512d4f36e249d451865aa1503;hp=95e1f80b81d2971d37658f40ae85da4c1e7448b5;hpb=73aacea5ecd160c845d8fdc15cacf443eddc79ca;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index 95e1f80b8..3cd3338bc 100644
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -8,8 +8,12 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox)
 	METHOD(XonoticServerList, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(XonoticServerList, keyDown, float(entity, float, float, float))
 
+	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)
@@ -48,6 +52,9 @@ CLASS(XonoticServerList) EXTENDS(XonoticListBox)
 	ATTRIB(XonoticServerList, lastClickedTime, float, 0)
 
 	ATTRIB(XonoticServerList, ipAddressBoxFocused, float, -1)
+
+	ATTRIB(XonoticServerList, seenIPv4, float, 0)
+	ATTRIB(XonoticServerList, seenIPv6, float, 0)
 ENDCLASS(XonoticServerList)
 entity makeXonoticServerList();
 void ServerList_Connect_Click(entity btn, entity me);
@@ -100,6 +107,8 @@ float IsFavorite(string srv)
 	if(srv == "")
 		return FALSE;
 	srv = netaddress_resolve(srv, 26000);
+	if(srv == "")
+		return FALSE;
 	p = crypto_getidfp(srv);
 	n = tokenize_console(cvar_string("net_slist_favorites"));
 	for(i = 0; i < n; ++i)
@@ -345,9 +354,9 @@ void XonoticServerList_draw(entity me)
 		if(me.ipAddressBox.focused || me.ipAddressBoxFocused < 0)
 		{
 			if(IsFavorite(me.ipAddressBox.text))
-				me.favoriteButton.setText(me.favoriteButton, "Remove");
+				me.favoriteButton.setText(me.favoriteButton, _("Remove"));
 			else
-				me.favoriteButton.setText(me.favoriteButton, "Bookmark");
+				me.favoriteButton.setText(me.favoriteButton, _("Bookmark"));
 		}
 		me.ipAddressBoxFocused = me.ipAddressBox.focused;
 	}
@@ -490,22 +499,24 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize,
 	me.realFontSize_x = me.fontSize / (absSize_x * (1 - me.controlWidth));
 	me.realUpperMargin = 0.5 * (1 - me.realFontSize_y);
 
-	me.columnPingOrigin = 0;
-	me.columnPingSize = me.realFontSize_x * 4;
-	me.columnMapSize = me.realFontSize_x * 12;
+	me.columnIconsOrigin = 0;
+	me.columnIconsSize = me.realFontSize_x * 3 * me.iconsSizeFactor;
+	me.columnPingSize = me.realFontSize_x * 3;
+	me.columnMapSize = me.realFontSize_x * 10;
 	me.columnTypeSize = me.realFontSize_x * 4;
-	me.columnPlayersSize = me.realFontSize_x * 6;
-	me.columnNameSize = 1 - me.columnPlayersSize - me.columnMapSize - me.columnPingSize - me.columnTypeSize - 4 * me.realFontSize_x;
+	me.columnPlayersSize = me.realFontSize_x * 5;
+	me.columnNameSize = 1 - me.columnPlayersSize - me.columnMapSize - me.columnPingSize - me.columnIconsSize - me.columnTypeSize - 5 * me.realFontSize_x;
+	me.columnPingOrigin = me.columnIconsOrigin + me.columnIconsSize + me.realFontSize_x;
 	me.columnNameOrigin = me.columnPingOrigin + me.columnPingSize + me.realFontSize_x;
 	me.columnMapOrigin = me.columnNameOrigin + me.columnNameSize + me.realFontSize_x;
 	me.columnTypeOrigin = me.columnMapOrigin + me.columnMapSize + me.realFontSize_x;
 	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.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);
+	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.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;
@@ -553,6 +564,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 	// layout: Ping, Server name, Map name, NP, TP, MP
 	string s;
 	float p, q;
+	float isv4, isv6;
 	vector theColor;
 	float theAlpha;
 
@@ -592,16 +604,80 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 	}
 
 	s = gethostcachestring(SLIST_FIELD_CNAME, i);
+
+	isv4 = isv6 = 0;
+	if(substring(s, 0, 1) == "[")
+	{
+		isv6 = 1;
+		me.seenIPv6 += 1;
+	}
+	else if(strstrofs("0123456789", substring(s, 0, 1), 0) >= 0)
+	{
+		isv4 = 1;
+		me.seenIPv4 += 1;
+	}
+
 	q = stof(substring(crypto_getencryptlevel(s), 0, 1));
 	if((q <= 0 && cvar("crypto_aeslevel") >= 3) || (q >= 3 && cvar("crypto_aeslevel") <= 0))
 	{
 		theColor = SKINCOLOR_SERVERLIST_IMPOSSIBLE;
 		theAlpha = SKINALPHA_SERVERLIST_IMPOSSIBLE;
 	}
-	// TODO show an icon for encryption status
+
+	if(q == 1)
+	{
+		if(cvar("crypto_aeslevel") >= 2)
+			q |= 4;
+	}
+	if(q == 2)
+	{
+		if(cvar("crypto_aeslevel") >= 1)
+			q |= 4;
+	}
+	if(q == 3)
+		q = 5;
+	if(q >= 3)
+		q -= 2;
+	// possible status:
+	// 0: crypto off
+	// 1: AES possible
+	// 2: AES recommended but not available
+	// 3: AES possible and will be used
+	// 4: AES recommended and will be used
+	// 5: AES required
+
+	s = gethostcachestring(SLIST_FIELD_QCSTATUS, i);
+	{
+		vector iconSize;
+		iconSize_y = me.realFontSize_y * me.iconsSizeFactor;
+		iconSize_x = me.realFontSize_x * me.iconsSizeFactor;
+
+		vector iconPos;
+		iconPos_x = (me.columnIconsSize - 3 * iconSize_x) * 0.5;
+		iconPos_y = (1 - iconSize_y) * 0.5;
+
+		if not(me.seenIPv4 && me.seenIPv6)
+		{
+			iconPos_x += iconSize_x * 0.5;
+		}
+		else if(me.seenIPv4 && me.seenIPv6)
+		{
+			if(isv6)
+				draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv6"), iconSize, '1 1 1', 1);
+			else if(isv4)
+				draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_ipv4"), iconSize, '1 1 1', 1);
+			iconPos_x += iconSize_x;
+		}
+
+		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_aeslevel", ftos(q)), iconSize, '1 1 1', 1);
+		iconPos_x += iconSize_x;
+
+		draw_Picture(iconPos, strcat(SKINGFX_SERVERLIST_ICON, "_pure", ftos(strstrofs(s, ":P0:", 0) >= 0)), iconSize, '1 1 1', 1);
+		iconPos_x += iconSize_x;
+	}
 
 	s = ftos(p);
-	draw_Text(me.realUpperMargin * eY + (me.columnPingSize - draw_TextWidth(s, 0, me.realFontSize)) * eX, s, me.realFontSize, theColor, theAlpha, 0);
+	draw_Text(me.realUpperMargin * eY + (me.columnPingOrigin + me.columnPingSize - draw_TextWidth(s, 0, me.realFontSize)) * eX, s, me.realFontSize, theColor, theAlpha, 0);
 	s = draw_TextShortenToWidth(gethostcachestring(SLIST_FIELD_NAME, i), me.columnNameSize, 0, me.realFontSize);
 	draw_Text(me.realUpperMargin * eY + me.columnNameOrigin * eX, s, me.realFontSize, theColor, theAlpha, 0);
 	s = draw_TextShortenToWidth(gethostcachestring(SLIST_FIELD_MAP, i), me.columnMapSize, 0, me.realFontSize);
@@ -633,8 +709,11 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
 	}
 	else if(scan == K_MOUSE2 || scan == K_SPACE)
 	{
-		main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
-		DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
+		if(me.nItems != 0)
+		{
+			main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
+			DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
+		}
 	}
 	else if(scan == K_INS || scan == K_MOUSE3 || scan == K_KP_INS)
 	{