X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=7b7041200098360db6ee4b4aadc35decd462da5e;hb=80b3b0a5109b5678a9a921fcd1b4f7046e5e76d0;hp=45744a8c99f01d14c2c5059ea590371cc650e57f;hpb=6ed4958820f8f97174ca47594dcc6f00ee31b2cb;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 45744a8c..7b704120 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -22,6 +22,7 @@
 /* values for DrawGadget() */
 #define DG_UNPRESSED		0
 #define DG_PRESSED		1
+
 #define DG_BUFFERED		0
 #define DG_DIRECT		1
 
@@ -68,7 +69,7 @@ void DUMP_GADGET_MAP_STATE()
 {
   struct GadgetInfo *gi = gadget_list_first_entry;
 
-  while (gi)
+  while (gi != NULL)
   {
     printf("-XXX-1-> '%s': %s\n",
 	   gi->info_text, (gi->mapped ? "mapped" : "not mapped"));
@@ -80,22 +81,28 @@ void DUMP_GADGET_MAP_STATE()
 
 static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
 {
-  struct GadgetInfo *gi = gadget_list_first_entry;
+  struct GadgetInfo *gi;
 
-  while (gi)
+  /* open selectboxes may overlap other active gadgets, so check them first */
+  for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
   {
-    if (gi->mapped &&
-	((mx >= gi->x && mx < gi->x + gi->width &&
-	  my >= gi->y && my < gi->y + gi->height) ||
-	 (gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open &&
-	  mx >= gi->selectbox.x && mx < gi->selectbox.x+gi->selectbox.width &&
-	  my >= gi->selectbox.y && my < gi->selectbox.y+gi->selectbox.height)))
-      break;
+    if (gi->mapped && gi->active &&
+	gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open &&
+	mx >= gi->selectbox.x && mx < gi->selectbox.x + gi->selectbox.width &&
+	my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height)
+      return gi;
+  }
 
-    gi = gi->next;
+  /* check all other gadgets */
+  for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next)
+  {
+    if (gi->mapped && gi->active &&
+	mx >= gi->x && mx < gi->x + gi->width &&
+	my >= gi->y && my < gi->y + gi->height)
+      return gi;
   }
 
-  return gi;
+  return NULL;
 }
 
 static void default_callback_info(void *ptr)
@@ -110,9 +117,9 @@ static void default_callback_action(void *ptr)
 
 static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 {
-  int state = (pressed ? 1 : 0);
-  struct GadgetDesign *gd = (gi->checked ?
-			     &gi->alt_design[state] :
+  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;
 
@@ -132,31 +139,67 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 		   gi->y + gi->deco.y + (pressed ? gi->deco.yshift : 0));
       break;
 
+    case GD_TYPE_TEXT_BUTTON:
+      {
+	int i;
+	int font_nr = (gi->active ? gi->font_active : gi->font);
+	int font_width = getFontWidth(font_nr);
+	int border_x = gi->border.xsize;
+	int border_y = gi->border.ysize;
+	int text_size = strlen(gi->textbutton.value);
+	int text_start = (gi->width - text_size * font_width) / 2;
+
+	/* left part of gadget */
+	BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y,
+			       border_x, gi->height, gi->x, gi->y);
+
+	/* middle part of gadget */
+	for (i=0; i < gi->textbutton.size; i++)
+	  BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y,
+				 font_width, gi->height,
+				 gi->x + border_x + i * font_width, gi->y);
+
+	/* right part of gadget */
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x + gi->border.width - border_x, gd->y,
+			       border_x, gi->height,
+			       gi->x + gi->width - border_x, gi->y);
+
+	/* gadget text value */
+	DrawTextExt(drawto,
+		    gi->x + text_start + (pressed ? gi->deco.xshift : 0),
+		    gi->y + border_y   + (pressed ? gi->deco.yshift : 0),
+		    gi->textbutton.value, font_nr, BLIT_MASKED);
+      }
+      break;
+
     case GD_TYPE_TEXTINPUT_ALPHANUMERIC:
     case GD_TYPE_TEXTINPUT_NUMERIC:
       {
 	int i;
 	char cursor_letter;
-	char cursor_string[3];
+	char cursor_string[2];
 	char text[MAX_GADGET_TEXTSIZE + 1];
-	int font_type = gi->text.font_type;
-	int font_width = getFontWidth(font_type);
-	int border = gi->border.size;
+	int font_nr = (pressed ? gi->font_active : gi->font);
+	int font_width = getFontWidth(font_nr);
+	int border_x = gi->border.xsize;
+	int border_y = gi->border.ysize;
 
 	/* left part of gadget */
-	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x, gd->y, border, gi->height, gi->x, gi->y);
+	BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y,
+			       border_x, gi->height, gi->x, gi->y);
 
 	/* middle part of gadget */
 	for (i=0; i < gi->text.size + 1; i++)
