rnd-20000718-1-src
[rocksndiamonds.git] / src / buttons.c
index 1e0ff787ccc7ac9c197fd6f8919de86aeb83c307..4844f2fe86ae4eff829f110524a1ebbb47ef1223 100644 (file)
 #include "tape.h"
 
 /* some positions in the video tape control window */
-#define VIDEO_BUTTON_EJECT_XPOS        (VIDEO_CONTROL_XPOS + 0 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_STOP_XPOS (VIDEO_CONTROL_XPOS + 1 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_PAUSE_XPOS        (VIDEO_CONTROL_XPOS + 2 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_REC_XPOS  (VIDEO_CONTROL_XPOS + 3 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_PLAY_XPOS (VIDEO_CONTROL_XPOS + 4 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_ANY_YPOS  (VIDEO_CONTROL_YPOS)
 #define VIDEO_DATE_LABEL_XPOS  (VIDEO_DISPLAY1_XPOS)
 #define VIDEO_DATE_LABEL_YPOS  (VIDEO_DISPLAY1_YPOS)
 #define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE)
-#define VIDEO_DATE_XPOS                (VIDEO_DISPLAY1_XPOS+1)
-#define VIDEO_DATE_YPOS                (VIDEO_DISPLAY1_YPOS+14)
+#define VIDEO_DATE_XPOS                (VIDEO_DISPLAY1_XPOS + 1)
+#define VIDEO_DATE_YPOS                (VIDEO_DISPLAY1_YPOS + 14)
 #define VIDEO_DATE_XSIZE       (VIDEO_DISPLAY_XSIZE)
 #define VIDEO_DATE_YSIZE       16
 #define VIDEO_REC_LABEL_XPOS   (VIDEO_DISPLAY2_XPOS)
 #define VIDEO_REC_LABEL_YPOS   (VIDEO_DISPLAY2_YPOS)
 #define VIDEO_REC_LABEL_XSIZE  20
 #define VIDEO_REC_LABEL_YSIZE  12
-#define VIDEO_REC_SYMBOL_XPOS  (VIDEO_DISPLAY2_XPOS+20)
+#define VIDEO_REC_SYMBOL_XPOS  (VIDEO_DISPLAY2_XPOS + 20)
 #define VIDEO_REC_SYMBOL_YPOS  (VIDEO_DISPLAY2_YPOS)
 #define VIDEO_REC_SYMBOL_XSIZE 16
 #define VIDEO_REC_SYMBOL_YSIZE 16
-#define VIDEO_PLAY_LABEL_XPOS  (VIDEO_DISPLAY2_XPOS+65)
+#define VIDEO_PLAY_LABEL_XPOS  (VIDEO_DISPLAY2_XPOS + 65)
 #define VIDEO_PLAY_LABEL_YPOS  (VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PLAY_LABEL_XSIZE 22
 #define VIDEO_PLAY_LABEL_YSIZE 12
-#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS+52)
+#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52)
 #define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PLAY_SYMBOL_XSIZE        11
 #define VIDEO_PLAY_SYMBOL_YSIZE        13
 #define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS)
-#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS+20)
+#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20)
 #define VIDEO_PAUSE_LABEL_XSIZE        35
 #define VIDEO_PAUSE_LABEL_YSIZE        8
-#define VIDEO_PAUSE_SYMBOL_XPOS        (VIDEO_DISPLAY2_XPOS+35)
+#define VIDEO_PAUSE_SYMBOL_XPOS        (VIDEO_DISPLAY2_XPOS + 35)
 #define VIDEO_PAUSE_SYMBOL_YPOS        (VIDEO_DISPLAY2_YPOS)
 #define VIDEO_PAUSE_SYMBOL_XSIZE 17
 #define VIDEO_PAUSE_SYMBOL_YSIZE 13
-#define VIDEO_TIME_XPOS                (VIDEO_DISPLAY2_XPOS+38)
-#define VIDEO_TIME_YPOS                (VIDEO_DISPLAY2_YPOS+14)
+#define VIDEO_TIME_XPOS                (VIDEO_DISPLAY2_XPOS + 38)
+#define VIDEO_TIME_YPOS                (VIDEO_DISPLAY2_YPOS + 14)
 #define VIDEO_TIME_XSIZE       50
 #define VIDEO_TIME_YSIZE       16
 
 #define VIDEO_PBEND_LABEL_XSIZE        35
 #define VIDEO_PBEND_LABEL_YSIZE        30
 
