X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=77c374376bae17aa3ed4224996fc564ef1b60eca;hb=e6856beb007b3f09036a04290c6b162953ddfece;hp=efb8ebf6d41b51e125cb1760f989ed758bd12b60;hpb=f6ba86f49b8d92a6cb8d06b42e580195d09b8183;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index efb8ebf6..77c37437 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -1573,8 +1573,12 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	new_gadget->state = va_arg(ap, unsigned long);
 	break;
 
-      case GDI_ALT_STATE:
-	new_gadget->state = va_arg(ap, boolean);
+      case GDI_RADIO_NR:
+	new_gadget->radio_nr = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_RADIO_PRESSED:
+	new_gadget->radio_pressed = va_arg(ap, boolean);
 	break;
 
       case GDI_NUMBER_VALUE:
@@ -1582,7 +1586,35 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
 	break;
 
       case GDI_TEXT_VALUE:
-	strcpy(new_gadget->text_value, va_arg(ap, char *));
+	{
+	  int max_textsize = MAX_GADGET_TEXTSIZE;
+
+	  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';
+	}
+	break;
+
+      case GDI_TEXT_SIZE:
+	{
+	  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';
+
+	  if (new_gadget->width == 0 && new_gadget->height == 0)
+	  {
+	    new_gadget->width = (new_gadget->text_size + 1) * FONT2_XSIZE + 6;
+	    new_gadget->height = ED_WIN_COUNT_YSIZE;
+	  }
+	}
+	break;
+
+      case GDI_TEXT_BORDER:
+	new_gadget->text_border = va_arg(ap, int);
 	break;
 
       case GDI_DESIGN_UNPRESSED:
@@ -1718,26 +1750,86 @@ void FreeGadget(struct GadgetInfo *gi)
   free(gi);
 }
 
+/* values for DrawGadget() */
+#define DG_UNPRESSED	0
+#define DG_PRESSED	1
+#define DG_BUFFERED	0
+#define DG_DIRECT	1
+
 static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 {
   int state = (pressed ? 1 : 0);
-  struct GadgetDesign *gd = (gi->alt_state ?
+  struct GadgetDesign *gd = (gi->radio_pressed ?
 			     &gi->alt_design[state] :
 			     &gi->design[state]);
 
-  if (gi->type != GD_TYPE_NORMAL_BUTTON)
-    return;
+  switch (gi->type)
+  {
+    case GD_TYPE_NORMAL_BUTTON:
+    case GD_TYPE_RADIO_BUTTON:
+      XCopyArea(display, gd->pixmap, drawto, gc,
+		gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+      break;
+
+    case GD_TYPE_TEXTINPUT:
+      {
+	int i;
+
+	/* left part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x, gd->y,
+		  gi->text_border, gi->height,
+		  gi->x, gi->y);
+
+	/* middle part of gadget */
+	for (i=0; i<=gi->text_size; i++)
+	  XCopyArea(display, gd->pixmap, drawto, gc,
+		    gd->x + gi->text_border, gd->y,
+		    FONT2_XSIZE, gi->height,
+		    gi->x + gi->text_border + i * FONT2_XSIZE, gi->y);
+
+	/* right part of gadget */
+	XCopyArea(display, gd->pixmap, drawto, gc,
+		  gd->x + ED_WIN_COUNT_XSIZE - gi->text_border, gd->y,
+		  gi->text_border, gi->height,
+		  gi->x + gi->width - gi->text_border, gi->y);
+
+	/* gadget text value */
+	DrawText(gi->x + gi->text_border, gi->y + gi->text_border,
+		 gi->text_value, FS_SMALL, (pressed ? FC_GREEN : FC_YELLOW));
+
+	/* draw cursor, if active */
+	DrawText(gi->x + gi->text_border + strlen(gi->text_value)*FONT2_XSIZE,
+		 gi->y + gi->text_border,
+		 (pressed ? "<" : " "),
+		 FS_SMALL, FC_RED);
+      }
+      break;
 
-  XCopyArea(display, gd->pixmap, drawto, gc,
-	    gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+    default:
+      return;
+  }
 
   if (direct)
-    XCopyArea(display, gd->pixmap, window, gc,
-	      gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
+    XCopyArea(display, drawto, window, gc,
+	      gi->x, gi->y, gi->width, gi->height, gi->x, gi->y);
   else
     redraw_mask |= REDRAW_ALL;
 }
 
+void ClickOnGadget(struct GadgetInfo *gi)
+{
+  /* simulate releasing mouse button over last gadget, if still pressed */
+  if (button_status)
+    HandleGadgets(-1, -1, 0);
+
+  /* simulate pressing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, 1);
+
+  /* simulate releasing mouse button over specified gadget */
+  HandleGadgets(gi->x, gi->y, 0);
+}
+
 void MapGadget(struct GadgetInfo *gi)
 {
   if (gi == NULL)
@@ -1745,7 +1837,7 @@ void MapGadget(struct GadgetInfo *gi)
 
   gi->mapped = TRUE;
 
-  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), FALSE);
+  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), DG_BUFFERED);
 }
 
 void UnmapGadget(struct GadgetInfo *gi)
