X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.h;h=65d09fcb67806deb9a6d1ee21094f88a42017ea0;hb=446c65ff4739d51e02dd3556226b51f1b8fb8f79;hp=aca41e103f6011d9a38cb2fe45e7b3343825f822;hpb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;p=rocksndiamonds.git

diff --git a/src/buttons.h b/src/buttons.h
index aca41e10..65d09fcb 100644
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -151,8 +151,8 @@
 #define ED_BUTTON_EDOWN_Y2POS	165
 #define ED_BUTTON_ELEM_Y2POS	190
 
-#define ED_SCROLLBUTTON_XSIZE	30
-#define ED_SCROLLBUTTON_YSIZE	20
+#define ED_CURSORBUTTON_XSIZE	30
+#define ED_CURSORBUTTON_YSIZE	20
 
 #define ED_BUTTON_CTRL_XPOS	5
 #define ED_BUTTON_CTRL_YPOS	5
@@ -164,20 +164,20 @@
 #define ED_BUTTON_FILL_YSIZE	20
 #define ED_BUTTON_LEFT_XPOS	5
 #define ED_BUTTON_LEFT_YPOS	65
-#define ED_BUTTON_LEFT_XSIZE	ED_SCROLLBUTTON_XSIZE
-#define ED_BUTTON_LEFT_YSIZE	ED_SCROLLBUTTON_YSIZE
+#define ED_BUTTON_LEFT_XSIZE	ED_CURSORBUTTON_XSIZE
+#define ED_BUTTON_LEFT_YSIZE	ED_CURSORBUTTON_YSIZE
 #define ED_BUTTON_UP_XPOS	35
 #define ED_BUTTON_UP_YPOS	55
-#define ED_BUTTON_UP_XSIZE	ED_SCROLLBUTTON_XSIZE
-#define ED_BUTTON_UP_YSIZE	ED_SCROLLBUTTON_YSIZE
+#define ED_BUTTON_UP_XSIZE	ED_CURSORBUTTON_XSIZE
+#define ED_BUTTON_UP_YSIZE	ED_CURSORBUTTON_YSIZE
 #define ED_BUTTON_DOWN_XPOS	35
 #define ED_BUTTON_DOWN_YPOS	75
-#define ED_BUTTON_DOWN_XSIZE	ED_SCROLLBUTTON_XSIZE
-#define ED_BUTTON_DOWN_YSIZE	ED_SCROLLBUTTON_YSIZE
+#define ED_BUTTON_DOWN_XSIZE	ED_CURSORBUTTON_XSIZE
+#define ED_BUTTON_DOWN_YSIZE	ED_CURSORBUTTON_YSIZE
 #define ED_BUTTON_RIGHT_XPOS	65
 #define ED_BUTTON_RIGHT_YPOS	65
-#define ED_BUTTON_RIGHT_XSIZE	ED_SCROLLBUTTON_XSIZE
-#define ED_BUTTON_RIGHT_YSIZE	ED_SCROLLBUTTON_YSIZE
+#define ED_BUTTON_RIGHT_XSIZE	ED_CURSORBUTTON_XSIZE
+#define ED_BUTTON_RIGHT_YSIZE	ED_CURSORBUTTON_YSIZE
 
 #define ED_BUTTON_EDIT_XPOS	5
 #define ED_BUTTON_EDIT_YPOS	5
@@ -275,15 +275,15 @@ 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		(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_BUTTON			(GD_TYPE_NORMAL_BUTTON | \
 					 GD_TYPE_RADIO_BUTTON)
@@ -291,13 +291,13 @@ int CheckCountButtons(int, int, int);
 					 GD_TYPE_SCROLLBAR_HORIZONTAL)
 
 /* 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
@@ -329,14 +329,16 @@ int CheckCountButtons(int, int, int);
 #define GDI_DESIGN_BORDER		19
 #define GDI_EVENT_MASK			20
 #define GDI_EVENT			21
-#define GDI_CALLBACK			22
-#define GDI_AREA_SIZE			23
-#define GDI_ITEM_SIZE			24
-#define GDI_SCROLLBAR_ITEMS_MAX		25
-#define GDI_SCROLLBAR_ITEMS_VISIBLE	26
-#define GDI_SCROLLBAR_ITEM_POSITION	27
+#define GDI_CALLBACK_INFO		22
+#define GDI_CALLBACK_ACTION		23
+#define GDI_AREA_SIZE			24
+#define GDI_ITEM_SIZE			25
+#define GDI_SCROLLBAR_ITEMS_MAX		26
+#define GDI_SCROLLBAR_ITEMS_VISIBLE	27
+#define GDI_SCROLLBAR_ITEM_POSITION	28
+#define GDI_DESCRIPTION_TEXT		29
 
-typedef void (*gadget_callback_function)(void *);
+typedef void (*gadget_function)(void *);
 
 struct GadgetDesign
 {
@@ -359,6 +361,13 @@ 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 size;				/* maximal size of input text */
+  int cursor_position;			/* actual cursor position */
+};
+
 struct GadgetScrollbar
 {
   int items_max;			/* number of items to access */
@@ -375,6 +384,7 @@ struct GadgetInfo
 {
   int id;				/* internal gadget identifier */
   int custom_id;			/* custom gadget identifier */
+  char *description_text;		/* short text describing gadget */
   int x, y;				/* gadget position */
   int width, height;			/* gadget size */
   unsigned long type;			/* type (button, text input, ...) */
@@ -383,15 +393,15 @@ struct GadgetInfo
   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 */
   unsigned long event_mask;		/* possible events for this gadget */
   struct GadgetEvent event;		/* actual gadget event */
-  gadget_callback_function callback;
+  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 */
 };