-#define ON_VIDEO_BUTTON(x,y)   ((x)>=(VX+VIDEO_CONTROL_XPOS) &&        \
-                                (x)< (VX+VIDEO_CONTROL_XPOS +          \
-                                      VIDEO_CONTROL_XSIZE) &&          \
-                                (y)>=(VY+VIDEO_CONTROL_YPOS) &&        \
-                                (y)< (VY+VIDEO_CONTROL_YPOS +          \
-                                      VIDEO_CONTROL_YSIZE))
-#define VIDEO_BUTTON(x)                (((x)-(VX+VIDEO_CONTROL_XPOS))/VIDEO_BUTTON_XSIZE)
-
 #define VIDEO_STATE_OFF                (VIDEO_STATE_PLAY_OFF   |       \
                                 VIDEO_STATE_REC_OFF    |       \
                                 VIDEO_STATE_PAUSE_OFF  |       \
 #define VIDEO_ALL              (VIDEO_ALL_ON | VIDEO_ALL_OFF)
 
 
-/* some positions in the sound control window */
-#define SOUND_BUTTON_XSIZE     30
-#define SOUND_BUTTON_YSIZE     30
-#define SOUND_CONTROL_XPOS     5
-#define SOUND_CONTROL_YPOS     245
-#define SOUND_CONTROL_XSIZE     (3*SOUND_BUTTON_XSIZE)
-#define SOUND_CONTROL_YSIZE     (1*SOUND_BUTTON_YSIZE)
-#define SOUND_BUTTON_MUSIC_XPOS         (SOUND_CONTROL_XPOS + 0 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_LOOPS_XPOS         (SOUND_CONTROL_XPOS + 1 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_SIMPLE_XPOS (SOUND_CONTROL_XPOS + 2 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_ANY_YPOS   (SOUND_CONTROL_YPOS)
-
-#define ON_SOUND_BUTTON(x,y)   ((x)>=(DX+SOUND_CONTROL_XPOS) &&        \
-                                (x)< (DX+SOUND_CONTROL_XPOS +          \
-                                      SOUND_CONTROL_XSIZE) &&          \
-                                (y)>=(DY+SOUND_CONTROL_YPOS) &&        \
-                                (y)< (DY+SOUND_CONTROL_YPOS +          \
-                                      SOUND_CONTROL_YSIZE))
-#define SOUND_BUTTON(x)                (((x)-(DX+SOUND_CONTROL_XPOS))/SOUND_BUTTON_XSIZE)
-
-/* some positions in the game control window */
-#define GAME_BUTTON_STOP_XPOS  (GAME_CONTROL_XPOS + 0 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_STOP_YPOS  (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_PAUSE_XPOS (GAME_CONTROL_XPOS + 1 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_PAUSE_YPOS (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_PLAY_XPOS  (GAME_CONTROL_XPOS + 2 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_PLAY_YPOS  (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_ANY_YPOS   (GAME_CONTROL_YPOS)
-
-#define ON_GAME_BUTTON(x,y)    ((x)>=(DX+GAME_CONTROL_XPOS) && \
-                                (x)< (DX+GAME_CONTROL_XPOS +           \
-                                      GAME_CONTROL_XSIZE) &&           \
-                                (y)>=(DY+GAME_CONTROL_YPOS) && \
-                                (y)< (DY+GAME_CONTROL_YPOS +           \
-                                      GAME_CONTROL_YSIZE))
-#define GAME_BUTTON(x)         (((x)-(DX+GAME_CONTROL_XPOS))/GAME_BUTTON_XSIZE)
-
-/* some positions in the asking window */
-#define OK_BUTTON_XPOS         2
-#define OK_BUTTON_YPOS         250
-#define OK_BUTTON_GFX_YPOS     0
-#define OK_BUTTON_XSIZE                46
-#define OK_BUTTON_YSIZE                28
-#define NO_BUTTON_XPOS         52
-#define NO_BUTTON_YPOS         OK_BUTTON_YPOS
-#define NO_BUTTON_XSIZE                OK_BUTTON_XSIZE
-#define NO_BUTTON_YSIZE                OK_BUTTON_YSIZE
-#define CONFIRM_BUTTON_XPOS    2
-#define CONFIRM_BUTTON_GFX_YPOS        30
-#define CONFIRM_BUTTON_YPOS    OK_BUTTON_YPOS
-#define CONFIRM_BUTTON_XSIZE   96
-#define CONFIRM_BUTTON_YSIZE   OK_BUTTON_YSIZE
-
-#define ON_YESNO_BUTTON(x,y)   (((x)>=(DX+OK_BUTTON_XPOS) &&           \
-                                 (x)< (DX+OK_BUTTON_XPOS +             \
-                                       OK_BUTTON_XSIZE) &&             \
-                                 (y)>=(DY+OK_BUTTON_YPOS) &&           \
-                                 (y)< (DY+OK_BUTTON_YPOS +             \
-                                       OK_BUTTON_YSIZE)) ||            \
-                                ((x)>=(DX+NO_BUTTON_XPOS) &&           \
-                                 (x)< (DX+NO_BUTTON_XPOS +             \
-                                       NO_BUTTON_XSIZE) &&             \
-                                 (y)>=(DY+NO_BUTTON_YPOS) &&           \
-                                 (y)< (DY+NO_BUTTON_YPOS +             \
-                                       NO_BUTTON_YSIZE)))
-#define ON_CONFIRM_BUTTON(x,y) (((x)>=(DX+CONFIRM_BUTTON_XPOS) &&      \
-                                 (x)< (DX+CONFIRM_BUTTON_XPOS +        \
-                                       CONFIRM_BUTTON_XSIZE) &&        \
-                                 (y)>=(DY+CONFIRM_BUTTON_YPOS) &&      \
-                                 (y)< (DY+CONFIRM_BUTTON_YPOS +        \
-                                       CONFIRM_BUTTON_YSIZE)))
-#define YESNO_BUTTON(x)                (((x)-(DX+OK_BUTTON_XPOS))/OK_BUTTON_XSIZE)
-
-/* some positions in the choose player window */
-#define PLAYER_BUTTON_XSIZE    30
-#define PLAYER_BUTTON_YSIZE    30
-#define PLAYER_BUTTON_GFX_XPOS 5
-#define PLAYER_BUTTON_GFX_YPOS (215-30)
-#define PLAYER_CONTROL_XPOS    (5 + PLAYER_BUTTON_XSIZE/2)
-#define PLAYER_CONTROL_YPOS    (215 - PLAYER_BUTTON_YSIZE/2)
-#define PLAYER_CONTROL_XSIZE   (2*PLAYER_BUTTON_XSIZE)
-#define PLAYER_CONTROL_YSIZE   (2*PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_1_XPOS   (PLAYER_CONTROL_XPOS + 0 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_2_XPOS   (PLAYER_CONTROL_XPOS + 1 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_3_XPOS   (PLAYER_CONTROL_XPOS + 0 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_4_XPOS   (PLAYER_CONTROL_XPOS + 1 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_1_YPOS   (PLAYER_CONTROL_YPOS + 0 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_2_YPOS   (PLAYER_CONTROL_YPOS + 0 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_3_YPOS   (PLAYER_CONTROL_YPOS + 1 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_4_YPOS   (PLAYER_CONTROL_YPOS + 1 * PLAYER_BUTTON_YSIZE)
-
-#define ON_PLAYER_BUTTON(x,y)  ((x)>=(DX+PLAYER_CONTROL_XPOS) &&       \
-                                (x)< (DX+PLAYER_CONTROL_XPOS +         \
-                                      PLAYER_CONTROL_XSIZE) &&         \
-                                (y)>=(DY+PLAYER_CONTROL_YPOS) &&       \
-                                (y)< (DY+PLAYER_CONTROL_YPOS +         \
-                                      PLAYER_CONTROL_YSIZE))
-#define PLAYER_BUTTON(x,y)     ((((x)-(DX+PLAYER_CONTROL_XPOS)) /      \
-                                 PLAYER_BUTTON_XSIZE) + 2 *            \
-                                (((y)-(DY+PLAYER_CONTROL_YPOS)) /      \
-                                 PLAYER_BUTTON_YSIZE))
-
-
-/* some definitions for the editor control window */
-
-#define ON_EDIT_BUTTON(x,y)    (((x)>=(VX+ED_BUTTON_CTRL_XPOS) &&      \
-                                 (x)< (VX+ED_BUTTON_CTRL_XPOS +        \
-                                       ED_BUTTON_CTRL_XSIZE) &&        \
-                                 (y)>=(VY+ED_BUTTON_CTRL_YPOS) &&      \
-                                 (y)< (VY+ED_BUTTON_CTRL_YPOS +        \
-                                       ED_BUTTON_CTRL_YSIZE +          \
-                                       ED_BUTTON_FILL_YSIZE)) ||       \
-                                ((x)>=(VX+ED_BUTTON_LEFT_XPOS) &&      \
-                                 (x)< (VX+ED_BUTTON_LEFT_XPOS +        \
-                                       ED_BUTTON_LEFT_XSIZE +          \
-                                       ED_BUTTON_UP_XSIZE +            \
-                                       ED_BUTTON_RIGHT_XSIZE) &&       \
-                                 (y)>=(VY+ED_BUTTON_LEFT_YPOS) &&      \
-                                 (y)< (VY+ED_BUTTON_LEFT_YPOS +        \
-                                       ED_BUTTON_LEFT_YSIZE)) ||       \
-                                ((x)>=(VX+ED_BUTTON_UP_XPOS) &&        \
-                                 (x)< (VX+ED_BUTTON_UP_XPOS +          \
-                                       ED_BUTTON_UP_XSIZE) &&          \
-                                 (y)>=(VY+ED_BUTTON_UP_YPOS) &&        \
-                                 (y)< (VY+ED_BUTTON_UP_YPOS +          \
-                                       ED_BUTTON_UP_YSIZE +            \
-                                       ED_BUTTON_DOWN_YSIZE)))
-
-#define ON_CTRL_BUTTON(x,y)    ((x)>=(VX+ED_BUTTON_EDIT_XPOS) &&       \
-                                (x)< (VX+ED_BUTTON_EDIT_XPOS +         \
-                                      ED_BUTTON_EDIT_XSIZE) &&         \
-                                (y)>=(VY+ED_BUTTON_EDIT_YPOS) &&       \
-                                (y)< (VY+ED_BUTTON_EDIT_YPOS +         \
-                                      ED_BUTTON_EDIT_YSIZE +           \
-                                      ED_BUTTON_CLEAR_YSIZE +          \
-                                      ED_BUTTON_UNDO_YSIZE +           \
-                                      ED_BUTTON_EXIT_YSIZE))
-
-#define ON_ELEM_BUTTON(x,y)    (((x)>=(DX+ED_BUTTON_EUP_XPOS) &&       \
-                                 (x)< (DX+ED_BUTTON_EUP_XPOS +         \
-                                       ED_BUTTON_EUP_XSIZE) &&         \
-                                 (y)>=(DY+ED_BUTTON_EUP_YPOS) &&       \
-                                 (y)< (DY+ED_BUTTON_EUP_YPOS +         \
-                                       ED_BUTTON_EUP_YSIZE)) ||        \
-                                ((x)>=(DX+ED_BUTTON_EDOWN_XPOS) &&     \
-                                 (x)< (DX+ED_BUTTON_EDOWN_XPOS +       \
-                                       ED_BUTTON_EDOWN_XSIZE) &&       \
-                                 (y)>=(DY+ED_BUTTON_EDOWN_YPOS) &&     \
-                                 (y)< (DY+ED_BUTTON_EDOWN_YPOS +       \
-                                       ED_BUTTON_EDOWN_YSIZE)) ||      \
-                                ((x)>=(DX+ED_BUTTON_ELEM_XPOS) &&      \
-                                 (x)< (DX+ED_BUTTON_ELEM_XPOS +        \
-                                       MAX_ELEM_X*ED_BUTTON_ELEM_XSIZE) && \
-                                 (y)>=(DY+ED_BUTTON_ELEM_YPOS) &&      \
-                                 (y)< (DY+ED_BUTTON_ELEM_YPOS +        \
-                                       MAX_ELEM_Y*ED_BUTTON_ELEM_YSIZE)))
-
-#define ON_COUNT_BUTTON(x,y)   (((((x)>=ED_COUNT_GADGET_XPOS &&        \
-                                   (x)<(ED_COUNT_GADGET_XPOS +         \
-                                        ED_BUTTON_MINUS_XSIZE)) ||     \
-                                  ((x)>=(ED_COUNT_GADGET_XPOS +        \
-                                         (ED_BUTTON_PLUS_XPOS -        \
-                                          ED_BUTTON_MINUS_XPOS)) &&    \
-                                   (x)<(ED_COUNT_GADGET_XPOS +         \
-                                        (ED_BUTTON_PLUS_XPOS -         \
-                                         ED_BUTTON_MINUS_XPOS) +       \
-                                        ED_BUTTON_PLUS_XSIZE))) &&     \
-                                 ((y)>=ED_COUNT_GADGET_YPOS &&         \
-                                  (y)<(ED_COUNT_GADGET_YPOS +          \
-                                       16*ED_COUNT_GADGET_YSIZE)) &&   \
-                                 (((y)-ED_COUNT_GADGET_YPOS) %         \
-                                  ED_COUNT_GADGET_YSIZE) <             \
-                                 ED_BUTTON_MINUS_YSIZE) ||             \
-                                ((((x)>=ED_SIZE_GADGET_XPOS &&         \
-                                   (x)<(ED_SIZE_GADGET_XPOS +          \
-                                        ED_BUTTON_MINUS_XSIZE)) ||     \
-                                  ((x)>=(ED_SIZE_GADGET_XPOS +         \
-                                         (ED_BUTTON_PLUS_XPOS -        \
-                                          ED_BUTTON_MINUS_XPOS)) &&    \
-                                   (x)<(ED_SIZE_GADGET_XPOS +          \
-                                        (ED_BUTTON_PLUS_XPOS -         \
-                                         ED_BUTTON_MINUS_XPOS) +       \
-                                        ED_BUTTON_PLUS_XSIZE))) &&     \
-                                 ((y)>=ED_SIZE_GADGET_YPOS &&          \
-                                  (y)<(ED_SIZE_GADGET_YPOS +           \
-                                       2*ED_SIZE_GADGET_YSIZE)) &&     \
-                                 (((y)-ED_SIZE_GADGET_YPOS) %          \
-                                  ED_SIZE_GADGET_YSIZE) <              \
-                                 ED_BUTTON_MINUS_YSIZE))
-
-#define EDIT_BUTTON(x,y)       (((y) < (VY + ED_BUTTON_CTRL_YPOS +     \
-                                        ED_BUTTON_CTRL_YSIZE)) ? 0 :   \
-                                ((y) < (VY + ED_BUTTON_CTRL_YPOS +     \
-                                        ED_BUTTON_CTRL_YSIZE +         \
-                                        ED_BUTTON_FILL_YSIZE)) ? 1 :   \
-                                ((x) < (VX + ED_BUTTON_LEFT_XPOS +     \
-                                        ED_BUTTON_LEFT_XSIZE) ? 2 :    \
-                                 (x) > (VX + ED_BUTTON_LEFT_XPOS +     \
-                                        ED_BUTTON_LEFT_XSIZE +         \
-                                        ED_BUTTON_UP_XSIZE) ? 5 :      \
-                                 3+(((y)-(VY + ED_BUTTON_CTRL_YPOS +   \
-                                          ED_BUTTON_CTRL_YSIZE +       \
-                                          ED_BUTTON_FILL_YSIZE)) /     \
-                                    ED_BUTTON_UP_YSIZE)))
-
-#define CTRL_BUTTON(x,y)       (((y) < (VY + ED_BUTTON_EDIT_YPOS +     \
-                                        ED_BUTTON_EDIT_YSIZE)) ? 0 :   \
-                                1+(((y)-(VY + ED_BUTTON_EDIT_YPOS +    \
-                                        ED_BUTTON_EDIT_YSIZE)) /       \
-                                   ED_BUTTON_CLEAR_YSIZE))
-
-#define ELEM_BUTTON(x,y)       (((y) < (DY + ED_BUTTON_EUP_YPOS +      \
-                                        ED_BUTTON_EUP_YSIZE)) ? 0 :    \
-                                ((y) > (DY + ED_BUTTON_EDOWN_YPOS)) ? 1 : \
-                                2+(((y) - (DY + ED_BUTTON_ELEM_YPOS)) /   \
-                                ED_BUTTON_ELEM_YSIZE)*MAX_ELEM_X +     \
-                                ((x) - (DX + ED_BUTTON_ELEM_XPOS)) /   \
-                                ED_BUTTON_ELEM_XSIZE)
-
-#define COUNT_BUTTON(x,y)      ((x) < ED_SIZE_GADGET_XPOS ?            \
-                                ((((y) - ED_COUNT_GADGET_YPOS) /       \
-                                  ED_COUNT_GADGET_YSIZE)*2 +           \
-                                 ((x) < (ED_COUNT_GADGET_XPOS +        \
-                                         ED_BUTTON_MINUS_XSIZE) ? 0 : 1)) : \
-                                32+((((y) - ED_SIZE_GADGET_YPOS) /     \
-                                     ED_SIZE_GADGET_YSIZE)*2 +         \
-                                    ((x) < (ED_SIZE_GADGET_XPOS +      \
-                                            ED_BUTTON_MINUS_XSIZE) ? 0 : 1)))
-
-/****************************************************************/
-/********** drawing buttons and corresponding displays **********/
-/****************************************************************/
-
-void OLD_DrawVideoDisplay(unsigned long state, unsigned long value)
+void DrawVideoDisplay(unsigned long state, unsigned long value)
 {
   int i;
   int part_label = 0, part_symbol = 1;
@@ -483,171 +236,6 @@ void OLD_DrawVideoDisplay(unsigned long state, unsigned long value)
     redraw_mask |= REDRAW_VIDEO_3;
 }
 
