projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20091202-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
gadgets.c
diff --git
a/src/libgame/gadgets.c
b/src/libgame/gadgets.c
index afe4c81026630cef7c9a22a57e6bd69f60783958..3d593a9b1f12ba6ee05346c898bcb6775ddf29ee 100644
(file)
--- a/
src/libgame/gadgets.c
+++ b/
src/libgame/gadgets.c
@@
-381,10
+381,16
@@
static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
gi->height - 2 * border_y);
/* gadget text value */
gi->height - 2 * border_y);
/* gadget text value */
+#if 1
+ DrawTextBuffer(gi->x + border_x, gi->y + border_y, gi->textarea.value,
+ font_nr, gi->textarea.xsize, -1, gi->textarea.ysize,
+ BLIT_ON_BACKGROUND, FALSE, FALSE, FALSE);
+#else
DrawTextToTextArea(gi->x + border_x, gi->y + border_y,
gi->textarea.value, font_nr, gi->textarea.xsize,
gi->textarea.xsize, gi->textarea.ysize,
BLIT_ON_BACKGROUND);
DrawTextToTextArea(gi->x + border_x, gi->y + border_y,
gi->textarea.value, font_nr, gi->textarea.xsize,
gi->textarea.xsize, gi->textarea.ysize,
BLIT_ON_BACKGROUND);
+#endif
cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
@@
-742,7
+748,7
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
case GDI_INFO_TEXT:
{
case GDI_INFO_TEXT:
{
- int max_textsize = MAX_INFO_TEXTSIZE
- 1
;
+ int max_textsize = MAX_INFO_TEXTSIZE;
char *text = va_arg(ap, char *);
if (text != NULL)
char *text = va_arg(ap, char *);
if (text != NULL)
@@
-826,7
+832,7
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
int max_textsize = MAX_GADGET_TEXTSIZE;
if (gi->textinput.size)
int max_textsize = MAX_GADGET_TEXTSIZE;
if (gi->textinput.size)
- max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE
- 1
);
+ max_textsize = MIN(gi->textinput.size, MAX_GADGET_TEXTSIZE);
strncpy(gi->textinput.value, va_arg(ap, char *), max_textsize);
strcpy(gi->textinput.last_value, gi->textinput.value);
strncpy(gi->textinput.value, va_arg(ap, char *), max_textsize);
strcpy(gi->textinput.last_value, gi->textinput.value);
@@
-844,7
+850,7
@@
static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
case GDI_TEXT_SIZE:
{
int tag_value = va_arg(ap, int);
case GDI_TEXT_SIZE:
{
int tag_value = va_arg(ap, int);
- int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE
- 1
);
+ int max_textsize = MIN(tag_value, MAX_GADGET_TEXTSIZE);
gi->textinput.size = max_textsize;
gi->textinput.value[max_textsize] = '\0';
gi->textinput.size = max_textsize;
gi->textinput.value[max_textsize] = '\0';
@@
-1992,10
+1998,10
@@
boolean HandleGadgets(int mx, int my, int button)
static void insertCharIntoTextArea(struct GadgetInfo *gi, char c)
{
static void insertCharIntoTextArea(struct GadgetInfo *gi, char c)
{
- char text[MAX_GADGET_TEXTSIZE];
+ char text[MAX_GADGET_TEXTSIZE
+ 1
];
int cursor_position = gi->textarea.cursor_position;
int cursor_position = gi->textarea.cursor_position;
- if (strlen(gi->textarea.value)
=
= MAX_GADGET_TEXTSIZE) /* no space left */
+ if (strlen(gi->textarea.value)
>
= MAX_GADGET_TEXTSIZE) /* no space left */
return;
strcpy(text, gi->textarea.value);
return;
strcpy(text, gi->textarea.value);
@@
-2056,7
+2062,7
@@
boolean HandleGadgetsKeyInput(Key key)
}
else if (gi->type & GD_TYPE_TEXT_INPUT) /* only valid for text input */
{
}
else if (gi->type & GD_TYPE_TEXT_INPUT) /* only valid for text input */
{
- char text[MAX_GADGET_TEXTSIZE];
+ char text[MAX_GADGET_TEXTSIZE
+ 1
];
int text_length = strlen(gi->textinput.value);
int cursor_pos = gi->textinput.cursor_position;
char letter = getCharFromKey(key);
int text_length = strlen(gi->textinput.value);
int cursor_pos = gi->textinput.cursor_position;
char letter = getCharFromKey(key);
@@
-2103,7
+2109,7
@@
boolean HandleGadgetsKeyInput(Key key)
}
else if (gi->type & GD_TYPE_TEXT_AREA) /* only valid for text area */
{
}
else if (gi->type & GD_TYPE_TEXT_AREA) /* only valid for text area */
{
- char text[MAX_GADGET_TEXTSIZE];
+ char text[MAX_GADGET_TEXTSIZE
+ 1
];
int text_length = strlen(gi->textarea.value);
int area_ysize = gi->textarea.ysize;
int cursor_x_pref = gi->textarea.cursor_x_preferred;
int text_length = strlen(gi->textarea.value);
int area_ysize = gi->textarea.ysize;
int cursor_x_pref = gi->textarea.cursor_x_preferred;