X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=5b77b1fc9d47c5c165482ac5728feba18ee8ac6f;hb=370a25a79d2e8df1e6e3e4cb4be39496d0190c28;hp=ee201420d2029dd184f33028da5db76702b1e0e0;hpb=78ec772d11cb8823d8dca05c227b472da8708a07;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index ee201420..5b77b1fc 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -23,14 +23,12 @@
 #include "tape.h"
 
 /* positions in the level editor */
-#define ED_WIN_MB_LEFT_XPOS		7
-#define ED_WIN_MB_LEFT_YPOS		6
-#define ED_WIN_LEVELNR_XPOS		77
-#define ED_WIN_LEVELNR_YPOS		7
-#define ED_WIN_MB_MIDDLE_XPOS		7
-#define ED_WIN_MB_MIDDLE_YPOS		258
-#define ED_WIN_MB_RIGHT_XPOS		77
-#define ED_WIN_MB_RIGHT_YPOS		258
+#define ED_WIN_MB_LEFT_XPOS		6
+#define ED_WIN_MB_LEFT_YPOS		258
+#define ED_WIN_MB_MIDDLE_XPOS		42
+#define ED_WIN_MB_MIDDLE_YPOS		ED_WIN_MB_LEFT_YPOS
+#define ED_WIN_MB_RIGHT_XPOS		78
+#define ED_WIN_MB_RIGHT_YPOS		ED_WIN_MB_LEFT_YPOS
 
 /* other constants for the editor */
 #define ED_SCROLL_NO			0
@@ -72,21 +70,12 @@
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
 
 /* values for the element list */
-#define ED_ELEMENTLIST_UP_XPOS		35
-#define ED_ELEMENTLIST_UP_YPOS		5
-#define ED_ELEMENTLIST_UP_ALT_YPOS	140
-#define ED_ELEMENTLIST_DOWN_XPOS	35
-#define ED_ELEMENTLIST_DOWN_YPOS	250
-#define ED_ELEMENTLIST_DOWN_ALT_YPOS	165
-#define ED_ELEMENTLIST_UPDOWN_XSIZE	30
-#define ED_ELEMENTLIST_UPDOWN_YSIZE	25
-#define ED_ELEMENTLIST_XPOS		6
+#define ED_ELEMENTLIST_XPOS		5
 #define ED_ELEMENTLIST_YPOS		30
-#define ED_ELEMENTLIST_ALT_YPOS		190
-#define ED_ELEMENTLIST_XSIZE		22
-#define ED_ELEMENTLIST_YSIZE		22
+#define ED_ELEMENTLIST_XSIZE		20
+#define ED_ELEMENTLIST_YSIZE		20
 #define ED_ELEMENTLIST_BUTTONS_HORIZ	4
-#define ED_ELEMENTLIST_BUTTONS_VERT	10
+#define ED_ELEMENTLIST_BUTTONS_VERT	11
 #define ED_NUM_ELEMENTLIST_BUTTONS	(ED_ELEMENTLIST_BUTTONS_HORIZ * \
 					 ED_ELEMENTLIST_BUTTONS_VERT)
 
@@ -120,7 +109,7 @@
 #define ED_AREA_RANDOM_BACKGROUND_XPOS	(29 * MINI_TILEX)
 #define ED_AREA_RANDOM_BACKGROUND_YPOS	(31 * MINI_TILEY)
 
-/* values for scrolling gadgets */
+/* values for scrolling gadgets for drawing area */
 #define ED_SCROLLBUTTON_XPOS		24
 #define ED_SCROLLBUTTON_YPOS		0
 #define ED_SCROLLBAR_XPOS		24
@@ -146,13 +135,38 @@
 #define ED_SCROLL_VERTICAL_XSIZE	ED_SCROLLBUTTON_XSIZE
 #define ED_SCROLL_VERTICAL_YSIZE	(SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
 
+/* values for scrolling gadgets for element list */
+#define ED_SCROLLBUTTON2_XPOS		50
+#define ED_SCROLLBUTTON2_YPOS		0
+#define ED_SCROLLBAR2_XPOS		50
+#define ED_SCROLLBAR2_YPOS		20
+
+#define ED_SCROLLBUTTON2_XSIZE		10
+#define ED_SCROLLBUTTON2_YSIZE		10
+
+#define ED_SCROLL2_UP_XPOS		85
+#define ED_SCROLL2_UP_YPOS		30
+#define ED_SCROLL2_DOWN_XPOS		ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_DOWN_YPOS		(ED_SCROLL2_UP_YPOS + \
+					 ED_ELEMENTLIST_BUTTONS_VERT * \
+					 ED_ELEMENTLIST_YSIZE - \
+					 ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XPOS	ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_VERTICAL_YPOS	(ED_SCROLL2_UP_YPOS + \
+					 ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XSIZE	ED_SCROLLBUTTON2_XSIZE
+#define ED_SCROLL2_VERTICAL_YSIZE	(ED_ELEMENTLIST_BUTTONS_VERT * \
+					 ED_ELEMENTLIST_YSIZE - \
+					 2 * ED_SCROLLBUTTON2_YSIZE)
+
 /* values for checkbutton gadgets */
 #define ED_CHECKBUTTON_XSIZE		ED_BUTTON_COUNT_XSIZE
 #define ED_CHECKBUTTON_YSIZE		ED_BUTTON_COUNT_YSIZE
 #define ED_CHECKBUTTON_UNCHECKED_XPOS	ED_BUTTON_MINUS_XPOS
 #define ED_CHECKBUTTON_CHECKED_XPOS	ED_BUTTON_PLUS_XPOS
 #define ED_CHECKBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 22)
-#define ED_STICKYBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 88)
+#define ED_RADIOBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 44)
+#define ED_STICKYBUTTON_YPOS		(ED_BUTTON_MINUS_YPOS + 66)
 
 /* some positions in the editor control window */
 #define ED_BUTTON_ELEM_XPOS	6
@@ -160,6 +174,19 @@
 #define ED_BUTTON_ELEM_XSIZE	22
 #define ED_BUTTON_ELEM_YSIZE	22
 
+/* some values for text input and counter gadgets */
+#define ED_BUTTON_COUNT_YPOS	60
+#define ED_BUTTON_COUNT_XSIZE	20
+#define ED_BUTTON_COUNT_YSIZE	20
+#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_WIN_COUNT2_XPOS	27
+#define ED_WIN_COUNT2_YPOS	3
+#define ED_WIN_COUNT2_XSIZE	46
+#define ED_WIN_COUNT2_YSIZE	ED_BUTTON_COUNT_YSIZE
+
 #define ED_BUTTON_MINUS_XPOS	2
 #define ED_BUTTON_MINUS_YPOS	ED_BUTTON_COUNT_YPOS
 #define ED_BUTTON_MINUS_XSIZE	ED_BUTTON_COUNT_XSIZE
