X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fbuttons.h;h=fcd23247594809e78f286a43a1f93032c48b4e69;hb=fd18ece8535cd87bd72989d7d39092d55b283939;hp=aca41e103f6011d9a38cb2fe45e7b3343825f822;hpb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;p=rocksndiamonds.git diff --git a/src/buttons.h b/src/buttons.h index aca41e10..fcd23247 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,29 +275,31 @@ 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_CHECK_BUTTON (1 << 1) +#define GD_TYPE_RADIO_BUTTON (1 << 2) +#define GD_TYPE_DRAWING_AREA (1 << 3) +#define GD_TYPE_TEXTINPUT_ALPHANUMERIC (1 << 4) +#define GD_TYPE_TEXTINPUT_NUMERIC (1 << 5) +#define GD_TYPE_SCROLLBAR_VERTICAL (1 << 6) +#define GD_TYPE_SCROLLBAR_HORIZONTAL (1 << 7) #define GD_TYPE_BUTTON (GD_TYPE_NORMAL_BUTTON | \ + GD_TYPE_CHECK_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) -#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 @@ -305,6 +307,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 @@ -315,8 +318,8 @@ int CheckCountButtons(int, int, int); #define GDI_HEIGHT 5 #define GDI_TYPE 6 #define GDI_STATE 7 -#define GDI_RADIO_NR 8 -#define GDI_RADIO_PRESSED 9 +#define GDI_CHECKED 8 +#define GDI_RADIO_NR 9 #define GDI_NUMBER_VALUE 10 #define GDI_NUMBER_MIN 11 #define GDI_NUMBER_MAX 12 @@ -327,16 +330,22 @@ int CheckCountButtons(int, int, int); #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_SCROLLBAR_ITEMS_MAX 25 -#define GDI_SCROLLBAR_ITEMS_VISIBLE 26 -#define GDI_SCROLLBAR_ITEM_POSITION 27 - -typedef void (*gadget_callback_function)(void *); +#define GDI_DECORATION_DESIGN 20 +#define GDI_DECORATION_POSITION 22 +#define GDI_DECORATION_SIZE 21 +#define GDI_DECORATION_SHIFTING 23 +#define GDI_EVENT_MASK 24 +#define GDI_EVENT 25 +#define GDI_CALLBACK_INFO 26 +#define GDI_CALLBACK_ACTION 27 +#define GDI_AREA_SIZE 28 +#define GDI_ITEM_SIZE 29 +#define GDI_SCROLLBAR_ITEMS_MAX 30 +#define GDI_SCROLLBAR_ITEMS_VISIBLE 31 +#define GDI_SCROLLBAR_ITEM_POSITION 32 +#define GDI_INFO_TEXT 33 + +typedef void (*gadget_function)(void *); struct GadgetDesign { @@ -344,6 +353,14 @@ struct GadgetDesign int x, y; /* position of rectangle in Pixmap */ }; +struct GadgetDecoration +{ + struct GadgetDesign design; /* decoration design structure */ + int x, y; /* position of deco on the gadget */ + int width, height; /* width and height of decoration */ + int xshift, yshift; /* deco shifting when gadget pressed */ +}; + struct GadgetEvent { unsigned long type; /* event type */ @@ -359,6 +376,16 @@ 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 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 */ +}; + struct GadgetScrollbar { int items_max; /* number of items to access */ @@ -375,23 +402,24 @@ struct GadgetInfo { int id; /* internal gadget identifier */ int custom_id; /* custom gadget identifier */ + 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, ...) */ + boolean checked; /* check/radio button state */ int radio_nr; /* number of radio button series */ - 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 */ + struct GadgetDecoration deco; /* decoration on top of gadget */ 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 */ }; @@ -399,11 +427,16 @@ struct GadgetInfo struct GadgetInfo *CreateGadget(int, ...); void FreeGadget(struct GadgetInfo *); -void ClickOnGadget(struct GadgetInfo *); -void AdjustScrollbar(struct GadgetInfo *, int, int); +void ModifyGadget(struct GadgetInfo *, int, ...); +void RedrawGadget(struct GadgetInfo *); void MapGadget(struct GadgetInfo *); void UnmapGadget(struct GadgetInfo *); +void UnmapAllGadgets(); +void RemapAllGadgets(); + +boolean anyTextGadgetActive(); +void ClickOnGadget(struct GadgetInfo *, int); void HandleGadgets(int, int, int); void HandleGadgetsKeyInput(KeySym);