-	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + border, gd->y, font_width, gi->height,
-				 gi->x + border + i * font_width, gi->y);
+	  BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y,
+				 font_width, gi->height,
+				 gi->x + border_x + i * font_width, gi->y);
 
 	/* right part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x + gi->border.width - border, gd->y,border,
-			       gi->height, gi->x + gi->width - border, gi->y);
+			       gd->x + gi->border.width - border_x, gd->y,
+			       border_x, gi->height,
+			       gi->x + gi->width - border_x, gi->y);
 
 	/* set text value */
 	strcpy(text, gi->text.value);
@@ -164,20 +207,19 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 
 	/* gadget text value */
 	DrawTextExt(drawto,
-		    gi->x + border, gi->y + border, text,
-		    font_type, FONT_MASKED);
+		    gi->x + border_x, gi->y + border_y, text,
+		    font_nr, BLIT_MASKED);
 
 	cursor_letter = gi->text.value[gi->text.cursor_position];
-	cursor_string[0] = '~';
-	cursor_string[1] = (cursor_letter != '\0' ? cursor_letter : ' ');
-	cursor_string[2] = '\0';
+	cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
+	cursor_string[1] = '\0';
 
 	/* draw cursor, if active */
 	if (pressed)
 	  DrawTextExt(drawto,
-		      gi->x + border + gi->text.cursor_position * font_width,
-		      gi->y + border, cursor_string,
-		      font_type, FONT_MASKED);
+		      gi->x + border_x + gi->text.cursor_position * font_width,
+		      gi->y + border_y, cursor_string,
+		      font_nr, BLIT_INVERSE);
       }
       break;
 
@@ -185,44 +227,46 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
       {
 	int i;
 	char text[MAX_GADGET_TEXTSIZE + 1];
-	int font_type = gi->selectbox.font_type;
-	int font_width = getFontWidth(font_type);
-	int font_height = getFontHeight(font_type);
-	int border = gi->border.size;
-	int button = gi->border.size_selectbutton;
-	int width_inner = gi->border.width - button - 2 * border;
+	int font_nr = (pressed ? gi->font_active : gi->font);
+	int font_width = getFontWidth(font_nr);
+	int font_height = getFontHeight(font_nr);
+	int border_x = gi->border.xsize;
+	int border_y = gi->border.ysize;
+	int button = gi->border.xsize_selectbutton;
+	int width_inner = gi->border.width - button - 2 * border_x;
 	int box_width = gi->selectbox.width;
 	int box_height = gi->selectbox.height;
 
 	/* left part of gadget */
-	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x, gd->y, border, gi->height, gi->x, gi->y);
+	BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y,
+			       border_x, gi->height, gi->x, gi->y);
 
 	/* middle part of gadget */
 	for (i=0; i < gi->selectbox.size; i++)
-	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + border, gd->y, font_width, gi->height,
-				 gi->x + border + i * font_width, gi->y);
+	  BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y,
+				 font_width, gi->height,
+				 gi->x + border_x + i * font_width, gi->y);
 
 	/* button part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x + border + width_inner, gd->y,
+			       gd->x + border_x + width_inner, gd->y,
 			       button, gi->height,
-			       gi->x + gi->width - border - button, gi->y);
+			       gi->x + gi->width - border_x - button, gi->y);
 
 	/* right part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x + gi->border.width - border, gd->y,border,
-			       gi->height, gi->x + gi->width - border, gi->y);
+			       gd->x + gi->border.width - border_x, gd->y,
+			       border_x, gi->height,
+			       gi->x + gi->width - border_x, gi->y);
 
 	/* set text value */