@@ -221,51 +248,55 @@
 #define GADGET_ID_LEVEL_TIMESCORE_DOWN	43
 #define GADGET_ID_LEVEL_TIMESCORE_TEXT	44
 #define GADGET_ID_LEVEL_TIMESCORE_UP	45
+#define GADGET_ID_SELECT_LEVEL_DOWN	46
+#define GADGET_ID_SELECT_LEVEL_TEXT	47
+#define GADGET_ID_SELECT_LEVEL_UP	48
 
 /* drawing area identifiers */
-#define GADGET_ID_DRAWING_LEVEL	46
-#define GADGET_ID_ELEM_CONTENT_0	47
-#define GADGET_ID_ELEM_CONTENT_1	48
-#define GADGET_ID_ELEM_CONTENT_2	49
-#define GADGET_ID_ELEM_CONTENT_3	50
-#define GADGET_ID_ELEM_CONTENT_4	51
-#define GADGET_ID_ELEM_CONTENT_5	52
-#define GADGET_ID_ELEM_CONTENT_6	53
-#define GADGET_ID_ELEM_CONTENT_7	54
-#define GADGET_ID_AMOEBA_CONTENT	55
+#define GADGET_ID_DRAWING_LEVEL		49
+#define GADGET_ID_ELEM_CONTENT_0	50
+#define GADGET_ID_ELEM_CONTENT_1	51
+#define GADGET_ID_ELEM_CONTENT_2	52
+#define GADGET_ID_ELEM_CONTENT_3	53
+#define GADGET_ID_ELEM_CONTENT_4	54
+#define GADGET_ID_ELEM_CONTENT_5	55
+#define GADGET_ID_ELEM_CONTENT_6	56
+#define GADGET_ID_ELEM_CONTENT_7	57
+#define GADGET_ID_AMOEBA_CONTENT	58
 
 /* text input identifiers */
-#define GADGET_ID_LEVEL_NAME		56
-#define GADGET_ID_LEVEL_AUTHOR		57
+#define GADGET_ID_LEVEL_NAME		59
+#define GADGET_ID_LEVEL_AUTHOR		60
 
 /* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLL_UP		58
-#define GADGET_ID_SCROLL_DOWN		59
-#define GADGET_ID_SCROLL_LEFT		60
-#define GADGET_ID_SCROLL_RIGHT		61
-#define GADGET_ID_SCROLL_HORIZONTAL	62
-#define GADGET_ID_SCROLL_VERTICAL	63
+#define GADGET_ID_SCROLL_UP		61
+#define GADGET_ID_SCROLL_DOWN		62
+#define GADGET_ID_SCROLL_LEFT		63
+#define GADGET_ID_SCROLL_RIGHT		64
+#define GADGET_ID_SCROLL_HORIZONTAL	65
+#define GADGET_ID_SCROLL_VERTICAL	66
 
 /* gadgets for scrolling element list */
-#define GADGET_ID_ELEMENTLIST_UP	64
-#define GADGET_ID_ELEMENTLIST_DOWN	65
-
-/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST	66
-#define GADGET_ID_ELEMENTLIST_LAST	105
+#define GADGET_ID_SCROLL_LIST_UP	67
+#define GADGET_ID_SCROLL_LIST_DOWN	68
+#define GADGET_ID_SCROLL_LIST_VERTICAL	69
 
 /* buttons for level settings */
-#define GADGET_ID_RANDOM_PERCENTAGE	106
-#define GADGET_ID_RANDOM_QUANTITY	107
-#define GADGET_ID_RANDOM_RESTRICTED	108
-#define GADGET_ID_DOUBLE_SPEED		109
-#define GADGET_ID_GRAVITY		110
-#define GADGET_ID_STICK_ELEMENT		111
+#define GADGET_ID_RANDOM_PERCENTAGE	70
+#define GADGET_ID_RANDOM_QUANTITY	71
+#define GADGET_ID_RANDOM_RESTRICTED	72
+#define GADGET_ID_DOUBLE_SPEED		73
+#define GADGET_ID_GRAVITY		74
+#define GADGET_ID_STICK_ELEMENT		75
 
 /* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND	112
+#define GADGET_ID_RANDOM_BACKGROUND	76
+
+/* gadgets for buttons in element list */
+#define GADGET_ID_ELEMENTLIST_FIRST	77
+#define GADGET_ID_ELEMENTLIST_LAST	(77 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
 
-#define NUM_EDITOR_GADGETS		113
+#define NUM_EDITOR_GADGETS		(GADGET_ID_ELEMENTLIST_LAST + 1)
 
 /* radio button numbers */
 #define RADIO_NR_NONE			0
@@ -281,8 +312,9 @@
 #define ED_COUNTER_ID_LEVEL_TIMELIMIT	5
 #define ED_COUNTER_ID_LEVEL_TIMESCORE	6
 #define ED_COUNTER_ID_LEVEL_RANDOM	7
+#define ED_COUNTER_ID_SELECT_LEVEL	8
 
-#define ED_NUM_COUNTERBUTTONS		8
+#define ED_NUM_COUNTERBUTTONS		9
 
 #define ED_COUNTER_ID_LEVEL_FIRST	ED_COUNTER_ID_LEVEL_XSIZE
 #define ED_COUNTER_ID_LEVEL_LAST	ED_COUNTER_ID_LEVEL_RANDOM
@@ -301,10 +333,14 @@
 #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
+#define ED_SCROLLBAR_ID_AREA_HORIZONTAL	0
+#define ED_SCROLLBAR_ID_AREA_VERTICAL	1
+#define ED_SCROLLBAR_ID_LIST_VERTICAL	2
 
-#define ED_NUM_SCROLLBARS		2
+#define ED_NUM_SCROLLBARS		3
+
+#define ED_SCROLLBAR_ID_AREA_FIRST	ED_SCROLLBAR_ID_AREA_HORIZONTAL
+#define ED_SCROLLBAR_ID_AREA_LAST	ED_SCROLLBAR_ID_AREA_VERTICAL
 
 /* values for text input gadgets */
 #define ED_TEXTINPUT_ID_LEVEL_NAME	0
@@ -459,6 +495,14 @@ static struct
     GADGET_ID_LEVEL_RANDOM_TEXT,
     &random_placement_value,
     "random element placement",		"in"
+  },
+  {
+    DX + 5 - SX,			DY + 3 - SY,
+    1,					100,
+    GADGET_ID_SELECT_LEVEL_DOWN,	GADGET_ID_SELECT_LEVEL_UP,
+    GADGET_ID_SELECT_LEVEL_TEXT,
+    &level_nr,
+    NULL,				NULL
   }
 };
 
