X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=00cda340cc0053cedec3e928c13be96f5f673a6e;hb=72657dfeee6b6c184a42e83ed923a63c1768100b;hp=64e96e24164b6515b4c6ae7bcd3a52ead062fe1b;hpb=f941ccddee3065d7531298e37ad4dcfcd892c1f8;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 64e96e24..00cda340 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,36 +1,34 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  editor.c                                                *
+* editor.c                                                 *
 ***********************************************************/
 
 #include <math.h>
 
+#include "libgame/libgame.h"
+
 #include "editor.h"
 #include "screens.h"
 #include "tools.h"
-#include "misc.h"
-#include "buttons.h"
 #include "files.h"
 #include "game.h"
 #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
@@ -47,18 +45,10 @@
 /* how many steps can be cancelled */
 #define NUM_UNDO_STEPS			(10 + 1)
 
-/* values for random placement */
-#define RANDOM_USE_PERCENTAGE		0
-#define RANDOM_USE_NUM_OBJECTS		1
-
 /* values for elements with score */
 #define MIN_SCORE			0
 #define MAX_SCORE			255
 
-/* values for elements with content */
-#define MIN_ELEM_CONTENT		1
-#define MAX_ELEM_CONTENT		8
-
 /* values for the control window */
 #define ED_CTRL_BUTTONS_GFX_YPOS 	236
 #define ED_CTRL_BUTTONS_ALT_GFX_YPOS 	142
@@ -80,51 +70,46 @@
 #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)
 
-/* values for element properties window */
-#define ED_PROPERTIES_XPOS		(TILEX - MINI_TILEX/2)
-
-/* values for level information window */
-#define ED_LEVELINFO_XPOS		(TILEX - MINI_TILEX/2)
-#define ED_LEVELINFO_YPOS		(TILEY - MINI_TILEY/2)
+/* values for the setting windows */
+#define ED_SETTINGS_XPOS		(MINI_TILEX + 8)
+#define ED_SETTINGS2_XPOS		MINI_TILEX
+#define ED_SETTINGS_YPOS		MINI_TILEY
+#define ED_SETTINGS2_YPOS		(ED_SETTINGS_YPOS + 12 * TILEY - 2)
 
 /* values for counter gadgets */
-#define ED_COUNT_VALUE_XOFFSET		5
-#define ED_COUNT_VALUE_YOFFSET		3
-#define ED_COUNT_ELEM_SCORE_XPOS	ED_PROPERTIES_XPOS
+#define ED_COUNT_ELEM_SCORE_XPOS	ED_SETTINGS_XPOS
 #define ED_COUNT_ELEM_SCORE_YPOS	(14 * MINI_TILEY)
-#define ED_COUNT_ELEM_CONTENT_XPOS	ED_PROPERTIES_XPOS
-#define ED_COUNT_ELEM_CONTENT_YPOS	(17 * MINI_TILEY)
-#define ED_COUNTER_YSTART		(ED_LEVELINFO_YPOS + 3 * TILEY)
+#define ED_COUNT_ELEM_CONTENT_XPOS	ED_SETTINGS_XPOS
+#define ED_COUNT_ELEM_CONTENT_YPOS	(19 * MINI_TILEY)
+
+#define ED_COUNTER_YSTART		(ED_SETTINGS_YPOS + 2 * TILEY)
 #define ED_COUNTER_YDISTANCE		(3 * MINI_TILEY)
 #define ED_COUNTER_YPOS(n)		(ED_COUNTER_YSTART + \
 					 n * ED_COUNTER_YDISTANCE)
+#define ED_COUNTER2_YPOS(n)		(ED_COUNTER_YSTART + \
+					 n * ED_COUNTER_YDISTANCE - 2)
 /* standard distances */
 #define ED_BORDER_SIZE			3
 #define ED_GADGET_DISTANCE		2
 
 /* values for element content drawing areas */
-#define ED_AREA_ELEM_CONTENT_XPOS	(TILEX)
-#define ED_AREA_ELEM_CONTENT_YPOS	(10 * TILEY)
+#define ED_AREA_ELEM_CONTENT_XPOS	( 2 * MINI_TILEX)
+#define ED_AREA_ELEM_CONTENT_YPOS	(22 * MINI_TILEY)
+
+/* values for random placement background drawing area */
+#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
@@ -141,130 +126,289 @@
 #define ED_SCROLL_LEFT_YPOS		(SYSIZE - 2 * ED_SCROLLBUTTON_YSIZE)
 #define ED_SCROLL_RIGHT_XPOS		(SXSIZE - 2 * ED_SCROLLBUTTON_XSIZE)
 #define ED_SCROLL_RIGHT_YPOS		ED_SCROLL_LEFT_YPOS
-#define ED_SCROLL_VERTICAL_XPOS		ED_SCROLL_UP_XPOS
-#define ED_SCROLL_VERTICAL_YPOS	  (ED_SCROLL_UP_YPOS + ED_SCROLLBUTTON_YSIZE)
-#define ED_SCROLL_VERTICAL_XSIZE	ED_SCROLLBUTTON_XSIZE
-#define ED_SCROLL_VERTICAL_YSIZE	(SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
 #define ED_SCROLL_HORIZONTAL_XPOS (ED_SCROLL_LEFT_XPOS + ED_SCROLLBUTTON_XSIZE)
 #define ED_SCROLL_HORIZONTAL_YPOS	ED_SCROLL_LEFT_YPOS
 #define ED_SCROLL_HORIZONTAL_XSIZE	(SXSIZE - 3 * ED_SCROLLBUTTON_XSIZE)
 #define ED_SCROLL_HORIZONTAL_YSIZE	ED_SCROLLBUTTON_YSIZE
+#define ED_SCROLL_VERTICAL_XPOS		ED_SCROLL_UP_XPOS
+#define ED_SCROLL_VERTICAL_YPOS	  (ED_SCROLL_UP_YPOS + ED_SCROLLBUTTON_YSIZE)
+#define ED_SCROLL_VERTICAL_XSIZE	ED_SCROLLBUTTON_XSIZE
+#define ED_SCROLL_VERTICAL_YSIZE	(SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
 
-/* control button identifiers */
-#define ED_CTRL_ID_NONE			-1
-
-#define ED_CTRL_ID_SINGLE_ITEMS		0
-#define ED_CTRL_ID_CONNECTED_ITEMS	1
-#define ED_CTRL_ID_LINE			2
-#define ED_CTRL_ID_ARC			3
-#define ED_CTRL_ID_RECTANGLE		4
-#define ED_CTRL_ID_FILLED_BOX		5
-#define ED_CTRL_ID_WRAP_UP		6
-#define ED_CTRL_ID_TEXT			7
-#define ED_CTRL_ID_FLOOD_FILL		8
-#define ED_CTRL_ID_WRAP_LEFT		9
-#define ED_CTRL_ID_PROPERTIES		10
-#define ED_CTRL_ID_WRAP_RIGHT		11
-#define ED_CTRL_ID_RANDOM_PLACEMENT	12
-#define ED_CTRL_ID_GRAB_BRUSH		13
-#define ED_CTRL_ID_WRAP_DOWN		14
-#define ED_CTRL_ID_PICK_ELEMENT		15
-#define ED_CTRL_ID_UNDO			16
-#define ED_CTRL_ID_INFO			17
-#define ED_CTRL_ID_SAVE			18
-#define ED_CTRL_ID_CLEAR		19
-#define ED_CTRL_ID_TEST			20
-#define ED_CTRL_ID_EXIT			21
+/* 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_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
+#define ED_BUTTON_ELEM_YPOS		30
+#define ED_BUTTON_ELEM_XSIZE		22
+#define ED_BUTTON_ELEM_YSIZE		22
+
+/* some values for text input, selectbox 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
+#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
+
+#define ED_SELECTBOX_XPOS		ED_WIN_COUNT_XPOS
+#define ED_SELECTBOX_YPOS		(ED_WIN_COUNT_YPOS + 2 + \
+					 ED_WIN_COUNT_YSIZE)
+#define ED_SELECTBOX_XSIZE		ED_WIN_COUNT_XSIZE
+#define ED_SELECTBOX_YSIZE		ED_WIN_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 GADGET_ID_ARC			3
+#define GADGET_ID_RECTANGLE		4
+#define GADGET_ID_FILLED_BOX		5
+#define GADGET_ID_WRAP_UP		6
+#define GADGET_ID_TEXT			7
+#define GADGET_ID_FLOOD_FILL		8
+#define GADGET_ID_WRAP_LEFT		9
+#define GADGET_ID_PROPERTIES		10
+#define GADGET_ID_WRAP_RIGHT		11
+#define GADGET_ID_RANDOM_PLACEMENT	12
+#define GADGET_ID_GRAB_BRUSH		13
+#define GADGET_ID_WRAP_DOWN		14
+#define GADGET_ID_PICK_ELEMENT		15
+#define GADGET_ID_UNDO			16
+#define GADGET_ID_INFO			17
+#define GADGET_ID_SAVE			18
+#define GADGET_ID_CLEAR			19
+#define GADGET_ID_TEST			20
+#define GADGET_ID_EXIT			21
 
 /* counter button identifiers */
-#define ED_CTRL_ID_ELEM_SCORE_DOWN	22
-#define ED_CTRL_ID_ELEM_SCORE_TEXT	23
-#define ED_CTRL_ID_ELEM_SCORE_UP	24
-#define ED_CTRL_ID_ELEM_CONTENT_DOWN	25
-#define ED_CTRL_ID_ELEM_CONTENT_TEXT	26
-#define ED_CTRL_ID_ELEM_CONTENT_UP	27
-#define ED_CTRL_ID_LEVEL_XSIZE_DOWN	28
-#define ED_CTRL_ID_LEVEL_XSIZE_TEXT	29
-#define ED_CTRL_ID_LEVEL_XSIZE_UP	30
-#define ED_CTRL_ID_LEVEL_YSIZE_DOWN	31
-#define ED_CTRL_ID_LEVEL_YSIZE_TEXT	32
-#define ED_CTRL_ID_LEVEL_YSIZE_UP	33
-#define ED_CTRL_ID_LEVEL_RANDOM_DOWN	34
-#define ED_CTRL_ID_LEVEL_RANDOM_TEXT	35
-#define ED_CTRL_ID_LEVEL_RANDOM_UP	36
-#define ED_CTRL_ID_LEVEL_COLLECT_DOWN	37
-#define ED_CTRL_ID_LEVEL_COLLECT_TEXT	38
-#define ED_CTRL_ID_LEVEL_COLLECT_UP	39
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN	40
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT	41
-#define ED_CTRL_ID_LEVEL_TIMELIMIT_UP	42
-#define ED_CTRL_ID_LEVEL_TIMESCORE_DOWN	43
-#define ED_CTRL_ID_LEVEL_TIMESCORE_TEXT	44
-#define ED_CTRL_ID_LEVEL_TIMESCORE_UP	45
+#define GADGET_ID_ELEM_SCORE_DOWN	22
+#define GADGET_ID_ELEM_SCORE_TEXT	23
+#define GADGET_ID_ELEM_SCORE_UP		24
+#define GADGET_ID_ELEM_CONTENT_DOWN	25
+#define GADGET_ID_ELEM_CONTENT_TEXT	26
+#define GADGET_ID_ELEM_CONTENT_UP	27
+#define GADGET_ID_LEVEL_XSIZE_DOWN	28
+#define GADGET_ID_LEVEL_XSIZE_TEXT	29
+#define GADGET_ID_LEVEL_XSIZE_UP	30
+#define GADGET_ID_LEVEL_YSIZE_DOWN	31
+#define GADGET_ID_LEVEL_YSIZE_TEXT	32
+#define GADGET_ID_LEVEL_YSIZE_UP	33
+#define GADGET_ID_LEVEL_RANDOM_DOWN	34
+#define GADGET_ID_LEVEL_RANDOM_TEXT	35
+#define GADGET_ID_LEVEL_RANDOM_UP	36
+#define GADGET_ID_LEVEL_COLLECT_DOWN	37
+#define GADGET_ID_LEVEL_COLLECT_TEXT	38
+#define GADGET_ID_LEVEL_COLLECT_UP	39
+#define GADGET_ID_LEVEL_TIMELIMIT_DOWN	40
+#define GADGET_ID_LEVEL_TIMELIMIT_TEXT	41
+#define GADGET_ID_LEVEL_TIMELIMIT_UP	42
+#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 ED_CTRL_ID_DRAWING_LEVEL	46
-#define ED_CTRL_ID_ELEM_CONTENT_0	47
-#define ED_CTRL_ID_ELEM_CONTENT_1	48
-#define ED_CTRL_ID_ELEM_CONTENT_2	49
-#define ED_CTRL_ID_ELEM_CONTENT_3	50
-#define ED_CTRL_ID_ELEM_CONTENT_4	51
-#define ED_CTRL_ID_ELEM_CONTENT_5	52
-#define ED_CTRL_ID_ELEM_CONTENT_6	53
-#define ED_CTRL_ID_ELEM_CONTENT_7	54
-#define ED_CTRL_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
+#define GADGET_ID_RANDOM_BACKGROUND	59
 
 /* text input identifiers */
-#define ED_CTRL_ID_LEVEL_NAME		56
-#define ED_CTRL_ID_LEVEL_AUTHOR		57
+#define GADGET_ID_LEVEL_NAME		60
+#define GADGET_ID_LEVEL_AUTHOR		61
+
+/* selectbox identifiers */
+#define GADGET_ID_SELECTBOX_TEST	62
 
 /* gadgets for scrolling of drawing area */
-#define ED_CTRL_ID_SCROLL_UP		58
-#define ED_CTRL_ID_SCROLL_DOWN		59
-#define ED_CTRL_ID_SCROLL_LEFT		60
-#define ED_CTRL_ID_SCROLL_RIGHT		61
-#define ED_CTRL_ID_SCROLL_VERTICAL	62
-#define ED_CTRL_ID_SCROLL_HORIZONTAL	63
+#define GADGET_ID_SCROLL_UP		63
+#define GADGET_ID_SCROLL_DOWN		64
+#define GADGET_ID_SCROLL_LEFT		65
+#define GADGET_ID_SCROLL_RIGHT		66
+#define GADGET_ID_SCROLL_HORIZONTAL	67
+#define GADGET_ID_SCROLL_VERTICAL	68
 
 /* gadgets for scrolling element list */
-#define ED_CTRL_ID_ELEMENTLIST_UP	64
-#define ED_CTRL_ID_ELEMENTLIST_DOWN	65
+#define GADGET_ID_SCROLL_LIST_UP	69
+#define GADGET_ID_SCROLL_LIST_DOWN	70
+#define GADGET_ID_SCROLL_LIST_VERTICAL	71
+
+/* buttons for level/element properties */
+#define GADGET_ID_RANDOM_PERCENTAGE	72
+#define GADGET_ID_RANDOM_QUANTITY	73
+#define GADGET_ID_RANDOM_RESTRICTED	74
+#define GADGET_ID_DOUBLE_SPEED		75
+#define GADGET_ID_GRAVITY		76
+#define GADGET_ID_STICK_ELEMENT		77
+#define GADGET_ID_EM_SLIPPERY_GEMS	78
+#define GADGET_ID_CUSTOM_INDESTRUCTIBLE	79
+#define GADGET_ID_CUSTOM_CAN_FALL	80
+#define GADGET_ID_CUSTOM_CAN_SMASH	81
+#define GADGET_ID_CUSTOM_PUSHABLE	82
+#define GADGET_ID_CUSTOM_SLIPPERY	83
 
 /* gadgets for buttons in element list */
-#define ED_CTRL_ID_ELEMENTLIST_FIRST	66
-#define ED_CTRL_ID_ELEMENTLIST_LAST	105
+#define GADGET_ID_ELEMENTLIST_FIRST	84
+#define GADGET_ID_ELEMENTLIST_LAST	(GADGET_ID_ELEMENTLIST_FIRST +	\
+	 				ED_NUM_ELEMENTLIST_BUTTONS - 1)
+
+#define NUM_EDITOR_GADGETS		(GADGET_ID_ELEMENTLIST_LAST + 1)
 
-#define ED_NUM_GADGETS			106
+/* radio button numbers */
+#define RADIO_NR_NONE			0
+#define RADIO_NR_DRAWING_TOOLBOX	1
+#define RADIO_NR_RANDOM_ELEMENTS	2
 
 /* values for counter gadgets */
 #define ED_COUNTER_ID_ELEM_SCORE	0
 #define ED_COUNTER_ID_ELEM_CONTENT	1
 #define ED_COUNTER_ID_LEVEL_XSIZE	2
 #define ED_COUNTER_ID_LEVEL_YSIZE	3
-#define ED_COUNTER_ID_LEVEL_RANDOM	4
-#define ED_COUNTER_ID_LEVEL_COLLECT	5
-#define ED_COUNTER_ID_LEVEL_TIMELIMIT	6
-#define ED_COUNTER_ID_LEVEL_TIMESCORE	7
+#define ED_COUNTER_ID_LEVEL_COLLECT	4
+#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		9
+
+#define ED_COUNTER_ID_LEVEL_FIRST	ED_COUNTER_ID_LEVEL_XSIZE
+#define ED_COUNTER_ID_LEVEL_LAST	ED_COUNTER_ID_LEVEL_RANDOM
+
+/* values for scrollbutton gadgets */
+#define ED_SCROLLBUTTON_ID_AREA_UP	0
+#define ED_SCROLLBUTTON_ID_AREA_DOWN	1
+#define ED_SCROLLBUTTON_ID_AREA_LEFT	2
+#define ED_SCROLLBUTTON_ID_AREA_RIGHT	3
+#define ED_SCROLLBUTTON_ID_LIST_UP	4
+#define ED_SCROLLBUTTON_ID_LIST_DOWN	5
+
+#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_AREA_HORIZONTAL	0
+#define ED_SCROLLBAR_ID_AREA_VERTICAL	1
+#define ED_SCROLLBAR_ID_LIST_VERTICAL	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
 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR	1
 
-#define ED_NUM_COUNTERBUTTONS		8
-#define ED_NUM_SCROLLBUTTONS		6
-#define ED_NUM_SCROLLBARS		2
 #define ED_NUM_TEXTINPUT		2
 
+#define ED_TEXTINPUT_ID_LEVEL_FIRST	ED_TEXTINPUT_ID_LEVEL_NAME
+#define ED_TEXTINPUT_ID_LEVEL_LAST	ED_TEXTINPUT_ID_LEVEL_AUTHOR
+
+/* values for selectbox gadgets */
+#define ED_SELECTBOX_ID_TEST		0
+
+#define ED_NUM_SELECTBOX		1
+
+/* values for checkbutton gadgets */
+#define ED_CHECKBUTTON_ID_DOUBLE_SPEED		0
+#define ED_CHECKBUTTON_ID_GRAVITY		1
+#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED	2
+#define ED_CHECKBUTTON_ID_STICK_ELEMENT		3
+#define ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS	4
+#define ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE	5
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL	6
+#define ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH	7
+#define ED_CHECKBUTTON_ID_CUSTOM_PUSHABLE	8
+#define ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY	9
+
+#define ED_NUM_CHECKBUTTONS			10
+
+#define ED_CHECKBUTTON_ID_LEVEL_FIRST	ED_CHECKBUTTON_ID_DOUBLE_SPEED
+#define ED_CHECKBUTTON_ID_LEVEL_LAST	ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
+
+#define ED_CHECKBUTTON_ID_CUSTOM_FIRST	ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE
+#define ED_CHECKBUTTON_ID_CUSTOM_LAST	ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY
+
+/* values for radiobutton gadgets */
+#define ED_RADIOBUTTON_ID_PERCENTAGE	0
+#define ED_RADIOBUTTON_ID_QUANTITY	1
+
+#define ED_NUM_RADIOBUTTONS		2
+
+#define ED_RADIOBUTTON_ID_LEVEL_FIRST	ED_RADIOBUTTON_ID_PERCENTAGE
+#define ED_RADIOBUTTON_ID_LEVEL_LAST	ED_RADIOBUTTON_ID_QUANTITY
+
 /* values for CopyLevelToUndoBuffer() */
 #define UNDO_IMMEDIATE			0
 #define UNDO_ACCUMULATE			1
 
 /* values for ClearEditorGadgetInfoText() and HandleGadgetInfoText() */
-#define INFOTEXT_XPOS		SX
-#define INFOTEXT_YPOS		(SY + SYSIZE - MINI_TILEX + 2)
-#define INFOTEXT_XSIZE		SXSIZE
-#define INFOTEXT_YSIZE		MINI_TILEX
-#define MAX_INFOTEXT_LEN	(SXSIZE / FONT2_XSIZE)
+#define INFOTEXT_XPOS			SX
+#define INFOTEXT_YPOS			(SY + SYSIZE - MINI_TILEX + 2)
+#define INFOTEXT_XSIZE			SXSIZE
+#define INFOTEXT_YSIZE			MINI_TILEX
 
 static struct
 {
@@ -272,39 +416,48 @@ static struct
   char *text;
 } control_info[ED_NUM_CTRL_BUTTONS] =
 {
-  { 's', "draw single items" },
-  { 'd', "draw connected items" },
-  { 'l', "draw lines" },
-  { 'a', "draw arcs" },
-  { 'r', "draw outline rectangles" },
-  { 'R', "draw filled rectangles" },
-  { '\0', "wrap (rotate) level up" },
-  { 't', "enter text elements" },
-  { 'f', "flood fill" },
-  { '\0', "wrap (rotate) level left" },
-  { '?', "properties of drawing element" },
-  { '\0', "wrap (rotate) level right" },
-  { '\0', "random element placement" },
-  { 'b', "grab brush" },
-  { '\0', "wrap (rotate) level down" },
-  { ',', "pick drawing element" },
-  { 'U', "undo last operation" },
-  { 'I', "level properties" },
-  { 'S', "save level" },
-  { 'C', "clear level" },
-  { 'T', "test level" },
-  { 'E', "exit level editor" }
+  { 's',	"draw single items"		},
+  { 'd',	"draw connected items"		},
+  { 'l',	"draw lines"			},
+  { 'a',	"draw arcs"			},
+  { 'r',	"draw outline rectangles"	},
+  { 'R',	"draw filled rectangles"	},
+  { '\0',	"wrap (rotate) level up"	},
+  { 't',	"enter text elements"		},
+  { 'f',	"flood fill"			},
+  { '\0',	"wrap (rotate) level left"	},
+  { '?',	"properties of drawing element"	},
+  { '\0',	"wrap (rotate) level right"	},
+  { '\0',	"random element placement"	},
+  { 'b',	"grab brush"			},
+  { '\0',	"wrap (rotate) level down"	},
+  { ',',	"pick drawing element"		},
+  { 'U',	"undo last operation"		},
+  { 'I',	"level properties"		},
+  { 'S',	"save level"			},
+  { 'C',	"clear level"			},
+  { 'T',	"test level"			},
+  { 'E',	"exit level editor"		}
 };
 
