rnd-19990216-1
authorHolger Schemel <info@artsoft.org>
Tue, 16 Feb 1999 01:04:58 +0000 (02:04 +0100)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:33:43 +0000 (10:33 +0200)
src/buttons.c
src/buttons.h
src/editor.c
src/game.c

index 1e0ff787ccc7ac9c197fd6f8919de86aeb83c307..db43b201cccc4aa7321638c95b29a850f94a5311 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,
index b5bb5ec36078c17b582ac4f048fb211b9d9bbb97..3740bfc9352a4cc958a6ed9afc020b27047f3ed9 100644 (file)
 #define VIDEO_BUTTON_YSIZE     18
 #define VIDEO_CONTROL_XPOS     5
 #define VIDEO_CONTROL_YPOS     77
-#define VIDEO_CONTROL_XSIZE    (VIDEO_DISPLAY_XSIZE)
-#define VIDEO_CONTROL_YSIZE    (VIDEO_BUTTON_YSIZE)
-
-/* values for requests */
-#define BUTTON_OK              (1L<<0)
-#define BUTTON_NO              (1L<<1)
-#define BUTTON_CONFIRM         (1L<<2)
-
-/* values for choosing network player */
-#define BUTTON_PLAYER_1                (1L<<10)
-#define BUTTON_PLAYER_2                (1L<<11)
-#define BUTTON_PLAYER_3                (1L<<12)
-#define BUTTON_PLAYER_4                (1L<<13)
-
-/* for DrawPlayerButton() */
-#define DB_INIT                        0
-#define DB_NORMAL              1
-
-/* the following definitions are also used by screens.c */
-
-/* buttons of the video tape player */
-#define BUTTON_VIDEO_EJECT     1
-#define BUTTON_VIDEO_STOP      2
-#define BUTTON_VIDEO_PAUSE     3
-#define BUTTON_VIDEO_REC       4
-#define BUTTON_VIDEO_PLAY      5
+#define VIDEO_CONTROL_XSIZE    VIDEO_DISPLAY_XSIZE
+#define VIDEO_CONTROL_YSIZE    VIDEO_BUTTON_YSIZE
 
 /* values for video tape control */
-#define VIDEO_STATE_PLAY_OFF   (1L<<0)
-#define VIDEO_STATE_PLAY_ON    (1L<<1)
+#define VIDEO_STATE_PLAY_OFF   (1L << 0)
+#define VIDEO_STATE_PLAY_ON    (1L << 1)
 #define VIDEO_STATE_PLAY       (VIDEO_STATE_PLAY_OFF   | VIDEO_STATE_PLAY_ON)
-#define VIDEO_STATE_REC_OFF    (1L<<2)
-#define VIDEO_STATE_REC_ON     (1L<<3)
+#define VIDEO_STATE_REC_OFF    (1L << 2)
+#define VIDEO_STATE_REC_ON     (1L << 3)
 #define VIDEO_STATE_REC                (VIDEO_STATE_REC_OFF    | VIDEO_STATE_REC_ON)
-#define VIDEO_STATE_PAUSE_OFF  (1L<<4)
-#define VIDEO_STATE_PAUSE_ON   (1L<<5)
+#define VIDEO_STATE_PAUSE_OFF  (1L << 4)
+#define VIDEO_STATE_PAUSE_ON   (1L << 5)
 #define VIDEO_STATE_PAUSE      (VIDEO_STATE_PAUSE_OFF  | VIDEO_STATE_PAUSE_ON)
-#define VIDEO_STATE_DATE_OFF   (1L<<6)
-#define VIDEO_STATE_DATE_ON    (1L<<7)
+#define VIDEO_STATE_DATE_OFF   (1L << 6)
+#define VIDEO_STATE_DATE_ON    (1L << 7)
 #define VIDEO_STATE_DATE       (VIDEO_STATE_DATE_OFF   | VIDEO_STATE_DATE_ON)
