case GD_TYPE_NORMAL_BUTTON:
case GD_TYPE_CHECK_BUTTON:
case GD_TYPE_RADIO_BUTTON:
- BlitBitmap(gd->bitmap, drawto,
- gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x, gd->y, gi->width, gi->height,
+ gi->x, gi->y);
if (gi->deco.design.bitmap)
BlitBitmap(gi->deco.design.bitmap, drawto,
gi->deco.design.x, gi->deco.design.y,
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 */
- DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_type);
+ DrawTextExt(drawto,
+ gi->x + border, gi->y + border, text,
+ font_type, FONT_MASKED);
cursor_letter = gi->text.value[gi->text.cursor_position];
cursor_string[0] = '~';
/* draw cursor, if active */
if (pressed)
- DrawText(gi->x + border + gi->text.cursor_position * font_width,
- gi->y + border, cursor_string, FS_SMALL, font_type);
+ DrawTextExt(drawto,
+ gi->x + border + gi->text.cursor_position * font_width,
+ gi->y + border, cursor_string,
+ 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;
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);
/* upper part of gadget */
- BlitBitmap(gd->bitmap, drawto,
- gd->x, gd->y,
- gi->width, gi->border.size,
- xpos, ypos);
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x, gd->y,
+ gi->width, gi->border.size,
+ xpos, ypos);
/* middle part of gadget */
for (i=0; i<num_steps; i++)
- BlitBitmap(gd->bitmap, drawto,
- gd->x, gd->y + gi->border.size,
- gi->width, design_body,
- xpos, ypos + gi->border.size + i * design_body);
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x, gd->y + gi->border.size,
+ gi->width, design_body,
+ xpos,
+ ypos + gi->border.size + i * design_body);
/* remaining middle part of gadget */
if (step_size_remain > 0)
- BlitBitmap(gd->bitmap, drawto,
- gd->x, gd->y + gi->border.size,
- gi->width, step_size_remain,
- xpos, ypos + gi->border.size + num_steps * design_body);
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x, gd->y + gi->border.size,
+ gi->width, step_size_remain,
+ xpos,
+ ypos + gi->border.size
+ + num_steps * design_body);
/* lower part of gadget */
- BlitBitmap(gd->bitmap, drawto,
- gd->x, gd->y + design_full - gi->border.size,
- gi->width, gi->border.size,
- xpos, ypos + size_full - gi->border.size);
+ 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);
}
break;
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;
case GDI_INFO_TEXT:
{
int max_textsize = MAX_INFO_TEXTSIZE - 1;
+ char *text = va_arg(ap, char *);
+
+ if (text != NULL)
+ strncpy(gi->info_text, text, max_textsize);
+ else
+ max_textsize = 0;
- strncpy(gi->info_text, va_arg(ap, char *), max_textsize);
gi->info_text[max_textsize] = '\0';
}
break;
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:
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;
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))
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)
struct GadgetInfo *CreateGadget(int first_tag, ...)
{
- struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo));
+ struct GadgetInfo *new_gadget = checked_calloc(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;
+ new_gadget->next = NULL;
va_start(ap, first_tag);
HandleGadgetTags(new_gadget, first_tag, ap);
{
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)
if (gi == gadget_list_last_entry)
gadget_list_last_entry = gi_previous;
- gi_previous->next = gi->next;
+ if (gi_previous != NULL)
+ gi_previous->next = gi->next;
+
free(gi);
}
/* 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;
projects / rocksndiamonds.git / blobdiff