-	strncpy(text, gi->selectbox.values[gi->selectbox.index],
+	strncpy(text, gi->selectbox.options[gi->selectbox.index].text,
 		gi->selectbox.size);
 	text[gi->selectbox.size] = '\0';
 
 	/* gadget text value */
-	DrawTextExt(drawto, gi->x + border, gi->y + border, text,
-		    font_type, FONT_MASKED);
+	DrawTextExt(drawto, gi->x + border_x, gi->y + border_y, text,
+		    font_nr, BLIT_MASKED);
 
 	if (pressed)
 	{
@@ -243,107 +287,113 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 
 	  /* top left part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y,
-				 border, border,
+				 border_x, border_y,
 				 gi->selectbox.x, gi->selectbox.y);
 
 	  /* top middle part of gadget border */
 	  for (i=0; i < gi->selectbox.size; i++)
-	    BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border, gd->y,
-				   font_width, border,
-				   gi->selectbox.x + border + i * font_width,
+	    BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y,
+				   font_width, border_y,
+				   gi->selectbox.x + border_x + i * font_width,
 				   gi->selectbox.y);
 
 	  /* top button part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + border + width_inner, gd->y,
-				 button, border,
-				 gi->selectbox.x + box_width - border - button,
+				 gd->x + border_x + width_inner, gd->y,
+				 button, border_y,
+				 gi->selectbox.x + box_width -border_x -button,
 				 gi->selectbox.y);
 
 	  /* top right part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + gi->border.width - border, gd->y,
-				 border, border,
-				 gi->selectbox.x + box_width - border,
+				 gd->x + gi->border.width - border_x, gd->y,
+				 border_x, border_y,
+				 gi->selectbox.x + box_width - border_x,
 				 gi->selectbox.y);
 
 	  /* left and right part of gadget border for each row */
 	  for (i=0; i < gi->selectbox.num_values; i++)
 	  {
-	    BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + border,
-				   border, font_height,
+	    BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + border_y,
+				   border_x, font_height,
 				   gi->selectbox.x,
-				   gi->selectbox.y + border + i * font_height);
+				   gi->selectbox.y + border_y + i*font_height);
 	    BlitBitmapOnBackground(gd->bitmap, drawto,
-				   gd->x + gi->border.width - border,
-				   gd->y + border,
-				   border, font_height,
-				   gi->selectbox.x + box_width - border,
-				   gi->selectbox.y + border + i * font_height);
+				   gd->x + gi->border.width - border_x,
+				   gd->y + border_y,
+				   border_x, font_height,
+				   gi->selectbox.x + box_width - border_x,
+				   gi->selectbox.y + border_y + i*font_height);
 	  }
 
 	  /* bottom left part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x, gd->y + gi->height - border,
-				 border, border,
+				 gd->x, gd->y + gi->height - border_y,
+				 border_x, border_y,
 				 gi->selectbox.x,
-				 gi->selectbox.y + box_height - border);
+				 gi->selectbox.y + box_height - border_y);
 
 	  /* bottom middle part of gadget border */
 	  for (i=0; i < gi->selectbox.size; i++)
 	    BlitBitmapOnBackground(gd->bitmap, drawto,
-				   gd->x + border, gd->y + gi->height - border,
-				   font_width, border,
-				   gi->selectbox.x + border + i * font_width,
-				   gi->selectbox.y + box_height - border);
+				   gd->x + border_x,
+				   gd->y + gi->height - border_y,
+				   font_width, border_y,
+				   gi->selectbox.x + border_x + i * font_width,
+				   gi->selectbox.y + box_height - border_y);
 
 	  /* bottom button part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + border + width_inner,
-				 gd->y + gi->height - border,
-				 button, border,
-				 gi->selectbox.x + box_width - border - button,
-				 gi->selectbox.y + box_height - border);
+				 gd->x + border_x + width_inner,
+				 gd->y + gi->height - border_y,
+				 button, border_y,
+				 gi->selectbox.x + box_width -border_x -button,
+				 gi->selectbox.y + box_height - border_y);
 
 	  /* bottom right part of gadget border */
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + gi->border.width - border,
-				 gd->y + gi->height - border,
-				 border, border,
-				 gi->selectbox.x + box_width - border,
-				 gi->selectbox.y + box_height - border);
+				 gd->x + gi->border.width - border_x,
+				 gd->y + gi->height - border_y,
+				 border_x, border_y,
+				 gi->selectbox.x + box_width - border_x,
+				 gi->selectbox.y + box_height - border_y);
 
 	  ClearRectangleOnBackground(drawto,
-				     gi->selectbox.x + border,
-				     gi->selectbox.y + border,
-				     gi->selectbox.width - 2 * border,
-				     gi->selectbox.height - 2 * border);
+				     gi->selectbox.x + border_x,
+				     gi->selectbox.y + border_y,
+				     gi->selectbox.width - 2 * border_x,
+				     gi->selectbox.height - 2 * border_y);
 
 	  /* selectbox text values */
 	  for (i=0; i < gi->selectbox.num_values; i++)
 	  {
+	    int mask_mode;
+
 	    if (i == gi->selectbox.current_index)
 	    {
-	      DrawRectangle(drawto,
-			    gi->selectbox.x + border,
-			    gi->selectbox.y + border + i * font_height,
-			    gi->selectbox.width - 2 * border, font_height,
-			    gi->selectbox.reverse_color);
-
-	      text[0] = '~';
-	      strncpy(&text[1], gi->selectbox.values[i], gi->selectbox.size);
+	      FillRectangle(drawto,
+			    gi->selectbox.x + border_x,
+			    gi->selectbox.y + border_y + i * font_height,
+			    gi->selectbox.width - 2 * border_x, font_height,
+			    gi->selectbox.inverse_color);
+
+	      strncpy(text, gi->selectbox.options[i].text, gi->selectbox.size);
 	      text[1 + gi->selectbox.size] = '\0';
+
+	      mask_mode = BLIT_INVERSE;
 	    }
 	    else
 	    {
-	      strncpy(text, gi->selectbox.values[i], gi->selectbox.size);
+	      strncpy(text, gi->selectbox.options[i].text, gi->selectbox.size);
 	      text[gi->selectbox.size] = '\0';
+
+	      mask_mode = BLIT_MASKED;
 	    }
 
 	    DrawTextExt(drawto,
-			gi->selectbox.x + border,
-			gi->selectbox.y + border + i * font_height, text,
-			font_type, FONT_MASKED);
+			gi->selectbox.x + border_x,
+			gi->selectbox.y + border_y + i * font_height, text,
+			font_nr, mask_mode);
 	  }
 
 	  redraw_selectbox = TRUE;