-#define VIDEO_STATE_TIME_OFF   (1L<<8)
-#define VIDEO_STATE_TIME_ON    (1L<<9)
+#define VIDEO_STATE_TIME_OFF   (1L << 8)
+#define VIDEO_STATE_TIME_ON    (1L << 9)
 #define VIDEO_STATE_TIME       (VIDEO_STATE_TIME_OFF   | VIDEO_STATE_TIME_ON)
-#define VIDEO_PRESS_PLAY_ON    (1L<<10)
-#define VIDEO_PRESS_PLAY_OFF   (1L<<11)
+#define VIDEO_PRESS_PLAY_ON    (1L << 10)
+#define VIDEO_PRESS_PLAY_OFF   (1L << 11)
 #define VIDEO_PRESS_PLAY       (VIDEO_PRESS_PLAY_OFF   | VIDEO_PRESS_PLAY_ON)
-#define VIDEO_PRESS_REC_ON     (1L<<12)
-#define VIDEO_PRESS_REC_OFF    (1L<<13)
+#define VIDEO_PRESS_REC_ON     (1L << 12)
+#define VIDEO_PRESS_REC_OFF    (1L << 13)
 #define VIDEO_PRESS_REC                (VIDEO_PRESS_REC_OFF    | VIDEO_PRESS_REC_ON)
-#define VIDEO_PRESS_PAUSE_ON   (1L<<14)
-#define VIDEO_PRESS_PAUSE_OFF  (1L<<15)
+#define VIDEO_PRESS_PAUSE_ON   (1L << 14)
+#define VIDEO_PRESS_PAUSE_OFF  (1L << 15)
 #define VIDEO_PRESS_PAUSE      (VIDEO_PRESS_PAUSE_OFF  | VIDEO_PRESS_PAUSE_ON)
-#define VIDEO_PRESS_STOP_ON    (1L<<16)
-#define VIDEO_PRESS_STOP_OFF   (1L<<17)
+#define VIDEO_PRESS_STOP_ON    (1L << 16)
+#define VIDEO_PRESS_STOP_OFF   (1L << 17)
 #define VIDEO_PRESS_STOP       (VIDEO_PRESS_STOP_OFF   | VIDEO_PRESS_STOP_ON)
-#define VIDEO_PRESS_EJECT_ON   (1L<<18)
-#define VIDEO_PRESS_EJECT_OFF  (1L<<19)
+#define VIDEO_PRESS_EJECT_ON   (1L << 18)
+#define VIDEO_PRESS_EJECT_OFF  (1L << 19)
 #define VIDEO_PRESS_EJECT      (VIDEO_PRESS_EJECT_OFF  | VIDEO_PRESS_EJECT_ON)
 
 /* special */
-#define VIDEO_STATE_FFWD_OFF   ((1L<<20) | VIDEO_STATE_PAUSE_OFF)
-#define VIDEO_STATE_FFWD_ON    (1L<<21)
+#define VIDEO_STATE_FFWD_OFF   ((1L << 20) | VIDEO_STATE_PAUSE_OFF)
+#define VIDEO_STATE_FFWD_ON    (1L << 21)
 #define VIDEO_STATE_FFWD       (VIDEO_STATE_FFWD_OFF   | VIDEO_STATE_FFWD_ON)
-#define VIDEO_STATE_PBEND_OFF  (1L<<22)
-#define VIDEO_STATE_PBEND_ON   (1L<<23)
+#define VIDEO_STATE_PBEND_OFF  (1L << 22)
+#define VIDEO_STATE_PBEND_ON   (1L << 23)
 #define VIDEO_STATE_PBEND      (VIDEO_STATE_PBEND_OFF  | VIDEO_STATE_PBEND_ON)
 
 /* tags to draw video display labels or symbols only */
 #define VIDEO_DISPLAY_LABEL_ONLY       1
 #define VIDEO_DISPLAY_SYMBOL_ONLY      2
 
