X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=2d6c173eb5a52145194fb3828f537d14d257113c;hb=209871b6f17880f98d41cf7d7953f6bf2227a16c;hp=75bcf61618923b7b24749ec7f2ee1314d47641b6;hpb=5ed4de42ced8e7dce5b786ba3d5fd1a6f6a7d7f6;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index 75bcf616..2d6c173e 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:
@@ -1718,26 +1722,46 @@ 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)
+  if (gi->type != GD_TYPE_NORMAL_BUTTON &&
+      gi->type != GD_TYPE_RADIO_BUTTON)
     return;
 
   XCopyArea(display, gd->pixmap, drawto, gc,
 	    gd->x, gd->y, gi->width, gi->height, gi->x, gi->y);
 
   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 +1769,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)
@@ -1758,10 +1782,10 @@ void UnmapGadget(struct GadgetInfo *gi)
 
 void HandleGadgets(int mx, int my, int button)
 {
-  static struct GadgetInfo *gi = NULL;
+  static struct GadgetInfo *last_gi = NULL;
   static unsigned long pressed_delay = 0;
 
-  struct GadgetInfo *new_gi;
+  struct GadgetInfo *new_gi, *gi;
   boolean gadget_pressed;
   boolean gadget_pressed_repeated;
   boolean gadget_moving;
@@ -1772,23 +1796,28 @@ void HandleGadgets(int mx, int my, int button)
   if (gadget_list_first_entry == NULL)
     return;
 
-  new_gi = getGadgetInfoFromMousePosition(mx,my);
+  new_gi = getGadgetInfoFromMousePosition(mx, my);
 
   gadget_pressed =
-    (button != 0 && gi == NULL && new_gi != NULL && !motion_status);
+    (button != 0 && last_gi == NULL && new_gi != NULL && !motion_status);
   gadget_pressed_repeated =
-    (button != 0 && gi != NULL && new_gi == gi);
+    (button != 0 && last_gi != NULL && new_gi == last_gi);
   gadget_moving =
-    (button != 0 && gi != NULL && new_gi == gi && motion_status);
+    (button != 0 && last_gi != NULL && new_gi == last_gi && motion_status);
   gadget_moving_off_borders =
-    (button != 0 && gi != NULL && new_gi != gi && motion_status);
+    (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 && gi != NULL && new_gi != gi);
+    (button == 0 && last_gi != NULL && new_gi != last_gi);
 
   if (gadget_pressed)
-    gi = new_gi;
+    last_gi = new_gi;
+
+  gi = last_gi;
+
+  if (button == 0)
+    last_gi = NULL;
 
   if (gi)
   {
@@ -1804,7 +1833,28 @@ void HandleGadgets(int mx, int my, int button)
 
   if (gadget_pressed)
   {
-    DrawGadget(gi, TRUE, TRUE);
+    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;
+      }
+
+      gi->radio_pressed = TRUE;
+    }
+
+    DrawGadget(gi, DG_PRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_PRESSED;
     gi->event.type = GD_EVENT_PRESSED;
@@ -1829,7 +1879,7 @@ void HandleGadgets(int mx, int my, int button)
   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;
@@ -1841,7 +1891,7 @@ void HandleGadgets(int mx, int my, int button)
   if (gadget_moving_off_borders)
   {
     if (gi->state == GD_BUTTON_PRESSED)
-      DrawGadget(gi, FALSE, TRUE);
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_MOVING;
@@ -1854,7 +1904,7 @@ void HandleGadgets(int mx, int my, int button)
 
   if (gadget_released)
   {
-    DrawGadget(gi, FALSE, TRUE);
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
     gi->state = GD_BUTTON_UNPRESSED;
     gi->event.type = GD_EVENT_RELEASED;
@@ -1871,7 +1921,4 @@ void HandleGadgets(int mx, int my, int button)
 	gi->event_mask & GD_EVENT_OFF_BORDERS)
       gi->callback(gi);
   }
-
-  if (button == 0)
-    gi = NULL;
 }