X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=f8d181e497dc4f618b952451a1233c252c481354;hb=240269d614d12d0612cc0764589e6798378e2b8c;hp=7ac61e36a7a10e147e60b500302f1993f6ad40f2;hpb=65e73b3607d8d4aef09abaf1f44d090197953f21;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index 7ac61e36..f8d181e4 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -1515,7 +1515,33 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
     if (gi->mapped &&
 	mx >= gi->x && mx < gi->x + gi->width &&
 	my >= gi->y && my < gi->y + gi->height)
-      break;
+    {
+
+#if 0
+      if (gi->type & GD_TYPE_SCROLLBAR)
+      {
+	int mpos, gpos;
+
+	if (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+	{
+	  mpos = mx;
+	  gpos = gi->x;
+	}
+	else
+	{
+	  mpos = my;
+	  gpos = gi->y;
+	}
+
+	if (mpos >= gpos + gi->scrollbar.position &&
+	    mpos < gpos + gi->scrollbar.position + gi->scrollbar.size)
+	  break;
+      }
+      else
+#endif
+
+	break;
+    }
 
     gi = gi->next;
   }
@@ -1523,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;
 }
@@ -1538,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)
   {
@@ -1549,6 +1582,15 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->custom_id = va_arg(ap, int);
 	break;
 
+      case GDI_INFO_TEXT:
+	{
+	  int max_textsize = MAX_INFO_TEXTSIZE;
+
+	  strncpy(new_gadget->info_text, va_arg(ap, char *), max_textsize);
+	  new_gadget->info_text[max_textsize] = '\0';
+	}
+	break;
+
       case GDI_X:
 	new_gadget->x = va_arg(ap, int);
 	break;
@@ -1573,16 +1615,65 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->state = va_arg(ap, unsigned long);
 	break;
 
-      case GDI_ALT_STATE:
-	new_gadget->state = va_arg(ap, boolean);
+      case GDI_RADIO_NR:
+	new_gadget->radio_nr = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_RADIO_PRESSED:
+	new_gadget->radio_pressed = va_arg(ap, boolean);
 	break;
 
       case GDI_NUMBER_VALUE:
-	new_gadget->number_value = va_arg(ap, long);
+	new_gadget->text.number_value = va_arg(ap, long);
+	sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value);
+	new_gadget->text.cursor_position = strlen(new_gadget->text.value);
+	break;
+
+      case GDI_NUMBER_MIN:
+	new_gadget->text.number_min = va_arg(ap, long);
+	if (new_gadget->text.number_value < new_gadget->text.number_min)
+	{
+	  new_gadget->text.number_value = new_gadget->text.number_min;
+	  sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value);
+	}
+	break;
+
+      case GDI_NUMBER_MAX:
+	new_gadget->text.number_max = va_arg(ap, long);
+	if (new_gadget->text.number_value > new_gadget->text.number_max)
+	{
+	  new_gadget->text.number_value = new_gadget->text.number_max;
+	  sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value);
+	}
 	break;
 
       case GDI_TEXT_VALUE:
-	strcpy(new_gadget->text_value, va_arg(ap, char *));
+	{
+	  int max_textsize = MAX_GADGET_TEXTSIZE;
+
+	  if (new_gadget->text.size)
+	    max_textsize = MIN(new_gadget->text.size, MAX_GADGET_TEXTSIZE - 1);
+
+	  strncpy(new_gadget->text.value, va_arg(ap, char *), max_textsize);
+	  new_gadget->text.value[max_textsize] = '\0';
+	  new_gadget->text.cursor_position = strlen(new_gadget->text.value);
+	}
+	break;
+
+      case GDI_TEXT_SIZE:
+	{
+	  int tag_value = va_arg(ap, int);
+	  int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE - 1);
+
+	  new_gadget->text.size = max_textsize;
+	  new_gadget->text.value[max_textsize] = '\0';
+
+	  if (new_gadget->width == 0 && new_gadget->height == 0)
+	  {
+	    new_gadget->width = (new_gadget->text.size + 1) * FONT2_XSIZE + 6;
+	    new_gadget->height = ED_WIN_COUNT_YSIZE;
+	  }
+	}
 	break;
 
       case GDI_DESIGN_UNPRESSED:
@@ -1609,6 +1700,10 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
 
+      case GDI_DESIGN_BORDER:
+	new_gadget->design_border = va_arg(ap, int);
+	break;
+
       case GDI_EVENT_MASK:
 	new_gadget->event_mask = va_arg(ap, unsigned long);
 	break;
@@ -1667,8 +1762,24 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	}
 	break;
 
-      case GDI_CALLBACK:
-	new_gadget->callback = va_arg(ap, gadget_callback_function);
+      case GDI_SCROLLBAR_ITEMS_MAX:
+	new_gadget->scrollbar.items_max = va_arg(ap, int);
+	break;
+
+      case GDI_SCROLLBAR_ITEMS_VISIBLE:
+	new_gadget->scrollbar.items_visible = va_arg(ap, int);
+	break;
+
+      case GDI_SCROLLBAR_ITEM_POSITION:
+	new_gadget->scrollbar.item_position = va_arg(ap, int);
+	break;
+
+      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:
@@ -1686,17 +1797,30 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
        !new_gadget->design[GD_BUTTON_PRESSED].pixmap))
     Error(ERR_EXIT, "gadget incomplete (missing Pixmap)");
 
-  /* insert new gadget into gloabl gadget list */
+  if (new_gadget->type & GD_TYPE_SCROLLBAR)
+  {
+    struct GadgetScrollbar *gs = &new_gadget->scrollbar;
+
+    if (new_gadget->width == 0 || new_gadget->height == 0 ||
+	gs->items_max == 0 || gs->items_visible == 0)
+      Error(ERR_EXIT, "scrollbar gadget incomplete (missing tags)");
+
+    /* calculate internal scrollbar values */
+    gs->size_max = (new_gadget->type == GD_TYPE_SCROLLBAR_VERTICAL ?
+		    new_gadget->height : new_gadget->width);
+    gs->size = gs->size_max * gs->items_visible / gs->items_max;
+    gs->position = gs->size_max * gs->item_position / gs->items_max;
+    gs->position_max = gs->size_max - gs->size;
+  }
 
+  /* insert new gadget into global gadget list */
   if (gadget_list_last_entry)
   {
     gadget_list_last_entry->next = new_gadget;
     gadget_list_last_entry = gadget_list_last_entry->next;
   }
   else
-  {
     gadget_list_first_entry = gadget_list_last_entry = new_gadget;
-  }
 
   return new_gadget;
 }
@@ -1718,81 +1842,381 @@ void FreeGadget(struct GadgetInfo *gi)
   free(gi);
 }
 