@@ -520,15 +564,15 @@ static struct
     "scroll level editing area right"
   },
   {
-    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
-    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
-    GADGET_ID_ELEMENTLIST_UP,
+    ED_SCROLLBUTTON2_XPOS,  ED_SCROLLBUTTON2_YPOS + 0 * ED_SCROLLBUTTON2_YSIZE,
+    ED_SCROLL2_UP_XPOS,     ED_SCROLL2_UP_YPOS,
+    GADGET_ID_SCROLL_LIST_UP,
     "scroll element list up ('Page Up')"
   },
   {
-    ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS,
-    ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS,
-    GADGET_ID_ELEMENTLIST_DOWN,
+    ED_SCROLLBUTTON2_XPOS,  ED_SCROLLBUTTON2_YPOS + 1 * ED_SCROLLBUTTON2_YSIZE,
+    ED_SCROLL2_DOWN_XPOS,    ED_SCROLL2_DOWN_YPOS,
+    GADGET_ID_SCROLL_LIST_DOWN,
     "scroll element list down ('Page Down')"
   }
 };
@@ -544,20 +588,28 @@ static struct
 } scrollbar_info[ED_NUM_SCROLLBARS] =
 {
   {
-    ED_SCROLLBAR_XPOS,		ED_SCROLLBAR_YPOS,
-    ED_SCROLL_HORIZONTAL_XPOS,	ED_SCROLL_HORIZONTAL_YPOS,
-    ED_SCROLL_HORIZONTAL_XSIZE,	ED_SCROLL_HORIZONTAL_YSIZE,
+    ED_SCROLLBAR_XPOS,			ED_SCROLLBAR_YPOS,
+    SX + ED_SCROLL_HORIZONTAL_XPOS,	SY + ED_SCROLL_HORIZONTAL_YPOS,
+    ED_SCROLL_HORIZONTAL_XSIZE,		ED_SCROLL_HORIZONTAL_YSIZE,
     GD_TYPE_SCROLLBAR_HORIZONTAL,
     GADGET_ID_SCROLL_HORIZONTAL,
     "scroll level editing area horizontally"
   },
   {
-    ED_SCROLLBAR_XPOS,		ED_SCROLLBAR_YPOS,
-    ED_SCROLL_VERTICAL_XPOS,	ED_SCROLL_VERTICAL_YPOS,
-    ED_SCROLL_VERTICAL_XSIZE,	ED_SCROLL_VERTICAL_YSIZE,
+    ED_SCROLLBAR_XPOS,			ED_SCROLLBAR_YPOS,
+    SX + ED_SCROLL_VERTICAL_XPOS,	SY + ED_SCROLL_VERTICAL_YPOS,
+    ED_SCROLL_VERTICAL_XSIZE,		ED_SCROLL_VERTICAL_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
     GADGET_ID_SCROLL_VERTICAL,
     "scroll level editing area vertically"
+  },
+  {
+    ED_SCROLLBAR2_XPOS,			ED_SCROLLBAR2_YPOS,
+    DX + ED_SCROLL2_VERTICAL_XPOS,	DY + ED_SCROLL2_VERTICAL_YPOS,
+    ED_SCROLL2_VERTICAL_XSIZE,		ED_SCROLL2_VERTICAL_YSIZE,
+    GD_TYPE_SCROLLBAR_VERTICAL,
+    GADGET_ID_SCROLL_LIST_VERTICAL,
+    "scroll element list vertically"
   }
 };
 
@@ -631,7 +683,7 @@ static int ed_fieldx = MAX_ED_FIELDX - 1, ed_fieldy = MAX_ED_FIELDY - 1;
 /* actual position of level editor drawing area in level playfield */
 static int level_xpos = -1, level_ypos = -1;
 
-#define IN_ED_FIELD(x,y)  ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldx)
+#define IN_ED_FIELD(x,y)  ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldy)
 
 /* drawing elements on the three mouse buttons */
 static int new_element1 = EL_MAUERWERK;
@@ -644,6 +696,8 @@ static int new_element3 = EL_ERDREICH;
 #define BUTTON_STEPSIZE(button) (button == 1 ? 1 : button == 2 ? 5 : 10)
 
 /* forward declaration for internal use */
+static void ModifyEditorCounter(int, int);
+static void ModifyEditorCounterLimits(int, int, int);
 static void DrawDrawingWindow();
 static void DrawLevelInfoWindow();
 static void DrawPropertiesWindow();
@@ -682,7 +736,7 @@ int editor_element[] =
   EL_CHAR('U'),
   EL_CHAR('L'),
 
-  EL_CHAR_MINUS,
+  EL_CHAR('-'),
   EL_CHAR('D'),
   EL_CHAR('E'),
   EL_CHAR('R'),
@@ -703,24 +757,24 @@ int editor_element[] =
   EL_AUSGANG_AUF,
 
   EL_EDELSTEIN_BD,
-  EL_BUTTERFLY_O,
-  EL_FIREFLY_O,
+  EL_BUTTERFLY_UP,
+  EL_FIREFLY_UP,
   EL_FELSBROCKEN,
 
-  EL_BUTTERFLY_L,
-  EL_FIREFLY_L,
-  EL_BUTTERFLY_R,
-  EL_FIREFLY_R,
+  EL_BUTTERFLY_LEFT,
+  EL_FIREFLY_LEFT,
+  EL_BUTTERFLY_RIGHT,
+  EL_FIREFLY_RIGHT,
 
   EL_AMOEBE_BD,
-  EL_BUTTERFLY_U,
-  EL_FIREFLY_U,
+  EL_BUTTERFLY_DOWN,
+  EL_FIREFLY_DOWN,
   EL_LEERRAUM,
 
   EL_CHAR('E'),
   EL_CHAR('M'),
   EL_CHAR('E'),
-  EL_CHAR_MINUS,
+  EL_CHAR('-'),
 
   EL_CHAR('R'),
   EL_CHAR('A'),
@@ -757,24 +811,24 @@ int editor_element[] =
   EL_MORAST_LEER,
   EL_MORAST_VOLL,
 
-  EL_DYNAMIT_AUS,
-  EL_DYNAMIT,
+  EL_DYNAMITE_INACTIVE,
+  EL_DYNAMITE_ACTIVE,
   EL_AUSGANG_ZU,
   EL_AUSGANG_AUF,
 
   EL_MAMPFER,
-  EL_KAEFER_O,
-  EL_FLIEGER_O,
+  EL_KAEFER_UP,
+  EL_FLIEGER_UP,
   EL_ROBOT,
 
