X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fbuttons.h;h=5dfeb377cc4a73d421e0b5a1666c8f45f85f6075;hp=bafbd2a2d8400ff0516e8b173a0cba6d08aa77f5;hb=1e196be4c0a2f1edf823b3a0e5a14a146317686e;hpb=5ed4de42ced8e7dce5b786ba3d5fd1a6f6a7d7f6

diff --git a/src/buttons.h b/src/buttons.h
index bafbd2a2..5dfeb377 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)
@@ -288,6 +288,8 @@ int CheckCountButtons(int, int, int);
 #define GD_EVENT_MOVING			(1<<2)
 #define GD_EVENT_REPEATED		(1<<3)
 #define GD_EVENT_OFF_BORDERS		(1<<4)
+#define GD_EVENT_TEXT_RETURN		(1<<5)
+#define GD_EVENT_TEXT_LEAVING		(1<<6)
 
 /* gadget button states */
 #define GD_BUTTON_UNPRESSED		0
@@ -305,18 +307,23 @@ 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_TEXT_SIZE			14
+#define GDI_TEXT_BORDER			15
+#define GDI_DESIGN_UNPRESSED		16
+#define GDI_DESIGN_PRESSED		17
+#define GDI_ALT_DESIGN_UNPRESSED	18
+#define GDI_ALT_DESIGN_PRESSED		19
+#define GDI_EVENT_MASK			20
+#define GDI_EVENT			21
+#define GDI_CALLBACK			22
+#define GDI_AREA_SIZE			23
+#define GDI_ITEM_SIZE			24
 
 typedef void (*gadget_callback_function)(void *);
 
@@ -348,10 +355,13 @@ 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];
+  int text_size;			/* maximal size of input text */
+  int text_border;			/* border size of text input gadget */
   struct GadgetDesign design[2];	/* 0: normal; 1: pressed */
   struct GadgetDesign alt_design[2];	/* alternative design */
   unsigned long event_mask;		/* possible events for this gadget */
@@ -364,9 +374,12 @@ struct GadgetInfo
 struct GadgetInfo *CreateGadget(int, ...);
 void FreeGadget(struct GadgetInfo *);
 
+void ClickOnGadget(struct GadgetInfo *);
+
 void MapGadget(struct GadgetInfo *);
 void UnmapGadget(struct GadgetInfo *);
 
 void HandleGadgets(int, int, int);
+void HandleGadgetsKeyInput(KeySym);
 
 #endif