-void DrawVideoDisplay(unsigned long state, unsigned long value)
-{
-  int i;
-  int part_label = 0, part_symbol = 1;
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
-  static char *monatsname[12] =
-  {
-    "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
-    "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
-  };
-  static int video_pos[10][2][4] =
-  {
-    {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
-       VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
-     { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
-       VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
-
-    {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
-       VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
-     { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
-       VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
-
-    {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
-       VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
-     { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
-       VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
-
-    {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
-       VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
-     { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
-       VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
-
-    {{ 0,0,
-       0,0 },
-     { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
-       VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }},
-
-    {{ VIDEO_BUTTON_PLAY_XPOS, VIDEO_BUTTON_ANY_YPOS,
-       VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
-     { 0,0,
-       0,0 }},
-
-    {{ VIDEO_BUTTON_REC_XPOS, VIDEO_BUTTON_ANY_YPOS,
-       VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
-     { 0,0,
-       0,0 }},
-
-    {{ VIDEO_BUTTON_PAUSE_XPOS, VIDEO_BUTTON_ANY_YPOS,
-       VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
-     { 0,0,
-       0,0 }},
-
-    {{ VIDEO_BUTTON_STOP_XPOS, VIDEO_BUTTON_ANY_YPOS,
-       VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
-     { 0,0,
-       0,0 }},
-
-    {{ VIDEO_BUTTON_EJECT_XPOS, VIDEO_BUTTON_ANY_YPOS,
-       VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
-     { 0,0,
-       0,0 }}
-  };
-
-  if (state & VIDEO_STATE_PBEND_OFF)
-  {
-    int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
-
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-             cx + VIDEO_REC_LABEL_XPOS,
-             cy + VIDEO_REC_LABEL_YPOS,
-             VIDEO_PBEND_LABEL_XSIZE,
-             VIDEO_PBEND_LABEL_YSIZE,
-             VX + VIDEO_REC_LABEL_XPOS,
-             VY + VIDEO_REC_LABEL_YPOS);
-  }
-
-  for(i=0;i<20;i++)
-  {
-    if (state & (1<<i))
-    {
-      int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
-
-      if (i%2)                 /* i ungerade => STATE_ON / PRESS_OFF */
-       cx = DOOR_GFX_PAGEX4;
-      else
-       cx = DOOR_GFX_PAGEX3;   /* i gerade => STATE_OFF / PRESS_ON */
-
-      if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
-       XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-                 cx + video_pos[pos][part_label][xpos],
-                 cy + video_pos[pos][part_label][ypos],
-                 video_pos[pos][part_label][xsize],
-                 video_pos[pos][part_label][ysize],
-                 VX + video_pos[pos][part_label][xpos],
-                 VY + video_pos[pos][part_label][ypos]);
-      if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
-       XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-                 cx + video_pos[pos][part_symbol][xpos],
-                 cy + video_pos[pos][part_symbol][ypos],
-                 video_pos[pos][part_symbol][xsize],
-                 video_pos[pos][part_symbol][ysize],
-                 VX + video_pos[pos][part_symbol][xpos],
-                 VY + video_pos[pos][part_symbol][ypos]);
-    }
-  }
-
-  if (state & VIDEO_STATE_FFWD_ON)
-  {
-    int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
-
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-             cx + VIDEO_PLAY_SYMBOL_XPOS,
-             cy + VIDEO_PLAY_SYMBOL_YPOS,
-             VIDEO_PLAY_SYMBOL_XSIZE - 2,
-             VIDEO_PLAY_SYMBOL_YSIZE,
-             VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
-             VY + VIDEO_PLAY_SYMBOL_YPOS);
-  }
-
-  if (state & VIDEO_STATE_PBEND_ON)
-  {
-    int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-             cx + VIDEO_PBEND_LABEL_XPOS,
-             cy + VIDEO_PBEND_LABEL_YPOS,
-             VIDEO_PBEND_LABEL_XSIZE,
-             VIDEO_PBEND_LABEL_YSIZE,
-             VX + VIDEO_REC_LABEL_XPOS,
-             VY + VIDEO_REC_LABEL_YPOS);
-  }
-
-  if (state & VIDEO_STATE_DATE_ON)
-  {
-    int tag = value % 100;
-    int monat = (value/100) % 100;
-    int jahr = (value/10000);
-
-    DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
-            int2str(tag,2),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
-            monatsname[monat],FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
-            int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
-  }
-
-  if (state & VIDEO_STATE_TIME_ON)
-  {
-    int min = value / 60;
-    int sec = value % 60;
-
-    DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
-            int2str(min,2),FS_SMALL,FC_SPECIAL1);
-    DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
-            int2str(sec,2),FS_SMALL,FC_SPECIAL1);
-  }
-
-  if (state & VIDEO_STATE_DATE)
-    redraw_mask |= REDRAW_VIDEO_1;
-  if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
-    redraw_mask |= REDRAW_VIDEO_2;
-  if (state & VIDEO_PRESS)
-    redraw_mask |= REDRAW_VIDEO_3;
-}
-
 void DrawCompleteVideoDisplay()
 {
   XCopyArea(display,pix[PIX_DOOR],drawto,gc,
@@ -774,8 +362,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        char cursor_letter;
        char cursor_string[3];
        char text[MAX_GADGET_TEXTSIZE + 1];
-       int font_color = FC_YELLOW;
-       int border = gi->design_border;
+       int font_type = gi->text.font_type;
+       int font_width = getFontWidth(FS_SMALL, font_type);
+       int border = gi->border.size;
        strcpy(text, gi->text.value);
        strcat(text, " ");
 
@@ -786,16 +375,16 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        /* middle part of gadget */
        for (i=0; i<=gi->text.size; i++)
          XCopyArea(display, gd->pixmap, drawto, gc,
-                   gd->x + border, gd->y, FONT2_XSIZE, gi->height,
-                   gi->x + border + i * FONT2_XSIZE, gi->y);
+                   gd->x + border, gd->y, font_width, gi->height,
+                   gi->x + border + i * font_width, gi->y);
 
        /* right part of gadget */
        XCopyArea(display, gd->pixmap, drawto, gc,
-                 gd->x + ED_WIN_COUNT_XSIZE - border, gd->y,
+                 gd->x + gi->border.width - border, gd->y,
                  border, gi->height, gi->x + gi->width - border, gi->y);
 
        /* gadget text value */
-       DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_color);
+       DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_type);
 
        cursor_letter = gi->text.value[gi->text.cursor_position];
        cursor_string[0] = '~';
@@ -804,8 +393,8 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
 
        /* draw cursor, if active */
        if (pressed)
-         DrawText(gi->x + border + gi->text.cursor_position * FONT2_XSIZE,
-                  gi->y + border, cursor_string, FS_SMALL, font_color);
+         DrawText(gi->x + border + gi->text.cursor_position * font_width,
+                  gi->y + border, cursor_string, FS_SMALL, font_type);
       }
       break;
 
@@ -815,9 +404,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        int xpos = gi->x;
        int ypos = gi->y + gi->scrollbar.position;
        int design_full = gi->width;
-       int design_body = design_full - 2 * gi->design_border;
+       int design_body = design_full - 2 * gi->border.size;
        int size_full = gi->scrollbar.size;
-       int size_body = size_full - 2 * gi->design_border;
+       int size_body = size_full - 2 * gi->border.size;
        int num_steps = size_body / design_body;
        int step_size_remain = size_body - num_steps * design_body;
 
@@ -828,28 +417,28 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        /* upper part of gadget */
        XCopyArea(display, gd->pixmap, drawto, gc,
                  gd->x, gd->y,
-                 gi->width, gi->design_border,
+                 gi->width, gi->border.size,
                  xpos, ypos);
 
        /* middle part of gadget */
        for (i=0; i<num_steps; i++)
          XCopyArea(display, gd->pixmap, drawto, gc,
-                   gd->x, gd->y + gi->design_border,
+                   gd->x, gd->y + gi->border.size,
                    gi->width, design_body,
-                   xpos, ypos + gi->design_border + i * design_body);
+                   xpos, ypos + gi->border.size + i * design_body);
 
        /* remaining middle part of gadget */
        if (step_size_remain > 0)
          XCopyArea(display, gd->pixmap, drawto, gc,
-                   gd->x,  gd->y + gi->design_border,
+                   gd->x,  gd->y + gi->border.size,
                    gi->width, step_size_remain,
-                   xpos, ypos + gi->design_border + num_steps * design_body);
+                   xpos, ypos + gi->border.size + num_steps * design_body);
 
        /* lower part of gadget */
        XCopyArea(display, gd->pixmap, drawto, gc,
-                 gd->x, gd->y + design_full - gi->design_border,
-                 gi->width, gi->design_border,
-                 xpos, ypos + size_full - gi->design_border);
+                 gd->x, gd->y + design_full - gi->border.size,
+                 gi->width, gi->border.size,
+                 xpos, ypos + size_full - gi->border.size);
       }
       break;
 
@@ -859,9 +448,9 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        int xpos = gi->x + gi->scrollbar.position;
        int ypos = gi->y;
        int design_full = gi->height;
-       int design_body = design_full - 2 * gi->design_border;
+       int design_body = design_full - 2 * gi->border.size;
        int size_full = gi->scrollbar.size;
-       int size_body = size_full - 2 * gi->design_border;
+       int size_body = size_full - 2 * gi->border.size;
        int num_steps = size_body / design_body;
        int step_size_remain = size_body - num_steps * design_body;
 
@@ -872,28 +461,28 @@ static void DrawGadget(struct GadgetInfo *gi, boolean pressed, boolean direct)
        /* left part of gadget */
        XCopyArea(display, gd->pixmap, drawto, gc,
                  gd->x, gd->y,
-                 gi->design_border, gi->height,
+                 gi->border.size, gi->height,
                  xpos, ypos);
 
        /* middle part of gadget */
        for (i=0; i<num_steps; i++)
          XCopyArea(display, gd->pixmap, drawto, gc,
-                   gd->x + gi->design_border, gd->y,
+                   gd->x + gi->border.size, gd->y,
                    design_body, gi->height,
-                   xpos + gi->design_border + i * design_body, ypos);
+                   xpos + gi->border.size + i * design_body, ypos);
 
        /* remaining middle part of gadget */
        if (step_size_remain > 0)
          XCopyArea(display, gd->pixmap, drawto, gc,
-                   gd->x + gi->design_border, gd->y,
+                   gd->x + gi->border.size, gd->y,
                    step_size_remain, gi->height,
-                   xpos + gi->design_border + num_steps * design_body, ypos);
+                   xpos + gi->border.size + num_steps * design_body, ypos);
 
        /* right part of gadget */
        XCopyArea(display, gd->pixmap, drawto, gc,
-                 gd->x + design_full - gi->design_border, gd->y,
-                 gi->design_border, gi->height,
-                 xpos + size_full - gi->design_border, ypos);
+                 gd->x + design_full - gi->border.size, gd->y,
+                 gi->border.size, gi->height,
+                 xpos + size_full - gi->border.size, ypos);
       }
       break;
 
