rnd-19990122-1

[rocksndiamonds.git] / src / buttons.h

diff --git a/src/buttons.h b/src/buttons.h
index 65d09fcb67806deb9a6d1ee21094f88a42017ea0..064a65ada51e8a3947d5bed5ca6e2235573d63ef 100644 (file)
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -278,17 +278,17 @@ int CheckCountButtons(int, int, int);
 #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_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)
@@ -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 *);
 
@@ -364,6 +365,9 @@ struct GadgetDrawingArea
 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 */
 };
@@ -384,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, ...) */
@@ -392,7 +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;
   struct GadgetDesign design[2];       /* 0: normal; 1: pressed */
   struct GadgetDesign alt_design[2];   /* alternative design */
   int design_border;                   /* border size of gadget decoration */
@@ -411,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 *);