-/* values for sound control */
-#define BUTTON_SOUND_MUSIC     (1L<<0)
-#define BUTTON_SOUND_LOOPS     (1L<<1)
-#define BUTTON_SOUND_SIMPLE    (1L<<2)
-#define BUTTON_RELEASED                0
-#define BUTTON_PRESSED         (1L<<3)
-#define BUTTON_OFF             0
-#define BUTTON_ON              (1L<<4)
-#define BUTTON_SOUND_MUSIC_OFF (BUTTON_SOUND_MUSIC  | BUTTON_OFF)
-#define BUTTON_SOUND_LOOPS_OFF (BUTTON_SOUND_LOOPS  | BUTTON_OFF)
-#define BUTTON_SOUND_SIMPLE_OFF        (BUTTON_SOUND_SIMPLE | BUTTON_OFF)
-#define BUTTON_SOUND_MUSIC_ON  (BUTTON_SOUND_MUSIC  | BUTTON_ON)
-#define BUTTON_SOUND_LOOPS_ON  (BUTTON_SOUND_LOOPS  | BUTTON_ON)
-#define BUTTON_SOUND_SIMPLE_ON (BUTTON_SOUND_SIMPLE | BUTTON_ON)
-
-/* values for game control */
-#define BUTTON_GAME_STOP       (1L<<0)
-#define BUTTON_GAME_PAUSE      (1L<<1)
-#define BUTTON_GAME_PLAY       (1L<<2)
-
-/* the following definitions are also used by game.c */
-
-/* some positions in the game control window */
-#define GAME_BUTTON_XSIZE      30
-#define GAME_BUTTON_YSIZE      30
-#define GAME_CONTROL_XPOS      5
-#define GAME_CONTROL_YPOS      215
-#define GAME_CONTROL_XSIZE     (3*GAME_BUTTON_XSIZE)
-#define GAME_CONTROL_YSIZE     (1*GAME_BUTTON_YSIZE)
-
-/* the following definitions are also used by editor.c */
-
-/* some positions in the editor control window */
-#define ED_BUTTON_EUP_XPOS     35
-#define ED_BUTTON_EUP_YPOS     5
-#define ED_BUTTON_EUP_XSIZE    30
-#define ED_BUTTON_EUP_YSIZE    25
-#define ED_BUTTON_EDOWN_XPOS   35
-#define ED_BUTTON_EDOWN_YPOS   250
-#define ED_BUTTON_EDOWN_XSIZE  30
-#define ED_BUTTON_EDOWN_YSIZE  25
-#define ED_BUTTON_ELEM_XPOS    6
-#define ED_BUTTON_ELEM_YPOS    30
-#define ED_BUTTON_ELEM_XSIZE   22
-#define ED_BUTTON_ELEM_YSIZE   22
-
-#define ED_BUTTON_EUP_Y2POS    140
-#define ED_BUTTON_EDOWN_Y2POS  165
-#define ED_BUTTON_ELEM_Y2POS   190
-
-#define ED_CURSORBUTTON_XSIZE  30
-#define ED_CURSORBUTTON_YSIZE  20
+void DrawVideoDisplay(unsigned long, unsigned long);
+void DrawCompleteVideoDisplay(void);
 
-#define ED_BUTTON_CTRL_XPOS    5
-#define ED_BUTTON_CTRL_YPOS    5
-#define ED_BUTTON_CTRL_XSIZE   90
-#define ED_BUTTON_CTRL_YSIZE   30
-#define ED_BUTTON_FILL_XPOS    5
-#define ED_BUTTON_FILL_YPOS    35
-#define ED_BUTTON_FILL_XSIZE   90
-#define ED_BUTTON_FILL_YSIZE   20
-#define ED_BUTTON_LEFT_XPOS    5
-#define ED_BUTTON_LEFT_YPOS    65
-#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_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_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_CURSORBUTTON_XSIZE
-#define ED_BUTTON_RIGHT_YSIZE  ED_CURSORBUTTON_YSIZE
 
