X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=3d593a9b1f12ba6ee05346c898bcb6775ddf29ee;hb=ba702cd338586991ab20176cf5587afbb4d77af7;hp=7c140cbedffbaf8d7cb742cd6cc5f3e741327b7c;hpb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index 7c140cbe..3d593a9b 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -32,6 +32,17 @@ static struct GadgetInfo *last_info_gi = NULL;
 static int next_free_gadget_id = 1;
 static boolean gadget_id_wrapped = FALSE;
 
+static void (*PlayGadgetSoundActivating)(void) = NULL;
+static void (*PlayGadgetSoundSelecting)(void) = NULL;
+
+
+void InitGadgetsSoundCallback(void (*activating_function)(void),
+			      void (*selecting_function)(void))
+{
+  PlayGadgetSoundActivating = activating_function;
+  PlayGadgetSoundSelecting = selecting_function;
+}
+
 static struct GadgetInfo *getGadgetInfoFromGadgetID(int id)
 {
   struct GadgetInfo *gi = gadget_list_first_entry;
@@ -370,10 +381,16 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 				   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);
+#endif
 
 	cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
 	cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
@@ -731,7 +748,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 
       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)
@@ -815,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)
-	    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);
@@ -833,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);
-	  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';
@@ -1783,6 +1800,8 @@ boolean HandleGadgets(int mx, int my, int button)
 
   if (gadget_pressed)
   {
+    PlayGadgetSoundActivating();
+
     if (gi->type == GD_TYPE_CHECK_BUTTON)
     {
       gi->checked = !gi->checked;
@@ -1979,10 +1998,10 @@ boolean HandleGadgets(int mx, int my, int button)
 
 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;
 
-  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);
@@ -2043,7 +2062,7 @@ boolean HandleGadgetsKeyInput(Key key)
   }
   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);
@@ -2090,7 +2109,7 @@ boolean HandleGadgetsKeyInput(Key key)
   }
   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;