@@ -372,9 +422,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	int xpos = gi->x;
 	int ypos = gi->y + gi->scrollbar.position;
 	int design_full = gi->width;
-	int design_body = design_full - 2 * gi->border.size;
+	int design_body = design_full - 2 * gi->border.ysize;
 	int size_full = gi->scrollbar.size;
-	int size_body = size_full - 2 * gi->border.size;
+	int size_body = size_full - 2 * gi->border.ysize;
 	int num_steps = size_body / design_body;
 	int step_size_remain = size_body - num_steps * design_body;
 
@@ -385,31 +435,31 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	/* upper part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
 			       gd->x, gd->y,
-			       gi->width, gi->border.size,
+			       gi->width, gi->border.ysize,
 			       xpos, ypos);
 
 	/* middle part of gadget */
 	for (i=0; i<num_steps; i++)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x, gd->y + gi->border.size,
+				 gd->x, gd->y + gi->border.ysize,
 				 gi->width, design_body,
 				 xpos,
-				 ypos + gi->border.size + i * design_body);
+				 ypos + gi->border.ysize + i * design_body);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x,  gd->y + gi->border.size,
+				 gd->x,  gd->y + gi->border.ysize,
 				 gi->width, step_size_remain,
 				 xpos,
-				 ypos + gi->border.size
+				 ypos + gi->border.ysize
 				 + num_steps * design_body);
 
 	/* lower part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x, gd->y + design_full - gi->border.size,
-			       gi->width, gi->border.size,
-			       xpos, ypos + size_full - gi->border.size);
+			       gd->x, gd->y + design_full - gi->border.ysize,
+			       gi->width, gi->border.ysize,
+			       xpos, ypos + size_full - gi->border.ysize);
       }
       break;
 
@@ -419,9 +469,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	int xpos = gi->x + gi->scrollbar.position;
 	int ypos = gi->y;
 	int design_full = gi->height;
-	int design_body = design_full - 2 * gi->border.size;
+	int design_body = design_full - 2 * gi->border.xsize;
 	int size_full = gi->scrollbar.size;
-	int size_body = size_full - 2 * gi->border.size;
+	int size_body = size_full - 2 * gi->border.xsize;
 	int num_steps = size_body / design_body;
 	int step_size_remain = size_body - num_steps * design_body;
 
@@ -432,31 +482,31 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	/* left part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
 			       gd->x, gd->y,
-			       gi->border.size, gi->height,
+			       gi->border.xsize, gi->height,
 			       xpos, ypos);
 
 	/* middle part of gadget */
 	for (i=0; i<num_steps; i++)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + gi->border.size, gd->y,
+				 gd->x + gi->border.xsize, gd->y,
 				 design_body, gi->height,