+/* values for DrawGadget() */
+#define DG_UNPRESSED	0
+#define DG_PRESSED	1
+#define DG_BUFFERED	0
+#define DG_DIRECT	1
+
+static void CheckRangeOfNumericInputGadget(struct GadgetInfo *gi)
+{
+  if (gi->type != GD_TYPE_TEXTINPUT_NUMERIC)
+    return;
+
+  gi->text.number_value = atoi(gi->text.value);
+
+  if (gi->text.number_value < gi->text.number_min)
+    gi->text.number_value = gi->text.number_min;
+  if (gi->text.number_value > gi->text.number_max)
+    gi->text.number_value = gi->text.number_max;
+
+  sprintf(gi->text.value, "%d", gi->text.number_value);
+
+  if (gi->text.cursor_position < 0)
+    gi->text.cursor_position = 0;
+  else if (gi->text.cursor_position > strlen(gi->text.value))
+    gi->text.cursor_position = strlen(gi->text.value);
+}
+
 static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 {
   int state = (pressed ? 1 : 0);
-  struct GadgetDesign *gd = (gi->alt_state ?
+  struct GadgetDesign *gd = (gi->radio_pressed ?
 			     &gi->alt_design[state] :
 			     &gi->design[state]);
 
-  if (gi->type != GD_TYPE_NORMAL_BUTTON)
-    return;
+  switch (gi->type)
+  {
+    case GD_TYPE_NORMAL_BUTTON:
+    case GD_TYPE_RADIO_BUTTON:
+      XCopyArea(display, gd->pixmap, drawto, gc,
+		gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+      break;
 
-  XCopyArea(display, gd->pixmap, drawto, gc,
-	    gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+    case GD_TYPE_TEXTINPUT_ALPHANUMERIC:
+    case GD_TYPE_TEXTINPUT_NUMERIC:
+      {
+	int i;
+	char cursor_letter;
+	char cursor_string[3];
+	char text[MAX_GADGET_TEXTSIZE + 1];
+	int font_color = FC_YELLOW;
+	int border = gi->design_border;
+	strcpy(text, gi->text.value);
+	strcat(text, " ");
+
+	/* left part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y, border, gi->height, gi->x, gi->y);
+
+	/* middle part of gadget */
+	for (i=0; i<=gi->text.size; i++)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x + border, gd->y, FONT2_XSIZE, gi->height,
+		    gi->x + border + i * FONT2_XSIZE, gi->y);
+
+	/* right part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x + ED_WIN_COUNT_XSIZE - border, gd->y,
+		  border, gi->height, gi->x + gi->width - border, gi->y);
+
+	/* gadget text value */
+	DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_color);
+
+	cursor_letter = gi->text.value[gi->text.cursor_position];
+	cursor_string[0] = '~';
+	cursor_string[1] = (cursor_letter != '\0' ? cursor_letter : ' ');
+	cursor_string[2] = '\0';
+
+	/* draw cursor, if active */
+	if (pressed)
+	  DrawText(gi->x + border + gi->text.cursor_position * FONT2_XSIZE,
+		   gi->y + border, cursor_string, FS_SMALL, font_color);
+      }
+      break;
+
+    case GD_TYPE_SCROLLBAR_VERTICAL:
+      {
+	int i;
+	int xpos = gi->x;
+	int ypos = gi->y + gi->scrollbar.position;
+	int design_full = gi->width;
+	int design_body = design_full - 2 * gi->design_border;
+	int size_full = gi->scrollbar.size;
+	int size_body = size_full - 2 * gi->design_border;
+	int num_steps = size_body / design_body;
+	int step_size_remain = size_body - num_steps * design_body;
+
+	/* clear scrollbar area */
+	XFillRectangle(display, backbuffer, gc,
+		       gi->x, gi->y, gi->width, gi->height);
+
+	/* upper part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y,
+		  gi->width, gi->design_border,
+		  xpos, ypos);
+
+	/* middle part of gadget */
+	for (i=0; i<num_steps; i++)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x, gd->y + gi->design_border,
+		    gi->width, design_body,
+		    xpos, ypos + gi->design_border + i * design_body);
+
+	/* remaining middle part of gadget */
+	if (step_size_remain > 0)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x,  gd->y + gi->design_border,
+		    gi->width, step_size_remain,
+		    xpos, ypos + gi->design_border + num_steps * design_body);
+
+	/* lower part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y + design_full - gi->design_border,
+		  gi->width, gi->design_border,
+		  xpos, ypos + size_full - gi->design_border);
+      }
+      break;
+
+    case GD_TYPE_SCROLLBAR_HORIZONTAL:
+      {
+	int i;
+	int xpos = gi->x + gi->scrollbar.position;
+	int ypos = gi->y;
+	int design_full = gi->height;
+	int design_body = design_full - 2 * gi->design_border;
+	int size_full = gi->scrollbar.size;
+	int size_body = size_full - 2 * gi->design_border;
+	int num_steps = size_body / design_body;
+	int step_size_remain = size_body - num_steps * design_body;
+
+	/* clear scrollbar area */
+	XFillRectangle(display, backbuffer, gc,
+		       gi->x, gi->y, gi->width, gi->height);
+
+	/* left part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y,
+		  gi->design_border, gi->height,
+		  xpos, ypos);
+
+	/* middle part of gadget */
+	for (i=0; i<num_steps; i++)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x + gi->design_border, gd->y,
+		    design_body, gi->height,
+		    xpos + gi->design_border + i * design_body, ypos);
+
+	/* remaining middle part of gadget */
+	if (step_size_remain > 0)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x + gi->design_border, gd->y,
+		    step_size_remain, gi->height,
+		    xpos + gi->design_border + num_steps * design_body, ypos);
+
+	/* right part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x + design_full - gi->design_border, gd->y,
+		  gi->design_border, gi->height,
+		  xpos + size_full - gi->design_border, ypos);
+      }
+      break;
+
+    default:
+      return;
+  }
 
   if (direct)
-    XCopyArea(display, gd->pixmap, window, gc,
-	      gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+    XCopyArea(display, drawto, window, gc,
+	      gi->x, gi->y, gi->width, gi->height, gi->x, gi->y);
   else
     redraw_mask |= REDRAW_ALL;
 }
 
+void ClickOnGadget(struct GadgetInfo *gi)
+{
+  /* simulate releasing mouse button over last gadget, if still pressed */
+  if (button_status)
+    HandleGadgets(-1, -1, 0);
+
+  /* simulate pressing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, 1);
+
+  /* simulate releasing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, 0);
+}
+
+void AdjustScrollbar(struct GadgetInfo *gi, int items_max, int item_pos)
+{
+  struct GadgetScrollbar *gs = &gi->scrollbar;
+
+  gs->items_max = items_max;
+  gs->item_position = item_pos;
+
+  gs->size = gs->size_max * gs->items_visible / gs->items_max;
+  gs->position = gs->size_max * gs->item_position / gs->items_max;
+  gs->position_max = gs->size_max - gs->size;
+
+  /* finetuning for maximal right/bottom position */
+  if (gs->item_position == gs->items_max - gs->items_visible)
+    gs->position = gs->position_max;
+
+  if (gi->mapped)
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+}
+
+void ModifyTextInputTextValue(struct GadgetInfo *gi, char *new_text)
+{
+  struct GadgetTextInput *text = &gi->text;
+  int max_textsize = MAX_GADGET_TEXTSIZE;
+
+  if (text->size)
+    max_textsize = MIN(text->size, MAX_GADGET_TEXTSIZE - 1);
+
+  strncpy(text->value, new_text, max_textsize);
+  text->value[max_textsize] = '\0';
+  text->cursor_position = strlen(text->value);
+
+  if (gi->mapped)
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+}
+
+void ModifyTextInputNumberValue(struct GadgetInfo *gi, int new_value)
+{
+  struct GadgetTextInput *text = &gi->text;
+
+  text->number_value = (new_value < text->number_min ? text->number_min :
+			new_value > text->number_max ? text->number_max :
+			new_value);
+
+  sprintf(text->value, "%d", text->number_value);
+
+  if (gi->mapped)
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+}
+
+/* global pointer to gadget actually in use (when mouse button pressed) */
+static struct GadgetInfo *last_gi = NULL;
+
 void MapGadget(struct GadgetInfo *gi)
 {
-  if (gi == NULL)
+  if (gi == NULL || gi->mapped)
     return;
 
   gi->mapped = TRUE;
 
-  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), FALSE);
+  DrawGadget(gi, DG_UNPRESSED, DG_BUFFERED);
 }
 
 void UnmapGadget(struct GadgetInfo *gi)
 {
-  if (gi == NULL)
+  if (gi == NULL || !gi->mapped)
     return;
 
   gi->mapped = FALSE;
+
+  if (gi == last_gi)
+    last_gi = NULL;
 }
 
 void HandleGadgets(int mx, int my, int button)
 {
-  static struct GadgetInfo *gi = NULL;
+  static struct GadgetInfo *last_info_gi = NULL;
   static unsigned long pressed_delay = 0;
-
-#if 0
-  static boolean pressed = FALSE;
-#endif
-
-  struct GadgetInfo *new_gi;
+  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;
+  boolean release_event;
+  boolean mouse_moving;
   boolean gadget_pressed;
   boolean gadget_pressed_repeated;
+  boolean gadget_moving;
   boolean gadget_moving_inside;
-  boolean gadget_moving_outside;
+  boolean gadget_moving_off_borders;
   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)
     return;
 
