X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=9200cf8507bc4a6cfa3d5774929232a309a66c65;hb=b4045ec83a11b71b7348575d2c76783cde14dccd;hp=d990bc131ee03ef263c29edff8fd73643c4ca810;hpb=cd47bf969c6d8c602b8f5dfa100f0be944bd0e46;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index d990bc13..9200cf85 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -840,7 +840,7 @@ void DrawElemButton(int button_nr, int button_state)
     DrawMiniGraphicExt(drawto,gc,
 		       DX+ED_BUTTON_ELEM_XPOS+3+shift + 
 		       (elem_pos % MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
-		       DY+ED_BUTTON_ELEM_YPOS+3-shift +
+		       DY+ED_BUTTON_ELEM_YPOS+3+shift +
 		       (elem_pos / MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
 		       graphic);
   }
@@ -1470,6 +1470,41 @@ int CheckCountButtons(int mx, int my, int button)
 
 static struct GadgetInfo *gadget_list_first_entry = NULL;
 static struct GadgetInfo *gadget_list_last_entry = NULL;
+static int next_free_gadget_id = 1;
+static boolean gadget_id_wrapped = FALSE;
+
+static struct GadgetInfo *getGadgetInfoFromGadgetID(int id)
+{
+  struct GadgetInfo *gi = gadget_list_first_entry;
+
+  while (gi && gi->id != id)
+    gi = gi->next;
+
+  return gi;
+}
+
+static int getNewGadgetID()
+{
+  int id = next_free_gadget_id++;
+
+  if (next_free_gadget_id <= 0)		/* counter overrun */
+  {
+    gadget_id_wrapped = TRUE;		/* now we must check each ID */
+    next_free_gadget_id = 0;
+  }
+
+  if (gadget_id_wrapped)
+  {
+    next_free_gadget_id++;
+    while (getGadgetInfoFromGadgetID(next_free_gadget_id) != NULL)
+      next_free_gadget_id++;
+  }
+
+  if (next_free_gadget_id <= 0)		/* cannot get new gadget id */
+    Error(ERR_EXIT, "too much gadgets -- this should not happen");
+
+  return id;
+}
 
 static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
 {
@@ -1477,7 +1512,8 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
 
   while (gi)
   {
-    if (mx >= gi->x && mx < gi->x + gi->width &&
+    if (gi->mapped &&
+	mx >= gi->x && mx < gi->x + gi->width &&
 	my >= gi->y && my < gi->y + gi->height)
       break;
 
@@ -1487,6 +1523,11 @@ static struct GadgetInfo *getGadgetInfoFromMousePosition(int mx, int my)
   return gi;
 }
 
+static void default_callback_function(void *ptr)
+{
+  return;
+}
+
 struct GadgetInfo *CreateGadget(int first_tag, ...)
 {
   struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo));
@@ -1496,62 +1537,140 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
   va_start(ap, first_tag);
 
   /* always start with reliable default values */
-  memset(new_gadget, 0, sizeof(struct GadgetInfo));
+  memset(new_gadget, 0, sizeof(struct GadgetInfo));	/* zero all fields */
+  new_gadget->id = getNewGadgetID();			/* new gadget id */
+  new_gadget->callback = default_callback_function;	/* dummy function */
 
   while (tag != GDI_END)
   {
-    printf("tag: %d\n", tag);
-
-
     switch(tag)
     {
+      case GDI_CUSTOM_ID:
+	new_gadget->custom_id = va_arg(ap, int);
+	break;
+
       case GDI_X:
 	new_gadget->x = va_arg(ap, int);
 	break;
+
       case GDI_Y:
 	new_gadget->y = va_arg(ap, int);
 	break;
+
       case GDI_WIDTH:
 	new_gadget->width = va_arg(ap, int);
 	break;
+
       case GDI_HEIGHT:
 	new_gadget->height = va_arg(ap, int);
 	break;
+
       case GDI_TYPE:
 	new_gadget->type = va_arg(ap, unsigned long);
 	break;
+
       case GDI_STATE:
 	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:
 	new_gadget->number_value = va_arg(ap, long);
 	break;
+
       case GDI_TEXT_VALUE:
 	strcpy(new_gadget->text_value, va_arg(ap, char *));
 	break;
+
       case GDI_DESIGN_UNPRESSED:
 	new_gadget->design[GD_BUTTON_UNPRESSED].pixmap = va_arg(ap, Pixmap);
 	new_gadget->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	new_gadget->design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
+
       case GDI_DESIGN_PRESSED:
 	new_gadget->design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
 	new_gadget->design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	new_gadget->design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
+
       case GDI_ALT_DESIGN_UNPRESSED:
 	new_gadget->alt_design[GD_BUTTON_UNPRESSED].pixmap= va_arg(ap, Pixmap);
 	new_gadget->alt_design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
 	new_gadget->alt_design[GD_BUTTON_UNPRESSED].y = va_arg(ap, int);
 	break;
+
       case GDI_ALT_DESIGN_PRESSED:
 	new_gadget->alt_design[GD_BUTTON_PRESSED].pixmap = va_arg(ap, Pixmap);
 	new_gadget->alt_design[GD_BUTTON_PRESSED].x = va_arg(ap, int);
 	new_gadget->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
 	break;
+
+      case GDI_EVENT_MASK:
+	new_gadget->event_mask = va_arg(ap, unsigned long);
+	break;
+
+      case GDI_AREA_SIZE:
+	new_gadget->drawing.area_xsize = va_arg(ap, int);
+	new_gadget->drawing.area_ysize = va_arg(ap, int);
+
+	/* determine dependent values for drawing area gadget, if needed */
+	if (new_gadget->width == 0 &&
+	    new_gadget->height == 0 &&
+	    new_gadget->drawing.item_xsize !=0 &&
+	    new_gadget->drawing.item_ysize !=0)
+	{
+	  new_gadget->width =
+	    new_gadget->drawing.area_xsize * new_gadget->drawing.item_xsize;
+	  new_gadget->height =
+	    new_gadget->drawing.area_ysize * new_gadget->drawing.item_ysize;
+	}
+	else if (new_gadget->drawing.item_xsize == 0 &&
+		 new_gadget->drawing.item_ysize == 0 &&
+		 new_gadget->width != 0 &&
+		 new_gadget->height != 0)
+	{
+	  new_gadget->drawing.item_xsize =
+	    new_gadget->width / new_gadget->drawing.area_xsize;
+	  new_gadget->drawing.item_ysize =
+	    new_gadget->height / new_gadget->drawing.area_ysize;
+	}
+	break;
+
+      case GDI_ITEM_SIZE:
+	new_gadget->drawing.item_xsize = va_arg(ap, int);
+	new_gadget->drawing.item_ysize = va_arg(ap, int);
+
+	/* determine dependent values for drawing area gadget, if needed */
+	if (new_gadget->width == 0 &&
+	    new_gadget->height == 0 &&
+	    new_gadget->drawing.area_xsize !=0 &&
+	    new_gadget->drawing.area_ysize !=0)
+	{
+	  new_gadget->width =
+	    new_gadget->drawing.area_xsize * new_gadget->drawing.item_xsize;
+	  new_gadget->height =
+	    new_gadget->drawing.area_ysize * new_gadget->drawing.item_ysize;
+	}
+	else if (new_gadget->drawing.area_xsize == 0 &&
+		 new_gadget->drawing.area_ysize == 0 &&
+		 new_gadget->width != 0 &&
+		 new_gadget->height != 0)
+	{
+	  new_gadget->drawing.area_xsize =
+	    new_gadget->width / new_gadget->drawing.item_xsize;
+	  new_gadget->drawing.area_ysize =
+	    new_gadget->height / new_gadget->drawing.item_ysize;
+	}
+	break;
+
       case GDI_CALLBACK:
 	new_gadget->callback = va_arg(ap, gadget_callback_function);
 	break;
@@ -1566,8 +1685,9 @@ struct GadgetInfo *CreateGadget(int first_tag, ...)
   va_end(ap);
 
   /* check if gadget complete */
-  if (!new_gadget->design[GD_BUTTON_UNPRESSED].pixmap ||
-      !new_gadget->design[GD_BUTTON_PRESSED].pixmap)
+  if (new_gadget->type != GD_TYPE_DRAWING_AREA &&
+      (!new_gadget->design[GD_BUTTON_UNPRESSED].pixmap ||
+       !new_gadget->design[GD_BUTTON_PRESSED].pixmap))
     Error(ERR_EXIT, "gadget incomplete (missing Pixmap)");
 
   /* insert new gadget into gloabl gadget list */
@@ -1602,96 +1722,188 @@ 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 &&
+      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 MapGadget(struct GadgetInfo *gi)
 {
+  if (gi == NULL)
+    return;
+
   gi->mapped = TRUE;
 
-  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), TRUE);
+  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), DG_BUFFERED);
 }
 
 void UnmapGadget(struct GadgetInfo *gi)
 {
+  if (gi == NULL)
+    return;
+
   gi->mapped = FALSE;
 }
 
 void HandleGadgets(int mx, int my, int button)
 {
-  static struct GadgetInfo *choice = NULL;
-  static boolean pressed = FALSE;
-  struct GadgetInfo *new_choice;
+  static struct GadgetInfo *gi = NULL;
+  static unsigned long pressed_delay = 0;
+
+  struct GadgetInfo *new_gi;
+  boolean gadget_pressed;
+  boolean gadget_pressed_repeated;
+  boolean gadget_moving;
+  boolean gadget_moving_off_borders;
+  boolean gadget_released;
+  boolean gadget_released_off_borders;
 
   if (gadget_list_first_entry == NULL)
     return;
 
-  new_choice = getGadgetInfoFromMousePosition(mx,my);
-
-  if (button)
+  new_gi = getGadgetInfoFromMousePosition(mx,my);
+
+  gadget_pressed =
+    (button != 0 && gi == NULL && new_gi != NULL && !motion_status);
+  gadget_pressed_repeated =
+    (button != 0 && gi != NULL && new_gi == gi);
+  gadget_moving =
+    (button != 0 && gi != NULL && new_gi == gi && motion_status);
+  gadget_moving_off_borders =
+    (button != 0 && gi != NULL && new_gi != gi && motion_status);
+  gadget_released =
+    (button == 0 && gi != NULL && new_gi == gi);
+  gadget_released_off_borders =
+    (button == 0 && gi != NULL && new_gi != gi);
+
+  if (gadget_pressed)
+    gi = new_gi;
+
+  if (gi)
   {
-    if (!motion_status)		/* mouse button just pressed */
+    gi->event.x = mx - gi->x;
+    gi->event.y = my - gi->y;
+
+    if (gi->type == GD_TYPE_DRAWING_AREA)
     {
-      if (new_choice != NULL)
-      {
-	choice = new_choice;
-	choice->state = GD_BUTTON_PRESSED;
-	choice->event = GD_EVENT_PRESSED;
-	DrawGadget(choice, TRUE, TRUE);
-	choice->callback(choice);
-	pressed = TRUE;
-      }
+      gi->event.x /= gi->drawing.item_xsize;
+      gi->event.y /= gi->drawing.item_ysize;
     }
-    else			/* mouse movement with pressed mouse button */
+  }
+
+  if (gadget_pressed)
+  {
+    if (gi->type == GD_TYPE_RADIO_BUTTON)
     {
-      if ((new_choice == NULL || new_choice != choice) &&
-	  choice != NULL && pressed)
+      struct GadgetInfo *rgi = gadget_list_first_entry;
+
+      while (rgi)
       {
-	choice->state = GD_BUTTON_UNPRESSED;
-	DrawGadget(choice, FALSE, TRUE);
-	pressed = FALSE;
+	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;
       }
-      else if (new_choice != NULL && new_choice == choice)
-      {
-	if (!pressed)
-	  DrawGadget(choice, TRUE, TRUE);
-	choice->state = GD_BUTTON_PRESSED;
-
-	/*
-	choice->callback(choice);
-	*/
 
-	pressed = 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);
+
+    if (gi->event_mask & GD_EVENT_PRESSED)
+      gi->callback(gi);
   }
-  else				/* mouse button just released */
+
+  if (gadget_pressed_repeated)
   {
-    if (new_choice != NULL && new_choice == choice && pressed)
-    {
-      choice->state = GD_BUTTON_UNPRESSED;
-      choice->event = GD_EVENT_RELEASED;
-      DrawGadget(choice, FALSE, TRUE);
-      choice->callback(choice);
-      choice = NULL;
-      pressed = FALSE;
-    }
-    else
-    {
-      choice = NULL;
-      pressed = FALSE;
-    }
+    if (gi->event_mask & GD_EVENT_REPEATED &&
+	DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
+      gi->callback(gi);
   }
+
+  if (gadget_moving)
+  {
+    if (gi->state == GD_BUTTON_UNPRESSED)
+      DrawGadget(gi, DG_PRESSED, DG_DIRECT);
+
+    gi->state = GD_BUTTON_PRESSED;
+    gi->event.type = GD_EVENT_MOVING;
+    gi->event.off_borders = FALSE;
+    if (gi->event_mask & GD_EVENT_MOVING)
+      gi->callback(gi);
+  }
+
+  if (gadget_moving_off_borders)
+  {
+    if (gi->state == GD_BUTTON_PRESSED)
+      DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+
+    gi->state = GD_BUTTON_UNPRESSED;
+    gi->event.type = GD_EVENT_MOVING;
+    gi->event.off_borders = TRUE;
+
+    if (gi->event_mask & GD_EVENT_MOVING &&
+	gi->event_mask & GD_EVENT_OFF_BORDERS)
+      gi->callback(gi);
+  }
+
+  if (gadget_released)
+  {
+    DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+
+    gi->state = GD_BUTTON_UNPRESSED;
+    gi->event.type = GD_EVENT_RELEASED;
+
+    if (gi->event_mask & GD_EVENT_RELEASED)
+      gi->callback(gi);
+  }
+
+  if (gadget_released_off_borders)
+  {
+    gi->event.type = GD_EVENT_RELEASED;
+
+    if (gi->event_mask & GD_EVENT_RELEASED &&
+	gi->event_mask & GD_EVENT_OFF_BORDERS)
+      gi->callback(gi);
+  }
+
+  if (button == 0)
+    gi = NULL;
 }