X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fbuttons.c;h=7c1e9c9a0ee99bf9a1c84d1ffb1a2fddbdf8dad7;hp=c5d998a34e7f7c9b470cdae04e3bcc148aae26f9;hb=fd18ece8535cd87bd72989d7d39092d55b283939;hpb=05c80e257e74b9f48c5d4b5cc807db0a4fb82fd2

diff --git a/src/buttons.c b/src/buttons.c
index c5d998a3..7c1e9c9a 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -132,8 +132,11 @@
 
 /* some positions in the game control window */
 #define GAME_BUTTON_STOP_XPOS	(GAME_CONTROL_XPOS + 0 * GAME_BUTTON_XSIZE)
+#define GAME_BUTTON_STOP_YPOS	(GAME_CONTROL_YPOS)
 #define GAME_BUTTON_PAUSE_XPOS	(GAME_CONTROL_XPOS + 1 * GAME_BUTTON_XSIZE)
+#define GAME_BUTTON_PAUSE_YPOS	(GAME_CONTROL_YPOS)
 #define GAME_BUTTON_PLAY_XPOS	(GAME_CONTROL_XPOS + 2 * GAME_BUTTON_XSIZE)
+#define GAME_BUTTON_PLAY_YPOS	(GAME_CONTROL_YPOS)
 #define GAME_BUTTON_ANY_YPOS	(GAME_CONTROL_YPOS)
 
 #define ON_GAME_BUTTON(x,y)	((x)>=(DX+GAME_CONTROL_XPOS) &&	\
@@ -340,6 +343,146 @@
 /********** drawing buttons and corresponding displays **********/
 /****************************************************************/
 
+void OLD_DrawVideoDisplay(unsigned long state, unsigned long value)
+{
+  int i;
+  int part_label = 0, part_symbol = 1;
+  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
+  static char *monatsname[12] =
+  {
+    "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
+    "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
+  };
+  static int video_pos[5][2][4] =
+  {
+    {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
+       VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
+     { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
+       VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
+
+    {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
+       VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
+     { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
+       VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
+
+    {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
+       VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
+     { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
+       VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
+
+    {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
+       VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
+     { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
+       VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
+
+    {{ 0,0,
+       0,0 },
+     { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
+       VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }}
+  };
+
+  if (state & VIDEO_STATE_PBEND_OFF)
+  {
+    int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
+
+    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+	      cx + VIDEO_REC_LABEL_XPOS,
+	      cy + VIDEO_REC_LABEL_YPOS,
+	      VIDEO_PBEND_LABEL_XSIZE,
+	      VIDEO_PBEND_LABEL_YSIZE,
+	      VX + VIDEO_REC_LABEL_XPOS,
+	      VY + VIDEO_REC_LABEL_YPOS);
+  }
+
+  for(i=0;i<10;i++)
+  {
+    if (state & (1<<i))
+    {
+      int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
+
+      if (i%2)			/* i ungerade => STATE_ON / PRESS_OFF */
+	cx = DOOR_GFX_PAGEX4;
+      else
+	cx = DOOR_GFX_PAGEX3;	/* i gerade => STATE_OFF / PRESS_ON */
+
+      if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
+	XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+		  cx + video_pos[pos][part_label][xpos],
+		  cy + video_pos[pos][part_label][ypos],
+		  video_pos[pos][part_label][xsize],
+		  video_pos[pos][part_label][ysize],
+		  VX + video_pos[pos][part_label][xpos],
+		  VY + video_pos[pos][part_label][ypos]);
+      if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
+	XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+		  cx + video_pos[pos][part_symbol][xpos],
+		  cy + video_pos[pos][part_symbol][ypos],
+		  video_pos[pos][part_symbol][xsize],
+		  video_pos[pos][part_symbol][ysize],
+		  VX + video_pos[pos][part_symbol][xpos],
+		  VY + video_pos[pos][part_symbol][ypos]);
+    }
+  }
+
+  if (state & VIDEO_STATE_FFWD_ON)
+  {
+    int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
+
+    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+	      cx + VIDEO_PLAY_SYMBOL_XPOS,
+	      cy + VIDEO_PLAY_SYMBOL_YPOS,
+	      VIDEO_PLAY_SYMBOL_XSIZE - 2,
+	      VIDEO_PLAY_SYMBOL_YSIZE,
+	      VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
+	      VY + VIDEO_PLAY_SYMBOL_YPOS);
+  }
+
+  if (state & VIDEO_STATE_PBEND_ON)
+  {
+    int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
+
+    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+	      cx + VIDEO_PBEND_LABEL_XPOS,
+	      cy + VIDEO_PBEND_LABEL_YPOS,
+	      VIDEO_PBEND_LABEL_XSIZE,
+	      VIDEO_PBEND_LABEL_YSIZE,
+	      VX + VIDEO_REC_LABEL_XPOS,
+	      VY + VIDEO_REC_LABEL_YPOS);
+  }
+
+  if (state & VIDEO_STATE_DATE_ON)
+  {
+    int tag = value % 100;
+    int monat = (value/100) % 100;
+    int jahr = (value/10000);
+
+    DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
+	     int2str(tag,2),FS_SMALL,FC_SPECIAL1);
+    DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
+	     monatsname[monat],FS_SMALL,FC_SPECIAL1);
+    DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
+	     int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
+  }
+
+  if (state & VIDEO_STATE_TIME_ON)
+  {
+    int min = value / 60;
+    int sec = value % 60;
+
+    DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
+	     int2str(min,2),FS_SMALL,FC_SPECIAL1);
+    DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
+	     int2str(sec,2),FS_SMALL,FC_SPECIAL1);
+  }
+
+  if (state & VIDEO_STATE_DATE)
+    redraw_mask |= REDRAW_VIDEO_1;
+  if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
+    redraw_mask |= REDRAW_VIDEO_2;
+  if (state & VIDEO_PRESS)
+    redraw_mask |= REDRAW_VIDEO_3;
+}
+
 void DrawVideoDisplay(unsigned long state, unsigned long value)
 {
   int i;
@@ -1468,6 +1611,12 @@ int CheckCountButtons(int mx, int my, int button)
 /* NEW GADGET STUFF -------------------------------------------------------- */
 
 
+/* values for DrawGadget() */
+#define DG_UNPRESSED		0
+#define DG_PRESSED		1
+#define DG_BUFFERED		0
+#define DG_DIRECT		1
+
 static struct GadgetInfo *gadget_list_first_entry = NULL;
 static struct GadgetInfo *gadget_list_last_entry = NULL;
 static int next_free_gadget_id = 1;
@@ -1515,33 +1664,7 @@ 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)
-    {
-
-#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;
   }
