X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.h;h=5d5b2ac36523ec1a47a49a6204cc634286a5b8fd;hb=1a58dd6669241cfffa14f4e6585787e3efca82fa;hp=5a62e9a48a848036cbf80ef9ae656301b8100116;hpb=f70652c4a2f2e45d0f4ed7baf62e2311e66d4b13;p=rocksndiamonds.git

diff --git a/src/buttons.h b/src/buttons.h
index 5a62e9a4..5d5b2ac3 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
@@ -285,6 +285,11 @@ int CheckCountButtons(int, int, int);
 #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)
+#define GD_TYPE_SCROLLBAR		(GD_TYPE_SCROLLBAR_VERTICAL | \
+					 GD_TYPE_SCROLLBAR_HORIZONTAL)
+
 /* gadget events */
 #define GD_EVENT_PRESSED		(1<<0)
 #define GD_EVENT_RELEASED		(1<<1)
@@ -317,18 +322,23 @@ int CheckCountButtons(int, int, int);
 #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_DESIGN_UNPRESSED		15
+#define GDI_DESIGN_PRESSED		16
+#define GDI_ALT_DESIGN_UNPRESSED	17
+#define GDI_ALT_DESIGN_PRESSED		18
+#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_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
 {
@@ -342,6 +352,7 @@ struct GadgetEvent
   int button;				/* button number for button events */
   int x, y;				/* gadget position at event time */
   boolean off_borders;			/* mouse pointer outside gadget? */
+  int item_x, item_y, item_position;	/* new item position */
 };
 
 struct GadgetDrawingArea
@@ -350,10 +361,23 @@ struct GadgetDrawingArea
   int item_xsize, item_ysize;		/* size of each item in drawing area */
 };
 
+struct GadgetScrollbar
+{
+  int items_max;			/* number of items to access */
+  int items_visible;			/* number of visible items */
+  int item_position;			/* actual item position */
+  int size_max;				/* this is either width or height */
+  int size;				/* scrollbar size on screen */
+  int position;				/* scrollbar position on screen */
+  int position_max;			/* bottom/right scrollbar position */
+  int drag_position;			/* drag position on scrollbar */
+};
+
 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, ...) */
@@ -364,13 +388,15 @@ struct GadgetInfo
   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 */
+  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 GadgetScrollbar scrollbar;	/* fields for scrollbar gadget */
   struct GadgetInfo *next;		/* next list entry */
 };
 
@@ -378,6 +404,7 @@ struct GadgetInfo *CreateGadget(int, ...);
 void FreeGadget(struct GadgetInfo *);
 
 void ClickOnGadget(struct GadgetInfo *);
+void AdjustScrollbar(struct GadgetInfo *, int, int);
 
 void MapGadget(struct GadgetInfo *);
 void UnmapGadget(struct GadgetInfo *);