X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.h;h=e3ba29be841272d50ad5f294b9dd8d69c508ef73;hb=209871b6f17880f98d41cf7d7953f6bf2227a16c;hp=695aef6bf1219cbe0b7adfbb82bb28f92ca25d85;hpb=4ec434ee1acb955d0e2e8c33558e5f9226904174;p=rocksndiamonds.git

diff --git a/src/buttons.h b/src/buttons.h
index 695aef6b..e3ba29be 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -193,18 +193,21 @@
 #define ED_BUTTON_EXIT_XSIZE	90
 #define ED_BUTTON_EXIT_YSIZE	20
 
+#define ED_BUTTON_COUNT_YPOS	60
+#define ED_BUTTON_COUNT_XSIZE	20
+#define ED_BUTTON_COUNT_YSIZE	20
 #define ED_BUTTON_MINUS_XPOS	2
-#define ED_BUTTON_MINUS_YPOS	60
-#define ED_BUTTON_MINUS_XSIZE	20
-#define ED_BUTTON_MINUS_YSIZE	20
+#define ED_BUTTON_MINUS_YPOS	ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE	ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE	ED_BUTTON_COUNT_YSIZE
 #define ED_WIN_COUNT_XPOS	(ED_BUTTON_MINUS_XPOS+ED_BUTTON_MINUS_XSIZE+2)
-#define ED_WIN_COUNT_YPOS	ED_BUTTON_MINUS_YPOS
+#define ED_WIN_COUNT_YPOS	ED_BUTTON_COUNT_YPOS
 #define ED_WIN_COUNT_XSIZE	52
-#define ED_WIN_COUNT_YSIZE	ED_BUTTON_MINUS_YSIZE
+#define ED_WIN_COUNT_YSIZE	ED_BUTTON_COUNT_YSIZE
 #define ED_BUTTON_PLUS_XPOS	(ED_WIN_COUNT_XPOS+ED_WIN_COUNT_XSIZE+2)
-#define ED_BUTTON_PLUS_YPOS	ED_BUTTON_MINUS_YPOS
-#define ED_BUTTON_PLUS_XSIZE	ED_BUTTON_MINUS_XSIZE
-#define ED_BUTTON_PLUS_YSIZE	ED_BUTTON_MINUS_YSIZE
+#define ED_BUTTON_PLUS_YPOS	ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE	ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE	ED_BUTTON_COUNT_YSIZE
 
 #define ED_COUNT_GADGET_XPOS	16
 #define ED_COUNT_GADGET_YPOS	(16+3*MINI_TILEY+64)
@@ -270,7 +273,7 @@ int CheckCountButtons(int, int, int);
 
 /* gadget types */
 #define GD_TYPE_NORMAL_BUTTON		(1<<0)
-#define GD_TYPE_TWO_STATE_BUTTON	(1<<1)
+#define GD_TYPE_RADIO_BUTTON		(1<<1)
 #define GD_TYPE_DRAWING_AREA		(1<<2)
 #define GD_TYPE_TEXTINPUT		(1<<3)
 #define GD_TYPE_TEXTOUTPUT		(1<<4)
@@ -283,6 +286,8 @@ int CheckCountButtons(int, int, int);
 #define GD_EVENT_PRESSED		(1<<0)
 #define GD_EVENT_RELEASED		(1<<1)
 #define GD_EVENT_MOVING			(1<<2)
+#define GD_EVENT_REPEATED		(1<<3)
+#define GD_EVENT_OFF_BORDERS		(1<<4)
 
 /* gadget button states */
 #define GD_BUTTON_UNPRESSED		0
@@ -293,23 +298,28 @@ int CheckCountButtons(int, int, int);
 
 /* gadget creation tags */
 #define GDI_END				0
-#define GDI_ID				1
+#define GDI_CUSTOM_ID			1
 #define GDI_X				2
 #define GDI_Y				3
 #define GDI_WIDTH			4
 #define GDI_HEIGHT			5
 #define GDI_TYPE			6
 #define GDI_STATE			7
-#define GDI_ALT_STATE			8
-#define GDI_NUMBER_VALUE		9
-#define GDI_TEXT_VALUE			10
-#define GDI_DESIGN_UNPRESSED		11
-#define GDI_DESIGN_PRESSED		12
-#define GDI_ALT_DESIGN_UNPRESSED	13
-#define GDI_ALT_DESIGN_PRESSED		14
-#define GDI_EVENT_MASK			15
-#define GDI_EVENT			16
-#define GDI_CALLBACK			17
+#define GDI_RADIO_NR			8
+#define GDI_RADIO_PRESSED		9
+#define GDI_NUMBER_VALUE		10
+#define GDI_NUMBER_MIN			11
+#define GDI_NUMBER_MAX			12
+#define GDI_TEXT_VALUE			13
+#define GDI_DESIGN_UNPRESSED		14
+#define GDI_DESIGN_PRESSED		15
+#define GDI_ALT_DESIGN_UNPRESSED	16
+#define GDI_ALT_DESIGN_PRESSED		17
+#define GDI_EVENT_MASK			18
+#define GDI_EVENT			19
+#define GDI_CALLBACK			20
+#define GDI_AREA_SIZE			21
+#define GDI_ITEM_SIZE			22
 
 typedef void (*gadget_callback_function)(void *);
 
@@ -323,16 +333,26 @@ struct GadgetEvent
 {
   unsigned long type;			/* event type */
   int button;				/* button number for button events */
+  int x, y;				/* gadget position at event time */
+  boolean off_borders;			/* mouse pointer outside gadget? */
+};
+
+struct GadgetDrawingArea
+{
+  int area_xsize, area_ysize;		/* size of drawing area (in items) */
+  int item_xsize, item_ysize;		/* size of each item in drawing area */
 };
 
 struct GadgetInfo
 {
-  int id;				/* gadget identifier */
+  int id;				/* internal gadget identifier */
+  int custom_id;			/* custom gadget identifier */
   int x, y;				/* gadget position */
   int width, height;			/* gadget size */
   unsigned long type;			/* type (button, text input, ...) */
   unsigned long state;			/* state (pressed, released, ...) */
-  boolean alt_state;			/* alternative state */
+  int radio_nr;				/* number of radio button series */
+  boolean radio_pressed;		/* radio button state */
   boolean mapped;			/* gadget is active */
   long number_value;
   char text_value[MAX_GADGET_TEXTSIZE];
@@ -341,12 +361,15 @@ struct GadgetInfo
   unsigned long event_mask;		/* possible events for this gadget */
   struct GadgetEvent event;		/* actual gadget event */
   gadget_callback_function callback;
+  struct GadgetDrawingArea drawing;	/* fields for drawing area gadget */
   struct GadgetInfo *next;		/* next list entry */
 };
 
 struct GadgetInfo *CreateGadget(int, ...);
 void FreeGadget(struct GadgetInfo *);
 
+void ClickOnGadget(struct GadgetInfo *);
+
 void MapGadget(struct GadgetInfo *);
 void UnmapGadget(struct GadgetInfo *);