-				 xpos + gi->border.size + i * design_body,
+				 xpos + gi->border.xsize + i * design_body,
 				 ypos);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
-				 gd->x + gi->border.size, gd->y,
+				 gd->x + gi->border.xsize, gd->y,
 				 step_size_remain, gi->height,
-				 xpos + gi->border.size
+				 xpos + gi->border.xsize
 				 + num_steps * design_body,
 				 ypos);
 
 	/* right part of gadget */
 	BlitBitmapOnBackground(gd->bitmap, drawto,
-			       gd->x + design_full - gi->border.size, gd->y,
-			       gi->border.size, gi->height,
-			       xpos + size_full - gi->border.size, ypos);
+			       gd->x + design_full - gi->border.xsize, gd->y,
+			       gi->border.xsize, gi->height,
+			       xpos + size_full - gi->border.xsize, ypos);
       }
       break;
 
@@ -535,6 +585,18 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	gi->state = va_arg(ap, unsigned long);
 	break;
 
+      case GDI_ACTIVE:
+	/* take care here: "boolean" is typedef'ed as "unsigned char",
+	   which gets promoted to "int" */
+	gi->active = (boolean)va_arg(ap, int);
+	break;
+
+      case GDI_DIRECT_DRAW:
+	/* take care here: "boolean" is typedef'ed as "unsigned char",
+	   which gets promoted to "int" */
+	gi->direct_draw = (boolean)va_arg(ap, int);
+	break;
+
       case GDI_CHECKED:
 	/* take care here: "boolean" is typedef'ed as "unsigned char",
 	   which gets promoted to "int" */
@@ -579,6 +641,9 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	  strncpy(gi->text.value, va_arg(ap, char *), max_textsize);
 	  gi->text.value[max_textsize] = '\0';
 	  gi->text.cursor_position = strlen(gi->text.value);
+
+	  /* same tag also used for textbutton definition */
+	  strcpy(gi->textbutton.value, gi->text.value);
 	}
 	break;
 
@@ -590,20 +655,25 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	  gi->text.size = max_textsize;
 	  gi->text.value[max_textsize] = '\0';
 
-	  /* same tag also used for selectbox definition */
+	  /* same tag also used for textbutton and selectbox definition */
+	  strcpy(gi->textbutton.value, gi->text.value);
+	  gi->textbutton.size = gi->text.size;
 	  gi->selectbox.size = gi->text.size;
 	}
 	break;
 
       case GDI_TEXT_FONT:
-	gi->text.font_type = va_arg(ap, int);
+	gi->font = va_arg(ap, int);
+	if (gi->font_active == 0)
+	  gi->font_active = gi->font;
+	break;
 
-	/* same tag also used for selectbox definition */
-	gi->selectbox.font_type = gi->text.font_type;
+      case GDI_TEXT_FONT_ACTIVE:
+	gi->font_active = va_arg(ap, int);
 	break;
 
-      case GDI_SELECTBOX_VALUES:
-	gi->selectbox.values = va_arg(ap, const char **);
+      case GDI_SELECTBOX_OPTIONS:
+	gi->selectbox.options = va_arg(ap, struct ValueTextInfo *);
 	break;
 
       case GDI_SELECTBOX_INDEX:
@@ -635,14 +705,15 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	break;
 
       case GDI_BORDER_SIZE:
-	gi->border.size = va_arg(ap, int);
+	gi->border.xsize = va_arg(ap, int);
+	gi->border.ysize = va_arg(ap, int);
 	break;
 
       case GDI_BORDER_SIZE_SELECTBUTTON:
-	gi->border.size_selectbutton = va_arg(ap, int);
+	gi->border.xsize_selectbutton = va_arg(ap, int);
 	break;
 
-      case GDI_TEXTINPUT_DESIGN_WIDTH:
+      case GDI_DESIGN_WIDTH:
 	gi->border.width = va_arg(ap, int);
 	break;
 