@@ -1756,37 +1848,62 @@ void UnmapGadget(struct GadgetInfo *gi)
   gi->mapped = FALSE;
 }
 
+static struct GadgetInfo *last_gi = NULL;
+
 void HandleGadgets(int mx, int my, int button)
 {
-  static struct GadgetInfo *gi = NULL;
   static unsigned long pressed_delay = 0;
 
-#if 0
-  static boolean pressed = FALSE;
-#endif
-
-  struct GadgetInfo *new_gi;
+  struct GadgetInfo *new_gi, *gi;
   boolean gadget_pressed;
   boolean gadget_pressed_repeated;
-  boolean gadget_moving_inside;
-  boolean gadget_moving_outside;
+  boolean gadget_moving;
+  boolean gadget_moving_off_borders;
   boolean gadget_released;
+  boolean gadget_released_off_borders;
 
-  if (gadget_list_first_entry == NULL)
+  if (gadget_list_first_entry == NULL)	/* no gadgets defined */
     return;
 
-  new_gi = getGadgetInfoFromMousePosition(mx,my);
+  new_gi = getGadgetInfoFromMousePosition(mx, 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)
+  {
+    struct GadgetInfo *gi = last_gi;
+
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+
+    if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
+      gi->callback(gi);
+
+    last_gi = NULL;
+  }
 
   gadget_pressed =
-    (button != 0 && gi == NULL && new_gi != NULL);
+    (button != 0 && last_gi == NULL && new_gi != NULL && !motion_status);
   gadget_pressed_repeated =
-    (button != 0 && gi != NULL && new_gi == gi);
-  gadget_moving_inside =
-    (button != 0 && gi != NULL && new_gi == gi && motion_status);
-  gadget_moving_outside =
-    (button != 0 && gi != NULL && new_gi != gi && motion_status);
+    (button != 0 && last_gi != NULL && new_gi == last_gi);
+  gadget_moving =
+    (button != 0 && last_gi != NULL && new_gi == last_gi && motion_status);
+  gadget_moving_off_borders =
+    (button != 0 && last_gi != NULL && new_gi != last_gi && motion_status);
   gadget_released =
-    (button == 0 && gi != NULL && new_gi == gi);
+    (button == 0 && last_gi != NULL && new_gi == last_gi);
+  gadget_released_off_borders =
+    (button == 0 && last_gi != NULL && new_gi != last_gi);
+
+  /* if new gadget pressed, store this gadget  */
+  if (gadget_pressed)
+    last_gi = new_gi;
+
+  /* 'gi' is actually handled gadget */
+  gi = last_gi;
+
+  /* if mouse button released, no gadget needs to be handled anymore */
+  if (button == 0 && last_gi && last_gi->type != GD_TYPE_TEXTINPUT)
+    last_gi = NULL;
 
   if (gi)
   {
@@ -1802,201 +1919,128 @@ void HandleGadgets(int mx, int my, int button)
 
   if (gadget_pressed)
   {
-    gi = new_gi;
+    if (gi->type == GD_TYPE_RADIO_BUTTON)
+    {
+      struct GadgetInfo *rgi = gadget_list_first_entry;
+
+      while (rgi)
+      {
+	if (rgi->mapped &&
+	    rgi->type == GD_TYPE_RADIO_BUTTON &&
+	    rgi->radio_nr == gi->radio_nr &&
+	    rgi != gi)
+	{
+	  rgi->radio_pressed = FALSE;
+	  DrawGadget(rgi, DG_UNPRESSED, DG_DIRECT);
+	}
+
+	rgi = rgi->next;
+      }
 
-    DrawGadget(gi, TRUE, TRUE);
+      gi->radio_pressed = TRUE;
+    }
+
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_PRESSED;
     gi->event.type = GD_EVENT_PRESSED;
     gi->event.button = button;
+    gi->event.off_borders = FALSE;
 
     /* initialize delay counter */
     pressed_delay = 0;
     DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
 
-
-    /*
-    printf("new gadget pressed\n");
-    */
-
-
     if (gi->event_mask & GD_EVENT_PRESSED)
       gi->callback(gi);
   }
 
   if (gadget_pressed_repeated)
   {
-    if (gi->event_mask & GD_EVENT_PRESSED_REPEATED &&
+    if (gi->event_mask & GD_EVENT_REPEATED &&
 	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
-    {
-
-
-      /*
-	printf("gadget pressed (repeated)\n");
-      */
-
-
-	gi->callback(gi);
-    }
+      gi->callback(gi);
   }
 
-  if (gadget_moving_inside)
+  if (gadget_moving)
   {
     if (gi->state == GD_BUTTON_UNPRESSED)
-      DrawGadget(gi, TRUE, TRUE);
+      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_PRESSED;
     gi->event.type = GD_EVENT_MOVING;
-
-
-    /*
-    printf("inside gadget\n");
-    */
-
+    gi->event.off_borders = FALSE;
     if (gi->event_mask & GD_EVENT_MOVING)
       gi->callback(gi);
   }
 
-  if (gadget_moving_outside)
+  if (gadget_moving_off_borders)
   {
-    if (gi->state == GD_BUTTON_PRESSED)
-      DrawGadget(gi, FALSE, TRUE);
+    if (gi->state == GD_BUTTON_PRESSED &&
+	gi->type != GD_TYPE_TEXTINPUT)
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_MOVING;
+    gi->event.off_borders = TRUE;
 
-
-    /*
-    printf("outside gadget\n");
-    */
-
-
-    if (gi->event_mask & GD_EVENT_MOVING)
+    if (gi->event_mask & GD_EVENT_MOVING &&
+	gi->event_mask & GD_EVENT_OFF_BORDERS)
       gi->callback(gi);
   }
 
   if (gadget_released)
   {
-    DrawGadget(gi, FALSE, TRUE);
+    if (gi->type != GD_TYPE_TEXTINPUT)
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_RELEASED;
 
-
-    /*
-    printf("gadget released\n");
-    */
-
-
     if (gi->event_mask & GD_EVENT_RELEASED)
       gi->callback(gi);
   }
 
-  if (button == 0)
-    gi = NULL;
-
-
-
-#if 0
-  if (button)
+  if (gadget_released_off_borders)
   {
-    if (!motion_status)		/* mouse button just pressed */
-    {
-      if (new_gi != NULL)
-      {
-	gi = new_gi;
-	gi->state = GD_BUTTON_PRESSED;
-	gi->event.type = GD_EVENT_PRESSED;
-	gi->event.button = button;
-	DrawGadget(gi, TRUE, TRUE);
-
-	/* initialize delay counter */
-	pressed_delay = 0;
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY);
-
-
-	printf("new gadget pressed\n");
-
-
-	if (gi->event_mask & GD_EVENT_PRESSED)
-	  gi->callback(gi);
-
-	pressed = TRUE;
-      }
-    }
-    else			/* mouse movement with pressed mouse button */
-    {
-      if (new_gi != gi && gi != NULL)
-      {
-	if (pressed)
-	  DrawGadget(gi, FALSE, TRUE);
-	gi->state = GD_BUTTON_UNPRESSED;
-	gi->event.type = GD_EVENT_MOVING;
-
-
-	printf("outside gadget\n");
-
-
-
-
-	if (gi->event_mask & GD_EVENT_MOVING)
-	  gi->callback(gi);
-
-	pressed = FALSE;
-      }
-      else if (new_gi == gi && gi != NULL)
-      {
-	if (!pressed)
-	  DrawGadget(gi, TRUE, TRUE);
-	gi->state = GD_BUTTON_PRESSED;
-	gi->event.type = GD_EVENT_MOVING;
-
-
-	printf("inside gadget\n");
-
-
-
+    gi->event.type = GD_EVENT_RELEASED;
 
-	if (gi->event_mask & GD_EVENT_MOVING)
-	  gi->callback(gi);
+    if (gi->event_mask & GD_EVENT_RELEASED &&
+	gi->event_mask & GD_EVENT_OFF_BORDERS)
+      gi->callback(gi);
+  }
+}
 
-	pressed = TRUE;
-      }
-    }
+void HandleGadgetsKeyInput(KeySym key)
+{
+  struct GadgetInfo *gi = last_gi;
+  int text_length;
+  char letter;
 
-    if (gi != NULL &&
-	gi->event_mask & GD_EVENT_PRESSED_REPEATED &&
-	gi->state == GD_BUTTON_PRESSED &&
-	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
-    {
-	printf("gadget pressed (repeated)\n");
+  if (gi == NULL || gi->type != GD_TYPE_TEXTINPUT)
+    return;
 
+  text_length = strlen(gi->text_value);
+  letter = getCharFromKeySym(key);
 
-	gi->callback(gi);
-    }
+  if (letter && text_length < gi->text_size)
+  {
+    gi->text_value[text_length] = letter;
+    gi->text_value[text_length + 1] = '\0';
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
   }
-  else				/* mouse button just released */
+  else if ((key == XK_Delete || key == XK_BackSpace) && text_length > 0)
   {
-    if (new_gi == gi && gi != NULL && pressed)
-    {
-      gi->state = GD_BUTTON_UNPRESSED;
-      gi->event.type = GD_EVENT_RELEASED;
-      DrawGadget(gi, FALSE, TRUE);
-
-
-      printf("gadget released\n");
-
-
-
-      if (gi->event_mask & GD_EVENT_RELEASED)
-	gi->callback(gi);
-    }
-
-    gi = NULL;
-    pressed = FALSE;
+    gi->text_value[text_length - 1] = '\0';
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
   }
-#endif
-
+  else if (key == XK_Return)
+  {
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
+    if (gi->event_mask & GD_EVENT_TEXT_RETURN)
+      gi->callback(gi);
 
+    last_gi = NULL;
+  }
 }