-/* pointers to counter values */
-static int *gadget_elem_score_value = NULL;
-static int *gadget_elem_content_value = NULL;
-static int *gadget_level_xsize_value = NULL;
-static int *gadget_level_ysize_value = NULL;
-static int *gadget_level_random_value = NULL;
-static int *gadget_level_collect_value = NULL;
-static int *gadget_level_timelimit_value = NULL;
-static int *gadget_level_timescore_value = NULL;
+/* values for random placement */
+#define RANDOM_USE_PERCENTAGE		0
+#define RANDOM_USE_QUANTITY		1
+
+static int random_placement_value = 10;
+static int random_placement_method = RANDOM_USE_QUANTITY;
+static int random_placement_background_element = EL_SAND;
+static boolean random_placement_background_restricted = FALSE;
+static boolean stick_element_properties_window = FALSE;
+
+static struct
+{
+  boolean indestructible;
+  boolean can_fall;
+  boolean can_smash;
+  boolean pushable;
+  boolean slippery;
+} custom_element_properties[NUM_CUSTOM_ELEMENTS];
 
 static struct
 {
@@ -312,98 +465,137 @@ static struct
   int min_value, max_value;
   int gadget_id_down, gadget_id_up;
   int gadget_id_text;
-  int **counter_value;
-  char *infotext;
+  int *value;
+  char *infotext_above, *infotext_right;
 } counterbutton_info[ED_NUM_COUNTERBUTTONS] =
 {
   {
     ED_COUNT_ELEM_SCORE_XPOS,		ED_COUNT_ELEM_SCORE_YPOS,
     MIN_SCORE,				MAX_SCORE,
-    ED_CTRL_ID_ELEM_SCORE_DOWN,		ED_CTRL_ID_ELEM_SCORE_UP,
-    ED_CTRL_ID_ELEM_SCORE_TEXT,
-    &gadget_elem_score_value,
-    "element score"
+    GADGET_ID_ELEM_SCORE_DOWN,		GADGET_ID_ELEM_SCORE_UP,
+    GADGET_ID_ELEM_SCORE_TEXT,
+    NULL,				/* will be set when used */
+    "element score",			NULL
   },
   {
     ED_COUNT_ELEM_CONTENT_XPOS,		ED_COUNT_ELEM_CONTENT_YPOS,
-    MIN_ELEM_CONTENT,			MAX_ELEM_CONTENT,
-    ED_CTRL_ID_ELEM_CONTENT_DOWN,	ED_CTRL_ID_ELEM_CONTENT_UP,
-    ED_CTRL_ID_ELEM_CONTENT_TEXT,
-    &gadget_elem_content_value,
-    "element content"
+    MIN_ELEMENT_CONTENTS,		MAX_ELEMENT_CONTENTS,
+    GADGET_ID_ELEM_CONTENT_DOWN,	GADGET_ID_ELEM_CONTENT_UP,
+    GADGET_ID_ELEM_CONTENT_TEXT,
+    &level.num_yam_contents,
+    "element content",			NULL
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(0),
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(2),
     MIN_LEV_FIELDX,			MAX_LEV_FIELDX,
-    ED_CTRL_ID_LEVEL_XSIZE_DOWN,	ED_CTRL_ID_LEVEL_XSIZE_UP,
-    ED_CTRL_ID_LEVEL_XSIZE_TEXT,
-    &gadget_level_xsize_value,
-    "playfield width"
+    GADGET_ID_LEVEL_XSIZE_DOWN,		GADGET_ID_LEVEL_XSIZE_UP,
+    GADGET_ID_LEVEL_XSIZE_TEXT,
+    &level.fieldx,
+    "playfield size",			"width",
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(1),
+    ED_SETTINGS_XPOS + 2 * DXSIZE,	ED_COUNTER_YPOS(2),
     MIN_LEV_FIELDY,			MAX_LEV_FIELDY,
-    ED_CTRL_ID_LEVEL_YSIZE_DOWN,	ED_CTRL_ID_LEVEL_YSIZE_UP,
-    ED_CTRL_ID_LEVEL_YSIZE_TEXT,
-    &gadget_level_ysize_value,
-    "playfield height"
-  },
-  {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(2),
-    0,					100,
-    ED_CTRL_ID_LEVEL_RANDOM_DOWN,	ED_CTRL_ID_LEVEL_RANDOM_UP,
-    ED_CTRL_ID_LEVEL_RANDOM_TEXT,
-    &gadget_level_random_value,
-    "number of random elements"
+    GADGET_ID_LEVEL_YSIZE_DOWN,		GADGET_ID_LEVEL_YSIZE_UP,
+    GADGET_ID_LEVEL_YSIZE_TEXT,
+    &level.fieldy,
+    NULL,				"height",
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(3),
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(3),
     0,					999,
-    ED_CTRL_ID_LEVEL_COLLECT_DOWN,	ED_CTRL_ID_LEVEL_COLLECT_UP,
-    ED_CTRL_ID_LEVEL_COLLECT_TEXT,
-    &gadget_level_collect_value,
-    "number of emeralds to collect"
+    GADGET_ID_LEVEL_COLLECT_DOWN,	GADGET_ID_LEVEL_COLLECT_UP,
+    GADGET_ID_LEVEL_COLLECT_TEXT,
+    &level.gems_needed,
+    "number of emeralds to collect",	NULL
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(4),
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
     0,					999,
-    ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN,	ED_CTRL_ID_LEVEL_TIMELIMIT_UP,
-    ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT,
-    &gadget_level_timelimit_value,
-    "time available to solve level"
+    GADGET_ID_LEVEL_TIMELIMIT_DOWN,	GADGET_ID_LEVEL_TIMELIMIT_UP,
+    GADGET_ID_LEVEL_TIMELIMIT_TEXT,
+    &level.time,
+    "time available to solve level",	"(0 => no time limit)"
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(5),
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(5),
     0,					255,
-    ED_CTRL_ID_LEVEL_TIMESCORE_DOWN,	ED_CTRL_ID_LEVEL_TIMESCORE_UP,
-    ED_CTRL_ID_LEVEL_TIMESCORE_TEXT,
-    &gadget_level_timescore_value,
-    "score for each 10 seconds left"
+    GADGET_ID_LEVEL_TIMESCORE_DOWN,	GADGET_ID_LEVEL_TIMESCORE_UP,
+    GADGET_ID_LEVEL_TIMESCORE_TEXT,
+    &level.score[SC_ZEITBONUS],
+    "score for each 10 seconds left",	NULL
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER2_YPOS(8),
+    1,					100,
+    GADGET_ID_LEVEL_RANDOM_DOWN,	GADGET_ID_LEVEL_RANDOM_UP,
+    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
+  }
 };
 
 static struct
 {
   int x, y;
   int gadget_id;
+  int size;
   char *value;
   char *infotext;
 } textinput_info[ED_NUM_TEXTINPUT] =
 {
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(6),
-    ED_CTRL_ID_LEVEL_NAME,
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(0),
+    GADGET_ID_LEVEL_NAME,
+    MAX_LEVEL_NAME_LEN,
     level.name,
-    "Level Title"
+    "Title"
   },
   {
-    ED_LEVELINFO_XPOS,			ED_COUNTER_YPOS(7),
-    ED_CTRL_ID_LEVEL_AUTHOR,
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(1),
+    GADGET_ID_LEVEL_AUTHOR,
+    MAX_LEVEL_AUTHOR_LEN,
     level.author,
-    "Level Author"
+    "Author"
   }
 };
 
+static char *test_values[] =
+{
+  "test 1",
+  "test 2",
+  "dieser test-text ist viel zu lang fuer die selectbox",
+  "letzter text"
+};
+static int test_index = 0;
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+  int size;
+  char **values;
+  int *index;
+  char *text, *infotext;
+} selectbox_info[ED_NUM_SELECTBOX] =
+{
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(3),
+    GADGET_ID_SELECTBOX_TEST,
+    MAX_PLAYER_NAME_LEN,
+    test_values, &test_index,
+    "test:", "test-selectbox entry"
+  },
+};
+
 static struct
 {
   int xpos, ypos;
@@ -415,38 +607,38 @@ static struct
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE,
     ED_SCROLL_UP_XPOS,      ED_SCROLL_UP_YPOS,
-    ED_CTRL_ID_SCROLL_UP,
+    GADGET_ID_SCROLL_UP,
     "scroll level editing area up"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 1 * ED_SCROLLBUTTON_YSIZE,
     ED_SCROLL_DOWN_XPOS,    ED_SCROLL_DOWN_YPOS,
-    ED_CTRL_ID_SCROLL_DOWN,
+    GADGET_ID_SCROLL_DOWN,
     "scroll level editing area down"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 2 * ED_SCROLLBUTTON_YSIZE,
     ED_SCROLL_LEFT_XPOS,    ED_SCROLL_LEFT_YPOS,
-    ED_CTRL_ID_SCROLL_LEFT,
+    GADGET_ID_SCROLL_LEFT,
     "scroll level editing area left"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 3 * ED_SCROLLBUTTON_YSIZE,
     ED_SCROLL_RIGHT_XPOS,   ED_SCROLL_RIGHT_YPOS,
-    ED_CTRL_ID_SCROLL_RIGHT,
+    GADGET_ID_SCROLL_RIGHT,
     "scroll level editing area right"
   },
   {
-    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
-    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
-    ED_CTRL_ID_ELEMENTLIST_UP,
-    "scroll element list 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,
-    ED_CTRL_ID_ELEMENTLIST_DOWN,
-    "scroll element list 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')"
   }
 };
 
@@ -461,273 +653,445 @@ static struct
 } scrollbar_info[ED_NUM_SCROLLBARS] =
 {
   {
-    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_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,
+    SX + ED_SCROLL_VERTICAL_XPOS,	SY + ED_SCROLL_VERTICAL_YPOS,
+    ED_SCROLL_VERTICAL_XSIZE,		ED_SCROLL_VERTICAL_YSIZE,
     GD_TYPE_SCROLLBAR_VERTICAL,
-    ED_CTRL_ID_SCROLL_VERTICAL,
+    GADGET_ID_SCROLL_VERTICAL,
     "scroll level editing area vertically"
   },
   {
-    ED_SCROLLBAR_XPOS,		ED_SCROLLBAR_YPOS,
-    ED_SCROLL_HORIZONTAL_XPOS,	ED_SCROLL_HORIZONTAL_YPOS,
-    ED_SCROLL_HORIZONTAL_XSIZE,	ED_SCROLL_HORIZONTAL_YSIZE,
-    GD_TYPE_SCROLLBAR_HORIZONTAL,
-    ED_CTRL_ID_SCROLL_HORIZONTAL,
-    "scroll level editing area horizontally"
+    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"
+  }
+};
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+  int radio_button_nr;
+  int *value;
+  int checked_value;
+  char *text, *infotext;
+} radiobutton_info[ED_NUM_RADIOBUTTONS] =
+{
+  {
+    ED_SETTINGS_XPOS + 160,		ED_COUNTER2_YPOS(8),
+    GADGET_ID_RANDOM_PERCENTAGE,
+    RADIO_NR_RANDOM_ELEMENTS,
+    &random_placement_method,		RANDOM_USE_PERCENTAGE,
+    "percentage",			"use percentage for random elements"
+  },
+  {
+    ED_SETTINGS_XPOS + 340,		ED_COUNTER2_YPOS(8),
+    GADGET_ID_RANDOM_QUANTITY,
+    RADIO_NR_RANDOM_ELEMENTS,
+    &random_placement_method,		RANDOM_USE_QUANTITY,
+    "quantity",				"use quantity for random elements"
+  }
+};
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+  boolean *value;
+  char *text, *infotext;
+} checkbutton_info[ED_NUM_CHECKBUTTONS] =
+{
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(6) - MINI_TILEY,
+    GADGET_ID_DOUBLE_SPEED,
+    &level.double_speed,
+    "double speed movement",		"set movement speed of player"
+  },
+  {
+    ED_SETTINGS_XPOS + 340,		ED_COUNTER_YPOS(6) - MINI_TILEY,
+    GADGET_ID_GRAVITY,
+    &level.gravity,
+    "gravity",				"set level gravity"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER2_YPOS(9) - MINI_TILEY,
+    GADGET_ID_RANDOM_RESTRICTED,
+    &random_placement_background_restricted,
+    "restrict random placement to",	"set random placement restriction"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
+    GADGET_ID_STICK_ELEMENT,
+    &stick_element_properties_window,
+    "stick window to edit content",	"stick window to edit content"
   },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
+    GADGET_ID_EM_SLIPPERY_GEMS,
+    &level.em_slippery_gems,
+    "slip down from certain flat walls","use EM style slipping behaviour"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(4),
+    GADGET_ID_CUSTOM_INDESTRUCTIBLE,
+    &custom_element_properties[0].indestructible,
+    "indestructible",			"element cannot be destroyed"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(5),
+    GADGET_ID_CUSTOM_CAN_FALL,
+    &custom_element_properties[0].can_fall,
+    "can fall",				"element can fall down"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(6),
+    GADGET_ID_CUSTOM_CAN_SMASH,
+    &custom_element_properties[0].can_smash,
+    "can smash",			"element can smash other elements"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(7),
+    GADGET_ID_CUSTOM_PUSHABLE,
+    &custom_element_properties[0].pushable,
+    "pushable",				"element can be pushed"
+  },
+  {
+    ED_SETTINGS_XPOS,			ED_COUNTER_YPOS(8),
+    GADGET_ID_CUSTOM_SLIPPERY,
+    &custom_element_properties[0].slippery,
+    "slippery",				"other elements can fall down from it"
+  }
 };
 
+/* maximal size of level editor drawing area */
+#define MAX_ED_FIELDX		(2 * SCR_FIELDX)
+#define MAX_ED_FIELDY		(2 * SCR_FIELDY - 1)
+
+/* actual size of level editor drawing area */
+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_fieldy)
+
+/* drawing elements on the three mouse buttons */
+static int new_element1 = EL_WALL;
+static int new_element2 = EL_EMPTY;
+static int new_element3 = EL_SAND;
+
+#define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
+				(button) == 2 ? new_element2 : \
+				(button) == 3 ? new_element3 : EL_EMPTY)
+#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();
 static void CopyLevelToUndoBuffer(int);
-static void HandleControlButtons(struct GadgetInfo *);
-static void HandleCounterButtons(struct GadgetInfo *);
 static void HandleDrawingAreas(struct GadgetInfo *);
-static void HandleDrawingAreaInfo(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
 static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleSelectboxGadgets(struct GadgetInfo *);
+static void HandleRadiobuttons(struct GadgetInfo *);
+static void HandleCheckbuttons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
+static void HandleDrawingAreaInfo(struct GadgetInfo *);
 
-static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
+static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
 
-static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
-static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static int drawing_function = GADGET_ID_SINGLE_ITEMS;
+static int last_drawing_function = GADGET_ID_SINGLE_ITEMS;
 static boolean draw_with_brush = FALSE;
 static int properties_element = 0;
 
-static short ElementContent[MAX_ELEM_CONTENT][3][3];
+static short ElementContent[MAX_ELEMENT_CONTENTS][3][3];
 static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static int undo_buffer_position = 0;
 static int undo_buffer_steps = 0;
 
-static int random_placement_percentage = 10;
-static int random_placement_num_objects = 10;
-#if 0
-static int random_placement_method = RANDOM_USE_PERCENTAGE;
-#else
-static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
-#endif
-
-static int level_xpos, level_ypos;
 static int edit_mode;
-static boolean name_typing;
-static int new_element1 = EL_MAUERWERK;
-static int new_element2 = EL_LEERRAUM;
-static int new_element3 = EL_ERDREICH;
 
-static int counter_xsize = DXSIZE + 20;
+static int element_shift = 0;
+
+static int editor_el_boulderdash[] =
+{
+  EL_CHAR('B'),
+  EL_CHAR('O'),
+  EL_CHAR('U'),
+  EL_CHAR('L'),
+
+  EL_CHAR('-'),
+  EL_CHAR('D'),
+  EL_CHAR('E'),
+  EL_CHAR('R'),
 
-int element_shift = 0;
+  EL_CHAR('D'),
+  EL_CHAR('A'),
+  EL_CHAR('S'),
+  EL_CHAR('H'),
+
+  EL_PLAYER_1,
+  EL_EMPTY,
+  EL_SAND,
+  EL_STEELWALL,
+
+  EL_BD_WALL,
+  EL_BD_MAGIC_WALL,
+  EL_EXIT_CLOSED,
+  EL_EXIT_OPEN,
+
+  EL_BD_DIAMOND,
+  EL_BD_BUTTERFLY_UP,
+  EL_BD_FIREFLY_UP,
+  EL_BD_ROCK,
+
+  EL_BD_BUTTERFLY_LEFT,
+  EL_BD_FIREFLY_LEFT,
+  EL_BD_BUTTERFLY_RIGHT,
+  EL_BD_FIREFLY_RIGHT,
+
+  EL_BD_AMOEBA,
+  EL_BD_BUTTERFLY_DOWN,
+  EL_BD_FIREFLY_DOWN,
+  EL_EMPTY,
+};
+static int num_editor_el_boulderdash = SIZEOF_ARRAY_INT(editor_el_boulderdash);
 
-int editor_element[] =
+static int editor_el_emerald_mine[] =
 {
-  EL_CHAR_A + ('B' - 'A'),
-  EL_CHAR_A + ('O' - 'A'),
-  EL_CHAR_A + ('U' - 'A'),
-  EL_CHAR_A + ('L' - 'A'),
-
-  EL_CHAR_MINUS,
-  EL_CHAR_A + ('D' - 'A'),
-  EL_CHAR_A + ('E' - 'A'),
-  EL_CHAR_A + ('R' - 'A'),
-
-  EL_CHAR_A + ('D' - 'A'),
-  EL_CHAR_A + ('A' - 'A'),
-  EL_CHAR_A + ('S' - 'A'),
-  EL_CHAR_A + ('H' - 'A'),
-
-  EL_SPIELFIGUR,
-  EL_LEERRAUM,
-  EL_ERDREICH,
-  EL_BETON,
-
-  EL_FELSBODEN,
-  EL_SIEB2_INAKTIV,
-  EL_AUSGANG_ZU,
-  EL_AUSGANG_AUF,
-
-  EL_EDELSTEIN_BD,
-  EL_BUTTERFLY_O,
-  EL_FIREFLY_O,
-  EL_FELSBROCKEN,
-
-  EL_BUTTERFLY_L,
-  EL_FIREFLY_L,
-  EL_BUTTERFLY_R,
-  EL_FIREFLY_R,
-
-  EL_AMOEBE_BD,
-  EL_BUTTERFLY_U,
-  EL_FIREFLY_U,
-  EL_LEERRAUM,
-
-  EL_CHAR_A + ('E' - 'A'),
-  EL_CHAR_A + ('M' - 'A'),
-  EL_CHAR_A + ('E' - 'A'),
-  EL_CHAR_MINUS,
-
-  EL_CHAR_A + ('R' - 'A'),
-  EL_CHAR_A + ('A' - 'A'),
-  EL_CHAR_A + ('L' - 'A'),
-  EL_CHAR_A + ('D' - 'A'),
-
-  EL_CHAR_A + ('M' - 'A'),
-  EL_CHAR_A + ('I' - 'A'),
-  EL_CHAR_A + ('N' - 'A'),
-  EL_CHAR_A + ('E' - 'A'),
-
-  EL_SPIELER1,
-  EL_SPIELER2,
-  EL_SPIELER3,
-  EL_SPIELER4,
-
-  EL_SPIELFIGUR,
-  EL_LEERRAUM,
-  EL_ERDREICH,
-  EL_FELSBROCKEN,
-
-  EL_BETON,
-  EL_MAUERWERK,
-  EL_FELSBODEN,
-  EL_SIEB_INAKTIV,
-
-  EL_EDELSTEIN,
-  EL_DIAMANT,
-  EL_KOKOSNUSS,
-  EL_BOMBE,
-
-  EL_ERZ_EDEL,
-  EL_ERZ_DIAM,
-  EL_MORAST_LEER,
-  EL_MORAST_VOLL,
-
-  EL_DYNAMIT_AUS,
-  EL_DYNAMIT,
-  EL_AUSGANG_ZU,
-  EL_AUSGANG_AUF,
-
-  EL_MAMPFER,
-  EL_KAEFER_O,
-  EL_FLIEGER_O,
+  EL_CHAR('E'),
+  EL_CHAR('M'),
+  EL_CHAR('E'),
+  EL_CHAR('-'),
+
+  EL_CHAR('R'),
+  EL_CHAR('A'),
+  EL_CHAR('L'),
+  EL_CHAR('D'),
+
+  EL_CHAR('M'),
+  EL_CHAR('I'),
+  EL_CHAR('N'),
+  EL_CHAR('E'),
+
+  EL_PLAYER_1,
+  EL_PLAYER_2,
+  EL_PLAYER_3,
+  EL_PLAYER_4,
+
+  EL_PLAYER_1,
+  EL_EMPTY,
+  EL_SAND,
+  EL_ROCK,
+
+  EL_STEELWALL,
+  EL_WALL,
+  EL_WALL_CRUMBLED,
+  EL_MAGIC_WALL,
+
+  EL_EMERALD,
+  EL_DIAMOND,
+  EL_NUT,
+  EL_BOMB,
+
+  EL_WALL_EMERALD,
+  EL_WALL_DIAMOND,
+  EL_QUICKSAND_EMPTY,
+  EL_QUICKSAND_FULL,
+
+  EL_DYNAMITE,
+  EL_DYNAMITE_ACTIVE,
+  EL_EXIT_CLOSED,
+  EL_EXIT_OPEN,
+
+  EL_YAMYAM,
+  EL_BUG_UP,
+  EL_SPACESHIP_UP,
   EL_ROBOT,
 
-  EL_KAEFER_L,
-  EL_FLIEGER_L,
-  EL_KAEFER_R,
-  EL_FLIEGER_R,
-
-  EL_ABLENK_AUS,
-  EL_KAEFER_U,
-  EL_FLIEGER_U,
-  EL_UNSICHTBAR,
-
-  EL_BADEWANNE1,
-  EL_SALZSAEURE,
-  EL_BADEWANNE2,
-  EL_LEERRAUM,
-
-  EL_BADEWANNE3,
-  EL_BADEWANNE4,
-  EL_BADEWANNE5,
-  EL_LEERRAUM,
-
-  EL_TROPFEN,
-  EL_AMOEBE_TOT,
-  EL_AMOEBE_NASS,
-  EL_AMOEBE_NORM,
-
-  EL_SCHLUESSEL1,
-  EL_SCHLUESSEL2,
-  EL_SCHLUESSEL3,
-  EL_SCHLUESSEL4,
-
-  EL_PFORTE1,
-  EL_PFORTE2,
-  EL_PFORTE3,
-  EL_PFORTE4,
-
-  EL_PFORTE1X,
-  EL_PFORTE2X,
-  EL_PFORTE3X,
-  EL_PFORTE4X,
-
-  EL_CHAR_A + ('M' - 'A'),
-  EL_CHAR_A + ('O' - 'A'),
-  EL_CHAR_A + ('R' - 'A'),
-  EL_CHAR_A + ('E' - 'A'),
-
-  EL_PFEIL_L,
-  EL_PFEIL_R,
-  EL_PFEIL_O,
-  EL_PFEIL_U,
-
-  EL_AMOEBE_VOLL,
-  EL_EDELSTEIN_GELB,
-  EL_EDELSTEIN_ROT,
-  EL_EDELSTEIN_LILA,
-
-  EL_ERZ_EDEL_BD,
-  EL_ERZ_EDEL_GELB,
-  EL_ERZ_EDEL_ROT,
-  EL_ERZ_EDEL_LILA,
-
-  EL_LIFE,
-  EL_PACMAN_O,
-  EL_ZEIT_VOLL,
-  EL_ZEIT_LEER,
-
-  EL_PACMAN_L,
-  EL_MAMPFER2,
-  EL_PACMAN_R,
-  EL_MAUER_LEBT,
-
-  EL_LIFE_ASYNC,
-  EL_PACMAN_U,
-  EL_BIRNE_AUS,
-  EL_BIRNE_EIN,
-
-  EL_DYNABOMB_NR,
-  EL_DYNABOMB_SZ,
-  EL_DYNABOMB_XL,
-  EL_BADEWANNE,
-
-  EL_MAULWURF,
-  EL_PINGUIN,
-  EL_SCHWEIN,
-  EL_DRACHE,
-
-  EL_SONDE,
-  EL_MAUER_X,
-  EL_MAUER_Y,
-  EL_MAUER_XY,
-
-  EL_INVISIBLE_STEEL,
-  EL_UNSICHTBAR,
+  EL_BUG_LEFT,
+  EL_SPACESHIP_LEFT,
+  EL_BUG_RIGHT,
+  EL_SPACESHIP_RIGHT,
+
+  EL_ROBOT_WHEEL,
+  EL_BUG_DOWN,
+  EL_SPACESHIP_DOWN,
+  EL_INVISIBLE_WALL,
+
+  EL_ACID_POOL_TOPLEFT,
+  EL_ACID,
+  EL_ACID_POOL_TOPRIGHT,
+  EL_EMPTY,
+
+  EL_ACID_POOL_BOTTOMLEFT,
+  EL_ACID_POOL_BOTTOM,
+  EL_ACID_POOL_BOTTOMRIGHT,
+  EL_EMPTY,
+
+  EL_AMOEBA_DROP,
+  EL_AMOEBA_DEAD,
+  EL_AMOEBA_WET,
+  EL_AMOEBA_DRY,
+
+  EL_EM_KEY_1_FILE,
+  EL_EM_KEY_2_FILE,
+  EL_EM_KEY_3_FILE,
+  EL_EM_KEY_4_FILE,
+
+  EL_EM_GATE_1,
+  EL_EM_GATE_2,
+  EL_EM_GATE_3,
+  EL_EM_GATE_4,
+
+  EL_EM_GATE_1_GRAY,
+  EL_EM_GATE_2_GRAY,
+  EL_EM_GATE_3_GRAY,
+  EL_EM_GATE_4_GRAY,
+};
+static int num_editor_el_emerald_mine = SIZEOF_ARRAY_INT(editor_el_emerald_mine);
+
+static int editor_el_more[] =
+{
+  EL_CHAR('M'),
+  EL_CHAR('O'),
+  EL_CHAR('R'),
+  EL_CHAR('E'),
+
+  EL_KEY_1,
+  EL_KEY_2,
+  EL_KEY_3,
+  EL_KEY_4,
+
+  EL_GATE_1,
+  EL_GATE_2,
+  EL_GATE_3,
+  EL_GATE_4,
+
+  EL_GATE_1_GRAY,
+  EL_GATE_2_GRAY,
+  EL_GATE_3_GRAY,
+  EL_GATE_4_GRAY,
+
+  EL_ARROW_LEFT,
+  EL_ARROW_RIGHT,
+  EL_ARROW_UP,
+  EL_ARROW_DOWN,
+
+  EL_AMOEBA_FULL,
+  EL_EMERALD_YELLOW,
+  EL_EMERALD_RED,
+  EL_EMERALD_PURPLE,
+
+  EL_WALL_BD_DIAMOND,
+  EL_WALL_EMERALD_YELLOW,
+  EL_WALL_EMERALD_RED,
+  EL_WALL_EMERALD_PURPLE,
+
+  EL_GAME_OF_LIFE,
+  EL_PACMAN_UP,
+  EL_TIME_ORB_FULL,
+  EL_TIME_ORB_EMPTY,
+
+  EL_PACMAN_LEFT,
+  EL_DARK_YAMYAM,
+  EL_PACMAN_RIGHT,
+  EL_EXPANDABLE_WALL,
+
+  EL_BIOMAZE,
+  EL_PACMAN_DOWN,
+  EL_LAMP,
+  EL_LAMP_ACTIVE,
+
+  EL_DYNABOMB_INCREASE_NUMBER,
+  EL_DYNABOMB_INCREASE_SIZE,
+  EL_DYNABOMB_INCREASE_POWER,
+  EL_STONEBLOCK,
+
+  EL_MOLE,
+  EL_PENGUIN,
+  EL_PIG,
+  EL_DRAGON,
+
+  EL_EMPTY,
+  EL_MOLE_UP,
+  EL_EMPTY,
+  EL_EMPTY,
+
+  EL_MOLE_LEFT,
+  EL_EMPTY,
+  EL_MOLE_RIGHT,
+  EL_EMPTY,
+
+  EL_EMPTY,
+  EL_MOLE_DOWN,
+  EL_BALLOON,
+  EL_BALLOON_SWITCH_ANY,
+
+  EL_BALLOON_SWITCH_LEFT,
+  EL_BALLOON_SWITCH_RIGHT,
+  EL_BALLOON_SWITCH_UP,
+  EL_BALLOON_SWITCH_DOWN,
+
+  EL_SATELLITE,
+  EL_EXPANDABLE_WALL_HORIZONTAL,
+  EL_EXPANDABLE_WALL_VERTICAL,
+  EL_EXPANDABLE_WALL_ANY,
+
+  EL_INVISIBLE_STEELWALL,
+  EL_INVISIBLE_WALL,
   EL_SPEED_PILL,
-  EL_LEERRAUM,
+  EL_BLACK_ORB,
+
+  EL_EMC_STEELWALL_1,
+  EL_EMC_WALL_1,
+  EL_EMC_WALL_2,
+  EL_EMC_WALL_3,
 
-  EL_CHAR_A + ('S' - 'A'),
-  EL_CHAR_A + ('O' - 'A'),
-  EL_CHAR_A + ('K' - 'A'),
-  EL_CHAR_A + ('O' - 'A'),
+  EL_EMC_WALL_4,
+  EL_EMC_WALL_5,
+  EL_EMC_WALL_6,
+  EL_EMC_WALL_7,
+};
+static int num_editor_el_more = SIZEOF_ARRAY_INT(editor_el_more);
 
-  EL_CHAR_MINUS,
-  EL_CHAR_A + ('B' - 'A'),
-  EL_CHAR_A + ('A' - 'A'),
-  EL_CHAR_A + ('N' - 'A'),
+static int editor_el_sokoban[] =
+{
+  EL_CHAR('S'),
+  EL_CHAR('O'),
+  EL_CHAR('K'),
+  EL_CHAR('O'),
 
-  EL_SOKOBAN_OBJEKT,
-  EL_SOKOBAN_FELD_LEER,
-  EL_SOKOBAN_FELD_VOLL,
-  EL_BETON,
+  EL_CHAR('-'),
+  EL_CHAR('B'),
+  EL_CHAR('A'),
+  EL_CHAR('N'),
 
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
+  EL_SOKOBAN_OBJECT,
+  EL_SOKOBAN_FIELD_EMPTY,
+  EL_SOKOBAN_FIELD_FULL,
+  EL_STEELWALL,
+};
+static int num_editor_el_sokoban = SIZEOF_ARRAY_INT(editor_el_sokoban);
 
+static int editor_el_supaplex[] =
+{
   EL_CHAR('S'),
   EL_CHAR('U'),
   EL_CHAR('P'),
@@ -745,147 +1109,581 @@ int editor_element[] =
 
   EL_SP_INFOTRON,
   EL_SP_CHIP_SINGLE,
-  EL_SP_HARD_GRAY,
-  EL_SP_EXIT,
+  EL_SP_HARDWARE_GRAY,
+  EL_SP_EXIT_CLOSED,
 
   EL_SP_DISK_ORANGE,
-  EL_SP_PORT1_RIGHT,
-  EL_SP_PORT1_DOWN,
-  EL_SP_PORT1_LEFT,
+  EL_SP_PORT_RIGHT,
+  EL_SP_PORT_DOWN,
+  EL_SP_PORT_LEFT,
 
-  EL_SP_PORT1_UP,
-  EL_SP_PORT2_RIGHT,
-  EL_SP_PORT2_DOWN,
-  EL_SP_PORT2_LEFT,
+  EL_SP_PORT_UP,
+  EL_SP_GRAVITY_PORT_RIGHT,
+  EL_SP_GRAVITY_PORT_DOWN,
+  EL_SP_GRAVITY_PORT_LEFT,
 
-  EL_SP_PORT2_UP,
+  EL_SP_GRAVITY_PORT_UP,
   EL_SP_SNIKSNAK,
   EL_SP_DISK_YELLOW,
   EL_SP_TERMINAL,
 
   EL_SP_DISK_RED,
-  EL_SP_PORT_Y,
-  EL_SP_PORT_X,
-  EL_SP_PORT_XY,
+  EL_SP_PORT_VERTICAL,
+  EL_SP_PORT_HORIZONTAL,
+  EL_SP_PORT_ANY,
 
   EL_SP_ELECTRON,
-  EL_SP_BUG,
+  EL_SP_BUGGY_BASE,
   EL_SP_CHIP_LEFT,
   EL_SP_CHIP_RIGHT,
 
-  EL_SP_HARD_BASE1,
-  EL_SP_HARD_GREEN,
-  EL_SP_HARD_BLUE,
-  EL_SP_HARD_RED,
-
-  EL_SP_HARD_YELLOW,
-  EL_SP_HARD_BASE2,
-  EL_SP_HARD_BASE3,
-  EL_SP_HARD_BASE4,
-
-  EL_SP_HARD_BASE5,
-  EL_SP_HARD_BASE6,
-  EL_SP_CHIP_UPPER,
-  EL_SP_CHIP_LOWER,
-
-/*
-  EL_CHAR_A + ('D' - 'A'),
-  EL_CHAR_A + ('Y' - 'A'),
-  EL_CHAR_A + ('N' - 'A'),
-  EL_CHAR_A + ('A' - 'A'),
-
-  EL_CHAR_A + ('B' - 'A'),
-  EL_CHAR_A + ('L' - 'A'),
-  EL_CHAR_A + ('A' - 'A'),
-  EL_CHAR_A + ('S' - 'A'),
-
-  EL_CHAR_MINUS,
-  EL_CHAR_A + ('T' - 'A'),
-  EL_CHAR_A + ('E' - 'A'),
-  EL_CHAR_A + ('R' - 'A'),
-*/
-
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
-
-  EL_CHAR_AUSRUF,
-  EL_CHAR_ZOLL,
-  EL_CHAR_DOLLAR,
-  EL_CHAR_PROZ,
-
-  EL_CHAR_APOSTR,
-  EL_CHAR_KLAMM1,
-  EL_CHAR_KLAMM2,
-  EL_CHAR_PLUS,
-
-  EL_CHAR_KOMMA,
-  EL_CHAR_MINUS,
-  EL_CHAR_PUNKT,
-  EL_CHAR_SLASH,
-
-  EL_CHAR_0 + 0,
-  EL_CHAR_0 + 1,
-  EL_CHAR_0 + 2,
-  EL_CHAR_0 + 3,
-
-  EL_CHAR_0 + 4,
-  EL_CHAR_0 + 5,
-  EL_CHAR_0 + 6,
-  EL_CHAR_0 + 7,
-
-  EL_CHAR_0 + 8,
-  EL_CHAR_0 + 9,
-  EL_CHAR_DOPPEL,
-  EL_CHAR_SEMIKL,
-
-  EL_CHAR_LT,
-  EL_CHAR_GLEICH,
-  EL_CHAR_GT,
-  EL_CHAR_FRAGE,
-
-  EL_CHAR_AT,
-  EL_CHAR_A + 0,
-  EL_CHAR_A + 1,
-  EL_CHAR_A + 2,
-
-  EL_CHAR_A + 3,
-  EL_CHAR_A + 4,
-  EL_CHAR_A + 5,
-  EL_CHAR_A + 6,
-
-  EL_CHAR_A + 7,
-  EL_CHAR_A + 8,
-  EL_CHAR_A + 9,
-  EL_CHAR_A + 10,
-
-  EL_CHAR_A + 11,
-  EL_CHAR_A + 12,
-  EL_CHAR_A + 13,
-  EL_CHAR_A + 14,
-
-  EL_CHAR_A + 15,
-  EL_CHAR_A + 16,
-  EL_CHAR_A + 17,
-  EL_CHAR_A + 18,
-
-  EL_CHAR_A + 19,
-  EL_CHAR_A + 20,
-  EL_CHAR_A + 21,
-  EL_CHAR_A + 22,
-
-  EL_CHAR_A + 23,
-  EL_CHAR_A + 24,
-  EL_CHAR_A + 25,
-  EL_CHAR_AE,
-
-  EL_CHAR_OE,
-  EL_CHAR_UE,
-  EL_CHAR_COPY,
-  EL_LEERRAUM
+  EL_SP_HARDWARE_BASE_1,
+  EL_SP_HARDWARE_GREEN,
+  EL_SP_HARDWARE_BLUE,
+  EL_SP_HARDWARE_RED,
+
+  EL_SP_HARDWARE_YELLOW,
+  EL_SP_HARDWARE_BASE_2,
+  EL_SP_HARDWARE_BASE_3,
+  EL_SP_HARDWARE_BASE_4,
+
+  EL_SP_HARDWARE_BASE_5,
+  EL_SP_HARDWARE_BASE_6,
+  EL_SP_CHIP_TOP,
+  EL_SP_CHIP_BOTTOM,
+};
+static int num_editor_el_supaplex = SIZEOF_ARRAY_INT(editor_el_supaplex);
+
+static int editor_el_diamond_caves[] =
+{
+  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_PEARL,
+  EL_CRYSTAL,
+  EL_WALL_PEARL,
+  EL_WALL_CRYSTAL,
+
+  EL_CONVEYOR_BELT_1_LEFT,
+  EL_CONVEYOR_BELT_1_MIDDLE,
+  EL_CONVEYOR_BELT_1_RIGHT,
+  EL_CONVEYOR_BELT_1_SWITCH_MIDDLE,
+
+  EL_CONVEYOR_BELT_2_LEFT,
+  EL_CONVEYOR_BELT_2_MIDDLE,
+  EL_CONVEYOR_BELT_2_RIGHT,
+  EL_CONVEYOR_BELT_2_SWITCH_MIDDLE,
+
+  EL_CONVEYOR_BELT_3_LEFT,
+  EL_CONVEYOR_BELT_3_MIDDLE,
+  EL_CONVEYOR_BELT_3_RIGHT,
+  EL_CONVEYOR_BELT_3_SWITCH_MIDDLE,
+
+  EL_CONVEYOR_BELT_4_LEFT,
+  EL_CONVEYOR_BELT_4_MIDDLE,
+  EL_CONVEYOR_BELT_4_RIGHT,
+  EL_CONVEYOR_BELT_4_SWITCH_MIDDLE,
+
+  EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+  EL_CONVEYOR_BELT_4_SWITCH_LEFT,
+
+  EL_CONVEYOR_BELT_1_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_2_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_3_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT_4_SWITCH_RIGHT,
+
+  EL_SWITCHGATE_OPEN,
+  EL_SWITCHGATE_CLOSED,
+  EL_SWITCHGATE_SWITCH_UP,
+  EL_ENVELOPE,
+
+  EL_TIMEGATE_CLOSED,
+  EL_TIMEGATE_OPEN,
+  EL_TIMEGATE_SWITCH,
+  EL_EMPTY,
+
+  EL_LANDMINE,
+  EL_INVISIBLE_SAND,
+  EL_STEELWALL_SLANTED,
+  EL_EMPTY,
+
+  EL_SIGN_EXCLAMATION,
+  EL_SIGN_STOP,
+  EL_LIGHT_SWITCH,
+  EL_LIGHT_SWITCH_ACTIVE,
+
+  EL_SHIELD_NORMAL,
+  EL_SHIELD_DEADLY,
+  EL_EXTRA_TIME,
+  EL_EMPTY,
+};
+static int num_editor_el_diamond_caves = SIZEOF_ARRAY_INT(editor_el_diamond_caves);
+
+static int editor_el_dx_boulderdash[] =
+{
+  EL_CHAR('D'),
+  EL_CHAR('X'),
+  EL_CHAR('-'),
+  EL_CHAR(' '),
+
+  EL_CHAR('B'),
+  EL_CHAR('O'),
+  EL_CHAR('U'),
+  EL_CHAR('L'),
+
+  EL_CHAR('-'),
+  EL_CHAR('D'),
+  EL_CHAR('E'),
+  EL_CHAR('R'),
+
+  EL_CHAR('D'),
+  EL_CHAR('A'),
+  EL_CHAR('S'),
+  EL_CHAR('H'),
+
+  EL_SPRING,
+  EL_TUBE_RIGHT_DOWN,
+  EL_TUBE_HORIZONTAL_DOWN,
+  EL_TUBE_LEFT_DOWN,
+
+  EL_TUBE_HORIZONTAL,
+  EL_TUBE_VERTICAL_RIGHT,
+  EL_TUBE_ANY,
+  EL_TUBE_VERTICAL_LEFT,
+
+  EL_TUBE_VERTICAL,
+  EL_TUBE_RIGHT_UP,
+  EL_TUBE_HORIZONTAL_UP,
+  EL_TUBE_LEFT_UP,
+
+  EL_TRAP,
+  EL_DX_SUPABOMB,
+  EL_EMPTY,
+  EL_EMPTY
+};
+static int num_editor_el_dx_boulderdash = SIZEOF_ARRAY_INT(editor_el_dx_boulderdash);
+
+static int editor_el_chars[] =
+{
+  EL_CHAR('T'),
+  EL_CHAR('E'),
+  EL_CHAR('X'),
+  EL_CHAR('T'),
+
+  EL_CHAR(' '),
+  EL_CHAR('!'),
+  EL_CHAR('"'),
+  EL_CHAR('#'),
+
+  EL_CHAR('$'),
+  EL_CHAR('%'),
+  EL_CHAR('&'),
+  EL_CHAR('\''),
+
+  EL_CHAR('('),
+  EL_CHAR(')'),
+  EL_CHAR('*'),
+  EL_CHAR('+'),
+
+  EL_CHAR(','),
+  EL_CHAR('-'),
+  EL_CHAR('.'),
+  EL_CHAR('/'),
+
+  EL_CHAR('0'),
+  EL_CHAR('1'),
+  EL_CHAR('2'),
+  EL_CHAR('3'),
+
+  EL_CHAR('4'),
+  EL_CHAR('5'),
+  EL_CHAR('6'),
+  EL_CHAR('7'),
+
+  EL_CHAR('8'),
+  EL_CHAR('9'),
+  EL_CHAR(':'),
+  EL_CHAR(';'),
+
+  EL_CHAR('<'),
+  EL_CHAR('='),
+  EL_CHAR('>'),
+  EL_CHAR('?'),
+
+  EL_CHAR('@'),
+  EL_CHAR('A'),
+  EL_CHAR('B'),
+  EL_CHAR('C'),
+
+  EL_CHAR('D'),
+  EL_CHAR('E'),
+  EL_CHAR('F'),
+  EL_CHAR('G'),
+
+  EL_CHAR('H'),
+  EL_CHAR('I'),
+  EL_CHAR('J'),
+  EL_CHAR('K'),
+
+  EL_CHAR('L'),
+  EL_CHAR('M'),
+  EL_CHAR('N'),
+  EL_CHAR('O'),
+
+  EL_CHAR('P'),
+  EL_CHAR('Q'),
+  EL_CHAR('R'),
+  EL_CHAR('S'),
+
+  EL_CHAR('T'),
+  EL_CHAR('U'),
+  EL_CHAR('V'),
+  EL_CHAR('W'),
+
+  EL_CHAR('X'),
+  EL_CHAR('Y'),
+  EL_CHAR('Z'),
+  EL_CHAR('Ä'),
+
+  EL_CHAR('Ö'),
+  EL_CHAR('Ü'),
+  EL_CHAR('^'),
+  EL_CHAR('_'),
+
+  EL_CHAR(' '),
+  EL_CHAR('°'),
+  EL_CHAR('´'),
+  EL_CHAR('|')
+};
+static int num_editor_el_chars = SIZEOF_ARRAY_INT(editor_el_chars);
+
+static int editor_el_custom[] =
+{
+  EL_CHAR('C'),
+  EL_CHAR('U'),
+  EL_CHAR('S'),
+  EL_CHAR('-'),
+
+  EL_CHAR('T'),
+  EL_CHAR('O'),
+  EL_CHAR('M'),
+  EL_CHAR(' '),
+
+  EL_CHAR('E'),
+  EL_CHAR('L'),
+  EL_CHAR('E'),
+  EL_CHAR('M'),
+
+  EL_CHAR('E'),
+  EL_CHAR('N'),
+  EL_CHAR('T'),
+  EL_CHAR('S'),
+
+  EL_CUSTOM_START + 0,
+  EL_CUSTOM_START + 1,
+  EL_CUSTOM_START + 2,
+  EL_CUSTOM_START + 3,
+
+  EL_CUSTOM_START + 4,
+  EL_CUSTOM_START + 5,
+  EL_CUSTOM_START + 6,
+  EL_CUSTOM_START + 7,
+
+  EL_CUSTOM_START + 8,
+  EL_CUSTOM_START + 9,
+  EL_CUSTOM_START + 10,
+  EL_CUSTOM_START + 11,
+
+  EL_CUSTOM_START + 12,
+  EL_CUSTOM_START + 13,
+  EL_CUSTOM_START + 14,
+  EL_CUSTOM_START + 15,
+
+  EL_CUSTOM_START + 16,
+  EL_CUSTOM_START + 17,
+  EL_CUSTOM_START + 18,
+  EL_CUSTOM_START + 19,
+
+  EL_CUSTOM_START + 20,
+  EL_CUSTOM_START + 21,
+  EL_CUSTOM_START + 22,
+  EL_CUSTOM_START + 23,
+
+  EL_CUSTOM_START + 24,
+  EL_CUSTOM_START + 25,
+  EL_CUSTOM_START + 26,
+  EL_CUSTOM_START + 27,
+
+  EL_CUSTOM_START + 28,
+  EL_CUSTOM_START + 29,
+  EL_CUSTOM_START + 30,
+  EL_CUSTOM_START + 31,
+
+  EL_CUSTOM_START + 32,
+  EL_CUSTOM_START + 33,
+  EL_CUSTOM_START + 34,
+  EL_CUSTOM_START + 35,
+
+  EL_CUSTOM_START + 36,
+  EL_CUSTOM_START + 37,
+  EL_CUSTOM_START + 38,
+  EL_CUSTOM_START + 39,
+
+  EL_CUSTOM_START + 40,
+  EL_CUSTOM_START + 41,
+  EL_CUSTOM_START + 42,
+  EL_CUSTOM_START + 43,
+
+  EL_CUSTOM_START + 44,
+  EL_CUSTOM_START + 45,
+  EL_CUSTOM_START + 46,
+  EL_CUSTOM_START + 47,
+
+  EL_CUSTOM_START + 48,
+  EL_CUSTOM_START + 49,
+  EL_CUSTOM_START + 50,
+  EL_CUSTOM_START + 51,
+
+  EL_CUSTOM_START + 52,
+  EL_CUSTOM_START + 53,
+  EL_CUSTOM_START + 54,
+  EL_CUSTOM_START + 55,
+
+  EL_CUSTOM_START + 56,
+  EL_CUSTOM_START + 57,
+  EL_CUSTOM_START + 58,
+  EL_CUSTOM_START + 59,
+
+  EL_CUSTOM_START + 60,
+  EL_CUSTOM_START + 61,
+  EL_CUSTOM_START + 62,
+  EL_CUSTOM_START + 63,
+
+  EL_CUSTOM_START + 64,
+  EL_CUSTOM_START + 65,
+  EL_CUSTOM_START + 66,
+  EL_CUSTOM_START + 67,
+
+  EL_CUSTOM_START + 68,
+  EL_CUSTOM_START + 69,
+  EL_CUSTOM_START + 70,
+  EL_CUSTOM_START + 71,
+
+  EL_CUSTOM_START + 72,
+  EL_CUSTOM_START + 73,
+  EL_CUSTOM_START + 74,
+  EL_CUSTOM_START + 75,
+
+  EL_CUSTOM_START + 76,
+  EL_CUSTOM_START + 77,
+  EL_CUSTOM_START + 78,
+  EL_CUSTOM_START + 79,
+
+  EL_CUSTOM_START + 80,
+  EL_CUSTOM_START + 81,
+  EL_CUSTOM_START + 82,
+  EL_CUSTOM_START + 83,
+
+  EL_CUSTOM_START + 84,
+  EL_CUSTOM_START + 85,
+  EL_CUSTOM_START + 86,
+  EL_CUSTOM_START + 87,
+
+  EL_CUSTOM_START + 88,
+  EL_CUSTOM_START + 89,
+  EL_CUSTOM_START + 90,
+  EL_CUSTOM_START + 91,
+
+  EL_CUSTOM_START + 92,
+  EL_CUSTOM_START + 93,
+  EL_CUSTOM_START + 94,
+  EL_CUSTOM_START + 95,
+
+  EL_CUSTOM_START + 96,
+  EL_CUSTOM_START + 97,
+  EL_CUSTOM_START + 98,
+  EL_CUSTOM_START + 99,
+
+  EL_CUSTOM_START + 100,
+  EL_CUSTOM_START + 101,
+  EL_CUSTOM_START + 102,
+  EL_CUSTOM_START + 103,
+
+  EL_CUSTOM_START + 104,
+  EL_CUSTOM_START + 105,
+  EL_CUSTOM_START + 106,
+  EL_CUSTOM_START + 107,
+
+  EL_CUSTOM_START + 108,
+  EL_CUSTOM_START + 109,
+  EL_CUSTOM_START + 110,
+  EL_CUSTOM_START + 111,
+
+  EL_CUSTOM_START + 112,
+  EL_CUSTOM_START + 113,
+  EL_CUSTOM_START + 114,
+  EL_CUSTOM_START + 115,
+
+  EL_CUSTOM_START + 116,
+  EL_CUSTOM_START + 117,
+  EL_CUSTOM_START + 118,
+  EL_CUSTOM_START + 119,
+
+  EL_CUSTOM_START + 120,
+  EL_CUSTOM_START + 121,
+  EL_CUSTOM_START + 122,
+  EL_CUSTOM_START + 123,
+
+  EL_CUSTOM_START + 124,
+  EL_CUSTOM_START + 125,
+  EL_CUSTOM_START + 126,
+  EL_CUSTOM_START + 127
 };
-int elements_in_list = sizeof(editor_element)/sizeof(int);
+static int num_editor_el_custom = SIZEOF_ARRAY_INT(editor_el_custom);
+
+static int *editor_elements = NULL;	/* dynamically allocated */
+static int num_editor_elements = 0;	/* dynamically determined */
+
+static struct
+{
+  boolean *setup_value;
+  int *element_list;
+  int *element_list_size;
+
+  boolean last_setup_value;
+}
+editor_elements_info[] =
+{
+  { &setup.editor.el_boulderdash,	editor_el_boulderdash,
+    &num_editor_el_boulderdash						},
+  { &setup.editor.el_emerald_mine,	editor_el_emerald_mine,
+    &num_editor_el_emerald_mine						},
+  { &setup.editor.el_more,		editor_el_more,
+    &num_editor_el_more							},
+  { &setup.editor.el_sokoban,		editor_el_sokoban,
+    &num_editor_el_sokoban						},
+  { &setup.editor.el_supaplex,		editor_el_supaplex,
+    &num_editor_el_supaplex						},
+  { &setup.editor.el_diamond_caves,	editor_el_diamond_caves,
+    &num_editor_el_diamond_caves					},
+  { &setup.editor.el_dx_boulderdash,	editor_el_dx_boulderdash,
+    &num_editor_el_dx_boulderdash					},
+  { &setup.editor.el_chars,		editor_el_chars,
+    &num_editor_el_chars						},
+  { &setup.editor.el_custom,		editor_el_custom,
+    &num_editor_el_custom						},
+  { NULL,				NULL,
+    NULL								}
+};
+
+static void ReinitializeElementList()
+{
+  int pos = 0;
+  int i, j;
+
+  if (editor_elements != NULL)
+    free(editor_elements);
+
+  num_editor_elements = 0;
+
+  /* determine size of element list */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    if (*editor_elements_info[i].setup_value)
+      num_editor_elements += *editor_elements_info[i].element_list_size;
+
+  if (num_editor_elements < ED_NUM_ELEMENTLIST_BUTTONS)
+  {
+    /* workaround: offer at least as many elements as element buttons exist */
+    int list_nr = 1;	/* see above: editor_elements_info for Emerald Mine */
+
+    *editor_elements_info[list_nr].setup_value = TRUE;
+    num_editor_elements += *editor_elements_info[list_nr].element_list_size;
+  }
+
+  editor_elements = checked_malloc(num_editor_elements * sizeof(int));
+
+  /* fill element list */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    if (*editor_elements_info[i].setup_value)
+      for (j=0; j<*editor_elements_info[i].element_list_size; j++)
+	editor_elements[pos++] = editor_elements_info[i].element_list[j];
+}
+
+static void ReinitializeElementListButtons()
+{
+  static boolean initialization_needed = TRUE;
+  int i;
+
+  if (!initialization_needed)	/* check if editor element setup has changed */
+    for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+      if (editor_elements_info[i].last_setup_value !=
+	  *editor_elements_info[i].setup_value)
+	initialization_needed = TRUE;
+
+  if (!initialization_needed)
+    return;
+
+  FreeLevelEditorGadgets();
+  CreateLevelEditorGadgets();
+
+  /* store current setup values for next invocation of this function */
+  for (i=0; editor_elements_info[i].setup_value != NULL; i++)
+    editor_elements_info[i].last_setup_value =
+      *editor_elements_info[i].setup_value;
+
+  initialization_needed = FALSE;
+}
+
+static int getCounterGadgetWidth()
+{
+  return (DXSIZE + getFontWidth(FONT_INPUT) - 2 * ED_GADGET_DISTANCE);
+}
+
+static int getMaxInfoTextLength()
+{
+  return (SXSIZE / getFontWidth(FONT_TEXT_2));
+}
+
+static char *getElementInfoText(int element)
+{
+  char *info_text = NULL;
+
+  if (element < NUM_FILE_ELEMENTS)
+  {
+    if (element_info[element].custom_description != NULL)
+      info_text = element_info[element].custom_description;
+    else if (element_info[element].editor_description != NULL)
+      info_text = element_info[element].editor_description;
+  }
+
+  if (info_text == NULL)
+  {
+    info_text = "unknown";
+
+    Error(ERR_WARN, "no element description for element %d", element);
+  }
+
+  return info_text;
+}
 
 static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 {
@@ -893,23 +1691,23 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
   int dx = (scroll == ED_SCROLL_LEFT ? -1 : scroll == ED_SCROLL_RIGHT ? 1 : 0);
   int dy = (scroll == ED_SCROLL_UP   ? -1 : scroll == ED_SCROLL_DOWN  ? 1 : 0);
 
-  XCopyArea(display, drawto, drawto, gc,
-	    SX + (dx == -1 ? MINI_TILEX : 0),
-	    SY + (dy == -1 ? MINI_TILEY : 0),
-	    (ED_FIELDX * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
-	    (ED_FIELDY * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
-	    SX + (dx == +1 ? MINI_TILEX : 0),
-	    SY + (dy == +1 ? MINI_TILEY : 0));
+  BlitBitmap(drawto, drawto,
+	     SX + (dx == -1 ? MINI_TILEX : 0),
+	     SY + (dy == -1 ? MINI_TILEY : 0),
+	     (ed_fieldx * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
+	     (ed_fieldy * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
+	     SX + (dx == +1 ? MINI_TILEX : 0),
+	     SY + (dy == +1 ? MINI_TILEY : 0));
   if (dx)
   {
-    x = (dx == 1 ? 0 : ED_FIELDX - 1);
-    for(y=0; y<ED_FIELDY; y++)
+    x = (dx == 1 ? 0 : ed_fieldx - 1);
+    for(y=0; y<ed_fieldy; y++)
       DrawMiniElementOrWall(x, y, from_x, from_y);
   }
   else if (dy)
   {
-    y = (dy == 1 ? 0 : ED_FIELDY - 1);
-    for(x=0; x<ED_FIELDX; x++)
+    y = (dy == 1 ? 0 : ed_fieldy - 1);
+    for(x=0; x<ed_fieldx; x++)
       DrawMiniElementOrWall(x, y, from_x, from_y);
   }
 
@@ -919,7 +1717,7 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 
 static void CreateControlButtons()
 {
-  Pixmap gd_pixmap = pix[PIX_DOOR];
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int i;
@@ -935,32 +1733,32 @@ static void CreateControlButtons()
     int radio_button_nr;
     boolean checked;
 
-    if (id == ED_CTRL_ID_SINGLE_ITEMS ||
-	id == ED_CTRL_ID_CONNECTED_ITEMS ||
-	id == ED_CTRL_ID_LINE ||
-	id == ED_CTRL_ID_ARC ||
-	id == ED_CTRL_ID_TEXT ||
-	id == ED_CTRL_ID_RECTANGLE ||
-	id == ED_CTRL_ID_FILLED_BOX ||
-	id == ED_CTRL_ID_FLOOD_FILL ||
-	id == ED_CTRL_ID_GRAB_BRUSH ||
-	id == ED_CTRL_ID_PICK_ELEMENT)
+    if (id == GADGET_ID_SINGLE_ITEMS ||
+	id == GADGET_ID_CONNECTED_ITEMS ||
+	id == GADGET_ID_LINE ||
+	id == GADGET_ID_ARC ||
+	id == GADGET_ID_TEXT ||
+	id == GADGET_ID_RECTANGLE ||
+	id == GADGET_ID_FILLED_BOX ||
+	id == GADGET_ID_FLOOD_FILL ||
+	id == GADGET_ID_GRAB_BRUSH ||
+	id == GADGET_ID_PICK_ELEMENT)
     {
       button_type = GD_TYPE_RADIO_BUTTON;
-      radio_button_nr = 1;
+      radio_button_nr = RADIO_NR_DRAWING_TOOLBOX;
       checked = (id == drawing_function ? TRUE : FALSE);
       event_mask = GD_EVENT_PRESSED;
     }
     else
     {
       button_type = GD_TYPE_NORMAL_BUTTON;
-      radio_button_nr = 0;
+      radio_button_nr = RADIO_NR_NONE;
       checked = FALSE;
 
-      if (id == ED_CTRL_ID_WRAP_LEFT ||
-	  id == ED_CTRL_ID_WRAP_RIGHT ||
-	  id == ED_CTRL_ID_WRAP_UP ||
-	  id == ED_CTRL_ID_WRAP_DOWN)
+      if (id == GADGET_ID_WRAP_LEFT ||
+	  id == GADGET_ID_WRAP_RIGHT ||
+	  id == GADGET_ID_WRAP_UP ||
+	  id == GADGET_ID_WRAP_DOWN)
 	event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
       else
 	event_mask = GD_EVENT_RELEASED;
@@ -993,6 +1791,7 @@ static void CreateControlButtons()
     gd_y2  = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, control_info[i].text,
 		      GDI_X, EX + gd_xoffset,
 		      GDI_Y, EY + gd_yoffset,
@@ -1002,11 +1801,12 @@ static void CreateControlButtons()
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_RADIO_NR, radio_button_nr,
 		      GDI_CHECKED, checked,
-		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
-		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1,
-		      GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2,
-		      GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y1,
+		      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y2,
+		      GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
 		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
 
@@ -1028,18 +1828,18 @@ static void CreateControlButtons()
 
     event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-    if (id == ED_CTRL_ID_ELEMENTLIST_UP ||
-	id == ED_CTRL_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
     {
       x += SX;
@@ -1050,9 +1850,10 @@ static void CreateControlButtons()
       gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
       gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
       gd_y2 = gd_y1;
-   }
+    }
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
 		      GDI_X, x,
 		      GDI_Y, y,
@@ -1060,9 +1861,10 @@ static void CreateControlButtons()
 		      GDI_HEIGHT, height,
 		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
 		      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_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
 		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
 
@@ -1075,43 +1877,45 @@ static void CreateControlButtons()
   /* create buttons for element list */
   for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
   {
-    Pixmap deco_pixmap;
+    Bitmap *deco_bitmap;
     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 = ED_CTRL_ID_ELEMENTLIST_FIRST + i;
+    int id = GADGET_ID_ELEMENTLIST_FIRST + i;
+    int element = editor_elements[i];
 
     event_mask = GD_EVENT_RELEASED;
 
     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);
+    getMiniGraphicSource(el2edimg(element), &deco_bitmap, &deco_x, &deco_y);
     deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
-		      GDI_INFO_TEXT, "choose element",
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, getElementInfoText(element),
 		      GDI_X, DX + gd_xoffset,
 		      GDI_Y, DY + gd_yoffset,
 		      GDI_WIDTH, ED_ELEMENTLIST_XSIZE,
 		      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_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+		      GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
 		      GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
 		      GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
 		      GDI_DECORATION_SHIFTING, 1, 1,
 		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
 
@@ -1124,6 +1928,7 @@ static void CreateControlButtons()
 
 static void CreateCounterButtons()
 {
+  int max_infotext_len = getMaxInfoTextLength();
   int i;
 
   for (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
@@ -1134,37 +1939,63 @@ static void CreateCounterButtons()
 
     for (j=0; j<2; j++)
     {
-      Pixmap gd_pixmap = pix[PIX_DOOR];
+      Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
       struct GadgetInfo *gi;
       int id = (j == 0 ?
 		counterbutton_info[i].gadget_id_down :
 		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];
+      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"));
 
       gi = CreateGadget(GDI_CUSTOM_ID, id,
+			GDI_CUSTOM_TYPE_ID, i,
 			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,
-			GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+			GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+			GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
 			GDI_EVENT_MASK, event_mask,
+			GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 			GDI_CALLBACK_ACTION, HandleCounterButtons,
 			GDI_END);
 
@@ -1176,13 +2007,31 @@ static void CreateCounterButtons()
 
       if (j == 0)
       {
+	int font_type = FONT_INPUT;
+	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 = FONT_LEVEL_NUMBER;
+
+	  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,
 			  GDI_INFO_TEXT, "enter counter value",
 			  GDI_X, xpos,
 			  GDI_Y, ypos,
@@ -1191,10 +2040,13 @@ static void CreateCounterButtons()
 			  GDI_NUMBER_MIN, counterbutton_info[i].min_value,
 			  GDI_NUMBER_MAX, counterbutton_info[i].max_value,
 			  GDI_TEXT_SIZE, 3,
-			  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_TEXT_FONT, font_type,
+			  GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+			  GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+			  GDI_BORDER_SIZE, ED_BORDER_SIZE,
+			  GDI_TEXTINPUT_DESIGN_WIDTH, gd_width,
 			  GDI_EVENT_MASK, event_mask,
+			  GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 			  GDI_CALLBACK_ACTION, HandleCounterButtons,
 			  GDI_END);
 
@@ -1220,12 +2072,12 @@ static void CreateDrawingAreas()
     GD_EVENT_OFF_BORDERS;
 
   /* one for the level drawing area ... */
-  id = ED_CTRL_ID_DRAWING_LEVEL;
+  id = GADGET_ID_DRAWING_LEVEL;
   gi = CreateGadget(GDI_CUSTOM_ID, id,
 		    GDI_X, SX,
 		    GDI_Y, SY,
 		    GDI_TYPE, GD_TYPE_DRAWING_AREA,
-		    GDI_AREA_SIZE, ED_FIELDX, ED_FIELDY,
+		    GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
 		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
 		    GDI_EVENT_MASK, event_mask,
 		    GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
@@ -1238,13 +2090,14 @@ static void CreateDrawingAreas()
   level_editor_gadget[id] = gi;
 
   /* ... up to eight areas for element content ... */
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
   {
     int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
     int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
 
-    id = ED_CTRL_ID_ELEM_CONTENT_0 + i;
+    id = GADGET_ID_ELEM_CONTENT_0 + i;
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_X, gx,
 		      GDI_Y, gy,
 		      GDI_WIDTH, 3 * MINI_TILEX,
@@ -1262,8 +2115,8 @@ static void CreateDrawingAreas()
     level_editor_gadget[id] = gi;
   }
 
-  /* ... and one for the amoeba content */
-  id = ED_CTRL_ID_AMOEBA_CONTENT;
+  /* ... one for the amoeba content */
+  id = GADGET_ID_AMOEBA_CONTENT;
   gi = CreateGadget(GDI_CUSTOM_ID, id,
 		    GDI_X, SX + ED_AREA_ELEM_CONTENT_XPOS,
 		    GDI_Y, SY + ED_AREA_ELEM_CONTENT_YPOS,
@@ -1280,20 +2133,41 @@ static void CreateDrawingAreas()
     Error(ERR_EXIT, "cannot create gadget");
 
   level_editor_gadget[id] = gi;
+
+  /* ... and one for random placement background restrictions */
+
+  id = GADGET_ID_RANDOM_BACKGROUND;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+		    GDI_X, SX + ED_AREA_RANDOM_BACKGROUND_XPOS,
+		    GDI_Y, SY + ED_AREA_RANDOM_BACKGROUND_YPOS,
+		    GDI_WIDTH, MINI_TILEX,
+		    GDI_HEIGHT, MINI_TILEY,
+		    GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		    GDI_EVENT_MASK, event_mask,
+		    GDI_CALLBACK_INFO, HandleDrawingAreaInfo,
+		    GDI_CALLBACK_ACTION, HandleDrawingAreas,
+		    GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[id] = gi;
 }
 
 static void CreateTextInputGadgets()
 {
+  int max_infotext_len = getMaxInfoTextLength();
   int i;
 
   for (i=0; i<ED_NUM_TEXTINPUT; i++)
   {
-    Pixmap gd_pixmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x, gd_y;
     struct GadgetInfo *gi;
     unsigned long event_mask;
-    char infotext[1024];
-    int id = ED_CTRL_ID_LEVEL_NAME + i;
+    char infotext[MAX_OUTPUT_LINESIZE + 1];
+    int id = textinput_info[i].gadget_id;
 
     event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
 
@@ -1301,19 +2175,23 @@ static void CreateTextInputGadgets()
     gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
 
     sprintf(infotext, "Enter %s", textinput_info[i].infotext);
-    infotext[MAX_INFOTEXT_LEN] = '\0';
+    infotext[max_infotext_len] = '\0';
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
 		      GDI_INFO_TEXT, infotext,
 		      GDI_X, SX + textinput_info[i].x,
 		      GDI_Y, SY + textinput_info[i].y,
 		      GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
 		      GDI_TEXT_VALUE, textinput_info[i].value,
-		      GDI_TEXT_SIZE, 30,
-		      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_TEXT_SIZE, textinput_info[i].size,
+		      GDI_TEXT_FONT, FONT_INPUT,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+		      GDI_BORDER_SIZE, ED_BORDER_SIZE,
+		      GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
 		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 		      GDI_CALLBACK_ACTION, HandleTextInputGadgets,
 		      GDI_END);
 
@@ -1324,6 +2202,55 @@ static void CreateTextInputGadgets()
   }
 }
 
+static void CreateSelectboxGadgets()
+{
+  int max_infotext_len = getMaxInfoTextLength();
+  int i;
+
+  for (i=0; i<ED_NUM_SELECTBOX; i++)
+  {
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+    int gd_x, gd_y;
+    struct GadgetInfo *gi;
+    unsigned long event_mask;
+    char infotext[MAX_OUTPUT_LINESIZE + 1];
+    int id = selectbox_info[i].gadget_id;
+
+    event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+    gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
+    gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
+
+    sprintf(infotext, "Select %s", selectbox_info[i].infotext);
+    infotext[max_infotext_len] = '\0';
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, infotext,
+		      GDI_X, SX + selectbox_info[i].x,
+		      GDI_Y, SY + selectbox_info[i].y,
+		      GDI_TYPE, GD_TYPE_SELECTBOX,
+		      GDI_SELECTBOX_VALUES, selectbox_info[i].values,
+		      GDI_SELECTBOX_INDEX, selectbox_info[i].index,
+		      GDI_TEXT_SIZE, selectbox_info[i].size,
+		      GDI_TEXT_FONT, FONT_INPUT,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x, gd_y,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x, gd_y,
+		      GDI_BORDER_SIZE, ED_BORDER_SIZE,
+		      GDI_BORDER_SIZE_SELECTBUTTON, getFontHeight(FONT_INPUT),
+		      GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+		      GDI_CALLBACK_ACTION, HandleSelectboxGadgets,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+}
+
 static void CreateScrollbarGadgets()
 {
   int i;
@@ -1331,36 +2258,47 @@ static void CreateScrollbarGadgets()
   for (i=0; i<ED_NUM_SCROLLBARS; i++)
   {
     int id = scrollbar_info[i].gadget_id;
-    Pixmap gd_pixmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     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 = num_editor_elements / 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,
@@ -1368,10 +2306,11 @@ static void CreateScrollbarGadgets()
 		      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
 		      GDI_SCROLLBAR_ITEM_POSITION, item_position,
 		      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_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y2,
+		      GDI_BORDER_SIZE, ED_BORDER_SIZE,
 		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
 
@@ -1382,23 +2321,108 @@ static void CreateScrollbarGadgets()
   }
 }
 
+static void CreateCheckbuttonGadgets()
+{
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
+  boolean checked;
+  int i;
+
+  event_mask = GD_EVENT_PRESSED;
+
+  gd_x1 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_UNCHECKED_XPOS;
+  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_RADIOBUTTON_YPOS;
+
+  for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
+  {
+    int id = radiobutton_info[i].gadget_id;
+
+    checked =
+      (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, radiobutton_info[i].infotext,
+		      GDI_X, SX + radiobutton_info[i].x,
+		      GDI_Y, SY + radiobutton_info[i].y,
+		      GDI_WIDTH, ED_CHECKBUTTON_XSIZE,
+		      GDI_HEIGHT, ED_CHECKBUTTON_YSIZE,
+		      GDI_TYPE, GD_TYPE_RADIO_BUTTON,
+		      GDI_RADIO_NR, radiobutton_info[i].radio_button_nr,
+		      GDI_CHECKED, checked,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+		      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
+		      GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+		      GDI_CALLBACK_ACTION, HandleRadiobuttons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+
+  for (i=0; i<ED_NUM_CHECKBUTTONS; i++)
+  {
+    int id = checkbutton_info[i].gadget_id;
+
+    if (id == GADGET_ID_STICK_ELEMENT)
+      gd_y  = DOOR_GFX_PAGEY1 + ED_STICKYBUTTON_YPOS;
+    else
+      gd_y  = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_INFO_TEXT, checkbutton_info[i].infotext,
+		      GDI_X, SX + checkbutton_info[i].x,
+		      GDI_Y, SY + checkbutton_info[i].y,
+		      GDI_WIDTH, ED_CHECKBUTTON_XSIZE,
+		      GDI_HEIGHT, ED_CHECKBUTTON_YSIZE,
+		      GDI_TYPE, GD_TYPE_CHECK_BUTTON,
+		      GDI_CHECKED, *checkbutton_info[i].value,
+		      GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
+		      GDI_ALT_DESIGN_UNPRESSED, gd_bitmap, gd_x3, gd_y,
+		      GDI_ALT_DESIGN_PRESSED, gd_bitmap, gd_x4, gd_y,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_INFO, HandleEditorGadgetInfoText,
+		      GDI_CALLBACK_ACTION, HandleCheckbuttons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+}
+
 void CreateLevelEditorGadgets()
 {
+  ReinitializeElementList();
+
   CreateControlButtons();
   CreateCounterButtons();
   CreateDrawingAreas();
   CreateTextInputGadgets();
+  CreateSelectboxGadgets();
   CreateScrollbarGadgets();
+  CreateCheckbuttonGadgets();
 }
 
-static void MapControlButtons()
+void FreeLevelEditorGadgets()
 {
   int i;
 
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    MapGadget(level_editor_gadget[i]);
-  for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
-    MapGadget(level_editor_gadget[ED_CTRL_ID_ELEMENTLIST_FIRST + i]);
+  for (i=0; i<NUM_EDITOR_GADGETS; i++)
+    FreeGadget(level_editor_gadget[i]);
 }
 
 static void MapCounterButtons(int id)
@@ -1408,6 +2432,31 @@ static void MapCounterButtons(int id)
   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_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)
 {
   MapGadget(level_editor_gadget[id]);
@@ -1418,17 +2467,50 @@ static void MapTextInputGadget(int id)
   MapGadget(level_editor_gadget[textinput_info[id].gadget_id]);
 }
 
+static void MapSelectboxGadget(int id)
+{
+  MapGadget(level_editor_gadget[selectbox_info[id].gadget_id]);
+}
+
+static void MapRadiobuttonGadget(int id)
+{
+  MapGadget(level_editor_gadget[radiobutton_info[id].gadget_id]);
+}
+
+static void MapCheckbuttonGadget(int id)
+{
+  MapGadget(level_editor_gadget[checkbutton_info[id].gadget_id]);
+}
+
 static void MapMainDrawingArea()
 {
+  boolean no_horizontal_scrollbar = (lev_fieldx + 2 <= ed_fieldx);
+  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) &&
+	 no_horizontal_scrollbar) ||
+	((i == ED_SCROLLBUTTON_ID_AREA_UP ||
+	  i == ED_SCROLLBUTTON_ID_AREA_DOWN) &&
+	 no_vertical_scrollbar))
+      continue;
+
     MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
+  }
+
+  for (i=ED_SCROLLBAR_ID_AREA_FIRST; i<=ED_SCROLLBAR_ID_AREA_LAST; i++)
+  {
+    if ((i == ED_SCROLLBAR_ID_AREA_HORIZONTAL && no_horizontal_scrollbar) ||
+	(i == ED_SCROLLBAR_ID_AREA_VERTICAL && no_vertical_scrollbar))
+      continue;
 
-  for (i=0; i<ED_NUM_SCROLLBARS; i++)
     MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
+  }
 
-  MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+  MapDrawingArea(GADGET_ID_DRAWING_LEVEL);
 }
 
 static void UnmapDrawingArea(int id)
@@ -1440,8 +2522,8 @@ void UnmapLevelEditorWindowGadgets()
 {
   int i;
 
-  for (i=0; i<ED_NUM_GADGETS; i++)
-    if (level_editor_gadget[i]->x < DX)
+  for (i=0; i<NUM_EDITOR_GADGETS; i++)
+    if (level_editor_gadget[i]->x < SX + SXSIZE)
       UnmapGadget(level_editor_gadget[i]);
 }
 
@@ -1449,359 +2531,318 @@ void UnmapLevelEditorGadgets()
 {
   int i;
 
-  for (i=0; i<ED_NUM_GADGETS; i++)
+  for (i=0; i<NUM_EDITOR_GADGETS; i++)
     UnmapGadget(level_editor_gadget[i]);
 }
 
-void DrawLevelEd()
+static void ResetUndoBuffer()
 {
-  int i, x, y, graphic;
-
-  edit_mode = ED_MODE_DRAWING;
-  name_typing = FALSE;
+  undo_buffer_position = -1;
+  undo_buffer_steps = -1;
+  CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
 
-  CloseDoor(DOOR_CLOSE_ALL);
+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();
+}
 
-  OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
+static boolean LevelChanged()
+{
+  boolean level_changed = FALSE;
+  int x, y;
 
-  if (level_editor_test_game)
-  {
+  for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	Feld[x][y] = Ur[x][y];
+      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++)
-      for(y=0; y<lev_fieldy; y++)
-	Ur[x][y] = FieldBackup[x][y];
+      if (Feld[x][y] == EL_PLAYER_1 ||
+	  Feld[x][y] == EL_SP_MURPHY) 
+	player_found = TRUE;
 
-    level_editor_test_game = FALSE;
-  }
-  else
-  {
-    level_xpos = -1;
-    level_ypos = -1;
-    undo_buffer_position = -1;
-    undo_buffer_steps = -1;
-    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
-  }
+  return player_found;
+}
+
+static void CopyPlayfield(short src[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
+			  short dst[MAX_LEV_FIELDX][MAX_LEV_FIELDY])
+{
+  int x, y;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++) 
+      dst[x][y] = src[x][y];
+}
 
-  /*
-  DrawMiniLevel(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++)
+static void CopyCustomElementPropertiesToEditor()
+{
+  int i;
+
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; 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);
-  }
+    int element = EL_CUSTOM_START + i;
+    int properties = Properties1[element];
 
-  DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
-		     DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
-		     DOOR_GFX_PAGEY1+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,
-		     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,
-		     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);
+    custom_element_properties[i].indestructible =
+      ((properties & EP_BIT_INDESTRUCTIBLE) != 0 ? TRUE : FALSE);
 
-  /* draw bigger door */
-  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-	    DOOR_GFX_PAGEX7, 0,
-	    108, 64,
-	    EX - 4, EY - 12);
+    custom_element_properties[i].can_fall =
+      ((properties & EP_BIT_CAN_FALL) != 0 ? TRUE : FALSE);
 
-  /* draw new control window */
-  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-	    DOOR_GFX_PAGEX8, 236,
-	    EXSIZE, EYSIZE,
-	    EX, EY);
+    custom_element_properties[i].can_smash =
+      ((properties & EP_BIT_CAN_SMASH) != 0 ? TRUE : FALSE);
 
-  redraw_mask |= REDRAW_ALL;
+    custom_element_properties[i].pushable =
+      ((properties & EP_BIT_PUSHABLE) != 0 ? TRUE : FALSE);
 
-  OpenDoor(DOOR_OPEN_1);
+    custom_element_properties[i].slippery =
+      ((properties & EP_BIT_SLIPPERY) != 0 ? TRUE : FALSE);
+  }
+}
 
-  strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name);
+static void CopyCustomElementPropertiesToGame()
+{
+  int i;
 
-  MapControlButtons();
+  for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
+  {
+    int element = EL_CUSTOM_START + i;
 
-  /*
-  MapMainDrawingArea();
-  */
+    Properties1[element] = EP_BITMASK_DEFAULT;
 
-  DrawDrawingWindow();
-  FadeToFront();
+    if (custom_element_properties[i].indestructible)
+      Properties1[element] |= EP_BIT_INDESTRUCTIBLE;
+    else
+      Properties1[element] &= ~EP_BIT_INDESTRUCTIBLE;
 
-  /*
-  OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
-  */
+    if (custom_element_properties[i].can_fall)
+      Properties1[element] |= EP_BIT_CAN_FALL;
+    else
+      Properties1[element] &= ~EP_BIT_CAN_FALL;
+
+    if (custom_element_properties[i].can_smash)
+      Properties1[element] |= EP_BIT_CAN_SMASH;
+    else
+      Properties1[element] &= ~EP_BIT_CAN_SMASH;
+
+    if (custom_element_properties[i].pushable)
+      Properties1[element] |= EP_BIT_PUSHABLE;
+    else
+      Properties1[element] &= ~EP_BIT_PUSHABLE;
+
+    if (custom_element_properties[i].slippery)
+      Properties1[element] |= EP_BIT_SLIPPERY;
+    else
+      Properties1[element] &= ~EP_BIT_SLIPPERY;
+  }
 }
 
-void DrawControlWindow()
+void DrawLevelEd()
 {
-  int i,x,y;
-
-  ClearWindow();
-  UnmapLevelEditorWindowGadgets();
+  CloseDoor(DOOR_CLOSE_ALL);
+  OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
 
-  /* Inhalt der Mampfer */
-  DrawText(ED_COUNT_GADGET_XPOS+1,SY+6,
-	   "Contents of a smashed cruncher:",FS_SMALL,FC_YELLOW);
-  for(i=0;i<4;i++) for(y=0;y<4;y++) for(x=0;x<4;x++)
+  if (level_editor_test_game)
   {
-    DrawMiniElement(1+5*i+x,2+y,EL_ERDREICH);
-    XFillRectangle(display,drawto,gc,
-		   SX+(1+5*i)*MINI_TILEX+MINI_TILEX/2-1,
-		   SY+(2)*MINI_TILEY+MINI_TILEY/2-1,
-		   3*MINI_TILEX+2,3*MINI_TILEY+2);
+    CopyPlayfield(Ur, Feld);
+    CopyPlayfield(FieldBackup, Ur);
+
+    level_editor_test_game = FALSE;
   }
-  XCopyArea(display,drawto,drawto,gc,
-	    SX+1*MINI_TILEX,SY+2*MINI_TILEY,
-	    4*5*MINI_TILEX,5*MINI_TILEY,
-	    SX+1*MINI_TILEX-MINI_TILEX/2,SY+2*MINI_TILEY-MINI_TILEY/2);
-  for(i=0;i<4;i++)
+  else
   {
-    for(y=0;y<3;y++) for(x=0;x<3;x++)
-      DrawMiniElement(1+5*i+x,2+y,level.mampfer_inhalt[i][x][y]);
+    edit_mode = ED_MODE_DRAWING;
 
-    DrawText(SX+MINI_TILEX+(5*i+1)*MINI_TILEX+1,
-	     SY+2*MINI_TILEY+(4)*MINI_TILEY-4,
-	     int2str(i+1,1),FS_SMALL,FC_YELLOW);
+    ResetUndoBuffer();
+    level_xpos = -1;
+    level_ypos = -1;
   }
 
-  /* Inhalt der Amöbe */
-  for(y=0;y<2;y++) for(x=0;x<2;x++)
-  {
-    DrawMiniElement(29+x,26+y,EL_ERDREICH);
-    XFillRectangle(display,drawto,gc,
-		   SX+29*MINI_TILEX+MINI_TILEX/2-1,
-		   SY+26*MINI_TILEY+MINI_TILEY/2-1,
-		   MINI_TILEX+2,MINI_TILEY+2);
-  }
-  XCopyArea(display,drawto,drawto,gc,
-	    SX+29*MINI_TILEX,SY+26*MINI_TILEY,
-	    3*MINI_TILEX,3*MINI_TILEY,
-	    SX+29*MINI_TILEX-MINI_TILEX/2,SY+26*MINI_TILEY-MINI_TILEY/2);
-  DrawMiniElement(29,26,level.amoebe_inhalt);
+  /* copy default editor door content to main double buffer */
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
+	     DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+
+  /* draw mouse button brush elements */
+  DrawMiniGraphicExt(drawto,
+		     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
+		     el2edimg(new_element1));
+  DrawMiniGraphicExt(drawto,
+		     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
+		     el2edimg(new_element2));
+  DrawMiniGraphicExt(drawto,
+		     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
+		     el2edimg(new_element3));
 
-  for(i=0;i<11+3+2;i++)
-  {
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	      DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS,
-	      DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS,
-	      DXSIZE-4,ED_BUTTON_MINUS_YSIZE,
-	      ED_COUNT_GADGET_XPOS,
-	      ED_COUNT_GADGET_YPOS+i*ED_COUNT_GADGET_YSIZE);
-
-    if (i<11)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+i*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.score[i],3),FS_SMALL,FC_YELLOW);
-    else if (i==11)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+11*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.tempo_amoebe,3),FS_SMALL,FC_YELLOW);
-    else if (i==12)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+12*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.dauer_sieb,3),FS_SMALL,FC_YELLOW);
-    else if (i==13)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+13*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.dauer_ablenk,3),FS_SMALL,FC_YELLOW);
-    else if (i==14)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+14*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.edelsteine,3),FS_SMALL,FC_YELLOW);
-    else if (i==15)
-      DrawText(ED_COUNT_VALUE_XPOS,
-	       ED_COUNT_VALUE_YPOS+15*ED_COUNT_GADGET_YSIZE,
-	       int2str(level.time,3),FS_SMALL,FC_YELLOW);
-  }
+  /* draw bigger door */
+  DrawSpecialEditorDoor();
+
+  /* draw new control window */
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
+	     DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
+
+  redraw_mask |= REDRAW_ALL;
+
+  ReinitializeElementListButtons();	/* only needed after setup changes */
+
+  UnmapTapeButtons();
+  MapControlButtons();
+
+  /* copy actual editor door content to door double buffer for OpenDoor() */
+  BlitBitmap(drawto, bitmap_db_door,
+	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+
+  DrawEditModeWindow();
+
+  OpenDoor(DOOR_OPEN_1);
+}
 
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+0*ED_COUNT_TEXT_YSIZE,
-	   "Score for Emerald",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+1*ED_COUNT_TEXT_YSIZE,
-	   "Score for Diamond",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+2*ED_COUNT_TEXT_YSIZE,
-	   "Score for smashing a Bug",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+3*ED_COUNT_TEXT_YSIZE,
-	   "Score for smashing a Spaceship",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+4*ED_COUNT_TEXT_YSIZE,
-	   "Score for smashing a Cruncher",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+5*ED_COUNT_TEXT_YSIZE,
-	   "Score for smashing an Alien",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+6*ED_COUNT_TEXT_YSIZE,
-	   "Score for smashing a Pacman",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+7*ED_COUNT_TEXT_YSIZE,
-	   "Score for cracking a nut",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+8*ED_COUNT_TEXT_YSIZE,
-	   "Score for dynamite",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+9*ED_COUNT_TEXT_YSIZE,
-	   "Score for key",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+10*ED_COUNT_TEXT_YSIZE,
-	   "Score for each 10 seconds left",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+11*ED_COUNT_TEXT_YSIZE,
-	   "Speed of the amoeba / Content",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+12*ED_COUNT_TEXT_YSIZE,
-	   "Time for magic wall",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+13*ED_COUNT_TEXT_YSIZE,
-	   "Time for wheel",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+14*ED_COUNT_TEXT_YSIZE,
-	   "Emeralds needed in this level",FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_TEXT_XPOS,ED_COUNT_TEXT_YPOS+15*ED_COUNT_TEXT_YSIZE,
-	   "Time available for this level",FS_SMALL,FC_YELLOW);
-
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    DOOR_GFX_PAGEX4+ED_WIN_COUNT_XPOS,
-	    DOOR_GFX_PAGEY1+ED_WIN_COUNT_YPOS,
-	    ED_WIN_COUNT_XSIZE,ED_WIN_COUNT_YSIZE,
-	    ED_COUNT_GADGET_XPOS,
-	    ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE);
-  for(i=1;i<31;i++)
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	      DOOR_GFX_PAGEX4+ED_WIN_COUNT_XPOS+3+2*FONT2_XSIZE,
-	      DOOR_GFX_PAGEY1+ED_WIN_COUNT_YPOS,
-	      ED_WIN_COUNT_XSIZE-3-2*FONT2_XSIZE,ED_WIN_COUNT_YSIZE,
-	      ED_COUNT_GADGET_XPOS+3+i*FONT2_XSIZE,
-	      ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE);
-  DrawText(ED_COUNT_GADGET_XPOS+5,
-	   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-	   level.name,FS_SMALL,FC_YELLOW);
-  DrawText(ED_COUNT_GADGET_XPOS+(30+3)*FONT2_XSIZE-5,
-	   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-	   "Title",FS_SMALL,FC_YELLOW);
-
-  DrawText(ED_SIZE_GADGET_XPOS,ED_SIZE_GADGET_YPOS-18,
-	   "Playfield size:",FS_SMALL,FC_YELLOW);
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS,
-	    DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS,
-	    DXSIZE-4,ED_BUTTON_MINUS_YSIZE,
-	    ED_SIZE_GADGET_XPOS,
-	    ED_SIZE_GADGET_YPOS+0*ED_COUNT_GADGET_YSIZE);
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    DOOR_GFX_PAGEX4+ED_BUTTON_MINUS_XPOS,
-	    DOOR_GFX_PAGEY1+ED_BUTTON_MINUS_YPOS,
-	    DXSIZE-4,ED_BUTTON_MINUS_YSIZE,
-	    ED_SIZE_GADGET_XPOS,
-	    ED_SIZE_GADGET_YPOS+1*ED_COUNT_GADGET_YSIZE);
-  DrawText(ED_SIZE_TEXT_XPOS,ED_SIZE_TEXT_YPOS+0*ED_SIZE_TEXT_YSIZE,
-	   "Width",FS_SMALL,FC_YELLOW);
-  DrawText(ED_SIZE_TEXT_XPOS,ED_SIZE_TEXT_YPOS+1*ED_SIZE_TEXT_YSIZE,
-	   "Height",FS_SMALL,FC_YELLOW);
-  DrawText(ED_SIZE_VALUE_XPOS,ED_SIZE_VALUE_YPOS+0*ED_SIZE_GADGET_YSIZE,
-	   int2str(level.fieldx,3),FS_SMALL,FC_YELLOW);
-  DrawText(ED_SIZE_VALUE_XPOS,ED_SIZE_VALUE_YPOS+1*ED_SIZE_GADGET_YSIZE,
-	   int2str(level.fieldy,3),FS_SMALL,FC_YELLOW);
+static void AdjustDrawingAreaGadgets()
+{
+  int ed_xsize = lev_fieldx + 2;
+  int ed_ysize = lev_fieldy + 2;
+  int max_ed_fieldx = MAX_ED_FIELDX;
+  int max_ed_fieldy = MAX_ED_FIELDY;
+  boolean horizontal_scrollbar_needed;
+  boolean vertical_scrollbar_needed;
+  int x, y, width, height;
+  int xoffset, yoffset;
+
+  /* check if we need any scrollbars */
+  horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
+  vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy);
+
+  /* check if we have a smaller editor field because of scrollbars */
+  if (horizontal_scrollbar_needed)
+    max_ed_fieldy = MAX_ED_FIELDY - 1;
+  if (vertical_scrollbar_needed)
+    max_ed_fieldx = MAX_ED_FIELDX - 1;
+
+  /* check again if we now need more scrollbars because of less space */
+  horizontal_scrollbar_needed = (ed_xsize > max_ed_fieldx);
+  vertical_scrollbar_needed = (ed_ysize > max_ed_fieldy);
+
+  /* check if editor field gets even smaller after adding new scrollbars */
+  if (horizontal_scrollbar_needed)
+    max_ed_fieldy = MAX_ED_FIELDY - 1;
+  if (vertical_scrollbar_needed)
+    max_ed_fieldx = MAX_ED_FIELDX - 1;
+
+  ed_fieldx = (ed_xsize < MAX_ED_FIELDX ? ed_xsize : max_ed_fieldx);
+  ed_fieldy = (ed_ysize < MAX_ED_FIELDY ? ed_ysize : max_ed_fieldy);
+
+  ModifyGadget(level_editor_gadget[GADGET_ID_DRAWING_LEVEL],
+	       GDI_WIDTH, ed_fieldx * MINI_TILEX,
+	       GDI_HEIGHT, ed_fieldy * MINI_TILEY,
+	       GDI_AREA_SIZE, ed_fieldx, ed_fieldy,
+	       GDI_END);
+
+  xoffset = (ed_fieldx == MAX_ED_FIELDX ? ED_SCROLLBUTTON_XSIZE : 0);
+  yoffset = (ed_fieldy == MAX_ED_FIELDY ? ED_SCROLLBUTTON_YSIZE : 0);
+
+  x = SX + scrollbutton_info[ED_SCROLLBUTTON_ID_AREA_RIGHT].x + xoffset;
+  y = SX + scrollbutton_info[ED_SCROLLBUTTON_ID_AREA_DOWN].y + yoffset;
+
+  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_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,
+	       GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldx,
+	       GDI_END);
+  ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+	       GDI_HEIGHT, height,
+	       GDI_SCROLLBAR_ITEMS_VISIBLE, ed_fieldy,
+	       GDI_END);
 }
 
-void AdjustLevelScrollPosition()
+static void AdjustLevelScrollPosition()
 {
   if (level_xpos < -1)
     level_xpos = -1;
-  if (level_xpos > lev_fieldx - ED_FIELDX + 1)
-    level_xpos = lev_fieldx - ED_FIELDX + 1;
-  if (lev_fieldx < ED_FIELDX - 2)
+  if (level_xpos > lev_fieldx - ed_fieldx + 1)
+    level_xpos = lev_fieldx - ed_fieldx + 1;
+  if (lev_fieldx < ed_fieldx - 2)
     level_xpos = -1;
 
   if (level_ypos < -1)
     level_ypos = -1;
-  if (level_ypos > lev_fieldy - ED_FIELDY + 1)
-    level_ypos = lev_fieldy - ED_FIELDY + 1;
-  if (lev_fieldy < ED_FIELDY - 2)
+  if (level_ypos > lev_fieldy - ed_fieldy + 1)
+    level_ypos = lev_fieldy - ed_fieldy + 1;
+  if (lev_fieldy < ed_fieldy - 2)
     level_ypos = -1;
 }
 
-void AdjustEditorScrollbar(int id)
+static void AdjustEditorScrollbar(int id)
 {
   struct GadgetInfo *gi = level_editor_gadget[id];
   int items_max, items_visible, item_position;
 
-  if (id == ED_CTRL_ID_SCROLL_HORIZONTAL)
+  if (id == GADGET_ID_SCROLL_HORIZONTAL)
   {
-    items_max = MAX(lev_fieldx + 2, ED_FIELDX);
-    items_visible = ED_FIELDX;
+    items_max = MAX(lev_fieldx + 2, ed_fieldx);
+    items_visible = ed_fieldx;
     item_position = level_xpos + 1;
   }
   else
   {
-    items_max = MAX(lev_fieldy + 2, ED_FIELDY);
-    items_visible = ED_FIELDY;
+    items_max = MAX(lev_fieldy + 2, ed_fieldy);
+    items_visible = ed_fieldy;
     item_position = level_ypos + 1;
   }
 
   if (item_position > items_max - items_visible)
     item_position = items_max - items_visible;
 
-  AdjustScrollbar(gi, items_max, item_position);
+  ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+	       GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
 }
 
