X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=45744a8c99f01d14c2c5059ea590371cc650e57f;hb=6ed4958820f8f97174ca47594dcc6f00ee31b2cb;hp=9827fc80a12fe09e2b541589eefd16900759501a;hpb=222cd4187e6632bd904a937f167a2f1c70b8f66d;p=rocksndiamonds.git diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c index 9827fc80..45744a8c 100644 --- a/src/libgame/gadgets.c +++ b/src/libgame/gadgets.c @@ -1,264 +1,22 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1994-2002 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* gadgets.c * +* gadgets.c * ***********************************************************/ #include - -#include "libgame.h" - -#include "main_TMP.h" +#include #include "gadgets.h" - -/* some positions in the video tape control window */ -#define VIDEO_DATE_LABEL_XPOS (VIDEO_DISPLAY1_XPOS) -#define VIDEO_DATE_LABEL_YPOS (VIDEO_DISPLAY1_YPOS) -#define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE) -#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS + 1) -#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS + 14) -#define VIDEO_DATE_XSIZE (VIDEO_DISPLAY_XSIZE) -#define VIDEO_DATE_YSIZE 16 -#define VIDEO_REC_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_REC_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_LABEL_XSIZE 20 -#define VIDEO_REC_LABEL_YSIZE 12 -#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 20) -#define VIDEO_REC_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_REC_SYMBOL_XSIZE 16 -#define VIDEO_REC_SYMBOL_YSIZE 16 -#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS + 65) -#define VIDEO_PLAY_LABEL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_LABEL_XSIZE 22 -#define VIDEO_PLAY_LABEL_YSIZE 12 -#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52) -#define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PLAY_SYMBOL_XSIZE 11 -#define VIDEO_PLAY_SYMBOL_YSIZE 13 -#define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS) -#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20) -#define VIDEO_PAUSE_LABEL_XSIZE 35 -#define VIDEO_PAUSE_LABEL_YSIZE 8 -#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 35) -#define VIDEO_PAUSE_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS) -#define VIDEO_PAUSE_SYMBOL_XSIZE 17 -#define VIDEO_PAUSE_SYMBOL_YSIZE 13 -#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS + 38) -#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS + 14) -#define VIDEO_TIME_XSIZE 50 -#define VIDEO_TIME_YSIZE 16 - -/* special */ -#define VIDEO_PBEND_LABEL_XPOS 6 -#define VIDEO_PBEND_LABEL_YPOS 220 -#define VIDEO_PBEND_LABEL_XSIZE 35 -#define VIDEO_PBEND_LABEL_YSIZE 30 - -#define VIDEO_STATE_OFF (VIDEO_STATE_PLAY_OFF | \ - VIDEO_STATE_REC_OFF | \ - VIDEO_STATE_PAUSE_OFF | \ - VIDEO_STATE_FFWD_OFF | \ - VIDEO_STATE_PBEND_OFF | \ - VIDEO_STATE_DATE_OFF | \ - VIDEO_STATE_TIME_OFF) -#define VIDEO_PRESS_OFF (VIDEO_PRESS_PLAY_OFF | \ - VIDEO_PRESS_REC_OFF | \ - VIDEO_PRESS_PAUSE_OFF | \ - VIDEO_PRESS_STOP_OFF | \ - VIDEO_PRESS_EJECT_OFF) -#define VIDEO_ALL_OFF (VIDEO_STATE_OFF | VIDEO_PRESS_OFF) - -#define VIDEO_STATE_ON (VIDEO_STATE_PLAY_ON | \ - VIDEO_STATE_REC_ON | \ - VIDEO_STATE_PAUSE_ON | \ - VIDEO_STATE_FFWD_ON | \ - VIDEO_STATE_PBEND_ON | \ - VIDEO_STATE_DATE_ON | \ - VIDEO_STATE_TIME_ON) -#define VIDEO_PRESS_ON (VIDEO_PRESS_PLAY_ON | \ - VIDEO_PRESS_REC_ON | \ - VIDEO_PRESS_PAUSE_ON | \ - VIDEO_PRESS_STOP_ON | \ - VIDEO_PRESS_EJECT_ON) -#define VIDEO_ALL_ON (VIDEO_STATE_ON | VIDEO_PRESS_ON) - -#define VIDEO_STATE (VIDEO_STATE_ON | VIDEO_STATE_OFF) -#define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF) -#define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF) - - -void DrawVideoDisplay(unsigned long state, unsigned long value) -{ - int i; - int part_label = 0, part_symbol = 1; - int xpos = 0, ypos = 1, xsize = 2, ysize = 3; - static char *monatsname[12] = - { - "JAN", "FEB", "MAR", "APR", "MAY", "JUN", - "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" - }; - static int video_pos[5][2][4] = - { - {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS, - VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE }, - { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }}, - - {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS, - VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE }, - { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS, - VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }}, - - {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS, - VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE }, - { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS, - VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }}, - - {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS, - VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE }, - { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS, - VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }}, - - {{ 0,0, - 0,0 }, - { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS, - VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }} - }; - - if (state & VIDEO_STATE_PBEND_OFF) - { - int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2; - - BlitBitmap(pix[PIX_DOOR], drawto, - cx + VIDEO_REC_LABEL_XPOS, - cy + VIDEO_REC_LABEL_YPOS, - VIDEO_PBEND_LABEL_XSIZE, - VIDEO_PBEND_LABEL_YSIZE, - VX + VIDEO_REC_LABEL_XPOS, - VY + VIDEO_REC_LABEL_YPOS); - } - - for(i=0;i<10;i++) - { - if (state & (1< STATE_ON / PRESS_OFF */ - cx = DOOR_GFX_PAGEX4; - else - cx = DOOR_GFX_PAGEX3; /* i gerade => STATE_OFF / PRESS_ON */ - - if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY) - BlitBitmap(pix[PIX_DOOR], drawto, - cx + video_pos[pos][part_label][xpos], - cy + video_pos[pos][part_label][ypos], - video_pos[pos][part_label][xsize], - video_pos[pos][part_label][ysize], - VX + video_pos[pos][part_label][xpos], - VY + video_pos[pos][part_label][ypos]); - if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY) - BlitBitmap(pix[PIX_DOOR], drawto, - cx + video_pos[pos][part_symbol][xpos], - cy + video_pos[pos][part_symbol][ypos], - video_pos[pos][part_symbol][xsize], - video_pos[pos][part_symbol][ysize], - VX + video_pos[pos][part_symbol][xpos], - VY + video_pos[pos][part_symbol][ypos]); - } - } - - if (state & VIDEO_STATE_FFWD_ON) - { - int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2; - - BlitBitmap(pix[PIX_DOOR], drawto, - cx + VIDEO_PLAY_SYMBOL_XPOS, - cy + VIDEO_PLAY_SYMBOL_YPOS, - VIDEO_PLAY_SYMBOL_XSIZE - 2, - VIDEO_PLAY_SYMBOL_YSIZE, - VX + VIDEO_PLAY_SYMBOL_XPOS - 9, - VY + VIDEO_PLAY_SYMBOL_YPOS); - } - - if (state & VIDEO_STATE_PBEND_ON) - { - int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1; - - BlitBitmap(pix[PIX_DOOR], drawto, - cx + VIDEO_PBEND_LABEL_XPOS, - cy + VIDEO_PBEND_LABEL_YPOS, - VIDEO_PBEND_LABEL_XSIZE, - VIDEO_PBEND_LABEL_YSIZE, - VX + VIDEO_REC_LABEL_XPOS, - VY + VIDEO_REC_LABEL_YPOS); - } - - if (state & VIDEO_STATE_DATE_ON) - { - int tag = value % 100; - int monat = (value/100) % 100; - int jahr = (value/10000); - - DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS, - int2str(tag,2),FS_SMALL,FC_SPECIAL1); - DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS, - monatsname[monat],FS_SMALL,FC_SPECIAL1); - DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS, - int2str(jahr,2),FS_SMALL,FC_SPECIAL1); - } - - if (state & VIDEO_STATE_TIME_ON) - { - int min = value / 60; - int sec = value % 60; - - DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS, - int2str(min,2),FS_SMALL,FC_SPECIAL1); - DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS, - int2str(sec,2),FS_SMALL,FC_SPECIAL1); - } - - if (state & VIDEO_STATE_DATE) - redraw_mask |= REDRAW_VIDEO_1; - if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE) - redraw_mask |= REDRAW_VIDEO_2; - if (state & VIDEO_PRESS) - redraw_mask |= REDRAW_VIDEO_3; -} - -void DrawCompleteVideoDisplay() -{ - BlitBitmap(pix[PIX_DOOR], drawto, - DOOR_GFX_PAGEX3,DOOR_GFX_PAGEY2, VXSIZE,VYSIZE, VX,VY); - BlitBitmap(pix[PIX_DOOR], drawto, - DOOR_GFX_PAGEX4+VIDEO_CONTROL_XPOS, - DOOR_GFX_PAGEY2+VIDEO_CONTROL_YPOS, - VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE, - VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS); - - DrawVideoDisplay(VIDEO_ALL_OFF,0); - if (tape.date && tape.length) - { - DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date); - DrawVideoDisplay(VIDEO_STATE_TIME_ON,tape.length_seconds); - } - - BlitBitmap(drawto, pix[PIX_DB_DOOR], - VX,VY, VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2); -} - - -/* NEW GADGET STUFF -------------------------------------------------------- */ +#include "text.h" +#include "misc.h" /* values for DrawGadget() */ @@ -305,6 +63,21 @@ static int getNewGadgetID() return id; } +#if 0 +void DUMP_GADGET_MAP_STATE() +{ + struct GadgetInfo *gi = gadget_list_first_entry; + + while (gi) + { + printf("-XXX-1-> '%s': %s\n", + gi->info_text, (gi->mapped ? "mapped" : "not mapped")); + + gi = gi->next; + } +} +#endif + static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) { struct GadgetInfo *gi = gadget_list_first_entry; @@ -312,9 +85,12 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) while (gi) { if (gi->mapped && - mx >= gi->x && mx < gi->x + gi->width && - my >= gi->y && my < gi->y + gi->height) - break; + ((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; gi = gi->next; } @@ -324,11 +100,6 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) static void default_callback_info(void *ptr) { -#if 0 - if (game_status == LEVELED) - HandleEditorGadgetInfoText(ptr); -#endif - return; } @@ -343,14 +114,16 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) struct GadgetDesign *gd = (gi->checked ? &gi->alt_design[state] : &gi->design[state]); + boolean redraw_selectbox = FALSE; switch (gi->type) { case GD_TYPE_NORMAL_BUTTON: case GD_TYPE_CHECK_BUTTON: case GD_TYPE_RADIO_BUTTON: - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y, gi->width, gi->height, gi->x, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y, gi->width, gi->height, + gi->x, gi->y); if (gi->deco.design.bitmap) BlitBitmap(gi->deco.design.bitmap, drawto, gi->deco.design.x, gi->deco.design.y, @@ -367,28 +140,32 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) char cursor_string[3]; char text[MAX_GADGET_TEXTSIZE + 1]; int font_type = gi->text.font_type; - int font_width = getFontWidth(FS_SMALL, font_type); + int font_width = getFontWidth(font_type); int border = gi->border.size; - strcpy(text, gi->text.value); - strcat(text, " "); /* left part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y, border, gi->height, gi->x, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y, border, gi->height, gi->x, gi->y); /* middle part of gadget */ - for (i=0; i<=gi->text.size; i++) - BlitBitmap(gd->bitmap, drawto, - gd->x + border, gd->y, font_width, gi->height, - gi->x + border + i * font_width, gi->y); + for (i=0; i < gi->text.size + 1; i++) + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + border, gd->y, font_width, gi->height, + gi->x + border + i * font_width, gi->y); /* right part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x + gi->border.width - border, gd->y, - border, gi->height, gi->x + gi->width - border, gi->y); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + gi->border.width - border, gd->y,border, + gi->height, gi->x + gi->width - border, gi->y); + + /* set text value */ + strcpy(text, gi->text.value); + strcat(text, " "); /* gadget text value */ - DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_type); + DrawTextExt(drawto, + gi->x + border, gi->y + border, text, + font_type, FONT_MASKED); cursor_letter = gi->text.value[gi->text.cursor_position]; cursor_string[0] = '~'; @@ -397,8 +174,195 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) /* draw cursor, if active */ if (pressed) - DrawText(gi->x + border + gi->text.cursor_position * font_width, - gi->y + border, cursor_string, FS_SMALL, font_type); + DrawTextExt(drawto, + gi->x + border + gi->text.cursor_position * font_width, + gi->y + border, cursor_string, + font_type, FONT_MASKED); + } + break; + + case GD_TYPE_SELECTBOX: + { + int i; + char text[MAX_GADGET_TEXTSIZE + 1]; + int font_type = gi->selectbox.font_type; + int font_width = getFontWidth(font_type); + int 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 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); + + /* middle part of gadget */ + for (i=0; i < gi->selectbox.size; i++) + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + border, gd->y, font_width, gi->height, + gi->x + border + i * font_width, gi->y); + + /* button part of gadget */ + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + border + width_inner, gd->y, + button, gi->height, + gi->x + gi->width - border - button, gi->y); + + /* right part of gadget */ + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + gi->border.width - border, gd->y,border, + gi->height, gi->x + gi->width - border, gi->y); + + /* set text value */ + strncpy(text, gi->selectbox.values[gi->selectbox.index], + gi->selectbox.size); + text[gi->selectbox.size] = '\0'; + + /* gadget text value */ + DrawTextExt(drawto, gi->x + border, gi->y + border, text, + font_type, FONT_MASKED); + + if (pressed) + { + if (!gi->selectbox.open) + { + gi->selectbox.open = TRUE; + gi->selectbox.stay_open = FALSE; + gi->selectbox.current_index = gi->selectbox.index; + + /* 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 */ + + /* top left part of gadget border */ + BlitBitmapOnBackground(gd->bitmap, drawto, gd->x, gd->y, + border, border, + 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, + 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, + 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, + 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, + gi->selectbox.x, + gi->selectbox.y + border + 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); + } + + /* bottom left part of gadget border */ + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y + gi->height - border, + border, border, + gi->selectbox.x, + gi->selectbox.y + box_height - border); + + /* 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); + + /* 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); + + /* 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); + + ClearRectangleOnBackground(drawto, + gi->selectbox.x + border, + gi->selectbox.y + border, + gi->selectbox.width - 2 * border, + gi->selectbox.height - 2 * border); + + /* selectbox text values */ + for (i=0; i < gi->selectbox.num_values; i++) + { + if (i == gi->selectbox.current_index) + { + DrawRectangle(drawto, + gi->selectbox.x + border, + gi->selectbox.y + border + i * font_height, + gi->selectbox.width - 2 * border, font_height, + gi->selectbox.reverse_color); + + text[0] = '~'; + strncpy(&text[1], gi->selectbox.values[i], gi->selectbox.size); + text[1 + gi->selectbox.size] = '\0'; + } + else + { + strncpy(text, gi->selectbox.values[i], gi->selectbox.size); + text[gi->selectbox.size] = '\0'; + } + + DrawTextExt(drawto, + gi->selectbox.x + border, + gi->selectbox.y + border + i * font_height, text, + font_type, FONT_MASKED); + } + + redraw_selectbox = TRUE; + } + else if (gi->selectbox.open) + { + gi->selectbox.open = FALSE; + + /* redraw closed selectbox */ + DrawGadget(gi, FALSE, FALSE); + + /* 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_selectbox = TRUE; + } } break; @@ -415,33 +379,37 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int step_size_remain = size_body - num_steps * design_body; /* clear scrollbar area */ - ClearRectangle(backbuffer, gi->x, gi->y, gi->width, gi->height); + ClearRectangleOnBackground(backbuffer, gi->x, gi->y, + gi->width, gi->height); /* upper part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y, - gi->width, gi->border.size, - xpos, ypos); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y, + gi->width, gi->border.size, + xpos, ypos); /* middle part of gadget */ for (i=0; ibitmap, drawto, - gd->x, gd->y + gi->border.size, - gi->width, design_body, - xpos, ypos + gi->border.size + i * design_body); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y + gi->border.size, + gi->width, design_body, + xpos, + ypos + gi->border.size + i * design_body); /* remaining middle part of gadget */ if (step_size_remain > 0) - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y + gi->border.size, - gi->width, step_size_remain, - xpos, ypos + gi->border.size + num_steps * design_body); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y + gi->border.size, + gi->width, step_size_remain, + xpos, + ypos + gi->border.size + + num_steps * design_body); /* lower part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y + design_full - gi->border.size, - gi->width, gi->border.size, - xpos, ypos + size_full - gi->border.size); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y + design_full - gi->border.size, + gi->width, gi->border.size, + xpos, ypos + size_full - gi->border.size); } break; @@ -458,33 +426,37 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) int step_size_remain = size_body - num_steps * design_body; /* clear scrollbar area */ - ClearRectangle(backbuffer, gi->x, gi->y, gi->width, gi->height); + ClearRectangleOnBackground(backbuffer, gi->x, gi->y, + gi->width, gi->height); /* left part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x, gd->y, - gi->border.size, gi->height, - xpos, ypos); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x, gd->y, + gi->border.size, gi->height, + xpos, ypos); /* middle part of gadget */ for (i=0; ibitmap, drawto, - gd->x + gi->border.size, gd->y, - design_body, gi->height, - xpos + gi->border.size + i * design_body, ypos); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + gi->border.size, gd->y, + design_body, gi->height, + xpos + gi->border.size + i * design_body, + ypos); /* remaining middle part of gadget */ if (step_size_remain > 0) - BlitBitmap(gd->bitmap, drawto, - gd->x + gi->border.size, gd->y, - step_size_remain, gi->height, - xpos + gi->border.size + num_steps * design_body, ypos); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + gi->border.size, gd->y, + step_size_remain, gi->height, + xpos + gi->border.size + + num_steps * design_body, + ypos); /* right part of gadget */ - BlitBitmap(gd->bitmap, drawto, - gd->x + design_full - gi->border.size, gd->y, - gi->border.size, gi->height, - xpos + size_full - gi->border.size, ypos); + BlitBitmapOnBackground(gd->bitmap, drawto, + gd->x + design_full - gi->border.size, gd->y, + gi->border.size, gi->height, + xpos + size_full - gi->border.size, ypos); } break; @@ -493,12 +465,20 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) } if (direct) + { BlitBitmap(drawto, window, gi->x, gi->y, gi->width, gi->height, gi->x, gi->y); + + if (gi->type == GD_TYPE_SELECTBOX && redraw_selectbox) + BlitBitmap(drawto, window, + gi->selectbox.x, gi->selectbox.y, + gi->selectbox.width, gi->selectbox.height, + gi->selectbox.x, gi->selectbox.y); + } else - redraw_mask |= (gi->x < SX + SXSIZE ? REDRAW_FIELD : - gi->y < DY + DYSIZE ? REDRAW_DOOR_1 : - gi->y > VY ? REDRAW_DOOR_2 : REDRAW_DOOR_3); + 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); } static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) @@ -520,8 +500,13 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) case GDI_INFO_TEXT: { int max_textsize = MAX_INFO_TEXTSIZE - 1; + char *text = va_arg(ap, char *); + + if (text != NULL) + strncpy(gi->info_text, text, max_textsize); + else + max_textsize = 0; - strncpy(gi->info_text, va_arg(ap, char *), max_textsize); gi->info_text[max_textsize] = '\0'; } break; @@ -551,7 +536,9 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) break; case GDI_CHECKED: - gi->checked = va_arg(ap, boolean); + /* take care here: "boolean" is typedef'ed as "unsigned char", + which gets promoted to "int" */ + gi->checked = (boolean)va_arg(ap, int); break; case GDI_RADIO_NR: @@ -602,33 +589,47 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->text.size = max_textsize; gi->text.value[max_textsize] = '\0'; + + /* same tag also used for selectbox definition */ + gi->selectbox.size = gi->text.size; } break; case GDI_TEXT_FONT: gi->text.font_type = va_arg(ap, int); + + /* same tag also used for selectbox definition */ + gi->selectbox.font_type = gi->text.font_type; + break; + + case GDI_SELECTBOX_VALUES: + gi->selectbox.values = va_arg(ap, const char **); + break; + + case GDI_SELECTBOX_INDEX: + gi->selectbox.index = va_arg(ap, int); break; case GDI_DESIGN_UNPRESSED: - gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap); + gi->design[GD_BUTTON_UNPRESSED].bitmap = va_arg(ap, Bitmap *); gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int); gi->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int); break; case GDI_DESIGN_PRESSED: - gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap); + gi->design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *); gi->design[GD_BUTTON_PRESSED].x = va_arg(ap, int); gi->design[GD_BUTTON_PRESSED].y = va_arg(ap, int); break; case GDI_ALT_DESIGN_UNPRESSED: - gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap); + gi->alt_design[GD_BUTTON_UNPRESSED].bitmap= va_arg(ap, Bitmap *); gi->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int); gi->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int); break; case GDI_ALT_DESIGN_PRESSED: - gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap); + gi->alt_design[GD_BUTTON_PRESSED].bitmap = va_arg(ap, Bitmap *); gi->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int); gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int); break; @@ -637,12 +638,16 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) gi->border.size = va_arg(ap, int); break; + case GDI_BORDER_SIZE_SELECTBUTTON: + gi->border.size_selectbutton = va_arg(ap, int); + break; + case GDI_TEXTINPUT_DESIGN_WIDTH: gi->border.width = va_arg(ap, int); break; case GDI_DECORATION_DESIGN: - gi->deco.design.bitmap = va_arg(ap, Bitmap); + gi->deco.design.bitmap = va_arg(ap, Bitmap *); gi->deco.design.x = va_arg(ap, int); gi->deco.design.y = va_arg(ap, int); break; @@ -731,7 +736,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) tag = va_arg(ap, int); /* read next tag */ } - /* check if gadget complete */ + /* check if gadget is complete */ if (gi->type != GD_TYPE_DRAWING_AREA && (!gi->design[GD_BUTTON_UNPRESSED].bitmap || !gi->design[GD_BUTTON_PRESSED].bitmap)) @@ -741,11 +746,54 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap) if (gi->type & GD_TYPE_TEXTINPUT) { - int font_width = getFontWidth(FS_SMALL, gi->text.font_type); - int font_height = getFontHeight(FS_SMALL, gi->text.font_type); + int font_width = getFontWidth(gi->text.font_type); + int font_height = getFontHeight(gi->text.font_type); + int border_size = gi->border.size; - gi->width = 2 * gi->border.size + (gi->text.size + 1) * font_width; - gi->height = 2 * gi->border.size + font_height; + gi->width = 2 * border_size + (gi->text.size + 1) * font_width; + gi->height = 2 * border_size + 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_width = getFontWidth(gi->selectbox.font_type); + int font_height = getFontHeight(gi->selectbox.font_type); + int border_size = gi->border.size; + int button_size = gi->border.size_selectbutton; + int src_x, src_y; + + gi->width = 2 * border_size + gi->text.size * font_width + button_size; + gi->height = 2 * border_size + font_height; + + if (gi->selectbox.values == NULL) + Error(ERR_EXIT, "selectbox gadget incomplete (missing values array)"); + + gi->selectbox.num_values = 0; + while (gi->selectbox.values[gi->selectbox.num_values] != 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; + + 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) + 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.reverse_color = GetPixel(font->bitmap, src_x, src_y); + + /* always start with closed selectbox */ + gi->selectbox.open = FALSE; } if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC) @@ -801,14 +849,14 @@ void RedrawGadget(struct GadgetInfo *gi) struct GadgetInfo *CreateGadget(int first_tag, ...) { - struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo)); + struct GadgetInfo *new_gadget = checked_calloc(sizeof(struct GadgetInfo)); va_list ap; /* always start with reliable default values */ - memset(new_gadget, 0, sizeof(struct GadgetInfo)); /* zero all fields */ new_gadget->id = getNewGadgetID(); new_gadget->callback_info = default_callback_info; new_gadget->callback_action = default_callback_action; + new_gadget->next = NULL; va_start(ap, first_tag); HandleGadgetTags(new_gadget, first_tag, ap); @@ -830,7 +878,7 @@ void FreeGadget(struct GadgetInfo *gi) { struct GadgetInfo *gi_previous = gadget_list_first_entry; - while (gi_previous && gi_previous->next != gi) + while (gi_previous != NULL && gi_previous->next != gi) gi_previous = gi_previous->next; if (gi == gadget_list_first_entry) @@ -839,7 +887,9 @@ void FreeGadget(struct GadgetInfo *gi) if (gi == gadget_list_last_entry) gadget_list_last_entry = gi_previous; - gi_previous->next = gi->next; + if (gi_previous != NULL) + gi_previous->next = gi->next; + free(gi); } @@ -912,9 +962,12 @@ static void MultiMapGadgets(int mode) while (gi) { - if ((mode & MULTIMAP_PLAYFIELD && gi->x < SX + SXSIZE) || - (mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y < DY + DYSIZE) || - (mode & MULTIMAP_DOOR_2 && gi->x >= DX && gi->y > DY + DYSIZE) || + 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) || (mode & MULTIMAP_ALL) == MULTIMAP_ALL) { if (mode & MULTIMAP_UNMAP) @@ -943,9 +996,19 @@ void RemapAllGadgets() MultiMapGadgets(MULTIMAP_ALL | MULTIMAP_REMAP); } +boolean anyTextInputGadgetActive() +{ + return (last_gi && (last_gi->type & GD_TYPE_TEXTINPUT) && last_gi->mapped); +} + +boolean anySelectboxGadgetActive() +{ + return (last_gi && (last_gi->type & GD_TYPE_SELECTBOX) && last_gi->mapped); +} + boolean anyTextGadgetActive() { - return (last_gi && last_gi->type & GD_TYPE_TEXTINPUT && last_gi->mapped); + return (anyTextInputGadgetActive() || anySelectboxGadgetActive()); } void ClickOnGadget(struct GadgetInfo *gi, int button) @@ -979,6 +1042,8 @@ void HandleGadgets(int mx, int my, int button) boolean gadget_moving_off_borders; 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; @@ -1000,23 +1065,25 @@ void HandleGadgets(int mx, int my, int button) last_my = my; /* special treatment for text and number input gadgets */ - if (anyTextGadgetActive() && button != 0 && !motion_status) + if (anyTextInputGadgetActive() && button != 0 && !motion_status) { 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(FS_SMALL, gi->text.font_type); + (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); - DrawGadget(gi, DG_PRESSED, DG_DIRECT); + if (gi->text.cursor_position != old_cursor_position) + DrawGadget(gi, DG_PRESSED, DG_DIRECT); } else { @@ -1033,6 +1100,43 @@ void HandleGadgets(int mx, int my, int button) } } + /* 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; + } + } + gadget_pressed = (button != 0 && last_gi == NULL && new_gi != NULL && press_event); gadget_pressed_repeated = @@ -1046,6 +1150,24 @@ void 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 */ + if (gadget_released_inside && (last_gi->type & GD_TYPE_SELECTBOX)) + { + struct GadgetInfo *gi = last_gi; + + gadget_released_inside_select_line = + (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); + } + else + { + gadget_released_inside_select_line = FALSE; + gadget_released_inside_select_area = FALSE; + } + /* if new gadget pressed, store this gadget */ if (gadget_pressed) last_gi = new_gi; @@ -1059,8 +1181,15 @@ void HandleGadgets(int mx, int my, int button) (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL ? mx - gi->x : my - gi->y); /* if mouse button released, no gadget needs to be handled anymore */ - if (button == 0 && last_gi && !(last_gi->type & GD_TYPE_TEXTINPUT)) - last_gi = NULL; + if (gadget_released) + { + if ((last_gi->type & GD_TYPE_SELECTBOX) && + (gadget_released_inside_select_line || + gadget_released_off_borders)) /* selectbox stays open */ + gi->selectbox.stay_open = TRUE; + else if (!(last_gi->type & GD_TYPE_TEXTINPUT)) /* text input stays open */ + last_gi = NULL; + } /* modify event position values even if no gadget is pressed */ if (button == 0 && !release_event) @@ -1088,15 +1217,27 @@ void HandleGadgets(int mx, int my, int button) if (last_info_gi != new_gi || (new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position)) { - last_info_gi = new_gi; - if (new_gi != NULL && (button == 0 || new_gi == last_gi)) { - new_gi->event.type = 0; + new_gi->event.type = GD_EVENT_INFO_ENTERING; new_gi->callback_info(new_gi); } - else + else if (last_info_gi != NULL) + { + 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; } if (gadget_pressed) @@ -1219,8 +1360,25 @@ void HandleGadgets(int mx, int my, int button) else if (gadget_moving_off_borders && gi->state == GD_BUTTON_PRESSED) DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); } + else if (gi->type & GD_TYPE_SELECTBOX) + { + int old_index = gi->selectbox.current_index; - if (gi->type & GD_TYPE_SCROLLBAR) + /* 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); + + 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 (gi->type & GD_TYPE_SCROLLBAR) { struct GadgetScrollbar *gs = &gi->scrollbar; int old_item_position = gs->item_position; @@ -1261,13 +1419,25 @@ void HandleGadgets(int mx, int my, int button) if (gadget_released_inside) { - if (!(gi->type & GD_TYPE_TEXTINPUT)) + boolean deactivate_gadget = TRUE; + + if (gi->type & GD_TYPE_SELECTBOX) + { + if (gadget_released_inside_select_line || + gadget_released_off_borders) /* selectbox stays open */ + deactivate_gadget = FALSE; + else + gi->selectbox.index = gi->selectbox.current_index; + } + + if (deactivate_gadget && + !(gi->type & GD_TYPE_TEXTINPUT)) /* text input stays open */ DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); gi->state = GD_BUTTON_UNPRESSED; gi->event.type = GD_EVENT_RELEASED; - if (gi->event_mask & GD_EVENT_RELEASED) + if ((gi->event_mask & GD_EVENT_RELEASED) && deactivate_gadget) gi->callback_action(gi); } @@ -1287,56 +1457,18 @@ void HandleGadgets(int mx, int my, int button) void HandleGadgetsKeyInput(Key key) { struct GadgetInfo *gi = last_gi; - char text[MAX_GADGET_TEXTSIZE]; - int text_length; - int cursor_pos; - char letter; - boolean legal_letter; - if (gi == NULL || !(gi->type & GD_TYPE_TEXTINPUT) || !gi->mapped) + if (gi == NULL || !gi->mapped || + !((gi->type & GD_TYPE_TEXTINPUT) || (gi->type & GD_TYPE_SELECTBOX))) return; - text_length = strlen(gi->text.value); - cursor_pos = gi->text.cursor_position; - letter = getCharFromKey(key); - legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ? - letter >= '0' && letter <= '9' : - letter != 0); - - if (legal_letter && text_length < gi->text.size) + if (key == KSYM_Return) /* valid for both text input and selectbox */ { - 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++; - DrawGadget(gi, DG_PRESSED, DG_DIRECT); - } - else if (key == KSYM_Left && cursor_pos > 0) - { - gi->text.cursor_position--; - DrawGadget(gi, DG_PRESSED, DG_DIRECT); - } - else if (key == KSYM_Right && cursor_pos < text_length) - { - gi->text.cursor_position++; - DrawGadget(gi, DG_PRESSED, DG_DIRECT); - } - 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); - } - 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); - } - else if (key == KSYM_Return) - { - CheckRangeOfNumericInputGadget(gi); + if (gi->type & GD_TYPE_TEXTINPUT) + CheckRangeOfNumericInputGadget(gi); + else if (gi->type & GD_TYPE_SELECTBOX) + gi->selectbox.index = gi->selectbox.current_index; + DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); gi->event.type = GD_EVENT_TEXT_RETURN; @@ -1346,4 +1478,63 @@ void HandleGadgetsKeyInput(Key key) last_gi = NULL; } + else if (gi->type & GD_TYPE_TEXTINPUT) /* only valid for text input */ + { + char text[MAX_GADGET_TEXTSIZE]; + int text_length = strlen(gi->text.value); + int cursor_pos = gi->text.cursor_position; + char letter = getCharFromKey(key); + boolean legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ? + letter >= '0' && letter <= '9' : + letter != 0); + + if (legal_letter && text_length < gi->text.size) + { + 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++; + + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else if (key == KSYM_Left && cursor_pos > 0) + { + gi->text.cursor_position--; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else if (key == KSYM_Right && cursor_pos < text_length) + { + gi->text.cursor_position++; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + 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); + } + 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); + } + } + else if (gi->type & GD_TYPE_SELECTBOX) /* only valid for selectbox */ + { + int index = gi->selectbox.current_index; + int num_values = gi->selectbox.num_values; + + if (key == KSYM_Up && index > 0) + { + gi->selectbox.current_index--; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else if (key == KSYM_Down && index < num_values - 1) + { + gi->selectbox.current_index++; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + } }