X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Finputbox.c;h=78bab2bccb33418b146c79e75cf08fc4722211f2;hb=615bb68a764d1dc8064077a1c86a349975ad3e5b;hp=9e42f3bf6fc0fa61c56f54f5bd92e2ab80612223;hpb=1c2bdc1f0012349f80906e05902ce19bed35be16;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c
index 9e42f3bf6..78bab2bcc 100644
--- a/qcsrc/menu/xonotic/inputbox.c
+++ b/qcsrc/menu/xonotic/inputbox.c
@@ -5,9 +5,9 @@ CLASS(XonoticInputBox) EXTENDS(InputBox)
 	METHOD(XonoticInputBox, setText, void(entity, string))
 	ATTRIB(XonoticInputBox, fontSize, float, SKINFONTSIZE_NORMAL)
 	ATTRIB(XonoticInputBox, image, string, SKINGFX_INPUTBOX)
-	ATTRIB(XonoticInputBox, onChange, void(entity, entity), SUB_Null)
+	ATTRIB(XonoticInputBox, onChange, void(entity, entity), func_null)
 	ATTRIB(XonoticInputBox, onChangeEntity, entity, NULL)
-	ATTRIB(XonoticInputBox, onEnter, void(entity, entity), SUB_Null)
+	ATTRIB(XonoticInputBox, onEnter, void(entity, entity), func_null)
 	ATTRIB(XonoticInputBox, onEnterEntity, entity, NULL)
 	ATTRIB(XonoticInputBox, marginLeft, float, SKINMARGIN_INPUTBOX_CHARS)
 	ATTRIB(XonoticInputBox, marginRight, float, SKINMARGIN_INPUTBOX_CHARS)
@@ -19,6 +19,9 @@ CLASS(XonoticInputBox) EXTENDS(InputBox)
 	// Clear button attributes
 	ATTRIB(XonoticInputBox, cb_offset, float, SKINOFFSET_CLEARBUTTON) // bound to range -1, 0
 	ATTRIB(XonoticInputBox, cb_src, string, SKINGFX_CLEARBUTTON)
+	ATTRIB(XonoticInputBox, cb_color, vector, SKINCOLOR_CLEARBUTTON_N)
+	ATTRIB(XonoticInputBox, cb_colorF, vector, SKINCOLOR_CLEARBUTTON_F)
+	ATTRIB(XonoticInputBox, cb_colorC, vector, SKINCOLOR_CLEARBUTTON_C)
 
 	ATTRIB(XonoticInputBox, cvarName, string, string_null)
 	METHOD(XonoticInputBox, loadCvars, void(entity))
@@ -59,7 +62,8 @@ void XonoticInputBox_setText(entity me, string new)
 	if(me.text != new)
 	{
 		SUPER(XonoticInputBox).setText(me, new);
-		me.onChange(me, me.onChangeEntity);
+		if(me.onChange)
+			me.onChange(me, me.onChangeEntity);
 		if(me.saveImmediately)
 			me.saveCvars(me);
 	}
@@ -68,13 +72,13 @@ void XonoticInputBox_setText(entity me, string new)
 }
 void XonoticInputBox_loadCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!me.cvarName)
 		return;
 	SUPER(XonoticInputBox).setText(me, cvar_string(me.cvarName));
 }
 void XonoticInputBox_saveCvars(entity me)
 {
-	if not(me.cvarName)
+	if (!me.cvarName)
 		return;
 	cvar_set(me.cvarName, me.text);
 }
@@ -89,7 +93,8 @@ float XonoticInputBox_keyDown(entity me, float key, float ascii, float shift)
 			me.saveCvars(me);
 			r = 1;
 		}
-		me.onEnter(me, me.onEnterEntity);
+		if(me.onEnter)
+			me.onEnter(me, me.onEnterEntity);
 	}
 	if(SUPER(XonoticInputBox).keyDown(me, key, ascii, shift))
 		r = 1;