-void ModifyEditorTextInput(int textinput_id, char *new_text)
+static void ModifyEditorTextInput(int textinput_id, char *new_text)
 {
   int gadget_id = textinput_info[textinput_id].gadget_id;
   struct GadgetInfo *gi = level_editor_gadget[gadget_id];
 
-  ModifyTextInputTextValue(gi, new_text);
+  ModifyGadget(gi, GDI_TEXT_VALUE, new_text, GDI_END);
 }
 
-void ModifyEditorCounter(int counter_id, int new_value)
+static void ModifyEditorCounter(int counter_id, int new_value)
 {
-  int *counter_value = *counterbutton_info[counter_id].counter_value;
+  int *counter_value = counterbutton_info[counter_id].value;
   int gadget_id = counterbutton_info[counter_id].gadget_id_text;
   struct GadgetInfo *gi = level_editor_gadget[gadget_id];
 
-  ModifyTextInputNumberValue(gi, new_value);
+  ModifyGadget(gi, GDI_NUMBER_VALUE, new_value, GDI_END);
 
   if (counter_value != NULL)
     *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)
@@ -1810,827 +2851,231 @@ static void PickDrawingElement(int button, int element)
   if (button == 1)
   {
     new_element1 = element;
-    DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_LEFT_XPOS,
-		       DY + ED_WIN_MB_LEFT_YPOS,
-		       el2gfx(new_element1));
+    DrawMiniGraphicExt(drawto,
+		       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
+		       el2edimg(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
-    DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_MIDDLE_XPOS,
-		       DY + ED_WIN_MB_MIDDLE_YPOS,
-		       el2gfx(new_element2));
+    DrawMiniGraphicExt(drawto,
+		       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
+		       el2edimg(new_element2));
   }
   else
   {
     new_element3 = element;
-    DrawMiniGraphicExt(drawto, gc,
-		       DX + ED_WIN_MB_RIGHT_XPOS,
-		       DY + ED_WIN_MB_RIGHT_YPOS,
-		       el2gfx(new_element3));
+    DrawMiniGraphicExt(drawto,
+		       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
+		       el2edimg(new_element3));
   }
 
   redraw_mask |= REDRAW_DOOR_1;
 }
 
-void LevelEd(int mx, int my, int button)
+static void DrawDrawingWindow()
 {
-  static int last_button = 0;
+  SetMainBackgroundImage(IMG_UNDEFINED);
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
-  /*
-  static int in_field_pressed = FALSE;
-  */
+  AdjustDrawingAreaGadgets();
+  AdjustLevelScrollPosition();
+  AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
+  AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
 
-  static boolean use_floodfill = FALSE;
+  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+  MapMainDrawingArea();
+}
 
+static void DrawElementBorder(int dest_x, int dest_y, int width, int height)
+{
+  int border_graphic = IMG_EDITOR_ELEMENT_BORDER;
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int num_mini_tilex = width / MINI_TILEX + 1;
+  int num_mini_tiley = width / MINI_TILEY + 1;
+  int x, y;
 
-  /*
-  int x = (mx-SX)/MINI_TILEX; 
-  int y = (my-SY)/MINI_TILEY; 
-  */
+  getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y);
 
-  /*
-  HandlePressedControlButtons();
-  HandleDrawingFunctions(mx, my, button);
-  */
+  for (y=0; y < num_mini_tiley; y++)
+    for (x=0; x < num_mini_tilex; x++)
+      BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY,
+		 dest_x - MINI_TILEX / 2 + x * MINI_TILEX,
+		 dest_y - MINI_TILEY / 2 + y * MINI_TILEY);
 
-  if (use_floodfill)		/********** FLOOD FILL **********/
-  {
+  ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2);
+}
 
+static void DrawRandomPlacementBackgroundArea()
+{
+  int area_x = ED_AREA_RANDOM_BACKGROUND_XPOS / MINI_TILEX;
+  int area_y = ED_AREA_RANDOM_BACKGROUND_YPOS / MINI_TILEY;
+  int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS;
+  int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS;
 
-#if 0
+  ElementContent[0][0][0] = random_placement_background_element;
 
-    if (button)
-    {
-      if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
-      {
-	int from_x, from_y;
-	int fill_element;
-
-	if (x>lev_fieldx || y>lev_fieldy ||
-	    (x==0 && level_xpos<0) ||
-	    (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
-	    (y==0 && level_ypos<0) ||
-	    (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY))
-	  return;
-
-	from_x = x+level_xpos;
-	from_y = y+level_ypos;
-	fill_element = (button==1 ? new_element1 :
-			button==2 ? new_element2 :
-			button==3 ? new_element3 : 0);
-
-	FloodFill(from_x,from_y,fill_element);
-	DrawMiniLevel(level_xpos,level_ypos);
-      }
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
+  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
-      use_floodfill = FALSE;
-      CloseDoor(DOOR_CLOSE_1);
-      OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-    }
-    return;
+  MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
+}
 
-#endif
+static void DrawLevelInfoWindow()
+{
+  char infotext[MAX_OUTPUT_LINESIZE + 1];
+  int max_infotext_len = getMaxInfoTextLength();
+  int xoffset_above = 0;
+  int yoffset_above = -(MINI_TILEX + ED_GADGET_DISTANCE);
+  int xoffset_right = getCounterGadgetWidth();
+  int yoffset_right = ED_BORDER_SIZE;
+  int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+  int yoffset_right2 = ED_BORDER_SIZE;
+  int i, x, y;
 
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
+  DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
+	   "Level Settings", FONT_TITLE_1);
+  DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
+	   "Editor Settings", FONT_TITLE_1);
 
-  }
-  else				/********** EDIT/CTRL-FENSTER **********/
+  /* draw counter gadgets */
+  for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
   {
-
-
-#if 0
-    static unsigned long choice_delay = 0;
-    int choice = CheckElemButtons(mx,my,button);
-    int elem_pos = choice-ED_BUTTON_ELEM;
-
-    if (((choice == ED_BUTTON_EUP && element_shift>0) ||
-	 (choice == ED_BUTTON_EDOWN &&
-	  element_shift<elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)) &&
-	DelayReached(&choice_delay, GADGET_FRAME_DELAY))
+    if (counterbutton_info[i].infotext_above)
     {
-      int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-      int i;
-
-      step = step * MAX_ELEM_X * (choice == ED_BUTTON_EUP ? -1 : +1);
-      element_shift += step;
-
-      if (element_shift<0)
-	element_shift = 0;
-      if (element_shift>elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)
-	element_shift = elements_in_list-MAX_ELEM_X*MAX_ELEM_Y;
-      if (element_shift % MAX_ELEM_X)
-	element_shift += MAX_ELEM_X-(element_shift % MAX_ELEM_X);
+      x = counterbutton_info[i].x + xoffset_above;
+      y = counterbutton_info[i].y + yoffset_above;
 
-      for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
-	DrawElemButton(i+2,ED_BUTTON_RELEASED);
+      sprintf(infotext, "%s:", counterbutton_info[i].infotext_above);
+      infotext[max_infotext_len] = '\0';
+      DrawTextF(x, y, FONT_TEXT_1, infotext);
     }
-    else if (elem_pos>=0 && elem_pos<MAX_ELEM_X*MAX_ELEM_Y)
-    {
-      int new_element;
-
-      if (elem_pos+element_shift < elements_in_list)
-	new_element = editor_element[elem_pos+element_shift];
-      else
-	new_element = EL_LEERRAUM;
-
-      PickDrawingElement(last_button, new_element);
-
-      if (!HAS_CONTENT(properties_element))
-      {
-	properties_element = new_element;
-	if (edit_mode == ED_MODE_PROPERTIES)
-	  DrawPropertiesWindow();
-      }
-    }
-#endif
-
 
-  
-    if (edit_mode == ED_MODE_DRAWING)	/********** EDIT-FENSTER **********/
+    if (counterbutton_info[i].infotext_right)
     {
+      x = counterbutton_info[i].x + xoffset_right;
+      y = counterbutton_info[i].y + yoffset_right;
 
-
-
-#if 0
-
-      switch(CheckEditButtons(mx,my,button))
-      {
-	case ED_BUTTON_CTRL:
-	  CloseDoor(DOOR_CLOSE_2);
-	  DrawControlWindow();
-	  XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-		    DOOR_GFX_PAGEX4,DOOR_GFX_PAGEY1+80,
-		    VXSIZE,VYSIZE,
-		    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
-	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = ED_MODE_INFO;
-	  break;
-	case ED_BUTTON_FILL:
-	  Request("Caution ! Flood fill mode ! Choose area !",REQ_OPEN);
-	  use_floodfill = TRUE;
-	  return;
-	  break;
-	case ED_BUTTON_LEFT:
-	  if (level_xpos>=0)
-	  {
-	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
-	      break;
-	    if (lev_fieldx<ED_FIELDX-2)
-	      break;
-
-	    level_xpos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
-	    if (level_xpos<-1)
-	      level_xpos = -1;
-	    if (button==1)
-	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_RIGHT);
-	    else
-	      DrawMiniLevel(level_xpos,level_ypos);
-	  }
-	  break;
-	case ED_BUTTON_RIGHT:
-	  if (level_xpos<=lev_fieldx-ED_FIELDX)
-	  {
-	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
-	      break;
-	    if (lev_fieldx<ED_FIELDX-2)
-	      break;
-
-	    level_xpos += (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
-	    if (level_xpos>lev_fieldx-ED_FIELDX+1)
-	      level_xpos = lev_fieldx-ED_FIELDX+1;
-	    if (button==1)
-	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_LEFT);
-	    else
-	      DrawMiniLevel(level_xpos,level_ypos);
-	  }
-	  break;
-	case ED_BUTTON_UP:
-	  if (level_ypos>=0)
-	  {
-	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
-	      break;
-	    if (lev_fieldy<ED_FIELDY-2)
-	      break;
-
-	    level_ypos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
-	    if (level_ypos<-1)
-	      level_ypos = -1;
-	    if (button==1)
-	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_DOWN);
-	    else
-	      DrawMiniLevel(level_xpos,level_ypos);
-	  }
-	  break;
-	case ED_BUTTON_DOWN:
-	  if (level_ypos<=lev_fieldy-ED_FIELDY)
-	  {
-	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
-	      break;
-	    if (lev_fieldy<ED_FIELDY-2)
-	      break;
-
-	    level_ypos += (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
-	    if (level_ypos>lev_fieldy-ED_FIELDY+1)
-	      level_ypos = lev_fieldy-ED_FIELDY+1;
-	    if (button==1)
-	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_UP);
-	    else
-	      DrawMiniLevel(level_xpos,level_ypos);
-	  }
-	  break;
-	default:
-	  break;
-      }
-
-#endif
-
-
-
-#if 0
-
-      if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
-      {
-	int new_element;
-
-	if (button && !motion_status)
-	  in_field_pressed = TRUE;
-
-	if (!button || !in_field_pressed || button<1 || button>3 ||
-	    (y==0 && level_ypos<0) ||
-	    (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY) ||
-	    (x==0 && level_xpos<0) ||
-	    (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
-	    x>lev_fieldx || y>lev_fieldy)
-	  return;
-
-	new_element = (button==1 ? new_element1 :
-		       button==2 ? new_element2 :
-		       button==3 ? new_element3 : 0);
-
-	if (new_element != Feld[x+level_xpos][y+level_ypos])
-	{
-	  if (new_element==EL_SPIELFIGUR) /* Jeder nur EINE Figur bitte... */
-	  {
-	    int x,y;
-
-	    for(x=0;x<lev_fieldx;x++) for(y=0;y<lev_fieldy;y++)
-	    {
-	      if (Feld[x][y]==EL_SPIELFIGUR || Feld[x][y]==EL_SPIELER1)
-	      {
-		Feld[x][y] = EL_LEERRAUM;
-		if (x-level_xpos>=0 && x-level_xpos<ED_FIELDX &&
-		    y-level_ypos>=0 && y-level_ypos<ED_FIELDY)
-		  DrawMiniElement(x-level_xpos,y-level_ypos,EL_LEERRAUM);
-	      }
-	    }
-	  }
-
-	  Feld[x+level_xpos][y+level_ypos] = new_element;
-	  DrawMiniElement(x,y,new_element);
-	}
-      }
-      else if (!motion_status)	/* Mauszeiger nicht im Level-Feld */
-	in_field_pressed = FALSE;
-
-#endif
-
-
-
+      sprintf(infotext, "%s", counterbutton_info[i].infotext_right);
+      infotext[max_infotext_len] = '\0';
+      DrawTextF(x, y, FONT_TEXT_1, infotext);
     }