-  new_gi = getGadgetInfoFromMousePosition(mx,my);
+  /* check which gadget is under the mouse pointer */
+  new_gi = getGadgetInfoFromMousePosition(mx, my);
+
+  /* check if button state has changed since last invocation */
+  press_event = (button != 0 && last_button == 0);
+  release_event = (button == 0 && last_button != 0);
+  last_button = button;
+
+  /* check if mouse has been moved since last invocation */
+  mouse_moving = ((mx != last_mx || my != last_my) && motion_status);
+  last_mx = mx;
+  last_my = my;
+
+  /* special treatment for text and number input gadgets */
+  if (last_gi && last_gi->type & GD_TYPE_TEXTINPUT && last_gi->mapped &&
+      button != 0 && !motion_status)
+  {
+    struct GadgetInfo *gi = last_gi;
+
+    if (new_gi == last_gi)
+    {
+      /* if mouse button pressed inside activated text gadget, set cursor */
+      gi->text.cursor_position = (mx - gi->x) / FONT2_XSIZE;
+
+      if (gi->text.cursor_position < 0)
+	gi->text.cursor_position = 0;
+      else if (gi->text.cursor_position > strlen(gi->text.value))
+	gi->text.cursor_position = strlen(gi->text.value);
+
+      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+    }
+    else
+    {
+      /* if mouse button pressed outside text input gadget, deactivate it */
+      CheckRangeOfNumericInputGadget(gi);
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+
+      if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
+	gi->callback_action(gi);
+
+      last_gi = NULL;
+    }
+  }
 
   gadget_pressed =
