new_gadget->custom_id = va_arg(ap, int);
break;
- case GDI_DESCRIPTION_TEXT:
- new_gadget->description_text = va_arg(ap, char *);
+ 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:
break;
case GDI_NUMBER_VALUE:
- new_gadget->number_value = va_arg(ap, long);
+ 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_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;
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;
}
}
#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);
gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
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;
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)
{
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_action(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 =
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);
(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;
- if (new_gi)
+ /* modify event position values even if no gadget is pressed */
+ if (button == 0 && !release_event)
+ gi = new_gi;
+
+ if (gi)
{
- int last_x = new_gi->event.x;
- int last_y = new_gi->event.y;
+ int last_x = gi->event.x;
+ int last_y = gi->event.y;
- new_gi->event.x = mx - new_gi->x;
- new_gi->event.y = my - new_gi->y;
+ gi->event.x = mx - gi->x;
+ gi->event.y = my - gi->y;
- if (new_gi->type == GD_TYPE_DRAWING_AREA)
+ if (gi->type == GD_TYPE_DRAWING_AREA)
{
- new_gi->event.x /= new_gi->drawing.item_xsize;
- new_gi->event.y /= new_gi->drawing.item_ysize;
+ gi->event.x /= gi->drawing.item_xsize;
+ gi->event.y /= gi->drawing.item_ysize;
- if (last_x != new_gi->event.x || last_y != new_gi->event.y)
+ 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))
+ (new_gi && new_gi->type == GD_TYPE_DRAWING_AREA && changed_position))
{
last_info_gi = new_gi;
- if (new_gi != NULL)
+ 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);
}
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_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;
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)
projects / rocksndiamonds.git / blobdiff