X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=00f54c6fc88c33998f45a9bb78714fb7256cf729;hb=72657dfeee6b6c184a42e83ed923a63c1768100b;hp=9dfea83896e25a33d61c3a90899d8e28e40a158d;hpb=14089dac2cbe56e563863e1e5adb8847944fd262;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 9dfea838..00f54c6f 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -136,30 +136,31 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	char cursor_string[3];
 	char text[MAX_GADGET_TEXTSIZE + 1];
 	int font_type = gi->text.font_type;
-	int font_width = getFontWidth(FS_SMALL, font_type);
+	int font_width = getFontWidth(font_type);
 	int border = gi->border.size;
+
 	strcpy(text, gi->text.value);
 	strcat(text, " ");
 
 	/* left part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x, gd->y, border, gi->height, gi->x, gi->y);
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x, gd->y, border, gi->height, gi->x, gi->y);
 
 	/* middle part of gadget */
-	for (i=0; i<=gi->text.size; i++)
-	  BlitBitmap(gd->bitmap, drawto,
-		     gd->x + border, gd->y, font_width, gi->height,
-		     gi->x + border + i * font_width, gi->y);
+	for (i=0; i <= gi->text.size; i++)
+	  BlitBitmapOnBackground(gd->bitmap, drawto,
+				 gd->x + border, gd->y, font_width, gi->height,
+				 gi->x + border + i * font_width, gi->y);
 
 	/* right part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x + gi->border.width - border, gd->y,
-		   border, gi->height, gi->x + gi->width - border, gi->y);
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x + gi->border.width - border, gd->y,border,
+			       gi->height, gi->x + gi->width - border, gi->y);
 
 	/* gadget text value */
 	DrawTextExt(drawto,
 		    gi->x + border, gi->y + border, text,
-		    FS_SMALL, font_type, FONT_OPAQUE);
+		    font_type, FONT_MASKED);
 
 	cursor_letter = gi->text.value[gi->text.cursor_position];
 	cursor_string[0] = '~';
@@ -171,7 +172,49 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	  DrawTextExt(drawto,
 		      gi->x + border + gi->text.cursor_position * font_width,
 		      gi->y + border, cursor_string,
-		      FS_SMALL, font_type, FONT_OPAQUE);
+		      font_type, FONT_MASKED);
+      }
+      break;
+
+    case GD_TYPE_SELECTBOX:
+      {
+	int i;
+	char text[MAX_GADGET_TEXTSIZE + 1];
+	int font_type = gi->selectbox.font_type;
+	int font_width = getFontWidth(font_type);
+	int border = gi->border.size;
+	int button = gi->border.size_selectbutton;
+	int width_inner = gi->border.width - button - 2 * border;
+
+	strncpy(text, gi->selectbox.values[gi->selectbox.index],
+		MAX_GADGET_TEXTSIZE);
+	text[MAX_GADGET_TEXTSIZE] = '\0';
+
+	/* left part of gadget */
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x, gd->y, border, 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);
+
+	/* button part of gadget */
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x + border + width_inner, gd->y,
+			       button, gi->height,
+			       gi->x + gi->width - border - 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);
+
+	/* gadget text value */
+	DrawTextExt(drawto,
+		    gi->x + border, gi->y + border, text,
+		    font_type, FONT_MASKED);
       }
       break;
 
@@ -202,15 +245,16 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
 				 gd->x, gd->y + gi->border.size,
 				 gi->width, design_body,
-				 xpos, ypos + gi->border.size
-				 + i * design_body);
+				 xpos,
+				 ypos + gi->border.size + i * design_body);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
 	  BlitBitmapOnBackground(gd->bitmap, drawto,
 				 gd->x,  gd->y + gi->border.size,
 				 gi->width, step_size_remain,
-				 xpos, ypos + gi->border.size
+				 xpos,
+				 ypos + gi->border.size
 				 + num_steps * design_body);
 
 	/* lower part of gadget */
@@ -234,33 +278,37 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 	int step_size_remain = size_body - num_steps * design_body;
 
 	/* clear scrollbar area */
-	ClearRectangle(backbuffer, gi->x, gi->y, gi->width, gi->height);
+	ClearRectangleOnBackground(backbuffer, gi->x, gi->y,
+				   gi->width, gi->height);
 
 	/* left part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x, gd->y,
-		   gi->border.size, gi->height,
-		   xpos, ypos);
+	BlitBitmapOnBackground(gd->bitmap, drawto,
+			       gd->x, gd->y,
+			       gi->border.size, gi->height,
+			       xpos, ypos);
 
 	/* middle part of gadget */
 	for (i=0; i<num_steps; i++)