-  EL_KAEFER_L,
-  EL_FLIEGER_L,
-  EL_KAEFER_R,
-  EL_FLIEGER_R,
+  EL_KAEFER_LEFT,
+  EL_FLIEGER_LEFT,
+  EL_KAEFER_RIGHT,
+  EL_FLIEGER_RIGHT,
 
   EL_ABLENK_AUS,
-  EL_KAEFER_U,
-  EL_FLIEGER_U,
+  EL_KAEFER_DOWN,
+  EL_FLIEGER_DOWN,
   EL_UNSICHTBAR,
 
   EL_BADEWANNE1,
@@ -827,10 +881,10 @@ int editor_element[] =
   EL_PFORTE3X,
   EL_PFORTE4X,
 
-  EL_PFEIL_L,
-  EL_PFEIL_R,
-  EL_PFEIL_O,
-  EL_PFEIL_U,
+  EL_PFEIL_LEFT,
+  EL_PFEIL_RIGHT,
+  EL_PFEIL_UP,
+  EL_PFEIL_DOWN,
 
   EL_AMOEBE_VOLL,
   EL_EDELSTEIN_GELB,
@@ -843,17 +897,17 @@ int editor_element[] =
   EL_ERZ_EDEL_LILA,
 
   EL_LIFE,
-  EL_PACMAN_O,
+  EL_PACMAN_UP,
   EL_ZEIT_VOLL,
   EL_ZEIT_LEER,
 
-  EL_PACMAN_L,
+  EL_PACMAN_LEFT,
   EL_MAMPFER2,
-  EL_PACMAN_R,
+  EL_PACMAN_RIGHT,
   EL_MAUER_LEBT,
 
   EL_LIFE_ASYNC,
-  EL_PACMAN_U,
+  EL_PACMAN_DOWN,
   EL_BIRNE_AUS,
   EL_BIRNE_EIN,
 
@@ -862,11 +916,31 @@ int editor_element[] =
   EL_DYNABOMB_XL,
   EL_BADEWANNE,
 
-  EL_MAULWURF,
+  EL_MOLE,
   EL_PINGUIN,
   EL_SCHWEIN,
   EL_DRACHE,
 
+  EL_LEERRAUM,
+  EL_MOLE_UP,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
+  EL_MOLE_LEFT,
+  EL_LEERRAUM,
+  EL_MOLE_RIGHT,
+  EL_LEERRAUM,
+
+  EL_LEERRAUM,
+  EL_MOLE_DOWN,
+  EL_BALLOON,
+  EL_BALLOON_SEND_ANY,
+
+  EL_BALLOON_SEND_LEFT,
+  EL_BALLOON_SEND_RIGHT,
+  EL_BALLOON_SEND_UP,
+  EL_BALLOON_SEND_DOWN,
+
   EL_SONDE,
   EL_MAUER_X,
   EL_MAUER_Y,
@@ -877,12 +951,23 @@ int editor_element[] =
   EL_SPEED_PILL,
   EL_BLACK_ORB,
 
+  EL_EMC_STEEL_WALL_1,
+  EL_EMC_WALL_1,
+  EL_EMC_WALL_2,
+  EL_EMC_WALL_3,
+
+  EL_EMC_WALL_4,
+  EL_EMC_WALL_5,
+  EL_EMC_WALL_6,
+  EL_EMC_WALL_7,
+
+
   EL_CHAR('S'),
   EL_CHAR('O'),
   EL_CHAR('K'),
   EL_CHAR('O'),
 
-  EL_CHAR_MINUS,
+  EL_CHAR('-'),
   EL_CHAR('B'),
   EL_CHAR('A'),
   EL_CHAR('N'),
@@ -892,11 +977,6 @@ int editor_element[] =
   EL_SOKOBAN_FELD_VOLL,
   EL_BETON,
 
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-
   EL_CHAR('S'),
   EL_CHAR('U'),
   EL_CHAR('P'),
@@ -957,6 +1037,81 @@ int editor_element[] =
   EL_SP_CHIP_UPPER,
   EL_SP_CHIP_LOWER,
 
