X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.c;h=e788b754366263ee773818a0f8362cba0880f7a2;hb=e5804efb99033c96d71c37ce89f60e1ee23b7004;hp=c961021a3e2a56e855ed93d9096f270a5823ba63;hpb=f0a36d142c51c8936afa8f9e7bbcf10946c8170a;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.c b/src/libgame/gadgets.c
index c961021a..e788b754 100644
--- a/src/libgame/gadgets.c
+++ b/src/libgame/gadgets.c
@@ -423,9 +423,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 				   gi->height - 2 * border_y);
 
 	// gadget text value
-	DrawTextBuffer(gi->x + border_x, gi->y + border_y, gi->textarea.value,
-		       font_nr, gi->textarea.xsize, -1, gi->textarea.ysize, 0,
-		       BLIT_ON_BACKGROUND, FALSE, FALSE, FALSE);
+	DrawTextArea(gi->x + border_x, gi->y + border_y, gi->textarea.value,
+		     font_nr, gi->textarea.xsize, -1, gi->textarea.ysize, 0,
+		     BLIT_ON_BACKGROUND, FALSE, FALSE, FALSE);
 
 	cursor_letter = gi->textarea.value[gi->textarea.cursor_position];
 	cursor_string[0] = (cursor_letter != '\0' ? cursor_letter : ' ');
@@ -879,7 +879,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 {
   int tag = first_tag;
 
-  if (gi == NULL || gi->deactivated)
+  if (gi == NULL)
     return;
 
   while (tag != GDI_END)
@@ -1711,7 +1711,7 @@ boolean HandleGadgets(int mx, int my, int button)
     struct GadgetInfo *gi = last_gi;
     boolean gadget_changed = ((gi->event_mask & GD_EVENT_TEXT_LEAVING) != 0);
 
-    // check if text gadget has changed its value
+    // check if text input gadget has changed its value
     if (gi->type & GD_TYPE_TEXT_INPUT)
     {
       CheckRangeOfNumericInputGadget(gi);
@@ -1722,6 +1722,15 @@ boolean HandleGadgets(int mx, int my, int button)
 	gadget_changed = FALSE;
     }
 
+    // check if text area gadget has changed its value
+    if (gi->type & GD_TYPE_TEXT_AREA)
+    {
+      if (!strEqual(gi->textarea.last_value, gi->textarea.value))
+	strcpy(gi->textarea.last_value, gi->textarea.value);
+      else
+	gadget_changed = FALSE;
+    }
+
     // selectbox does not change its value when closed by clicking outside
     if (gi->type & GD_TYPE_SELECTBOX)
       gadget_changed = FALSE;
@@ -1925,7 +1934,7 @@ boolean HandleGadgets(int mx, int my, int button)
     if (gadget_pressed)		// gadget pressed the first time
     {
       // initialize delay counter
-      DelayReached(&pressed_delay, 0);
+      ResetDelayCounter(&pressed_delay);
 
       // start gadget delay with longer delay after first click on gadget
       pressed_delay_value = GADGET_FRAME_DELAY_FIRST;
@@ -2345,6 +2354,18 @@ boolean HandleGadgetsKeyInput(Key key)
       strcpy(text, gi->textinput.value);
       strcpy(&gi->textinput.value[cursor_pos], &text[cursor_pos + 1]);
 
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+    }
+    else if (key == KSYM_Home && cursor_pos > 0)
+    {
+      gi->textinput.cursor_position = 0;
+
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+    }
+    else if (key == KSYM_End && cursor_pos < text_length)
+    {
+      gi->textinput.cursor_position = text_length;
+
       DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
   }
@@ -2354,6 +2375,7 @@ boolean HandleGadgetsKeyInput(Key key)
     int text_length = strlen(gi->textarea.value);
     int area_ysize = gi->textarea.ysize;
     int cursor_x_pref = gi->textarea.cursor_x_preferred;
+    int cursor_x = gi->textarea.cursor_x;
     int cursor_y = gi->textarea.cursor_y;
     int cursor_pos = gi->textarea.cursor_position;
     char letter = getCharFromKey(key);
@@ -2405,6 +2427,25 @@ boolean HandleGadgetsKeyInput(Key key)
       strcpy(text, gi->textarea.value);
       strcpy(&gi->textarea.value[cursor_pos], &text[cursor_pos + 1]);
 
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+    }
+    else if (key == KSYM_Home && cursor_x > 0)
+    {
+      setTextAreaCursorPosition(gi, gi->textarea.cursor_position - cursor_x);
+
+      DrawGadget(gi, DG_PRESSED, gi->direct_draw);
+    }
+    else if (key == KSYM_End && cursor_pos < text_length)
+    {
+      int last_cursor_pos = cursor_pos;
+
+      while (gi->textarea.value[cursor_pos] != '\0' &&
+	     gi->textarea.value[cursor_pos] != '\n')
+	cursor_pos++;
+
+      setTextAreaCursorPosition(gi, gi->textarea.cursor_position + cursor_pos -
+				last_cursor_pos);
+
       DrawGadget(gi, DG_PRESSED, gi->direct_draw);
     }
   }