X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fgadgets.h;h=a12718132782edfe51ab5f4614907382bef07be4;hb=d109a83b1b41088e536efa0788d5cb33382bbe18;hp=5c71680466463186c3c910691ad22b1200e5be9e;hpb=5a2237add0a19d1559c0fe20c3f27651a71adf6c;p=rocksndiamonds.git

diff --git a/src/libgame/gadgets.h b/src/libgame/gadgets.h
index 5c716804..a1271813 100644
--- a/src/libgame/gadgets.h
+++ b/src/libgame/gadgets.h
@@ -17,7 +17,8 @@
 #include "system.h"
 
 
-#define GADGET_FRAME_DELAY	150	/* delay between gadget actions */
+#define GADGET_FRAME_DELAY_FIRST	250	/* delay after first click */
+#define GADGET_FRAME_DELAY		100	/* delay for pressed butten */
 
 /* gadget types */
 #define GD_TYPE_NORMAL_BUTTON		(1 << 0)
@@ -101,9 +102,13 @@
 #define GDI_SCROLLBAR_ITEMS_MAX		37
 #define GDI_SCROLLBAR_ITEMS_VISIBLE	38
 #define GDI_SCROLLBAR_ITEM_POSITION	39
-#define GDI_INFO_TEXT			40
-#define GDI_ACTIVE			41
-#define GDI_DIRECT_DRAW			42
+#define GDI_WHEEL_AREA_X		40
+#define GDI_WHEEL_AREA_Y		41
+#define GDI_WHEEL_AREA_WIDTH		42
+#define GDI_WHEEL_AREA_HEIGHT		43
+#define GDI_INFO_TEXT			44
+#define GDI_ACTIVE			45
+#define GDI_DIRECT_DRAW			46
 
 typedef void (*gadget_function)(void *);
 
@@ -195,7 +200,9 @@ 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_min;				/* minimal scrollbar size */
   int size_max;				/* this is either width or height */
+  int size_max_cmp;			/* needed for minimal scrollbar size */
   int size;				/* scrollbar size on screen */
   int position;				/* scrollbar position on screen */
   int position_max;			/* bottom/right scrollbar position */
@@ -203,6 +210,12 @@ struct GadgetScrollbar
   int correction;			/* scrollbar position correction */
 };
 
+struct GadgetWheelArea
+{
+  int x, y;				/* active area for wheel (start) */
+  int width, height;			/* active area for wheel (size) */ 
+};
+
 struct GadgetInfo
 {
   int id;				/* internal gadget identifier */
@@ -211,8 +224,8 @@ struct GadgetInfo
   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, ...) */
-  unsigned long state;			/* state (pressed, released, ...) */
+  unsigned int type;			/* type (button, text input, ...) */
+  unsigned int state;			/* state (pressed, released, ...) */
   boolean checked;			/* check/radio button state */
   int radio_nr;				/* number of radio button series */
   boolean mapped;			/* gadget is mapped on the screen */
@@ -224,7 +237,7 @@ struct GadgetInfo
   struct GadgetDesign design[2];	/* 0: normal; 1: pressed */
   struct GadgetDesign alt_design[2];	/* alternative design */
   struct GadgetDecoration deco;		/* decoration on top of gadget */
-  unsigned long event_mask;		/* possible events for this gadget */
+  unsigned int event_mask;		/* possible events for this gadget */
   struct GadgetEvent event;		/* actual gadget event */
   gadget_function callback_info;	/* function for pop-up info text */
   gadget_function callback_action;	/* function for gadget action */
@@ -234,6 +247,7 @@ struct GadgetInfo
   struct GadgetTextArea textarea;	/* fields for text area gadget */
   struct GadgetSelectbox selectbox;	/* fields for selectbox gadget */
   struct GadgetScrollbar scrollbar;	/* fields for scrollbar gadget */
+  struct GadgetWheelArea wheelarea;	/* fields for scroll wheel area */
   struct GadgetInfo *next;		/* next list entry */
 };
 
@@ -248,6 +262,10 @@ void UnmapGadget(struct GadgetInfo *);
 void UnmapAllGadgets();
 void RemapAllGadgets();
 
+boolean anyTextInputGadgetActive();
+boolean anyTextAreaGadgetActive();
+boolean anySelectboxGadgetActive();
+boolean anyScrollbarGadgetActive();
 boolean anyTextGadgetActive();
 
 void ClickOnGadget(struct GadgetInfo *, int);