rnd-19981217-2

[rocksndiamonds.git] / src / buttons.h

diff --git a/src/buttons.h b/src/buttons.h
index 695aef6bf1219cbe0b7adfbb82bb28f92ca25d85..255c82436d4f497709c88c3e6ed770cec052037f 100644 (file)
--- a/src/buttons.h
+++ b/src/buttons.h
@@ -193,18 +193,21 @@
 #define ED_BUTTON_EXIT_XSIZE   90
 #define ED_BUTTON_EXIT_YSIZE   20
 
+#define ED_BUTTON_COUNT_YPOS   60
+#define ED_BUTTON_COUNT_XSIZE  20
+#define ED_BUTTON_COUNT_YSIZE  20
 #define ED_BUTTON_MINUS_XPOS   2
-#define ED_BUTTON_MINUS_YPOS   60
-#define ED_BUTTON_MINUS_XSIZE  20
-#define ED_BUTTON_MINUS_YSIZE  20
+#define ED_BUTTON_MINUS_YPOS   ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE  ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE  ED_BUTTON_COUNT_YSIZE
 #define ED_WIN_COUNT_XPOS      (ED_BUTTON_MINUS_XPOS+ED_BUTTON_MINUS_XSIZE+2)
-#define ED_WIN_COUNT_YPOS      ED_BUTTON_MINUS_YPOS
+#define ED_WIN_COUNT_YPOS      ED_BUTTON_COUNT_YPOS
 #define ED_WIN_COUNT_XSIZE     52
-#define ED_WIN_COUNT_YSIZE     ED_BUTTON_MINUS_YSIZE
+#define ED_WIN_COUNT_YSIZE     ED_BUTTON_COUNT_YSIZE
 #define ED_BUTTON_PLUS_XPOS    (ED_WIN_COUNT_XPOS+ED_WIN_COUNT_XSIZE+2)
-#define ED_BUTTON_PLUS_YPOS    ED_BUTTON_MINUS_YPOS
-#define ED_BUTTON_PLUS_XSIZE   ED_BUTTON_MINUS_XSIZE
-#define ED_BUTTON_PLUS_YSIZE   ED_BUTTON_MINUS_YSIZE
+#define ED_BUTTON_PLUS_YPOS    ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE   ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE   ED_BUTTON_COUNT_YSIZE
 
 #define ED_COUNT_GADGET_XPOS   16
 #define ED_COUNT_GADGET_YPOS   (16+3*MINI_TILEY+64)
@@ -283,6 +286,7 @@ int CheckCountButtons(int, int, int);
 #define GD_EVENT_PRESSED               (1<<0)
 #define GD_EVENT_RELEASED              (1<<1)
 #define GD_EVENT_MOVING                        (1<<2)
+#define GD_EVENT_REPEATED              (1<<3)
 
 /* gadget button states */
 #define GD_BUTTON_UNPRESSED            0
@@ -293,7 +297,7 @@ int CheckCountButtons(int, int, int);
 
 /* gadget creation tags */
 #define GDI_END                                0
-#define GDI_ID                         1
+#define GDI_CUSTOM_ID                  1
 #define GDI_X                          2
 #define GDI_Y                          3
 #define GDI_WIDTH                      4
@@ -310,6 +314,8 @@ int CheckCountButtons(int, int, int);
 #define GDI_EVENT_MASK                 15
 #define GDI_EVENT                      16
 #define GDI_CALLBACK                   17
+#define GDI_AREA_SIZE                  18
+#define GDI_ITEM_SIZE                  19
 
 typedef void (*gadget_callback_function)(void *);
 
@@ -323,11 +329,20 @@ struct GadgetEvent
 {
   unsigned long type;                  /* event type */
   int button;                          /* button number for button events */
+  int x, y;                            /* gadget position at event time */
+  boolean off_borders;                 /* mouse pointer outside gadget? */
+};
+
+struct GadgetDrawingArea
+{
+  int area_xsize, area_ysize;          /* size of drawing area (in items) */
+  int item_xsize, item_ysize;          /* size of each item in drawing area */
 };
 
 struct GadgetInfo
 {
-  int id;                              /* gadget identifier */
+  int id;                              /* internal gadget identifier */
+  int custom_id;                       /* custom gadget identifier */
   int x, y;                            /* gadget position */
   int width, height;                   /* gadget size */
   unsigned long type;                  /* type (button, text input, ...) */
@@ -341,6 +356,7 @@ struct GadgetInfo
   unsigned long event_mask;            /* possible events for this gadget */
   struct GadgetEvent event;            /* actual gadget event */
   gadget_callback_function callback;
+  struct GadgetDrawingArea drawing;    /* fields for drawing area gadget */
   struct GadgetInfo *next;             /* next list entry */
 };