X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker.c;h=e0727373c14b3a4795db1cde2f3caadaec45bfbc;hp=66f292a0369588ae675b237fc0580d1d8cf34a04;hb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;hpb=c94e06a08777b32dea9a5b3a3934da16f50803bf

diff --git a/qcsrc/menu/xonotic/colorpicker.c b/qcsrc/menu/xonotic/colorpicker.c
index 66f292a03..e0727373c 100644
--- a/qcsrc/menu/xonotic/colorpicker.c
+++ b/qcsrc/menu/xonotic/colorpicker.c
@@ -53,7 +53,7 @@ vector hslimage_color(vector v, vector margin)
 
 vector color_hslimage(vector v, vector margin)
 {
-	vector pos;
+	vector pos = '0 0 0';
 	v = rgb_to_hsl(v);
 	if (v_y)
 	{
@@ -72,39 +72,60 @@ vector color_hslimage(vector v, vector margin)
 
 float XonoticColorpicker_mouseDrag(entity me, vector coords)
 {
-	float i;
+	float i, carets;
 	for(;;)
 	{
 		i = me.controlledTextbox.cursorPos;
 		if(i >= 2)
 		{
 			if(substring(me.controlledTextbox.text, i-2, 1) == "^")
-				if(strstrofs("0123456789", substring(me.controlledTextbox.text, i-1, 1), 0) >= 0)
-				{
-					me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-					me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-					continue;
-				}
+			{
+				carets = 1;
+				while (i - 2 - carets >= 0 && substring(me.controlledTextbox.text, i - 2 - carets, 1) == "^")
+					++carets;
+				if (carets & 1)
+					if(strstrofs("0123456789", substring(me.controlledTextbox.text, i-1, 1), 0) >= 0)
+					{
+						me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+						me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+						continue;
+					}
+			}
 		}
 
 		if(i >= 5)
 		{
 			if(substring(me.controlledTextbox.text, i-5, 2) == "^x")
-				if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-3, 1), 0) >= 0)
-					if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-2, 1), 0) >= 0)
-						if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-1, 1), 0) >= 0)
-						{
-							me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-							me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-							me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-							me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-							me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
-							continue;
-						}
+			{
+				carets = 1;
+				while (i - 5 - carets >= 0 && substring(me.controlledTextbox.text, i - 5 - carets, 1) == "^")
+					++carets;
+				if (carets & 1)
+					if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-3, 1), 0) >= 0)
+						if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-2, 1), 0) >= 0)
+							if(strstrofs("0123456789abcdefABCDEF", substring(me.controlledTextbox.text, i-1, 1), 0) >= 0)
+							{
+								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
+								continue;
+							}
+			}
 		}
 		break;
 	}
 
+	if(substring(me.controlledTextbox.text, i-1, 1) == "^")
+	{
+		carets = 1;
+		while (i - 1 - carets >= 0 && substring(me.controlledTextbox.text, i - 1 - carets, 1) == "^")
+			++carets;
+		if (carets & 1)
+			me.controlledTextbox.enterText(me.controlledTextbox, "^"); // escape previous caret
+	}
+
 	vector margin;
 	margin = me.imagemargin;
 	if(coords_x >= margin_x)
@@ -141,7 +162,7 @@ void XonoticColorpicker_draw(entity me)
 	// for this to work, C/(1-B) must be in 0..1
 	// B must be < 1
 	// C must be < 1-B
-	
+
 	B = bound(0, B, 1);
 	C = bound(0, C, 1-B);