+  EL_CHAR('D'),
+  EL_CHAR('I'),
+  EL_CHAR('A'),
+  EL_CHAR('-'),
+
+  EL_CHAR('M'),
+  EL_CHAR('O'),
+  EL_CHAR('N'),
+  EL_CHAR('D'),
+
+  EL_CHAR('C'),
+  EL_CHAR('A'),
+  EL_CHAR('V'),
+  EL_CHAR('E'),
+
+  EL_CHAR('S'),
+  EL_CHAR(' '),
+  EL_CHAR('I'),
+  EL_CHAR('I'),
+
+  EL_BELT1_LEFT,
+  EL_BELT1_MIDDLE,
+  EL_BELT1_RIGHT,
+  EL_BELT1_SWITCH_MIDDLE,
+
+  EL_BELT2_LEFT,
+  EL_BELT2_MIDDLE,
+  EL_BELT2_RIGHT,
+  EL_BELT2_SWITCH_MIDDLE,
+
+  EL_BELT3_LEFT,
+  EL_BELT3_MIDDLE,
+  EL_BELT3_RIGHT,
+  EL_BELT3_SWITCH_MIDDLE,
+
+  EL_BELT4_LEFT,
+  EL_BELT4_MIDDLE,
+  EL_BELT4_RIGHT,
+  EL_BELT4_SWITCH_MIDDLE,
+
+  EL_BELT1_SWITCH_LEFT,
+  EL_BELT2_SWITCH_LEFT,
+  EL_BELT3_SWITCH_LEFT,
+  EL_BELT4_SWITCH_LEFT,
+
+  EL_BELT1_SWITCH_RIGHT,
+  EL_BELT2_SWITCH_RIGHT,
+  EL_BELT3_SWITCH_RIGHT,
+  EL_BELT4_SWITCH_RIGHT,
+
+  EL_SWITCHGATE_OPEN,
+  EL_SWITCHGATE_CLOSED,
+  EL_SWITCHGATE_SWITCH_1,
+  EL_ENVELOPE,
+
+  EL_TIMEGATE_CLOSED,
+  EL_TIMEGATE_OPEN,
+  EL_TIMEGATE_SWITCH_OFF,
+  EL_LEERRAUM,
+
+  EL_LANDMINE,
+  EL_SAND_INVISIBLE,
+  EL_STEEL_SLANTED,
+  EL_LEERRAUM,
+
+  EL_SIGN_EXCLAMATION,
+  EL_SIGN_STOP,
+  EL_LIGHT_SWITCH_OFF,
+  EL_LIGHT_SWITCH_ON,
+
+  EL_SHIELD_PASSIVE,
+  EL_SHIELD_ACTIVE,
+  EL_EXTRA_TIME,
+  EL_LEERRAUM,
+
   /*
   EL_CHAR('D'),
   EL_CHAR('Y'),
@@ -1203,17 +1358,17 @@ static void CreateControlButtons()
 
     event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-    if (id == GADGET_ID_ELEMENTLIST_UP ||
-	id == GADGET_ID_ELEMENTLIST_DOWN)
+    if (id == GADGET_ID_SCROLL_LIST_UP ||
+	id == GADGET_ID_SCROLL_LIST_DOWN)
     {
       x += DX;
       y += DY;
-      width = ED_ELEMENTLIST_UPDOWN_XSIZE;
-      height = ED_ELEMENTLIST_UPDOWN_YSIZE;
-      gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
-      gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].y;
-      gd_x2 = gd_x1;
-      gd_y2 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+      width = ED_SCROLLBUTTON2_XSIZE;
+      height = ED_SCROLLBUTTON2_YSIZE;
+      gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+      gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+      gd_x2 = gd_x1 - ED_SCROLLBUTTON2_XSIZE;
+      gd_y2 = gd_y1;
     }
     else
     {
@@ -1254,7 +1409,7 @@ static void CreateControlButtons()
     Pixmap deco_pixmap;
     int deco_x, deco_y, deco_xpos, deco_ypos;
     int gd_xoffset, gd_yoffset;
-    int gd_x, gd_y1, gd_y2;
+    int gd_x1, gd_x2, gd_y;
     int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
     int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
     int id = GADGET_ID_ELEMENTLIST_FIRST + i;
@@ -1264,9 +1419,9 @@ static void CreateControlButtons()
     gd_xoffset = ED_ELEMENTLIST_XPOS + x * ED_ELEMENTLIST_XSIZE;
     gd_yoffset = ED_ELEMENTLIST_YPOS + y * ED_ELEMENTLIST_YSIZE;
 
-    gd_x = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
-    gd_y1 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
-    gd_y2 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_ALT_YPOS;
+    gd_x1 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS + ED_ELEMENTLIST_XSIZE;
+    gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+    gd_y  = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
 
     getMiniGraphicSource(el2gfx(editor_element[i]),
 			 &deco_pixmap, &deco_x, &deco_y);
@@ -1282,8 +1437,8 @@ static void CreateControlButtons()
 		      GDI_HEIGHT, ED_ELEMENTLIST_YSIZE,
 		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
-		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y1,
-		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
 		      GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
 		      GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
 		      GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
@@ -1318,15 +1473,39 @@ static void CreateCounterButtons()
 		counterbutton_info[i].gadget_id_up);
       int gd_xoffset;
       int gd_x, gd_x1, gd_x2, gd_y;
+      int x_size, y_size;
       unsigned long event_mask;
       char infotext[MAX_INFOTEXT_LEN + 1];
 
       event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-      gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
-      gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
-      gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
-      gd_y  = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+      if (i == ED_COUNTER_ID_SELECT_LEVEL)
+      {
+	int sid = (j == 0 ?
+		   ED_SCROLLBUTTON_ID_AREA_LEFT :
+		   ED_SCROLLBUTTON_ID_AREA_RIGHT);
+
+	event_mask |= GD_EVENT_RELEASED;
+
+	if (j == 1)
+	  xpos += 2 * ED_GADGET_DISTANCE;
+	ypos += ED_GADGET_DISTANCE;
+
+	gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].xpos;
+	gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+	gd_y  = DOOR_GFX_PAGEY1 + scrollbutton_info[sid].ypos;
+	x_size = ED_SCROLLBUTTON_XSIZE;
+	y_size = ED_SCROLLBUTTON_YSIZE;
+      }
+      else
+      {
+	gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
+	gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
+	gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
+	gd_y  = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+	x_size = ED_BUTTON_COUNT_XSIZE;
+	y_size = ED_BUTTON_COUNT_YSIZE;
+      }
 
       sprintf(infotext, "%s counter value by 1, 5 or 10",
 	      (j == 0 ? "decrease" : "increase"));
@@ -1336,8 +1515,8 @@ static void CreateCounterButtons()
 			GDI_INFO_TEXT, infotext,
 			GDI_X, xpos,
 			GDI_Y, ypos,
-			GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
-			GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
+			GDI_WIDTH, x_size,
+			GDI_HEIGHT, y_size,
 			GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
 			GDI_STATE, GD_BUTTON_UNPRESSED,
 			GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
@@ -1354,11 +1533,28 @@ static void CreateCounterButtons()
 
       if (j == 0)
       {
+	int font_type = FC_YELLOW;
+	int gd_width = ED_WIN_COUNT_XSIZE;
+
 	id = counterbutton_info[i].gadget_id_text;
 	event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
 
-	gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
-	gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+	if (i == ED_COUNTER_ID_SELECT_LEVEL)
+	{
+	  font_type = FC_SPECIAL3;
+
+	  xpos += 2 * ED_GADGET_DISTANCE;
+	  ypos -= ED_GADGET_DISTANCE;
+
+	  gd_x = DOOR_GFX_PAGEX6 + ED_WIN_COUNT2_XPOS;
+	  gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT2_YPOS;
+	  gd_width = ED_WIN_COUNT2_XSIZE;
+	}
+	else
+	{
+	  gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+	  gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+	}
 
 	gi = CreateGadget(GDI_CUSTOM_ID, id,
 			  GDI_CUSTOM_TYPE_ID, i,
@@ -1370,9 +1566,11 @@ static void CreateCounterButtons()
 			  GDI_NUMBER_MIN, counterbutton_info[i].min_value,
 			  GDI_NUMBER_MAX, counterbutton_info[i].max_value,
 			  GDI_TEXT_SIZE, 3,
+			  GDI_TEXT_FONT, font_type,
 			  GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
 			  GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
-			  GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+			  GDI_BORDER_SIZE, ED_BORDER_SIZE,
+			  GDI_TEXTINPUT_DESIGN_WIDTH, gd_width,
 			  GDI_EVENT_MASK, event_mask,
 			  GDI_CALLBACK_ACTION, HandleCounterButtons,
 			  GDI_END);
@@ -1511,9 +1709,11 @@ static void CreateTextInputGadgets()
 		      GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
 		      GDI_TEXT_VALUE, textinput_info[i].value,
 		      GDI_TEXT_SIZE, textinput_info[i].size,
+		      GDI_TEXT_FONT, FC_YELLOW,
 		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
 		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
-		      GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+		      GDI_BORDER_SIZE, ED_BORDER_SIZE,
+		      GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
 		      GDI_EVENT_MASK, event_mask,
 		      GDI_CALLBACK_ACTION, HandleTextInputGadgets,
 		      GDI_END);
@@ -1538,31 +1738,41 @@ static void CreateScrollbarGadgets()
     int items_max, items_visible, item_position;
     unsigned long event_mask;
 
-    if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+    if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
     {
-      items_max = MAX(lev_fieldx + 2, ed_fieldx);
-      items_visible = ed_fieldx;
+      items_max = elements_in_list / ED_ELEMENTLIST_BUTTONS_HORIZ;
+      items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
       item_position = 0;
     }
-    else
+    else	/* drawing area scrollbars */
     {
-      items_max = MAX(lev_fieldy + 2, ed_fieldy);
-      items_visible = ed_fieldy;
-      item_position = 0;
+      if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+      {
+	items_max = MAX(lev_fieldx + 2, ed_fieldx);
+	items_visible = ed_fieldx;
+	item_position = 0;
+      }
+      else
+      {
+	items_max = MAX(lev_fieldy + 2, ed_fieldy);
+	items_visible = ed_fieldy;
+	item_position = 0;
+      }
     }
 
     event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
 
     gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].xpos;