-#define ED_BUTTON_EDIT_XPOS    5
-#define ED_BUTTON_EDIT_YPOS    5
-#define ED_BUTTON_EDIT_XSIZE   90
-#define ED_BUTTON_EDIT_YSIZE   30
-#define ED_BUTTON_CLEAR_XPOS   5
-#define ED_BUTTON_CLEAR_YPOS   35
-#define ED_BUTTON_CLEAR_XSIZE  90
-#define ED_BUTTON_CLEAR_YSIZE  20
-#define ED_BUTTON_UNDO_XPOS    5
-#define ED_BUTTON_UNDO_YPOS    55
-#define ED_BUTTON_UNDO_XSIZE   90
-#define ED_BUTTON_UNDO_YSIZE   20
-#define ED_BUTTON_EXIT_XPOS    5
-#define ED_BUTTON_EXIT_YPOS    75
-#define ED_BUTTON_EXIT_XSIZE   90
-#define ED_BUTTON_EXIT_YSIZE   20
+/* NEW GADGET STUFF -------------------------------------------------------- */
 
+/* some values for gadget graphics (also used by editor.c) */
 #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   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_XPOS      (2 + ED_BUTTON_COUNT_XSIZE + 2)
 #define ED_WIN_COUNT_YPOS      ED_BUTTON_COUNT_YPOS
 #define ED_WIN_COUNT_XSIZE     52
 #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_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)
-#define ED_COUNT_GADGET_YSIZE  (ED_BUTTON_MINUS_YSIZE+4)
-#define ED_COUNT_TEXT_XPOS     (ED_COUNT_GADGET_XPOS+DXSIZE+10)
-#define ED_COUNT_TEXT_YPOS     (ED_COUNT_GADGET_YPOS+3)
-#define ED_COUNT_TEXT_YSIZE    ED_COUNT_GADGET_YSIZE
-#define ED_COUNT_VALUE_XPOS    (ED_COUNT_GADGET_XPOS+ED_BUTTON_MINUS_XSIZE+7)
-#define ED_COUNT_VALUE_YPOS    ED_COUNT_TEXT_YPOS
-#define ED_SIZE_GADGET_XPOS    (SX+21*MINI_TILEX)
-#define ED_SIZE_GADGET_YPOS    (SY+4*MINI_TILEY)
-#define ED_SIZE_GADGET_YSIZE   (ED_BUTTON_MINUS_YSIZE+4)
-#define ED_SIZE_TEXT_XPOS      (ED_SIZE_GADGET_XPOS+DXSIZE+10)
-#define ED_SIZE_TEXT_YPOS      (ED_SIZE_GADGET_YPOS+3)
-#define ED_SIZE_TEXT_YSIZE     ED_COUNT_GADGET_YSIZE
-#define ED_SIZE_VALUE_XPOS     (ED_SIZE_GADGET_XPOS+ED_BUTTON_MINUS_XSIZE+7)
-#define ED_SIZE_VALUE_YPOS     ED_SIZE_TEXT_YPOS
-
-/* values for asking control */
-#define ED_BUTTON_CTRL         (1L<<0)
-#define ED_BUTTON_FILL         (1L<<1)
-#define ED_BUTTON_LEFT         (1L<<2)
-#define ED_BUTTON_UP           (1L<<3)
-#define ED_BUTTON_DOWN         (1L<<4)
-#define ED_BUTTON_RIGHT                (1L<<5)
-#define ED_BUTTON_EDIT         (1L<<6)
-#define ED_BUTTON_CLEAR                (1L<<7)
-#define ED_BUTTON_UNDO         (1L<<8)
-#define ED_BUTTON_EXIT         (1L<<9)
-
-#define ED_BUTTON_PRESSED      (1L<<10)
-#define ED_BUTTON_RELEASED     (1L<<11)
-
-#define ED_BUTTON_EUP          0
-#define ED_BUTTON_EDOWN                1
-#define ED_BUTTON_ELEM         2
-
-void DrawVideoDisplay(unsigned long, unsigned long);
-void DrawCompleteVideoDisplay(void);
-
-
-/* NEW GADGET STUFF -------------------------------------------------------- */
-
 
 /* gadget types */
 #define GD_TYPE_NORMAL_BUTTON          (1 << 0)
