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

diff --git a/src/buttons.h b/src/buttons.h
index f555dd39..e3ba29be 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -273,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)
@@ -287,7 +287,7 @@ int CheckCountButtons(int, int, int);
 #define GD_EVENT_RELEASED		(1<<1)
 #define GD_EVENT_MOVING			(1<<2)
 #define GD_EVENT_REPEATED		(1<<3)
-#define GD_EVENT_PRESSED_REPEATED	(GD_EVENT_PRESSED | GD_EVENT_REPEATED)
+#define GD_EVENT_OFF_BORDERS		(1<<4)
 
 /* gadget button states */
 #define GD_BUTTON_UNPRESSED		0
@@ -305,18 +305,21 @@ int CheckCountButtons(int, int, int);
 #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_AREA_SIZE			18
-#define GDI_ITEM_SIZE			19
+#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 *);
 
@@ -331,6 +334,7 @@ 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
@@ -347,7 +351,8 @@ struct GadgetInfo
   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];
@@ -363,6 +368,8 @@ struct GadgetInfo
 struct GadgetInfo *CreateGadget(int, ...);
 void FreeGadget(struct GadgetInfo *);
 
+void ClickOnGadget(struct GadgetInfo *);
+
 void MapGadget(struct GadgetInfo *);
 void UnmapGadget(struct GadgetInfo *);