-    gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+    gd_x2 = (gd_x1 - (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL ?
+		      scrollbar_info[i].height : scrollbar_info[i].width));
     gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
     gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, scrollbar_info[i].infotext,
-		      GDI_X, SX + scrollbar_info[i].x,
-		      GDI_Y, SY + scrollbar_info[i].y,
+		      GDI_X, scrollbar_info[i].x,
+		      GDI_Y, scrollbar_info[i].y,
 		      GDI_WIDTH, scrollbar_info[i].width,
 		      GDI_HEIGHT, scrollbar_info[i].height,
 		      GDI_TYPE, scrollbar_info[i].type,
@@ -1572,7 +1782,7 @@ static void CreateScrollbarGadgets()
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
 		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
-		      GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+		      GDI_BORDER_SIZE, ED_BORDER_SIZE,
 		      GDI_EVENT_MASK, event_mask,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
@@ -1599,7 +1809,7 @@ static void CreateCheckbuttonGadgets()
   gd_x2 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_UNCHECKED_XPOS;
   gd_x3 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_CHECKED_XPOS;
   gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS;
-  gd_y  = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+  gd_y  = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS;
 
   for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
   {
@@ -1675,23 +1885,36 @@ void CreateLevelEditorGadgets()
   CreateCheckbuttonGadgets();
 }
 
+static void MapCounterButtons(int id)
+{
+  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
+  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
+  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+}
+
 static void MapControlButtons()
 {
+  int counter_id;
   int i;
 
+  /* map toolbox buttons */
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
     MapGadget(level_editor_gadget[i]);
+
+  /* map buttons to select elements */
   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)
-{
-  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
-  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
-  MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]);
+  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
+  MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+
+  /* map buttons to select level */
+  counter_id = ED_COUNTER_ID_SELECT_LEVEL;
+  ModifyEditorCounterLimits(counter_id,
+			    leveldir_current->first_level,
+			    leveldir_current->last_level);
+  ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+  MapCounterButtons(counter_id);
 }
 
 static void MapDrawingArea(int id)
@@ -1733,10 +1956,10 @@ static void MapMainDrawingArea()
     MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
   }
 
-  for (i=0; i<ED_NUM_SCROLLBARS; i++)
+  for (i=ED_SCROLLBAR_ID_AREA_FIRST; i<=ED_SCROLLBAR_ID_AREA_LAST; i++)
   {
-    if ((i == ED_SCROLLBAR_ID_HORIZONTAL && no_horizontal_scrollbar) ||
-	(i == ED_SCROLLBAR_ID_VERTICAL && no_vertical_scrollbar))
+    if ((i == ED_SCROLLBAR_ID_AREA_HORIZONTAL && no_horizontal_scrollbar) ||
+	(i == ED_SCROLLBAR_ID_AREA_VERTICAL && no_vertical_scrollbar))
       continue;
 
     MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
@@ -1755,7 +1978,7 @@ void UnmapLevelEditorWindowGadgets()
   int i;
 
   for (i=0; i<NUM_EDITOR_GADGETS; i++)
-    if (level_editor_gadget[i]->x < DX)
+    if (level_editor_gadget[i]->x < SX + SXSIZE)
       UnmapGadget(level_editor_gadget[i]);
 }
 
@@ -1767,10 +1990,53 @@ void UnmapLevelEditorGadgets()
     UnmapGadget(level_editor_gadget[i]);
 }
 
-void DrawLevelEd()
+static void ResetUndoBuffer()
+{
+  undo_buffer_position = -1;
+  undo_buffer_steps = -1;
+  CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
+
+static void DrawEditModeWindow()
+{
+  if (edit_mode == ED_MODE_INFO)
+    DrawLevelInfoWindow();
+  else if (edit_mode == ED_MODE_PROPERTIES)
+    DrawPropertiesWindow();
+  else	/* edit_mode == ED_MODE_DRAWING */
+    DrawDrawingWindow();
+}
+
+static boolean LevelChanged()
 {
-  edit_mode = ED_MODE_DRAWING;
+  boolean level_changed = FALSE;
+  int x, y;
+
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++)
+      if (Feld[x][y] != Ur[x][y])
+	level_changed = TRUE;
+
+  return level_changed;
+}
+
+static boolean LevelContainsPlayer()
+{
+  boolean player_found = FALSE;
+  int x, y;
+
+  for(y=0; y<lev_fieldy; y++) 
+    for(x=0; x<lev_fieldx; x++)
+      if (Feld[x][y] == EL_SPIELFIGUR ||
+	  Feld[x][y] == EL_SPIELER1 ||
+	  Feld[x][y] == EL_SP_MURPHY) 
+	player_found = TRUE;
+
+  return player_found;
+}
 
+void DrawLevelEd()
+{
   CloseDoor(DOOR_CLOSE_ALL);
   OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
 
@@ -1790,11 +2056,11 @@ void DrawLevelEd()
   }
   else
   {
+    edit_mode = ED_MODE_DRAWING;
+
+    ResetUndoBuffer();
     level_xpos = -1;
     level_ypos = -1;
-    undo_buffer_position = -1;
-    undo_buffer_steps = -1;
-    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
   }
 
   /* copy default editor door content to main double buffer */
@@ -1812,30 +2078,8 @@ void DrawLevelEd()
 		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
 		     el2gfx(new_element3));
 