index a74d702c58d2c19539b79bcdac92ecd1380f415f..9df186776b76713a89461b6aa0dcbd0f685b12b6 100644 (file)
 #define ED_CHECKBUTTON_YPOS            (ED_BUTTON_MINUS_YPOS + 22)
 #define ED_STICKYBUTTON_YPOS           (ED_BUTTON_MINUS_YPOS + 88)
 
-#define GADGET_ID_NONE                 -1
+/* some positions in the editor control window */
+#define ED_BUTTON_ELEM_XPOS    6
+#define ED_BUTTON_ELEM_YPOS    30
+#define ED_BUTTON_ELEM_XSIZE   22
+#define ED_BUTTON_ELEM_YSIZE   22
+
+#define ED_BUTTON_MINUS_XPOS   2
+#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_BUTTON_PLUS_XPOS    (ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2)
+#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
+
+/* editor gadget identifiers */
 
 /* drawing toolbox buttons */
+#define GADGET_ID_NONE                 -1
 #define GADGET_ID_SINGLE_ITEMS         0
 #define GADGET_ID_CONNECTED_ITEMS      1
 #define GADGET_ID_LINE                 2
 
 #define ED_NUM_SCROLLBUTTONS           6
 
+#define ED_SCROLLBUTTON_ID_AREA_FIRST  ED_SCROLLBUTTON_ID_AREA_UP
+#define ED_SCROLLBUTTON_ID_AREA_LAST   ED_SCROLLBUTTON_ID_AREA_RIGHT
+
 /* values for scrollbar gadgets */
 #define ED_SCROLLBAR_ID_HORIZONTAL     0
 #define ED_SCROLLBAR_ID_VERTICAL       1
 
 /* values for radiobutton gadgets */
 #define ED_RADIOBUTTON_ID_PERCENTAGE   0
-#define ED_RADIOBUTTON_ID_QUANTITY             1
+#define ED_RADIOBUTTON_ID_QUANTITY     1
 
 #define ED_NUM_RADIOBUTTONS            2
 
@@ -1665,6 +1684,8 @@ static void MapControlButtons()
     MapGadget(level_editor_gadget[i]);
   for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
     MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
+  MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_UP]);
+  MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_DOWN]);
 }
 
 static void MapCounterButtons(int id)
@@ -1700,7 +1721,7 @@ static void MapMainDrawingArea()
   boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
   int i;
 
-  for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+  for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i<=ED_SCROLLBUTTON_ID_AREA_LAST; i++)
   {
     if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
          i == ED_SCROLLBUTTON_ID_AREA_RIGHT) &&
