X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=3c626c90fff3b3b8b33e23c31a6623a2d63eed9d;hb=a098627819ee709e24a49088e7a374cacf80cc92;hp=a8d3e55c35460abe482e076e4e165a2a5915b7a4;hpb=587ba60f59f857c634198d4b815cf9bb1edbb0f0;p=rocksndiamonds.git diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index a8d3e55c..3c626c90 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -38,6 +38,8 @@ 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; @@ -50,6 +52,30 @@ void InitGadgetsSoundCallback(void (*activating_function)(void), 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) { struct GadgetInfo *gi = gadget_list_first_entry; @@ -238,6 +264,7 @@ 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, @@ -362,70 +389,76 @@ 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; // 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++) + 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 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++) + 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 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++) + 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 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 - DrawTextBuffer(gi->x + border_x, gi->y + border_y, gi->textarea.value, - font_nr, gi->textarea.xsize, -1, gi->textarea.ysize, 0, - BLIT_ON_BACKGROUND, FALSE, FALSE, FALSE); + 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 : ' '); @@ -434,8 +467,8 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) // 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); } @@ -828,6 +861,7 @@ static void DrawGadget_OverlayTouchButton(struct GadgetInfo *gi) { 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); @@ -1260,7 +1294,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; @@ -1629,8 +1663,7 @@ void ClickOnGadget(struct GadgetInfo *gi, int button) boolean HandleGadgets(int mx, int my, int button) { - static unsigned int pressed_delay = 0; - static unsigned int pressed_delay_value = GADGET_FRAME_DELAY; + 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; @@ -1756,7 +1789,7 @@ boolean HandleGadgets(int mx, int my, int button) (button != 0 && last_gi != NULL && new_gi == last_gi); gadget_pressed_delay_reached = - DelayReached(&pressed_delay, pressed_delay_value); + DelayReached(&pressed_delay); gadget_released = (release_event && last_gi != NULL); gadget_released_inside = (gadget_released && new_gi == last_gi); @@ -1937,12 +1970,12 @@ boolean HandleGadgets(int mx, int my, int button) ResetDelayCounter(&pressed_delay); // start gadget delay with longer delay after first click on gadget - pressed_delay_value = GADGET_FRAME_DELAY_FIRST; + pressed_delay.value = GADGET_FRAME_DELAY_FIRST; } else // gadget hold pressed for some time { // after first repeated gadget click, continue with shorter delay value - pressed_delay_value = GADGET_FRAME_DELAY; + pressed_delay.value = GADGET_FRAME_DELAY; } if (gi->type & GD_TYPE_SCROLLBAR && !gadget_dragging) @@ -2159,7 +2192,11 @@ 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 (keep_selectbox_open || mouse_released_where_pressed || @@ -2354,6 +2391,18 @@ 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); } } @@ -2363,6 +2412,7 @@ boolean HandleGadgetsKeyInput(Key key) 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); @@ -2414,6 +2464,25 @@ 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); } }