-  /* 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,
-	    DOOR_GFX_PAGEX7, 0,
-	    108, 64,
-	    EX - 4, EY - 12);
+  DrawSpecialEditorDoor();
 
   /* draw new control window */
   XCopyArea(display, pix[PIX_DOOR], drawto, gc,
@@ -1851,8 +2095,12 @@ void DrawLevelEd()
   XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
 	    DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
-  DrawDrawingWindow();
+  DrawEditModeWindow();
+
+  /*
   FadeToFront();
+  */
+
 
   OpenDoor(DOOR_OPEN_1);
 
@@ -1910,8 +2158,8 @@ static void AdjustDrawingAreaGadgets()
   ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_RIGHT], GDI_X, x, GDI_END);
   ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_DOWN], GDI_Y, y, GDI_END);
 
-  width = scrollbar_info[ED_SCROLLBAR_ID_HORIZONTAL].width + xoffset;
-  height = scrollbar_info[ED_SCROLLBAR_ID_VERTICAL].height + yoffset;
+  width = scrollbar_info[ED_SCROLLBAR_ID_AREA_HORIZONTAL].width + xoffset;
+  height = scrollbar_info[ED_SCROLLBAR_ID_AREA_VERTICAL].height + yoffset;
 
   ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
 	       GDI_WIDTH, width,
@@ -1985,6 +2233,14 @@ static void ModifyEditorCounter(int counter_id, int new_value)
     *counter_value = gi->text.number_value;
 }
 
+static void ModifyEditorCounterLimits(int counter_id, int min, int max)
+{
+  int gadget_id = counterbutton_info[counter_id].gadget_id_text;
+  struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+
+  ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END);
+}
+
 static void PickDrawingElement(int button, int element)
 {
   if (button < 1 || button > 3)
@@ -1994,24 +2250,21 @@ static void PickDrawingElement(int button, int element)
   {
     new_element1 = element;
     DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_LEFT_XPOS,
-		       DY + ED_WIN_MB_LEFT_YPOS,
+		       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
 		       el2gfx(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
     DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_MIDDLE_XPOS,
-		       DY + ED_WIN_MB_MIDDLE_YPOS,
+		       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
 		       el2gfx(new_element2));
   }
   else
   {
     new_element3 = element;
     DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_RIGHT_XPOS,
-		       DY + ED_WIN_MB_RIGHT_YPOS,
+		       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
 		       el2gfx(new_element3));
   }
 