@@ -1749,16 +1770,15 @@ void UnmapLevelEditorGadgets()
 
 void DrawLevelEd()
 {
-  int i, x, y, graphic;
-
   edit_mode = ED_MODE_DRAWING;
 
   CloseDoor(DOOR_CLOSE_ALL);
-
   OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
 
   if (level_editor_test_game)
   {
+    int x, y;
+
     for(x=0; x<lev_fieldx; x++)
       for(y=0; y<lev_fieldy; y++)
        Feld[x][y] = Ur[x][y];
@@ -1778,70 +1798,39 @@ void DrawLevelEd()
     CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
   }
 
-  /*
-  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
-  FadeToFront();
-  */
-
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
-           DXSIZE,DYSIZE,
-           DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX6+ED_BUTTON_ELEM_XPOS,
-           DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS,
-           4*ED_BUTTON_ELEM_XSIZE,5*ED_BUTTON_ELEM_YSIZE,
-           DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS,
-           DOOR_GFX_PAGEY1+ED_BUTTON_EUP_Y2POS);
-
-  for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
-  {
-    if (i < elements_in_list)
-      graphic = el2gfx(editor_element[i + element_shift]);
-    else
-      graphic = GFX_LEERRAUM;
-
-    DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-                      DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 + 
-                      (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
-                      DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
-                      (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
-                      graphic);
-  }
+  /* copy default editor door content to main double buffer */
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+           DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-                    DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
-                    DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
+  /* draw mouse button brush elements */
+  DrawMiniGraphicExt(drawto, gc,
+                    DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
                     el2gfx(new_element1));
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-                    DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
-                    DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
+  DrawMiniGraphicExt(drawto, gc,
+                    DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
                     el2gfx(new_element2));
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-                    DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
-                    DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
+  DrawMiniGraphicExt(drawto, gc,
+                    DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
                     el2gfx(new_element3));
-  DrawTextExt(pix[PIX_DB_DOOR],gc,
-             DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS,
-             DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-             int2str(level_nr,2),FS_SMALL,FC_SPECIAL1);
-  XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+3,
-           DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-           7,FONT3_YSIZE,
-           DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS,
-           DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
-  XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+14,
-           DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
-           7,FONT3_YSIZE,
-           DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS+9,
-           DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
-
-  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY2,
-           VXSIZE,VYSIZE,
-           DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
+
+  /* draw level number */
+  DrawTextExt(pix[PIX_DB_DOOR], gc,
+             DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS,
+             DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+             int2str(level_nr, 2), FS_SMALL, FC_SPECIAL1);
+  /* copy level number to fit into level number field */
+  XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+           DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 3,
+           DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+           7, FONT3_YSIZE,
+           DX + ED_WIN_LEVELNR_XPOS,
+           DY + ED_WIN_LEVELNR_YPOS);
+  XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc,
+           DOOR_GFX_PAGEX2 + ED_WIN_LEVELNR_XPOS + 14,
+           DOOR_GFX_PAGEY1 + ED_WIN_LEVELNR_YPOS,
+           7, FONT3_YSIZE,
+           DX + ED_WIN_LEVELNR_XPOS + 9,
+           DY + ED_WIN_LEVELNR_YPOS);
 
   /* draw bigger door */
   XCopyArea(display, pix[PIX_DOOR], drawto, gc,
@@ -1857,19 +1846,17 @@ void DrawLevelEd()
 
   redraw_mask |= REDRAW_ALL;
 
-  OpenDoor(DOOR_OPEN_1);
-
-  strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
-
   MapControlButtons();
 
-  /*
-  MapMainDrawingArea();
-  */
+  /* copy actual editor door content to door double buffer for OpenDoor() */
+  XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
+           DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   DrawDrawingWindow();
   FadeToFront();
 
+  OpenDoor(DOOR_OPEN_1);
+
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
   */
@@ -2421,8 +2408,6 @@ static void DrawPropertiesWindow()
 
   if (HAS_CONTENT(properties_element))
   {
-
-#if 1
     /* draw stickybutton gadget */
     i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
     x = checkbutton_info[i].x + xoffset_right2;
@@ -2432,8 +2417,6 @@ static void DrawPropertiesWindow()
     ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
                 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
     MapCheckbuttonGadget(i);
-#endif
-
 
     if (IS_AMOEBOID(properties_element))
       DrawAmoebaContentArea();
@@ -2678,16 +2661,12 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
   static int brush_width, brush_height;
   static int last_cursor_x = -1, last_cursor_y = -1;
   static boolean delete_old_brush;
-  int new_element;
+  int new_element = BUTTON_ELEMENT(button);
   int x, y;
 
   if (mode == CB_DELETE_OLD_CURSOR && !delete_old_brush)
     return;
 
-  new_element = (button == 1 ? new_element1 :
-                button == 2 ? new_element2 :
-                button == 3 ? new_element3 : 0);
-
   if (mode == CB_AREA_TO_BRUSH)
   {
     int from_lx, from_ly;
@@ -2769,19 +2748,9 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
       }
     }
 
-    /*
-    printf("%d, %d - %d, %d in level and screen\n",
-          border_from_x, border_from_y, border_to_x, border_to_y);
-    */
-
     if (mode != CB_DELETE_OLD_CURSOR)
       DrawAreaBorder(border_from_x, border_from_y, border_to_x, border_to_y);
 
-    /*
-    if (mode == CB_BRUSH_TO_LEVEL)
-      CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
-    */
-
     last_cursor_x = cursor_x;
     last_cursor_y = cursor_y;
     delete_old_brush = TRUE;
@@ -3110,11 +3079,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   /* handle info callback for each invocation of action callback */
   gi->callback_info(gi);
 
-  /*
-  if (edit_mode != ED_MODE_DRAWING)
-    return;
-  */
-
   button_press_event = (gi->event.type == GD_EVENT_PRESSED);
   button_release_event = (gi->event.type == GD_EVENT_RELEASED);
 
@@ -3149,17 +3113,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   if (!button && !button_release_event)
     return;
 
-
-#if 0
-  if (button_release_event)
-    button = 0;
-#endif
-
-#if 0
-  if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
-    return;
-#endif
-
   /* automatically switch to 'single item' drawing mode, if needed */
   actual_drawing_function =
     (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
@@ -3322,12 +3275,6 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_PICK_ELEMENT:
-
-      /*
-      if (button_press_event)
-       PickDrawingElement(button, Feld[lx][ly]);
-      */
-
       if (button_release_event)
        ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
       else
@@ -3698,12 +3645,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          if (Feld[x][y] != Ur[x][y])
            level_changed = TRUE;
 
-      if (0 && !level_changed)
-      {
-       Request("Level has not changed !", REQ_CONFIRM);
-       break;
-      }
-
       for(y=0; y<lev_fieldy; y++) 
        for(x=0; x<lev_fieldx; x++)
          if (Feld[x][y] == EL_SPIELFIGUR ||
index b510a0e56c72e434be4d71e74c6784d5e25acd3e..2df15b7796b07d6276158268c488f5c2d1825093 100644 (file)
@@ -606,24 +606,20 @@ void InitGame()
   DrawAllPlayers();
   FadeToFront();
 
-  XCopyArea(display, pix[PIX_DOOR], pix[PIX_DB_DOOR], gc,
-           DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
-           DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-  DrawTextExt(pix[PIX_DB_DOOR], gc,
-             DOOR_GFX_PAGEX1 + XX_LEVEL, DOOR_GFX_PAGEY1 + YY_LEVEL,
-             int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
-  DrawTextExt(pix[PIX_DB_DOOR], gc,
-             DOOR_GFX_PAGEX1 + XX_EMERALDS, DOOR_GFX_PAGEY1 + YY_EMERALDS,
-             int2str(local_player->gems_still_needed,3), FS_SMALL, FC_YELLOW);
-  DrawTextExt(pix[PIX_DB_DOOR], gc,
-             DOOR_GFX_PAGEX1 + XX_DYNAMITE, DOOR_GFX_PAGEY1 + YY_DYNAMITE,
-             int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
-  DrawTextExt(pix[PIX_DB_DOOR], gc,
-             DOOR_GFX_PAGEX1 + XX_SCORE, DOOR_GFX_PAGEY1 + YY_SCORE,
-             int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
-  DrawTextExt(pix[PIX_DB_DOOR], gc,
-             DOOR_GFX_PAGEX1 + XX_TIME, DOOR_GFX_PAGEY1 + YY_TIME,
-             int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+  /* copy default game door content to main double buffer */
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+           DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+
+  DrawText(DX + XX_LEVEL, DY + YY_LEVEL,
+          int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
+          int2str(local_player->gems_still_needed,3), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
+          int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_SCORE, DY + YY_SCORE,
+          int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_TIME, DY + YY_TIME,
+          int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
 
   UnmapGameButtons();
   game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
@@ -632,12 +628,9 @@ void InitGame()
   MapGameButtons();
   MapTapeButtons();
 
-  /* copy actual game buttons to door double buffer for OpenDoor() */
+  /* copy actual game door content to door double buffer for OpenDoor() */
   XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
-           DX + GAME_CONTROL_XPOS, DY + GAME_CONTROL_YPOS,
-           GAME_CONTROL_XSIZE, 2 * GAME_CONTROL_YSIZE,
-           DOOR_GFX_PAGEX1 + GAME_CONTROL_XPOS,
-           DOOR_GFX_PAGEY1 + GAME_CONTROL_YPOS);
+           DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   OpenDoor(DOOR_OPEN_ALL);