-    else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/
-    {
-
-
-#if 0
-
-      int choice = CheckCountButtons(mx,my,button);
-      int step = (button==1 ? 1 : button==2 ? 5 : button==3 ? 10 : 0);
-
-      if (choice >= 0 && choice < 36 &&
-	  DelayReached(&choice_delay, GADGET_FRAME_DELAY))
-      {
-	if (!(choice % 2))
-	  step = -step;
-
-	choice /= 2;
-
-	if (choice<11)
-	{
-	  level.score[choice] += step;
-	  if (level.score[choice]<0)
-	    level.score[choice] = 0;
-	  else if (level.score[choice]>255)
-	    level.score[choice] = 255;
-	}
-	else if (choice==11)
-	{
-	  level.tempo_amoebe += step;
-	  if (level.tempo_amoebe<0)
-	    level.tempo_amoebe = 0;
-	  else if (level.tempo_amoebe>255)
-	    level.tempo_amoebe = 255;
-	}
-	else if (choice==12)
-	{
-	  level.dauer_sieb += step;
-	  if (level.dauer_sieb<0)
-	    level.dauer_sieb = 0;
-	  else if (level.dauer_sieb>255)
-	    level.dauer_sieb = 255;
-	}
-	else if (choice==13)
-	{
-	  level.dauer_ablenk += step;
-	  if (level.dauer_ablenk<0)
-	    level.dauer_ablenk = 0;
-	  else if (level.dauer_ablenk>255)
-	    level.dauer_ablenk = 255;
-	}
-	else if (choice==14)
-	{
-	  level.edelsteine += step;
-	  if (level.edelsteine<0)
-	    level.edelsteine = 0;
-	  else if (level.edelsteine>999)
-	    level.edelsteine = 999;
-	}
-	else if (choice==15)
-	{
-	  level.time += step;
-	  if (level.time<0)
-	    level.time = 0;
-	  else if (level.time>999)
-	    level.time = 999;
-	}
-	else if (choice==16)
-	{
-	  lev_fieldx += step;
-	  if (lev_fieldx<MIN_LEV_FIELDX)
-	    lev_fieldx = MIN_LEV_FIELDX;
-	  else if (lev_fieldx>MAX_LEV_FIELDX)
-	    lev_fieldx = MAX_LEV_FIELDX;
-	  level.fieldx = lev_fieldx;
-	}
-	else if (choice==17)
-	{
-	  lev_fieldy += step;
-	  if (lev_fieldy<MIN_LEV_FIELDY)
-	    lev_fieldy = MIN_LEV_FIELDY;
-	  else if (lev_fieldy>MAX_LEV_FIELDY)
-	    lev_fieldy = MAX_LEV_FIELDY;
-	  level.fieldy = lev_fieldy;
-	}
-
-	if (choice<11)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.score[choice],3),FS_SMALL,FC_YELLOW);
-	else if (choice==11)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+11*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.tempo_amoebe,3),FS_SMALL,FC_YELLOW);
-	else if (choice==12)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+12*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.dauer_sieb,3),FS_SMALL,FC_YELLOW);
-	else if (choice==13)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+13*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.dauer_ablenk,3),FS_SMALL,FC_YELLOW);
-	else if (choice==14)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+14*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.edelsteine,3),FS_SMALL,FC_YELLOW);
-	else if (choice==15)
-	  DrawText(ED_COUNT_VALUE_XPOS,
-		   ED_COUNT_VALUE_YPOS+15*ED_COUNT_GADGET_YSIZE,
-		   int2str(level.time,3),FS_SMALL,FC_YELLOW);
-	else if (choice==16)
-	  DrawText(ED_SIZE_VALUE_XPOS,
-		   ED_SIZE_VALUE_YPOS+0*ED_SIZE_GADGET_YSIZE,
-		   int2str(level.fieldx,3),FS_SMALL,FC_YELLOW);
-	else if (choice==17)
-	  DrawText(ED_SIZE_VALUE_XPOS,
-		   ED_SIZE_VALUE_YPOS+1*ED_SIZE_GADGET_YSIZE,
-		   int2str(level.fieldy,3),FS_SMALL,FC_YELLOW);
-
-	redraw_mask &= ~REDRAW_FIELD;
-	if (choice<16)
-	  XCopyArea(display,drawto,window,gc,
-		    ED_COUNT_VALUE_XPOS,
-		    ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE,
-		    3*FONT2_XSIZE,FONT2_YSIZE,
-		    ED_COUNT_VALUE_XPOS,
-		    ED_COUNT_VALUE_YPOS+choice*ED_COUNT_GADGET_YSIZE);
-	else
-	  XCopyArea(display,drawto,window,gc,
-		    ED_SIZE_VALUE_XPOS,
-		    ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE,
-		    3*FONT2_XSIZE,FONT2_YSIZE,
-		    ED_SIZE_VALUE_XPOS,
-		    ED_SIZE_VALUE_YPOS+(choice-16)*ED_SIZE_GADGET_YSIZE);
-	XFlush(display);
-      }
-
-      switch(CheckCtrlButtons(mx,my,button))
-      {
-	case ED_BUTTON_EDIT:
-	  CloseDoor(DOOR_CLOSE_2);
-	  AdjustLevelScrollPosition();
-	  DrawMiniLevel(level_xpos,level_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);
-	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = ED_MODE_DRAWING;
-	  break;
-	case ED_BUTTON_CLEAR:
-	  if (Request("Are you sure to clear this level ?",REQ_ASK))
-	  {
-	    for(x=0;x<MAX_LEV_FIELDX;x++) 
-	      for(y=0;y<MAX_LEV_FIELDY;y++) 
-		Feld[x][y] = EL_ERDREICH;
-	    DrawMiniLevel(level_xpos,level_ypos);
-	  }
-	  break;
-	case ED_BUTTON_UNDO:
-	  if (leveldir[leveldir_nr].readonly ||
-	      Request("Exit without saving ?",REQ_ASK | REQ_STAY_OPEN))
-	  {
-	    CloseDoor(DOOR_CLOSE_ALL);
-	    game_status=MAINMENU;
-	    DrawMainMenu();
-	  }
-	  else
-	  {
-	    CloseDoor(DOOR_CLOSE_1);
-	    OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-	  }
-	  break;
-	case ED_BUTTON_EXIT:
-	  {
-	    int figur_vorhanden = FALSE;
-
-	    if (leveldir[leveldir_nr].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] == EL_SPIELFIGUR ||
-		    Feld[x][y] == EL_SPIELER1 ||
-		    Feld[x][y] == EL_SP_MURPHY) 
-		  figur_vorhanden = TRUE;
-
-	    if (!figur_vorhanden)
-	      Request("No Level without Gregor Mc Duffin please !",
-			 REQ_CONFIRM);
-	    else
-	    {
-	      if (Request("Save this level and kill the old ?",
-			     REQ_ASK | REQ_STAY_OPEN))
-	      {
-		for(x=0;x<lev_fieldx;x++)
-		  for(y=0;y<lev_fieldy;y++) 
-		    Ur[x][y]=Feld[x][y];
-		SaveLevel(level_nr);
-	      }
-	      CloseDoor(DOOR_CLOSE_ALL);
-	      game_status=MAINMENU;
-	      DrawMainMenu();
-	    }
-	  }
-	  break;
-	default:
-	  break;
-      }
-
-      if (mx>=ED_COUNT_GADGET_XPOS &&
-	  mx<ED_COUNT_GADGET_XPOS+31*FONT2_XSIZE+10 &&
-	  my>=ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE &&
-	  my<ED_COUNT_GADGET_YPOS+16*ED_COUNT_GADGET_YSIZE+ED_WIN_COUNT_YSIZE)
-      {
-	if (!name_typing)
-	{
-	  name_typing = TRUE;
-	  DrawText(ED_COUNT_GADGET_XPOS+5,
-		   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		   level.name,FS_SMALL,FC_GREEN);
-	  DrawText(ED_COUNT_GADGET_XPOS+5+strlen(level.name)*FONT2_XSIZE,
-		   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		   "<",FS_SMALL,FC_RED);
-	}
-      }
-      else
-      {
-	if (name_typing)
-	{
-	  name_typing = FALSE;
-	  DrawText(ED_COUNT_GADGET_XPOS+5,
-		   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		   level.name,FS_SMALL,FC_YELLOW);
-	  DrawText(ED_COUNT_GADGET_XPOS+5+strlen(level.name)*FONT2_XSIZE,
-		   ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		   " ",FS_SMALL,FC_RED);
-	}
-      }
-
-      if (mx>=SX+29*MINI_TILEX && mx<SX+30*MINI_TILEX &&
-	  my>=SY+26*MINI_TILEY && my<SY+27*MINI_TILEY)
-      {
-	int new_element;
 
-	if (!button || button<1 || button>3)
-	  return;
-
-	new_element = (button==1 ? new_element1 :
-		       button==2 ? new_element2 :
-		       button==3 ? new_element3 : 0);
-
-	if (new_element != level.amoebe_inhalt)
-	{
-	  level.amoebe_inhalt = new_element;
-	  DrawMiniElement(29,26,new_element);
-	}
-      }
-
-      if (mx>=SX+1*MINI_TILEX && mx<SX+(1+4*5)*MINI_TILEX &&
-	  my>=SY+2*MINI_TILEY && my<SY+(2+3)*MINI_TILEY)
-      {
-	int x = (mx-SX-1*MINI_TILEX)/MINI_TILEX;
-	int y = (my-SY-2*MINI_TILEY)/MINI_TILEY;
-	int i = x/5;
-	int new_element;
-
-	x = x-i*5;
-	if (i>=0 && i<43 && x>=0 && x<3 && y>=0 && y<3)
-	{
-	  if (button && !motion_status)
-	    in_field_pressed = TRUE;
-
-	  if (!button || !in_field_pressed || button<1 || button>3)
-	    return;
-
-	  new_element = (button==1 ? new_element1 :
-			 button==2 ? new_element2 :
-			 button==3 ? new_element3 : 0);
-
-	  if (new_element != level.mampfer_inhalt[i][x][y])
-	  {
-	    level.mampfer_inhalt[i][x][y] = new_element;
-	    DrawMiniElement(1+5*i+x,2+y,new_element);
-	  }
-	}
-	else if (!motion_status)/* Mauszeiger nicht im Cruncher-Feld */
-	  in_field_pressed = FALSE;
-      }
-      else if (!motion_status)	/* Mauszeiger nicht im Cruncher-Feld */
-	in_field_pressed = FALSE;
-
-#endif
-
-
-
-    }
+    ModifyEditorCounter(i, *counterbutton_info[i].value);
+    MapCounterButtons(i);
   }
 
-  last_button = button;
+  /* draw text input gadgets */
+  for (i=ED_TEXTINPUT_ID_LEVEL_FIRST; i<=ED_TEXTINPUT_ID_LEVEL_LAST; i++)
+  {
+    x = textinput_info[i].x + xoffset_above;
+    y = textinput_info[i].y + yoffset_above;
 
-  BackToFront();
-}
+    sprintf(infotext, "%s:", textinput_info[i].infotext);
+    infotext[max_infotext_len] = '\0';
 
-void LevelNameTyping(KeySym key)
-{
-  unsigned char ascii = 0;
-  int len = strlen(level.name);
+    DrawTextF(x, y, FONT_TEXT_1, infotext);
+    ModifyEditorTextInput(i, textinput_info[i].value);
+    MapTextInputGadget(i);
+  }
 
-  if (!name_typing)
-    return;
+  /* draw radiobutton gadgets */
+  for (i=ED_RADIOBUTTON_ID_LEVEL_FIRST; i<=ED_RADIOBUTTON_ID_LEVEL_LAST; i++)
+  {
+    boolean checked =
+      (*radiobutton_info[i].value == radiobutton_info[i].checked_value);
 
-  if (key>=XK_A && key<=XK_Z)
-    ascii = 'A'+(char)(key-XK_A);
-  else if (key>=XK_a && key<=XK_z)
-    ascii = 'a'+(char)(key-XK_a);
-  else if (key>=XK_0 && key<=XK_9)
-    ascii = '0'+(char)(key-XK_0);
-#ifdef XK_LATIN1
-  else if (key>=XK_space && key<=XK_at)
-    ascii = ' '+(char)(key-XK_space);
-  else if (key==XK_Adiaeresis)
-    ascii = 'Ä';
-  else if (key==XK_Odiaeresis)
-    ascii = 'Ö';
-  else if (key==XK_Udiaeresis)
-    ascii = 'Ü';
-  else if (key==XK_adiaeresis)
-    ascii = 'ä';
-  else if (key==XK_odiaeresis)
-    ascii = 'ö';
-  else if (key==XK_udiaeresis)
-    ascii = 'ü';
-  else if (key==XK_underscore)
-    ascii = '_';
-#endif
+    x = radiobutton_info[i].x + xoffset_right2;
+    y = radiobutton_info[i].y + yoffset_right2;
 
-  if (ascii && len<MAX_LEVEL_NAME_LEN-2)
-  {
-    level.name[len] = ascii;
-    level.name[len+1] = 0;
-    len++;
-
-    DrawTextExt(drawto,gc,
-		ED_COUNT_GADGET_XPOS+5,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		level.name,FS_SMALL,FC_GREEN);
-    DrawTextExt(window,gc,
-		ED_COUNT_GADGET_XPOS+5,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		level.name,FS_SMALL,FC_GREEN);
-    DrawTextExt(drawto,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		"<",FS_SMALL,FC_RED);
-    DrawTextExt(window,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		"<",FS_SMALL,FC_RED);
-  }
-  else if ((key==XK_Delete || key==XK_BackSpace) && len>0)
-  {
-    level.name[len-1] = 0;
-    len--;
-
-    DrawTextExt(drawto,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		"< ",FS_SMALL,FC_GREEN);
-    DrawTextExt(window,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		"< ",FS_SMALL,FC_GREEN);
-  }
-  else if (key==XK_Return)
-  {
-    DrawTextExt(drawto,gc,
-		ED_COUNT_GADGET_XPOS+5,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		level.name,FS_SMALL,FC_YELLOW);
-    DrawTextExt(window,gc,
-		ED_COUNT_GADGET_XPOS+5,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		level.name,FS_SMALL,FC_YELLOW);
-    DrawTextExt(drawto,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		" ",FS_SMALL,FC_YELLOW);
-    DrawTextExt(window,gc,
-		ED_COUNT_GADGET_XPOS+5+len*FONT2_XSIZE,
-		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
-		" ",FS_SMALL,FC_YELLOW);
-
-    name_typing = FALSE;
+    DrawTextF(x, y, FONT_TEXT_1, radiobutton_info[i].text);
+    ModifyGadget(level_editor_gadget[radiobutton_info[i].gadget_id],
+		 GDI_CHECKED, checked, GDI_END);
+    MapRadiobuttonGadget(i);
   }
-}
 
-static void DrawCounterValueField(int counter_id, int value)
-{
-  int x = SX + counterbutton_info[counter_id].x + ED_WIN_COUNT_XPOS;
-  int y = SY + counterbutton_info[counter_id].y;
-
-  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-	    DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
-	    DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS,
-	    ED_WIN_COUNT_XSIZE, ED_WIN_COUNT_YSIZE,
-	    x, y);
+  /* draw checkbutton gadgets */
+  for (i=ED_CHECKBUTTON_ID_LEVEL_FIRST; i<=ED_CHECKBUTTON_ID_LEVEL_LAST; i++)
+  {
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
 
-  DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
-	   int2str(value, 3), FS_SMALL, FC_YELLOW);
-}
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+  }
 
-static void DrawDrawingWindow()
-{
-  ClearWindow();
-  UnmapLevelEditorWindowGadgets();
-  AdjustLevelScrollPosition();
-  AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_HORIZONTAL);
-  AdjustEditorScrollbar(ED_CTRL_ID_SCROLL_VERTICAL);
-  DrawMiniLevel(level_xpos, level_ypos);
-  MapMainDrawingArea();
+  /* draw drawing area */
+  DrawRandomPlacementBackgroundArea();
 }
 
-static void DrawLevelInfoWindow()
+static void DrawAmoebaContentArea()
 {
-  char infotext[1024];
-  int infotext_yoffset = MINI_TILEX + ED_GADGET_DISTANCE;
-  int i, x, y;
-
-  ClearWindow();
-  UnmapLevelEditorWindowGadgets();
-
-  DrawTextF(ED_LEVELINFO_XPOS, ED_LEVELINFO_YPOS, FC_YELLOW,
-	    "Level Information");
-
-  gadget_level_xsize_value = &lev_fieldx;
-  gadget_level_ysize_value = &lev_fieldy;
-  gadget_level_random_value = &random_placement_num_objects;
-  gadget_level_collect_value = &level.edelsteine;
-  gadget_level_timelimit_value = &level.time;
-  gadget_level_timescore_value = &level.score[10];
-
-  /* draw counter gadgets for level info */
-  for (i=ED_COUNTER_ID_LEVEL_XSIZE; i<=ED_COUNTER_ID_LEVEL_TIMESCORE; i++)
-  {
-    x = counterbutton_info[i].x;
-    y = counterbutton_info[i].y - infotext_yoffset;
-
-    sprintf(infotext, "%s:", counterbutton_info[i].infotext);
-    infotext[MAX_INFOTEXT_LEN] = '\0';
+  int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
+  int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
+  int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
+  int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
 
-    DrawTextF(x, y, FC_YELLOW, infotext);
-    ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
-    MapCounterButtons(i);
-  }
+  ElementContent[0][0][0] = level.amoeba_content;
 
-  /* draw text input gadgets for level info */
-  for (i=ED_TEXTINPUT_ID_LEVEL_NAME; i<=ED_TEXTINPUT_ID_LEVEL_AUTHOR; i++)
-  {
-    x = textinput_info[i].x;
-    y = textinput_info[i].y - infotext_yoffset;
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
+  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
-    sprintf(infotext, "%s:", textinput_info[i].infotext);
-    infotext[MAX_INFOTEXT_LEN] = '\0';
+  DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba", FONT_TEXT_1);
 
-    DrawTextF(x, y, FC_YELLOW, infotext);
-    ModifyEditorTextInput(i, textinput_info[i].value);
-    MapTextInputGadget(i);
-  }
+  MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
 }
 
 static void DrawElementContentAreas()
 {
-  int *num_areas = &MampferMax;
+  int counter_id = ED_COUNTER_ID_ELEM_CONTENT;
   int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
   int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
+  int xoffset_right = getCounterGadgetWidth();
+  int yoffset_right = ED_BORDER_SIZE;
   int i, x, y;
 
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
     for (y=0; y<3; y++)
       for (x=0; x<3; x++)
-	ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
+	ElementContent[i][x][y] = level.yam_content[i][x][y];
 
-  for (i=0; i<MAX_ELEM_CONTENT; i++)
-    UnmapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
+  for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
+    UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
 
   /* display counter to choose number of element content areas */
-  gadget_elem_content_value = num_areas;
-  DrawCounterValueField(ED_COUNTER_ID_ELEM_CONTENT,*gadget_elem_content_value);
-  x = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].x + counter_xsize;
-  y = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].y;
-  DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
-	    FC_YELLOW, "number of content areas");
-  ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, *gadget_elem_content_value);
-  MapCounterButtons(ED_COUNTER_ID_ELEM_CONTENT);
-
-  /* delete content areas in case of reducing number of them */
-  XFillRectangle(display, backbuffer, gc,
-		 SX, area_sy - MINI_TILEX,
-		 SXSIZE, 12 * MINI_TILEY);
+  x = counterbutton_info[counter_id].x + xoffset_right;
+  y = counterbutton_info[counter_id].y + yoffset_right;
+  DrawTextF(x, y, FONT_TEXT_1, "number of content areas");
 
-  /* draw some decorative border for the objects */
-  for (i=0; i<*num_areas; i++)
-  {
-    for (y=0; y<4; y++)
-      for (x=0; x<4; x++)
-	DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
-			EL_ERDREICH);
+  ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+  MapCounterButtons(counter_id);
 
-    XFillRectangle(display, drawto, gc,
-		   area_sx + 5 * (i % 4) * MINI_TILEX + MINI_TILEX/2 - 1,
-		   area_sy + 6 * (i / 4) * MINI_TILEY + MINI_TILEY/2 - 1,
-		   3 * MINI_TILEX + 2, 3 * MINI_TILEY + 2);
-  }
+  /* delete content areas in case of reducing number of them */
+  DrawBackground(SX, area_sy - MINI_TILEX, SXSIZE, 12 * MINI_TILEY);
 
-  /* copy border to the right location */
-  XCopyArea(display, drawto, drawto, gc,
-	    area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 12 * MINI_TILEY,
-	    area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+  for (i=0; i<level.num_yam_contents; i++)
+    DrawElementBorder(area_sx + 5 * (i % 4) * MINI_TILEX,
+		      area_sy + 6 * (i / 4) * MINI_TILEY,
+		      3 * MINI_TILEX, 3 * MINI_TILEY);
 
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
-	   "Content", FS_SMALL, FC_YELLOW);
+	   "Content", FONT_TEXT_1);
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 1 * MINI_TILEY + 1,
-	   "when", FS_SMALL, FC_YELLOW);
+	   "when",    FONT_TEXT_1);
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
-	   "smashed", FS_SMALL, FC_YELLOW);
+	   "smashed", FONT_TEXT_1);
 
-  for (i=0; i<*num_areas; i++)
+  for (i=0; i<level.num_yam_contents; i++)
   {
     for (y=0; y<3; y++)
       for (x=0; x<3; x++)
@@ -2639,43 +3084,11 @@ static void DrawElementContentAreas()
 
     DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
 	      area_sy - SY + 6 * (i / 4) * MINI_TILEY + 4 * MINI_TILEY - 4,
-	      FC_YELLOW, "%d", i + 1);
+	      FONT_TEXT_1, "%d", i + 1);
   }
 
-  for (i=0; i<*num_areas; i++)
-    MapDrawingArea(ED_CTRL_ID_ELEM_CONTENT_0 + i);
-}
-
-static void DrawAmoebaContentArea()
-{
-  int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
-  int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
-  int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
-  int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
-  int x, y;
-
-  ElementContent[0][0][0] = level.amoebe_inhalt;
-
-  /* draw decorative border for the object */
-  for (y=0; y<2; y++)
-    for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_ERDREICH);
-
-  XFillRectangle(display, drawto, gc,
-		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
-		 MINI_TILEX + 2, MINI_TILEY + 2);
-
-  /* copy border to the right location */
-  XCopyArea(display, drawto, drawto, gc,
-	    area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
-	    area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
-
-  DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba",
-	   FS_SMALL, FC_YELLOW);
-
-  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
-
-  MapDrawingArea(ED_CTRL_ID_AMOEBA_CONTENT);
+  for (i=0; i<level.num_yam_contents; i++)
+    MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
 }
 
 #define TEXT_COLLECTING		"Score for collecting"
@@ -2686,140 +3099,229 @@ static void DrawAmoebaContentArea()
 
 static void DrawPropertiesWindow()
 {
-  int i, x, y;
+  int counter_id = ED_COUNTER_ID_ELEM_SCORE;
   int num_elements_in_level;
+  float percentage;
+  int xoffset_right = getCounterGadgetWidth();
+  int yoffset_right = ED_BORDER_SIZE;
+  int xoffset_right2 = ED_CHECKBUTTON_XSIZE + 2 * ED_GADGET_DISTANCE;
+  int yoffset_right2 = ED_BORDER_SIZE;
+  int xstart = 2;
+  int ystart = 4;
+  int i, x, y;
   static struct
   {
     int element;
-    int *counter_value;
+    int *value;
     char *text;
   } elements_with_counter[] =
   {
-    { EL_EDELSTEIN,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_BD,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_GELB,&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_ROT,	&level.score[0],	TEXT_COLLECTING },
-    { EL_EDELSTEIN_LILA,&level.score[0],	TEXT_COLLECTING },
-    { EL_DIAMANT,	&level.score[1],	TEXT_COLLECTING },
-    { EL_KAEFER_R,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_O,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_L,	&level.score[2],	TEXT_SMASHING },
-    { EL_KAEFER_U,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_R,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_O,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_L,	&level.score[2],	TEXT_SMASHING },
-    { EL_BUTTERFLY_U,	&level.score[2],	TEXT_SMASHING },
-    { EL_FLIEGER_R,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_O,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_L,	&level.score[3],	TEXT_SMASHING },
-    { EL_FLIEGER_U,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_R,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_O,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_L,	&level.score[3],	TEXT_SMASHING },
-    { EL_FIREFLY_U,	&level.score[3],	TEXT_SMASHING },
-    { EL_MAMPFER,	&level.score[4],	TEXT_SMASHING },
-    { EL_MAMPFER2,	&level.score[4],	TEXT_SMASHING },
-    { EL_ROBOT,		&level.score[5],	TEXT_SMASHING },
-    { EL_PACMAN_R,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_O,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_L,	&level.score[6],	TEXT_SMASHING },
-    { EL_PACMAN_U,	&level.score[6],	TEXT_SMASHING },
-    { EL_KOKOSNUSS,	&level.score[7],	TEXT_CRACKING },
-    { EL_DYNAMIT_AUS,	&level.score[8],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL1,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL2,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL3,	&level.score[9],	TEXT_COLLECTING },
-    { EL_SCHLUESSEL4,	&level.score[9],	TEXT_COLLECTING },
-    { EL_AMOEBE_NASS,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_NORM,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_VOLL,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_AMOEBE_BD,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_SIEB_INAKTIV,	&level.dauer_sieb,	TEXT_DURATION },
-    { EL_ABLENK_AUS,	&level.dauer_ablenk,	TEXT_DURATION },
+    { EL_EMERALD,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_BD_DIAMOND,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EMERALD_YELLOW,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EMERALD_RED,	&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_EMERALD_PURPLE,&level.score[SC_EDELSTEIN],	TEXT_COLLECTING },
+    { EL_DIAMOND,	&level.score[SC_DIAMANT],	TEXT_COLLECTING },
+    { EL_BUG_RIGHT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUG_UP,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUG_LEFT,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BUG_DOWN,	&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_RIGHT,&level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_UP,   &level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_LEFT, &level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_BD_BUTTERFLY_DOWN, &level.score[SC_KAEFER],	TEXT_SMASHING },
+    { EL_SPACESHIP_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_UP,	 &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_SPACESHIP_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_RIGHT,&level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_UP,	  &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_LEFT, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_BD_FIREFLY_DOWN, &level.score[SC_FLIEGER],	TEXT_SMASHING },
+    { EL_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
+    { EL_DARK_YAMYAM,	&level.score[SC_MAMPFER],	TEXT_SMASHING },
+    { EL_ROBOT,		&level.score[SC_ROBOT],		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_NUT,		&level.score[SC_KOKOSNUSS],	TEXT_CRACKING },
+    { EL_DYNAMITE,	&level.score[SC_DYNAMIT],	TEXT_COLLECTING },
+    { EL_KEY_1,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY_2,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY_3,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_KEY_4,		&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY_1_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY_2_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY_3_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_EM_KEY_4_FILE,	&level.score[SC_SCHLUESSEL],	TEXT_COLLECTING },
+    { EL_AMOEBA_WET,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_AMOEBA_DRY,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_AMOEBA_FULL,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_BD_AMOEBA,	&level.amoeba_speed,		TEXT_SPEED },
+    { EL_MAGIC_WALL,	&level.time_magic_wall,		TEXT_DURATION },
+    { EL_ROBOT_WHEEL,	&level.time_wheel,		TEXT_DURATION },
     { -1, NULL, NULL }
   };
 
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
-  /* draw some decorative border for the object */
-  for (y=0; y<3; y++)
-    for (x=0; x<3; x++)
-      DrawMiniElement(2 + x , 2 + y, EL_ERDREICH);
+  DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
+	   "Element Settings", FONT_TITLE_1);
 
-  XFillRectangle(display, drawto, gc,
-		 SX + TILEX + MINI_TILEX/2 - 1,
-		 SY + TILEY + MINI_TILEY/2 - 1,
-		 TILEX + 2, TILEY + 2);
+  DrawElementBorder(SX + xstart * MINI_TILEX,
+		    SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+		    TILEX, TILEY);
+  DrawGraphicAnimationExt(drawto,
+			  SX + xstart * MINI_TILEX,
+			  SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+			  el2edimg(properties_element), -1, NO_MASKING);
 
-  /* copy border to the right location */
-  XCopyArea(display, drawto, drawto, gc,
-	    SX + TILEX, SY + TILEY,
-	    2 * TILEX, 2 * TILEY,
-	    SX + TILEX - MINI_TILEX/2, SY + TILEY - MINI_TILEY/2);
+  FrameCounter = 0;	/* restart animation frame counter */
 
-  DrawGraphic(1, 1, el2gfx(properties_element));
-  DrawText(SX + 3*TILEX, SY + 5*TILEY/4, "Element Properties",
-	   FS_SMALL, FC_YELLOW);
+  DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
+	    FONT_TEXT_1, getElementInfoText(properties_element));
 
   num_elements_in_level = 0;
   for (y=0; y<lev_fieldy; y++) 
     for (x=0; x<lev_fieldx; x++)
       if (Feld[x][y] == properties_element)
 	num_elements_in_level++;
