X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.c;h=cffd190bc0f5c4c93fd7511fc9e015647b915b9b;hb=c5728b1ebc2a1d3753a6eea5a0f6335d077eef6b;hp=d9c2c47f6a1fd34c3706090b6ff3a9be17585b73;hpb=4f767d54c7ac468e9a42e22caf716111be1ceba9;p=rocksndiamonds.git

diff --git a/src/buttons.c b/src/buttons.c
index d9c2c47f..cffd190b 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -11,6 +11,8 @@
 *  buttons.c                                               *
 ***********************************************************/
 
+#include <stdarg.h>
+
 #include "buttons.h"
 #include "tools.h"
 #include "misc.h"
@@ -632,7 +634,7 @@ void DrawPlayerButton(unsigned long state, int mode)
 {
   Drawable dest_drawto;
   int dest_xoffset, dest_yoffset;
-  int graphic;
+  int graphic = GFX_SPIELER1;	/* default */
   int graphic_offset = (PLAYER_BUTTON_XSIZE - TILEX/2)/2;
   int xpos, ypos;
   int cx = DOOR_GFX_PAGEX4, cy = 0;
@@ -838,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);
   }
@@ -1461,3 +1463,300 @@ int CheckCountButtons(int mx, int my, int button)
   BackToFront();
   return(return_code);
 }
+
+
+/* NEW GADGET STUFF -------------------------------------------------------- */
+
+
+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)
+{
+  struct GadgetInfo *gi = gadget_list_first_entry;
+
+  while (gi)
+  {
+    if (gi->mapped &&
+	mx >= gi->x && mx < gi->x + gi->width &&
+	my >= gi->y && my < gi->y + gi->height)
+      break;
+
+    gi = gi->next;
+  }
+
+  return gi;
+}
+
+struct GadgetInfo *CreateGadget(int first_tag, ...)
+{
+  struct GadgetInfo *new_gadget = checked_malloc(sizeof(struct GadgetInfo));
+  int tag = first_tag;
+  va_list ap;
+
+  va_start(ap, first_tag);
+
+  /* always start with reliable default values */
+  memset(new_gadget, 0, sizeof(struct GadgetInfo));
+
+  new_gadget->id = getNewGadgetID();
+
+  while (tag != GDI_END)
+  {
+
+
+
+#if 0
+    printf("tag: %d\n", tag);
+#endif
+
+
+
+    switch(tag)
+    {
+      case GDI_ID:
+	new_gadget->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);
+	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_CALLBACK:
+	new_gadget->callback = va_arg(ap, gadget_callback_function);
+	break;
+
+      default:
+	Error(ERR_EXIT, "CreateGadget(): unknown tag %d", tag);
+    }
+
+    tag = va_arg(ap, int);	/* read next tag */
+  }
+
+  va_end(ap);
+
+  /* check if gadget complete */
+  if (!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 */
+
+  if (gadget_list_last_entry)
+  {
+    gadget_list_last_entry->next = new_gadget;
+    gadget_list_last_entry = gadget_list_last_entry->next;
+  }
+  else
+  {
+    gadget_list_first_entry = gadget_list_last_entry = new_gadget;
+  }
+
+  return new_gadget;
+}
+
+void FreeGadget(struct GadgetInfo *gi)
+{
+  struct GadgetInfo *gi_previous = gadget_list_first_entry;
+
+  while (gi_previous && gi_previous->next != gi)
+    gi_previous = gi_previous->next;
+
+  if (gi == gadget_list_first_entry)
+    gadget_list_first_entry = gi->next;
+
+  if (gi == gadget_list_last_entry)
+    gadget_list_last_entry = gi_previous;
+
+  gi_previous->next = gi->next;
+  free(gi);
+}
+
+static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
+{
+  int state = (pressed ? 1 : 0);
+  struct GadgetDesign *gd = (gi->alt_state ?
+			     &gi->alt_design[state] :
+			     &gi->design[state]);
+
+  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);
+  else
+    redraw_mask |= REDRAW_ALL;
+}
+
+void MapGadget(struct GadgetInfo *gi)
+{
+  if (gi == NULL)
+    return;
+
+  gi->mapped = TRUE;
+
+  DrawGadget(gi, (gi->state == GD_BUTTON_PRESSED), FALSE);
+}
+
+void UnmapGadget(struct GadgetInfo *gi)
+{
+  if (gi == NULL)
+    return;
+
+  gi->mapped = FALSE;
+}
+
+void HandleGadgets(int mx, int my, int button)
+{
+  static struct GadgetInfo *gi = NULL;
+  static boolean pressed = FALSE;
+  struct GadgetInfo *new_gi;
+
+  if (gadget_list_first_entry == NULL)
+    return;
+
+  new_gi = getGadgetInfoFromMousePosition(mx,my);
+
+  if (button)
+  {
+    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);
+
+	if (gi->event_mask & GD_EVENT_PRESSED)
+	  gi->callback(gi);
+
+	pressed = TRUE;
+      }
+    }
+    else			/* mouse movement with pressed mouse button */
+    {
+      if ((new_gi == NULL || new_gi != gi) &&
+	  gi != NULL && pressed)
+      {
+	gi->state = GD_BUTTON_UNPRESSED;
+	DrawGadget(gi, FALSE, TRUE);
+	pressed = FALSE;
+      }
+      else if (new_gi != NULL && new_gi == gi)
+      {
+	if (!pressed)
+	  DrawGadget(gi, TRUE, TRUE);
+	gi->state = GD_BUTTON_PRESSED;
+	gi->event.type = GD_EVENT_MOVING;
+
+	if (gi->event_mask & GD_EVENT_MOVING)
+	  gi->callback(gi);
+
+	pressed = TRUE;
+      }
+    }
+  }
+  else				/* mouse button just released */
+  {
+    if (new_gi != NULL && new_gi == gi && pressed)
+    {
+      gi->state = GD_BUTTON_UNPRESSED;
+      gi->event.type = GD_EVENT_RELEASED;
+      DrawGadget(gi, FALSE, TRUE);
+
+      if (gi->event_mask & GD_EVENT_RELEASED)
+	gi->callback(gi);
+
+      gi = NULL;
+      pressed = FALSE;
+    }
+    else
+    {
+      gi = NULL;
+      pressed = FALSE;
+    }
+  }
+}