@@ -1549,228 +1672,478 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
   return gi;
 }
 
-static void default_callback_function(void *ptr)
+static void default_callback_info(void *ptr)
 {
-  return;
+  if (game_status == LEVELED)
+    HandleEditorGadgetInfoText(ptr);
 }
 
-struct GadgetInfo *CreateGadget(int first_tag, ...)
+static void default_callback_action(void *ptr)
 {
-  struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo));
-  int tag = first_tag;
-  va_list ap;
-
-  va_start(ap, first_tag);
+  return;
+}
 
-  /* 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 */
+static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
+{
+  int state = (pressed ? 1 : 0);
+  struct GadgetDesign *gd = (gi->checked ?
+			     &gi->alt_design[state] :
+			     &gi->design[state]);
 
-  while (tag != GDI_END)
+  switch (gi->type)
   {
-    switch(tag)
-    {
-      case GDI_CUSTOM_ID:
-	new_gadget->custom_id = va_arg(ap, int);
-	break;
-
-      case GDI_X:
-	new_gadget->x = va_arg(ap, int);
-	break;
+    case GD_TYPE_NORMAL_BUTTON:
+    case GD_TYPE_CHECK_BUTTON:
+    case GD_TYPE_RADIO_BUTTON:
+      XCopyArea(display, gd->pixmap, drawto, gc,
+		gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+      if (gi->deco.design.pixmap)
+	XCopyArea(display, gi->deco.design.pixmap, drawto, gc,
+		  gi->deco.design.x, gi->deco.design.y,
+		  gi->deco.width, gi->deco.height,
+		  gi->x + gi->deco.x + (pressed ? gi->deco.xshift : 0),
+		  gi->y + gi->deco.y + (pressed ? gi->deco.yshift : 0));
+      break;
 
-      case GDI_Y:
-	new_gadget->y = va_arg(ap, int);
-	break;
+    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, " ");
 
-      case GDI_WIDTH:
-	new_gadget->width = va_arg(ap, int);
-	break;
+	/* left part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y, border, gi->height, gi->x, gi->y);
 
-      case GDI_HEIGHT:
-	new_gadget->height = va_arg(ap, int);
-	break;
+	/* 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);
 
-      case GDI_TYPE:
-	new_gadget->type = va_arg(ap, unsigned long);
-	break;
+	/* 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);
 
-      case GDI_STATE:
-	new_gadget->state = va_arg(ap, unsigned long);
-	break;
+	/* gadget text value */
+	DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_color);
 
-      case GDI_RADIO_NR:
-	new_gadget->radio_nr = va_arg(ap, unsigned long);
-	break;
+	cursor_letter = gi->text.value[gi->text.cursor_position];
+	cursor_string[0] = '~';
+	cursor_string[1] = (cursor_letter != '\0' ? cursor_letter : ' ');
+	cursor_string[2] = '\0';
 
-      case GDI_RADIO_PRESSED:
-	new_gadget->radio_pressed = va_arg(ap, boolean);
-	break;
+	/* 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 GDI_NUMBER_VALUE:
-	new_gadget->number_value = va_arg(ap, long);
-	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;
 
-      case GDI_TEXT_VALUE:
-	{
-	  int max_textsize = MAX_GADGET_TEXTSIZE;
+	/* clear scrollbar area */
+	XFillRectangle(display, backbuffer, gc,
+		       gi->x, gi->y, gi->width, gi->height);
 
-	  if (new_gadget->text_size)
-	    max_textsize = MIN(new_gadget->text_size, MAX_GADGET_TEXTSIZE - 1);
+	/* upper part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y,
+		  gi->width, gi->design_border,
+		  xpos, ypos);
 
-	  strncpy(new_gadget->text_value, va_arg(ap, char *), max_textsize);
-	  new_gadget->text_value[max_textsize] = '\0';
-	}
-	break;
+	/* 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);
 
-      case GDI_TEXT_SIZE:
-	{
-	  int tag_value = va_arg(ap, int);
-	  int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE - 1);
+	/* 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);
 
-	  new_gadget->text_size = max_textsize;
-	  new_gadget->text_value[max_textsize] = '\0';
+	/* 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;
 
-	  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;
+    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, drawto, window, gc,
+	      gi->x, gi->y, gi->width, gi->height, gi->x, gi->y);
+  else
+    redraw_mask |= (gi->x < SX + SXSIZE ? REDRAW_FIELD :
+		    gi->y < DY + DYSIZE ? REDRAW_DOOR_1 :
+		    gi->y > VY ? REDRAW_DOOR_2 : REDRAW_DOOR_3);
+}
+
+static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
+{
+  int tag = first_tag;
+
+  while (tag != GDI_END)
+  {
+    switch(tag)
+    {
+      case GDI_CUSTOM_ID:
+	gi->custom_id = va_arg(ap, int);
+	break;
+
+      case GDI_INFO_TEXT:
+	{
+	  int max_textsize = MAX_INFO_TEXTSIZE - 1;
+
+	  strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
+	  gi->info_text[max_textsize] = '\0';
+	}
+	break;
+
+      case GDI_X:
+	gi->x = va_arg(ap, int);
+	break;
+
+      case GDI_Y:
+	gi->y = va_arg(ap, int);
+	break;
+
+      case GDI_WIDTH:
+	gi->width = va_arg(ap, int);
+	break;
+
+      case GDI_HEIGHT:
+	gi->height = va_arg(ap, int);
+	break;
+
+      case GDI_TYPE:
+	gi->type = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_STATE:
+	gi->state = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_CHECKED:
+	gi->checked = va_arg(ap, boolean);
+	break;
+
+      case GDI_RADIO_NR:
+	gi->radio_nr = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_NUMBER_VALUE:
+	gi->text.number_value = va_arg(ap, long);
+	sprintf(gi->text.value, "%d", gi->text.number_value);
+	gi->text.cursor_position = strlen(gi->text.value);
+	break;
+
+      case GDI_NUMBER_MIN:
+	gi->text.number_min = va_arg(ap, long);
+	if (gi->text.number_value < gi->text.number_min)
+	{
+	  gi->text.number_value = gi->text.number_min;
+	  sprintf(gi->text.value, "%d", gi->text.number_value);
+	}
+	break;
+
+      case GDI_NUMBER_MAX:
+	gi->text.number_max = va_arg(ap, long);
+	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);
+	}
+	break;
+
+      case GDI_TEXT_VALUE:
+	{
+	  int max_textsize = MAX_GADGET_TEXTSIZE;
+
+	  if (gi->text.size)
+	    max_textsize = MIN(gi->text.size, MAX_GADGET_TEXTSIZE - 1);
+
+	  strncpy(gi->text.value, va_arg(ap, char *), max_textsize);
+	  gi->text.value[max_textsize] = '\0';
+	  gi->text.cursor_position = strlen(gi->text.value);
+	}
+	break;
+
+      case GDI_TEXT_SIZE:
+	{
+	  int tag_value = va_arg(ap, int);
+	  int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE - 1);
+
+	  gi->text.size = max_textsize;
+	  gi->text.value[max_textsize] = '\0';
+
+	  if (gi->width == 0 && gi->height == 0)
+	  {
+	    gi->width = (gi->text.size + 1) * FONT2_XSIZE + 6;
+	    gi->height = ED_WIN_COUNT_YSIZE;
 	  }
 	}
 	break;
 
       case GDI_DESIGN_UNPRESSED:
-	new_gadget->design[GD_BUTTON_UNPRESSED].pixmap = va_arg(ap, Pixmap);
-	new_gadget->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
-	new_gadget->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
+	gi->design[GD_BUTTON_UNPRESSED].pixmap = va_arg(ap, Pixmap);
+	gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
+	gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_PRESSED:
-	new_gadget->design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
-	new_gadget->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
-	new_gadget->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
+	gi->design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
+	gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
+	gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_UNPRESSED:
-	new_gadget->alt_design[GD_BUTTON_UNPRESSED].pixmap= va_arg(ap, Pixmap);
-	new_gadget->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
-	new_gadget->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
+	gi->alt_design[GD_BUTTON_UNPRESSED].pixmap= va_arg(ap, Pixmap);
+	gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
+	gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_ALT_DESIGN_PRESSED:
-	new_gadget->alt_design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
-	new_gadget->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
-	new_gadget->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
+	gi->alt_design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
+	gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
+	gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_BORDER:
-	new_gadget->design_border = va_arg(ap, int);
+	gi->design_border = va_arg(ap, int);
+	break;
+
+      case GDI_DECORATION_DESIGN:
+	gi->deco.design.pixmap = va_arg(ap, Pixmap);
+	gi->deco.design.x = va_arg(ap, int);
+	gi->deco.design.y = va_arg(ap, int);
+	break;
+
+      case GDI_DECORATION_POSITION:
+	gi->deco.x = va_arg(ap, int);
+	gi->deco.y = va_arg(ap, int);
+	break;
+
+      case GDI_DECORATION_SIZE:
+	gi->deco.width = va_arg(ap, int);
+	gi->deco.height = va_arg(ap, int);
+	break;
+
+      case GDI_DECORATION_SHIFTING:
+	gi->deco.xshift = va_arg(ap, int);
+	gi->deco.yshift = va_arg(ap, int);
 	break;
 
       case GDI_EVENT_MASK:
-	new_gadget->event_mask = va_arg(ap, unsigned long);
+	gi->event_mask = va_arg(ap, unsigned long);
 	break;
 
       case GDI_AREA_SIZE:
-	new_gadget->drawing.area_xsize = va_arg(ap, int);
-	new_gadget->drawing.area_ysize = va_arg(ap, int);
+	gi->drawing.area_xsize = va_arg(ap, int);
+	gi->drawing.area_ysize = va_arg(ap, int);
 
 	/* determine dependent values for drawing area gadget, if needed */
-	if (new_gadget->width == 0 &&
-	    new_gadget->height == 0 &&
-	    new_gadget->drawing.item_xsize !=0 &&
-	    new_gadget->drawing.item_ysize !=0)
+	if (gi->width == 0 && gi->height == 0 &&
+	    gi->drawing.item_xsize !=0 && gi->drawing.item_ysize !=0)
 	{
-	  new_gadget->width =
-	    new_gadget->drawing.area_xsize * new_gadget->drawing.item_xsize;
-	  new_gadget->height =
-	    new_gadget->drawing.area_ysize * new_gadget->drawing.item_ysize;
+	  gi->width = gi->drawing.area_xsize * gi->drawing.item_xsize;
+	  gi->height = gi->drawing.area_ysize * gi->drawing.item_ysize;
 	}
-	else if (new_gadget->drawing.item_xsize == 0 &&
-		 new_gadget->drawing.item_ysize == 0 &&
-		 new_gadget->width != 0 &&
-		 new_gadget->height != 0)
+	else if (gi->drawing.item_xsize == 0 && gi->drawing.item_ysize == 0 &&
+		 gi->width != 0 && gi->height != 0)
 	{
-	  new_gadget->drawing.item_xsize =
-	    new_gadget->width / new_gadget->drawing.area_xsize;
-	  new_gadget->drawing.item_ysize =
-	    new_gadget->height / new_gadget->drawing.area_ysize;
+	  gi->drawing.item_xsize = gi->width / gi->drawing.area_xsize;
+	  gi->drawing.item_ysize = gi->height / gi->drawing.area_ysize;
 	}
 	break;
 
       case GDI_ITEM_SIZE:
-	new_gadget->drawing.item_xsize = va_arg(ap, int);
-	new_gadget->drawing.item_ysize = va_arg(ap, int);
+	gi->drawing.item_xsize = va_arg(ap, int);
+	gi->drawing.item_ysize = va_arg(ap, int);
 
 	/* determine dependent values for drawing area gadget, if needed */
-	if (new_gadget->width == 0 &&
-	    new_gadget->height == 0 &&
-	    new_gadget->drawing.area_xsize !=0 &&
-	    new_gadget->drawing.area_ysize !=0)
+	if (gi->width == 0 && gi->height == 0 &&
+	    gi->drawing.area_xsize !=0 && gi->drawing.area_ysize !=0)
 	{
-	  new_gadget->width =
-	    new_gadget->drawing.area_xsize * new_gadget->drawing.item_xsize;
-	  new_gadget->height =
-	    new_gadget->drawing.area_ysize * new_gadget->drawing.item_ysize;
+	  gi->width = gi->drawing.area_xsize * gi->drawing.item_xsize;
+	  gi->height = gi->drawing.area_ysize * gi->drawing.item_ysize;
 	}
-	else if (new_gadget->drawing.area_xsize == 0 &&
-		 new_gadget->drawing.area_ysize == 0 &&
-		 new_gadget->width != 0 &&
-		 new_gadget->height != 0)
+	else if (gi->drawing.area_xsize == 0 && gi->drawing.area_ysize == 0 &&
+		 gi->width != 0 && gi->height != 0)
 	{
-	  new_gadget->drawing.area_xsize =
-	    new_gadget->width / new_gadget->drawing.item_xsize;
-	  new_gadget->drawing.area_ysize =
-	    new_gadget->height / new_gadget->drawing.item_ysize;
+	  gi->drawing.area_xsize = gi->width / gi->drawing.item_xsize;
+	  gi->drawing.area_ysize = gi->height / gi->drawing.item_ysize;
 	}
 	break;
 
       case GDI_SCROLLBAR_ITEMS_MAX:
-	new_gadget->scrollbar.items_max = va_arg(ap, int);
+	gi->scrollbar.items_max = va_arg(ap, int);
 	break;
 
       case GDI_SCROLLBAR_ITEMS_VISIBLE:
-	new_gadget->scrollbar.items_visible = va_arg(ap, int);
+	gi->scrollbar.items_visible = va_arg(ap, int);
 	break;
 
       case GDI_SCROLLBAR_ITEM_POSITION:
-	new_gadget->scrollbar.item_position = va_arg(ap, int);
+	gi->scrollbar.item_position = va_arg(ap, int);
 	break;
 
-      case GDI_CALLBACK:
-	new_gadget->callback = va_arg(ap, gadget_callback_function);
+      case GDI_CALLBACK_INFO:
+	gi->callback_info = va_arg(ap, gadget_function);
+	break;
+
+      case GDI_CALLBACK_ACTION:
+	gi->callback_action = va_arg(ap, gadget_function);
 	break;
 
       default:
-	Error(ERR_EXIT, "CreateGadget(): unknown tag %d", tag);
+	Error(ERR_EXIT, "HandleGadgetTags(): unknown tag %d", tag);
     }
 
     tag = va_arg(ap, int);	/* read next tag */
   }
 