-	  BlitBitmap(gd->bitmap, drawto,
-		     gd->x + gi->border.size, gd->y,
-		     design_body, gi->height,
-		     xpos + gi->border.size + i * design_body, ypos);
+	  BlitBitmapOnBackground(gd->bitmap, drawto,
+				 gd->x + gi->border.size, gd->y,
+				 design_body, gi->height,
+				 xpos + gi->border.size + i * design_body,
+				 ypos);
 
 	/* remaining middle part of gadget */
 	if (step_size_remain > 0)
-	  BlitBitmap(gd->bitmap, drawto,
-		     gd->x + gi->border.size, gd->y,
-		     step_size_remain, gi->height,
-		     xpos + gi->border.size + num_steps * design_body, ypos);
+	  BlitBitmapOnBackground(gd->bitmap, drawto,
+				 gd->x + gi->border.size, gd->y,
+				 step_size_remain, gi->height,
+				 xpos + gi->border.size
+				 + num_steps * design_body,
+				 ypos);
 
 	/* right part of gadget */
-	BlitBitmap(gd->bitmap, drawto,
-		   gd->x + design_full - gi->border.size, gd->y,
-		   gi->border.size, gi->height,
-		   xpos + size_full - gi->border.size, ypos);
+	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);
       }
       break;
 
@@ -385,11 +433,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 */
+	  gi->selectbox.size = gi->text.size;
 	}
 	break;
 
       case GDI_TEXT_FONT:
 	gi->text.font_type = va_arg(ap, int);
+
+	/* same tag also used for selectbox definition */
+	gi->selectbox.font_type = gi->text.font_type;
+	break;
+
+      case GDI_SELECTBOX_VALUES:
+	gi->selectbox.values = va_arg(ap, const char **);
+	break;
+
+      case GDI_SELECTBOX_INDEX:
+	gi->selectbox.index = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_UNPRESSED:
@@ -420,6 +482,10 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 	gi->border.size = va_arg(ap, int);
 	break;
 
+      case GDI_BORDER_SIZE_SELECTBUTTON:
+	gi->border.size_selectbutton = va_arg(ap, int);
+	break;
+
       case GDI_TEXTINPUT_DESIGN_WIDTH:
 	gi->border.width = va_arg(ap, int);
 	break;
@@ -514,7 +580,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
     tag = va_arg(ap, int);	/* read next tag */
   }
 
-  /* check if gadget complete */
+  /* check if gadget is complete */
   if (gi->type != GD_TYPE_DRAWING_AREA &&
       (!gi->design[GD_BUTTON_UNPRESSED].bitmap ||
        !gi->design[GD_BUTTON_PRESSED].bitmap))
@@ -524,11 +590,23 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 
   if (gi->type & GD_TYPE_TEXTINPUT)
   {
-    int font_width = getFontWidth(FS_SMALL, gi->text.font_type);
-    int font_height = getFontHeight(FS_SMALL, gi->text.font_type);
+    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;
+  }
+
+  if (gi->type & GD_TYPE_SELECTBOX)
+  {
+    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;
 
-    gi->width = 2 * gi->border.size + (gi->text.size + 1) * font_width;
-    gi->height = 2 * gi->border.size + font_height;
+    gi->width  = 2 * border_size + gi->text.size * font_width + button_size;
+    gi->height = 2 * border_size + font_height;
   }
 
   if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC)
@@ -613,7 +691,7 @@ void FreeGadget(struct GadgetInfo *gi)
 {
   struct GadgetInfo *gi_previous = gadget_list_first_entry;
 
-  while (gi_previous && gi_previous->next != gi)
+  while (gi_previous != NULL && gi_previous->next != gi)
     gi_previous = gi_previous->next;
 
   if (gi == gadget_list_first_entry)
@@ -622,7 +700,7 @@ void FreeGadget(struct GadgetInfo *gi)
   if (gi == gadget_list_last_entry)
     gadget_list_last_entry = gi_previous;
 
-  if (gi_previous)
+  if (gi_previous != NULL)
     gi_previous->next = gi->next;
 
   free(gi);
@@ -797,7 +875,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(FS_SMALL, gi->text.font_type);
+	getFontWidth(gi->text.font_type);
 
       if (gi->text.cursor_position < 0)
 	gi->text.cursor_position = 0;