X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=c7c9ff182dd5b877711fa580683cf462e69ef698;hb=00e3ab259639fb01724dfc0f0bb96e06f54494e8;hp=a134b04921c77e6367249607564f5e6d071e9918;hpb=e2b2b44c56f55520c8cc43cf361c83a12e60f7b0;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index a134b049..c7c9ff18 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -28,6 +28,7 @@
 
 static struct GadgetInfo *gadget_list_first_entry = NULL;
 static struct GadgetInfo *gadget_list_last_entry = NULL;
+static struct GadgetInfo *last_info_gi = NULL;
 static int next_free_gadget_id = 1;
 static boolean gadget_id_wrapped = FALSE;
 
@@ -64,24 +65,28 @@ static int getNewGadgetID()
   return id;
 }
 
-#if 0
-void DUMP_GADGET_MAP_STATE()
+static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my,
+							 int button)
 {
-  struct GadgetInfo *gi = gadget_list_first_entry;
+  struct GadgetInfo *gi;
 
-  while (gi != NULL)
+  /* first check for scrollbars in case of mouse scroll wheel button events */
+  if (button == 4 || button == 5)
   {
-    printf("-XXX-1-> '%s': %s\n",
-	   gi->info_text, (gi->mapped ? "mapped" : "not mapped"));
-
-    gi = gi->next;
-  }
-}
+#if 0
+    printf("WHOA! SCROLL WHEEL DETECTED [%d]\n", button);
 #endif
 
-static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
-{
-  struct GadgetInfo *gi;
+    for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
+    {
+      if (gi->mapped && gi->active &&
+	  gi->type & GD_TYPE_SCROLLBAR)
+	return gi;
+    }
+
+    /* no active scrollbar found -- ignore this button event */
+    return NULL;
+  }
 
   /* open selectboxes may overlap other active gadgets, so check them first */
   for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
