X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=b917b43df0ffeabd65c22bbacf173fc571ec14b2;hp=1b368c569f703cb37f0245f1e09cf6d72b53bd12;hb=HEAD;hpb=37a06df577bbfd00f4b361f92cacb0d97036ba93 diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index 1b368c56..b917b43d 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -1,35 +1,80 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* gadgets.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// gadgets.c +// ============================================================================ #include #include #include "gadgets.h" +#include "image.h" #include "text.h" #include "misc.h" -/* values for DrawGadget() */ +// values for DrawGadget() #define DG_UNPRESSED 0 #define DG_PRESSED 1 #define DG_BUFFERED 0 #define DG_DIRECT 1 +#define OPTION_TEXT_SELECTABLE(g, t) \ + (t[0] != g->selectbox.char_unselectable && \ + t[0] != '\0' && \ + !strEqual(t, " ")) +#define CURRENT_OPTION_SELECTABLE(g) \ + OPTION_TEXT_SELECTABLE(g, g->selectbox.options[g->selectbox.current_index].text) + + static struct GadgetInfo *gadget_list_first_entry = NULL; static struct GadgetInfo *gadget_list_last_entry = NULL; +static struct GadgetInfo *last_info_gi = NULL; static int next_free_gadget_id = 1; static boolean gadget_id_wrapped = FALSE; +static int gadget_screen_border_right = -1; +static int gadget_screen_border_bottom = -1; + +static void (*PlayGadgetSoundActivating)(void) = NULL; +static void (*PlayGadgetSoundSelecting)(void) = NULL; + + +void InitGadgetsSoundCallback(void (*activating_function)(void), + void (*selecting_function)(void)) +{ + PlayGadgetSoundActivating = activating_function; + PlayGadgetSoundSelecting = selecting_function; +} + +void InitGadgetScreenBorders(int border_right, int border_bottom) +{ + gadget_screen_border_right = border_right; + gadget_screen_border_bottom = border_bottom; +} + +static int getGadgetScreenBorderRight(void) +{ + if (gadget_screen_border_right < gfx.sx || + gadget_screen_border_right > gfx.sx + gfx.sxsize) + return gfx.sx + gfx.sxsize; + + return gadget_screen_border_right; +} + +static int getGadgetScreenBorderBottom(void) +{ + if (gadget_screen_border_bottom < gfx.sy || + gadget_screen_border_bottom > gfx.sy + gfx.sysize) + return gfx.sy + gfx.sysize; + + return gadget_screen_border_bottom; +} static struct GadgetInfo *getGadgetInfoFromGadgetID(int id) { @@ -41,13 +86,13 @@ static struct GadgetInfo *getGadgetInfoFromGadgetID(int id) return gi; } -static int getNewGadgetID() +static int getNewGadgetID(void) { int id = next_free_gadget_id++; - if (next_free_gadget_id <= 0) /* counter overrun */ + if (next_free_gadget_id <= 0) // counter overrun { - gadget_id_wrapped = TRUE; /* now we must check each ID */ + gadget_id_wrapped = TRUE; // now we must check each ID next_free_gadget_id = 0; } @@ -58,17 +103,50 @@ static int getNewGadgetID() next_free_gadget_id++; } - if (next_free_gadget_id <= 0) /* cannot get new gadget id */ - Error(ERR_EXIT, "too much gadgets -- this should not happen"); + if (next_free_gadget_id <= 0) // cannot get new gadget id + Fail("too much gadgets -- this should not happen"); return id; } -static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) +static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my, + int button) { struct GadgetInfo *gi; - /* open selectboxes may overlap other active gadgets, so check them first */ + // first check for scrollbars in case of mouse scroll wheel button events + if (IS_WHEEL_BUTTON(button)) + { + // real horizontal wheel or vertical wheel with modifier key pressed + boolean check_horizontal = (IS_WHEEL_BUTTON_HORIZONTAL(button) || + GetKeyModState() & KMOD_Shift); + + // check for the first active scrollbar directly under the mouse pointer + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + { + if (gi->mapped && gi->active && + (gi->type & GD_TYPE_SCROLLBAR) && + mx >= gi->x && mx < gi->x + gi->width && + my >= gi->y && my < gi->y + gi->height) + return gi; + } + + // check for the first active scrollbar with matching mouse wheel area + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + { + if (gi->mapped && gi->active && + ((gi->type & GD_TYPE_SCROLLBAR_HORIZONTAL && check_horizontal) || + (gi->type & GD_TYPE_SCROLLBAR_VERTICAL && !check_horizontal)) && + mx >= gi->wheelarea.x && mx < gi->wheelarea.x + gi->wheelarea.width && + my >= gi->wheelarea.y && my < gi->wheelarea.y + gi->wheelarea.height) + return gi; + } + + // no active scrollbar found -- ignore this scroll wheel button event + return NULL; + } + + // 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 && gi->active && @@ -78,7 +156,17 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) return gi; } - /* check all other gadgets */ + // full text areas may overlap other active gadgets, so check them first + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + { + if (gi->mapped && gi->active && + gi->type & GD_TYPE_TEXT_AREA && gi->textarea.full_open && + mx >= gi->textarea.full_x && mx < gi->textarea.full_x + gi->width && + my >= gi->textarea.full_y && my < gi->textarea.full_y + gi->height) + return gi; + } + + // check all other gadgets for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) { if (gi->mapped && gi->active && @@ -104,12 +192,12 @@ static void setTextAreaCursorExt(struct GadgetInfo *gi, boolean set_cursor_pos) while (*text) { - if (set_cursor_pos) /* x/y => position */ + if (set_cursor_pos) // x/y => position { if (y == cursor_y && (x == cursor_x || (x < cursor_x && *text == '\n'))) break; } - else /* position => x/y */ + else // position => x/y { if (pos == cursor_position) break; @@ -161,13 +249,22 @@ static void default_callback_action(void *ptr) return; } +static void DoGadgetCallbackAction(struct GadgetInfo *gi, boolean changed) +{ + if (changed || gi->callback_action_always) + gi->callback_action(gi); +} + static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) { struct GadgetDesign *gd; int state = (pressed ? GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED); boolean redraw_selectbox = FALSE; - if (gi == NULL) + if (gi == NULL || gi->deactivated) + return; + + if (gi->overlay_touch_button) // will be drawn later (as texture) return; gd = (!gi->active ? &gi->alt_design[state] : @@ -177,16 +274,33 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) { case GD_TYPE_NORMAL_BUTTON: case GD_TYPE_CHECK_BUTTON: + case GD_TYPE_CHECK_BUTTON_2: case GD_TYPE_RADIO_BUTTON: + 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, - gi->deco.width, gi->deco.height, - gi->x + gi->deco.x + (pressed ? gi->deco.xshift : 0), - gi->y + gi->deco.y + (pressed ? gi->deco.yshift : 0)); + { + // make sure that decoration does not overlap gadget border + int deco_x = gi->deco.x + (pressed ? gi->deco.xshift : 0); + int deco_y = gi->deco.y + (pressed ? gi->deco.yshift : 0); + int deco_width = MIN(gi->deco.width, gi->width - deco_x); + int deco_height = MIN(gi->deco.height, gi->height - deco_y); + + if (gi->deco.masked) + BlitBitmapMasked(gi->deco.design.bitmap, drawto, + gi->deco.design.x, gi->deco.design.y, + deco_width, deco_height, + gi->x + deco_x, gi->y + deco_y); + else + BlitBitmap(gi->deco.design.bitmap, drawto, + gi->deco.design.x, gi->deco.design.y, + deco_width, deco_height, + gi->x + deco_x, gi->y + deco_y); + } + break; case GD_TYPE_TEXT_BUTTON: @@ -199,23 +313,23 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int text_size = strlen(gi->textbutton.value); int text_start = (gi->width - text_size * font_width) / 2; - /* left part of gadget */ + // 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++) + // 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 */ + // 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 */ + // gadget text value DrawTextExt(drawto, gi->x + text_start + (pressed ? gi->deco.xshift : 0), gi->y + border_y + (pressed ? gi->deco.yshift : 0), @@ -232,30 +346,43 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) char text[MAX_GADGET_TEXTSIZE + 1]; int font_nr = (pressed ? gi->font_active : gi->font); int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); int border_x = gi->border.xsize; int border_y = gi->border.ysize; + int text_x = gi->x + font->draw_xoffset; + int text_y = gi->y + font->draw_yoffset; - /* left part of gadget */ + // 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->textinput.size + 1; i++) + // middle part of gadget + 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 */ + // 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); - /* set text value */ + // set text value strcpy(text, gi->textinput.value); strcat(text, " "); - /* gadget text value */ + // dirty workaround to erase text if input gadget font has draw offset + if (font->draw_xoffset != 0 || font->draw_yoffset != 0) + for (i = 0; i < gi->textinput.size + 1; i++) + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + border_x, gd->y + border_y, + font_width, font_height, + text_x + border_x + i * font_width, + text_y + border_y); + + // gadget text value DrawTextExt(drawto, gi->x + border_x, gi->y + border_y, text, font_nr, BLIT_MASKED); @@ -264,7 +391,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' '); cursor_string[1] = '\0'; - /* draw cursor, if active */ + // draw cursor, if active if (pressed) DrawTextExt(drawto, gi->x + border_x + @@ -285,81 +412,124 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int border_x = gi->border.xsize; int border_y = gi->border.ysize; int gd_height = 2 * border_y + font_height; + int x = gi->x; + int y = gi->y; + int width = gi->width; + int height = gi->height; + int xsize = gi->textarea.xsize; + int ysize = gi->textarea.ysize; + + if (gi->textarea.cropped) + { + if (pressed) + { + x = gi->textarea.full_x; + y = gi->textarea.full_y; + + if (!gi->textarea.full_open) + { + gi->textarea.full_open = TRUE; + + // save background under fully opened text area + BlitBitmap(drawto, gfx.field_save_buffer, + gi->textarea.full_x, gi->textarea.full_y, + gi->width, gi->height, + gi->textarea.full_x, gi->textarea.full_y); + } + } + else + { + width = gi->textarea.crop_width; + height = gi->textarea.crop_height; + xsize = gi->textarea.crop_xsize; + ysize = gi->textarea.crop_ysize; - /* top left part of gadget border */ + if (gi->textarea.full_open) + { + gi->textarea.full_open = FALSE; + + // restore background under fully opened text area + BlitBitmap(gfx.field_save_buffer, drawto, + gi->textarea.full_x, gi->textarea.full_y, + gi->width, gi->height, + gi->textarea.full_x, gi->textarea.full_y); + } + } + } + + // top left part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y, - border_x, border_y, gi->x, gi->y); + border_x, border_y, x, y); - /* top middle part of gadget border */ - for (i=0; i < gi->textarea.xsize; i++) + // top middle part of gadget border + for (i = 0; i < 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); + x + border_x + i * font_width, y); - /* top right part of gadget border */ + // 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); + x + width - border_x, y); - /* left and right part of gadget border for each row */ - for (i=0; i < gi->textarea.ysize; i++) + // left and right part of gadget border for each row + for (i = 0; i < 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); + x, 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); + x + width - border_x, + y + border_y + i * font_height); } - /* bottom left part of gadget border */ + // 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); + x, y + height - border_y); - /* bottom middle part of gadget border */ - for (i=0; i < gi->textarea.xsize; i++) + // bottom middle part of gadget border + for (i = 0; i < 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); + x + border_x + i * font_width, + y + height - border_y); - /* bottom right part of gadget border */ + // 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); + x + width - border_x, + y + height - border_y); ClearRectangleOnBackground(drawto, - gi->x + border_x, - gi->y + border_y, - gi->width - 2 * border_x, - gi->height - 2 * border_y); + x + border_x, + y + border_y, + width - 2 * border_x, + 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.xsize, gi->textarea.ysize, - BLIT_ON_BACKGROUND); + // gadget text value + DrawTextArea(x + border_x, y + border_y, gi->textarea.value, + font_nr, xsize, -1, ysize, 0, + BLIT_ON_BACKGROUND, FALSE, FALSE, FALSE); 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 */ + // draw cursor, if active if (pressed) DrawTextExt(drawto, - gi->x + border_x + gi->textarea.cursor_x * font_width, - gi->y + border_y + gi->textarea.cursor_y * font_height, + x + border_x + gi->textarea.cursor_x * font_width, + y + border_y + gi->textarea.cursor_y * font_height, cursor_string, font_nr, BLIT_INVERSE); } @@ -369,7 +539,8 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) { int i; char text[MAX_GADGET_TEXTSIZE + 1]; - int font_nr = (pressed ? gi->font_active : gi->font); + int font_nr_default = (pressed ? gi->font_active : gi->font); + int font_nr = font_nr_default; int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); int border_x = gi->border.xsize; @@ -379,34 +550,38 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int box_width = gi->selectbox.width; int box_height = gi->selectbox.height; - /* left part of gadget */ + // 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->selectbox.size; i++) + // middle part of gadget + for (i = 0; i < gi->selectbox.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); - /* button part of gadget */ + // button part of gadget BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x + width_inner, gd->y, button, gi->height, gi->x + gi->width - border_x - button, gi->y); - /* right part of gadget */ + // 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); - /* set text value */ + // set text value strncpy(text, gi->selectbox.options[gi->selectbox.index].text, gi->selectbox.size); text[gi->selectbox.size] = '\0'; - /* gadget text value */ + // set font value + font_nr = (OPTION_TEXT_SELECTABLE(gi, text) ? font_nr_default : + gi->font_unselectable); + + // gadget text value DrawTextExt(drawto, gi->x + border_x, gi->y + border_y, text, font_nr, BLIT_MASKED); @@ -418,43 +593,43 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.stay_open = FALSE; gi->selectbox.current_index = gi->selectbox.index; - /* save background under selectbox */ + // save background under selectbox BlitBitmap(drawto, gfx.field_save_buffer, gi->selectbox.x, gi->selectbox.y, gi->selectbox.width, gi->selectbox.height, gi->selectbox.x, gi->selectbox.y); } - /* draw open selectbox */ + // draw open selectbox - /* top left part of gadget border */ + // top left part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y, border_x, border_y, gi->selectbox.x, gi->selectbox.y); - /* top middle part of gadget border */ - for (i=0; i < gi->selectbox.size; i++) + // top middle part of gadget border + for (i = 0; i < gi->selectbox.size; i++) 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 */ + // top button part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, 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 */ + // top right part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, 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++) + // 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_y, border_x, font_height, @@ -468,15 +643,15 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.y + border_y + i*font_height); } - /* bottom left part of gadget border */ + // bottom left part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + gi->height - border_y, border_x, border_y, gi->selectbox.x, gi->selectbox.y + box_height - border_y); - /* bottom middle part of gadget border */ - for (i=0; i < gi->selectbox.size; i++) + // bottom middle part of gadget border + for (i = 0; i < gi->selectbox.size; i++) BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x, gd->y + gi->height - border_y, @@ -484,7 +659,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.x + border_x + i * font_width, gi->selectbox.y + box_height - border_y); - /* bottom button part of gadget border */ + // bottom button part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + border_x + width_inner, gd->y + gi->height - border_y, @@ -492,7 +667,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.x + box_width -border_x -button, gi->selectbox.y + box_height - border_y); - /* bottom right part of gadget border */ + // bottom right part of gadget border BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + gi->border.width - border_x, gd->y + gi->height - border_y, @@ -506,15 +681,19 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.width - 2 * border_x, gi->selectbox.height - 2 * border_y); - /* selectbox text values */ - for (i=0; i < gi->selectbox.num_values; i++) + // 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) + font_nr = (OPTION_TEXT_SELECTABLE(gi, text) ? font_nr_default : + gi->font_unselectable); + + if (i == gi->selectbox.current_index && + OPTION_TEXT_SELECTABLE(gi, text)) { FillRectangle(drawto, gi->selectbox.x + border_x, @@ -522,7 +701,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.width - 2 * border_x, font_height, gi->selectbox.inverse_color); - /* prevent use of cursor graphic by drawing at least two chars */ + // prevent use of cursor graphic by drawing at least two chars strcat(text, " "); text[gi->selectbox.size] = '\0'; @@ -541,13 +720,13 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) { gi->selectbox.open = FALSE; - /* restore background under selectbox */ + // restore background under selectbox BlitBitmap(gfx.field_save_buffer, drawto, gi->selectbox.x, gi->selectbox.y, gi->selectbox.width, gi->selectbox.height, gi->selectbox.x, gi->selectbox.y); - /* redraw closed selectbox */ + // redraw closed selectbox DrawGadget(gi, FALSE, FALSE); redraw_selectbox = TRUE; @@ -567,25 +746,25 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int num_steps = size_body / design_body; int step_size_remain = size_body - num_steps * design_body; - /* clear scrollbar area */ + // clear scrollbar area ClearRectangleOnBackground(backbuffer, gi->x, gi->y, gi->width, gi->height); - /* upper part of gadget */ + // upper part of gadget BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y, gi->width, gi->border.ysize, xpos, ypos); - /* middle part of gadget */ - for (i=0; i < num_steps; i++) + // middle part of gadget + for (i = 0; i < num_steps; i++) BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + gi->border.ysize, gi->width, design_body, xpos, ypos + gi->border.ysize + i * design_body); - /* remaining middle part of gadget */ + // remaining middle part of gadget if (step_size_remain > 0) BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + gi->border.ysize, @@ -594,7 +773,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) ypos + gi->border.ysize + num_steps * design_body); - /* lower part of gadget */ + // lower part of gadget BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y + design_full - gi->border.ysize, gi->width, gi->border.ysize, @@ -614,25 +793,25 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int num_steps = size_body / design_body; int step_size_remain = size_body - num_steps * design_body; - /* clear scrollbar area */ + // clear scrollbar area ClearRectangleOnBackground(backbuffer, gi->x, gi->y, gi->width, gi->height); - /* left part of gadget */ + // left part of gadget BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y, gi->border.xsize, gi->height, xpos, ypos); - /* middle part of gadget */ - for (i=0; i < num_steps; i++) + // middle part of gadget + for (i = 0; i < num_steps; i++) BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + gi->border.xsize, gd->y, design_body, gi->height, xpos + gi->border.xsize + i * design_body, ypos); - /* remaining middle part of gadget */ + // remaining middle part of gadget if (step_size_remain > 0) BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + gi->border.xsize, gd->y, @@ -641,7 +820,7 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) + num_steps * design_body, ypos); - /* right part of gadget */ + // right part of gadget BlitBitmapOnBackground(gd->bitmap, drawto, gd->x + design_full - gi->border.xsize, gd->y, gi->border.xsize, gi->height, @@ -653,6 +832,10 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) return; } + // do not use direct gadget drawing anymore; this worked as a speed-up once, + // but would slow things down a lot now the screen is always fully redrawn + direct = FALSE; + if (direct) { BlitBitmap(drawto, window, @@ -665,21 +848,122 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) gi->selectbox.x, gi->selectbox.y); } else - redraw_mask |= (gi->x < gfx.sx + gfx.sxsize ? REDRAW_FIELD : - gi->y < gfx.dy + gfx.dysize ? REDRAW_DOOR_1 : - gi->y > gfx.vy ? REDRAW_DOOR_2 : REDRAW_DOOR_3); + { + int x = gi->x; + int y = gi->y; + + redraw_mask |= (IN_GFX_FIELD_FULL(x, y) ? REDRAW_FIELD : + IN_GFX_DOOR_1(x, y) ? REDRAW_DOOR_1 : + IN_GFX_DOOR_2(x, y) ? REDRAW_DOOR_2 : + IN_GFX_DOOR_3(x, y) ? REDRAW_DOOR_3 : REDRAW_ALL); + } +} + +static void SetGadgetPosition_OverlayTouchButton(struct GadgetInfo *gi) +{ + gi->x = gi->orig_x; + gi->y = gi->orig_y; + + if (gi->x < 0) + gi->x += video.screen_width; + if (gi->y < 0) + gi->y += video.screen_height; + + gi->x -= video.screen_xoffset; + gi->y -= video.screen_yoffset; +} + +void SetGadgetsPosition_OverlayTouchButtons(void) +{ + struct GadgetInfo *gi; + + if (gadget_list_first_entry == NULL) + return; + + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + if (gi->overlay_touch_button) + SetGadgetPosition_OverlayTouchButton(gi); +} + +static void DrawGadget_OverlayTouchButton(struct GadgetInfo *gi) +{ + struct GadgetDesign *gd; + int state = (gi->state ? GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED); + + if (gi == NULL || gi->deactivated) + return; + + gd = (!gi->active ? &gi->alt_design[state] : + gi->checked ? &gi->alt_design[state] : &gi->design[state]); + + int x = gi->x + video.screen_xoffset; + int y = gi->y + video.screen_yoffset; + int alpha = gi->overlay_touch_button_alpha; + int alpha_max = SDL_ALPHA_OPAQUE; + int alpha_step = ALPHA_FADING_STEPSIZE(alpha_max); + + // only show mapped overlay touch buttons if touch screen is really used + if (gi->mapped && runtime.uses_touch_device) + { + if (alpha < alpha_max) + alpha = MIN(alpha + alpha_step, alpha_max); + } + else + { + alpha = MAX(0, alpha - alpha_step); + } + + gi->overlay_touch_button_alpha = alpha; + + if (alpha == 0) + return; + + switch (gi->type) + { + case GD_TYPE_NORMAL_BUTTON: + case GD_TYPE_CHECK_BUTTON: + case GD_TYPE_CHECK_BUTTON_2: + case GD_TYPE_RADIO_BUTTON: + SDL_SetTextureAlphaMod(gd->bitmap->texture_masked, alpha); + SDL_SetTextureBlendMode(gd->bitmap->texture_masked, SDL_BLENDMODE_BLEND); + + BlitToScreenMasked(gd->bitmap, gd->x, gd->y, gi->width, gi->height, x, y); + break; + + default: + return; + } +} + +void DrawGadgets_OverlayTouchButtons(void) +{ + struct GadgetInfo *gi; + + if (gadget_list_first_entry == NULL) + return; + + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + if (gi->overlay_touch_button) + DrawGadget_OverlayTouchButton(gi); +} + +boolean CheckPosition_OverlayTouchButtons(int mx, int my, int button) +{ + struct GadgetInfo *gi = getGadgetInfoFromMousePosition(mx, my, button); + + return (gi != NULL && gi->overlay_touch_button); } static int get_minimal_size_for_numeric_input(int minmax_value) { - int min_size = 1; /* value needs at least one digit */ + int min_size = 1; // value needs at least one digit int i; - /* add number of digits needed for absolute value */ + // add number of digits needed for absolute value for (i = 10; i <= ABS(minmax_value); i *= 10) min_size++; - /* if min/max value is negative, add one digit for minus sign */ + // if min/max value is negative, add one digit for minus sign if (minmax_value < 0) min_size++; @@ -695,8 +979,12 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) while (tag != GDI_END) { - switch(tag) + switch (tag) { + case GDI_IMAGE_ID: + gi->image_id = va_arg(ap, int); + break; + case GDI_CUSTOM_ID: gi->custom_id = va_arg(ap, int); break; @@ -707,7 +995,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) case GDI_INFO_TEXT: { - int max_textsize = MAX_INFO_TEXTSIZE - 1; + int max_textsize = MAX_INFO_TEXTSIZE; char *text = va_arg(ap, char *); if (text != NULL) @@ -720,11 +1008,11 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) break; case GDI_X: - gi->x = va_arg(ap, int); + gi->x = gi->orig_x = va_arg(ap, int); break; case GDI_Y: - gi->y = va_arg(ap, int); + gi->y = gi->orig_y = va_arg(ap, int); break; case GDI_WIDTH: @@ -744,20 +1032,24 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) 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_OVERLAY_TOUCH_BUTTON: + gi->overlay_touch_button = (boolean)va_arg(ap, int); + if (gi->overlay_touch_button) + SetGadgetPosition_OverlayTouchButton(gi); + break; + + case GDI_CALLBACK_ACTION_ALWAYS: + gi->callback_action_always = (boolean)va_arg(ap, int); + break; + case GDI_CHECKED: - /* take care here: "boolean" is typedef'ed as "unsigned char", - which gets promoted to "int" */ gi->checked = (boolean)va_arg(ap, int); break; @@ -797,7 +1089,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) int max_textsize = MAX_GADGET_TEXTSIZE; if (gi->textinput.size) - max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE - 1); + max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE); strncpy(gi->textinput.value, va_arg(ap, char *), max_textsize); strcpy(gi->textinput.last_value, gi->textinput.value); @@ -805,7 +1097,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->textinput.value[max_textsize] = '\0'; gi->textinput.cursor_position = strlen(gi->textinput.value); - /* same tag also used for other gadget definitions */ + // same tag also used for other gadget definitions strcpy(gi->textbutton.value, gi->textinput.value); strcpy(gi->textarea.value, gi->textinput.value); strcpy(gi->textarea.last_value, gi->textinput.value); @@ -815,13 +1107,13 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) case GDI_TEXT_SIZE: { int tag_value = va_arg(ap, int); - int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE - 1); + int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE); gi->textinput.size = max_textsize; gi->textinput.value[max_textsize] = '\0'; strcpy(gi->textinput.last_value, gi->textinput.value); - /* same tag also used for other gadget definitions */ + // same tag also used for other gadget definitions gi->textarea.size = max_textsize; gi->textarea.value[max_textsize] = '\0'; @@ -838,12 +1130,18 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->font = va_arg(ap, int); if (gi->font_active == 0) gi->font_active = gi->font; + if (gi->font_unselectable == 0) + gi->font_unselectable = gi->font; break; case GDI_TEXT_FONT_ACTIVE: gi->font_active = va_arg(ap, int); break; + case GDI_TEXT_FONT_UNSELECTABLE: + gi->font_unselectable = va_arg(ap, int); + break; + case GDI_SELECTBOX_OPTIONS: gi->selectbox.options = va_arg(ap, struct ValueTextInfo *); break; @@ -852,6 +1150,10 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->selectbox.index = va_arg(ap, int); break; + case GDI_SELECTBOX_CHAR_UNSELECTABLE: + gi->selectbox.char_unselectable = (char)va_arg(ap, int); + break; + case GDI_DESIGN_UNPRESSED: gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *); gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int); @@ -910,6 +1212,10 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->deco.yshift = va_arg(ap, int); break; + case GDI_DECORATION_MASKED: + gi->deco.masked = (boolean)va_arg(ap, int); + break; + case GDI_EVENT_MASK: gi->event_mask = va_arg(ap, unsigned int); break; @@ -918,25 +1224,23 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->drawing.area_xsize = va_arg(ap, int); gi->drawing.area_ysize = va_arg(ap, int); - /* determine dependent values for drawing area gadget, if needed */ - if (gi->width == 0 && gi->height == 0 && - gi->drawing.item_xsize !=0 && gi->drawing.item_ysize !=0) + // determine dependent values for drawing area gadget, if needed + if (gi->drawing.item_xsize != 0 && gi->drawing.item_ysize != 0) { gi->width = gi->drawing.area_xsize * gi->drawing.item_xsize; gi->height = gi->drawing.area_ysize * gi->drawing.item_ysize; } - else if (gi->drawing.item_xsize == 0 && gi->drawing.item_ysize == 0 && - gi->width != 0 && gi->height != 0) + else if (gi->width != 0 && gi->height != 0) { 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 */ + // 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 */ + if (gi->type & GD_TYPE_TEXT_AREA) // force recalculation { gi->width = 0; gi->height = 0; @@ -948,15 +1252,13 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->drawing.item_xsize = va_arg(ap, int); gi->drawing.item_ysize = va_arg(ap, int); - /* determine dependent values for drawing area gadget, if needed */ - if (gi->width == 0 && gi->height == 0 && - gi->drawing.area_xsize !=0 && gi->drawing.area_ysize !=0) + // determine dependent values for drawing area gadget, if needed + if (gi->drawing.area_xsize != 0 && gi->drawing.area_ysize != 0) { gi->width = gi->drawing.area_xsize * gi->drawing.item_xsize; gi->height = gi->drawing.area_ysize * gi->drawing.item_ysize; } - else if (gi->drawing.area_xsize == 0 && gi->drawing.area_ysize == 0 && - gi->width != 0 && gi->height != 0) + else if (gi->width != 0 && gi->height != 0) { gi->drawing.area_xsize = gi->width / gi->drawing.item_xsize; gi->drawing.area_ysize = gi->height / gi->drawing.item_ysize; @@ -975,6 +1277,22 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->scrollbar.item_position = va_arg(ap, int); break; + case GDI_WHEEL_AREA_X: + gi->wheelarea.x = va_arg(ap, int); + break; + + case GDI_WHEEL_AREA_Y: + gi->wheelarea.y = va_arg(ap, int); + break; + + case GDI_WHEEL_AREA_WIDTH: + gi->wheelarea.width = va_arg(ap, int); + break; + + case GDI_WHEEL_AREA_HEIGHT: + gi->wheelarea.height = va_arg(ap, int); + break; + case GDI_CALLBACK_INFO: gi->callback_info = va_arg(ap, gadget_function); break; @@ -984,19 +1302,25 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) break; default: - Error(ERR_EXIT, "HandleGadgetTags(): unknown tag %d", tag); + Fail("HandleGadgetTags(): unknown tag %d", tag); } - tag = va_arg(ap, int); /* read next tag */ + tag = va_arg(ap, int); // read next tag } - /* check if gadget is complete */ + gi->deactivated = FALSE; + + // check if gadget has undefined bitmaps if (gi->type != GD_TYPE_DRAWING_AREA && - (!gi->design[GD_BUTTON_UNPRESSED].bitmap || - !gi->design[GD_BUTTON_PRESSED].bitmap)) - Error(ERR_EXIT, "gadget incomplete (missing Bitmap)"); + (gi->design[GD_BUTTON_UNPRESSED].bitmap == NULL || + gi->design[GD_BUTTON_PRESSED].bitmap == NULL)) + gi->deactivated = TRUE; - /* adjust gadget values in relation to other gadget values */ + // check if gadget is placed off-screen (and is no overlay touch button) + if ((gi->x < 0 || gi->y < 0) && !gi->overlay_touch_button) + gi->deactivated = TRUE; + + // adjust gadget values in relation to other gadget values if (gi->type & GD_TYPE_TEXT_INPUT) { @@ -1014,7 +1338,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) int min_size_max = get_minimal_size_for_numeric_input(number_max); int min_size = MAX(min_size_min, min_size_max); - /* expand gadget text input size, if maximal value is too large */ + // expand gadget text input size, if maximal value is too large if (gi->textinput.size < min_size) gi->textinput.size = min_size; } @@ -1031,7 +1355,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) 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; + int bottom_screen_border = getGadgetScreenBorderBottom(); Bitmap *src_bitmap; int src_x, src_y; @@ -1039,13 +1363,13 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->height = 2 * border_ysize + font_height; if (gi->selectbox.options == NULL) - Error(ERR_EXIT, "selectbox gadget incomplete (missing options array)"); + Fail("selectbox gadget incomplete (missing options array)"); gi->selectbox.num_values = 0; while (gi->selectbox.options[gi->selectbox.num_values].text != NULL) gi->selectbox.num_values++; - /* calculate values for open selectbox */ + // calculate values for open selectbox gi->selectbox.width = gi->width; gi->selectbox.height = 2 * border_ysize + gi->selectbox.num_values * font_height; @@ -1061,12 +1385,12 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) src_x += font_width / 2; src_y += font_height / 2; - /* there may be esoteric cases with missing or too small font bitmap */ + // there may be esoteric cases with missing or too small font bitmap if (src_bitmap != NULL && src_x < src_bitmap->width && src_y < src_bitmap->height) gi->selectbox.inverse_color = GetPixel(src_bitmap, src_x, src_y); - /* always start with closed selectbox */ + // always start with closed selectbox gi->selectbox.open = FALSE; } @@ -1101,9 +1425,9 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) if (gi->width == 0 || gi->height == 0 || gs->items_max == 0 || gs->items_visible == 0) - Error(ERR_EXIT, "scrollbar gadget incomplete (missing tags)"); + Fail("scrollbar gadget incomplete (missing tags)"); - /* calculate internal scrollbar values */ + // calculate internal scrollbar values gs->size_min = (gi->type == GD_TYPE_SCROLLBAR_VERTICAL ? gi->width : gi->height); gs->size_max = (gi->type == GD_TYPE_SCROLLBAR_VERTICAL ? @@ -1117,7 +1441,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gs->position_max = gs->size_max - gs->size; gs->correction = gs->size_max / gs->items_max / 2; - /* finetuning for maximal right/bottom position */ + // finetuning for maximal right/bottom position if (gs->item_position == gs->items_max - gs->items_visible) gs->position = gs->position_max; } @@ -1129,6 +1453,8 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) int font_height = getFontHeight(font_nr); int border_xsize = gi->border.xsize; int border_ysize = gi->border.ysize; + int right_screen_border = getGadgetScreenBorderRight(); + int bottom_screen_border = getGadgetScreenBorderBottom(); if (gi->width == 0 || gi->height == 0) { @@ -1140,6 +1466,42 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->textarea.xsize = (gi->width - 2 * border_xsize) / font_width; gi->textarea.ysize = (gi->height - 2 * border_ysize) / font_height; } + + gi->textarea.full_x = gi->x; + gi->textarea.full_y = gi->y; + gi->textarea.crop_width = gi->width; + gi->textarea.crop_height = gi->height; + gi->textarea.crop_xsize = gi->textarea.xsize; + gi->textarea.crop_ysize = gi->textarea.ysize; + + gi->textarea.cropped = FALSE; + + if (gi->x + gi->width > right_screen_border) + { + gi->textarea.full_x = MAX(0, right_screen_border - gi->width); + gi->textarea.crop_width = right_screen_border - gi->x; + gi->textarea.crop_xsize = + (gi->textarea.crop_width - 2 * border_xsize) / font_width; + gi->textarea.crop_width = + 2 * border_xsize + gi->textarea.crop_xsize * font_width; + + gi->textarea.cropped = TRUE; + } + + if (gi->y + gi->height > bottom_screen_border) + { + gi->textarea.full_y = MAX(0, bottom_screen_border - gi->height); + gi->textarea.crop_height = bottom_screen_border - gi->y; + gi->textarea.crop_ysize = + (gi->textarea.crop_height - 2 * border_ysize) / font_height; + gi->textarea.crop_height = + 2 * border_ysize + gi->textarea.crop_ysize * font_height; + + gi->textarea.cropped = TRUE; + } + + // always start with unselected text area (which is potentially cropped) + gi->textarea.full_open = FALSE; } } @@ -1156,7 +1518,7 @@ void ModifyGadget(struct GadgetInfo *gi, int first_tag, ...) void RedrawGadget(struct GadgetInfo *gi) { - if (gi == NULL) + if (gi == NULL || gi->deactivated) return; if (gi->mapped) @@ -1168,12 +1530,15 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) struct GadgetInfo *new_gadget = checked_calloc(sizeof(struct GadgetInfo)); va_list ap; - /* always start with reliable default values */ + // always start with reliable default values new_gadget->id = getNewGadgetID(); + new_gadget->image_id = -1; 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->overlay_touch_button = FALSE; + new_gadget->overlay_touch_button_alpha = 0; new_gadget->next = NULL; @@ -1181,7 +1546,7 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) HandleGadgetTags(new_gadget, first_tag, ap); va_end(ap); - /* insert new gadget into global gadget list */ + // insert new gadget into global gadget list if (gadget_list_last_entry) { gadget_list_last_entry->next = new_gadget; @@ -1197,6 +1562,13 @@ void FreeGadget(struct GadgetInfo *gi) { struct GadgetInfo *gi_previous = gadget_list_first_entry; + if (gi == NULL) + return; + + // prevent "last_info_gi" from pointing to memory that will be freed + if (last_info_gi == gi) + last_info_gi = NULL; + while (gi_previous != NULL && gi_previous->next != gi) gi_previous = gi_previous->next; @@ -1232,12 +1604,16 @@ static void CheckRangeOfNumericInputGadget(struct GadgetInfo *gi) gi->textinput.cursor_position = strlen(gi->textinput.value); } -/* global pointer to gadget actually in use (when mouse button pressed) */ +// global pointer to gadget actually in use (when mouse button pressed) static struct GadgetInfo *last_gi = NULL; static void MapGadgetExt(struct GadgetInfo *gi, boolean redraw) { - if (gi == NULL || gi->mapped) + if (gi == NULL || gi->deactivated || gi->mapped) + return; + + // do not map overlay touch buttons if touch screen is not used + if (gi->overlay_touch_button && !runtime.uses_touch_device) return; gi->mapped = TRUE; @@ -1253,7 +1629,7 @@ void MapGadget(struct GadgetInfo *gi) void UnmapGadget(struct GadgetInfo *gi) { - if (gi == NULL || !gi->mapped) + if (gi == NULL || gi->deactivated || !gi->mapped) return; gi->mapped = FALSE; @@ -1269,9 +1645,11 @@ void UnmapGadget(struct GadgetInfo *gi) #define MULTIMAP_PLAYFIELD (1 << 3) #define MULTIMAP_DOOR_1 (1 << 4) #define MULTIMAP_DOOR_2 (1 << 5) +#define MULTIMAP_DOOR_3 (1 << 6) #define MULTIMAP_ALL (MULTIMAP_PLAYFIELD | \ - MULTIMAP_DOOR_1 | \ - MULTIMAP_DOOR_2) + MULTIMAP_DOOR_1 | \ + MULTIMAP_DOOR_2 | \ + MULTIMAP_DOOR_3) static void MultiMapGadgets(int mode) { @@ -1281,12 +1659,13 @@ static void MultiMapGadgets(int mode) while (gi != NULL) { - if ((mode & MULTIMAP_PLAYFIELD && - gi->x < gfx.sx + gfx.sxsize) || - (mode & MULTIMAP_DOOR_1 && - gi->x >= gfx.dx && gi->y < gfx.dy + gfx.dysize) || - (mode & MULTIMAP_DOOR_2 && - gi->x >= gfx.dx && gi->y > gfx.dy + gfx.dysize) || + int x = gi->x; + int y = gi->y; + + if ((mode & MULTIMAP_PLAYFIELD && IN_GFX_FIELD_FULL(x, y)) || + (mode & MULTIMAP_DOOR_1 && IN_GFX_DOOR_1(x, y)) || + (mode & MULTIMAP_DOOR_2 && IN_GFX_DOOR_2(x, y)) || + (mode & MULTIMAP_DOOR_3 && IN_GFX_DOOR_3(x, y)) || (mode & MULTIMAP_ALL) == MULTIMAP_ALL) { if (mode & MULTIMAP_UNMAP) @@ -1305,37 +1684,37 @@ static void MultiMapGadgets(int mode) } } -void UnmapAllGadgets() +void UnmapAllGadgets(void) { MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_UNMAP); } -void RemapAllGadgets() +void RemapAllGadgets(void) { MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_REMAP); } -boolean anyTextInputGadgetActive() +boolean anyTextInputGadgetActive(void) { return (last_gi && (last_gi->type & GD_TYPE_TEXT_INPUT) && last_gi->mapped); } -boolean anyTextAreaGadgetActive() +boolean anyTextAreaGadgetActive(void) { return (last_gi && (last_gi->type & GD_TYPE_TEXT_AREA) && last_gi->mapped); } -boolean anySelectboxGadgetActive() +boolean anySelectboxGadgetActive(void) { return (last_gi && (last_gi->type & GD_TYPE_SELECTBOX) && last_gi->mapped); } -boolean anyScrollbarGadgetActive() +boolean anyScrollbarGadgetActive(void) { return (last_gi && (last_gi->type & GD_TYPE_SCROLLBAR) && last_gi->mapped); } -boolean anyTextGadgetActive() +boolean anyTextGadgetActive(void) { return (anyTextInputGadgetActive() || anyTextAreaGadgetActive() || @@ -1344,43 +1723,51 @@ boolean anyTextGadgetActive() static boolean insideSelectboxLine(struct GadgetInfo *gi, int mx, int my) { - return(gi != NULL && - gi->type & GD_TYPE_SELECTBOX && - mx >= gi->x && mx < gi->x + gi->width && - my >= gi->y && my < gi->y + gi->height); + return (gi != NULL && + gi->type & GD_TYPE_SELECTBOX && + mx >= gi->x && mx < gi->x + gi->width && + my >= gi->y && my < gi->y + gi->height); } static boolean insideSelectboxArea(struct GadgetInfo *gi, int mx, int my) { - return(gi != NULL && - gi->type & GD_TYPE_SELECTBOX && - mx >= gi->selectbox.x && mx < gi->selectbox.x + gi->selectbox.width && - my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height); + return (gi != NULL && + gi->type & GD_TYPE_SELECTBOX && + mx >= gi->selectbox.x && mx < gi->selectbox.x + gi->selectbox.width && + my >= gi->selectbox.y && my < gi->selectbox.y + gi->selectbox.height); } void ClickOnGadget(struct GadgetInfo *gi, int button) { - if (!gi->mapped) + if (gi == NULL || gi->deactivated || !gi->mapped) return; - /* simulate releasing mouse button over last gadget, if still pressed */ + // simulate releasing mouse button over last gadget, if still pressed if (button_status) HandleGadgets(-1, -1, 0); - /* simulate pressing mouse button over specified gadget */ - HandleGadgets(gi->x, gi->y, button); + int x = gi->x; + int y = gi->y; + + // set cursor position to the end of the text for text input gadgets + if (gi->type & GD_TYPE_TEXT_INPUT) + x = gi->x + gi->width - 1; + + // simulate pressing mouse button over specified gadget + HandleGadgets(x, y, button); - /* simulate releasing mouse button over specified gadget */ - HandleGadgets(gi->x, gi->y, 0); + // simulate releasing mouse button over specified gadget + HandleGadgets(x, y, 0); } boolean HandleGadgets(int mx, int my, int button) { - static struct GadgetInfo *last_info_gi = NULL; - static unsigned long pressed_delay = 0; + static DelayCounter pressed_delay = { GADGET_FRAME_DELAY }; static int last_button = 0; static int last_mx = 0, last_my = 0; static int pressed_mx = 0, pressed_my = 0; + static boolean keep_selectbox_open = FALSE; + static boolean gadget_stopped = FALSE; int scrollbar_mouse_pos = 0; struct GadgetInfo *new_gi, *gi; boolean press_event; @@ -1393,36 +1780,38 @@ boolean HandleGadgets(int mx, int my, int button) boolean gadget_pressed_repeated; boolean gadget_pressed_off_borders; boolean gadget_pressed_inside_select_line; + boolean gadget_pressed_delay_reached; boolean gadget_moving; boolean gadget_moving_inside; boolean gadget_moving_off_borders; + boolean gadget_draggable; + boolean gadget_dragging; boolean gadget_released; boolean gadget_released_inside; - boolean gadget_released_inside_select_line; boolean gadget_released_inside_select_area; boolean gadget_released_off_borders; boolean changed_position = FALSE; - /* check if there are any gadgets defined */ + // check if there are any gadgets defined if (gadget_list_first_entry == NULL) return FALSE; - /* simulated release of mouse button over last gadget */ + // 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); + // check which gadget is under the mouse pointer + new_gi = getGadgetInfoFromMousePosition(mx, my, button); - /* check if button state has changed since last invocation */ - press_event = (button != 0 && last_button == 0); + // check if button state has changed since last invocation + press_event = (button != 0 && last_button == 0); release_event = (button == 0 && last_button != 0); last_button = button; - /* check if mouse has been moved since last invocation */ + // check if mouse has been moved since last invocation mouse_moving = ((mx != last_mx || my != last_my) && motion_status); last_mx = mx; last_my = my; @@ -1446,26 +1835,35 @@ boolean HandleGadgets(int mx, int my, int button) new_gi->type & GD_TYPE_SELECTBOX && new_gi->selectbox.open && insideSelectboxLine(new_gi, mx, my)); - /* if mouse button pressed outside text or selectbox gadget, deactivate it */ + // if mouse button pressed outside text or selectbox gadget, deactivate it if (anyTextGadgetActive() && (gadget_pressed_off_borders || (gadget_pressed_inside_select_line && !mouse_inside_select_area))) { struct GadgetInfo *gi = last_gi; - boolean gadget_changed = (gi->event_mask & GD_EVENT_TEXT_LEAVING); + boolean gadget_changed = ((gi->event_mask & GD_EVENT_TEXT_LEAVING) != 0); - /* check if text gadget has changed its value */ + // check if text input gadget has changed its value if (gi->type & GD_TYPE_TEXT_INPUT) { CheckRangeOfNumericInputGadget(gi); - if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0) + if (!strEqual(gi->textinput.last_value, gi->textinput.value)) strcpy(gi->textinput.last_value, gi->textinput.value); else gadget_changed = FALSE; } - /* selectbox does not change its value when closed by clicking outside */ + // check if text area gadget has changed its value + if (gi->type & GD_TYPE_TEXT_AREA) + { + if (!strEqual(gi->textarea.last_value, gi->textarea.value)) + strcpy(gi->textarea.last_value, gi->textarea.value); + else + gadget_changed = FALSE; + } + + // selectbox does not change its value when closed by clicking outside if (gi->type & GD_TYPE_SELECTBOX) gadget_changed = FALSE; @@ -1473,13 +1871,15 @@ boolean HandleGadgets(int mx, int my, int button) gi->event.type = GD_EVENT_TEXT_LEAVING; - if (gadget_changed && !(gi->type & GD_TYPE_SELECTBOX)) - gi->callback_action(gi); + if (!(gi->type & GD_TYPE_SELECTBOX)) + DoGadgetCallbackAction(gi, gadget_changed); last_gi = NULL; if (gadget_pressed_inside_select_line) new_gi = NULL; + + StopTextInput(); } gadget_pressed = @@ -1487,6 +1887,9 @@ boolean HandleGadgets(int mx, int my, int button) gadget_pressed_repeated = (button != 0 && last_gi != NULL && new_gi == last_gi); + gadget_pressed_delay_reached = + DelayReached(&pressed_delay); + gadget_released = (release_event && last_gi != NULL); gadget_released_inside = (gadget_released && new_gi == last_gi); gadget_released_off_borders = (gadget_released && new_gi != last_gi); @@ -1495,71 +1898,83 @@ boolean HandleGadgets(int mx, int my, int button) gadget_moving_inside = (gadget_moving && new_gi == last_gi); gadget_moving_off_borders = (gadget_moving && new_gi != last_gi); - /* when handling selectbox, set additional state values */ + // when handling selectbox, set additional state values if (gadget_released_inside && (last_gi->type & GD_TYPE_SELECTBOX)) - { - gadget_released_inside_select_line = insideSelectboxLine(last_gi, mx, my); gadget_released_inside_select_area = insideSelectboxArea(last_gi, mx, my); - } else - { - gadget_released_inside_select_line = FALSE; gadget_released_inside_select_area = FALSE; - } - /* if new gadget pressed, store this gadget */ + // setting state for handling over-large selectbox + if (keep_selectbox_open && (press_event || !mouse_inside_select_line)) + keep_selectbox_open = FALSE; + + // if new gadget pressed, store this gadget if (gadget_pressed) last_gi = new_gi; - /* 'gi' is actually handled gadget */ + // 'gi' is actually handled gadget gi = last_gi; - /* if gadget is scrollbar, choose mouse position value */ + // if gadget is scrollbar, choose mouse position value if (gi && gi->type & GD_TYPE_SCROLLBAR) scrollbar_mouse_pos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx - gi->x : my - gi->y); - /* if mouse button released, no gadget needs to be handled anymore */ + // if mouse button released, no gadget needs to be handled anymore if (gadget_released) { if (gi->type & GD_TYPE_SELECTBOX && - (mouse_released_where_pressed || - !gadget_released_inside_select_area)) /* selectbox stays open */ + (keep_selectbox_open || + mouse_released_where_pressed || + !gadget_released_inside_select_area || + !CURRENT_OPTION_SELECTABLE(gi))) // selectbox stays open { gi->selectbox.stay_open = TRUE; pressed_mx = 0; pressed_my = 0; } else if (!(gi->type & GD_TYPE_TEXT_INPUT || - gi->type & GD_TYPE_TEXT_AREA)) /* text input stays open */ + gi->type & GD_TYPE_TEXT_AREA)) // text input stays open last_gi = NULL; } - /* modify event position values even if no gadget is pressed */ + // modify event position values even if no gadget is pressed if (button == 0 && !release_event) gi = new_gi; + // if new gadget or if no gadget was pressed, release stopped processing + if (gadget_pressed || new_gi == NULL) + gadget_stopped = FALSE; + + // if gadget was stopped while being handled, stop gadget processing here + if (gadget_stopped) + return TRUE; + if (gi != NULL) { int last_x = gi->event.x; int last_y = gi->event.y; + int last_mx = gi->event.mx; + int last_my = gi->event.my; - gi->event.x = mx - gi->x; - gi->event.y = my - gi->y; + gi->event.x = gi->event.mx = mx - gi->x; + gi->event.y = gi->event.my = my - gi->y; if (gi->type == GD_TYPE_DRAWING_AREA) { gi->event.x /= gi->drawing.item_xsize; gi->event.y /= gi->drawing.item_ysize; - if (last_x != gi->event.x || last_y != gi->event.y) + if (last_x != gi->event.x || last_y != gi->event.y || + ((last_mx != gi->event.mx || last_my != gi->event.my) && + gi->event_mask & GD_EVENT_PIXEL_PRECISE)) 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 */ + // if mouse button pressed inside activated text gadget, set cursor gi->textinput.cursor_position = (mx - gi->x - gi->border.xsize) / getFontWidth(gi->font); @@ -1570,12 +1985,17 @@ boolean HandleGadgets(int mx, int my, int button) if (gi->textinput.cursor_position != old_cursor_position) DrawGadget(gi, DG_PRESSED, gi->direct_draw); + + if (press_event) + StartTextInput(gi->x, gi->y, gi->width, gi->height); } 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); + int gadget_x = mx - gi->textarea.full_x - gi->border.xsize; + int gadget_y = my - gi->textarea.full_y - gi->border.ysize; + int x = gadget_x / getFontWidth(gi->font); + int y = gadget_y / 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); @@ -1584,12 +2004,16 @@ boolean HandleGadgets(int mx, int my, int button) if (gi->textarea.cursor_position != old_cursor_position) DrawGadget(gi, DG_PRESSED, gi->direct_draw); + + if (press_event) + StartTextInput(gi->x, gi->y, gi->width, gi->height); } - else if (gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open) + else if (gi->type & GD_TYPE_SELECTBOX && gi->selectbox.open && + !keep_selectbox_open) { int old_index = gi->selectbox.current_index; - /* if mouse moving inside activated selectbox, select value */ + // 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); @@ -1604,7 +2028,7 @@ boolean HandleGadgets(int mx, int my, int button) } } - /* handle gadget popup info text */ + // handle gadget popup info text if (last_info_gi != new_gi || (new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position)) { @@ -1613,7 +2037,7 @@ boolean HandleGadgets(int mx, int my, int button) new_gi->event.type = GD_EVENT_INFO_ENTERING; new_gi->callback_info(new_gi); } - else if (last_info_gi != NULL) + else if (last_info_gi != NULL && last_info_gi->mapped) { last_info_gi->event.type = GD_EVENT_INFO_LEAVING; last_info_gi->callback_info(last_info_gi); @@ -1622,65 +2046,68 @@ boolean HandleGadgets(int mx, int my, int button) last_info_gi = new_gi; } - if (gadget_pressed) - { - if (gi->type == GD_TYPE_CHECK_BUTTON) - { - gi->checked = !gi->checked; - } - else if (gi->type == GD_TYPE_RADIO_BUTTON) - { - struct GadgetInfo *rgi = gadget_list_first_entry; + gadget_draggable = (gi && gi->type & GD_TYPE_SCROLLBAR); - while (rgi) - { - if (rgi->mapped && - rgi->type == GD_TYPE_RADIO_BUTTON && - rgi->radio_nr == gi->radio_nr && - rgi != gi) - { - rgi->checked = FALSE; - DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw); - } + // reset drag position for newly pressed scrollbar to "not dragging" + if (gadget_pressed && gadget_draggable) + gi->scrollbar.drag_position = -1; - rgi = rgi->next; - } + gadget_dragging = (gadget_draggable && gi->scrollbar.drag_position != -1); - gi->checked = TRUE; + // clicking next to a scrollbar to move it is not considered "moving" + if (gadget_draggable && !gadget_dragging) + gadget_moving = FALSE; + + // when leaving scrollbar area when jump-scrolling, stop gadget processing + if (gadget_draggable && !gadget_dragging && gadget_moving_off_borders) + gadget_stopped = TRUE; + + if ((gadget_pressed) || + (gadget_pressed_repeated && gadget_pressed_delay_reached)) + { + if (gadget_pressed) // gadget pressed the first time + { + // initialize delay counter + ResetDelayCounter(&pressed_delay); + + // start gadget delay with longer delay after first click on gadget + pressed_delay.value = GADGET_FRAME_DELAY_FIRST; } - else if (gi->type & GD_TYPE_SCROLLBAR) + else // gadget hold pressed for some time { - int mpos, gpos; + // after first repeated gadget click, continue with shorter delay value + pressed_delay.value = GADGET_FRAME_DELAY; + } - if (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL) - { - mpos = mx; - gpos = gi->x; - } - else - { - mpos = my; - gpos = gi->y; - } + if (gi->type & GD_TYPE_SCROLLBAR && !gadget_dragging) + { + int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my); + int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y); + int slider_start = gpos + gi->scrollbar.position; + int slider_end = gpos + gi->scrollbar.position + gi->scrollbar.size - 1; + boolean inside_slider = (mpos >= slider_start && mpos <= slider_end); - if (mpos >= gpos + gi->scrollbar.position && - mpos < gpos + gi->scrollbar.position + gi->scrollbar.size) - { - /* drag scrollbar */ - gi->scrollbar.drag_position = - scrollbar_mouse_pos - gi->scrollbar.position; - } - else + if (IS_WHEEL_BUTTON(button) || !inside_slider) { - /* click scrollbar one scrollbar length up/left or down/right */ + // click scrollbar one scrollbar length up/left or down/right struct GadgetScrollbar *gs = &gi->scrollbar; int old_item_position = gs->item_position; + int item_steps = gs->items_visible - 1; + int item_direction = (mpos < gpos + gi->scrollbar.position ? -1 : +1); + + if (IS_WHEEL_BUTTON(button)) + { + boolean scroll_single_step = ((GetKeyModState() & KMOD_Alt) != 0); + + item_steps = (scroll_single_step ? 1 : wheel_steps); + item_direction = (button == MB_WHEEL_UP || + button == MB_WHEEL_LEFT ? -1 : +1); + } changed_position = FALSE; - gs->item_position += - gs->items_visible * (mpos < gpos + gi->scrollbar.position ? -1 : +1); + gs->item_position += item_steps * item_direction; if (gs->item_position < 0) gs->item_position = 0; @@ -1700,14 +2127,72 @@ boolean HandleGadgets(int mx, int my, int button) gi->event.type = GD_EVENT_MOVING; gi->event.off_borders = FALSE; - if (gi->event_mask & GD_EVENT_MOVING && changed_position) - gi->callback_action(gi); - - /* don't handle this scrollbar anymore while mouse button pressed */ - last_gi = NULL; + if (gi->event_mask & GD_EVENT_MOVING) + DoGadgetCallbackAction(gi, changed_position); return TRUE; } + else + { + // don't handle this scrollbar anymore when mouse position reached + if (gadget_pressed_repeated) + { + gadget_stopped = TRUE; + + return TRUE; + } + } + } + } + + if (gadget_pressed) + { + PlayGadgetSoundActivating(); + + if (gi->type == GD_TYPE_CHECK_BUTTON) + { + gi->checked = !gi->checked; + } + else if (gi->type == GD_TYPE_RADIO_BUTTON) + { + struct GadgetInfo *rgi = gadget_list_first_entry; + + while (rgi) + { + if (rgi->mapped && + rgi->type == GD_TYPE_RADIO_BUTTON && + rgi->radio_nr == gi->radio_nr && + rgi != gi) + { + rgi->checked = FALSE; + DrawGadget(rgi, DG_UNPRESSED, rgi->direct_draw); + } + + rgi = rgi->next; + } + + gi->checked = TRUE; + } + else if (gi->type & GD_TYPE_SCROLLBAR) + { + int mpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx : my); + int gpos = (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? gi->x : gi->y); + int slider_start = gpos + gi->scrollbar.position; + int slider_end = gpos + gi->scrollbar.position + gi->scrollbar.size - 1; + boolean inside_slider = (mpos >= slider_start && mpos <= slider_end); + + if (!IS_WHEEL_BUTTON(button) && inside_slider) + { + // start dragging scrollbar + gi->scrollbar.drag_position = + scrollbar_mouse_pos - gi->scrollbar.position; + } + } + else if (gi->type & GD_TYPE_SELECTBOX) + { + // keep selectbox open in case of over-large selectbox + keep_selectbox_open = (mouse_inside_select_line && + mouse_inside_select_area); } DrawGadget(gi, DG_PRESSED, gi->direct_draw); @@ -1717,9 +2202,6 @@ boolean HandleGadgets(int mx, int my, int button) gi->event.button = button; gi->event.off_borders = FALSE; - /* initialize delay counter */ - DelayReached(&pressed_delay, 0); - if (gi->event_mask & GD_EVENT_PRESSED) gi->callback_action(gi); } @@ -1728,8 +2210,7 @@ boolean HandleGadgets(int mx, int my, int button) { gi->event.type = GD_EVENT_PRESSED; - if (gi->event_mask & GD_EVENT_REPEATED && - DelayReached(&pressed_delay, GADGET_FRAME_DELAY)) + if (gi->event_mask & GD_EVENT_REPEATED && gadget_pressed_delay_reached) gi->callback_action(gi); } @@ -1742,11 +2223,11 @@ boolean HandleGadgets(int mx, int my, int button) else if (gadget_moving_off_borders && gi->state == GD_BUTTON_PRESSED) DrawGadget(gi, DG_UNPRESSED, gi->direct_draw); } - else if (gi->type & GD_TYPE_SELECTBOX) + else if (gi->type & GD_TYPE_SELECTBOX && !keep_selectbox_open) { int old_index = gi->selectbox.current_index; - /* if mouse moving inside activated selectbox, select value */ + // 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); @@ -1766,7 +2247,7 @@ boolean HandleGadgets(int mx, int my, int button) gs->position = scrollbar_mouse_pos - gs->drag_position; - /* make sure to always precisely reach end positions when dragging */ + // make sure to always precisely reach end positions when dragging if (gs->position <= 0) { gs->position = 0; @@ -1797,14 +2278,14 @@ boolean HandleGadgets(int mx, int my, int button) DrawGadget(gi, DG_PRESSED, gi->direct_draw); } - gi->state = (gadget_moving_inside || gi->type & GD_TYPE_SCROLLBAR ? + gi->state = (gadget_moving_inside || gadget_draggable ? GD_BUTTON_PRESSED : GD_BUTTON_UNPRESSED); gi->event.type = GD_EVENT_MOVING; gi->event.off_borders = gadget_moving_off_borders; - if (gi->event_mask & GD_EVENT_MOVING && changed_position && + if (gi->event_mask & GD_EVENT_MOVING && (gadget_moving_inside || gi->event_mask & GD_EVENT_OFF_BORDERS)) - gi->callback_action(gi); + DoGadgetCallbackAction(gi, changed_position); } if (gadget_released_inside) @@ -1812,10 +2293,16 @@ boolean HandleGadgets(int mx, int my, int button) boolean deactivate_gadget = TRUE; boolean gadget_changed = TRUE; - if (gi->type & GD_TYPE_SELECTBOX) + if (gi->type == GD_TYPE_CHECK_BUTTON_2) + { + gi->checked = !gi->checked; + } + else if (gi->type & GD_TYPE_SELECTBOX) { - if (mouse_released_where_pressed || - !gadget_released_inside_select_area) /* selectbox stays open */ + if (keep_selectbox_open || + mouse_released_where_pressed || + !gadget_released_inside_select_area || + !CURRENT_OPTION_SELECTABLE(gi)) // selectbox stays open { deactivate_gadget = FALSE; gadget_changed = FALSE; @@ -1828,16 +2315,14 @@ boolean HandleGadgets(int mx, int my, int button) if (deactivate_gadget && !(gi->type & GD_TYPE_TEXT_INPUT || - gi->type & GD_TYPE_TEXT_AREA)) /* text input stays open */ + 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 ((gi->event_mask & GD_EVENT_RELEASED) && gadget_changed) - { - gi->callback_action(gi); - } + if ((gi->event_mask & GD_EVENT_RELEASED)) + DoGadgetCallbackAction(gi, gadget_changed); } if (gadget_released_off_borders) @@ -1845,6 +2330,7 @@ boolean HandleGadgets(int mx, int my, int button) if (gi->type & GD_TYPE_SCROLLBAR) DrawGadget(gi, DG_UNPRESSED, gi->direct_draw); + gi->state = GD_BUTTON_UNPRESSED; gi->event.type = GD_EVENT_RELEASED; if (gi->event_mask & GD_EVENT_RELEASED && @@ -1852,7 +2338,7 @@ boolean HandleGadgets(int mx, int my, int button) gi->callback_action(gi); } - /* handle gadgets unmapped/mapped between pressing and releasing */ + // handle gadgets unmapped/mapped between pressing and releasing if (release_event && !gadget_released && new_gi) new_gi->state = GD_BUTTON_UNPRESSED; @@ -1862,10 +2348,10 @@ boolean HandleGadgets(int mx, int my, int button) static void insertCharIntoTextArea(struct GadgetInfo *gi, char c) { - char text[MAX_GADGET_TEXTSIZE]; + char text[MAX_GADGET_TEXTSIZE + 1]; int cursor_position = gi->textarea.cursor_position; - if (strlen(gi->textarea.value) == MAX_GADGET_TEXTSIZE) /* no space left */ + if (strlen(gi->textarea.value) >= MAX_GADGET_TEXTSIZE) // no space left return; strcpy(text, gi->textarea.value); @@ -1879,24 +2365,63 @@ boolean HandleGadgetsKeyInput(Key key) { struct GadgetInfo *gi = last_gi; - if (gi == NULL || !gi->mapped || + if (gi == NULL || gi->deactivated || !gi->mapped || !(gi->type & GD_TYPE_TEXT_INPUT || gi->type & GD_TYPE_TEXT_AREA || gi->type & GD_TYPE_SELECTBOX)) return FALSE; - if (key == KSYM_Return) /* valid for both text input and selectbox */ + if (key == KSYM_Escape) { - boolean gadget_changed = (gi->event_mask & GD_EVENT_TEXT_RETURN); + if (anyTextGadgetActive()) + { + boolean gadget_changed = ((gi->event_mask & GD_EVENT_TEXT_LEAVING) != 0); + + // restore previous text (before activating text gadget) + if (gi->type & GD_TYPE_TEXT_INPUT) + { + strcpy(gi->textinput.value, gi->textinput.last_value); + + CheckRangeOfNumericInputGadget(gi); + } + + // store current text for text area gadgets when pressing "Escape" key + if (gi->type & GD_TYPE_TEXT_AREA) + { + if (!strEqual(gi->textarea.last_value, gi->textarea.value)) + strcpy(gi->textarea.last_value, gi->textarea.value); + else + gadget_changed = FALSE; + } + + DrawGadget(gi, DG_UNPRESSED, gi->direct_draw); + + if (gi->type & GD_TYPE_TEXT_AREA) + { + gi->event.type = GD_EVENT_TEXT_LEAVING; + + DoGadgetCallbackAction(gi, gadget_changed); + } + + last_gi = NULL; + + StopTextInput(); + } + } + else if (key == KSYM_Return) // valid for both text input and selectbox + { + boolean gadget_changed = ((gi->event_mask & GD_EVENT_TEXT_RETURN) != 0); if (gi->type & GD_TYPE_TEXT_INPUT) { CheckRangeOfNumericInputGadget(gi); - if (strcmp(gi->textinput.value, gi->textinput.last_value) != 0) + if (!strEqual(gi->textinput.last_value, gi->textinput.value)) strcpy(gi->textinput.last_value, gi->textinput.value); else gadget_changed = FALSE; + + StopTextInput(); } else if (gi->type & GD_TYPE_SELECTBOX) { @@ -1921,12 +2446,11 @@ boolean HandleGadgetsKeyInput(Key key) last_gi = NULL; } - if (gadget_changed) - gi->callback_action(gi); + DoGadgetCallbackAction(gi, gadget_changed); } - else if (gi->type & GD_TYPE_TEXT_INPUT) /* only valid for text input */ + else if (gi->type & GD_TYPE_TEXT_INPUT) // only valid for text input { - char text[MAX_GADGET_TEXTSIZE]; + char text[MAX_GADGET_TEXTSIZE + 1]; int text_length = strlen(gi->textinput.value); int cursor_pos = gi->textinput.cursor_position; char letter = getCharFromKey(key); @@ -1968,15 +2492,28 @@ boolean HandleGadgetsKeyInput(Key key) strcpy(text, gi->textinput.value); strcpy(&gi->textinput.value[cursor_pos], &text[cursor_pos + 1]); + DrawGadget(gi, DG_PRESSED, gi->direct_draw); + } + else if (key == KSYM_Home && cursor_pos > 0) + { + gi->textinput.cursor_position = 0; + + DrawGadget(gi, DG_PRESSED, gi->direct_draw); + } + else if (key == KSYM_End && cursor_pos < text_length) + { + gi->textinput.cursor_position = text_length; + DrawGadget(gi, DG_PRESSED, gi->direct_draw); } } - else if (gi->type & GD_TYPE_TEXT_AREA) /* only valid for text area */ + else if (gi->type & GD_TYPE_TEXT_AREA) // only valid for text area { - char text[MAX_GADGET_TEXTSIZE]; + char text[MAX_GADGET_TEXTSIZE + 1]; int text_length = strlen(gi->textarea.value); int area_ysize = gi->textarea.ysize; int cursor_x_pref = gi->textarea.cursor_x_preferred; + int cursor_x = gi->textarea.cursor_x; int cursor_y = gi->textarea.cursor_y; int cursor_pos = gi->textarea.cursor_position; char letter = getCharFromKey(key); @@ -2028,10 +2565,29 @@ boolean HandleGadgetsKeyInput(Key key) strcpy(text, gi->textarea.value); strcpy(&gi->textarea.value[cursor_pos], &text[cursor_pos + 1]); + DrawGadget(gi, DG_PRESSED, gi->direct_draw); + } + else if (key == KSYM_Home && cursor_x > 0) + { + setTextAreaCursorPosition(gi, gi->textarea.cursor_position - cursor_x); + + DrawGadget(gi, DG_PRESSED, gi->direct_draw); + } + else if (key == KSYM_End && cursor_pos < text_length) + { + int last_cursor_pos = cursor_pos; + + while (gi->textarea.value[cursor_pos] != '\0' && + gi->textarea.value[cursor_pos] != '\n') + cursor_pos++; + + setTextAreaCursorPosition(gi, gi->textarea.cursor_position + cursor_pos - + last_cursor_pos); + DrawGadget(gi, DG_PRESSED, gi->direct_draw); } } - else if (gi->type & GD_TYPE_SELECTBOX) /* only valid for selectbox */ + else if (gi->type & GD_TYPE_SELECTBOX) // only valid for selectbox { int index = gi->selectbox.current_index; int num_values = gi->selectbox.num_values; @@ -2052,3 +2608,43 @@ boolean HandleGadgetsKeyInput(Key key) return TRUE; } + +void DumpGadgetIdentifiers(void) +{ + struct GadgetInfo *gi; + + Print("Gadgets on current screen:\n"); + + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + { + if (gi->mapped && gi->image_id != -1) + { + char *token = getTokenFromImageID(gi->image_id); + char *prefix = "gfx."; + + if (strPrefix(token, prefix)) + token = &token[strlen(prefix)]; + + Print("- '%s'\n", token); + } + } + + Print("Done.\n"); +} + +boolean DoGadgetAction(int image_id) +{ + struct GadgetInfo *gi; + + for (gi = gadget_list_first_entry; gi != NULL; gi = gi->next) + { + if (gi->mapped && gi->image_id == image_id) + { + gi->callback_action(gi); + + return TRUE; + } + } + + return FALSE; +}