+  percentage = num_elements_in_level * 100.0 / (lev_fieldx * lev_fieldy);
 
-  DrawTextF(ED_PROPERTIES_XPOS, 5*TILEY, FC_YELLOW, "%d x contained in level",
-	    num_elements_in_level);
+  DrawTextF(ED_SETTINGS_XPOS, 5 * TILEY, FONT_TEXT_1, "In this level:");
+  DrawTextF(ED_SETTINGS_XPOS + 15 * getFontWidth(FONT_TEXT_1), 5 * TILEY,
+	    FONT_TEXT_2, "%d (%.2f%%)", num_elements_in_level,
+	    percentage);
 
   /* check if there are elements where a score can be chosen for */
   for (i=0; elements_with_counter[i].element != -1; i++)
   {
     if (elements_with_counter[i].element == properties_element)
     {
-      int x = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].x + counter_xsize;
-      int y = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].y;
+      int x = counterbutton_info[counter_id].x + xoffset_right;
+      int y = counterbutton_info[counter_id].y + yoffset_right;
 
-      gadget_elem_score_value = elements_with_counter[i].counter_value;
+      counterbutton_info[counter_id].value = elements_with_counter[i].value;
+      DrawTextF(x, y, FONT_TEXT_1, elements_with_counter[i].text);
 
-      /*
-      DrawCounterValueField(ED_COUNTER_ID_SCORE, *gadget_score_value);
-      */
-
-      DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
-		FC_YELLOW, elements_with_counter[i].text);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, *gadget_elem_score_value);
-      MapCounterButtons(ED_COUNTER_ID_ELEM_SCORE);
+      ModifyEditorCounter(counter_id,  *counterbutton_info[counter_id].value);
+      MapCounterButtons(counter_id);
       break;
     }
   }
 
   if (HAS_CONTENT(properties_element))
   {
+    /* draw stickybutton gadget */
+    i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
     if (IS_AMOEBOID(properties_element))
       DrawAmoebaContentArea();
     else
       DrawElementContentAreas();
   }
-}
 
-static void swap_numbers(int *i1, int *i2)
-{
-  int help = *i1;
+  if (IS_GEM(properties_element))
+  {
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_EM_SLIPPERY_GEMS;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+  }
 
-  *i1 = *i2;
-  *i2 = help;
-}
+  if (IS_CUSTOM_ELEMENT(properties_element))
+  {
+    int nr = properties_element - EL_CUSTOM_START;
 
-static void swap_number_pairs(int *x1, int *y1, int *x2, int *y2)
-{
-  int help_x = *x1;
-  int help_y = *y1;
+    CopyCustomElementPropertiesToEditor();
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_INDESTRUCTIBLE;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].indestructible;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_CAN_FALL;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].can_fall;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_CAN_SMASH;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].can_smash;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_PUSHABLE;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
 
-  *x1 = *x2;
-  *x2 = help_x;
+    checkbutton_info[i].value = &custom_element_properties[nr].pushable;
 
-  *y1 = *y2;
-  *y2 = help_y;
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw checkbutton gadget */
+    i = ED_CHECKBUTTON_ID_CUSTOM_SLIPPERY;
+    x = checkbutton_info[i].x + xoffset_right2;
+    y = checkbutton_info[i].y + yoffset_right2;
+
+    checkbutton_info[i].value = &custom_element_properties[nr].slippery;
+
+    DrawTextF(x, y, FONT_TEXT_1, checkbutton_info[i].text);
+    ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
+		 GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
+    MapCheckbuttonGadget(i);
+
+    /* draw selectbox gadget */
+    i = ED_SELECTBOX_ID_TEST;
+    x = selectbox_info[i].x + xoffset_right2;
+    y = selectbox_info[i].y + yoffset_right2;
+
+    selectbox_info[i].index = &test_index;
+
+    DrawTextF(x, y, FONT_TEXT_1, selectbox_info[i].text);
+    ModifyGadget(level_editor_gadget[selectbox_info[i].gadget_id],
+		 GDI_SELECTBOX_INDEX, *selectbox_info[i].index, GDI_END);
+    MapSelectboxGadget(i);
+  }
 }
 
 static void DrawLineElement(int sx, int sy, int element, boolean change_level)
@@ -2968,7 +3470,8 @@ static void DrawArc(int from_x, int from_y, int to_x, int to_y,
   DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level);
 }
 
-#if 0
+#define DRAW_CIRCLES_BUTTON_AVAILABLE	0
+#if DRAW_CIRCLES_BUTTON_AVAILABLE
 static void DrawCircle(int from_x, int from_y, int to_x, int to_y,
 		       int element, boolean change_level)
 {
@@ -3000,14 +3503,10 @@ static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
   to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1;
   to_sy = SY + to_y * MINI_TILEY + MINI_TILEY - 1;
 
-  XSetForeground(display, gc, WhitePixel(display, screen));
-
-  XDrawLine(display, drawto, gc, from_sx, from_sy, to_sx, from_sy);
-  XDrawLine(display, drawto, gc, to_sx, from_sy, to_sx, to_sy);
-  XDrawLine(display, drawto, gc, to_sx, to_sy, from_sx, to_sy);
-  XDrawLine(display, drawto, gc, from_sx, to_sy, from_sx, from_sy);
-
-  XSetForeground(display, gc, BlackPixel(display, screen));
+  DrawSimpleWhiteLine(drawto, from_sx, from_sy, to_sx, from_sy);
+  DrawSimpleWhiteLine(drawto, to_sx, from_sy, to_sx, to_sy);
+  DrawSimpleWhiteLine(drawto, to_sx, to_sy, from_sx, to_sy);
+  DrawSimpleWhiteLine(drawto, from_sx, to_sy, from_sx, from_sy);
 
   if (from_x == to_x && from_y == to_y)
     MarkTileDirty(from_x/2, from_y/2);
@@ -3033,20 +3532,16 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
 static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 			 int button, int mode)
 {
-  static short brush_buffer[ED_FIELDX][ED_FIELDY];
+  static short brush_buffer[MAX_ED_FIELDX][MAX_ED_FIELDY];
   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;
@@ -3128,19 +3623,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;
@@ -3200,21 +3685,22 @@ static void FloodFill(int from_x, int from_y, int fill_element)
 }
 
 /* values for DrawLevelText() modes */
-#define TEXT_INIT	0
-#define TEXT_SETCURSOR	1
-#define TEXT_WRITECHAR	2
-#define TEXT_BACKSPACE	3
-#define TEXT_NEWLINE	4
-#define TEXT_END	5
-
-static void DrawLevelText(int sx, int sy, char letter, int mode)
+#define TEXT_INIT		0
+#define TEXT_SETCURSOR		1
+#define TEXT_WRITECHAR		2
+#define TEXT_BACKSPACE		3
+#define TEXT_NEWLINE		4
+#define TEXT_END		5
+#define TEXT_QUERY_TYPING	6
+
+static int DrawLevelText(int sx, int sy, char letter, int mode)
 {
   static short delete_buffer[MAX_LEV_FIELDX];
   static int start_sx, start_sy;
   static int last_sx, last_sy;
   static boolean typing = FALSE;
   int letter_element = EL_CHAR_ASCII0 + letter;
-  int lx, ly;
+  int lx = 0, ly = 0;
 
   /* map lower case letters to upper case and convert special characters */
   if (letter >= 'a' && letter <= 'z')
@@ -3226,14 +3712,14 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
   else if (letter == 'ü' || letter == 'Ü')
     letter_element = EL_CHAR_UE;
   else if (letter == '^')
-    letter_element = EL_CHAR_COPY;
+    letter_element = EL_CHAR_COPYRIGHT;
   else
     letter_element = EL_CHAR_ASCII0 + letter;
 
   if (mode != TEXT_INIT)
   {
     if (!typing)
-      return;
+      return FALSE;
 
     if (mode != TEXT_SETCURSOR)
     {
@@ -3270,9 +3756,9 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
 	delete_buffer[sx - start_sx] = Feld[lx][ly];
 	Feld[lx][ly] = letter_element;
 
-	if (sx + 1 < ED_FIELDX && lx + 1 < lev_fieldx)
+	if (sx + 1 < ed_fieldx && lx + 1 < lev_fieldx)
 	  DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR);
-	else if (sy + 1 < ED_FIELDY && ly + 1 < lev_fieldy)
+	else if (sy + 1 < ed_fieldy && ly + 1 < lev_fieldy)
 	  DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
 	else
 	  DrawLevelText(0, 0, 0, TEXT_END);
@@ -3283,13 +3769,13 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
       if (sx > start_sx)
       {
 	Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
-	DrawMiniElement(sx - 1, sy, new_element3);
+	DrawMiniElement(sx - 1, sy, Feld[lx - 1][ly]);
 	DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR);
       }
       break;
 
     case TEXT_NEWLINE:
-      if (sy + 1 < ED_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
+      if (sy + 1 < ed_fieldy - 1 && ly + 1 < lev_fieldy - 1)
 	DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
       else
 	DrawLevelText(0, 0, 0, TEXT_END);
@@ -3301,9 +3787,14 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
       typing = FALSE;
       break;
 
+    case TEXT_QUERY_TYPING:
+      break;
+
     default:
       break;
   }
+
+  return typing;
 }
 
 static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy,
@@ -3322,6 +3813,7 @@ static void CopyLevelToUndoBuffer(int mode)
 {
   static boolean accumulated_undo = FALSE;
   boolean new_undo_buffer_position = TRUE;
+  int last_border_element;
   int x, y;
 
   switch (mode)
@@ -3352,6 +3844,13 @@ static void CopyLevelToUndoBuffer(int mode)
   for(x=0; x<lev_fieldx; x++)
     for(y=0; y<lev_fieldy; y++)
       UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+
+  /* check if drawing operation forces change of border style */
+  last_border_element = BorderElement;
+  SetBorderElement();
+  if (BorderElement != last_border_element)
+    DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+
 #if 0
 #ifdef DEBUG
   printf("level saved to undo buffer\n");
@@ -3359,40 +3858,58 @@ static void CopyLevelToUndoBuffer(int mode)
 #endif
 }
 
-static void RandomPlacement(int button)
+static void RandomPlacement(int new_element)
 {
-  int new_element;
+  static boolean free_position[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+  int num_free_positions;
+  int num_percentage;
+  int num_elements;
   int x, y;
 
-  new_element = (button == 1 ? new_element1 :
-		 button == 2 ? new_element2 :
-		 button == 3 ? new_element3 : 0);
-
-  if (random_placement_method == RANDOM_USE_PERCENTAGE)
+  /* determine number of free positions for the new elements */
+  /* (maybe this statement should be formatted a bit more readable...) */
+  num_free_positions = 0;
+  for (x=0; x<lev_fieldx; x++)
+    for (y=0; y<lev_fieldy; y++)
+      if ((free_position[x][y] =
+	   ((random_placement_background_restricted &&
+	     Feld[x][y] == random_placement_background_element) ||
+	    (!random_placement_background_restricted &&
+	     Feld[x][y] != new_element))) == TRUE)
+	num_free_positions++;
+
+  /* determine number of new elements to place there */
+  num_percentage = num_free_positions * random_placement_value / 100;
+  num_elements = (random_placement_method == RANDOM_USE_PERCENTAGE ?
+		  num_percentage : random_placement_value);
+
+  /* if not more free positions than elements to place, fill whole level */
+  if (num_elements >= num_free_positions)
   {
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-	if (RND(100) < random_placement_percentage)
-	  Feld[x][y] = new_element;
+    for (x=0; x<lev_fieldx; x++)
+      for (y=0; y<lev_fieldy; y++)
+	Feld[x][y] = new_element;
+
+    DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+    return;
   }
-  else
+
+  while (num_elements > 0)
   {
-    int elements_left = random_placement_num_objects;
+    x = RND(lev_fieldx);
+    y = RND(lev_fieldy);
 
-    while (elements_left > 0)
+    /* don't place element at the same position twice */
+    if (free_position[x][y])
     {
-      x = RND(lev_fieldx);
-      y = RND(lev_fieldy);
-
-      if (Feld[x][y] != new_element)
-      {
-	Feld[x][y] = new_element;
-	elements_left--;
-      }
+      free_position[x][y] = FALSE;
+      Feld[x][y] = new_element;
+      num_elements--;
     }
   }
 
-  DrawMiniLevel(level_xpos, level_ypos);
+  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 }
 
@@ -3411,7 +3928,7 @@ void WrapLevel(int dx, int dy)
       Feld[x][y] =
 	FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
 
-  DrawMiniLevel(level_xpos, level_ypos);
+  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
@@ -3419,16 +3936,17 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
   static boolean started_inside_drawing_area = FALSE;
   int id = gi->custom_id;
-  boolean inside_drawing_area = !gi->event.off_borders;
   boolean button_press_event;
   boolean button_release_event;
-  boolean draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL);
-  int new_element;
+  boolean inside_drawing_area = !gi->event.off_borders;
+  boolean draw_level = (id == GADGET_ID_DRAWING_LEVEL);
+  int actual_drawing_function;
   int button = gi->event.button;
+  int new_element = BUTTON_ELEMENT(button);
   int sx = gi->event.x, sy = gi->event.y;
   int min_sx = 0, min_sy = 0;
   int max_sx = gi->drawing.area_xsize - 1, max_sy = gi->drawing.area_ysize - 1;
-  int lx, ly;
+  int lx = 0, ly = 0;
   int min_lx = 0, min_ly = 0;
   int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
   int x, y;
@@ -3436,11 +3954,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);
 
@@ -3454,6 +3967,9 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
     lx = sx + level_xpos;
     ly = sy + level_ypos;
 
+    if (!IN_LEV_FIELD(lx, ly))
+      inside_drawing_area = FALSE;
+
     /* make sure to stay inside level field boundaries */
     lx = (lx < min_lx ? min_lx : lx > max_lx ? max_lx : lx);
     ly = (ly < min_ly ? min_ly : ly > max_ly ? max_ly : ly);
@@ -3472,23 +3988,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   if (!button && !button_release_event)
     return;
 
-  new_element = (button == 1 ? new_element1 :
-		 button == 2 ? new_element2 :
-		 button == 3 ? new_element3 : 0);
-
-
-#if 0
-  if (button_release_event)
-    button = 0;
-#endif
-
-
-  if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
-    return;
+  /* automatically switch to 'single item' drawing mode, if needed */
+  actual_drawing_function =
+    (draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
 
-  switch (drawing_function)
+  switch (actual_drawing_function)
   {
-    case ED_CTRL_ID_SINGLE_ITEMS:
+    case GADGET_ID_SINGLE_ITEMS:
       if (draw_level)
       {
 	if (button_release_event)
@@ -3510,20 +4016,20 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	}
 	else if (new_element != Feld[lx][ly])
 	{
-	  if (new_element == EL_SPIELFIGUR)
+	  if (new_element == EL_PLAYER_1)
 	  {
 	    /* remove player at old position */
 	    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)
+		if (Feld[x][y] == EL_PLAYER_1)
 		{
-		  Feld[x][y] = EL_LEERRAUM;
-		  if (x - level_xpos >= 0 && x - level_xpos < ED_FIELDX &&
-		      y - level_ypos >= 0 && y - level_ypos < ED_FIELDY)
+		  Feld[x][y] = EL_EMPTY;
+		  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
+		      y - level_ypos >= 0 && y - level_ypos < ed_fieldy)
 		    DrawMiniElement(x - level_xpos, y - level_ypos,
-				    EL_LEERRAUM);
+				    EL_EMPTY);
 		}
 	      }
 	    }
@@ -3535,25 +4041,27 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       }
       else
       {
-	DrawMiniGraphicExt(drawto, gc,
+	DrawMiniGraphicExt(drawto,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
-	DrawMiniGraphicExt(window, gc,
+			   el2edimg(new_element));
+	DrawMiniGraphicExt(window,
 			   gi->x + sx * MINI_TILEX,
 			   gi->y + sy * MINI_TILEY,
-			   el2gfx(new_element));
-
-	if (id == ED_CTRL_ID_AMOEBA_CONTENT)
-	  level.amoebe_inhalt = new_element;
-	else if (id >= ED_CTRL_ID_ELEM_CONTENT_0 &&
-		 id <= ED_CTRL_ID_ELEM_CONTENT_7)
-	  level.mampfer_inhalt[id - ED_CTRL_ID_ELEM_CONTENT_0][sx][sy] =
+			   el2edimg(new_element));
+
+	if (id == GADGET_ID_AMOEBA_CONTENT)
+	  level.amoeba_content = new_element;
+	else if (id == GADGET_ID_RANDOM_BACKGROUND)
+	  random_placement_background_element = new_element;
+	else if (id >= GADGET_ID_ELEM_CONTENT_0 &&
+		 id <= GADGET_ID_ELEM_CONTENT_7)
+	  level.yam_content[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
 	    new_element;
       }
       break;
 
-    case ED_CTRL_ID_CONNECTED_ITEMS:
+    case GADGET_ID_CONNECTED_ITEMS:
       {
 	static int last_sx = -1;
 	static int last_sy = -1;
@@ -3572,12 +4080,12 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       }
       break;
 
-    case ED_CTRL_ID_LINE:
-    case ED_CTRL_ID_ARC:
-    case ED_CTRL_ID_RECTANGLE:
-    case ED_CTRL_ID_FILLED_BOX:
-    case ED_CTRL_ID_GRAB_BRUSH:
-    case ED_CTRL_ID_TEXT:
+    case GADGET_ID_LINE:
+    case GADGET_ID_ARC:
+    case GADGET_ID_RECTANGLE:
+    case GADGET_ID_FILLED_BOX:
+    case GADGET_ID_GRAB_BRUSH:
+    case GADGET_ID_TEXT:
       {
 	static int last_sx = -1;
 	static int last_sy = -1;
@@ -3585,17 +4093,17 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	static int start_sy = -1;
 	void (*draw_func)(int, int, int, int, int, boolean);
 
-	if (drawing_function == ED_CTRL_ID_LINE)
+	if (drawing_function == GADGET_ID_LINE)
 	  draw_func = DrawLine;
-	else if (drawing_function == ED_CTRL_ID_ARC)
+	else if (drawing_function == GADGET_ID_ARC)
 	  draw_func = DrawArc;
-	else if (drawing_function == ED_CTRL_ID_RECTANGLE)
+	else if (drawing_function == GADGET_ID_RECTANGLE)
 	  draw_func = DrawRectangle;
-	else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
+	else if (drawing_function == GADGET_ID_FILLED_BOX)
 	  draw_func = DrawFilledBox;
-	else if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+	else if (drawing_function == GADGET_ID_GRAB_BRUSH)
 	  draw_func = SelectArea;
-	else /* (drawing_function == ED_CTRL_ID_TEXT) */
+	else /* (drawing_function == GADGET_ID_TEXT) */
 	  draw_func = SetTextCursor;
 
 	if (button_press_event)
@@ -3604,20 +4112,21 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	  start_sx = last_sx = sx;
 	  start_sy = last_sy = sy;
 
-	  if (drawing_function == ED_CTRL_ID_TEXT)
+	  if (drawing_function == GADGET_ID_TEXT)
 	    DrawLevelText(0, 0, 0, TEXT_END);
 	}
 	else if (button_release_event)
 	{
 	  draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
-	  if (drawing_function == ED_CTRL_ID_GRAB_BRUSH)
+	  if (drawing_function == GADGET_ID_GRAB_BRUSH)
 	  {
 	    CopyAreaToBrush(start_sx, start_sy, sx, sy, button);
 	    CopyBrushToCursor(sx, sy);
-	    ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
+	    ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS],
+			  MB_LEFTBUTTON);
 	    draw_with_brush = TRUE;
 	  }
-	  else if (drawing_function == ED_CTRL_ID_TEXT)
+	  else if (drawing_function == GADGET_ID_TEXT)
 	    DrawLevelText(sx, sy, 0, TEXT_INIT);
 	  else
 	    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
@@ -3632,38 +4141,22 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       }
       break;
 
-
-
-#if 0
-    case ED_CTRL_ID_TEXT:
-      /*
-      DrawMiniElement(last_sx, last_sy, Feld[lx][ly]);
-      DrawAreaBorder(sx, sy, sx, sy);
-      last_sx = sx;
-      last_sy = sy;
-      */
-
-      if (button_press_event)
-	DrawLevelText(sx, sy, 0, TEXT_INIT);
-      break;
-#endif
-
-
-
-    case ED_CTRL_ID_FLOOD_FILL:
+    case GADGET_ID_FLOOD_FILL:
       if (button_press_event && Feld[lx][ly] != new_element)
       {
 	FloodFill(lx, ly, new_element);
-	DrawMiniLevel(level_xpos, level_ypos);
+	DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 	CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       }
       break;
 
-    case ED_CTRL_ID_PICK_ELEMENT:
-      if (button_press_event)
-	PickDrawingElement(button, Feld[lx][ly]);
+    case GADGET_ID_PICK_ELEMENT:
       if (button_release_event)
-	ClickOnGadget(level_editor_gadget[last_drawing_function]);
+	ClickOnGadget(level_editor_gadget[last_drawing_function],
+		      MB_LEFTBUTTON);
+      else
+	PickDrawingElement(button, Feld[lx][ly]);
+
       break;
 
     default:
@@ -3673,96 +4166,53 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 
 static void HandleCounterButtons(struct GadgetInfo *gi)
 {
-  int id = gi->custom_id;
+  int gadget_id = gi->custom_id;
+  int counter_id = gi->custom_type_id;
   int button = gi->event.button;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int *counter_value = counterbutton_info[counter_id].value;
+  int step = BUTTON_STEPSIZE(button) *
+    (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1);
 
-  switch (id)
+  if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
   {
-    case ED_CTRL_ID_ELEM_SCORE_DOWN:
-    case ED_CTRL_ID_ELEM_SCORE_UP:
-      step *= (id == ED_CTRL_ID_ELEM_SCORE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE,
-			  *gadget_elem_score_value + step);
-      break;
-    case ED_CTRL_ID_ELEM_SCORE_TEXT:
-      *gadget_elem_score_value = gi->text.number_value;
-      break;
-
-    case ED_CTRL_ID_ELEM_CONTENT_DOWN:
-    case ED_CTRL_ID_ELEM_CONTENT_UP:
-      step *= (id == ED_CTRL_ID_ELEM_CONTENT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT,
-			  *gadget_elem_content_value + step);
-      DrawElementContentAreas();
-      break;
-    case ED_CTRL_ID_ELEM_CONTENT_TEXT:
-      *gadget_elem_content_value = gi->text.number_value;
-      DrawElementContentAreas();
-      break;
+    boolean pressed = (gi->event.type == GD_EVENT_PRESSED);
+    boolean released = (gi->event.type == GD_EVENT_RELEASED);
+    boolean level_changed = LevelChanged();
 
-    case ED_CTRL_ID_LEVEL_XSIZE_DOWN:
-    case ED_CTRL_ID_LEVEL_XSIZE_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_XSIZE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE,
-			  *gadget_level_xsize_value + step);
-      level.fieldx = lev_fieldx;
-      break;
-    case ED_CTRL_ID_LEVEL_XSIZE_TEXT:
-      *gadget_level_xsize_value = gi->text.number_value;
-      level.fieldx = lev_fieldx;
-      break;
+    if ((level_changed && pressed) || (!level_changed && released))
+      return;
 
-    case ED_CTRL_ID_LEVEL_YSIZE_DOWN:
-    case ED_CTRL_ID_LEVEL_YSIZE_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_YSIZE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE,
-			  *gadget_level_ysize_value + step);
-      level.fieldy = lev_fieldy;
-      break;
-    case ED_CTRL_ID_LEVEL_YSIZE_TEXT:
-      *gadget_level_ysize_value = gi->text.number_value;
-      level.fieldy = lev_fieldy;
-      break;
+    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;
+    }
+  }
 
-    case ED_CTRL_ID_LEVEL_RANDOM_DOWN:
-    case ED_CTRL_ID_LEVEL_RANDOM_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_RANDOM_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM,
-			  *gadget_level_random_value + step);
-      break;
-    case ED_CTRL_ID_LEVEL_RANDOM_TEXT:
-      *gadget_level_random_value = gi->text.number_value;
-      break;
+  if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+    *counter_value = gi->text.number_value;
+  else
+    ModifyEditorCounter(counter_id, *counter_value + step);
 
-    case ED_CTRL_ID_LEVEL_COLLECT_DOWN:
-    case ED_CTRL_ID_LEVEL_COLLECT_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_COLLECT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT,
-			  *gadget_level_collect_value + step);
-      break;
-    case ED_CTRL_ID_LEVEL_COLLECT_TEXT:
-      *gadget_level_collect_value = gi->text.number_value;
+  switch (counter_id)
+  {
+    case ED_COUNTER_ID_ELEM_CONTENT:
+      DrawElementContentAreas();
       break;
 
-    case ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN:
-    case ED_CTRL_ID_LEVEL_TIMELIMIT_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT,
-			  *gadget_level_timelimit_value + step);
-      break;
-    case ED_CTRL_ID_LEVEL_TIMELIMIT_TEXT:
-      *gadget_level_timelimit_value = gi->text.number_value;
+    case ED_COUNTER_ID_LEVEL_XSIZE:
+    case ED_COUNTER_ID_LEVEL_YSIZE:
+      lev_fieldx = level.fieldx;
+      lev_fieldy = level.fieldy;
       break;
 
-    case ED_CTRL_ID_LEVEL_TIMESCORE_DOWN:
-    case ED_CTRL_ID_LEVEL_TIMESCORE_UP:
-      step *= (id == ED_CTRL_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1);
-      ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE,
-			  *gadget_level_timescore_value + step);
-      break;
-    case ED_CTRL_ID_LEVEL_TIMESCORE_TEXT:
-      *gadget_level_timescore_value = gi->text.number_value;
+    case ED_COUNTER_ID_SELECT_LEVEL:
+      LoadLevel(level_nr);
+      TapeErase();
+      ResetUndoBuffer();
+      DrawEditModeWindow();
       break;
 
     default:
@@ -3772,41 +4222,48 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
 
 static void HandleTextInputGadgets(struct GadgetInfo *gi)
 {
-  int id = gi->custom_id;
+  strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+}
 
-  switch (id)
-  {
-    case ED_CTRL_ID_LEVEL_NAME:
-      strcpy(level.name, gi->text.value);
-      break;
+static void HandleSelectboxGadgets(struct GadgetInfo *gi)
+{
+  *selectbox_info[gi->custom_type_id].index = gi->selectbox.index;
 
-    case ED_CTRL_ID_LEVEL_AUTHOR:
-      strcpy(level.author, gi->text.value);
-      break;
+#if 1
+  printf("Selected text value: '%s'\n",
+	 selectbox_info[gi->custom_type_id].values[gi->selectbox.index]);
+#endif
+}
 
-    default:
-      break;
-  }
+static void HandleRadiobuttons(struct GadgetInfo *gi)
+{
+  *radiobutton_info[gi->custom_type_id].value =
+    radiobutton_info[gi->custom_type_id].checked_value;
+}
+
+static void HandleCheckbuttons(struct GadgetInfo *gi)
+{
+  int type_id = gi->custom_type_id;
+
+  *checkbutton_info[type_id].value ^= TRUE;
+
+  if (type_id >= ED_CHECKBUTTON_ID_CUSTOM_FIRST &&
+      type_id <= ED_CHECKBUTTON_ID_CUSTOM_LAST)
+    CopyCustomElementPropertiesToGame();
 }
 
 static void HandleControlButtons(struct GadgetInfo *gi)
 {
   int id = gi->custom_id;
   int button = gi->event.button;
-  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
-  int new_element;
-  int player_present = FALSE;
-  int level_changed = FALSE;
+  int step = BUTTON_STEPSIZE(button);
+  int new_element = BUTTON_ELEMENT(button);
   int i, x, y;
 
-  new_element = (button == 1 ? new_element1 :
-		 button == 2 ? new_element2 :
-		 button == 3 ? new_element3 : 0);
-
-  if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
+  if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
     DrawLevelText(0, 0, 0, TEXT_END);
 
-  if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES &&
+  if (id < ED_NUM_CTRL1_BUTTONS && id != GADGET_ID_PROPERTIES &&
       edit_mode != ED_MODE_DRAWING)
   {
     DrawDrawingWindow();
@@ -3815,14 +4272,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
   switch (id)
   {
-    case ED_CTRL_ID_SCROLL_LEFT:
+    case GADGET_ID_SCROLL_LEFT:
       if (level_xpos >= 0)
       {
-	int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-	struct GadgetScrollbar *gs = &gi->scrollbar;
-
-	if (lev_fieldx < ED_FIELDX - 2)
+	if (lev_fieldx < ed_fieldx - 2)
 	  break;
 
 	level_xpos -= step;
@@ -3831,42 +4284,36 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
 	else
-	  DrawMiniLevel(level_xpos, level_ypos);
+	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
       }
       break;
 
-    case ED_CTRL_ID_SCROLL_RIGHT:
-      if (level_xpos <= lev_fieldx - ED_FIELDX)
+    case GADGET_ID_SCROLL_RIGHT:
+      if (level_xpos <= lev_fieldx - ed_fieldx)
       {
-	int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-	struct GadgetScrollbar *gs = &gi->scrollbar;
-
-	if (lev_fieldx < ED_FIELDX - 2)
+	if (lev_fieldx < ed_fieldx - 2)
 	  break;
 
 	level_xpos += step;
-	if (level_xpos > lev_fieldx - ED_FIELDX + 1)
-	  level_xpos = lev_fieldx - ED_FIELDX + 1;
+	if (level_xpos > lev_fieldx - ed_fieldx + 1)
+	  level_xpos = lev_fieldx - ed_fieldx + 1;
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
 	else
-	  DrawMiniLevel(level_xpos, level_ypos);
+	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
       }
       break;
 
-    case ED_CTRL_ID_SCROLL_UP:
+    case GADGET_ID_SCROLL_UP:
       if (level_ypos >= 0)
       {
-	int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-	struct GadgetScrollbar *gs = &gi->scrollbar;
-
-	if (lev_fieldy < ED_FIELDY - 2)
+	if (lev_fieldy < ed_fieldy - 2)
 	  break;
 
 	level_ypos -= step;
@@ -3875,103 +4322,112 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
 	else
-	  DrawMiniLevel(level_xpos, level_ypos);
+	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
       }
       break;
 
-    case ED_CTRL_ID_SCROLL_DOWN:
-      if (level_ypos <= lev_fieldy - ED_FIELDY)
+    case GADGET_ID_SCROLL_DOWN:
+      if (level_ypos <= lev_fieldy - ed_fieldy)
       {
-	int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
-	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-	struct GadgetScrollbar *gs = &gi->scrollbar;
-
-	if (lev_fieldy < ED_FIELDY - 2)
+	if (lev_fieldy < ed_fieldy - 2)
 	  break;
 
 	level_ypos += step;
-	if (level_ypos > lev_fieldy - ED_FIELDY + 1)
-	  level_ypos = lev_fieldy - ED_FIELDY + 1;
+	if (level_ypos > lev_fieldy - ed_fieldy + 1)
+	  level_ypos = lev_fieldy - ed_fieldy + 1;
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
 	else
-	  DrawMiniLevel(level_xpos, level_ypos);
+	  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
-	AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
+	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+		     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
       }
       break;
 
-    case ED_CTRL_ID_SCROLL_HORIZONTAL:
+    case GADGET_ID_SCROLL_HORIZONTAL:
       level_xpos = gi->event.item_position - 1;
-      DrawMiniLevel(level_xpos, level_ypos);
+      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
-    case ED_CTRL_ID_SCROLL_VERTICAL:
+    case GADGET_ID_SCROLL_VERTICAL:
       level_ypos = gi->event.item_position - 1;
-      DrawMiniLevel(level_xpos, level_ypos);
+      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
-    case ED_CTRL_ID_ELEMENTLIST_UP:
-    case ED_CTRL_ID_ELEMENTLIST_DOWN:
-      step *= (id == ED_CTRL_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 > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+	  element_shift = num_editor_elements - 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++)
       {
-	int gadget_id = ED_CTRL_ID_ELEMENTLIST_FIRST + i;
+	int gadget_id = GADGET_ID_ELEMENTLIST_FIRST + i;
 	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-	struct GadgetDesign *design = &gi->deco.design;
+	struct GadgetDesign *gd = &gi->deco.design;
+	int element = editor_elements[element_shift + i];
 
 	UnmapGadget(gi);
-	getMiniGraphicSource(el2gfx(editor_element[element_shift + i]),
-			     &design->pixmap, &design->x, &design->y);
+	getMiniGraphicSource(el2edimg(element), &gd->bitmap, &gd->x, &gd->y);
+	ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
 	MapGadget(gi);
       }
       break;
 
-    case ED_CTRL_ID_WRAP_LEFT:
+    case GADGET_ID_WRAP_LEFT:
       WrapLevel(-step, 0);
       break;
 
-    case ED_CTRL_ID_WRAP_RIGHT:
+    case GADGET_ID_WRAP_RIGHT:
       WrapLevel(step, 0);
       break;
 
-    case ED_CTRL_ID_WRAP_UP:
+    case GADGET_ID_WRAP_UP:
       WrapLevel(0, -step);
       break;
 
-    case ED_CTRL_ID_WRAP_DOWN:
+    case GADGET_ID_WRAP_DOWN:
       WrapLevel(0, step);
       break;
 
-    case ED_CTRL_ID_SINGLE_ITEMS:
-    case ED_CTRL_ID_CONNECTED_ITEMS:
-    case ED_CTRL_ID_LINE:
-    case ED_CTRL_ID_ARC:
-    case ED_CTRL_ID_TEXT:
-    case ED_CTRL_ID_RECTANGLE:
-    case ED_CTRL_ID_FILLED_BOX:
-    case ED_CTRL_ID_FLOOD_FILL:
-    case ED_CTRL_ID_GRAB_BRUSH:
-    case ED_CTRL_ID_PICK_ELEMENT:
+    case GADGET_ID_SINGLE_ITEMS:
+    case GADGET_ID_CONNECTED_ITEMS:
+    case GADGET_ID_LINE:
+    case GADGET_ID_ARC:
+    case GADGET_ID_TEXT:
+    case GADGET_ID_RECTANGLE:
+    case GADGET_ID_FILLED_BOX:
+    case GADGET_ID_FLOOD_FILL:
+    case GADGET_ID_GRAB_BRUSH:
+    case GADGET_ID_PICK_ELEMENT:
       last_drawing_function = drawing_function;
       drawing_function = id;
       draw_with_brush = FALSE;
       break;
 
-    case ED_CTRL_ID_RANDOM_PLACEMENT:
-      RandomPlacement(button);
+    case GADGET_ID_RANDOM_PLACEMENT:
+      RandomPlacement(new_element);
       break;
 
-    case ED_CTRL_ID_PROPERTIES:
+    case GADGET_ID_PROPERTIES:
       if (edit_mode != ED_MODE_PROPERTIES)
       {
 	properties_element = new_element;
@@ -3985,7 +4441,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       break;
 
-    case ED_CTRL_ID_UNDO:
+    case GADGET_ID_UNDO:
       if (undo_buffer_steps == 0)
       {
 	Request("Undo buffer empty !", REQ_CONFIRM);
@@ -3999,10 +4455,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       for(x=0; x<lev_fieldx; x++)
 	for(y=0; y<lev_fieldy; y++)
 	  Feld[x][y] = UndoBuffer[undo_buffer_position][x][y];
-      DrawMiniLevel(level_xpos,level_ypos);
+      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos,level_ypos);
       break;
 
-    case ED_CTRL_ID_INFO:
+    case GADGET_ID_INFO:
       if (edit_mode != ED_MODE_INFO)
       {
 	DrawLevelInfoWindow();
@@ -4015,82 +4471,48 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       break;
 
-    case ED_CTRL_ID_CLEAR:
+    case GADGET_ID_CLEAR:
       for(x=0; x<MAX_LEV_FIELDX; x++) 
 	for(y=0; y<MAX_LEV_FIELDY; y++) 
-	  Feld[x][y] = new_element3;
-      CopyLevelToUndoBuffer(ED_CTRL_ID_CLEAR);
+	  Feld[x][y] = (button == 1 ? EL_EMPTY : new_element);
+      CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
 
-      DrawMiniLevel(level_xpos, level_ypos);
+      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
-    case ED_CTRL_ID_SAVE:
-      if (leveldir[leveldir_nr].readonly)
+    case GADGET_ID_SAVE:
+      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;
-
-      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 ||
-	      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
       {
 	if (Request("Save this level and kill the old ?", REQ_ASK))
 	{
-	  for(x=0; x<lev_fieldx; x++)
-	    for(y=0; y<lev_fieldy; y++) 
-	      Ur[x][y] = Feld[x][y];
+	  CopyPlayfield(Feld, Ur);
+
 	  SaveLevel(level_nr);
 	}
       }
       break;
 
-    case ED_CTRL_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)
+    case GADGET_ID_TEST:
+      if (!LevelContainsPlayer)
 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
       else
       {
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    FieldBackup[x][y] = Ur[x][y];
+	if (LevelChanged())
+	  level.game_version = GAME_VERSION_ACTUAL;
 
-	for(x=0; x<lev_fieldx; x++)
-	  for(y=0; y<lev_fieldy; y++)
-	    Ur[x][y] = Feld[x][y];
+	CopyPlayfield(Ur, FieldBackup);
+	CopyPlayfield(Feld, Ur);
 
 	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);
 
@@ -4106,123 +4528,162 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       break;
 
-    case ED_CTRL_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;
+    case GADGET_ID_EXIT:
+      RequestExitLevelEditor(TRUE);	/* if level has changed, ask user */
+      break;
 
-      if (!level_changed ||
-	  Request("Level has changed! Exit without saving ?",
-		  REQ_ASK | REQ_STAY_OPEN))
+    default:
+      if (id >= GADGET_ID_ELEMENTLIST_FIRST &&
+	  id <= GADGET_ID_ELEMENTLIST_LAST)
       {
-	CloseDoor(DOOR_CLOSE_1);
+	int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
+	int new_element = editor_elements[element_position + element_shift];
 
-	/*
-	CloseDoor(DOOR_CLOSE_ALL);
-	*/
+	PickDrawingElement(button, new_element);
 
-	/* draw smaller door */
-	XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-		  DOOR_GFX_PAGEX7, 64,
-		  108, 64,
-		  EX - 4, EY - 12);
-	redraw_mask |= REDRAW_ALL;
+	if (!HAS_CONTENT(properties_element) ||
+	    !stick_element_properties_window)
+	{
+	  properties_element = new_element;
+	  if (edit_mode == ED_MODE_PROPERTIES)
+	    DrawPropertiesWindow();
+	}
 
-	game_status = MAINMENU;
-	DrawMainMenu();
-      }
-      else
-      {
-	CloseDoor(DOOR_CLOSE_1);
-	XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc,
-		  DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
-		  DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-	OpenDoor(DOOR_OPEN_1);
+	if (drawing_function == GADGET_ID_PICK_ELEMENT)
+	  ClickOnGadget(level_editor_gadget[last_drawing_function],
+			MB_LEFTBUTTON);
       }
-      break;
-
-    default:
 #ifdef DEBUG
-      if (gi->event.type == GD_EVENT_PRESSED)
-	printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
+      else if (gi->event.type == GD_EVENT_PRESSED)
+	printf("default: HandleControlButtons: GD_EVENT_PRESSED(%d)\n", id);
       else if (gi->event.type == GD_EVENT_RELEASED)
-	printf("default: HandleControlButtons: GD_EVENT_RELEASED\n");
+	printf("default: HandleControlButtons: GD_EVENT_RELEASED(%d)\n", id);
       else if (gi->event.type == GD_EVENT_MOVING)
-	printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
+	printf("default: HandleControlButtons: GD_EVENT_MOVING(%d)\n", id);
       else
-	printf("default: HandleControlButtons: ?\n");
+	printf("default: HandleControlButtons: ? (id == %d)\n", id);
 #endif
       break;
   }
 }
 
-void HandleLevelEditorKeyInput(KeySym key)
+void HandleLevelEditorKeyInput(Key key)
 {
-  if (edit_mode == ED_MODE_DRAWING)
+  char letter = getCharFromKey(key);
+  int button = MB_LEFTBUTTON;
+
+  if (drawing_function == GADGET_ID_TEXT &&
+      DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE)
+  {
+    if (letter)
+      DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
+    else if (key == KSYM_Delete || key == KSYM_BackSpace)
+      DrawLevelText(0, 0, 0, TEXT_BACKSPACE);
+    else if (key == KSYM_Return)
+      DrawLevelText(0, 0, 0, TEXT_NEWLINE);
+    else if (key == KSYM_Escape)
+      DrawLevelText(0, 0, 0, TEXT_END);
+  }
+  else if (button_status == MB_RELEASED)
   {
-    char letter = getCharFromKeySym(key);
+    int i, id = GADGET_ID_NONE;
 
-    if (drawing_function == ED_CTRL_ID_TEXT)
+    switch (key)
     {
-      if (letter)
-	DrawLevelText(0, 0, letter, TEXT_WRITECHAR);
-      else if (key == XK_Delete || key == XK_BackSpace)
-	DrawLevelText(0, 0, 0, TEXT_BACKSPACE);
-      else if (key == XK_Return)
-	DrawLevelText(0, 0, 0, TEXT_NEWLINE);
-    }
-    else if (button_status == MB_RELEASED)
-    {
-      int i, id;
-
-      switch (key)
-      {
-        case XK_Left:
-	  id = ED_CTRL_ID_SCROLL_LEFT;
-	  break;
-        case XK_Right:
-	  id = ED_CTRL_ID_SCROLL_RIGHT;
-	  break;
-        case XK_Up:
-	  id = ED_CTRL_ID_SCROLL_UP;
-	  break;
-        case XK_Down:
-	  id = ED_CTRL_ID_SCROLL_DOWN;
-	  break;
+      case KSYM_Left:
+	id = GADGET_ID_SCROLL_LEFT;
+	break;
+      case KSYM_Right:
+	id = GADGET_ID_SCROLL_RIGHT;
+	break;
+      case KSYM_Up:
+	id = GADGET_ID_SCROLL_UP;
+	break;
+      case KSYM_Down:
+	id = GADGET_ID_SCROLL_DOWN;
+	break;
+      case KSYM_Page_Up:
+	id = GADGET_ID_SCROLL_LIST_UP;
+	button = MB_RIGHTBUTTON;
+	break;
+      case KSYM_Page_Down:
+	id = GADGET_ID_SCROLL_LIST_DOWN;
+	button = MB_RIGHTBUTTON;
+	break;
 
-        default:
-	  id = ED_CTRL_ID_NONE;
-	  break;
-      }
+      case KSYM_Escape:
+        if (edit_mode == ED_MODE_DRAWING)
+	{
+	  RequestExitLevelEditor(setup.ask_on_escape);
+	}
+        else
+	{
+	  DrawDrawingWindow();
+	  edit_mode = ED_MODE_DRAWING;
+	}
+        break;
 
-      if (id != ED_CTRL_ID_NONE)
-	ClickOnGadget(level_editor_gadget[id]);
-      else if (letter == '.')
-	ClickOnGadget(level_editor_gadget[ED_CTRL_ID_SINGLE_ITEMS]);
-      else
-	for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-	  if (letter && letter == control_info[i].shortcut)
-	    ClickOnGadget(level_editor_gadget[i]);
+      default:
+	break;
     }
+
+    if (id != GADGET_ID_NONE)
+      ClickOnGadget(level_editor_gadget[id], button);
+    else if (letter == '.')
+      ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+    else if (key == KSYM_Return || key == setup.shortcut.toggle_pause)
+      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)
+	  if (!anyTextGadgetActive())
+	    ClickOnGadget(level_editor_gadget[i], button);
   }
 }
 
+void HandleLevelEditorIdle()
+{
+  static unsigned long action_delay = 0;
+  unsigned long action_delay_value = GameFrameDelay;
+  int xpos = 1, ypos = 2;
+
+  if (edit_mode != ED_MODE_PROPERTIES)
+    return;
+
+  if (!DelayReached(&action_delay, action_delay_value))
+    return;
+
+  DrawGraphicAnimationExt(drawto,
+			  SX + xpos * TILEX,
+			  SY + ypos * TILEY + MINI_TILEY / 2,
+			  el2edimg(properties_element), -1, NO_MASKING);
+
+  MarkTileDirty(xpos, ypos);
+  MarkTileDirty(xpos, ypos + 1);
+
+  FrameCounter++;	/* increase animation frame counter */
+}
+
 void ClearEditorGadgetInfoText()
 {
-  XFillRectangle(display, drawto, gc,
-		 INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
-  redraw_mask |= REDRAW_FIELD;
+  DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
 
 void HandleEditorGadgetInfoText(void *ptr)
 {
   struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
-  char infotext[MAX_INFOTEXT_LEN + 1];
-  char shortcut[20];
+  char infotext[MAX_OUTPUT_LINESIZE + 1];
+  char shortcut[MAX_OUTPUT_LINESIZE + 1];
+  int max_infotext_len = getMaxInfoTextLength();
+
+  if (game_status != LEVELED)
+    return;
 
   ClearEditorGadgetInfoText();
 
+  if (gi->event.type == GD_EVENT_INFO_LEAVING)
+    return;
+
   /* misuse this function to delete brush cursor, if needed */
   if (edit_mode == ED_MODE_DRAWING && draw_with_brush)
     DeleteBrushFromCursor();
@@ -4230,8 +4691,8 @@ void HandleEditorGadgetInfoText(void *ptr)
   if (gi == NULL || gi->info_text == NULL)
     return;
 
-  strncpy(infotext, gi->info_text, MAX_INFOTEXT_LEN);
-  infotext[MAX_INFOTEXT_LEN] = '\0';
+  strncpy(infotext, gi->info_text, max_infotext_len);
+  infotext[max_infotext_len] = '\0';
 
   if (gi->custom_id < ED_NUM_CTRL_BUTTONS)
   {
@@ -4239,17 +4700,20 @@ void HandleEditorGadgetInfoText(void *ptr)
 
     if (key)
     {
-      sprintf(shortcut, " ('%s%c')",
-	      (key >= 'A' && key <= 'Z' ? "Shift-" :
-	       gi->custom_id == ED_CTRL_ID_SINGLE_ITEMS ? ".' or '" : ""),
-	      key);
-
-      if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
+      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);
     }
   }
 
-  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FS_SMALL, FC_YELLOW);
+  DrawText(INFOTEXT_XPOS, INFOTEXT_YPOS, infotext, FONT_TEXT_2);
 }
 
 static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
@@ -4261,23 +4725,26 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
   int sy = gi->event.y;
   int lx = sx + level_xpos;
   int ly = sy + level_ypos;
+  int min_sx = 0, min_sy = 0;
+  int max_sx = gi->drawing.area_xsize - 1;
+  int max_sy = gi->drawing.area_ysize - 1;
 
   ClearEditorGadgetInfoText();
 
-  if (id == ED_CTRL_ID_DRAWING_LEVEL)
+  if (gi->event.type == GD_EVENT_INFO_LEAVING)
+    return;
+
+  /* make sure to stay inside drawing area boundaries */
+  sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx);
+  sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy);
+
+  if (id == GADGET_ID_DRAWING_LEVEL)
   {
     if (button_status)
     {
-      int min_sx = 0, min_sy = 0;
-      int max_sx = gi->drawing.area_xsize - 1;
-      int max_sy = gi->drawing.area_ysize - 1;
       int min_lx = 0, min_ly = 0;
       int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
 
-      /* make sure to stay inside drawing area boundaries */
-      sx = (sx < min_sx ? min_sx : sx > max_sx ? max_sx : sx);
-      sy = (sy < min_sy ? min_sy : sy > max_sy ? max_sy : sy);
-
       /* get positions inside level field */
       lx = sx + level_xpos;
       ly = sy + level_ypos;
@@ -4303,34 +4770,34 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
 
 	switch (drawing_function)
 	{
-	  case ED_CTRL_ID_SINGLE_ITEMS:
+	  case GADGET_ID_SINGLE_ITEMS:
 	    infotext = "Drawing single items";
 	    break;
-      	  case ED_CTRL_ID_CONNECTED_ITEMS:
+      	  case GADGET_ID_CONNECTED_ITEMS:
 	    infotext = "Drawing connected items";
 	    break;
-      	  case ED_CTRL_ID_LINE:
+      	  case GADGET_ID_LINE:
 	    infotext = "Drawing line";
 	    break;
-      	  case ED_CTRL_ID_ARC:
+      	  case GADGET_ID_ARC:
 	    infotext = "Drawing arc";
 	    break;
-      	  case ED_CTRL_ID_TEXT:
+      	  case GADGET_ID_TEXT:
 	    infotext = "Setting text cursor";
 	    break;
-      	  case ED_CTRL_ID_RECTANGLE:
+      	  case GADGET_ID_RECTANGLE:
 	    infotext = "Drawing rectangle";
 	    break;
-      	  case ED_CTRL_ID_FILLED_BOX:
+      	  case GADGET_ID_FILLED_BOX:
 	    infotext = "Drawing filled box";
 	    break;
-      	  case ED_CTRL_ID_FLOOD_FILL:
+      	  case GADGET_ID_FLOOD_FILL:
 	    infotext = "Flood fill";
 	    break;
-      	  case ED_CTRL_ID_GRAB_BRUSH:
+      	  case GADGET_ID_GRAB_BRUSH:
 	    infotext = "Grabbing brush";
 	    break;
-      	  case ED_CTRL_ID_PICK_ELEMENT:
+      	  case GADGET_ID_PICK_ELEMENT:
 	    infotext = "Picking element";
 	    break;
 
@@ -4339,13 +4806,19 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
 	    break;
 	}
 
-	DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
-		  "%s: %d, %d", infotext,
-		  ABS(lx - start_lx) + 1,
-		  ABS(ly - start_ly) + 1);
+	if (drawing_function == GADGET_ID_PICK_ELEMENT)
+	  DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+		    "%s: %d, %d", infotext, lx, ly);
+	else
+	  DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+		    "%s: %d, %d", infotext,
+		    ABS(lx - start_lx) + 1, ABS(ly - start_ly) + 1);
       }
+      else if (drawing_function == GADGET_ID_PICK_ELEMENT)
+	DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+		  "%s", getElementInfoText(Feld[lx][ly]));
       else
-	DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+	DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
 		  "Level position: %d, %d", lx, ly);
     }
 
@@ -4358,11 +4831,38 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
 	DeleteBrushFromCursor();
     }
   }
-  else if (id == ED_CTRL_ID_AMOEBA_CONTENT)
-    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
+  else if (id == GADGET_ID_AMOEBA_CONTENT)
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
 	      "Amoeba content");
+  else if (id == GADGET_ID_RANDOM_BACKGROUND)
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+	      "Random placement background");
+  else
+    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2,
+	      "Content area %d position: %d, %d",
+	      id - GADGET_ID_ELEM_CONTENT_0 + 1, sx, sy);
+}
+
+void RequestExitLevelEditor(boolean ask_if_level_has_changed)
+{
+  if (!ask_if_level_has_changed ||
+      !LevelChanged() ||
+      Request("Level has changed! Exit without saving ?",
+	      REQ_ASK | REQ_STAY_OPEN))
+  {
+    CloseDoor(DOOR_CLOSE_1);
+    /*
+    CloseDoor(DOOR_CLOSE_ALL);
+    */
+    game_status = MAINMENU;
+    DrawMainMenu();
+  }
   else
-    DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FC_YELLOW,
-	      "Cruncher %d content: %d, %d",
-	      id - ED_CTRL_ID_ELEM_CONTENT_0 + 1, sx, sy);
+  {
+    CloseDoor(DOOR_CLOSE_1);
+    BlitBitmap(bitmap_db_door, bitmap_db_door,
+	       DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
+	       DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+    OpenDoor(DOOR_OPEN_1);
+  }
 }