@@ -2291,31 +2544,31 @@ static void DrawPropertiesWindow()
     { EL_EDELSTEIN_ROT,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
     { EL_EDELSTEIN_LILA,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
     { EL_DIAMANT,	&level.score[SC_DIAMANT],	TEXT_COLLECTING },
-    { EL_KAEFER_R,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_O,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_L,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_KAEFER_U,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_R,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_O,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_L,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_BUTTERFLY_U,	&level.score[SC_KAEFER],	TEXT_SMASHING },
-    { EL_FLIEGER_R,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_O,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_L,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FLIEGER_U,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_R,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_O,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_L,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
-    { EL_FIREFLY_U,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_KAEFER_RIGHT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_LEFT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_KAEFER_DOWN,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_FLIEGER_RIGHT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_LEFT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FLIEGER_DOWN,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_RIGHT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_UP,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_LEFT,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_FIREFLY_DOWN,	&level.score[SC_FLIEGER],	TEXT_SMASHING },
     { EL_MAMPFER,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
     { EL_MAMPFER2,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
     { EL_ROBOT,		&level.score[SC_ROBOT],		TEXT_SMASHING },
-    { EL_PACMAN_R,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_O,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_L,	&level.score[SC_PACMAN],	TEXT_SMASHING },
-    { EL_PACMAN_U,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_RIGHT,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_UP,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_LEFT,	&level.score[SC_PACMAN],	TEXT_SMASHING },
+    { EL_PACMAN_DOWN,	&level.score[SC_PACMAN],	TEXT_SMASHING },
     { EL_KOKOSNUSS,	&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
-    { EL_DYNAMIT_AUS,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
+    { EL_DYNAMITE_INACTIVE,&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
     { EL_SCHLUESSEL1,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
     { EL_SCHLUESSEL2,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
     { EL_SCHLUESSEL3,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
@@ -2962,7 +3215,7 @@ static void CopyLevelToUndoBuffer(int mode)
     for(y=0; y<lev_fieldy; y++)
       UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
 
-  /* check if change of border style was forced by drawing operation */
+  /* check if drawing operation forces change of border style */
   last_border_element = BorderElement;
   SetBorderElement();
   if (BorderElement != last_border_element)
@@ -3288,17 +3541,50 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
   int step = BUTTON_STEPSIZE(button) *
     (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1);
 
+  if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
+  {
+    boolean pressed = (gi->event.type == GD_EVENT_PRESSED);
+    boolean released = (gi->event.type == GD_EVENT_RELEASED);
+    boolean level_changed = LevelChanged();
+
+    if ((level_changed && pressed) || (!level_changed && released))
+      return;
+
+    if (level_changed && !Request("Level has changed! Discard changes ?",
+				  REQ_ASK))
+    {
+      if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+	ModifyEditorCounter(counter_id, *counter_value);
+      return;
+    }
+  }
+
   if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
     *counter_value = gi->text.number_value;
   else
     ModifyEditorCounter(counter_id, *counter_value + step);
 
-  if (counter_id == ED_COUNTER_ID_ELEM_CONTENT)
-    DrawElementContentAreas();
-  else if (counter_id == ED_COUNTER_ID_LEVEL_XSIZE)
-    lev_fieldx = level.fieldx;
-  else if (counter_id == ED_COUNTER_ID_LEVEL_YSIZE)
-    lev_fieldy = level.fieldy;
+  switch (counter_id)
+  {
+    case ED_COUNTER_ID_ELEM_CONTENT:
+      DrawElementContentAreas();
+      break;
+
+    case ED_COUNTER_ID_LEVEL_XSIZE:
+    case ED_COUNTER_ID_LEVEL_YSIZE:
+      lev_fieldx = level.fieldx;
+      lev_fieldy = level.fieldy;
+      break;
+
+    case ED_COUNTER_ID_SELECT_LEVEL:
+      LoadLevel(level_nr);
+      ResetUndoBuffer();
+      DrawEditModeWindow();
+      break;
+
+    default:
+      break;
+  }
 }
 
 static void HandleTextInputGadgets(struct GadgetInfo *gi)
@@ -3323,8 +3609,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
   int button = gi->event.button;
   int step = BUTTON_STEPSIZE(button);
   int new_element = BUTTON_ELEMENT(button);
-  int player_present = FALSE;
-  int level_changed = FALSE;
   int i, x, y;
 
   if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
@@ -3342,9 +3626,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
     case GADGET_ID_SCROLL_LEFT:
       if (level_xpos >= 0)
       {
-	int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
 	if (lev_fieldx < ed_fieldx - 2)
 	  break;
 
@@ -3356,16 +3637,14 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	else
 	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
       }
       break;
 
     case GADGET_ID_SCROLL_RIGHT:
       if (level_xpos <= lev_fieldx - ed_fieldx)
       {
-	int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
 	if (lev_fieldx < ed_fieldx - 2)
 	  break;
 
@@ -3377,16 +3656,14 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	else
 	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
       }
       break;
 
     case GADGET_ID_SCROLL_UP:
       if (level_ypos >= 0)
       {
-	int gadget_id = GADGET_ID_SCROLL_VERTICAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
 	if (lev_fieldy < ed_fieldy - 2)
 	  break;
 
@@ -3398,16 +3675,14 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	else
 	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
       }
       break;
 
     case GADGET_ID_SCROLL_DOWN:
       if (level_ypos <= lev_fieldy - ed_fieldy)
       {
-	int gadget_id = GADGET_ID_SCROLL_VERTICAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
 	if (lev_fieldy < ed_fieldy - 2)
 	  break;
 
@@ -3419,7 +3694,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	else
 	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
       }
       break;
 
@@ -3433,15 +3709,25 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
-    case GADGET_ID_ELEMENTLIST_UP:
-    case GADGET_ID_ELEMENTLIST_DOWN:
-      step *= (id == GADGET_ID_ELEMENTLIST_UP ? -1 : +1);
-      element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+    case GADGET_ID_SCROLL_LIST_UP:
+    case GADGET_ID_SCROLL_LIST_DOWN:
+    case GADGET_ID_SCROLL_LIST_VERTICAL:
+      if (id == GADGET_ID_SCROLL_LIST_VERTICAL)
+	element_shift = gi->event.item_position * ED_ELEMENTLIST_BUTTONS_HORIZ;
+      else
+      {
+	step *= (id == GADGET_ID_SCROLL_LIST_UP ? -1 : +1);
+	element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
 
-      if (element_shift < 0)
-	element_shift = 0;
-      if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
-	element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+	if (element_shift < 0)
+	  element_shift = 0;
+	if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
+	  element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+		     GDI_SCROLLBAR_ITEM_POSITION,
+		     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      }
 
       for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
       {
@@ -3546,25 +3832,13 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_SAVE:
-      if (leveldir[leveldir_nr].readonly)
+      if (leveldir_current->readonly)
       {
 	Request("This level is read only !", REQ_CONFIRM);
 	break;
       }
 
-      for(y=0; y<lev_fieldy; y++) 
-	for(x=0; x<lev_fieldx; x++)
-	  if (Feld[x][y] != Ur[x][y])
-	    level_changed = TRUE;
-
-      for(y=0; y<lev_fieldy; y++) 
-	for(x=0; x<lev_fieldx; x++)
-	  if (Feld[x][y] == EL_SPIELFIGUR ||
-	      Feld[x][y] == EL_SPIELER1 ||
-	      Feld[x][y] == EL_SP_MURPHY) 
-	    player_present = TRUE;
-
-      if (!player_present)
+      if (!LevelContainsPlayer)
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
@@ -3579,14 +3853,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_TEST:
-      for(y=0; y<lev_fieldy; y++) 
-	for(x=0; x<lev_fieldx; x++)
-	  if (Feld[x][y] == EL_SPIELFIGUR ||
-	      Feld[x][y] == EL_SPIELER1 ||
-	      Feld[x][y] == EL_SP_MURPHY) 
-	    player_present = TRUE;
-
-      if (!player_present)
+      if (!LevelContainsPlayer)
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
@@ -3599,13 +3866,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	    Ur[x][y] = Feld[x][y];
 
 	UnmapLevelEditorGadgets();
-
-	/* draw smaller door */
-	XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-		  DOOR_GFX_PAGEX7, 64,
-		  108, 64,
-		  EX - 4, EY - 12);
-	redraw_mask |= REDRAW_ALL;
+	UndrawSpecialEditorDoor();
 
 	CloseDoor(DOOR_CLOSE_ALL);
 
@@ -3622,12 +3883,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_EXIT:
-      for(y=0; y<lev_fieldy; y++) 
-	for(x=0; x<lev_fieldx; x++)
-	  if (Feld[x][y] != Ur[x][y])
-	    level_changed = TRUE;
-
-      if (!level_changed ||
+      if (!LevelChanged() ||
 	  Request("Level has changed! Exit without saving ?",
 		  REQ_ASK | REQ_STAY_OPEN))
       {
@@ -3637,13 +3893,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	CloseDoor(DOOR_CLOSE_ALL);
 	*/
 
-	/* draw smaller door */
-	XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-		  DOOR_GFX_PAGEX7, 64,
-		  108, 64,
-		  EX - 4, EY - 12);
-	redraw_mask |= REDRAW_ALL;
-
 	game_status = MAINMENU;
 	DrawMainMenu();
       }
@@ -3725,11 +3974,11 @@ void HandleLevelEditorKeyInput(KeySym key)
 	id = GADGET_ID_SCROLL_DOWN;
 	break;
       case XK_Page_Up:
-	id = GADGET_ID_ELEMENTLIST_UP;
+	id = GADGET_ID_SCROLL_LIST_UP;
 	button = 3;
 	break;
       case XK_Page_Down:
-	id = GADGET_ID_ELEMENTLIST_DOWN;
+	id = GADGET_ID_SCROLL_LIST_DOWN;
 	button = 3;
 	break;
 
@@ -3742,6 +3991,8 @@ void HandleLevelEditorKeyInput(KeySym key)
       ClickOnGadget(level_editor_gadget[id], button);
     else if (letter == '.')
       ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+    else if (key == XK_space || key == XK_Return)
+      ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
     else
       for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
 	if (letter && letter == control_info[i].shortcut)
@@ -3761,7 +4012,7 @@ void HandleEditorGadgetInfoText(void *ptr)
 {
   struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
   char infotext[MAX_INFOTEXT_LEN + 1];
-  char shortcut[20];
+  char shortcut[MAX_INFOTEXT_LEN + 1];
 
   ClearEditorGadgetInfoText();
 
@@ -3781,10 +4032,13 @@ void HandleEditorGadgetInfoText(void *ptr)
 
     if (key)
     {
-      sprintf(shortcut, " ('%s%c')",
-	      (key >= 'A' && key <= 'Z' ? "Shift-" :
-	       gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""),
-	      key);
+      if (gi->custom_id == GADGET_ID_SINGLE_ITEMS)	/* special case 1 */
+	sprintf(shortcut, " ('.' or '%c')", key);
+      else if (gi->custom_id == GADGET_ID_TEST)		/* special case 2 */
+	sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
+      else						/* normal case */
+	sprintf(shortcut, " ('%s%c')",
+		(key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
 
       if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
 	strcat(infotext, shortcut);