-  va_end(ap);
-
   /* check if gadget complete */
-  if (new_gadget->type != GD_TYPE_DRAWING_AREA &&
-      (!new_gadget->design[GD_BUTTON_UNPRESSED].pixmap ||
-       !new_gadget->design[GD_BUTTON_PRESSED].pixmap))
+  if (gi->type != GD_TYPE_DRAWING_AREA &&
+      (!gi->design[GD_BUTTON_UNPRESSED].pixmap ||
+       !gi->design[GD_BUTTON_PRESSED].pixmap))
     Error(ERR_EXIT, "gadget incomplete (missing Pixmap)");
 
-  if (new_gadget->type & GD_TYPE_SCROLLBAR)
+  /* adjust gadget values in relation to other gadget values */
+
+  if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC)
   {
-    struct GadgetScrollbar *gs = &new_gadget->scrollbar;
+    struct GadgetTextInput *text = &gi->text;
+    int value = text->number_value;
+
+    text->number_value = (value < text->number_min ? text->number_min :
+			  value > text->number_max ? text->number_max :
+			  value);
 
-    if (new_gadget->width == 0 || new_gadget->height == 0 ||
+    sprintf(text->value, "%d", text->number_value);
+  }
+
+  if (gi->type & GD_TYPE_SCROLLBAR)
+  {
+    struct GadgetScrollbar *gs = &gi->scrollbar;
+
+    if (gi->width == 0 || gi->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_max = (gi->type == GD_TYPE_SCROLLBAR_VERTICAL ?
+		    gi->height : gi->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;
+
+    /* finetuning for maximal right/bottom position */
+    if (gs->item_position == gs->items_max - gs->items_visible)
+      gs->position = gs->position_max;
   }
+}
+
+void ModifyGadget(struct GadgetInfo *gi, int first_tag, ...)
+{
+  va_list ap;
+
+  va_start(ap, first_tag);
+  HandleGadgetTags(gi, first_tag, ap);
+  va_end(ap);
+
+  RedrawGadget(gi);
+}
+
+void RedrawGadget(struct GadgetInfo *gi)
+{
+  if (gi->mapped)
+    DrawGadget(gi, gi->state, DG_DIRECT);
+}
+
+struct GadgetInfo *CreateGadget(int first_tag, ...)
+{
+  struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo));
+  va_list ap;
+
+  /* always start with reliable default values */
+  memset(new_gadget, 0, sizeof(struct GadgetInfo));	/* zero all fields */
+  new_gadget->id = getNewGadgetID();
+  new_gadget->callback_info = default_callback_info;
+  new_gadget->callback_action = default_callback_action;
+
+  va_start(ap, first_tag);
+  HandleGadgetTags(new_gadget, first_tag, ap);
+  va_end(ap);
 
   /* insert new gadget into global gadget list */
   if (gadget_list_last_entry)
@@ -1801,220 +2174,130 @@ 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 DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
+static void CheckRangeOfNumericInputGadget(struct GadgetInfo *gi)
 {
-  int state = (pressed ? 1 : 0);
-  struct GadgetDesign *gd = (gi->radio_pressed ?
-			     &gi->alt_design[state] :
-			     &gi->design[state]);
+  if (gi->type != GD_TYPE_TEXTINPUT_NUMERIC)
+    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;
+  gi->text.number_value = atoi(gi->text.value);
 
-    case GD_TYPE_TEXTINPUT:
-      {
-	int i;
+  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;
 
-	/* left part of gadget */
-	XCopyArea(display, gd->pixmap, drawto, gc,
-		  gd->x, gd->y,
-		  gi->design_border, gi->height,
-		  gi->x, gi->y);
+  sprintf(gi->text.value, "%d", gi->text.number_value);
 
-	/* middle part of gadget */
-	for (i=0; i<=gi->text_size; i++)
-	  XCopyArea(display, gd->pixmap, drawto, gc,
-		    gd->x + gi->design_border, gd->y,
-		    FONT2_XSIZE, gi->height,
-		    gi->x + gi->design_border + i * FONT2_XSIZE, gi->y);
+  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);
+}
 
-	/* right part of gadget */
-	XCopyArea(display, gd->pixmap, drawto, gc,
-		  gd->x + ED_WIN_COUNT_XSIZE - gi->design_border, gd->y,
-		  gi->design_border, gi->height,
-		  gi->x + gi->width - gi->design_border, gi->y);
+/* global pointer to gadget actually in use (when mouse button pressed) */
+static struct GadgetInfo *last_gi = NULL;
 
-	/* gadget text value */
-	DrawText(gi->x + gi->design_border, gi->y + gi->design_border,
-		 gi->text_value, FS_SMALL, (pressed ? FC_GREEN : FC_YELLOW));
+static void MapGadgetExt(struct GadgetInfo *gi, boolean redraw)
+{
+  if (gi == NULL || gi->mapped)
+    return;
 
-	/* draw cursor, if active */
-	DrawText(gi->x + gi->design_border +
-		 strlen(gi->text_value) * FONT2_XSIZE,
-		 gi->y + gi->design_border,
-		 (pressed ? "<" : " "),
-		 FS_SMALL, FC_RED);
-      }
-      break;
+  gi->mapped = TRUE;
 
-    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;
+  if (redraw)
+    DrawGadget(gi, DG_UNPRESSED, DG_BUFFERED);
+}
 