@@ -746,51 +817,54 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 
   if (gi->type & GD_TYPE_TEXTINPUT)
   {
-    int font_width = getFontWidth(gi->text.font_type);
-    int font_height = getFontHeight(gi->text.font_type);
-    int border_size = gi->border.size;
-
-    gi->width  = 2 * border_size + (gi->text.size + 1) * font_width;
-    gi->height = 2 * border_size + font_height;
+    int font_nr = gi->font_active;
+    int font_width = getFontWidth(font_nr);
+    int font_height = getFontHeight(font_nr);
+    int border_xsize = gi->border.xsize;
+    int border_ysize = gi->border.ysize;
+
+    gi->width  = 2 * border_xsize + (gi->text.size + 1) * font_width;
+    gi->height = 2 * border_ysize + font_height;
   }
 
   if (gi->type & GD_TYPE_SELECTBOX)
   {
-    int font_nr = gi->selectbox.font_type;
-    int font_bitmap_id = gfx.select_font_function(font_nr);
-    struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
-    int font_width = getFontWidth(gi->selectbox.font_type);
-    int font_height = getFontHeight(gi->selectbox.font_type);
-    int border_size = gi->border.size;
-    int button_size = gi->border.size_selectbutton;
+    int font_nr = gi->font_active;
+    int font_width = getFontWidth(font_nr);
+    int font_height = getFontHeight(font_nr);
+    int border_xsize = gi->border.xsize;
+    int border_ysize = gi->border.ysize;
+    int button_size = gi->border.xsize_selectbutton;
+    int bottom_screen_border = gfx.sy + gfx.sysize - font_height;
+    Bitmap *src_bitmap;
     int src_x, src_y;
 
-    gi->width  = 2 * border_size + gi->text.size * font_width + button_size;
-    gi->height = 2 * border_size + font_height;
+    gi->width  = 2 * border_xsize + gi->text.size * font_width + button_size;
+    gi->height = 2 * border_ysize + font_height;
 
-    if (gi->selectbox.values == NULL)
-      Error(ERR_EXIT, "selectbox gadget incomplete (missing values array)");
+    if (gi->selectbox.options == NULL)
+      Error(ERR_EXIT, "selectbox gadget incomplete (missing options array)");
 
     gi->selectbox.num_values = 0;
-    while (gi->selectbox.values[gi->selectbox.num_values] != NULL)
+    while (gi->selectbox.options[gi->selectbox.num_values].text != NULL)
       gi->selectbox.num_values++;
 
     /* calculate values for open selectbox */
     gi->selectbox.width = gi->width;
     gi->selectbox.height =
-      2 * border_size + gi->selectbox.num_values * font_height;
+      2 * border_ysize + gi->selectbox.num_values * font_height;
 
     gi->selectbox.x = gi->x;
     gi->selectbox.y = gi->y + gi->height;
-    if (gi->selectbox.y + gi->selectbox.height > gfx.real_sy + gfx.full_sysize)
+    if (gi->selectbox.y + gi->selectbox.height > bottom_screen_border)
       gi->selectbox.y = gi->y - gi->selectbox.height;
     if (gi->selectbox.y < 0)
-      gi->selectbox.y = gfx.real_sy + gfx.full_sysize - gi->selectbox.height;
+      gi->selectbox.y = bottom_screen_border - gi->selectbox.height;
 
-    if (!getFontChar(font_nr, '|', &src_x, &src_y))
-      Error(ERR_EXIT, "selectbox gadget incomplete (cannot get cursor)");
-
-    gi->selectbox.reverse_color = GetPixel(font->bitmap, src_x, src_y);
+    getFontCharSource(font_nr, FONT_ASCII_CURSOR, &src_bitmap, &src_x, &src_y);
+    src_x += font_width / 2;
+    src_y += font_height / 2;
+    gi->selectbox.inverse_color = GetPixel(src_bitmap, src_x, src_y);
 
     /* always start with closed selectbox */
     gi->selectbox.open = FALSE;
@@ -808,6 +882,18 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
     sprintf(text->value, "%d", text->number_value);
   }
 