-    (button != 0 && gi == NULL && new_gi != NULL);
+    (button != 0 && last_gi == NULL && new_gi != NULL && press_event);
   gadget_pressed_repeated =
-    (button != 0 && gi != NULL && new_gi == gi);
-  gadget_moving_inside =
-    (button != 0 && gi != NULL && new_gi == gi && motion_status);
-  gadget_moving_outside =
-    (button != 0 && gi != NULL && new_gi != gi && motion_status);
-  gadget_released =
-    (button == 0 && gi != NULL && new_gi == gi);
+    (button != 0 && last_gi != NULL && new_gi == last_gi);
 
+  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);
+
+  gadget_moving =	      (button != 0 && last_gi != NULL && mouse_moving);
+  gadget_moving_inside =      (gadget_moving && new_gi == last_gi);
+  gadget_moving_off_borders = (gadget_moving && new_gi != last_gi);
+
+  /* if new gadget pressed, store this gadget  */
   if (gadget_pressed)
+    last_gi = new_gi;
+
+  /* 'gi' is actually handled gadget */
+  gi = last_gi;
+
+  /* if gadget is scrollbar, choose mouse position value */
+  if (gi && gi->type & GD_TYPE_SCROLLBAR)
+    scrollbar_mouse_pos =
+      (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx - gi->x : my - gi->y);
+
+  /* if mouse button released, no gadget needs to be handled anymore */
+  if (button == 0 && last_gi && !(last_gi->type & GD_TYPE_TEXTINPUT))
+    last_gi = NULL;
+
+  /* modify event position values even if no gadget is pressed */
+  if (button == 0 && !release_event)
     gi = new_gi;
 
   if (gi)
   {
+    int last_x = gi->event.x;
+    int last_y = gi->event.y;
+
     gi->event.x = mx - gi->x;
     gi->event.y = my - gi->y;
 
@@ -1800,174 +2224,257 @@ void HandleGadgets(int mx, int my, int button)
     {
       gi->event.x /= gi->drawing.item_xsize;
       gi->event.y /= gi->drawing.item_ysize;
-    }
-  }
-
-  if (gadget_pressed)
-  {
-    DrawGadget(gi, TRUE, TRUE);
-
-    gi->state = GD_BUTTON_PRESSED;
-    gi->event.type = GD_EVENT_PRESSED;
-    gi->event.button = button;
-    gi->event.off_borders = FALSE;
 
-    /* initialize delay counter */
-    pressed_delay = 0;
-    DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
-
-    if (gi->event_mask & GD_EVENT_PRESSED)
-      gi->callback(gi);
-  }
-
-  if (gadget_pressed_repeated)
-  {
-    if (gi->event_mask & GD_EVENT_REPEATED &&
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
-      gi->callback(gi);
+      if (last_x != gi->event.x || last_y != gi->event.y)
+	changed_position = TRUE;
+    }
   }
 
