X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=c8a380ff16752ba3f5d3af424249f62eda3b220d;hb=403fa67c24301d440ae0871c2e31e1e395133a41;hp=bdac86700da292ff60ac2c0e7c3bb515d572cd74;hpb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index bdac8670..c8a380ff 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -1549,7 +1549,13 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
   return gi;
 }
 
-static void default_callback_function(void *ptr)
+static void default_callback_info(void *ptr)
+{
+  if (game_status == LEVELED)
+    HandleEditorGadgetInfoText(ptr);
+}
+
+static void default_callback_action(void *ptr)
 {
   return;
 }
@@ -1564,8 +1570,9 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 
   /* always start with reliable default values */
   memset(new_gadget, 0, sizeof(struct GadgetInfo));	/* zero all fields */
-  new_gadget->id = getNewGadgetID();			/* new gadget id */
-  new_gadget->callback = default_callback_function;	/* dummy function */
+  new_gadget->id = getNewGadgetID();
+  new_gadget->callback_info = default_callback_info;
+  new_gadget->callback_action = default_callback_action;
 
   while (tag != GDI_END)
   {
@@ -1575,6 +1582,10 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->custom_id = va_arg(ap, int);
 	break;
 
+      case GDI_DESCRIPTION_TEXT:
+	new_gadget->description_text = va_arg(ap, char *);
+	break;
+
       case GDI_X:
 	new_gadget->x = va_arg(ap, int);
 	break;
@@ -1737,8 +1748,12 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->scrollbar.item_position = va_arg(ap, int);
 	break;
 
-      case GDI_CALLBACK:
-	new_gadget->callback = va_arg(ap, gadget_callback_function);
+      case GDI_CALLBACK_INFO:
+	new_gadget->callback_info = va_arg(ap, gadget_function);
+	break;
+
+      case GDI_CALLBACK_ACTION:
+	new_gadget->callback_action = va_arg(ap, gadget_function);
 	break;
 
       default:
@@ -1985,8 +2000,6 @@ void AdjustScrollbar(struct GadgetInfo *gi, int items_max, int item_pos)
   if (gs->item_position == gs->items_max - gs->items_visible)
     gs->position = gs->position_max;
 
-  printf("gs->item_position == %d\n", gs->item_position);
-
   if (gi->mapped)
     DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 }
@@ -2013,9 +2026,10 @@ static struct GadgetInfo *last_gi = NULL;
 
 void HandleGadgets(int mx, int my, int button)
 {
+  static struct GadgetInfo *last_info_gi = NULL;
   static unsigned long pressed_delay = 0;
-  static last_button = 0;
-  static last_mx = 0, last_my = 0;
+  static int last_button = 0;
+  static int last_mx = 0, last_my = 0;
   int scrollbar_mouse_pos;
   struct GadgetInfo *new_gi, *gi;
   boolean press_event;
@@ -2029,6 +2043,7 @@ void HandleGadgets(int mx, int my, int button)
   boolean gadget_released;
   boolean gadget_released_inside;
   boolean gadget_released_off_borders;
+  boolean changed_position = FALSE;
 
   /* check if there are any gadgets defined */
   if (gadget_list_first_entry == NULL)
@@ -2056,7 +2071,7 @@ void HandleGadgets(int mx, int my, int button)
     DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
-      gi->callback(gi);
+      gi->callback_action(gi);
 
     last_gi = NULL;
   }
@@ -2090,18 +2105,36 @@ void HandleGadgets(int mx, int my, int button)
   if (button == 0 && last_gi && last_gi->type != GD_TYPE_TEXTINPUT)
     last_gi = NULL;
 
-  if (gi)
+  if (new_gi)
   {
-    gi->event.x = mx - gi->x;
-    gi->event.y = my - gi->y;
+    int last_x = new_gi->event.x;
+    int last_y = new_gi->event.y;
 
-    if (gi->type == GD_TYPE_DRAWING_AREA)
+    new_gi->event.x = mx - new_gi->x;
+    new_gi->event.y = my - new_gi->y;
+
+    if (new_gi->type == GD_TYPE_DRAWING_AREA)
     {
-      gi->event.x /= gi->drawing.item_xsize;
-      gi->event.y /= gi->drawing.item_ysize;
+      new_gi->event.x /= new_gi->drawing.item_xsize;
+      new_gi->event.y /= new_gi->drawing.item_ysize;
+
+      if (last_x != new_gi->event.x || last_y != new_gi->event.y)
+	changed_position = TRUE;
     }
   }
 