+  if (gi->type & GD_TYPE_TEXT_BUTTON)
+  {
+    int font_nr = gi->font_active;
+    int font_width = getFontWidth(font_nr);
+    int font_height = getFontHeight(font_nr);
+    int border_xsize = gi->border.xsize;
+    int border_ysize = gi->border.ysize;
+
+    gi->width  = 2 * border_xsize + gi->textbutton.size * font_width;
+    gi->height = 2 * border_ysize + font_height;
+  }
+
   if (gi->type & GD_TYPE_SCROLLBAR)
   {
     struct GadgetScrollbar *gs = &gi->scrollbar;
@@ -844,7 +930,7 @@ void ModifyGadget(struct GadgetInfo *gi, int first_tag, ...)
 void RedrawGadget(struct GadgetInfo *gi)
 {
   if (gi->mapped)
-    DrawGadget(gi, gi->state, DG_DIRECT);
+    DrawGadget(gi, gi->state, gi->direct_draw);
 }
 
 struct GadgetInfo *CreateGadget(int first_tag, ...)
@@ -856,6 +942,9 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
   new_gadget->id = getNewGadgetID();
   new_gadget->callback_info = default_callback_info;
   new_gadget->callback_action = default_callback_action;
+  new_gadget->active = TRUE;
+  new_gadget->direct_draw = TRUE;
+
   new_gadget->next = NULL;
 
   va_start(ap, first_tag);
@@ -960,7 +1049,7 @@ static void MultiMapGadgets(int mode)
   static boolean map_state[MAX_NUM_GADGETS];
   int map_count = 0;
 
-  while (gi)
+  while (gi != NULL)
   {
     if ((mode & MULTIMAP_PLAYFIELD &&
 	 gi->x < gfx.sx + gfx.sxsize) ||
@@ -1051,6 +1140,13 @@ void HandleGadgets(int mx, int my, int button)
   if (gadget_list_first_entry == NULL)
     return;
 
+  /* simulated release of mouse button over last gadget */
+  if (mx == -1 && my == -1 && button == 0)
+  {
+    mx = last_mx;
+    my = last_my;
+  }
+
   /* check which gadget is under the mouse pointer */
   new_gi = getGadgetInfoFromMousePosition(mx, my);
 
@@ -1075,7 +1171,7 @@ void HandleGadgets(int mx, int my, int button)
 
       /* if mouse button pressed inside activated text gadget, set cursor */
       gi->text.cursor_position =
-	(mx - gi->x - gi->border.size) / getFontWidth(gi->text.font_type);
+	(mx - gi->x - gi->border.xsize) / getFontWidth(gi->font);
 
       if (gi->text.cursor_position < 0)
 	gi->text.cursor_position = 0;
@@ -1083,13 +1179,13 @@ void HandleGadgets(int mx, int my, int button)
 	gi->text.cursor_position = strlen(gi->text.value);
 
       if (gi->text.cursor_position != old_cursor_position)
-	DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else
     {
       /* if mouse button pressed outside text input gadget, deactivate it */
       CheckRangeOfNumericInputGadget(gi);
-      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
       gi->event.type = GD_EVENT_TEXT_LEAVING;
 
@@ -1112,8 +1208,7 @@ void HandleGadgets(int mx, int my, int button)
       /* if mouse button pressed inside activated selectbox, select value */
       if (my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height)
 	gi->selectbox.current_index =
-	  (my - gi->selectbox.y - gi->border.size) /
-	  getFontWidth(gi->selectbox.font_type);
+	  (my - gi->selectbox.y - gi->border.ysize) / getFontHeight(gi->font);
 
       if (gi->selectbox.current_index < 0)
 	gi->selectbox.current_index = 0;
@@ -1121,12 +1216,12 @@ void HandleGadgets(int mx, int my, int button)
 	gi->selectbox.current_index = gi->selectbox.num_values - 1;
 
       if (gi->selectbox.current_index != old_index)
-	DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else
     {
       /* if mouse button pressed outside selectbox gadget, deactivate it */
-      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
       gi->event.type = GD_EVENT_TEXT_LEAVING;
 
@@ -1159,8 +1254,8 @@ void HandleGadgets(int mx, int my, int button)
       (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);
+      (mx >= gi->selectbox.x && mx < gi->selectbox.x + gi->selectbox.width &&
+       my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height);
   }
   else
   {
@@ -1195,7 +1290,7 @@ void HandleGadgets(int mx, int my, int button)
   if (button == 0 && !release_event)
     gi = new_gi;
 
-  if (gi)
+  if (gi != NULL)
   {
     int last_x = gi->event.x;
     int last_y = gi->event.y;
@@ -1211,6 +1306,23 @@ void HandleGadgets(int mx, int my, int button)
       if (last_x != gi->event.x || last_y != gi->event.y)
 	changed_position = TRUE;
     }
+    else if (gi->type & GD_TYPE_SELECTBOX)
+    {
+      int old_index = gi->selectbox.current_index;
+
+      /* if mouse moving inside activated selectbox, select value */
+      if (my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height)
+	gi->selectbox.current_index =
+	  (my - gi->selectbox.y - gi->border.ysize) / getFontHeight(gi->font);
+
+      if (gi->selectbox.current_index < 0)
+	gi->selectbox.current_index = 0;
+      else if (gi->selectbox.current_index > gi->selectbox.num_values - 1)
+	gi->selectbox.current_index = gi->selectbox.num_values - 1;
+
+      if (gi->selectbox.current_index != old_index)
+	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+    }
   }
 
   /* handle gadget popup info text */
@@ -1258,7 +1370,7 @@ void HandleGadgets(int mx, int my, int button)
 	    rgi != gi)
 	{
 	  rgi->checked = FALSE;
-	  DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
+	  DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw);
 	}
 
 	rgi = rgi->next;
@@ -1328,7 +1440,7 @@ void HandleGadgets(int mx, int my, int button)
       }
     }
 
