X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem.c;h=d055b1a051d535dbfd18736751eb2357c25003a0;hb=f839eb5485ea9c494954e580e8d3e398159a5047;hp=b249ce9eb713ae20e30fd1507c639a6806719946;hpb=0e7ed909bffb4ff21f0c68d163edfc17487e380a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item.c b/qcsrc/menu/item.c
index b249ce9eb..d055b1a05 100644
--- a/qcsrc/menu/item.c
+++ b/qcsrc/menu/item.c
@@ -26,76 +26,108 @@ ENDCLASS(Item)
 #endif
 
 #ifdef IMPLEMENTATION
-void destroyItem(entity me)
+void Item_destroy(entity me)
 {
 	// free memory associated with me
 }
 
-void relinquishFocusItem(entity me)
+void Item_relinquishFocus(entity me)
 {
 	if(me.parent)
 		if(me.parent.instanceOfContainer)
 			me.parent.setFocus(me.parent, NULL);
 }
 
-void resizeNotifyItem(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void Item_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
 	me.origin = absOrigin;
 	me.size = absSize;
-	// me.tooltip = "The quick brown fox jumped over the lazy sleeping dog's back then sat on a tack. Franz jagt im komplett verwahrlosten Taxi quer durch Bayern.";
 }
 
-void drawItem(entity me)
+float autocvar_menu_showboxes;
+void Item_draw(entity me)
 {
+	if(autocvar_menu_showboxes)
+	{
+		vector rgb = '1 0 1';
+		float a = fabs(autocvar_menu_showboxes);
+
+		// don't draw containers and border images
+		if(me.instanceOfContainer || me.instanceOfBorderImage)
+		{
+			rgb = '0 0 0';
+			a = 0;
+		}
+
+#if 0
+		// hack to detect multi drawing
+		float r = random() * 3;
+		if(r >= 2)
+			rgb = '1 0 0';
+		else if(r >= 1)
+			rgb = '0 1 0';
+		else
+			rgb = '0 0 1';
+#endif
+		if(autocvar_menu_showboxes < 0)
+		{
+			draw_Fill('0 0 0', '0.5 0.5 0', rgb, a);
+			draw_Fill('0.5 0.5 0', '0.5 0.5 0', rgb, a);
+		}
+		if(autocvar_menu_showboxes > 0)
+		{
+			draw_Fill('0 0 0', '1 1 0', rgb, a);
+		}
+	}
 }
 
-void showNotifyItem(entity me)
+void Item_showNotify(entity me)
 {
 }
 
-void hideNotifyItem(entity me)
+void Item_hideNotify(entity me)
 {
 }
 
-float keyDownItem(entity me, float scan, float ascii, float shift)
+float Item_keyDown(entity me, float scan, float ascii, float shift)
 {
 	return 0; // unhandled
 }
 
-float keyUpItem(entity me, float scan, float ascii, float shift)
+float Item_keyUp(entity me, float scan, float ascii, float shift)
 {
 	return 0; // unhandled
 }
 
-float mouseMoveItem(entity me, vector pos)
+float Item_mouseMove(entity me, vector pos)
 {
 	return 0; // unhandled
 }
 
-float mousePressItem(entity me, vector pos)
+float Item_mousePress(entity me, vector pos)
 {
 	return 0; // unhandled
 }
 
-float mouseDragItem(entity me, vector pos)
+float Item_mouseDrag(entity me, vector pos)
 {
 	return 0; // unhandled
 }
 
-float mouseReleaseItem(entity me, vector pos)
+float Item_mouseRelease(entity me, vector pos)
 {
 	return 0; // unhandled
 }
 
-void focusEnterItem(entity me)
+void Item_focusEnter(entity me)
 {
 }
 
-void focusLeaveItem(entity me)
+void Item_focusLeave(entity me)
 {
 }
 
-string toStringItem(entity me)
+string Item_toString(entity me)
 {
 	return string_null;
 }