@@ -178,12 +183,16 @@ static void default_callback_action(void *ptr)
 
 static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 {
+  struct GadgetDesign *gd;
   int state = (pressed ? GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED);
-  struct GadgetDesign *gd = (!gi->active ? &gi->alt_design[state] :
-			     gi->checked ? &gi->alt_design[state] :
-			     &gi->design[state]);
   boolean redraw_selectbox = FALSE;
 
+  if (gi == NULL)
+    return;
+
+  gd = (!gi->active ? &gi->alt_design[state] :
+ 	gi->checked ? &gi->alt_design[state] : &gi->design[state]);
+
   switch (gi->type)
   {
     case GD_TYPE_NORMAL_BUTTON:
@@ -701,6 +710,9 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 {
   int tag = first_tag;
 
+  if (gi == NULL)
+    return;
+
   while (tag != GDI_END)
   {
     switch(tag)
@@ -744,11 +756,11 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_TYPE:
-	gi->type = va_arg(ap, unsigned long);
+	gi->type = va_arg(ap, unsigned int);
 	break;
 
       case GDI_STATE:
-	gi->state = va_arg(ap, unsigned long);
+	gi->state = va_arg(ap, unsigned int);
 	break;
 
       case GDI_ACTIVE:
@@ -770,18 +782,18 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_RADIO_NR:
-	gi->radio_nr = va_arg(ap, unsigned long);
+	gi->radio_nr = va_arg(ap, unsigned int);
 	break;
 
       case GDI_NUMBER_VALUE:
-	gi->textinput.number_value = va_arg(ap, long);
+	gi->textinput.number_value = va_arg(ap, int);
 	sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
 	strcpy(gi->textinput.last_value, gi->textinput.value);
 	gi->textinput.cursor_position = strlen(gi->textinput.value);
 	break;
 
       case GDI_NUMBER_MIN:
-	gi->textinput.number_min = va_arg(ap, long);
+	gi->textinput.number_min = va_arg(ap, int);
 	if (gi->textinput.number_value < gi->textinput.number_min)
 	{
 	  gi->textinput.number_value = gi->textinput.number_min;
@@ -791,7 +803,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_NUMBER_MAX:
-	gi->textinput.number_max = va_arg(ap, long);
+	gi->textinput.number_max = va_arg(ap, int);
 	if (gi->textinput.number_value > gi->textinput.number_max)
 	{
 	  gi->textinput.number_value = gi->textinput.number_max;
@@ -919,7 +931,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_EVENT_MASK:
-	gi->event_mask = va_arg(ap, unsigned long);
+	gi->event_mask = va_arg(ap, unsigned int);
 	break;
 
       case GDI_AREA_SIZE:
@@ -1164,6 +1176,9 @@ void ModifyGadget(struct GadgetInfo *gi, int first_tag, ...)
 
 void RedrawGadget(struct GadgetInfo *gi)
 {
+  if (gi == NULL)
+    return;
+
   if (gi->mapped)
     DrawGadget(gi, gi->state, gi->direct_draw);
 }
@@ -1202,6 +1217,10 @@ void FreeGadget(struct GadgetInfo *gi)
 {
   struct GadgetInfo *gi_previous = gadget_list_first_entry;
 
+  /* prevent "last_info_gi" from pointing to memory that will be freed */
+  if (last_info_gi == gi)
+    last_info_gi = NULL;
+
   while (gi_previous != NULL && gi_previous->next != gi)
     gi_previous = gi_previous->next;
 
@@ -1381,11 +1400,13 @@ void ClickOnGadget(struct GadgetInfo *gi, int button)
 
 boolean HandleGadgets(int mx, int my, int button)
 {
-  static struct GadgetInfo *last_info_gi = NULL;
   static unsigned long pressed_delay = 0;
+  static unsigned long pressed_delay_value = GADGET_FRAME_DELAY;
   static int last_button = 0;
   static int last_mx = 0, last_my = 0;
   static int pressed_mx = 0, pressed_my = 0;
+  static boolean keep_selectbox_open = FALSE;
+  static boolean gadget_stopped = FALSE;
   int scrollbar_mouse_pos = 0;
   struct GadgetInfo *new_gi, *gi;
   boolean press_event;
@@ -1398,9 +1419,12 @@ boolean HandleGadgets(int mx, int my, int button)
   boolean gadget_pressed_repeated;
   boolean gadget_pressed_off_borders;
   boolean gadget_pressed_inside_select_line;
+  boolean gadget_pressed_delay_reached;
   boolean gadget_moving;
   boolean gadget_moving_inside;
   boolean gadget_moving_off_borders;
+  boolean gadget_draggable;
+  boolean gadget_dragging;
   boolean gadget_released;
   boolean gadget_released_inside;
   boolean gadget_released_inside_select_line;
@@ -1420,10 +1444,10 @@ boolean HandleGadgets(int mx, int my, int button)
   }
 
   /* check which gadget is under the mouse pointer */
-  new_gi = getGadgetInfoFromMousePosition(mx, my);
+  new_gi = getGadgetInfoFromMousePosition(mx, my, button);
 
   /* check if button state has changed since last invocation */
-  press_event = (button != 0 && last_button == 0);
+  press_event   = (button != 0 && last_button == 0);
   release_event = (button == 0 && last_button != 0);
   last_button = button;
 
@@ -1452,14 +1476,9 @@ boolean HandleGadgets(int mx, int my, int button)
      insideSelectboxLine(new_gi, mx, my));
 
   /* if mouse button pressed outside text or selectbox gadget, deactivate it */
-#if 1
   if (anyTextGadgetActive() &&
       (gadget_pressed_off_borders ||
        (gadget_pressed_inside_select_line && !mouse_inside_select_area)))
-#else
-  if (anyTextGadgetActive() &&
-      button != 0 && !motion_status && new_gi != last_gi)
-#endif
   {
     struct GadgetInfo *gi = last_gi;
     boolean gadget_changed = (gi->event_mask & GD_EVENT_TEXT_LEAVING);
@@ -1469,7 +1488,7 @@ boolean HandleGadgets(int mx, int my, int button)
     {
       CheckRangeOfNumericInputGadget(gi);
 
-      if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0)
+      if (!strEqual(gi->textinput.last_value, gi->textinput.value))
 	strcpy(gi->textinput.last_value, gi->textinput.value);
       else
 	gadget_changed = FALSE;
@@ -1483,13 +1502,8 @@ boolean HandleGadgets(int mx, int my, int button)
 
     gi->event.type = GD_EVENT_TEXT_LEAVING;
 
-#if 1
     if (gadget_changed && !(gi->type & GD_TYPE_SELECTBOX))
       gi->callback_action(gi);
-#else
-    if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
-      gi->callback_action(gi);
-#endif
 
     last_gi = NULL;
 
@@ -1502,6 +1516,9 @@ boolean HandleGadgets(int mx, int my, int button)
   gadget_pressed_repeated =
     (button != 0 && last_gi != NULL && new_gi == last_gi);
 
+  gadget_pressed_delay_reached =
+    DelayReached(&pressed_delay, pressed_delay_value);
+
   gadget_released =		(release_event && last_gi != NULL);
   gadget_released_inside =	(gadget_released && new_gi == last_gi);
   gadget_released_off_borders =	(gadget_released && new_gi != last_gi);
@@ -1513,19 +1530,8 @@ boolean HandleGadgets(int mx, int my, int button)
   /* when handling selectbox, set additional state values */
   if (gadget_released_inside && (last_gi->type & GD_TYPE_SELECTBOX))
   {
-    struct GadgetInfo *gi = last_gi;
-
-#if 1
-    gadget_released_inside_select_line = insideSelectboxLine(gi, mx, my);
-    gadget_released_inside_select_area = insideSelectboxArea(gi, mx, my);
-#else
-    gadget_released_inside_select_line =
-      (mx >= gi->x && mx < gi->x + gi->width &&
-       my >= gi->y && my < gi->y + gi->height);
-    gadget_released_inside_select_area =
-      (mx >= gi->selectbox.x && mx < gi->selectbox.x + gi->selectbox.width &&
-       my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height);
-#endif
+    gadget_released_inside_select_line = insideSelectboxLine(last_gi, mx, my);
+    gadget_released_inside_select_area = insideSelectboxArea(last_gi, mx, my);
   }
   else
   {
@@ -1533,6 +1539,10 @@ boolean HandleGadgets(int mx, int my, int button)
     gadget_released_inside_select_area = FALSE;
   }
 
+  /* setting state for handling over-large selectbox */
+  if (keep_selectbox_open && (press_event || !mouse_inside_select_line))
+    keep_selectbox_open = FALSE;
+
   /* if new gadget pressed, store this gadget  */
   if (gadget_pressed)
     last_gi = new_gi;
@@ -1548,21 +1558,15 @@ boolean HandleGadgets(int mx, int my, int button)
   /* if mouse button released, no gadget needs to be handled anymore */
   if (gadget_released)
   {
-#if 1
     if (gi->type & GD_TYPE_SELECTBOX &&
-	(mouse_released_where_pressed ||
-	!gadget_released_inside_select_area))	     /* selectbox stays open */
+	(keep_selectbox_open ||
+	 mouse_released_where_pressed ||
+	 !gadget_released_inside_select_area))	     /* selectbox stays open */
     {
       gi->selectbox.stay_open = TRUE;
       pressed_mx = 0;
       pressed_my = 0;
     }
-#else
-    if (gi->type & GD_TYPE_SELECTBOX &&
-	(gadget_released_inside_select_line ||
-	 gadget_released_off_borders))		     /* selectbox stays open */
-      gi->selectbox.stay_open = TRUE;
-#endif
     else if (!(gi->type & GD_TYPE_TEXT_INPUT ||
 	       gi->type & GD_TYPE_TEXT_AREA))	    /* text input stays open */
       last_gi = NULL;
@@ -1572,6 +1576,14 @@ boolean HandleGadgets(int mx, int my, int button)
   if (button == 0 && !release_event)
     gi = new_gi;
 
+  /* if new gadget or if no gadget was pressed, release stopped processing */
+  if (gadget_pressed || new_gi == NULL)
+    gadget_stopped = FALSE;
+
+  /* if gadget was stopped while being handled, stop gadget processing here */
+  if (gadget_stopped)
+    return TRUE;
+
   if (gi != NULL)
   {
     int last_x = gi->event.x;
@@ -1618,7 +1630,8 @@ boolean HandleGadgets(int mx, int my, int button)
       if (gi->textarea.cursor_position != old_cursor_position)
 	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
-    else if (gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open)
+    else if (gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open &&
+	     !keep_selectbox_open)
     {
       int old_index = gi->selectbox.current_index;
 
@@ -1655,69 +1668,70 @@ boolean HandleGadgets(int mx, int my, int button)
     last_info_gi = new_gi;
   }
 
-  if (gadget_pressed)
-  {
-    if (gi->type == GD_TYPE_CHECK_BUTTON)
-    {
-      gi->checked = !gi->checked;
-    }
-    else if (gi->type == GD_TYPE_RADIO_BUTTON)
-    {
-      struct GadgetInfo *rgi = gadget_list_first_entry;
+#if 1
 
-      while (rgi)
-      {
-	if (rgi->mapped &&
-	    rgi->type == GD_TYPE_RADIO_BUTTON &&
-	    rgi->radio_nr == gi->radio_nr &&
-	    rgi != gi)
-	{
-	  rgi->checked = FALSE;
-	  DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw);
-	}
+  gadget_draggable = (gi && gi->type & GD_TYPE_SCROLLBAR);
 
-	rgi = rgi->next;
-      }
+  /* reset drag position for newly pressed scrollbar to "not dragging" */
+  if (gadget_pressed && gadget_draggable)
+    gi->scrollbar.drag_position = -1;
 
-      gi->checked = TRUE;
+  gadget_dragging = (gadget_draggable && gi->scrollbar.drag_position != -1);
+
+  /* clicking next to a scrollbar to move it is not considered "moving" */
+  if (gadget_draggable && !gadget_dragging)
+    gadget_moving = FALSE;
+
+  /* when leaving scrollbar area when jump-scrolling, stop gadget processing */
+  if (gadget_draggable && !gadget_dragging && gadget_moving_off_borders)
+    gadget_stopped = TRUE;
+
+  if ((gadget_pressed) ||
+      (gadget_pressed_repeated && gadget_pressed_delay_reached))
+  {
+    if (gadget_pressed)		/* gadget pressed the first time */
+    {
+      /* initialize delay counter */
+      DelayReached(&pressed_delay, 0);
+
+      /* start gadget delay with longer delay after first click on gadget */
+      pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
     }
-    else if (gi->type & GD_TYPE_SCROLLBAR)
+    else			/* gadget hold pressed for some time */
     {
-      int mpos, gpos;
+      /* after first repeated gadget click, continue with shorter delay value */
+      pressed_delay_value = GADGET_FRAME_DELAY;
+    }
 
-      if (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL)
-      {
-	mpos = mx;
-	gpos = gi->x;
-      }
-      else
-      {
-	mpos = my;
-	gpos = gi->y;
-      }
+    if (gi->type & GD_TYPE_SCROLLBAR && !gadget_dragging)
+    {
+      int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx    : my);
+      int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
 
-      if (mpos >= gpos + gi->scrollbar.position &&
-	  mpos < gpos + gi->scrollbar.position + gi->scrollbar.size)
-      {
-	/* drag scrollbar */
-	gi->scrollbar.drag_position =
-	  scrollbar_mouse_pos - gi->scrollbar.position;
-      }
-      else
+      if (button > 3 ||
+	  mpos < gpos + gi->scrollbar.position ||
+	  mpos >= gpos + gi->scrollbar.position + gi->scrollbar.size)
       {
 	/* click scrollbar one scrollbar length up/left or down/right */
 
 	struct GadgetScrollbar *gs = &gi->scrollbar;
 	int old_item_position = gs->item_position;
+	int item_steps = gs->items_visible - 1;
+	int item_direction = (mpos < gpos + gi->scrollbar.position ? -1 : +1);
+
+	if (button > 3)
+	{
+	  item_steps = 3;
+	  item_direction = (button == 4 ? -1 : +1);
+	}
 
 	changed_position = FALSE;
 
-	gs->item_position +=
-	  gs->items_visible * (mpos < gpos + gi->scrollbar.position ? -1 : +1);
+	gs->item_position += item_steps * item_direction;
 
 	if (gs->item_position < 0)
 	  gs->item_position = 0;
-	if (gs->item_position > gs->items_max - gs->items_visible)
+	else if (gs->item_position > gs->items_max - gs->items_visible)
 	  gs->item_position = gs->items_max - gs->items_visible;
 
 	if (old_item_position != gs->item_position)
@@ -1736,11 +1750,68 @@ boolean HandleGadgets(int mx, int my, int button)
 	if (gi->event_mask & GD_EVENT_MOVING && changed_position)
 	  gi->callback_action(gi);
 
-	/* don't handle this scrollbar anymore while mouse button pressed */
-	last_gi = NULL;
-
 	return TRUE;
       }
+      else
+      {
+	/* don't handle this scrollbar anymore when mouse position reached */
+	if (gadget_pressed_repeated)
+	{
+	  gadget_stopped = TRUE;
+
+	  return TRUE;
+	}
+      }
+    }
+  }
+
+#endif
+
+  if (gadget_pressed)
+  {
+    if (gi->type == GD_TYPE_CHECK_BUTTON)
+    {
+      gi->checked = !gi->checked;
+    }
+    else if (gi->type == GD_TYPE_RADIO_BUTTON)
+    {
+      struct GadgetInfo *rgi = gadget_list_first_entry;
+
+      while (rgi)
+      {
+	if (rgi->mapped &&
+	    rgi->type == GD_TYPE_RADIO_BUTTON &&
+	    rgi->radio_nr == gi->radio_nr &&
+	    rgi != gi)
+	{
+	  rgi->checked = FALSE;
+	  DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw);
+	}
+
+	rgi = rgi->next;
+      }
+
+      gi->checked = TRUE;
+    }
+    else if (gi->type & GD_TYPE_SCROLLBAR)
+    {
+      int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx    : my);
+      int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y);
+
+      if (button >= 1 && button <= 3 &&
+	  mpos >= gpos + gi->scrollbar.position &&
+	  mpos < gpos + gi->scrollbar.position + gi->scrollbar.size)
+      {
+	/* start dragging scrollbar */
+	gi->scrollbar.drag_position =
+	  scrollbar_mouse_pos - gi->scrollbar.position;
+      }
+    }
+    else if (gi->type & GD_TYPE_SELECTBOX)
+    {
+      /* keep selectbox open in case of over-large selectbox */
+      keep_selectbox_open = (mouse_inside_select_line &&
+			     mouse_inside_select_area);
     }
 
     DrawGadget(gi, DG_PRESSED, gi->direct_draw);
@@ -1750,9 +1821,6 @@ boolean HandleGadgets(int mx, int my, int button)
     gi->event.button = button;
     gi->event.off_borders = FALSE;
 
-    /* initialize delay counter */
-    DelayReached(&pressed_delay, 0);
-
     if (gi->event_mask & GD_EVENT_PRESSED)
       gi->callback_action(gi);
   }
@@ -1761,8 +1829,7 @@ boolean HandleGadgets(int mx, int my, int button)
   {
     gi->event.type = GD_EVENT_PRESSED;
 
-    if (gi->event_mask & GD_EVENT_REPEATED &&
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
+    if (gi->event_mask & GD_EVENT_REPEATED && gadget_pressed_delay_reached)
       gi->callback_action(gi);
   }
 
@@ -1775,7 +1842,7 @@ boolean HandleGadgets(int mx, int my, int button)
       else if (gadget_moving_off_borders && gi->state == GD_BUTTON_PRESSED)
 	DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
     }
-    else if (gi->type & GD_TYPE_SELECTBOX)
+    else if (gi->type & GD_TYPE_SELECTBOX && !keep_selectbox_open)
     {
       int old_index = gi->selectbox.current_index;
 
@@ -1799,13 +1866,22 @@ boolean HandleGadgets(int mx, int my, int button)
 
       gs->position = scrollbar_mouse_pos - gs->drag_position;
 
-      if (gs->position < 0)
+      /* make sure to always precisely reach end positions when dragging */
+      if (gs->position <= 0)
+      {
 	gs->position = 0;
-      if (gs->position > gs->position_max)
+	gs->item_position = 0;
+      }
+      else if (gs->position >= gs->position_max)
+      {
 	gs->position = gs->position_max;
-
-      gs->item_position =
-	gs->items_max * (gs->position + gs->correction) / gs->size_max_cmp;
+	gs->item_position = gs->items_max - gs->items_visible;
+      }
+      else
+      {
+	gs->item_position =
+	  gs->items_max * (gs->position + gs->correction) / gs->size_max_cmp;
+      }
 
       if (gs->item_position < 0)
 	gs->item_position = 0;
@@ -1821,7 +1897,7 @@ boolean HandleGadgets(int mx, int my, int button)
       DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
 
-    gi->state = (gadget_moving_inside || gi->type & GD_TYPE_SCROLLBAR ?
+    gi->state = (gadget_moving_inside || gadget_draggable ?
 		 GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED);
     gi->event.type = GD_EVENT_MOVING;
     gi->event.off_borders = gadget_moving_off_borders;
@@ -1838,21 +1914,13 @@ boolean HandleGadgets(int mx, int my, int button)
 
     if (gi->type & GD_TYPE_SELECTBOX)
     {
-#if 1
-      if (mouse_released_where_pressed ||
+      if (keep_selectbox_open ||
+	  mouse_released_where_pressed ||
 	  !gadget_released_inside_select_area)	     /* selectbox stays open */
       {
 	deactivate_gadget = FALSE;
 	gadget_changed = FALSE;
       }
-#else
-      if (gadget_released_inside_select_line ||
-	  gadget_released_off_borders)		     /* selectbox stays open */
-      {
-	deactivate_gadget = FALSE;
-	gadget_changed = FALSE;
-      }
-#endif
       else if (gi->selectbox.index != gi->selectbox.current_index)
 	gi->selectbox.index = gi->selectbox.current_index;
       else
@@ -1867,15 +1935,10 @@ boolean HandleGadgets(int mx, int my, int button)
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_RELEASED;
 
-#if 1
     if ((gi->event_mask & GD_EVENT_RELEASED) && gadget_changed)
     {
       gi->callback_action(gi);
     }
-#else
-    if ((gi->event_mask & GD_EVENT_RELEASED) && deactivate_gadget)
-      gi->callback_action(gi);
-#endif
   }
 
   if (gadget_released_off_borders)
@@ -1883,6 +1946,9 @@ boolean HandleGadgets(int mx, int my, int button)
     if (gi->type & GD_TYPE_SCROLLBAR)
       DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
+#if 1
+    gi->state = GD_BUTTON_UNPRESSED;
+#endif
     gi->event.type = GD_EVENT_RELEASED;
 
     if (gi->event_mask & GD_EVENT_RELEASED &&
@@ -1931,7 +1997,7 @@ boolean HandleGadgetsKeyInput(Key key)
     {
       CheckRangeOfNumericInputGadget(gi);
 
-      if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0)
+      if (!strEqual(gi->textinput.last_value, gi->textinput.value))
 	strcpy(gi->textinput.last_value, gi->textinput.value);
       else
 	gadget_changed = FALSE;
@@ -1959,13 +2025,8 @@ boolean HandleGadgetsKeyInput(Key key)
       last_gi = NULL;
     }
 
-#if 1
     if (gadget_changed)
       gi->callback_action(gi);
-#else
-    if (gi->event_mask & GD_EVENT_TEXT_RETURN)
-      gi->callback_action(gi);
-#endif
   }
   else if (gi->type & GD_TYPE_TEXT_INPUT)	/* only valid for text input */
   {