-    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+    DrawGadget(gi, DG_PRESSED, gi->direct_draw);
 
     gi->state = GD_BUTTON_PRESSED;
     gi->event.type = GD_EVENT_PRESSED;
@@ -1356,9 +1468,9 @@ void HandleGadgets(int mx, int my, int button)
     if (gi->type & GD_TYPE_BUTTON)
     {
       if (gadget_moving_inside && gi->state == GD_BUTTON_UNPRESSED)
-	DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
       else if (gadget_moving_off_borders && gi->state == GD_BUTTON_PRESSED)
-	DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+	DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
     }
     else if (gi->type & GD_TYPE_SELECTBOX)
     {
@@ -1367,8 +1479,7 @@ void HandleGadgets(int mx, int my, int button)
       /* if mouse moving inside activated selectbox, select value */
       if (my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height)
 	gi->selectbox.current_index =
-	  (my - gi->selectbox.y - gi->border.size) /
-	  getFontWidth(gi->selectbox.font_type);
+	  (my - gi->selectbox.y - gi->border.ysize) / getFontHeight(gi->font);
 
       if (gi->selectbox.current_index < 0)
 	gi->selectbox.current_index = 0;
@@ -1376,7 +1487,7 @@ void HandleGadgets(int mx, int my, int button)
 	gi->selectbox.current_index = gi->selectbox.num_values - 1;
 
       if (gi->selectbox.current_index != old_index)
-	DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+	DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (gi->type & GD_TYPE_SCROLLBAR)
     {
@@ -1404,7 +1515,7 @@ void HandleGadgets(int mx, int my, int button)
 	changed_position = TRUE;
       }
 
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
 
     gi->state = (gadget_moving_inside || gi->type & GD_TYPE_SCROLLBAR ?
@@ -1432,7 +1543,7 @@ void HandleGadgets(int mx, int my, int button)
 
     if (deactivate_gadget &&
 	!(gi->type & GD_TYPE_TEXTINPUT))	    /* text input stays open */
-      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_RELEASED;
@@ -1444,7 +1555,7 @@ void HandleGadgets(int mx, int my, int button)
   if (gadget_released_off_borders)
   {
     if (gi->type & GD_TYPE_SCROLLBAR)
-      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
     gi->event.type = GD_EVENT_RELEASED;
 
@@ -1452,6 +1563,10 @@ void HandleGadgets(int mx, int my, int button)
 	gi->event_mask & GD_EVENT_OFF_BORDERS)
       gi->callback_action(gi);
   }
+
+  /* handle gadgets unmapped/mapped between pressing and releasing */
+  if (release_event && !gadget_released && new_gi)
+    new_gi->state = GD_BUTTON_UNPRESSED;
 }
 
 void HandleGadgetsKeyInput(Key key)
@@ -1469,7 +1584,7 @@ void HandleGadgetsKeyInput(Key key)
     else if (gi->type & GD_TYPE_SELECTBOX)
       gi->selectbox.index = gi->selectbox.current_index;
 
-    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+    DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
 
     gi->event.type = GD_EVENT_TEXT_RETURN;
 
@@ -1495,30 +1610,30 @@ void HandleGadgetsKeyInput(Key key)
       gi->text.value[cursor_pos] = letter;
       gi->text.cursor_position++;
 
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (key == KSYM_Left && cursor_pos > 0)
     {
       gi->text.cursor_position--;
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (key == KSYM_Right && cursor_pos < text_length)
     {
       gi->text.cursor_position++;
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (key == KSYM_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);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (key == KSYM_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);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
   }
   else if (gi->type & GD_TYPE_SELECTBOX)	/* only valid for selectbox */
@@ -1529,12 +1644,12 @@ void HandleGadgetsKeyInput(Key key)
     if (key == KSYM_Up && index > 0)
     {
       gi->selectbox.current_index--;
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
     else if (key == KSYM_Down && index < num_values - 1)
     {
       gi->selectbox.current_index++;
-      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
   }
 }