-	/* clear scrollbar area */
-	XFillRectangle(display, backbuffer, gc,
-		       gi->x, gi->y, gi->width, gi->height);
+void MapGadget(struct GadgetInfo *gi)
+{
+  MapGadgetExt(gi, TRUE);
+}
 
-	/* upper part of gadget */
-	XCopyArea(display, gd->pixmap, drawto, gc,
-		  gd->x, gd->y,
-		  gi->width, gi->design_border,
-		  xpos, ypos);
+void UnmapGadget(struct GadgetInfo *gi)
+{
+  if (gi == NULL || !gi->mapped)
+    return;
 
-	/* 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);
+  gi->mapped = FALSE;
 
-	/* 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);
+  if (gi == last_gi)
+    last_gi = NULL;
+}
 
-	/* 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;
+#define MAX_NUM_GADGETS		1024
+#define MULTIMAP_UNMAP		(1 << 0)
+#define MULTIMAP_REMAP		(1 << 1)
+#define MULTIMAP_REDRAW		(1 << 2)
+#define MULTIMAP_PLAYFIELD	(1 << 3)
+#define MULTIMAP_DOOR_1		(1 << 4)
+#define MULTIMAP_DOOR_2		(1 << 5)
+#define MULTIMAP_ALL		(MULTIMAP_PLAYFIELD | \
+				 MULTIMAP_DOOR_1 | \
+				 MULTIMAP_DOOR_2)
+
+static void MultiMapGadgets(int mode)
+{
+  struct GadgetInfo *gi = gadget_list_first_entry;
+  static boolean map_state[MAX_NUM_GADGETS];
+  int map_count = 0;
 
-    case GD_TYPE_SCROLLBAR_HORIZONTAL:
+  while (gi)
+  {
+    if ((mode & MULTIMAP_PLAYFIELD && gi->x < SX + SXSIZE) ||
+	(mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y < DY + DYSIZE) ||
+	(mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y > DY + DYSIZE))
+    {
+      if (mode & MULTIMAP_UNMAP)
       {
-	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);
+	map_state[map_count++ % MAX_NUM_GADGETS] = gi->mapped;
+	UnmapGadget(gi);
       }
-      break;
+      else
+      {
+	if (map_state[map_count++ % MAX_NUM_GADGETS])
+	  MapGadgetExt(gi, (mode & MULTIMAP_REDRAW));
+      }
+    }
 
-    default:
-      return;
+    gi = gi->next;
   }
-
-  if (direct)
-    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)
+void UnmapAllGadgets()
 {
-  /* 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);
+  MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_UNMAP);
 }
 
-void AdjustScrollbar(struct GadgetInfo *gi, int items_max, int item_pos)
+void RemapAllGadgets()
 {
-  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);
+  MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_REMAP);
 }
 
-void MapGadget(struct GadgetInfo *gi)
+boolean anyTextGadgetActive()
 {
-  if (gi == NULL)
-    return;
-
-  gi->mapped = TRUE;
-
-  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), DG_BUFFERED);
+  return (last_gi && last_gi->type & GD_TYPE_TEXTINPUT && last_gi->mapped);
 }
 
-void UnmapGadget(struct GadgetInfo *gi)
+void ClickOnGadget(struct GadgetInfo *gi, int button)
 {
-  if (gi == NULL)
-    return;
+  /* simulate releasing mouse button over last gadget, if still pressed */
+  if (button_status)
+    HandleGadgets(-1, -1, 0);
 
-  gi->mapped = FALSE;
-}
+  /* simulate pressing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, button);
 
-static struct GadgetInfo *last_gi = NULL;
+  /* simulate releasing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, 0);
+}
 
 void HandleGadgets(int mx, int my, int button)
 {
+  static struct GadgetInfo *last_info_gi = NULL;
   static unsigned long pressed_delay = 0;
   static int last_button = 0;
   static int last_mx = 0, last_my = 0;
-  int scrollbar_mouse_pos;
+  int scrollbar_mouse_pos = 0;
   struct GadgetInfo *new_gi, *gi;
   boolean press_event;
   boolean release_event;
@@ -2027,6 +2310,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)
@@ -2045,18 +2329,34 @@ void HandleGadgets(int mx, int my, int button)
   last_mx = mx;
   last_my = my;
 
-  /* if mouse button pressed outside text input gadget, deactivate it */
-  if (last_gi && last_gi->type == GD_TYPE_TEXTINPUT &&
-      button != 0 && new_gi != last_gi && !motion_status)
+  /* special treatment for text and number input gadgets */
+  if (anyTextGadgetActive() && button != 0 && !motion_status)
   {
     struct GadgetInfo *gi = last_gi;
 
-    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+    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->event_mask & GD_EVENT_TEXT_LEAVING)
-      gi->callback(gi);
+      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);
 
