return NULL;
}
-#if 1
-
static void setTextAreaCursorExt(struct GadgetInfo *gi, boolean set_cursor_pos)
{
char *text = gi->textarea.value;
pos++;
}
- if (y >= area_ysize)
- {
- x = area_xsize - 1;
- }
-
-#if 0
- printf("::: %d, %d [%d]\n", cursor_x, cursor_y, cursor_position);
-#endif
-
gi->textarea.cursor_x = x;
gi->textarea.cursor_y = y;
gi->textarea.cursor_x_preferred = x;
setTextAreaCursorExt(gi, FALSE);
}
-#else
-
-static void setTextAreaCursorPosition(struct GadgetInfo *gi, int x, int y)
-{
- char *text = gi->textarea.value;
- int area_xsize = gi->textarea.xsize;
- int area_ysize = gi->textarea.ysize;
- int cursor_x = 0;
- int cursor_y = 0;
- int cursor_position = 0;
-
- while (*text && cursor_y < area_ysize)
- {
- char buffer[MAX_OUTPUT_LINESIZE + 1];
- int i;
-
- for (i=0; i < area_xsize && *text && *text != '\n'; i++)
- buffer[i] = *text++;
- buffer[i] = '\0';
-
-#if 1
- if (i == 0 && *text == '\n')
- {
- text++;
- cursor_position++;
- }
-#endif
-
- if (x == -1 && y == -1) /* get x/y from cursor position */
- {
- if (cursor_position + i >= gi->textarea.cursor_position)
- {
-#if 0
- printf("::: cursor: %d + %d >= %d\n", cursor_position, i,
- gi->textarea.cursor_position);
-#endif
-
- cursor_x = gi->textarea.cursor_position - cursor_position;
- cursor_position = gi->textarea.cursor_position;
-
- break;
- }
- }
-
- if (cursor_y == y || !*text) /* correct y position found */
- {
- cursor_x = MIN(i, x);
- cursor_position += cursor_x;
-
- break;
- }
- else
- cursor_position += i;
-
-#if 0
- if (*text == '\n')
- {
- text++;
- cursor_position++;
-
- if (i == area_xsize)
- cursor_y++;
- }
-#endif
-
- cursor_y++;
- }
-
- if (cursor_x >= area_xsize)
- {
- cursor_x = 0;
- cursor_y++;
- }
-
- if (cursor_y >= area_ysize)
- {
- cursor_x = area_xsize - 1;
- cursor_y = area_ysize - 1;
- }
-
-#if 0
- printf("::: %d, %d [%d]\n", cursor_x, cursor_y, cursor_position);
-#endif
-
- gi->textarea.cursor_x = cursor_x;
- gi->textarea.cursor_y = cursor_y;
- gi->textarea.cursor_x_preferred = cursor_x;
- gi->textarea.cursor_position = cursor_position;
-}
-
-#endif
-
static void default_callback_info(void *ptr)
{
return;
cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
cursor_string[1] = '\0';
-#if 0
- if (pressed)
- printf("::: PRESSED!\n");
-#endif
-
/* draw cursor, if active */
if (pressed)
DrawTextExt(drawto,
/* gadget text value */
DrawTextToTextArea(gi->x + border_x, gi->y + border_y,
- gi->textarea.value, font_nr,
- gi->textarea.xsize, gi->textarea.ysize);
+ gi->textarea.value, font_nr, gi->textarea.xsize,
+ gi->textarea.xsize, gi->textarea.ysize,
+ BLIT_ON_BACKGROUND);
cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
cursor_string[1] = '\0';
-#if 0
- printf("::: '%s' [%d, %d] [%d] [%d -> '%s']\n",
- gi->textarea.value,
- gi->textarea.cursor_x, gi->textarea.cursor_y,
- gi->textarea.cursor_position,
- pressed, cursor_string);
-#endif
-
/* draw cursor, if active */
if (pressed)
DrawTextExt(drawto,
/* selectbox text values */
for (i=0; i < gi->selectbox.num_values; i++)
{
- int mask_mode;
+ 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)
{
gi->selectbox.width - 2 * border_x, font_height,
gi->selectbox.inverse_color);
- strncpy(text, gi->selectbox.options[i].text, gi->selectbox.size);
- text[1 + gi->selectbox.size] = '\0';
-
- mask_mode = BLIT_INVERSE;
- }
- else
- {
- strncpy(text, gi->selectbox.options[i].text, gi->selectbox.size);
+ /* prevent use of cursor graphic by drawing at least two chars */
+ strcat(text, " ");
text[gi->selectbox.size] = '\0';
- mask_mode = BLIT_MASKED;
+ mask_mode = BLIT_INVERSE;
}
DrawTextExt(drawto,
xpos, ypos);
/* middle part of gadget */
- for (i=0; i<num_steps; i++)
+ for (i=0; i < num_steps; i++)
BlitBitmapOnBackground(gd->bitmap, drawto,
gd->x, gd->y + gi->border.ysize,
gi->width, design_body,
xpos, ypos);
/* middle part of gadget */
- for (i=0; i<num_steps; i++)
+ for (i=0; i < num_steps; i++)
BlitBitmapOnBackground(gd->bitmap, drawto,
gd->x + gi->border.xsize, gd->y,
design_body, gi->height,
HandleGadgets(gi->x, gi->y, 0);
}
-void HandleGadgets(int mx, int my, int button)
+boolean HandleGadgets(int mx, int my, int button)
{
static struct GadgetInfo *last_info_gi = NULL;
static unsigned long pressed_delay = 0;
/* check if there are any gadgets defined */
if (gadget_list_first_entry == NULL)
- return;
+ return FALSE;
/* simulated release of mouse button over last gadget */
if (mx == -1 && my == -1 && button == 0)
last_mx = mx;
last_my = my;
-#if 1
-
-#if 1
-
/* if mouse button pressed outside text or selectbox gadget, deactivate it */
if (anyTextGadgetActive() &&
button != 0 && !motion_status && new_gi != last_gi)
last_gi = NULL;
}
-#else
-
- /* special treatment for leaving text and number input gadgets */
- if (anyTextInputGadgetActive() &&
- button != 0 && !motion_status && new_gi != last_gi)
- {
- /* if mouse button pressed outside text input gadget, deactivate it */
- CheckRangeOfNumericInputGadget(last_gi);
- DrawGadget(last_gi, DG_UNPRESSED, last_gi->direct_draw);
-
- last_gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (last_gi->event_mask & GD_EVENT_TEXT_LEAVING)
- last_gi->callback_action(last_gi);
-
- last_gi = NULL;
- }
-
- /* special treatment for leaving text area gadgets */
- if (anyTextAreaGadgetActive() &&
- button != 0 && !motion_status && new_gi != last_gi)
- {
- /* if mouse button pressed outside text input gadget, deactivate it */
- DrawGadget(last_gi, DG_UNPRESSED, last_gi->direct_draw);
-
- last_gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (last_gi->event_mask & GD_EVENT_TEXT_LEAVING)
- last_gi->callback_action(last_gi);
-
- last_gi = NULL;
- }
-
- /* special treatment for leaving selectbox gadgets */
- if (anySelectboxGadgetActive() &&
- button != 0 && !motion_status && new_gi != last_gi)
- {
- /* if mouse button pressed outside selectbox gadget, deactivate it */
- DrawGadget(last_gi, DG_UNPRESSED, last_gi->direct_draw);
-
- last_gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (last_gi->event_mask & GD_EVENT_TEXT_LEAVING)
- last_gi->callback_action(last_gi);
-
- last_gi = NULL;
- }
-
-#endif
-
-#else
-
- /* special treatment for text and number input gadgets */
- if (anyTextInputGadgetActive() && button != 0 && !motion_status)
- {
- struct GadgetInfo *gi = last_gi;
-
- if (new_gi == last_gi)
- {
- int old_cursor_position = gi->textinput.cursor_position;
-
- /* if mouse button pressed inside activated text gadget, set cursor */
- gi->textinput.cursor_position =
- (mx - gi->x - gi->border.xsize) / getFontWidth(gi->font);
-
- if (gi->textinput.cursor_position < 0)
- gi->textinput.cursor_position = 0;
- else if (gi->textinput.cursor_position > strlen(gi->textinput.value))
- gi->textinput.cursor_position = strlen(gi->textinput.value);
-
- if (gi->textinput.cursor_position != old_cursor_position)
- DrawGadget(gi, DG_PRESSED, gi->direct_draw);
- }
- else
- {
- /* if mouse button pressed outside text input gadget, deactivate it */
- CheckRangeOfNumericInputGadget(gi);
- DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
-
- gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
- gi->callback_action(gi);
-
- last_gi = NULL;
- }
- }
-
- /* special treatment for text area gadgets */
- if (anyTextAreaGadgetActive() && button != 0 && !motion_status)
- {
- struct GadgetInfo *gi = last_gi;
-
- if (new_gi == last_gi)
- {
- 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);
-
- 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);
-
- setTextAreaCursorXY(gi, x, y);
-
-#if 0
- printf("::: %d -----> %d\n",
- old_cursor_position,
- gi->textarea.cursor_position);
-#endif
-
- if (gi->textarea.cursor_position != old_cursor_position)
- DrawGadget(gi, DG_PRESSED, gi->direct_draw);
- }
- else
- {
- /* if mouse button pressed outside text input gadget, deactivate it */
- DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
-
- gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
- gi->callback_action(gi);
-
- last_gi = NULL;
- }
- }
-
- /* 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.ysize) / getFontHeight(gi->font);
-
- 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, gi->direct_draw);
- }
- else
- {
- /* if mouse button pressed outside selectbox gadget, deactivate it */
- DrawGadget(gi, DG_UNPRESSED, gi->direct_draw);
-
- gi->event.type = GD_EVENT_TEXT_LEAVING;
-
- if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
- gi->callback_action(gi);
-
- last_gi = NULL;
- }
- }
-
-#endif
-
gadget_pressed =
(button != 0 && last_gi == NULL && new_gi != NULL && press_event);
gadget_pressed_repeated =
{
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;
/* don't handle this scrollbar anymore while mouse button pressed */
last_gi = NULL;
- return;
+ return TRUE;
}
}
- /* !!! bad for TEXT_INPUT ... !!! */
DrawGadget(gi, DG_PRESSED, gi->direct_draw);
gi->state = GD_BUTTON_PRESSED;
gi->callback_action(gi);
}
-#if 0
- if (!mouse_moving)
- printf("::: PRESSED...?\n");
-#endif
-
if (gadget_pressed_repeated)
{
gi->event.type = GD_EVENT_PRESSED;
/* handle gadgets unmapped/mapped between pressing and releasing */
if (release_event && !gadget_released && new_gi)
new_gi->state = GD_BUTTON_UNPRESSED;
+
+ return (gadget_pressed || gadget_pressed_repeated ||
+ gadget_released || gadget_moving);
}
static void insertCharIntoTextArea(struct GadgetInfo *gi, char c)
if (strlen(gi->textarea.value) == MAX_GADGET_TEXTSIZE) /* no space left */
return;
-#if 0
- printf("::: '%s' + '%c'", gi->textarea.value, c);
-#endif
-
strcpy(text, gi->textarea.value);
strcpy(&gi->textarea.value[cursor_position + 1], &text[cursor_position]);
gi->textarea.value[cursor_position] = c;
-#if 0
- printf(" => '%s'\n", gi->textarea.value);
-#endif
-
setTextAreaCursorPosition(gi, gi->textarea.cursor_position + 1);
}
-void HandleGadgetsKeyInput(Key key)
+boolean HandleGadgetsKeyInput(Key key)
{
struct GadgetInfo *gi = last_gi;
!(gi->type & GD_TYPE_TEXT_INPUT ||
gi->type & GD_TYPE_TEXT_AREA ||
gi->type & GD_TYPE_SELECTBOX))
- return;
+ return FALSE;
if (key == KSYM_Return) /* valid for both text input and selectbox */
{
char letter = getCharFromKey(key);
boolean legal_letter = (letter != 0);
-#if 0
- printf("::: KEY: %x!\n", key);
-#endif
-
if (legal_letter)
{
insertCharIntoTextArea(gi, letter);
DrawGadget(gi, DG_PRESSED, gi->direct_draw);
}
}
+
+ return TRUE;
}
projects / rocksndiamonds.git / blobdiff