-  if (gadget_moving_inside)
+  /* handle gadget popup info text */
+  if (last_info_gi != new_gi ||
+      (new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position))
   {
-    if (gi->state == GD_BUTTON_UNPRESSED)
-      DrawGadget(gi, TRUE, TRUE);
+    last_info_gi = new_gi;
 
-    gi->state = GD_BUTTON_PRESSED;
-    gi->event.type = GD_EVENT_MOVING;
-    gi->event.off_borders = FALSE;
-    if (gi->event_mask & GD_EVENT_MOVING)
-      gi->callback(gi);
+    if (new_gi != NULL && (button == 0 || new_gi == last_gi))
+    {
+      new_gi->event.type = 0;
+      new_gi->callback_info(new_gi);
+    }
+    else
+      default_callback_info(NULL);
   }
 
-  if (gadget_moving_outside)
+  if (gadget_pressed)
   {
-    if (gi->state == GD_BUTTON_PRESSED)
-      DrawGadget(gi, FALSE, TRUE);
+    if (gi->type == GD_TYPE_RADIO_BUTTON)
+    {
+      struct GadgetInfo *rgi = gadget_list_first_entry;
 
-    gi->state = GD_BUTTON_UNPRESSED;
-    gi->event.type = GD_EVENT_MOVING;
-    gi->event.off_borders = TRUE;
+      while (rgi)
+      {
+	if (rgi->mapped &&
+	    rgi->type == GD_TYPE_RADIO_BUTTON &&
+	    rgi->radio_nr == gi->radio_nr &&
+	    rgi != gi)
+	{
+	  rgi->radio_pressed = FALSE;
+	  DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
+	}
 
-    if (gi->event_mask & GD_EVENT_MOVING)
-      gi->callback(gi);
-  }
+	rgi = rgi->next;
+      }
 
-  if (gadget_released)
-  {
-    DrawGadget(gi, FALSE, TRUE);
+      gi->radio_pressed = TRUE;
+    }
+    else if (gi->type & GD_TYPE_SCROLLBAR)
+    {
+      int mpos, gpos;
 
-    gi->state = GD_BUTTON_UNPRESSED;
-    gi->event.type = GD_EVENT_RELEASED;
+      if (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+      {
+	mpos = mx;
+	gpos = gi->x;
+      }
+      else
+      {
+	mpos = my;
+	gpos = gi->y;
+      }
 
-    if (gi->event_mask & GD_EVENT_RELEASED)
-      gi->callback(gi);
-  }
+      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
+      {
+	/* click scrollbar one scrollbar length up/left or down/right */
 
-  if (button == 0)
-    gi = NULL;
+	struct GadgetScrollbar *gs = &gi->scrollbar;
+	int old_item_position = gs->item_position;
 
+	changed_position = FALSE;
 
+	gs->item_position +=
+	  gs->items_visible * (mpos < gpos + gi->scrollbar.position ? -1 : +1);
 
-#if 0
-  if (button)
-  {
-    if (!motion_status)		/* mouse button just pressed */
-    {
-      if (new_gi != NULL)
-      {
-	gi = new_gi;
-	gi->state = GD_BUTTON_PRESSED;
-	gi->event.type = GD_EVENT_PRESSED;
-	gi->event.button = button;
-	DrawGadget(gi, TRUE, TRUE);
+	if (gs->item_position < 0)
+	  gs->item_position = 0;
+	if (gs->item_position > gs->items_max - gs->items_visible)
+	  gs->item_position = gs->items_max - gs->items_visible;
 
-	/* initialize delay counter */
-	pressed_delay = 0;
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
+	if (old_item_position != gs->item_position)
+	{
+	  gi->event.item_position = gs->item_position;
+	  changed_position = TRUE;
+	}
 
+	AdjustScrollbar(gi, gs->items_max, gs->item_position);
 
-	printf("new gadget pressed\n");
+	gi->state = GD_BUTTON_UNPRESSED;
+	gi->event.type = GD_EVENT_MOVING;
+	gi->event.off_borders = FALSE;
 
+	if (gi->event_mask & GD_EVENT_MOVING && changed_position)
+	  gi->callback_action(gi);
 
-	if (gi->event_mask & GD_EVENT_PRESSED)
-	  gi->callback(gi);
+	/* don't handle this scrollbar anymore while mouse button pressed */
+	last_gi = NULL;
 
-	pressed = TRUE;
+	return;
       }
     }
-    else			/* mouse movement with pressed mouse button */
-    {
-      if (new_gi != gi && gi != NULL)
-      {
-	if (pressed)
-	  DrawGadget(gi, FALSE, TRUE);
-	gi->state = GD_BUTTON_UNPRESSED;
-	gi->event.type = GD_EVENT_MOVING;
 
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
 
-	printf("outside gadget\n");
+    gi->state = GD_BUTTON_PRESSED;
+    gi->event.type = GD_EVENT_PRESSED;
+    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);
+  }
 
+  if (gadget_pressed_repeated)
+  {
+    if (gi->event_mask & GD_EVENT_REPEATED &&
+	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
+      gi->callback_action(gi);
+  }
 
-	if (gi->event_mask & GD_EVENT_MOVING)
-	  gi->callback(gi);
+  if (gadget_moving)
+  {
+    if (gi->type & GD_TYPE_BUTTON)
+    {
+      if (gadget_moving_inside && gi->state == GD_BUTTON_UNPRESSED)
+	DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      else if (gadget_moving_off_borders && gi->state == GD_BUTTON_PRESSED)
+	DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+    }
 
-	pressed = FALSE;
-      }
-      else if (new_gi == gi && gi != NULL)
-      {
-	if (!pressed)
-	  DrawGadget(gi, TRUE, TRUE);
-	gi->state = GD_BUTTON_PRESSED;
-	gi->event.type = GD_EVENT_MOVING;
+    if (gi->type & GD_TYPE_SCROLLBAR)
+    {
+      struct GadgetScrollbar *gs = &gi->scrollbar;
+      int old_item_position = gs->item_position;
 
+      gs->position = scrollbar_mouse_pos - gs->drag_position;
 
-	printf("inside gadget\n");
+      if (gs->position < 0)
+	gs->position = 0;
+      if (gs->position > gs->position_max)
+	gs->position = gs->position_max;
 
+      gs->item_position = gs->items_max * gs->position / gs->size_max;
 
+      if (old_item_position != gs->item_position)
+      {
+	gi->event.item_position = gs->item_position;
+	changed_position = TRUE;
+      }
 
+      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+    }
 
-	if (gi->event_mask & GD_EVENT_MOVING)
-	  gi->callback(gi);
+    gi->state = (gadget_moving_inside || gi->type & GD_TYPE_SCROLLBAR ?
+		 GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED);
+    gi->event.type = GD_EVENT_MOVING;
+    gi->event.off_borders = gadget_moving_off_borders;
 
-	pressed = TRUE;
-      }
-    }
+    if (gi->event_mask & GD_EVENT_MOVING && changed_position &&
+	(gadget_moving_inside || gi->event_mask & GD_EVENT_OFF_BORDERS))
+      gi->callback_action(gi);
+  }
 
-    if (gi != NULL &&
-	gi->event_mask & GD_EVENT_PRESSED_REPEATED &&
-	gi->state == GD_BUTTON_PRESSED &&
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
-    {
-	printf("gadget pressed (repeated)\n");
+  if (gadget_released_inside)
+  {
+    if (!(gi->type & GD_TYPE_TEXTINPUT))
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
+    gi->state = GD_BUTTON_UNPRESSED;
+    gi->event.type = GD_EVENT_RELEASED;
 
-	gi->callback(gi);
-    }
+    if (gi->event_mask & GD_EVENT_RELEASED)
+      gi->callback_action(gi);
   }
-  else				/* mouse button just released */
-  {
-    if (new_gi == gi && gi != NULL && pressed)
-    {
-      gi->state = GD_BUTTON_UNPRESSED;
-      gi->event.type = GD_EVENT_RELEASED;
-      DrawGadget(gi, FALSE, TRUE);
 
+  if (gadget_released_off_borders)
+  {
+    if (gi->type & GD_TYPE_SCROLLBAR)
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
-      printf("gadget released\n");
+    gi->event.type = GD_EVENT_RELEASED;
 
+    if (gi->event_mask & GD_EVENT_RELEASED &&
+	gi->event_mask & GD_EVENT_OFF_BORDERS)
+      gi->callback_action(gi);
+  }
+}
 
+void HandleGadgetsKeyInput(KeySym key)
+{
+  struct GadgetInfo *gi = last_gi;
+  char text[MAX_GADGET_TEXTSIZE];
+  int text_length;
+  int cursor_pos;
+  char letter;
+  boolean legal_letter;
+
+  if (gi == NULL || !(gi->type & GD_TYPE_TEXTINPUT) || !gi->mapped)
+    return;
 
-      if (gi->event_mask & GD_EVENT_RELEASED)
-	gi->callback(gi);
-    }
+  text_length = strlen(gi->text.value);
+  cursor_pos = gi->text.cursor_position;
+  letter = getCharFromKeySym(key);
+  legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ?
+		  letter >= '0' && letter <= '9' :
+		  letter != 0);
 
-    gi = NULL;
-    pressed = FALSE;
+  if (legal_letter && text_length < gi->text.size)
+  {
+    strcpy(text, gi->text.value);
+    strcpy(&gi->text.value[cursor_pos + 1], &text[cursor_pos]);
+    gi->text.value[cursor_pos] = letter;
+    gi->text.cursor_position++;
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
   }
-#endif
-
+  else if (key == XK_Left && cursor_pos > 0)
+  {
+    gi->text.cursor_position--;
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+  }
+  else if (key == XK_Right && cursor_pos < text_length)
+  {
+    gi->text.cursor_position++;
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+  }
+  else if (key == XK_BackSpace && cursor_pos > 0)
+  {
+    strcpy(text, gi->text.value);
+    strcpy(&gi->text.value[cursor_pos - 1], &text[cursor_pos]);
+    gi->text.cursor_position--;
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+  }
+  else if (key == XK_Delete && cursor_pos < text_length)
+  {
+    strcpy(text, gi->text.value);
+    strcpy(&gi->text.value[cursor_pos], &text[cursor_pos + 1]);
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+  }
+  else if (key == XK_Return)
+  {
+    CheckRangeOfNumericInputGadget(gi);
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
+    if (gi->event_mask & GD_EVENT_TEXT_RETURN)
+      gi->callback_action(gi);
 
+    last_gi = NULL;
+  }
 }