-    last_gi = NULL;
+      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 =
@@ -2064,7 +2364,7 @@ void HandleGadgets(int mx, int my, int button)
   gadget_pressed_repeated =
     (button != 0 && last_gi != NULL && new_gi == last_gi);
 
-  gadget_released =		(button == 0 && last_gi != NULL);
+  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);
 
@@ -2085,11 +2385,18 @@ void HandleGadgets(int mx, int my, int button)
       (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)
+  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;
 
@@ -2097,12 +2404,34 @@ void HandleGadgets(int mx, int my, int button)
     {
       gi->event.x /= gi->drawing.item_xsize;
       gi->event.y /= gi->drawing.item_ysize;
+
+      if (last_x != gi->event.x || last_y != 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 && changed_position))
+  {
+    last_info_gi = new_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_pressed)
   {
-    if (gi->type == GD_TYPE_RADIO_BUTTON)
+    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;
 
@@ -2113,14 +2442,14 @@ void HandleGadgets(int mx, int my, int button)
 	    rgi->radio_nr == gi->radio_nr &&
 	    rgi != gi)
 	{
-	  rgi->radio_pressed = FALSE;
+	  rgi->checked = FALSE;
 	  DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
 	}
 
 	rgi = rgi->next;
       }
 
-      gi->radio_pressed = TRUE;
+      gi->checked = TRUE;
     }
     else if (gi->type & GD_TYPE_SCROLLBAR)
     {
@@ -2150,7 +2479,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,14 +2496,15 @@ void HandleGadgets(int mx, int my, int button)
 	  changed_position = TRUE;
 	}
 
