X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.h;h=064a65ada51e8a3947d5bed5ca6e2235573d63ef;hb=efd80a08bd5de21956872a615f1d03f2dd90cee2;hp=5d5b2ac36523ec1a47a49a6204cc634286a5b8fd;hpb=403fa67c24301d440ae0871c2e31e1e395133a41;p=rocksndiamonds.git

diff --git a/src/buttons.h b/src/buttons.h
index 5d5b2ac3..064a65ad 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -275,29 +275,29 @@ int CheckCountButtons(int, int, int);
 
 
 /* gadget types */
-#define GD_TYPE_NORMAL_BUTTON		(1<<0)
-#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)
-#define GD_TYPE_NUMBERINPUT		(1<<5)
-#define GD_TYPE_NUMBEROUTPUT		(1<<6)
-#define GD_TYPE_SCROLLBAR_VERTICAL	(1<<7)
-#define GD_TYPE_SCROLLBAR_HORIZONTAL	(1<<8)
+#define GD_TYPE_NORMAL_BUTTON		(1 << 0)
+#define GD_TYPE_RADIO_BUTTON		(1 << 1)
+#define GD_TYPE_DRAWING_AREA		(1 << 2)
+#define GD_TYPE_TEXTINPUT_ALPHANUMERIC	(1 << 3)
+#define GD_TYPE_TEXTINPUT_NUMERIC	(1 << 4)
+#define GD_TYPE_SCROLLBAR_VERTICAL	(1 << 5)
+#define GD_TYPE_SCROLLBAR_HORIZONTAL	(1 << 6)
 
 #define GD_TYPE_BUTTON			(GD_TYPE_NORMAL_BUTTON | \
 					 GD_TYPE_RADIO_BUTTON)
 #define GD_TYPE_SCROLLBAR		(GD_TYPE_SCROLLBAR_VERTICAL | \
 					 GD_TYPE_SCROLLBAR_HORIZONTAL)
+#define GD_TYPE_TEXTINPUT		(GD_TYPE_TEXTINPUT_ALPHANUMERIC | \
+					 GD_TYPE_TEXTINPUT_NUMERIC)
 
 /* gadget events */
-#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)
-#define GD_EVENT_TEXT_RETURN		(1<<5)
-#define GD_EVENT_TEXT_LEAVING		(1<<6)
+#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)
+#define GD_EVENT_TEXT_RETURN		(1 << 5)
+#define GD_EVENT_TEXT_LEAVING		(1 << 6)
 
 /* gadget button states */
 #define GD_BUTTON_UNPRESSED		0
@@ -305,6 +305,7 @@ int CheckCountButtons(int, int, int);
 
 /* gadget structure constants */
 #define MAX_GADGET_TEXTSIZE		1024
+#define MAX_INFO_TEXTSIZE		1024
 
 /* gadget creation tags */
 #define GDI_END				0
@@ -336,7 +337,7 @@ int CheckCountButtons(int, int, int);
 #define GDI_SCROLLBAR_ITEMS_MAX		26
 #define GDI_SCROLLBAR_ITEMS_VISIBLE	27
 #define GDI_SCROLLBAR_ITEM_POSITION	28
-#define GDI_DESCRIPTION_TEXT		29
+#define GDI_INFO_TEXT			29
 
 typedef void (*gadget_function)(void *);
 
@@ -361,6 +362,16 @@ struct GadgetDrawingArea
   int item_xsize, item_ysize;		/* size of each item in drawing area */
 };
 
+struct GadgetTextInput
+{
+  char value[MAX_GADGET_TEXTSIZE];	/* text string in input field */
+  int number_value;			/* integer value, if numeric */
+  int number_min;			/* minimal allowed numeric value */
+  int number_max;			/* maximal allowed numeric value */
+  int size;				/* maximal size of input text */
+  int cursor_position;			/* actual cursor position */
+};
+
 struct GadgetScrollbar
 {
   int items_max;			/* number of items to access */
@@ -377,7 +388,7 @@ struct GadgetInfo
 {
   int id;				/* internal gadget identifier */
   int custom_id;			/* custom gadget identifier */
-  char *description_text;		/* short text describing gadget */
+  char info_text[MAX_INFO_TEXTSIZE];	/* short popup info text */
   int x, y;				/* gadget position */
   int width, height;			/* gadget size */
   unsigned long type;			/* type (button, text input, ...) */
@@ -385,9 +396,6 @@ struct GadgetInfo
   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 */
   struct GadgetDesign design[2];	/* 0: normal; 1: pressed */
   struct GadgetDesign alt_design[2];	/* alternative design */
   int design_border;			/* border size of gadget decoration */
@@ -396,6 +404,7 @@ struct GadgetInfo
   gadget_function callback_info;	/* function for pop-up info text */
   gadget_function callback_action;	/* function for gadget action */
   struct GadgetDrawingArea drawing;	/* fields for drawing area gadget */
+  struct GadgetTextInput text;		/* fields for text input gadget */
   struct GadgetScrollbar scrollbar;	/* fields for scrollbar gadget */
   struct GadgetInfo *next;		/* next list entry */
 };
@@ -405,6 +414,8 @@ void FreeGadget(struct GadgetInfo *);
 
 void ClickOnGadget(struct GadgetInfo *);
 void AdjustScrollbar(struct GadgetInfo *, int, int);
+void ModifyTextInputTextValue(struct GadgetInfo *, char *);
+void ModifyTextInputNumberValue(struct GadgetInfo *, int);
 
 void MapGadget(struct GadgetInfo *);
 void UnmapGadget(struct GadgetInfo *);