X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=a55f38d9cbb62706ed6a9fb437f1db19da97796d;hb=f941ccddee3065d7531298e37ad4dcfcd892c1f8;hp=bdac86700da292ff60ac2c0e7c3bb515d572cd74;hpb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;p=rocksndiamonds.git diff --git a/src/buttons.c b/src/buttons.c index bdac8670..a55f38d9 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -132,8 +132,11 @@ /* some positions in the game control window */ #define GAME_BUTTON_STOP_XPOS (GAME_CONTROL_XPOS + 0 * GAME_BUTTON_XSIZE) +#define GAME_BUTTON_STOP_YPOS (GAME_CONTROL_YPOS) #define GAME_BUTTON_PAUSE_XPOS (GAME_CONTROL_XPOS + 1 * GAME_BUTTON_XSIZE) +#define GAME_BUTTON_PAUSE_YPOS (GAME_CONTROL_YPOS) #define GAME_BUTTON_PLAY_XPOS (GAME_CONTROL_XPOS + 2 * GAME_BUTTON_XSIZE) +#define GAME_BUTTON_PLAY_YPOS (GAME_CONTROL_YPOS) #define GAME_BUTTON_ANY_YPOS (GAME_CONTROL_YPOS) #define ON_GAME_BUTTON(x,y) ((x)>=(DX+GAME_CONTROL_XPOS) && \ @@ -340,6 +343,146 @@ /********** drawing buttons and corresponding displays **********/ /****************************************************************/ +void OLD_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; + + XCopyArea(display,pix[PIX_DOOR],drawto,gc, + 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) + XCopyArea(display,pix[PIX_DOOR],drawto,gc, + 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) + XCopyArea(display,pix[PIX_DOOR],drawto,gc, + 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; + + XCopyArea(display,pix[PIX_DOOR],drawto,gc, + 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; + + XCopyArea(display,pix[PIX_DOOR],drawto,gc, + 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 DrawVideoDisplay(unsigned long state, unsigned long value) { int i; @@ -1515,33 +1658,7 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) if (gi->mapped && mx >= gi->x && mx < gi->x + gi->width && my >= gi->y && my < gi->y + gi->height) - { - -#if 0 - if (gi->type & GD_TYPE_SCROLLBAR) - { - int mpos, gpos; - - if (gi->type == GD_TYPE_SCROLLBAR_HORIZONTAL) - { - mpos = mx; - gpos = gi->x; - } - else - { - mpos = my; - gpos = gi->y; - } - - if (mpos >= gpos + gi->scrollbar.position && - mpos < gpos + gi->scrollbar.position + gi->scrollbar.size) - break; - } - else -#endif - break; - } gi = gi->next; } @@ -1549,7 +1666,13 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my) return gi; } -static void default_callback_function(void *ptr) +static void default_callback_info(void *ptr) +{ + if (game_status == LEVELED) + HandleEditorGadgetInfoText(ptr); +} + +static void default_callback_action(void *ptr) { return; } @@ -1564,8 +1687,9 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) /* always start with reliable default values */ memset(new_gadget, 0, sizeof(struct GadgetInfo)); /* zero all fields */ - new_gadget->id = getNewGadgetID(); /* new gadget id */ - new_gadget->callback = default_callback_function; /* dummy function */ + new_gadget->id = getNewGadgetID(); + new_gadget->callback_info = default_callback_info; + new_gadget->callback_action = default_callback_action; while (tag != GDI_END) { @@ -1575,6 +1699,15 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) new_gadget->custom_id = va_arg(ap, int); break; + case GDI_INFO_TEXT: + { + int max_textsize = MAX_INFO_TEXTSIZE; + + strncpy(new_gadget->info_text, va_arg(ap, char *), max_textsize); + new_gadget->info_text[max_textsize] = '\0'; + } + break; + case GDI_X: new_gadget->x = va_arg(ap, int); break; @@ -1599,27 +1732,48 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) new_gadget->state = va_arg(ap, unsigned long); break; + case GDI_CHECKED: + new_gadget->checked = va_arg(ap, boolean); + break; + case GDI_RADIO_NR: new_gadget->radio_nr = va_arg(ap, unsigned long); break; - case GDI_RADIO_PRESSED: - new_gadget->radio_pressed = va_arg(ap, boolean); + case GDI_NUMBER_VALUE: + new_gadget->text.number_value = va_arg(ap, long); + sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value); + new_gadget->text.cursor_position = strlen(new_gadget->text.value); break; - case GDI_NUMBER_VALUE: - new_gadget->number_value = va_arg(ap, long); + case GDI_NUMBER_MIN: + new_gadget->text.number_min = va_arg(ap, long); + if (new_gadget->text.number_value < new_gadget->text.number_min) + { + new_gadget->text.number_value = new_gadget->text.number_min; + sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value); + } + break; + + case GDI_NUMBER_MAX: + new_gadget->text.number_max = va_arg(ap, long); + if (new_gadget->text.number_value > new_gadget->text.number_max) + { + new_gadget->text.number_value = new_gadget->text.number_max; + sprintf(new_gadget->text.value, "%d", new_gadget->text.number_value); + } break; case GDI_TEXT_VALUE: { int max_textsize = MAX_GADGET_TEXTSIZE; - if (new_gadget->text_size) - max_textsize = MIN(new_gadget->text_size, MAX_GADGET_TEXTSIZE - 1); + if (new_gadget->text.size) + max_textsize = MIN(new_gadget->text.size, MAX_GADGET_TEXTSIZE - 1); - strncpy(new_gadget->text_value, va_arg(ap, char *), max_textsize); - new_gadget->text_value[max_textsize] = '\0'; + strncpy(new_gadget->text.value, va_arg(ap, char *), max_textsize); + new_gadget->text.value[max_textsize] = '\0'; + new_gadget->text.cursor_position = strlen(new_gadget->text.value); } break; @@ -1628,12 +1782,12 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) int tag_value = va_arg(ap, int); int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE - 1); - new_gadget->text_size = max_textsize; - new_gadget->text_value[max_textsize] = '\0'; + new_gadget->text.size = max_textsize; + new_gadget->text.value[max_textsize] = '\0'; if (new_gadget->width == 0 && new_gadget->height == 0) { - new_gadget->width = (new_gadget->text_size + 1) * FONT2_XSIZE + 6; + new_gadget->width = (new_gadget->text.size + 1) * FONT2_XSIZE + 6; new_gadget->height = ED_WIN_COUNT_YSIZE; } } @@ -1667,6 +1821,27 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) new_gadget->design_border = va_arg(ap, int); break; + case GDI_DECORATION_DESIGN: + new_gadget->deco.design.pixmap = va_arg(ap, Pixmap); + new_gadget->deco.design.x = va_arg(ap, int); + new_gadget->deco.design.y = va_arg(ap, int); + break; + + case GDI_DECORATION_POSITION: + new_gadget->deco.x = va_arg(ap, int); + new_gadget->deco.y = va_arg(ap, int); + break; + + case GDI_DECORATION_SIZE: + new_gadget->deco.width = va_arg(ap, int); + new_gadget->deco.height = va_arg(ap, int); + break; + + case GDI_DECORATION_SHIFTING: + new_gadget->deco.xshift = va_arg(ap, int); + new_gadget->deco.yshift = va_arg(ap, int); + break; + case GDI_EVENT_MASK: new_gadget->event_mask = va_arg(ap, unsigned long); break; @@ -1737,8 +1912,12 @@ struct GadgetInfo *CreateGadget(int first_tag, ...) new_gadget->scrollbar.item_position = va_arg(ap, int); break; - case GDI_CALLBACK: - new_gadget->callback = va_arg(ap, gadget_callback_function); + case GDI_CALLBACK_INFO: + new_gadget->callback_info = va_arg(ap, gadget_function); + break; + + case GDI_CALLBACK_ACTION: + new_gadget->callback_action = va_arg(ap, gadget_function); break; default: @@ -1807,54 +1986,87 @@ void FreeGadget(struct GadgetInfo *gi) #define DG_BUFFERED 0 #define DG_DIRECT 1 +static void CheckRangeOfNumericInputGadget(struct GadgetInfo *gi) +{ + if (gi->type != GD_TYPE_TEXTINPUT_NUMERIC) + return; + + gi->text.number_value = atoi(gi->text.value); + + if (gi->text.number_value < gi->text.number_min) + gi->text.number_value = gi->text.number_min; + if (gi->text.number_value > gi->text.number_max) + gi->text.number_value = gi->text.number_max; + + sprintf(gi->text.value, "%d", gi->text.number_value); + + if (gi->text.cursor_position < 0) + gi->text.cursor_position = 0; + else if (gi->text.cursor_position > strlen(gi->text.value)) + gi->text.cursor_position = strlen(gi->text.value); +} + static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct) { int state = (pressed ? 1 : 0); - struct GadgetDesign *gd = (gi->radio_pressed ? + struct GadgetDesign *gd = (gi->checked ? &gi->alt_design[state] : &gi->design[state]); switch (gi->type) { case GD_TYPE_NORMAL_BUTTON: + case GD_TYPE_CHECK_BUTTON: case GD_TYPE_RADIO_BUTTON: XCopyArea(display, gd->pixmap, drawto, gc, gd->x, gd->y, gi->width, gi->height, gi->x, gi->y); + if (gi->deco.design.pixmap) + XCopyArea(display, gi->deco.design.pixmap, drawto, gc, + 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)); break; - case GD_TYPE_TEXTINPUT: + case GD_TYPE_TEXTINPUT_ALPHANUMERIC: + case GD_TYPE_TEXTINPUT_NUMERIC: { int i; + char cursor_letter; + char cursor_string[3]; + char text[MAX_GADGET_TEXTSIZE + 1]; + int font_color = FC_YELLOW; + int border = gi->design_border; + strcpy(text, gi->text.value); + strcat(text, " "); /* left part of gadget */ XCopyArea(display, gd->pixmap, drawto, gc, - gd->x, gd->y, - gi->design_border, gi->height, - gi->x, gi->y); + gd->x, gd->y, border, gi->height, gi->x, gi->y); /* middle part of gadget */ - for (i=0; i<=gi->text_size; i++) + for (i=0; i<=gi->text.size; i++) XCopyArea(display, gd->pixmap, drawto, gc, - gd->x + gi->design_border, gd->y, - FONT2_XSIZE, gi->height, - gi->x + gi->design_border + i * FONT2_XSIZE, gi->y); + gd->x + border, gd->y, FONT2_XSIZE, gi->height, + gi->x + border + i * FONT2_XSIZE, gi->y); /* right part of gadget */ XCopyArea(display, gd->pixmap, drawto, gc, - gd->x + ED_WIN_COUNT_XSIZE - gi->design_border, gd->y, - gi->design_border, gi->height, - gi->x + gi->width - gi->design_border, gi->y); + gd->x + ED_WIN_COUNT_XSIZE - border, gd->y, + border, gi->height, gi->x + gi->width - border, gi->y); /* gadget text value */ - DrawText(gi->x + gi->design_border, gi->y + gi->design_border, - gi->text_value, FS_SMALL, (pressed ? FC_GREEN : FC_YELLOW)); + DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_color); + + cursor_letter = gi->text.value[gi->text.cursor_position]; + cursor_string[0] = '~'; + cursor_string[1] = (cursor_letter != '\0' ? cursor_letter : ' '); + cursor_string[2] = '\0'; /* draw cursor, if active */ - DrawText(gi->x + gi->design_border + - strlen(gi->text_value) * FONT2_XSIZE, - gi->y + gi->design_border, - (pressed ? "<" : " "), - FS_SMALL, FC_RED); + if (pressed) + DrawText(gi->x + border + gi->text.cursor_position * FONT2_XSIZE, + gi->y + border, cursor_string, FS_SMALL, font_color); } break; @@ -1985,37 +2197,70 @@ void AdjustScrollbar(struct GadgetInfo *gi, int items_max, int item_pos) if (gs->item_position == gs->items_max - gs->items_visible) gs->position = gs->position_max; - printf("gs->item_position == %d\n", gs->item_position); + if (gi->mapped) + DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); +} + +void ModifyTextInputTextValue(struct GadgetInfo *gi, char *new_text) +{ + struct GadgetTextInput *text = &gi->text; + int max_textsize = MAX_GADGET_TEXTSIZE; + + if (text->size) + max_textsize = MIN(text->size, MAX_GADGET_TEXTSIZE - 1); + + strncpy(text->value, new_text, max_textsize); + text->value[max_textsize] = '\0'; + text->cursor_position = strlen(text->value); if (gi->mapped) DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); } +void ModifyTextInputNumberValue(struct GadgetInfo *gi, int new_value) +{ + struct GadgetTextInput *text = &gi->text; + + text->number_value = (new_value < text->number_min ? text->number_min : + new_value > text->number_max ? text->number_max : + new_value); + + sprintf(text->value, "%d", text->number_value); + + if (gi->mapped) + DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); +} + +/* global pointer to gadget actually in use (when mouse button pressed) */ +static struct GadgetInfo *last_gi = NULL; + void MapGadget(struct GadgetInfo *gi) { - if (gi == NULL) + if (gi == NULL || gi->mapped) return; gi->mapped = TRUE; - DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), DG_BUFFERED); + DrawGadget(gi, DG_UNPRESSED, DG_BUFFERED); } void UnmapGadget(struct GadgetInfo *gi) { - if (gi == NULL) + if (gi == NULL || !gi->mapped) return; gi->mapped = FALSE; -} -static struct GadgetInfo *last_gi = NULL; + if (gi == last_gi) + last_gi = NULL; +} void HandleGadgets(int mx, int my, int button) { + static struct GadgetInfo *last_info_gi = NULL; static unsigned long pressed_delay = 0; - static last_button = 0; - static last_mx = 0, last_my = 0; + static int last_button = 0; + static int last_mx = 0, last_my = 0; int scrollbar_mouse_pos; struct GadgetInfo *new_gi, *gi; boolean press_event; @@ -2029,6 +2274,7 @@ void HandleGadgets(int mx, int my, int button) boolean gadget_released; boolean gadget_released_inside; boolean gadget_released_off_borders; + boolean changed_position = FALSE; /* check if there are any gadgets defined */ if (gadget_list_first_entry == NULL) @@ -2047,18 +2293,35 @@ void HandleGadgets(int mx, int my, int button) last_mx = mx; last_my = my; - /* if mouse button pressed outside text input gadget, deactivate it */ - if (last_gi && last_gi->type == GD_TYPE_TEXTINPUT && - button != 0 && new_gi != last_gi && !motion_status) + /* special treatment for text and number input gadgets */ + if (last_gi && last_gi->type & GD_TYPE_TEXTINPUT && last_gi->mapped && + button != 0 && !motion_status) { struct GadgetInfo *gi = last_gi; - DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); + if (new_gi == last_gi) + { + /* if mouse button pressed inside activated text gadget, set cursor */ + gi->text.cursor_position = (mx - gi->x) / FONT2_XSIZE; - if (gi->event_mask & GD_EVENT_TEXT_LEAVING) - gi->callback(gi); + 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); - last_gi = NULL; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else + { + /* if mouse button pressed outside text input gadget, deactivate it */ + CheckRangeOfNumericInputGadget(gi); + DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); + + if (gi->event_mask & GD_EVENT_TEXT_LEAVING) + gi->callback_action(gi); + + last_gi = NULL; + } } gadget_pressed = @@ -2066,7 +2329,7 @@ void HandleGadgets(int mx, int my, int button) gadget_pressed_repeated = (button != 0 && last_gi != NULL && new_gi == last_gi); - gadget_released = (button == 0 && last_gi != NULL); + 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); @@ -2087,11 +2350,18 @@ 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) + if (button == 0 && last_gi && !(last_gi->type & GD_TYPE_TEXTINPUT)) last_gi = NULL; + /* modify event position values even if no gadget is pressed */ + if (button == 0 && !release_event) + gi = new_gi; + if (gi) { + int last_x = gi->event.x; + int last_y = gi->event.y; + gi->event.x = mx - gi->x; gi->event.y = my - gi->y; @@ -2099,12 +2369,34 @@ void HandleGadgets(int mx, int my, int button) { 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) + changed_position = TRUE; + } + } + + /* handle gadget popup info text */ + 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->callback_info(new_gi); } + else + default_callback_info(NULL); } if (gadget_pressed) { - if (gi->type == GD_TYPE_RADIO_BUTTON) + 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; @@ -2115,14 +2407,14 @@ void HandleGadgets(int mx, int my, int button) rgi->radio_nr == gi->radio_nr && rgi != gi) { - rgi->radio_pressed = FALSE; + rgi->checked = FALSE; DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT); } rgi = rgi->next; } - gi->radio_pressed = TRUE; + gi->checked = TRUE; } else if (gi->type & GD_TYPE_SCROLLBAR) { @@ -2152,7 +2444,8 @@ void HandleGadgets(int mx, int my, int button) struct GadgetScrollbar *gs = &gi->scrollbar; int old_item_position = gs->item_position; - boolean changed_position = FALSE; + + changed_position = FALSE; gs->item_position += gs->items_visible * (mpos < gpos + gi->scrollbar.position ? -1 : +1); @@ -2166,8 +2459,6 @@ void HandleGadgets(int mx, int my, int button) { gi->event.item_position = gs->item_position; changed_position = TRUE; - - printf("gs->item_position == %d\n", gs->item_position); } AdjustScrollbar(gi, gs->items_max, gs->item_position); @@ -2177,7 +2468,7 @@ void HandleGadgets(int mx, int my, int button) gi->event.off_borders = FALSE; if (gi->event_mask & GD_EVENT_MOVING && changed_position) - gi->callback(gi); + gi->callback_action(gi); /* don't handle this scrollbar anymore while mouse button pressed */ last_gi = NULL; @@ -2194,24 +2485,21 @@ void HandleGadgets(int mx, int my, int button) gi->event.off_borders = FALSE; /* initialize delay counter */ - pressed_delay = 0; - DelayReached(&pressed_delay, GADGET_FRAME_DELAY); + DelayReached(&pressed_delay, 0); if (gi->event_mask & GD_EVENT_PRESSED) - gi->callback(gi); + gi->callback_action(gi); } if (gadget_pressed_repeated) { if (gi->event_mask & GD_EVENT_REPEATED && DelayReached(&pressed_delay, GADGET_FRAME_DELAY)) - gi->callback(gi); + gi->callback_action(gi); } if (gadget_moving) { - boolean changed_position = FALSE; - if (gi->type & GD_TYPE_BUTTON) { if (gadget_moving_inside && gi->state == GD_BUTTON_UNPRESSED) @@ -2238,8 +2526,6 @@ void HandleGadgets(int mx, int my, int button) { gi->event.item_position = gs->item_position; changed_position = TRUE; - - printf("gs->item_position == %d\n", gs->item_position); } DrawGadget(gi, DG_PRESSED, DG_DIRECT); @@ -2252,19 +2538,19 @@ void HandleGadgets(int mx, int my, int button) if (gi->event_mask & GD_EVENT_MOVING && changed_position && (gadget_moving_inside || gi->event_mask & GD_EVENT_OFF_BORDERS)) - gi->callback(gi); + gi->callback_action(gi); } if (gadget_released_inside) { - if (gi->type != GD_TYPE_TEXTINPUT) + if (!(gi->type & GD_TYPE_TEXTINPUT)) DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); gi->state = GD_BUTTON_UNPRESSED; gi->event.type = GD_EVENT_RELEASED; if (gi->event_mask & GD_EVENT_RELEASED) - gi->callback(gi); + gi->callback_action(gi); } if (gadget_released_off_borders) @@ -2276,39 +2562,67 @@ void HandleGadgets(int mx, int my, int button) if (gi->event_mask & GD_EVENT_RELEASED && gi->event_mask & GD_EVENT_OFF_BORDERS) - gi->callback(gi); + gi->callback_action(gi); } } void HandleGadgetsKeyInput(KeySym 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) + if (gi == NULL || !(gi->type & GD_TYPE_TEXTINPUT) || !gi->mapped) return; - text_length = strlen(gi->text_value); + text_length = strlen(gi->text.value); + cursor_pos = gi->text.cursor_position; letter = getCharFromKeySym(key); + legal_letter = (gi->type == GD_TYPE_TEXTINPUT_NUMERIC ? + letter >= '0' && letter <= '9' : + letter != 0); - if (letter && text_length < gi->text_size) + 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 == XK_Left && cursor_pos > 0) + { + gi->text.cursor_position--; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else if (key == XK_Right && cursor_pos < text_length) + { + gi->text.cursor_position++; + DrawGadget(gi, DG_PRESSED, DG_DIRECT); + } + else if (key == XK_BackSpace && cursor_pos > 0) { - gi->text_value[text_length] = letter; - gi->text_value[text_length + 1] = '\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 == XK_Delete || key == XK_BackSpace) && text_length > 0) + else if (key == XK_Delete && cursor_pos < text_length) { - gi->text_value[text_length - 1] = '\0'; + strcpy(text, gi->text.value); + strcpy(&gi->text.value[cursor_pos], &text[cursor_pos + 1]); DrawGadget(gi, DG_PRESSED, DG_DIRECT); } else if (key == XK_Return) { + CheckRangeOfNumericInputGadget(gi); DrawGadget(gi, DG_UNPRESSED, DG_DIRECT); if (gi->event_mask & GD_EVENT_TEXT_RETURN) - gi->callback(gi); + gi->callback_action(gi); last_gi = NULL; }