/* values for DrawGadget() */
#define DG_UNPRESSED 0
#define DG_PRESSED 1
+
#define DG_BUFFERED 0
#define DG_DIRECT 1
{
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"));
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 setTextAreaCursorExt(struct GadgetInfo *gi, boolean set_cursor_pos)
+{
+ char *text = gi->textarea.value;
+ int area_xsize = gi->textarea.xsize;
+ int area_ysize = gi->textarea.ysize;
+ int cursor_position = gi->textarea.cursor_position;
+ int cursor_x = gi->textarea.cursor_x;
+ int cursor_y = gi->textarea.cursor_y;
+ int pos = 0;
+ int x = 0;
+ int y = 0;
+
+ while (*text)
+ {
+ if (set_cursor_pos) /* x/y => position */
+ {
+ if (y == cursor_y && (x == cursor_x || (x < cursor_x && *text == '\n')))
+ break;
+ }
+ else /* position => x/y */
+ {
+ if (pos == cursor_position)
+ break;
+ }
+
+ if (x + 1 >= area_xsize || *text == '\n')
+ {
+ if (y + 1 >= area_ysize)
+ break;
+
+ x = 0;
+ y++;
+ }
+ else
+ x++;
+
+ text++;
+ pos++;
+ }
+
+ gi->textarea.cursor_x = x;
+ gi->textarea.cursor_y = y;
+ gi->textarea.cursor_x_preferred = x;
+ gi->textarea.cursor_position = pos;
+}
+
+static void setTextAreaCursorXY(struct GadgetInfo *gi, int x, int y)
+{
+ gi->textarea.cursor_x = x;
+ gi->textarea.cursor_y = y;
+
+ setTextAreaCursorExt(gi, TRUE);
+}
+
+static void setTextAreaCursorPosition(struct GadgetInfo *gi, int pos)
+{
+ gi->textarea.cursor_position = pos;
+
+ setTextAreaCursorExt(gi, FALSE);
}
static void default_callback_info(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;
gi->y + gi->deco.y + (pressed ? gi->deco.yshift : 0));
break;
- case GD_TYPE_TEXTINPUT_ALPHANUMERIC:
- case GD_TYPE_TEXTINPUT_NUMERIC:
+ 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_TEXT_INPUT_ALPHANUMERIC:
+ case GD_TYPE_TEXT_INPUT_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);
+ for (i=0; i < gi->textinput.size + 1; 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, 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);
+ strcpy(text, gi->textinput.value);
strcat(text, " ");
/* gadget text value */
DrawTextExt(drawto,
- gi->x + border, gi->y + border, text,
- font_type, BLIT_MASKED);
+ gi->x + border_x, gi->y + border_y, text,
+ font_nr, BLIT_MASKED);
+
+ cursor_letter = gi->textinput.value[gi->textinput.cursor_position];
+ cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
+ cursor_string[1] = '\0';
+
+ /* draw cursor, if active */
+ if (pressed)
+ DrawTextExt(drawto,
+ gi->x + border_x +
+ gi->textinput.cursor_position * font_width,
+ gi->y + border_y, cursor_string,
+ font_nr, BLIT_INVERSE);
+ }
+ break;
+
+ case GD_TYPE_TEXT_AREA:
+ {
+ int i;
+ char cursor_letter;
+ char cursor_string[2];
+ 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 gd_height = 2 * border_y + font_height;
+
+ /* top left part of gadget border */
+ BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y,
+ border_x, border_y, gi->x, gi->y);
+
+ /* top middle part of gadget border */
+ for (i=0; i < gi->textarea.xsize; i++)
+ BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y,
+ font_width, border_y,
+ gi->x + border_x + i * font_width, gi->y);
+
+ /* top right part of gadget border */
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x + gi->border.width - border_x, gd->y,
+ border_x, border_y,
+ gi->x + gi->width - border_x, gi->y);
+
+ /* left and right part of gadget border for each row */
+ for (i=0; i < gi->textarea.ysize; i++)
+ {
+ BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + border_y,
+ border_x, font_height,
+ gi->x, gi->y + border_y + i * font_height);
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x + gi->border.width - border_x,
+ gd->y + border_y,
+ border_x, font_height,
+ gi->x + gi->width - border_x,
+ gi->y + border_y + i * font_height);
+ }
- cursor_letter = gi->text.value[gi->text.cursor_position];
- cursor_string[0] = '~';
- cursor_string[1] = (cursor_letter != '\0' ? cursor_letter : ' ');
- cursor_string[2] = '\0';
+ /* bottom left part of gadget border */
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x, gd->y + gd_height - border_y,
+ border_x, border_y,
+ gi->x, gi->y + gi->height - border_y);
+
+ /* bottom middle part of gadget border */
+ for (i=0; i < gi->textarea.xsize; i++)
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x + border_x,
+ gd->y + gd_height - border_y,
+ font_width, border_y,
+ gi->x + border_x + i * font_width,
+ gi->y + gi->height - border_y);
+
+ /* bottom right part of gadget border */
+ BlitBitmapOnBackground(gd->bitmap, drawto,
+ gd->x + gi->border.width - border_x,
+ gd->y + gd_height - border_y,
+ border_x, border_y,
+ gi->x + gi->width - border_x,
+ gi->y + gi->height - border_y);
+
+ ClearRectangleOnBackground(drawto,
+ gi->x + border_x,
+ gi->y + border_y,
+ gi->width - 2 * border_x,
+ gi->height - 2 * border_y);
+
+ /* gadget text value */
+ DrawTextToTextArea(gi->x + border_x, gi->y + border_y,
+ gi->textarea.value, font_nr,
+ gi->textarea.xsize, gi->textarea.ysize);
- SetInverseTextColor(gi->text.inverse_color);
+ cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
+ 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, BLIT_MASKED);
+ gi->x + border_x + gi->textarea.cursor_x * font_width,
+ gi->y + border_y + gi->textarea.cursor_y * font_height,
+ cursor_string,
+ font_nr, BLIT_INVERSE);
}
break;
{
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, BLIT_MASKED);
+ DrawTextExt(drawto, gi->x + border_x, gi->y + border_y, text,
+ font_nr, BLIT_MASKED);
if (pressed)
{
/* 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 = BLIT_MASKED;
+
+ strncpy(text, gi->selectbox.options[i].text, gi->selectbox.size);
+ text[gi->selectbox.size] = '\0';
+
if (i == gi->selectbox.current_index)
{
FillRectangle(drawto,
- gi->selectbox.x + border,
- gi->selectbox.y + border + i * font_height,
- gi->selectbox.width - 2 * border, font_height,
+ 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);
- text[0] = '~';
- strncpy(&text[1], gi->selectbox.values[i], gi->selectbox.size);
- text[1 + gi->selectbox.size] = '\0';
-
- SetInverseTextColor(gi->selectbox.inverse_color);
- }
- else
- {
- strncpy(text, gi->selectbox.values[i], gi->selectbox.size);
+ /* prevent use of cursor graphic by drawing at least two chars */
+ strcat(text, " ");
text[gi->selectbox.size] = '\0';
+
+ mask_mode = BLIT_INVERSE;
}
DrawTextExt(drawto,
- gi->selectbox.x + border,
- gi->selectbox.y + border + i * font_height, text,
- font_type, BLIT_MASKED);
+ gi->selectbox.x + border_x,
+ gi->selectbox.y + border_y + i * font_height, text,
+ font_nr, mask_mode);
}
redraw_selectbox = TRUE;
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;
/* 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;
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;
/* 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;
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" */
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);
+ gi->textinput.number_value = va_arg(ap, long);
+ sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
+ gi->textinput.cursor_position = strlen(gi->textinput.value);
break;
case GDI_NUMBER_MIN:
- gi->text.number_min = va_arg(ap, long);
- if (gi->text.number_value < gi->text.number_min)
+ gi->textinput.number_min = va_arg(ap, long);
+ if (gi->textinput.number_value < gi->textinput.number_min)
{
- gi->text.number_value = gi->text.number_min;
- sprintf(gi->text.value, "%d", gi->text.number_value);
+ gi->textinput.number_value = gi->textinput.number_min;
+ sprintf(gi->textinput.value, "%d", gi->textinput.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->textinput.number_max = va_arg(ap, long);
+ if (gi->textinput.number_value > gi->textinput.number_max)
{
- gi->text.number_value = gi->text.number_max;
- sprintf(gi->text.value, "%d", gi->text.number_value);
+ gi->textinput.number_value = gi->textinput.number_max;
+ sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
}
break;
{
int max_textsize = MAX_GADGET_TEXTSIZE;
- if (gi->text.size)
- max_textsize = MIN(gi->text.size, MAX_GADGET_TEXTSIZE - 1);
+ if (gi->textinput.size)
+ max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE - 1);
+
+ strncpy(gi->textinput.value, va_arg(ap, char *), max_textsize);
+ gi->textinput.value[max_textsize] = '\0';
+ gi->textinput.cursor_position = strlen(gi->textinput.value);
- 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 other gadget definitions */
+ strcpy(gi->textbutton.value, gi->textinput.value);
+ strcpy(gi->textarea.value, gi->textinput.value);
}
break;
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';
+ gi->textinput.size = max_textsize;
+ gi->textinput.value[max_textsize] = '\0';
- /* same tag also used for selectbox definition */
- gi->selectbox.size = gi->text.size;
+ /* same tag also used for other gadget definitions */
+ strcpy(gi->textbutton.value, gi->textinput.value);
+ gi->textbutton.size = gi->textinput.size;
+ gi->selectbox.size = gi->textinput.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:
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;
gi->drawing.item_xsize = gi->width / gi->drawing.area_xsize;
gi->drawing.item_ysize = gi->height / gi->drawing.area_ysize;
}
+
+ /* same tag also used for other gadget definitions */
+ gi->textarea.xsize = gi->drawing.area_xsize;
+ gi->textarea.ysize = gi->drawing.area_ysize;
+
+ if (gi->type & GD_TYPE_TEXT_AREA) /* force recalculation */
+ {
+ gi->width = 0;
+ gi->height = 0;
+ }
+
break;
case GDI_ITEM_SIZE:
/* adjust gadget values in relation to other gadget values */
- if (gi->type & GD_TYPE_TEXTINPUT)
+ if (gi->type & GD_TYPE_TEXT_INPUT)
{
- int font_nr = gi->text.font_type;
- int font_bitmap_id = gfx.select_font_function(font_nr);
- struct FontBitmapInfo *font = &gfx.font_bitmap_info[font_bitmap_id];
+ int font_nr = gi->font_active;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
- int border_size = gi->border.size;
- int src_x, src_y;
-
- gi->width = 2 * border_size + (gi->text.size + 1) * font_width;
- gi->height = 2 * border_size + font_height;
+ int border_xsize = gi->border.xsize;
+ int border_ysize = gi->border.ysize;
- if (!getFontChar(font_nr, '|', &src_x, &src_y))
- Error(ERR_EXIT, "text input gadget incomplete (cannot get cursor)");
-
- src_x += font_width / 2;
- src_y += font_height / 2;
- gi->text.inverse_color = GetPixel(font->bitmap, src_x, src_y);
+ gi->width = 2 * border_xsize + (gi->textinput.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_nr = gi->font_active;
int font_width = getFontWidth(font_nr);
int font_height = getFontHeight(font_nr);
- int border_size = gi->border.size;
- int button_size = gi->border.size_selectbutton;
+ 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->textinput.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;
-
- if (!getFontChar(font_nr, '|', &src_x, &src_y))
- Error(ERR_EXIT, "selectbox gadget incomplete (cannot get cursor)");
+ gi->selectbox.y = bottom_screen_border - gi->selectbox.height;
+ 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(font->bitmap, src_x, src_y);
+ gi->selectbox.inverse_color = GetPixel(src_bitmap, src_x, src_y);
/* always start with closed selectbox */
gi->selectbox.open = FALSE;
}
- if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC)
+ if (gi->type & GD_TYPE_TEXT_INPUT_NUMERIC)
{
- struct GadgetTextInput *text = &gi->text;
+ struct GadgetTextInput *text = &gi->textinput;
int value = text->number_value;
text->number_value = (value < text->number_min ? text->number_min :
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;
if (gs->item_position == gs->items_max - gs->items_visible)
gs->position = gs->position_max;
}
+
+ if (gi->type & GD_TYPE_TEXT_AREA)
+ {
+ 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;
+
+ if (gi->width == 0 || gi->height == 0)
+ {
+ gi->width = 2 * border_xsize + gi->textarea.xsize * font_width;
+ gi->height = 2 * border_ysize + gi->textarea.ysize * font_height;
+ }
+ else
+ {
+ gi->textarea.xsize = (gi->width - 2 * border_xsize) / font_width;
+ gi->textarea.ysize = (gi->height - 2 * border_ysize) / font_height;
+ }
+ }
}
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, ...)
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);
static void CheckRangeOfNumericInputGadget(struct GadgetInfo *gi)
{
- if (gi->type != GD_TYPE_TEXTINPUT_NUMERIC)
+ if (gi->type != GD_TYPE_TEXT_INPUT_NUMERIC)
return;
- gi->text.number_value = atoi(gi->text.value);
+ gi->textinput.number_value = atoi(gi->textinput.value);
- if (gi->text.number_value < gi->text.number_min)
- gi->text.number_value = gi->text.number_min;
- if (gi->text.number_value > gi->text.number_max)
- gi->text.number_value = gi->text.number_max;
+ if (gi->textinput.number_value < gi->textinput.number_min)
+ gi->textinput.number_value = gi->textinput.number_min;
+ if (gi->textinput.number_value > gi->textinput.number_max)
+ gi->textinput.number_value = gi->textinput.number_max;
- sprintf(gi->text.value, "%d", gi->text.number_value);
+ sprintf(gi->textinput.value, "%d", gi->textinput.number_value);
- if (gi->text.cursor_position < 0)
- gi->text.cursor_position = 0;
- else if (gi->text.cursor_position > strlen(gi->text.value))
- gi->text.cursor_position = strlen(gi->text.value);
+ if (gi->textinput.cursor_position < 0)
+ gi->textinput.cursor_position = 0;
+ else if (gi->textinput.cursor_position > strlen(gi->textinput.value))
+ gi->textinput.cursor_position = strlen(gi->textinput.value);
}
/* global pointer to gadget actually in use (when mouse button pressed) */
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) ||
MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_REMAP);
}
-boolean anyTextInputGadgetActive()
+static boolean anyTextInputGadgetActive()
+{
+ return (last_gi && (last_gi->type & GD_TYPE_TEXT_INPUT) && last_gi->mapped);
+}
+
+static boolean anyTextAreaGadgetActive()
{
- return (last_gi && (last_gi->type & GD_TYPE_TEXTINPUT) && last_gi->mapped);
+ return (last_gi && (last_gi->type & GD_TYPE_TEXT_AREA) && last_gi->mapped);
}
-boolean anySelectboxGadgetActive()
+static boolean anySelectboxGadgetActive()
{
return (last_gi && (last_gi->type & GD_TYPE_SELECTBOX) && last_gi->mapped);
}
boolean anyTextGadgetActive()
{
- return (anyTextInputGadgetActive() || anySelectboxGadgetActive());
+ return (anyTextInputGadgetActive() ||
+ anyTextAreaGadgetActive() ||
+ anySelectboxGadgetActive());
}
void ClickOnGadget(struct GadgetInfo *gi, 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);
last_mx = mx;
last_my = my;
- /* special treatment for text and number input gadgets */
- if (anyTextInputGadgetActive() && button != 0 && !motion_status)
+ /* if mouse button pressed outside text or selectbox gadget, deactivate it */
+ if (anyTextGadgetActive() &&
+ button != 0 && !motion_status && new_gi != last_gi)
{
- struct GadgetInfo *gi = last_gi;
-
- if (new_gi == last_gi)
- {
- int old_cursor_position = gi->text.cursor_position;
-
- /* 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);
-
- 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);
+ CheckRangeOfNumericInputGadget(last_gi); /* in case of numeric gadget */
- if (gi->text.cursor_position != old_cursor_position)
- 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);
+ DrawGadget(last_gi, DG_UNPRESSED, last_gi->direct_draw);
- gi->event.type = GD_EVENT_TEXT_LEAVING;
+ last_gi->event.type = GD_EVENT_TEXT_LEAVING;
- if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
- gi->callback_action(gi);
-
- last_gi = NULL;
- }
- }
+ if (last_gi->event_mask & GD_EVENT_TEXT_LEAVING)
+ last_gi->callback_action(last_gi);
- /* special treatment for selectbox gadgets */
- if (anySelectboxGadgetActive() && button != 0 && !motion_status)
- {
- struct GadgetInfo *gi = last_gi;
-
- if (new_gi == last_gi)
- {
- int old_index = gi->selectbox.current_index;
-
- /* 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);
-
- 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, DG_DIRECT);
- }
- else
- {
- /* if mouse button pressed outside selectbox gadget, deactivate it */
- DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
-
- gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
- gi->callback_action(gi);
-
- last_gi = NULL;
- }
+ last_gi = NULL;
}
gadget_pressed =
(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
{
/* if mouse button released, no gadget needs to be handled anymore */
if (gadget_released)
{
- if ((last_gi->type & GD_TYPE_SELECTBOX) &&
+ if (last_gi->type & GD_TYPE_SELECTBOX &&
(gadget_released_inside_select_line ||
- gadget_released_off_borders)) /* selectbox stays open */
+ gadget_released_off_borders)) /* selectbox stays open */
gi->selectbox.stay_open = TRUE;
- else if (!(last_gi->type & GD_TYPE_TEXTINPUT)) /* text input stays open */
+ else if (!(last_gi->type & GD_TYPE_TEXT_INPUT ||
+ last_gi->type & GD_TYPE_TEXT_AREA)) /* text input stays open */
last_gi = NULL;
}
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;
if (last_x != gi->event.x || last_y != gi->event.y)
changed_position = TRUE;
}
+ else if (gi->type & GD_TYPE_TEXT_INPUT && button != 0 && !motion_status)
+ {
+ int old_cursor_position = gi->textinput.cursor_position;
+
+ /* if mouse button pressed inside activated text gadget, set cursor */
+ gi->textinput.cursor_position =
+ (mx - gi->x - gi->border.xsize) / getFontWidth(gi->font);
+
+ if (gi->textinput.cursor_position < 0)
+ gi->textinput.cursor_position = 0;
+ else if (gi->textinput.cursor_position > strlen(gi->textinput.value))
+ gi->textinput.cursor_position = strlen(gi->textinput.value);
+
+ if (gi->textinput.cursor_position != old_cursor_position)
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (gi->type & GD_TYPE_TEXT_AREA && button != 0 && !motion_status)
+ {
+ int old_cursor_position = gi->textarea.cursor_position;
+ int x = (mx - gi->x - gi->border.xsize) / getFontWidth(gi->font);
+ int y = (my - gi->y - gi->border.ysize) / getFontHeight(gi->font);
+
+ x = (x < 0 ? 0 : x >= gi->textarea.xsize ? gi->textarea.xsize - 1 : x);
+ y = (y < 0 ? 0 : y >= gi->textarea.ysize ? gi->textarea.ysize - 1 : y);
+
+ setTextAreaCursorXY(gi, x, y);
+
+ if (gi->textarea.cursor_position != old_cursor_position)
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
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.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;
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);
}
}
{
last_info_gi->event.type = GD_EVENT_INFO_LEAVING;
last_info_gi->callback_info(last_info_gi);
-
-#if 0
- default_callback_info(NULL);
-
- printf("It seems that we are leaving gadget [%s]!\n",
- (last_info_gi != NULL &&
- last_info_gi->info_text != NULL ?
- last_info_gi->info_text : ""));
-#endif
}
last_info_gi = new_gi;
rgi != gi)
{
rgi->checked = FALSE;
- DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
+ DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw);
}
rgi = rgi->next;
}
}
- DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
gi->state = GD_BUTTON_PRESSED;
gi->event.type = GD_EVENT_PRESSED;
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)
{
/* 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;
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)
{
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 ?
}
if (deactivate_gadget &&
- !(gi->type & GD_TYPE_TEXTINPUT)) /* text input stays open */
- DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+ !(gi->type & GD_TYPE_TEXT_INPUT ||
+ gi->type & GD_TYPE_TEXT_AREA)) /* text input stays open */
+ DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
gi->state = GD_BUTTON_UNPRESSED;
gi->event.type = GD_EVENT_RELEASED;
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;
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;
+}
+
+static void insertCharIntoTextArea(struct GadgetInfo *gi, char c)
+{
+ char text[MAX_GADGET_TEXTSIZE];
+ int cursor_position = gi->textarea.cursor_position;
+
+ if (strlen(gi->textarea.value) == MAX_GADGET_TEXTSIZE) /* no space left */
+ return;
+
+ strcpy(text, gi->textarea.value);
+ strcpy(&gi->textarea.value[cursor_position + 1], &text[cursor_position]);
+ gi->textarea.value[cursor_position] = c;
+
+ setTextAreaCursorPosition(gi, gi->textarea.cursor_position + 1);
}
void HandleGadgetsKeyInput(Key key)
struct GadgetInfo *gi = last_gi;
if (gi == NULL || !gi->mapped ||
- !((gi->type & GD_TYPE_TEXTINPUT) || (gi->type & GD_TYPE_SELECTBOX)))
+ !(gi->type & GD_TYPE_TEXT_INPUT ||
+ gi->type & GD_TYPE_TEXT_AREA ||
+ gi->type & GD_TYPE_SELECTBOX))
return;
if (key == KSYM_Return) /* valid for both text input and selectbox */
{
- if (gi->type & GD_TYPE_TEXTINPUT)
+ if (gi->type & GD_TYPE_TEXT_INPUT)
CheckRangeOfNumericInputGadget(gi);
else if (gi->type & GD_TYPE_SELECTBOX)
gi->selectbox.index = gi->selectbox.current_index;
- DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+ if (gi->type & GD_TYPE_TEXT_AREA)
+ {
+ insertCharIntoTextArea(gi, '\n');
- gi->event.type = GD_EVENT_TEXT_RETURN;
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else
+ {
+ DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
+
+ gi->event.type = GD_EVENT_TEXT_RETURN;
+
+ last_gi = NULL;
+ }
if (gi->event_mask & GD_EVENT_TEXT_RETURN)
gi->callback_action(gi);
-
- last_gi = NULL;
}
- else if (gi->type & GD_TYPE_TEXTINPUT) /* only valid for text input */
+ else if (gi->type & GD_TYPE_TEXT_INPUT) /* only valid for text input */
{
char text[MAX_GADGET_TEXTSIZE];
- int text_length = strlen(gi->text.value);
- int cursor_pos = gi->text.cursor_position;
+ int text_length = strlen(gi->textinput.value);
+ int cursor_pos = gi->textinput.cursor_position;
char letter = getCharFromKey(key);
- boolean legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ?
+ boolean legal_letter = (gi->type == GD_TYPE_TEXT_INPUT_NUMERIC ?
letter >= '0' && letter <= '9' :
letter != 0);
- if (legal_letter && text_length < gi->text.size)
+ if (legal_letter && text_length < gi->textinput.size)
+ {
+ strcpy(text, gi->textinput.value);
+ strcpy(&gi->textinput.value[cursor_pos + 1], &text[cursor_pos]);
+ gi->textinput.value[cursor_pos] = letter;
+ gi->textinput.cursor_position++;
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (key == KSYM_Left && cursor_pos > 0)
+ {
+ gi->textinput.cursor_position--;
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (key == KSYM_Right && cursor_pos < text_length)
+ {
+ gi->textinput.cursor_position++;
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (key == KSYM_BackSpace && cursor_pos > 0)
+ {
+ strcpy(text, gi->textinput.value);
+ strcpy(&gi->textinput.value[cursor_pos - 1], &text[cursor_pos]);
+ gi->textinput.cursor_position--;
+
+ 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 + 1], &text[cursor_pos]);
- gi->text.value[cursor_pos] = letter;
- gi->text.cursor_position++;
+ strcpy(text, gi->textinput.value);
+ strcpy(&gi->textinput.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_TEXT_AREA) /* only valid for text area */
+ {
+ char text[MAX_GADGET_TEXTSIZE];
+ int text_length = strlen(gi->textarea.value);
+ int area_ysize = gi->textarea.ysize;
+ int cursor_x_pref = gi->textarea.cursor_x_preferred;
+ int cursor_y = gi->textarea.cursor_y;
+ int cursor_pos = gi->textarea.cursor_position;
+ char letter = getCharFromKey(key);
+ boolean legal_letter = (letter != 0);
+
+ if (legal_letter)
+ {
+ insertCharIntoTextArea(gi, letter);
+
+ 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);
+ setTextAreaCursorPosition(gi, gi->textarea.cursor_position - 1);
+
+ 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);
+ setTextAreaCursorPosition(gi, gi->textarea.cursor_position + 1);
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (key == KSYM_Up && cursor_y > 0)
+ {
+ setTextAreaCursorXY(gi, cursor_x_pref, cursor_y - 1);
+ gi->textarea.cursor_x_preferred = cursor_x_pref;
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+ }
+ else if (key == KSYM_Down && cursor_y < area_ysize - 1)
+ {
+ setTextAreaCursorXY(gi, cursor_x_pref, cursor_y + 1);
+ gi->textarea.cursor_x_preferred = cursor_x_pref;
+
+ 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);
+ strcpy(text, gi->textarea.value);
+ strcpy(&gi->textarea.value[cursor_pos - 1], &text[cursor_pos]);
+
+ setTextAreaCursorPosition(gi, gi->textarea.cursor_position - 1);
+
+ 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);
+ strcpy(text, gi->textarea.value);
+ strcpy(&gi->textarea.value[cursor_pos], &text[cursor_pos + 1]);
+
+ DrawGadget(gi, DG_PRESSED, gi->direct_draw);
}
}
else if (gi->type & GD_TYPE_SELECTBOX) /* only valid for selectbox */
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);
}
}
}
projects / rocksndiamonds.git / blobdiff