-	AdjustScrollbar(gi, gs->items_max, gs->item_position);
+	ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, gs->item_position,
+		     GDI_END);
 
 	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(gi);
+	  gi->callback_action(gi);
 
 	/* don't handle this scrollbar anymore while mouse button pressed */
 	last_gi = NULL;
@@ -2190,24 +2521,21 @@ void HandleGadgets(int mx, int my, int button)
     gi->event.off_borders = FALSE;
 
     /* initialize delay counter */
-    pressed_delay = 0;
-    DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
+    DelayReached(&pressed_delay, 0);
 
     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)
@@ -2246,19 +2574,19 @@ 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)
   {
-    if (gi->type != GD_TYPE_TEXTINPUT)
+    if (!(gi->type & GD_TYPE_TEXTINPUT))
       DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_UNPRESSED;
     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)
@@ -2270,39 +2598,67 @@ 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);
   }
 }
 
 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)
+  if (gi == NULL || !(gi->type & GD_TYPE_TEXTINPUT) || !gi->mapped)
     return;
 
-  text_length = strlen(gi->text_value);
+  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);
 
-  if (letter && text_length < gi->text_size)
+  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);
+  }
+  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)
   {
-    gi->text_value[text_length] = letter;
-    gi->text_value[text_length + 1] = '\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 || key == XK_BackSpace) && text_length > 0)
+  else if (key == XK_Delete && cursor_pos < text_length)
   {
-    gi->text_value[text_length - 1] = '\0';
+    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(gi);
+      gi->callback_action(gi);
 
     last_gi = NULL;
   }