+  /* handle gadget popup info text */
+  if (last_info_gi != new_gi ||
+      (new_gi && new_gi->type == GD_TYPE_DRAWING_AREA))
+  {
+    last_info_gi = new_gi;
+
+    if (new_gi != NULL)
+      new_gi->callback_info(new_gi);
+    else
+      default_callback_info(NULL);
+  }
+
   if (gadget_pressed)
   {
     if (gi->type == GD_TYPE_RADIO_BUTTON)
@@ -2152,7 +2185,8 @@ void HandleGadgets(int mx, int my, int button)
 
 	struct GadgetScrollbar *gs = &gi->scrollbar;
 	int old_item_position = gs->item_position;
-	boolean changed_position = FALSE;
+
+	changed_position = FALSE;
 
 	gs->item_position +=
 	  gs->items_visible * (mpos < gpos + gi->scrollbar.position ? -1 : +1);
@@ -2166,8 +2200,6 @@ void HandleGadgets(int mx, int my, int button)
 	{
 	  gi->event.item_position = gs->item_position;
 	  changed_position = TRUE;
-
-	  printf("gs->item_position == %d\n", gs->item_position);
 	}
 
 	AdjustScrollbar(gi, gs->items_max, gs->item_position);
@@ -2177,7 +2209,7 @@ void HandleGadgets(int mx, int my, int button)
 	gi->event.off_borders = FALSE;
 
 	if (gi->event_mask & GD_EVENT_MOVING && changed_position)
-	  gi->callback(gi);
+	  gi->callback_action(gi);
 
 	/* don't handle this scrollbar anymore while mouse button pressed */
 	last_gi = NULL;
@@ -2198,20 +2230,18 @@ void HandleGadgets(int mx, int my, int button)
     DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
 
     if (gi->event_mask & GD_EVENT_PRESSED)
-      gi->callback(gi);
+      gi->callback_action(gi);
   }
 
   if (gadget_pressed_repeated)
   {
     if (gi->event_mask & GD_EVENT_REPEATED &&
 	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
-      gi->callback(gi);
+      gi->callback_action(gi);
   }
 
   if (gadget_moving)
   {
-    boolean changed_position = FALSE;
-
     if (gi->type & GD_TYPE_BUTTON)
     {
       if (gadget_moving_inside && gi->state == GD_BUTTON_UNPRESSED)
@@ -2238,8 +2268,6 @@ void HandleGadgets(int mx, int my, int button)
       {
 	gi->event.item_position = gs->item_position;
 	changed_position = TRUE;
-
-	printf("gs->item_position == %d\n", gs->item_position);
       }
 
       DrawGadget(gi, DG_PRESSED, DG_DIRECT);
@@ -2252,7 +2280,7 @@ void HandleGadgets(int mx, int my, int button)
 
     if (gi->event_mask & GD_EVENT_MOVING && changed_position &&
 	(gadget_moving_inside || gi->event_mask & GD_EVENT_OFF_BORDERS))
-      gi->callback(gi);
+      gi->callback_action(gi);
   }
 
   if (gadget_released_inside)
@@ -2264,7 +2292,7 @@ void HandleGadgets(int mx, int my, int button)
     gi->event.type = GD_EVENT_RELEASED;
 
     if (gi->event_mask & GD_EVENT_RELEASED)
-      gi->callback(gi);
+      gi->callback_action(gi);
   }
 
   if (gadget_released_off_borders)
@@ -2276,7 +2304,7 @@ void HandleGadgets(int mx, int my, int button)
 
     if (gi->event_mask & GD_EVENT_RELEASED &&
 	gi->event_mask & GD_EVENT_OFF_BORDERS)
-      gi->callback(gi);
+      gi->callback_action(gi);
   }
 }
 
@@ -2308,7 +2336,7 @@ void HandleGadgetsKeyInput(KeySym key)
     DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     if (gi->event_mask & GD_EVENT_TEXT_RETURN)
-      gi->callback(gi);
+      gi->callback_action(gi);
 
     last_gi = NULL;
   }