@@ -922,6 +511,10 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
        gi->custom_id = va_arg(ap, int);
        break;
 
+      case GDI_CUSTOM_TYPE_ID:
+       gi->custom_type_id = va_arg(ap, int);
+       break;
+
       case GDI_INFO_TEXT:
        {
          int max_textsize = MAX_INFO_TEXTSIZE - 1;
@@ -1007,15 +600,13 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 
          gi->text.size = max_textsize;
          gi->text.value[max_textsize] = '\0';
-
-         if (gi->width == 0 && gi->height == 0)
-         {
-           gi->width = (gi->text.size + 1) * FONT2_XSIZE + 6;
-           gi->height = ED_WIN_COUNT_YSIZE;
-         }
        }
        break;
 
+      case GDI_TEXT_FONT:
+       gi->text.font_type = va_arg(ap, int);
+       break;
+
       case GDI_DESIGN_UNPRESSED:
        gi->design[GD_BUTTON_UNPRESSED].pixmap = va_arg(ap, Pixmap);
        gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
@@ -1040,8 +631,12 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
        gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
        break;
 
-      case GDI_DESIGN_BORDER:
-       gi->design_border = va_arg(ap, int);
+      case GDI_BORDER_SIZE:
+       gi->border.size = va_arg(ap, int);
+       break;
+
+      case GDI_TEXTINPUT_DESIGN_WIDTH:
+       gi->border.width = va_arg(ap, int);
        break;
 
       case GDI_DECORATION_DESIGN:
