X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcolorpicker.qc;h=357276e16adf3794334eb7d640089b78350504ca;hb=fcd31ea01083f448ef36785ad0bdb4244927fa42;hp=f16ab0ebd45fd0a16a0f941e06cfb9766941fe69;hpb=4e85c153239969d8dccea38031e18ddb24b6c935;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/colorpicker.qc b/qcsrc/menu/xonotic/colorpicker.qc
index f16ab0ebd..357276e16 100644
--- a/qcsrc/menu/xonotic/colorpicker.qc
+++ b/qcsrc/menu/xonotic/colorpicker.qc
@@ -1,25 +1,11 @@
-#ifdef INTERFACE
-CLASS(XonoticColorpicker) EXTENDS(Image)
-	METHOD(XonoticColorpicker, configureXonoticColorpicker, void(entity, entity))
-	METHOD(XonoticColorpicker, mousePress, float(entity, vector))
-	METHOD(XonoticColorpicker, mouseRelease, float(entity, vector))
-	METHOD(XonoticColorpicker, mouseDrag, float(entity, vector))
-	ATTRIB(XonoticColorpicker, controlledTextbox, entity, NULL)
-	ATTRIB(XonoticColorpicker, image, string, SKINGFX_COLORPICKER)
-	ATTRIB(XonoticColorpicker, imagemargin, vector, SKINMARGIN_COLORPICKER)
-	ATTRIB(XonoticColorpicker, focusable, float, 1)
-	METHOD(XonoticColorpicker, focusLeave, void(entity))
-	METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float))
-	METHOD(XonoticColorpicker, draw, void(entity))
-ENDCLASS(XonoticColorpicker)
-entity makeXonoticColorpicker(entity theTextbox);
-#endif
-
-#ifdef IMPLEMENTATION
+#include "colorpicker.qh"
+
+#include "inputbox.qh"
+
 entity makeXonoticColorpicker(entity theTextbox)
 {
 	entity me;
-	me = spawnXonoticColorpicker();
+	me = NEW(XonoticColorpicker);
 	me.configureXonoticColorpicker(me, theTextbox);
 	return me;
 }
@@ -84,7 +70,7 @@ float XonoticColorpicker_mouseDrag(entity me, vector coords)
 				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)
+					if(IS_DIGIT(substring(me.controlledTextbox.text, i-1, 1)))
 					{
 						me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
 						me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
@@ -101,9 +87,9 @@ float XonoticColorpicker_mouseDrag(entity me, vector coords)
 				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)
+					if(IS_HEXDIGIT(substring(me.controlledTextbox.text, i - 3, 1)))
+						if(IS_HEXDIGIT(substring(me.controlledTextbox.text, i - 2, 1)))
+							if(IS_HEXDIGIT(substring(me.controlledTextbox.text, i - 1, 1)))
 							{
 								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
 								me.controlledTextbox.keyDown(me.controlledTextbox, K_BACKSPACE, 8, 0);
@@ -172,4 +158,3 @@ void XonoticColorpicker_draw(entity me)
 	draw_Picture(me.imgOrigin, strcat(me.src, "_m"), me.imgSize, '0 0 0', aC);
 	draw_Picture(me.imgOrigin, strcat(me.src, "_m"), me.imgSize, me.color, B);
 }
-#endif