@@ -1142,6 +737,15 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
 
   /* adjust gadget values in relation to other gadget values */
 
+  if (gi->type & GD_TYPE_TEXTINPUT)
+  {
+    int font_width = getFontWidth(FS_SMALL, gi->text.font_type);
+    int font_height = getFontHeight(FS_SMALL, gi->text.font_type);
+
+    gi->width = 2 * gi->border.size + (gi->text.size + 1) * font_width;
+    gi->height = 2 * gi->border.size + font_height;
+  }
+
   if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC)
   {
     struct GadgetTextInput *text = &gi->text;
@@ -1168,6 +772,7 @@ static void HandleGadgetTags(struct GadgetInfo *gi, int first_tag, va_list ap)
     gs->size = gs->size_max * gs->items_visible / gs->items_max;
     gs->position = gs->size_max * gs->item_position / gs->items_max;
     gs->position_max = gs->size_max - gs->size;
+    gs->correction = gs->size_max / gs->items_max / 2;
 
     /* finetuning for maximal right/bottom position */
     if (gs->item_position == gs->items_max - gs->items_visible)
@@ -1307,7 +912,8 @@ static void MultiMapGadgets(int mode)
   {
     if ((mode & MULTIMAP_PLAYFIELD && gi->x < SX + SXSIZE) ||
        (mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y < DY + DYSIZE) ||
-       (mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y > DY + DYSIZE))
+       (mode & MULTIMAP_DOOR_2 && gi->x >= DX && gi->y > DY + DYSIZE) ||
+       (mode & MULTIMAP_ALL) == MULTIMAP_ALL)
     {
       if (mode & MULTIMAP_UNMAP)
       {
@@ -1399,7 +1005,9 @@ void HandleGadgets(int mx, int my, int button)
     if (new_gi == last_gi)
     {
       /* if mouse button pressed inside activated text gadget, set cursor */
-      gi->text.cursor_position = (mx - gi->x) / FONT2_XSIZE;
+      gi->text.cursor_position =
+       (mx - gi->x - gi->border.size) /
+       getFontWidth(FS_SMALL, gi->text.font_type);
 
       if (gi->text.cursor_position < 0)
        gi->text.cursor_position = 0;
@@ -1414,6 +1022,8 @@ void HandleGadgets(int mx, int my, int button)
       CheckRangeOfNumericInputGadget(gi);
       DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
+      gi->event.type = GD_EVENT_TEXT_LEAVING;
+
       if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
        gi->callback_action(gi);
 
@@ -1591,6 +1201,8 @@ void HandleGadgets(int mx, int my, int button)
 
   if (gadget_pressed_repeated)
   {
+    gi->event.type = GD_EVENT_PRESSED;
+
     if (gi->event_mask & GD_EVENT_REPEATED &&
        DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
       gi->callback_action(gi);
@@ -1618,7 +1230,13 @@ void HandleGadgets(int mx, int my, int button)
       if (gs->position > gs->position_max)
        gs->position = gs->position_max;
 
-      gs->item_position = gs->items_max * gs->position / gs->size_max;
+      gs->item_position =
+       gs->items_max * (gs->position + gs->correction) / gs->size_max;
+
+      if (gs->item_position < 0)
+       gs->item_position = 0;
+      if (gs->item_position > gs->items_max - 1)
+       gs->item_position = gs->items_max - 1;
 
       if (old_item_position != gs->item_position)
       {
@@ -1719,6 +1337,8 @@ void HandleGadgetsKeyInput(KeySym key)
     CheckRangeOfNumericInputGadget(gi);
     DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
 
+    gi->event.type = GD_EVENT_TEXT_RETURN;
+
     if (gi->event_mask & GD_EVENT_TEXT_RETURN)
       gi->callback_action(gi);