X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=a18b397617d2a493834a076fed51bd86ec7176ee;hb=caf79a7cd47eeeb43746bdeae08ec5f738d3bf61;hp=ee7fe4e58942403d9a98ae51274dee45b79c515f;hpb=d0893e6987c21c25ec137438a18cfe1288362139;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index ee7fe4e5..a18b3976 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1,34 +1,246 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  editor.c                                                *
-*                                                          *
-*  Letzte Aenderung: 15.06.1995                            *
 ***********************************************************/
 
 #include "editor.h"
 #include "screens.h"
-#include "game.h"
 #include "tools.h"
 #include "misc.h"
+#include "buttons.h"
+#include "files.h"
+#include "game.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
+
+/* other constants for the editor */
+#define ED_SCROLL_NO		0
+#define ED_SCROLL_LEFT		1
+#define ED_SCROLL_RIGHT		2
+#define ED_SCROLL_UP		4
+#define ED_SCROLL_DOWN		8
+
+/* screens in the level editor */
+#define ED_MODE_DRAWING		0
+#define ED_MODE_INFO		1
+#define ED_MODE_PROPERTIES	2
+
+/* 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 content */
+#define MAX_ELEMCONT		8
+
+/* values for the control window */
+#define ED_CTRL_BUTTONS_GFX_YPOS 	236
+#define ED_CTRL_BUTTONS_ALT_GFX_YPOS 	142
+
+#define ED_CTRL1_BUTTONS_HORIZ	4
+#define ED_CTRL1_BUTTONS_VERT	4
+#define ED_CTRL1_BUTTON_XSIZE	22
+#define ED_CTRL1_BUTTON_YSIZE	22
+#define ED_CTRL1_BUTTONS_XPOS	6
+#define ED_CTRL1_BUTTONS_YPOS	6
+#define ED_CTRL2_BUTTONS_HORIZ	3
+#define ED_CTRL2_BUTTONS_VERT	2
+#define ED_CTRL2_BUTTON_XSIZE	30
+#define ED_CTRL2_BUTTON_YSIZE	20
+#define ED_CTRL2_BUTTONS_XPOS	5
+#define ED_CTRL2_BUTTONS_YPOS	100
+#define ED_NUM_CTRL1_BUTTONS   (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT)
+#define ED_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
+#define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
+
+/* values for counter gadgets */
+#define ED_COUNT_VALUE_XOFFSET	5
+#define ED_COUNT_VALUE_YOFFSET	3
+#define ED_COUNT_SCORE_XPOS	(TILEX)
+#define ED_COUNT_SCORE_YPOS	(14 * MINI_TILEY)
+#define ED_COUNT_ELEMCONT_XPOS	(TILEX)
+#define ED_COUNT_ELEMCONT_YPOS	(17 * MINI_TILEY)
+
+/* values for element content drawing areas */
+#define ED_AREA_ELEMCONT_XPOS	(TILEX)
+#define ED_AREA_ELEMCONT_YPOS	(10 * TILEY)
+
+/* control button identifiers */
+#define ED_CTRL_ID_SINGLE_ITEMS		0
+#define ED_CTRL_ID_CONNECTED_ITEMS	1
+#define ED_CTRL_ID_LINE			2
+#define ED_CTRL_ID_TEXT			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_PROPERTIES		7
+#define ED_CTRL_ID_FLOOD_FILL		8
+#define ED_CTRL_ID_WRAP_LEFT		9
+#define ED_CTRL_ID_UNUSED1		10
+#define ED_CTRL_ID_WRAP_RIGHT		11
+#define ED_CTRL_ID_RANDOM_PLACEMENT	12
+#define ED_CTRL_ID_BRUSH		13
+#define ED_CTRL_ID_WRAP_DOWN		14
+#define ED_CTRL_ID_UNUSED2		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
+
+/* counter button identifiers */
+#define ED_CTRL_ID_SCORE_DOWN		22
+#define ED_CTRL_ID_SCORE_UP		23
+#define ED_CTRL_ID_ELEMCONT_DOWN	24
+#define ED_CTRL_ID_ELEMCONT_UP		25
+
+/* drawing area identifiers */
+#define ED_CTRL_ID_DRAWING_LEVEL	26
+#define ED_CTRL_ID_ELEMCONT_0		27
+#define ED_CTRL_ID_ELEMCONT_7		34
+#define ED_CTRL_ID_AMOEBA_CONTENT	35
+
+#define ED_NUM_GADGETS			36
+
+/* values for counter gadgets */
+#define ED_COUNTER_SCORE		0
+#define ED_COUNTER_ELEMCONT		1
+
+#define ED_NUM_COUNTERS			2
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+} counter_info[ED_NUM_COUNTERS] =
+{
+  { ED_COUNT_SCORE_XPOS,	ED_COUNT_SCORE_YPOS,
+    ED_CTRL_ID_SCORE_DOWN },
+  { ED_COUNT_ELEMCONT_XPOS,	ED_COUNT_ELEMCONT_YPOS,
+    ED_CTRL_ID_ELEMCONT_DOWN }
+};
+
+/* forward declaration for internal use */
+static void DrawDrawingWindow();
+static void DrawPropertiesWindow();
+static void CopyLevelToUndoBuffer();
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
+
+static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
+static boolean level_editor_gadgets_created = FALSE;
+
+static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
+static int properties_element = 0;
+
+static short ElementContent[MAX_ELEMCONT][3][3];
+static short OrigBackup[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
+
+/* pointer to score value */
+static int *gadget_score_value;
+static int *gadget_areas_value;
 
 static int level_xpos,level_ypos;
-static BOOL edit_mode;
-static BOOL name_typing;
-static int element_shift;
+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 editor_element[] =
+
+int element_shift;
+int editor_element[] =
 {
+  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_LEER,
+  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,
@@ -44,46 +256,45 @@ static int editor_element[] =
   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_KAEFER,
-  EL_FLIEGER,
   EL_MAMPFER,
-  EL_ZOMBIE,
+  EL_KAEFER_O,
+  EL_FLIEGER_O,
+  EL_ROBOT,
+
+  EL_KAEFER_L,
+  EL_FLIEGER_L,
+  EL_KAEFER_R,
+  EL_FLIEGER_R,
 
-  EL_PACMAN,
-  EL_DYNAMIT_AUS,
-  EL_DYNAMIT,
   EL_ABLENK_AUS,
+  EL_KAEFER_U,
+  EL_FLIEGER_U,
+  EL_UNSICHTBAR,
 
   EL_BADEWANNE1,
   EL_SALZSAEURE,
   EL_BADEWANNE2,
-  EL_BADEWANNE,
+  EL_LEERRAUM,
 
   EL_BADEWANNE3,
   EL_BADEWANNE4,
   EL_BADEWANNE5,
-  EL_UNSICHTBAR,
+  EL_LEERRAUM,
 
   EL_TROPFEN,
-  EL_AMOEBE1,
-  EL_AMOEBE2,
-  EL_AMOEBE3,
-
-  EL_LIFE,
-  EL_LIFE_ASYNC,
-
-  EL_ERZ_1,
-  EL_ERZ_2,
-
-/*
-  EL_BIRNE_AUS,
-  EL_BIRNE_EIN,
-*/
+  EL_AMOEBE_TOT,
+  EL_AMOEBE_NASS,
+  EL_AMOEBE_NORM,
 
   EL_SCHLUESSEL1,
   EL_SCHLUESSEL2,
@@ -100,20 +311,92 @@ static int editor_element[] =
   EL_PFORTE3X,
   EL_PFORTE4X,
 
-  EL_KAEFER_R,
-  EL_KAEFER_O,
-  EL_KAEFER_L,
-  EL_KAEFER_U,
+  EL_CHAR_A + ('M' - 'A'),
+  EL_CHAR_A + ('O' - 'A'),
+  EL_CHAR_A + ('R' - 'A'),
+  EL_CHAR_A + ('E' - 'A'),
 
-  EL_FLIEGER_R,
-  EL_FLIEGER_O,
-  EL_FLIEGER_L,
-  EL_FLIEGER_U,
+  EL_PFEIL_L,
+  EL_PFEIL_R,
+  EL_PFEIL_O,
+  EL_PFEIL_U,
 
-  EL_PACMAN_R,
+  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_CHAR_A + ('S' - 'A'),
+  EL_CHAR_A + ('O' - 'A'),
+  EL_CHAR_A + ('K' - 'A'),
+  EL_CHAR_A + ('O' - 'A'),
+
+  EL_CHAR_MINUS,
+  EL_CHAR_A + ('B' - 'A'),
+  EL_CHAR_A + ('A' - 'A'),
+  EL_CHAR_A + ('N' - 'A'),
+
+  EL_SOKOBAN_OBJEKT,
+  EL_SOKOBAN_FELD_LEER,
+  EL_SOKOBAN_FELD_VOLL,
+  EL_BETON,
+
+/*
+  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,
@@ -189,19 +472,343 @@ static int editor_element[] =
   EL_CHAR_UE,
   EL_CHAR_COPY
 };
-static int elements_in_list = sizeof(editor_element)/sizeof(int);
+int elements_in_list = sizeof(editor_element)/sizeof(int);
+
+static void ScrollMiniLevel(int from_x, int from_y, int scroll)
+{
+  int x,y;
+  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+MINI_TILEX*(dx==-1),SY+MINI_TILEY*(dy==-1),
+	    SXSIZE-MINI_TILEX*ABS(dx),SYSIZE-MINI_TILEY*ABS(dy),
+	    SX+MINI_TILEX*(dx==+1),SY+MINI_TILEY*(dy==+1));
+  if (dx)
+  {
+    x = (dx==1 ? 0 : 2*SCR_FIELDX-1);
+    for(y=0;y<2*SCR_FIELDY;y++)
+      DrawMiniElementOrWall(x,y,from_x,from_y);
+  }
+  else if (dy)
+  {
+    y = (dy==1 ? 0 : 2*SCR_FIELDY-1);
+    for(x=0;x<2*SCR_FIELDX;x++)
+      DrawMiniElementOrWall(x,y,from_x,from_y);
+  }
+
+  redraw_mask |= REDRAW_FIELD;
+  BackToFront();
+}
+
+void InitLevelEditorGadgets()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    level_editor_gadget[i] = NULL;
+}
+
+static void CreateControlButtons()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
+  {
+    Pixmap gd_pixmap = pix[PIX_DOOR];
+    struct GadgetInfo *gi;
+    int gd_xoffset, gd_yoffset;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+    int width, height;
+    int button_type;
+    int radio_button_nr;
+    boolean radio_button_pressed;
+    unsigned long event_mask;
+    int id = i;
+
+    if (id == ED_CTRL_ID_SINGLE_ITEMS ||
+	id == ED_CTRL_ID_CONNECTED_ITEMS ||
+	id == ED_CTRL_ID_LINE ||
+	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_BRUSH)
+    {
+      button_type = GD_TYPE_RADIO_BUTTON;
+      radio_button_nr = 1;
+      radio_button_pressed = (id == drawing_function ? TRUE : FALSE);
+      event_mask = GD_EVENT_PRESSED;
+    }
+    else
+    {
+      button_type = GD_TYPE_NORMAL_BUTTON;
+      radio_button_nr = 0;
+      radio_button_pressed = 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)
+	event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+      else
+	event_mask = GD_EVENT_RELEASED;
+    }
+
+    if (id < ED_NUM_CTRL1_BUTTONS)
+    {
+      int x = i % ED_CTRL1_BUTTONS_HORIZ;
+      int y = i / ED_CTRL1_BUTTONS_HORIZ;
+
+      gd_xoffset = ED_CTRL1_BUTTONS_XPOS + x * ED_CTRL1_BUTTON_XSIZE;
+      gd_yoffset = ED_CTRL1_BUTTONS_YPOS + y * ED_CTRL1_BUTTON_YSIZE;
+      width = ED_CTRL1_BUTTON_XSIZE;
+      height = ED_CTRL1_BUTTON_YSIZE;
+    }
+    else
+    {
+      int x = (i - ED_NUM_CTRL1_BUTTONS) % ED_CTRL2_BUTTONS_HORIZ;
+      int y = (i - ED_NUM_CTRL1_BUTTONS) / ED_CTRL2_BUTTONS_HORIZ;
+
+      gd_xoffset = ED_CTRL2_BUTTONS_XPOS + x * ED_CTRL2_BUTTON_XSIZE;
+      gd_yoffset = ED_CTRL2_BUTTONS_YPOS + y * ED_CTRL2_BUTTON_YSIZE;
+      width = ED_CTRL2_BUTTON_XSIZE;
+      height = ED_CTRL2_BUTTON_YSIZE;
+    }
+
+    gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset;
+    gd_x2 = DOOR_GFX_PAGEX7 + gd_xoffset;
+    gd_y1  = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset;
+    gd_y2  = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, EX + gd_xoffset,
+		      GDI_Y, EY + gd_yoffset,
+		      GDI_WIDTH, width,
+		      GDI_HEIGHT, height,
+		      GDI_TYPE, button_type,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_RADIO_NR, radio_button_nr,
+		      GDI_RADIO_PRESSED, radio_button_pressed,
+		      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_EVENT_MASK, event_mask,
+		      GDI_CALLBACK, HandleControlButtons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+}
+
+static void CreateCounterButtons()
+{
+  int i, j;
+
+  for (i=0; i<ED_NUM_COUNTERS; i++)
+  {
+    for (j=0; j<2; j++)
+    {
+      Pixmap gd_pixmap = pix[PIX_DOOR];
+      struct GadgetInfo *gi;
+      int gd_xoffset;
+      int gd_x1, gd_x2, gd_y;
+      int id = counter_info[i].gadget_id + j;
+      unsigned long event_mask;
+
+      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;
+
+      gi = CreateGadget(GDI_CUSTOM_ID, id,
+			GDI_X, SX + counter_info[i].x + gd_xoffset,
+			GDI_Y, SY + counter_info[i].y,
+			GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
+			GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
+			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_EVENT_MASK, event_mask,
+			GDI_CALLBACK, HandleCounterButtons,
+			GDI_END);
+
+      if (gi == NULL)
+	Error(ERR_EXIT, "cannot create gadget");
+
+      level_editor_gadget[id] = gi;
+    }
+  }
+}
+
+static void CreateDrawingAreas()
+{
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int id;
+  int i;
+
+  event_mask =
+    GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
+    GD_EVENT_OFF_BORDERS;
+
+  /* one for the level drawing area ... */
+  id = ED_CTRL_ID_DRAWING_LEVEL;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+		    GDI_X, SX,
+		    GDI_Y, SY,
+		    GDI_WIDTH, SXSIZE,
+		    GDI_HEIGHT, SYSIZE,
+		    GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		    GDI_EVENT_MASK, event_mask,
+		    GDI_CALLBACK, HandleDrawingAreas,
+		    GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[id] = gi;
+
+  /* ... up to eight areas for element content ... */
+  for (i=0; i<MAX_ELEMCONT; i++)
+  {
+    int gx = SX + ED_AREA_ELEMCONT_XPOS + 5 * (i % 4) * MINI_TILEX;
+    int gy = SX + ED_AREA_ELEMCONT_YPOS + 6 * (i / 4) * MINI_TILEY;
+
+    id = ED_CTRL_ID_ELEMCONT_0 + i;
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, gx,
+		      GDI_Y, gy,
+		      GDI_WIDTH, 3 * MINI_TILEX,
+		      GDI_HEIGHT, 3 * MINI_TILEY,
+		      GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		      GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK, HandleDrawingAreas,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+
+  /* ... and one for the amoeba content */
+  id = ED_CTRL_ID_AMOEBA_CONTENT;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+		    GDI_X, SX + ED_AREA_ELEMCONT_XPOS,
+		    GDI_Y, SY + ED_AREA_ELEMCONT_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, HandleDrawingAreas,
+		    GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[id] = gi;
+}
+
+static void CreateLevelEditorGadgets()
+{
+  if (level_editor_gadgets_created)
+    return;
+
+  CreateControlButtons();
+  CreateCounterButtons();
+  CreateDrawingAreas();
+
+  level_editor_gadgets_created = TRUE;
+}
+
+static void MapControlButtons()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
+    MapGadget(level_editor_gadget[i]);
+}
+
+static void MapCounterButtons(int id)
+{
+  int i;
+
+  for (i=0; i<2; i++)
+    MapGadget(level_editor_gadget[counter_info[id].gadget_id + i]);
+}
+
+static void MapDrawingArea(int id)
+{
+  MapGadget(level_editor_gadget[id]);
+}
+
+static void MapMainDrawingArea()
+{
+  MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+}
+
+static void UnmapDrawingArea(int id)
+{
+  UnmapGadget(level_editor_gadget[id]);
+}
+
+void UnmapLevelEditorWindowGadgets()
+{
+  int i;
+
+  for (i=ED_NUM_CTRL_BUTTONS; i<ED_NUM_GADGETS; i++)
+    UnmapGadget(level_editor_gadget[i]);
+}
+
+void UnmapLevelEditorGadgets()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    UnmapGadget(level_editor_gadget[i]);
+}
 
 void DrawLevelEd()
 {
-  int i, graphic;
+  int i, x, y, graphic;
 
   level_xpos=-1;
   level_ypos=-1;
-  edit_mode = TRUE;
+  edit_mode = ED_MODE_DRAWING;
   name_typing = FALSE;
   element_shift = 0;
 
-  CloseDoor(DOOR_CLOSE_2);
+  CloseDoor(DOOR_CLOSE_ALL);
+
+  if (level_editor_test_game)
+  {
+    for(x=0; x<lev_fieldx; x++)
+      for(y=0; y<lev_fieldy; y++)
+	Feld[x][y] = Ur[x][y];
+
+    for(x=0; x<lev_fieldx; x++)
+      for(y=0; y<lev_fieldy; y++)
+	Ur[x][y] = OrigBackup[x][y];
+
+    level_editor_test_game = FALSE;
+  }
+  else
+  {
+    undo_buffer_position = -1;
+    undo_buffer_steps = -1;
+    CopyLevelToUndoBuffer();
+  }
 
   DrawMiniLevel(level_xpos,level_ypos);
   FadeToFront();
@@ -224,26 +831,26 @@ void DrawLevelEd()
     else
       graphic = GFX_LEERRAUM;
 
-    DrawMiniGraphicExtHiRes(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);
+    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);
   }
 
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
-			  el2gfx(new_element1));
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
-			  el2gfx(new_element2));
-  DrawMiniGraphicExtHiRes(pix[PIX_DB_DOOR],gc,
-			  DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
-			  DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
-			  el2gfx(new_element3));
+  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,
@@ -266,7 +873,31 @@ void DrawLevelEd()
 	    VXSIZE,VYSIZE,
 	    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
 
+  /* draw bigger door */
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX7, 0,
+	    108, 64,
+	    EX - 4, EY - 12);
+
+  /* draw new control window */
+  XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+	    DOOR_GFX_PAGEX8, 236,
+	    EXSIZE, EYSIZE,
+	    EX, EY);
+
+  redraw_mask |= REDRAW_ALL;
+
+  OpenDoor(DOOR_OPEN_1);
+
+  if (!level_editor_gadgets_created)
+    CreateLevelEditorGadgets();
+
+  MapControlButtons();
+  MapMainDrawingArea();
+
+  /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
+  */
 }
 
 void DrawControlWindow()
@@ -274,21 +905,23 @@ void DrawControlWindow()
   int i,x,y;
 
   ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
+  /* 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++)
   {
     DrawMiniElement(1+5*i+x,2+y,EL_ERDREICH);
     XFillRectangle(display,drawto,gc,
-		   SX+(2+5*i)*MINI_TILEX-MINI_TILEX/2-1,
-		   SY+(3)*MINI_TILEY-MINI_TILEY/2-1,
+		   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);
   }
   XCopyArea(display,drawto,drawto,gc,
-	    SX+MINI_TILEX,SY+2*MINI_TILEY,
+	    SX+1*MINI_TILEX,SY+2*MINI_TILEY,
 	    4*5*MINI_TILEX,5*MINI_TILEY,
-	    SX+MINI_TILEX-MINI_TILEX/2,SY+2*MINI_TILEY-MINI_TILEY/2);
+	    SX+1*MINI_TILEX-MINI_TILEX/2,SY+2*MINI_TILEY-MINI_TILEY/2);
   for(i=0;i<4;i++)
   {
     for(y=0;y<3;y++) for(x=0;x<3;x++)
@@ -299,6 +932,21 @@ void DrawControlWindow()
 	     int2str(i+1,1),FS_SMALL,FC_YELLOW);
   }
 
+  /* 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);
+
   for(i=0;i<11+3+2;i++)
   {
     XCopyArea(display,pix[PIX_DOOR],drawto,gc,
@@ -357,7 +1005,7 @@ void DrawControlWindow()
   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",FS_SMALL,FC_YELLOW);
+	   "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,
@@ -411,90 +1059,46 @@ void DrawControlWindow()
 	   int2str(level.fieldy,3),FS_SMALL,FC_YELLOW);
 }
 
-void ScrollMiniLevel(int from_x, int from_y, int scroll)
-{
-  int x,y;
-  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+MINI_TILEX*(dx==-1),SY+MINI_TILEY*(dy==-1),
-	    SXSIZE-MINI_TILEX*ABS(dx),SYSIZE-MINI_TILEY*ABS(dy),
-	    SX+MINI_TILEX*(dx==+1),SY+MINI_TILEY*(dy==+1));
-  if (dx)
-  {
-    x = (dx==1 ? 0 : 2*SCR_FIELDX-1);
-    for(y=0;y<2*SCR_FIELDY;y++)
-      DrawMiniElementOrWall(x,y,from_x,from_y);
-  }
-  else if (dy)
-  {
-    y = (dy==1 ? 0 : 2*SCR_FIELDY-1);
-    for(x=0;x<2*SCR_FIELDX;x++)
-      DrawMiniElementOrWall(x,y,from_x,from_y);
-  }
-
-  redraw_mask |= REDRAW_FIELD;
-  BackToFront();
-}
-
 void AdjustLevelScrollPosition()
 {
-  if (level_xpos<-1)
+  if (level_xpos < -1)
     level_xpos = -1;
-  if (level_xpos>lev_fieldx-2*SCR_FIELDX+1)
-    level_xpos = lev_fieldx-2*SCR_FIELDX+1;
-  if (lev_fieldx<2*SCR_FIELDX-2)
+  if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
+    level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+  if (lev_fieldx < 2*SCR_FIELDX - 2)
     level_xpos = -1;
 
-  if (level_ypos<-1)
+  if (level_ypos < -1)
     level_ypos = -1;
-  if (level_ypos>lev_fieldy-2*SCR_FIELDY+1)
-    level_ypos = lev_fieldy-2*SCR_FIELDY+1;
-  if (lev_fieldy<2*SCR_FIELDY-2)
+  if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
+    level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+  if (lev_fieldy < 2*SCR_FIELDY - 2)
     level_ypos = -1;
 }
 
-void FloodFill(int from_x, int from_y, int fill_element)
+void LevelEd(int mx, int my, int button)
 {
-  int i,x,y;
-  int old_element;
-  static int check[4][2] = { -1,0, 0,-1, 1,0, 0,1 };
-  static int safety = 0;
+  static int last_button = 0;
+  static int in_field_pressed = FALSE;
+  static boolean use_floodfill = FALSE;
 
-  safety++;
 
-  if (safety>lev_fieldx*lev_fieldy)
-  {
-    fprintf(stderr,"Something went wrong in 'FloodFill()'. Please debug.\n");
-    exit(-1);
-  }
+  /*
+  int x = (mx-SX)/MINI_TILEX; 
+  int y = (my-SY)/MINI_TILEY; 
+  */
 
-  old_element = Feld[from_x][from_y];
-  Feld[from_x][from_y] = fill_element;
+  /*
+  HandlePressedControlButtons();
+  HandleDrawingFunctions(mx, my, button);
+  */
 
-  for(i=0;i<4;i++)
+  if (use_floodfill)		/********** FLOOD FILL **********/
   {
-    x = from_x+check[i][0];
-    y = from_y+check[i][1];
 
-    if (IN_LEV_FIELD(x,y) && Feld[x][y]==old_element)
-      FloodFill(x,y,fill_element);
-  }
 
-  safety--;
-}
+#if 0
 
-void LevelEd(int mx, int my, int button)
-{
-  static int last_button = 0;
-  static int in_field_pressed = FALSE;
-  static BOOL use_floodfill = FALSE;
-  int x = (mx-SX)/MINI_TILEX; 
-  int y = (my-SY)/MINI_TILEY; 
-
-  if (use_floodfill)		/********** FLOOD FILL **********/
-  {
     if (button)
     {
       if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
@@ -524,74 +1128,90 @@ void LevelEd(int mx, int my, int button)
       OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
     }
     return;
+
+#endif
+
+
+
   }
   else				/********** EDIT/CTRL-FENSTER **********/
   {
+    static unsigned long choice_delay = 0;
     int choice = CheckElemButtons(mx,my,button);
     int elem_pos = choice-ED_BUTTON_ELEM;
 
-    switch(choice)
+    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))
     {
-      case ED_BUTTON_EUP:
-      case ED_BUTTON_EDOWN:
-        if ((choice==ED_BUTTON_EUP && element_shift>0) ||
-	    (choice==ED_BUTTON_EDOWN &&
-	     element_shift<elements_in_list-MAX_ELEM_X*MAX_ELEM_Y))
-	{
-	  int i, step;
-
-	  step = (button==1 ? MAX_ELEM_X : button==2 ? 5*MAX_ELEM_X :
-		  elements_in_list);
-	  element_shift += (choice==ED_BUTTON_EUP ? -step : 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);
-
-	  for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
-	    DrawElemButton(i+2,ED_BUTTON_RELEASED);
-	  BackToFront();
-	  Delay(100000);
-	}
-	break;
-      default:
-	if (elem_pos>=0 && elem_pos<MAX_ELEM_X*MAX_ELEM_Y)
-	{
-	  int new_element;
+      int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+      int i;
+
+#if 0
+      step = (button==1 ? MAX_ELEM_X : button==2 ? 5*MAX_ELEM_X :
+	      elements_in_list);
+      element_shift += (choice==ED_BUTTON_EUP ? -step : step);
+#else
+      step = step * MAX_ELEM_X * (choice == ED_BUTTON_EUP ? -1 : +1);
+      element_shift += step;
+#endif
 
-	  if (elem_pos+element_shift < elements_in_list)
-	    new_element = editor_element[elem_pos+element_shift];
-	  else
-	    new_element = EL_LEERRAUM;
-
-	  if (last_button==1)
-	    new_element1 = new_element;
-	  else if (last_button==2)
-	    new_element2 = new_element;
-	  else if (last_button==3)
-	    new_element3 = new_element;
-
-	  DrawMiniGraphicExtHiRes(drawto,gc,
-				  DX+ED_WIN_MB_LEFT_XPOS,
-				  DY+ED_WIN_MB_LEFT_YPOS,
-				  el2gfx(new_element1));
-	  DrawMiniGraphicExtHiRes(drawto,gc,
-				  DX+ED_WIN_MB_MIDDLE_XPOS,
-				  DY+ED_WIN_MB_MIDDLE_YPOS,
-				  el2gfx(new_element2));
-	  DrawMiniGraphicExtHiRes(drawto,gc,
-				  DX+ED_WIN_MB_RIGHT_XPOS,
-				  DY+ED_WIN_MB_RIGHT_YPOS,
-				  el2gfx(new_element3));
-	  redraw_mask |= REDRAW_DOOR_1;
-	}
-	break;
+      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);
+
+      for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
+	DrawElemButton(i+2,ED_BUTTON_RELEASED);
     }
+    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;
+
+      if (last_button==1)
+	new_element1 = new_element;
+      else if (last_button==2)
+	new_element2 = new_element;
+      else if (last_button==3)
+	new_element3 = new_element;
+
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_LEFT_XPOS,
+			 DY+ED_WIN_MB_LEFT_YPOS,
+			 el2gfx(new_element1));
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_MIDDLE_XPOS,
+			 DY+ED_WIN_MB_MIDDLE_YPOS,
+			 el2gfx(new_element2));
+      DrawMiniGraphicExt(drawto,gc,
+			 DX+ED_WIN_MB_RIGHT_XPOS,
+			 DY+ED_WIN_MB_RIGHT_YPOS,
+			 el2gfx(new_element3));
+      redraw_mask |= REDRAW_DOOR_1;
+
+      /*
+      properties_element = new_element;
+      if (edit_mode == ED_MODE_PROPERTIES)
+	DrawPropertiesWindow();
+      */
 
-    if (edit_mode)		/********** EDIT-FENSTER **********/
+    }
+  
+    if (edit_mode == ED_MODE_DRAWING)	/********** EDIT-FENSTER **********/
     {
+
+
+
+#if 0
+
       switch(CheckEditButtons(mx,my,button))
       {
 	case ED_BUTTON_CTRL:
@@ -602,16 +1222,18 @@ void LevelEd(int mx, int my, int button)
 		    VXSIZE,VYSIZE,
 		    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
 	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = FALSE;
+	  edit_mode = ED_MODE_INFO;
 	  break;
 	case ED_BUTTON_FILL:
-	  AreYouSure("Caution ! Flood fill mode ! Choose area !",AYS_OPEN);
+	  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<2*SCR_FIELDX-2)
 	      break;
 
@@ -622,13 +1244,13 @@ void LevelEd(int mx, int my, int button)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_RIGHT);
 	    else
 	      DrawMiniLevel(level_xpos,level_ypos);
-	    BackToFront();
-	    Delay(100000);
 	  }
 	  break;
 	case ED_BUTTON_RIGHT:
 	  if (level_xpos<=lev_fieldx-2*SCR_FIELDX)
 	  {
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
+	      break;
 	    if (lev_fieldx<2*SCR_FIELDX-2)
 	      break;
 
@@ -639,13 +1261,13 @@ void LevelEd(int mx, int my, int button)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_LEFT);
 	    else
 	      DrawMiniLevel(level_xpos,level_ypos);
-	    BackToFront();
-	    Delay(100000);
 	  }
 	  break;
 	case ED_BUTTON_UP:
 	  if (level_ypos>=0)
 	  {
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
+	      break;
 	    if (lev_fieldy<2*SCR_FIELDY-2)
 	      break;
 
@@ -656,13 +1278,13 @@ void LevelEd(int mx, int my, int button)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_DOWN);
 	    else
 	      DrawMiniLevel(level_xpos,level_ypos);
-	    BackToFront();
-	    Delay(100000);
 	  }
 	  break;
 	case ED_BUTTON_DOWN:
 	  if (level_ypos<=lev_fieldy-2*SCR_FIELDY)
 	  {
+	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
+	      break;
 	    if (lev_fieldy<2*SCR_FIELDY-2)
 	      break;
 
@@ -673,14 +1295,18 @@ void LevelEd(int mx, int my, int button)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_UP);
 	    else
 	      DrawMiniLevel(level_xpos,level_ypos);
-	    BackToFront();
-	    Delay(100000);
 	  }
 	  break;
 	default:
 	  break;
       }
 
+#endif
+
+
+
+#if 0
+
       if (mx>=SX && mx<SX+SXSIZE && my>=SY && my<SY+SYSIZE)
       {
 	int new_element;
@@ -724,14 +1350,19 @@ void LevelEd(int mx, int my, int button)
       }
       else if (!motion_status)	/* Mauszeiger nicht im Level-Feld */
 	in_field_pressed = FALSE;
+
+#endif
+
+
+
     }
-    else			/********** KONTROLL-FENSTER **********/
+    else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/
     {
-      static long choice_delay = 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,10))
+      if (choice >= 0 && choice < 36 &&
+	  DelayReached(&choice_delay, GADGET_FRAME_DELAY))
       {
 	if (!(choice % 2))
 	  step = -step;
@@ -856,6 +1487,10 @@ void LevelEd(int mx, int my, int button)
 	XFlush(display);
       }
 
+
+
+#if 0
+
       switch(CheckCtrlButtons(mx,my,button))
       {
 	case ED_BUTTON_EDIT:
@@ -867,10 +1502,10 @@ void LevelEd(int mx, int my, int button)
 		    VXSIZE,VYSIZE,
 		    DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
 	  OpenDoor(DOOR_OPEN_2);
-	  edit_mode = TRUE;
+	  edit_mode = ED_MODE_DRAWING;
 	  break;
 	case ED_BUTTON_CLEAR:
-	  if (AreYouSure("Are you sure to clear this level ?",AYS_ASK))
+	  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++) 
@@ -879,9 +1514,10 @@ void LevelEd(int mx, int my, int button)
 	  }
 	  break;
 	case ED_BUTTON_UNDO:
-	  if (AreYouSure("Exit without saving ?",AYS_ASK | AYS_STAY_OPEN))
+	  if (leveldir[leveldir_nr].readonly ||
+	      Request("Exit without saving ?",REQ_ASK | REQ_STAY_OPEN))
 	  {
-	    CloseDoor(DOOR_CLOSE_BOTH);
+	    CloseDoor(DOOR_CLOSE_ALL);
 	    game_status=MAINMENU;
 	    DrawMainMenu();
 	  }
@@ -894,25 +1530,32 @@ void LevelEd(int mx, int my, int button)
 	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) 
 		  figur_vorhanden = TRUE;
 
 	    if (!figur_vorhanden)
-	      AreYouSure("No Level without Gregor Mc Duffin please !",
-			 AYS_CONFIRM);
+	      Request("No Level without Gregor Mc Duffin please !",
+			 REQ_CONFIRM);
 	    else
 	    {
-	      if (AreYouSure("Save this level and kill the old ?",
-			     AYS_ASK | AYS_STAY_OPEN))
+	      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_BOTH);
+	      CloseDoor(DOOR_CLOSE_ALL);
 	      game_status=MAINMENU;
 	      DrawMainMenu();
 	    }
@@ -922,6 +1565,10 @@ void LevelEd(int mx, int my, int button)
 	  break;
       }
 
+#endif
+
+
+
       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 &&
@@ -952,6 +1599,25 @@ void LevelEd(int mx, int my, int button)
 	}
       }
 
+      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)
       {
@@ -976,7 +1642,7 @@ void LevelEd(int mx, int my, int button)
 	  if (new_element != level.mampfer_inhalt[i][x][y])
 	  {
 	    level.mampfer_inhalt[i][x][y] = new_element;
-	    DrawMiniElement(1+5*i+x,2+y,level.mampfer_inhalt[i][x][y]);
+	    DrawMiniElement(1+5*i+x,2+y,new_element);
 	  }
 	}
 	else if (!motion_status)/* Mauszeiger nicht im Cruncher-Feld */
@@ -1048,7 +1714,7 @@ void LevelNameTyping(KeySym key)
 		ED_COUNT_TEXT_YPOS+16*ED_COUNT_TEXT_YSIZE,
 		"<",FS_SMALL,FC_RED);
   }
-  else if (key==XK_Delete && len>0)
+  else if ((key==XK_Delete || key==XK_BackSpace) && len>0)
   {
     level.name[len-1] = 0;
     len--;
@@ -1085,432 +1751,1139 @@ void LevelNameTyping(KeySym key)
   }
 }
 
-void DrawEditButton(unsigned long state)
+static void DrawCounterValueField(int counter_id, int value)
 {
-  int i;
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
-  int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY2;
-  static int edit_pos[6][4] =
-  {
-    ED_BUTTON_CTRL_XPOS,ED_BUTTON_CTRL_YPOS,
-    ED_BUTTON_CTRL_XSIZE,ED_BUTTON_CTRL_YSIZE,
+  int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS;
+  int y = SY + counter_info[counter_id].y;
 
-    ED_BUTTON_FILL_XPOS,ED_BUTTON_FILL_YPOS,
-    ED_BUTTON_FILL_XSIZE,ED_BUTTON_FILL_YSIZE,
+  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);
 
-    ED_BUTTON_LEFT_XPOS,ED_BUTTON_LEFT_YPOS,
-    ED_BUTTON_LEFT_XSIZE,ED_BUTTON_LEFT_YSIZE,
+  DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+	   int2str(value, 3), FS_SMALL, FC_YELLOW);
+}
 
-    ED_BUTTON_UP_XPOS,ED_BUTTON_UP_YPOS,
-    ED_BUTTON_UP_XSIZE,ED_BUTTON_UP_YSIZE,
+#define TEXT_COLLECTING		"Score for collecting"
+#define TEXT_SMASHING		"Score for smashing"
+#define TEXT_CRACKING		"Score for cracking"
+#define TEXT_SPEED		"Speed of growth"
+#define TEXT_DURATION		"Duration when activated"
 
-    ED_BUTTON_DOWN_XPOS,ED_BUTTON_DOWN_YPOS,
-    ED_BUTTON_DOWN_XSIZE,ED_BUTTON_DOWN_YSIZE,
+static void DrawDrawingWindow()
+{
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
+  MapMainDrawingArea();
+  AdjustLevelScrollPosition();
+  DrawMiniLevel(level_xpos, level_ypos);
+}
 
-    ED_BUTTON_RIGHT_XPOS,ED_BUTTON_RIGHT_YPOS,
-    ED_BUTTON_RIGHT_XSIZE,ED_BUTTON_RIGHT_YSIZE
-  };
+static void DrawElementContentAreas()
+{
+  static int num_areas = MAX_ELEMCONT;
+  int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX;
+  int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY;
+  int area_sx = SX + ED_AREA_ELEMCONT_XPOS;
+  int area_sy = SY + ED_AREA_ELEMCONT_YPOS;
+  int i, x, y;
+
+  for (i=0; i<MAX_ELEMCONT; i++)
+    for (y=0; y<3; y++)
+      for (x=0; x<3; x++)
+	ElementContent[i][x][y] =
+	  (i < 4 ? level.mampfer_inhalt[i][x][y] : EL_LEERRAUM);
+
+  for (i=0; i<MAX_ELEMCONT; i++)
+    UnmapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
+
+  /* display counter to choose number of element content areas */
+  gadget_areas_value = &num_areas;
+  DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+  x = counter_info[ED_COUNTER_ELEMCONT].x + DXSIZE;
+  y = counter_info[ED_COUNTER_ELEMCONT].y;
+  DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+	    FC_YELLOW, "number of content areas");
+  MapCounterButtons(ED_COUNTER_ELEMCONT);
+
+  /* delete content areas in case of reducing number of them */
+  XFillRectangle(display, backbuffer, gc,
+		 SX, area_sy - MINI_TILEX,
+		 SXSIZE, 12 * MINI_TILEY);
+
+  /* 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);
+
+    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);
+  }
 
-  if (state & ED_BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX5;
+  /* 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<6;i++)
+  for (i=0; i<num_areas; i++)
   {
-    if (state & (1<<i))
-      XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-		cx + edit_pos[i][xpos],
-		cy + edit_pos[i][ypos],
-		edit_pos[i][xsize],
-		edit_pos[i][ysize],
-		VX + edit_pos[i][xpos],
-		VY + edit_pos[i][ypos]);
+    for (y=0; y<3; y++)
+      for (x=0; x<3; x++)
+	DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
+			ElementContent[i][x][y]);
+
+    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);
   }
 
-  redraw_mask |= REDRAW_DOOR_2;
+  for (i=0; i<num_areas; i++)
+    MapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
 }
 
-void DrawCtrlButton(unsigned long state)
+static void DrawAmoebaContentArea()
 {
-  int i;
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
-  int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY1+80;
-  static int edit_pos[4][4] =
-  {
-    ED_BUTTON_EDIT_XPOS,ED_BUTTON_EDIT_YPOS,
-    ED_BUTTON_EDIT_XSIZE,ED_BUTTON_EDIT_YSIZE,
+  int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX;
+  int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY;
+  int area_sx = SX + ED_AREA_ELEMCONT_XPOS;
+  int area_sy = SY + ED_AREA_ELEMCONT_YPOS;
+  int x, y;
 
-    ED_BUTTON_CLEAR_XPOS,ED_BUTTON_CLEAR_YPOS,
-    ED_BUTTON_CLEAR_XSIZE,ED_BUTTON_CLEAR_YSIZE,
+  ElementContent[0][0][0] = level.amoebe_inhalt;
 
-    ED_BUTTON_UNDO_XPOS,ED_BUTTON_UNDO_YPOS,
-    ED_BUTTON_UNDO_XSIZE,ED_BUTTON_UNDO_YSIZE,
+  /* 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);
 
-    ED_BUTTON_EXIT_XPOS,ED_BUTTON_EXIT_YPOS,
-    ED_BUTTON_EXIT_XSIZE,ED_BUTTON_EXIT_YSIZE
-  };
+  XFillRectangle(display, drawto, gc,
+		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
+		 MINI_TILEX + 2, MINI_TILEY + 2);
 
-  if (state & ED_BUTTON_PRESSED)
-    cx = DOOR_GFX_PAGEX3;
+  /* 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);
 
-  for(i=0;i<4;i++)
-  {
-    if (state & (1<<(i+6)))
-      XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-		cx + edit_pos[i][xpos],
-		cy + edit_pos[i][ypos],
-		edit_pos[i][xsize],
-		edit_pos[i][ysize],
-		VX + edit_pos[i][xpos],
-		VY + edit_pos[i][ypos]);
-  }
+  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
-  redraw_mask |= REDRAW_DOOR_2;
+  MapDrawingArea(ED_CTRL_ID_AMOEBA_CONTENT);
 }
 
-void DrawElemButton(int button_nr, int button_state)
+static void DrawPropertiesWindow()
 {
-  int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
-  int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-  int from_x, from_y, to_x,to_y, size_x, size_y;
-  static int edit_pos[3][4] =
+  int i, x, y;
+  int num_elements_in_level;
+  static struct
   {
-    ED_BUTTON_EUP_XPOS,ED_BUTTON_EUP_YPOS,
-    ED_BUTTON_EUP_XSIZE,ED_BUTTON_EUP_YSIZE,
-
-    ED_BUTTON_EDOWN_XPOS,ED_BUTTON_EDOWN_YPOS,
-    ED_BUTTON_EDOWN_XSIZE,ED_BUTTON_EDOWN_YSIZE,
-
-    ED_BUTTON_ELEM_XPOS,ED_BUTTON_ELEM_YPOS,
-    ED_BUTTON_ELEM_XSIZE,ED_BUTTON_ELEM_YSIZE
+    int element;
+    int *counter_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_LEER,	&level.dauer_sieb,	TEXT_DURATION },
+    { EL_ABLENK_AUS,	&level.dauer_ablenk,	TEXT_DURATION },
+    { -1, NULL, NULL }
   };
 
-  if (button_nr<ED_BUTTON_ELEM)
+  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);
+
+  XFillRectangle(display, drawto, gc,
+		 SX + TILEX + MINI_TILEX/2 - 1,
+		 SY + TILEY + MINI_TILEY/2 - 1,
+		 TILEX + 2, TILEY + 2);
+
+  /* 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);
+
+  DrawGraphic(1, 1, el2gfx(properties_element));
+  DrawText(SX + 3*TILEX, SY + 5*TILEY/4, "Element Properties",
+	   FS_SMALL, FC_YELLOW);
+
+  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++;
+
+  DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
+	    num_elements_in_level);
+
+  /* check if there are elements where a score can be chosen for */
+  for (i=0; elements_with_counter[i].element != -1; i++)
   {
-    int pos = button_nr;
-
-    from_x = cx + edit_pos[pos][xpos];
-    from_y = cy + edit_pos[pos][ypos];
-    size_x = edit_pos[pos][xsize];
-    size_y = edit_pos[pos][ysize];
-    to_x   = DX + edit_pos[pos][xpos];
-    to_y   = DY + edit_pos[pos][ypos];
-
-    if (button_state & ED_BUTTON_PRESSED)
+    if (elements_with_counter[i].element == properties_element)
     {
-      if (button_nr==ED_BUTTON_EUP)
-	from_y = cy + ED_BUTTON_EUP_Y2POS;
-      else
-	from_y = cy + ED_BUTTON_EDOWN_Y2POS;
+      int x = counter_info[ED_COUNTER_SCORE].x + DXSIZE;
+      int y = counter_info[ED_COUNTER_SCORE].y;
+
+      gadget_score_value = elements_with_counter[i].counter_value;
+      DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+      DrawTextF(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+		FC_YELLOW, elements_with_counter[i].text);
+      MapCounterButtons(ED_COUNTER_SCORE);
+      break;
     }
-
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	      from_x,from_y, size_x,size_y, to_x,to_y);
   }
-  else
-  {
-    int pos = ED_BUTTON_ELEM;
-    int elem_pos = button_nr-ED_BUTTON_ELEM;
-    int x = elem_pos % MAX_ELEM_X;
-    int y = elem_pos / MAX_ELEM_X;
-    int graphic;
-    int shift = 0;
-
-    if (elem_pos+element_shift < elements_in_list)
-      graphic = el2gfx(editor_element[elem_pos+element_shift]);
-    else
-      graphic = GFX_LEERRAUM;
 
-    from_x = cx + edit_pos[pos][xpos];
-    from_y = cy + edit_pos[pos][ypos];
-    size_x = edit_pos[pos][xsize];
-    size_y = edit_pos[pos][ysize];
-    to_x   = DX + edit_pos[pos][xpos] + x * ED_BUTTON_ELEM_XSIZE;
-    to_y   = DY + edit_pos[pos][ypos] + y * ED_BUTTON_ELEM_YSIZE;
+  if (properties_element == EL_MAMPFER)
+    DrawElementContentAreas();
+  else if (IS_AMOEBOID(properties_element))
+    DrawAmoebaContentArea();
+}
 
-    if (button_state & ED_BUTTON_PRESSED)
-    {
-      from_y = ED_BUTTON_ELEM_Y2POS;
-      shift = 1;
-    }
+static void swap_numbers(int *i1, int *i2)
+{
+  int help = *i1;
 
-    XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	      from_x,from_y, size_x,size_y, to_x,to_y);
-
-    DrawMiniGraphicExtHiRes(drawto,gc,
-			    DX+ED_BUTTON_ELEM_XPOS+3+shift + 
-			    (elem_pos % MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
-			    DY+ED_BUTTON_ELEM_YPOS+3-shift +
-			    (elem_pos / MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
-			    graphic);
-  }
+  *i1 = *i2;
+  *i2 = help;
+}
+
+static void swap_number_pairs(int *x1, int *y1, int *x2, int *y2)
+{
+  int help_x = *x1;
+  int help_y = *y1;
 
-  redraw_mask |= REDRAW_DOOR_1;
+  *x1 = *x2;
+  *x2 = help_x;
+
+  *y1 = *y2;
+  *y2 = help_y;
 }
 
-void DrawCountButton(int button_nr, int button_state)
+static void DrawLineElement(int sx, int sy, int element, boolean change_level)
 {
-  int from_x, from_y, to_x,to_y, size_x, size_y;
-
-  from_x =
-    DOOR_GFX_PAGEX4+(button_nr%2 ? ED_BUTTON_PLUS_XPOS : ED_BUTTON_MINUS_XPOS);
-  from_y = DOOR_GFX_PAGEY1 + ED_BUTTON_MINUS_YPOS;
-  size_x = ED_BUTTON_MINUS_XSIZE;
-  size_y = ED_BUTTON_MINUS_YSIZE;
-  to_x = (button_nr<32 ? ED_COUNT_GADGET_XPOS : ED_SIZE_GADGET_XPOS);
-  if (button_nr % 2)
-    to_x += (ED_BUTTON_PLUS_XPOS - ED_BUTTON_MINUS_XPOS);
-  to_y = (button_nr<32 ? ED_COUNT_GADGET_YPOS : ED_SIZE_GADGET_YPOS) +
-    ((button_nr<32 ? button_nr : button_nr-32)/2)*ED_COUNT_GADGET_YSIZE;
-
-  if (button_state & ED_BUTTON_PRESSED)
-    from_x -= DXSIZE;
+  int lx = sx + level_xpos;
+  int ly = sy + level_ypos;
 
-  XCopyArea(display,pix[PIX_DOOR],drawto,gc,
-	    from_x,from_y, size_x,size_y, to_x,to_y);
-  XCopyArea(display,pix[PIX_DOOR],window,gc,
-	    from_x,from_y, size_x,size_y, to_x,to_y);
+  DrawMiniElement(sx, sy, (element < 0 ? Feld[lx][ly] : element));
+
+  if (change_level)
+    Feld[lx][ly] = element;
 }
 
-int CheckEditButtons(int mx, int my, int button)
+static void DrawLine(int from_x, int from_y, int to_x, int to_y,
+		     int element, boolean change_level)
 {
-  int return_code = 0;
-  static int choice = -1;
-  static BOOL pressed = FALSE;
-  static int edit_button[6] =
+  if (from_y == to_y)			/* horizontal line */
   {
-    ED_BUTTON_CTRL,
-    ED_BUTTON_FILL,
-    ED_BUTTON_LEFT,
-    ED_BUTTON_UP,
-    ED_BUTTON_DOWN,
-    ED_BUTTON_RIGHT
-  };
+    int x;
+    int y = from_y;
+
+    if (from_x > to_x)
+      swap_numbers(&from_x, &to_x);
 
-  if (button)
+    for (x=from_x; x<=to_x; x++)
+      DrawLineElement(x, y, element, change_level);
+  }
+  else if (from_x == to_x)		/* vertical line */
   {
-    if (!motion_status)		/* Maustaste neu gedrückt */
+    int x = from_x;
+    int y;
+
+    if (from_y > to_y)
+      swap_numbers(&from_y, &to_y);
+
+    for (y=from_y; y<=to_y; y++)
+      DrawLineElement(x, y, element, change_level);
+  }
+  else					/* diagonal line */
+  {
+    int len_x = ABS(to_x - from_x);
+    int len_y = ABS(to_y - from_y);
+    int x, y;
+
+    if (len_y < len_x)			/* a < 1 */
     {
-      if (ON_EDIT_BUTTON(mx,my))
+      float a = (float)len_y / (float)len_x;
+
+      if (from_x > to_x)
+	swap_number_pairs(&from_x, &from_y, &to_x, &to_y);
+
+      for (x=0; x<=len_x; x++)
       {
-	choice = EDIT_BUTTON(mx,my);
-	pressed = TRUE;
-	DrawEditButton(edit_button[choice] | ED_BUTTON_PRESSED);
-	if (edit_button[choice]!=ED_BUTTON_CTRL &&
-	    edit_button[choice]!=ED_BUTTON_FILL)
-	  return_code = 1<<choice;
+	int y = (int)(a * x + 0.5) * (to_y < from_y ? -1 : +1);
+
+	DrawLineElement(from_x + x, from_y + y, element, change_level);
       }
     }
-    else			/* Mausbewegung bei gedrückter Maustaste */
+    else				/* a >= 1 */
     {
-      if ((!ON_EDIT_BUTTON(mx,my) || EDIT_BUTTON(mx,my)!=choice) &&
-	  choice>=0 && pressed)
-      {
-	pressed = FALSE;
-	DrawEditButton(edit_button[choice] | ED_BUTTON_RELEASED);
-      }
-      else if (ON_EDIT_BUTTON(mx,my) && EDIT_BUTTON(mx,my)==choice)
+      float a = (float)len_x / (float)len_y;
+
+      if (from_y > to_y)
+	swap_number_pairs(&from_x, &from_y, &to_x, &to_y);
+
+      for (y=0; y<=len_y; y++)
       {
-	if (!pressed)
-	  DrawEditButton(edit_button[choice] | ED_BUTTON_PRESSED);
-	pressed = TRUE;
-	if (edit_button[choice]!=ED_BUTTON_CTRL &&
-	    edit_button[choice]!=ED_BUTTON_FILL)
-	  return_code = 1<<choice;
+	int x = (int)(a * y + 0.5) * (to_x < from_x ? -1 : +1);
+
+	DrawLineElement(from_x + x, from_y + y, element, change_level);
       }
     }
   }
-  else				/* Maustaste wieder losgelassen */
+}
+
+static void DrawRectangle(int from_x, int from_y, int to_x, int to_y,
+			  int element, boolean change_level)
+{
+  DrawLine(from_x, from_y, from_x, to_y, element, change_level);
+  DrawLine(from_x, to_y, to_x, to_y, element, change_level);
+  DrawLine(to_x, to_y, to_x, from_y, element, change_level);
+  DrawLine(to_x, from_y, from_x, from_y, element, change_level);
+}
+
+static void DrawFilledBox(int from_x, int from_y, int to_x, int to_y,
+			  int element, boolean change_level)
+{
+  int y;
+
+  if (from_y > to_y)
+    swap_number_pairs(&from_x, &from_y, &to_x, &to_y);
+
+  for (y=from_y; y<=to_y; y++)
+    DrawLine(from_x, y, to_x, y, element, change_level);
+}
+
+static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
+{
+  int from_sx, from_sy;
+  int to_sx, to_sy;
+
+  if (from_x > to_x)
+    swap_numbers(&from_x, &to_x);
+
+  if (from_y > to_y)
+    swap_numbers(&from_y, &to_y);
+
+  from_sx = SX + from_x * MINI_TILEX;
+  from_sy = SY + from_y * MINI_TILEY;
+  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));
+
+  if (from_x == to_x && from_y == to_y)
+    MarkTileDirty(from_x/2, from_y/2);
+  else
+    redraw_mask |= REDRAW_FIELD;
+}
+
+static void SelectArea(int from_x, int from_y, int to_x, int to_y,
+		       int element, boolean change_level)
+{
+  if (element == -1 || change_level)
+    DrawRectangle(from_x, from_y, to_x, to_y, -1, FALSE);
+  else
+    DrawAreaBorder(from_x, from_y, to_x, to_y);
+}
+
+/* values for CopyBrushExt() */
+#define CB_AREA_TO_BRUSH	0
+#define CB_BRUSH_TO_LEVEL	1
+
+static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, int mode)
+{
+  static short brush_buffer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+  static brush_from_x, brush_from_y;
+  static brush_to_x, brush_to_y;
+  int x, y;
+
+  if (from_x > to_x)
+    swap_numbers(&from_x, &to_x);
+
+  if (from_y > to_y)
+    swap_numbers(&from_y, &to_y);
+
+  if (mode == CB_AREA_TO_BRUSH)
+  {
+    for (y=from_y; y<=to_y; y++)
+      for (x=from_x; x<=to_x; x++)
+	brush_buffer[x][y] = Feld[x][y];
+
+    brush_from_x = from_x;
+    brush_from_y = from_y;
+    brush_to_x = to_x;
+    brush_to_y = to_y;
+  }
+  else
   {
-    if (ON_EDIT_BUTTON(mx,my) && EDIT_BUTTON(mx,my)==choice && pressed)
-    {
-      DrawEditButton(edit_button[choice] | ED_BUTTON_RELEASED);
-      if (edit_button[choice]==ED_BUTTON_CTRL ||
-	  edit_button[choice]==ED_BUTTON_FILL)
-	return_code = 1<<choice;
-      choice = -1;
-      pressed = FALSE;
-    }
-    else
-    {
-      choice = -1;
-      pressed = FALSE;
-    }
+    for (y=brush_from_y; y<=brush_to_y; y++)
+      for (x=brush_from_x; x<=brush_to_x; x++)
+	Feld[x][y] = brush_buffer[x][y];
+    CopyLevelToUndoBuffer();
   }
+}
 
-  BackToFront();
-  return(return_code);
+static void CopyAreaToBrush(int from_x, int from_y, int to_x, int to_y)
+{
+  CopyBrushExt(from_x, from_y, to_x, to_y, CB_AREA_TO_BRUSH);
+}
+
+#if 0
+static void CopyBrushToLevel()
+{
+  CopyBrushExt(0, 0, 0, 0, CB_BRUSH_TO_LEVEL);
 }
+#endif
 
-int CheckCtrlButtons(int mx, int my, int button)
+static void FloodFill(int from_x, int from_y, int fill_element)
 {
-  int return_code = 0;
-  static int choice = -1;
-  static BOOL pressed = FALSE;
-  static int ctrl_button[4] =
+  int i,x,y;
+  int old_element;
+  static int check[4][2] = { {-1,0}, {0,-1}, {1,0}, {0,1} };
+  static int safety = 0;
+
+  /* check if starting field still has the desired content */
+  if (Feld[from_x][from_y] == fill_element)
+    return;
+
+  safety++;
+
+  if (safety > lev_fieldx*lev_fieldy)
+    Error(ERR_EXIT, "Something went wrong in 'FloodFill()'. Please debug.");
+
+  old_element = Feld[from_x][from_y];
+  Feld[from_x][from_y] = fill_element;
+
+  for(i=0;i<4;i++)
   {
-    ED_BUTTON_EDIT,
-    ED_BUTTON_CLEAR,
-    ED_BUTTON_UNDO,
-    ED_BUTTON_EXIT
-  };
+    x = from_x + check[i][0];
+    y = from_y + check[i][1];
 
-  if (button)
+    if (IN_LEV_FIELD(x,y) && Feld[x][y] == old_element)
+      FloodFill(x, y, fill_element);
+  }
+
+  safety--;
+}
+
+/* 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)
+{
+  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;
+
+  if (mode != TEXT_INIT)
   {
-    if (!motion_status)		/* Maustaste neu gedrückt */
+    if (!typing)
+      return;
+
+    if (mode != TEXT_SETCURSOR)
     {
-      if (ON_CTRL_BUTTON(mx,my))
-      {
-	choice = CTRL_BUTTON(mx,my);
-	pressed = TRUE;
-	DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_PRESSED);
-      }
+      sx = last_sx;
+      sy = last_sy;
     }
-    else			/* Mausbewegung bei gedrückter Maustaste */
-    {
-      if ((!ON_CTRL_BUTTON(mx,my) || CTRL_BUTTON(mx,my)!=choice) &&
-	  choice>=0 && pressed)
+
+    lx = last_sx + level_xpos;
+    ly = last_sy + level_ypos;
+  }
+
+  switch (mode)
+  {
+    case TEXT_INIT:
+      if (typing)
+	DrawLevelText(0, 0, 0, TEXT_END);
+
+      typing = TRUE;
+      start_sx = last_sx = sx;
+      start_sy = last_sy = sy;
+      DrawLevelText(sx, sy, 0, TEXT_SETCURSOR);
+      break;
+
+    case TEXT_SETCURSOR:
+      DrawMiniElement(last_sx, last_sy, Feld[lx][ly]);
+      DrawAreaBorder(sx, sy, sx, sy);
+      last_sx = sx;
+      last_sy = sy;
+      break;
+
+    case TEXT_WRITECHAR:
+      if (letter_element >= EL_CHAR_START && letter_element <= EL_CHAR_END)
       {
-	pressed = FALSE;
-	DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_RELEASED);
+	delete_buffer[sx - start_sx] = Feld[lx][ly];
+	Feld[lx][ly] = letter_element;
+
+	if (sx + 1 < 2*SCR_FIELDX && lx + 1 < lev_fieldx)
+	  DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR);
+	else if (sy + 1 < 2*SCR_FIELDY && ly + 1 < lev_fieldy)
+	  DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
+	else
+	  DrawLevelText(0, 0, 0, TEXT_END);
       }
-      else if (ON_CTRL_BUTTON(mx,my) && CTRL_BUTTON(mx,my)==choice && !pressed)
+      break;
+
+    case TEXT_BACKSPACE:
+      if (sx > start_sx)
       {
-	pressed = TRUE;
-	DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_PRESSED);
+	Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
+	DrawMiniElement(sx - 1, sy, new_element3);
+	DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR);
       }
-    }
+      break;
+
+    case TEXT_NEWLINE:
+      if (sy + 1 < 2*SCR_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
+	DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
+      else
+	DrawLevelText(0, 0, 0, TEXT_END);
+      break;
+
+    case TEXT_END:
+      CopyLevelToUndoBuffer();
+      DrawMiniElement(sx, sy, Feld[lx][ly]);
+      typing = FALSE;
+      break;
+
+    default:
+      break;
   }
-  else				/* Maustaste wieder losgelassen */
+}
+
+static void CopyLevelToUndoBuffer()
+{
+  int x, y;
+
+  undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
+
+  if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
+    undo_buffer_steps++;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++)
+      UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+}
+
+static void RandomPlacement(int button)
+{
+  int new_element;
+  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)
   {
-    if (ON_CTRL_BUTTON(mx,my) && CTRL_BUTTON(mx,my)==choice && pressed)
-    {
-      DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_RELEASED);
-      return_code = 1<<(choice+6);
-      choice = -1;
-      pressed = FALSE;
-    }
-    else
+    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;
+  }
+  else
+  {
+    int elements_left = random_placement_num_objects;
+
+    while (elements_left > 0)
     {
-      choice = -1;
-      pressed = FALSE;
+      x = RND(lev_fieldx);
+      y = RND(lev_fieldy);
+
+      if (Feld[x][y] != new_element)
+      {
+	Feld[x][y] = new_element;
+	elements_left--;
+      }
     }
   }
 
-  BackToFront();
-  return(return_code);
+  DrawMiniLevel(level_xpos, level_ypos);
+  CopyLevelToUndoBuffer();
 }
 
-int CheckElemButtons(int mx, int my, int button)
+static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
-  int return_code = -1;
-  static int choice = -1;
-  static BOOL pressed = FALSE;
+  static boolean started_inside_drawing_area = FALSE;
+  static boolean draw_with_brush = FALSE;
+  boolean inside_drawing_area = !gi->event.off_borders;
+  boolean button_press_event;
+  boolean button_release_event;
+  boolean draw_level = (gi->custom_id == ED_CTRL_ID_DRAWING_LEVEL);
+  int new_element;
+  int button = gi->event.button;
+  int sx = gi->event.x, sy = gi->event.y;
+  int lx, ly;
+  int x, y;
+
+  /*
+  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);
 
-  if (button)
+  if (draw_level)
   {
-    if (!motion_status)		/* Maustaste neu gedrückt */
-    {
-      if (ON_ELEM_BUTTON(mx,my))
+    sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
+    sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
+
+    lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx);
+    ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly);
+    sx = lx - level_xpos;
+    sy = ly - level_ypos;
+  }
+  else
+  {
+    sx = (sx < 0 ? 0 : sx > 2 ? 2 : sx);
+    sy = (sy < 0 ? 0 : sy > 2 ? 2 : sy);
+  }
+
+  if (button_press_event)
+    started_inside_drawing_area = inside_drawing_area;
+
+  if (!started_inside_drawing_area)
+    return;
+
+  if (!button && !button_release_event)
+    return;
+
+  new_element = (button == 1 ? new_element1 :
+		 button == 2 ? new_element2 :
+		 button == 3 ? new_element3 : 0);
+
+  if (!draw_level && drawing_function != ED_CTRL_ID_SINGLE_ITEMS)
+    return;
+
+  switch (drawing_function)
+  {
+    case ED_CTRL_ID_SINGLE_ITEMS:
+      if (draw_level)
       {
-	choice = ELEM_BUTTON(mx,my);
-	pressed = TRUE;
-	DrawElemButton(choice,ED_BUTTON_PRESSED);
-	if (choice==ED_BUTTON_EUP ||
-	    choice==ED_BUTTON_EDOWN)
-	  return_code = choice;
+	if (button_release_event)
+	  CopyLevelToUndoBuffer();
+
+	if (!button)
+	  break;
+
+	if (new_element != Feld[lx][ly])
+	{
+	  if (new_element == EL_SPIELFIGUR)
+	  {
+	    /* 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)
+		{
+		  Feld[x][y] = EL_LEERRAUM;
+		  if (x - level_xpos >= 0 && x - level_xpos < 2*SCR_FIELDX &&
+		      y - level_ypos >= 0 && y - level_ypos < 2*SCR_FIELDY)
+		    DrawMiniElement(x - level_xpos, y - level_ypos,
+				    EL_LEERRAUM);
+		}
+	      }
+	    }
+	  }
+
+	  Feld[lx][ly] = new_element;
+	  DrawMiniElement(sx, sy, new_element);
+	}
       }
-    }
-    else			/* Mausbewegung bei gedrückter Maustaste */
-    {
-      if ((!ON_ELEM_BUTTON(mx,my) || ELEM_BUTTON(mx,my)!=choice) &&
-	  choice>=0 && pressed)
+      else
       {
-	pressed = FALSE;
-	DrawElemButton(choice,ED_BUTTON_RELEASED);
+	DrawMiniGraphicExt(drawto, gc,
+			   gi->x + sx * MINI_TILEX,
+			   gi->y + sy * MINI_TILEY,
+			   el2gfx(new_element));
+	DrawMiniGraphicExt(window, gc,
+			   gi->x + sx * MINI_TILEX,
+			   gi->y + sy * MINI_TILEY,
+			   el2gfx(new_element));
       }
-      else if (ON_ELEM_BUTTON(mx,my) && ELEM_BUTTON(mx,my)==choice)
+      break;
+
+    case ED_CTRL_ID_CONNECTED_ITEMS:
       {
-	if (!pressed)
-	  DrawElemButton(choice,ED_BUTTON_PRESSED);
-	pressed = TRUE;
-	if (choice==ED_BUTTON_EUP ||
-	    choice==ED_BUTTON_EDOWN)
-	  return_code = choice;
+	static int last_sx = -1;
+	static int last_sy = -1;
+
+	if (button_release_event)
+	  CopyLevelToUndoBuffer();
+
+	if (button)
+	{
+	  if (!button_press_event)
+	    DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
+
+	  last_sx = sx;
+	  last_sy = sy;
+	}
       }
-    }
+      break;
+
+    case ED_CTRL_ID_LINE:
+    case ED_CTRL_ID_RECTANGLE:
+    case ED_CTRL_ID_FILLED_BOX:
+    case ED_CTRL_ID_BRUSH:
+      {
+	static int last_sx = -1;
+	static int last_sy = -1;
+	static int start_sx = -1;
+	static int start_sy = -1;
+	void (*draw_func)(int, int, int, int, int, boolean);
+
+	if (drawing_function == ED_CTRL_ID_LINE)
+	  draw_func = DrawLine;
+	else if (drawing_function == ED_CTRL_ID_RECTANGLE)
+	  draw_func = DrawRectangle;
+	else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
+	  draw_func = DrawFilledBox;
+	else
+	  draw_func = SelectArea;
+
+	if (button_press_event)
+	{
+	  draw_func(sx, sy, sx, sy, new_element, FALSE);
+	  start_sx = last_sx = sx;
+	  start_sy = last_sy = sy;
+	}
+	else if (button_release_event)
+	{
+	  draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
+	  if (drawing_function == ED_CTRL_ID_BRUSH)
+	  {
+	    CopyAreaToBrush(start_sx, start_sy, sx, sy);
+	    draw_with_brush = TRUE;
+	  }
+	  else
+	    CopyLevelToUndoBuffer();
+	}
+	else if (last_sx != sx || last_sy != sy)
+	{
+	  draw_func(start_sx, start_sy, last_sx, last_sy, -1, FALSE);
+	  draw_func(start_sx, start_sy, sx, sy, new_element, FALSE);
+	  last_sx = sx;
+	  last_sy = sy;
+	}
+      }
+      break;
+
+    case ED_CTRL_ID_TEXT:
+      if (button_press_event)
+	DrawLevelText(sx, sy, 0, TEXT_INIT);
+      break;
+
+    case ED_CTRL_ID_FLOOD_FILL:
+      if (button_press_event && Feld[lx][ly] != new_element)
+      {
+	FloodFill(lx, ly, new_element);
+	DrawMiniLevel(level_xpos, level_ypos);
+	CopyLevelToUndoBuffer();
+      }
+      break;
+
+    default:
+      break;
   }
-  else				/* Maustaste wieder losgelassen */
+}
+
+static void HandleCounterButtons(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+
+  switch (id)
   {
-    if (ON_ELEM_BUTTON(mx,my) && ELEM_BUTTON(mx,my)==choice && pressed)
-    {
-      DrawElemButton(choice,ED_BUTTON_RELEASED);
-      if (choice!=ED_BUTTON_EUP &&
-	  choice!=ED_BUTTON_EDOWN)
-	return_code = choice;
-      choice = -1;
-      pressed = FALSE;
-    }
-    else
-    {
-      choice = -1;
-      pressed = FALSE;
-    }
+    case ED_CTRL_ID_SCORE_DOWN:
+    case ED_CTRL_ID_SCORE_UP:
+      *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step);
+      if (*gadget_score_value < 0)
+	*gadget_score_value = 0;
+      else if (*gadget_score_value > 255)
+	*gadget_score_value = 255;
+
+      DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+      break;
+
+    case ED_CTRL_ID_ELEMCONT_DOWN:
+    case ED_CTRL_ID_ELEMCONT_UP:
+      *gadget_areas_value += (id == ED_CTRL_ID_ELEMCONT_DOWN ? -step : step);
+      if (*gadget_areas_value < 1)
+	*gadget_areas_value = 1;
+      else if (*gadget_areas_value > MAX_ELEMCONT)
+	*gadget_areas_value = MAX_ELEMCONT;
+
+      DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+      DrawElementContentAreas();
+      break;
+
+    default:
+      break;
   }
-
-  BackToFront();
-  return(return_code);
 }
 
-int CheckCountButtons(int mx, int my, int button)
+static void HandleControlButtons(struct GadgetInfo *gi)
 {
-  int return_code = -1;
-  static int choice = -1;
-  static BOOL pressed = FALSE;
+  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 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)
+    DrawLevelText(0, 0, 0, TEXT_END);
+
+  if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
+  {
+    DrawDrawingWindow();
+    edit_mode = ED_MODE_DRAWING;
+  }
 
-  if (button)
+  switch (id)
   {
-    if (!motion_status)		/* Maustaste neu gedrückt */
-    {
-      if (ON_COUNT_BUTTON(mx,my))
+    case ED_CTRL_ID_SINGLE_ITEMS:
+    case ED_CTRL_ID_CONNECTED_ITEMS:
+    case ED_CTRL_ID_LINE:
+    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_BRUSH:
+      drawing_function = id;
+      break;
+
+    case ED_CTRL_ID_WRAP_LEFT:
+      if (level_xpos >= 0)
       {
-	choice = COUNT_BUTTON(mx,my);
-	pressed = TRUE;
-	DrawCountButton(choice,ED_BUTTON_PRESSED);
-	return_code = choice;
+	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	  break;
+
+	level_xpos -= step;
+	if (level_xpos <- 1)
+	  level_xpos = -1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
       }
-    }
-    else			/* Mausbewegung bei gedrückter Maustaste */
-    {
-      if ((!ON_COUNT_BUTTON(mx,my) || COUNT_BUTTON(mx,my)!=choice) &&
-	  choice>=0 && pressed)
+      break;
+
+    case ED_CTRL_ID_WRAP_RIGHT:
+      if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
       {
-	pressed = FALSE;
-	DrawCountButton(choice,ED_BUTTON_RELEASED);
+	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	  break;
+
+	level_xpos += step;
+	if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
+	  level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
       }
-      else if (ON_COUNT_BUTTON(mx,my) && COUNT_BUTTON(mx,my)==choice)
+      break;
+
+    case ED_CTRL_ID_WRAP_UP:
+      if (level_ypos >= 0)
       {
-	if (!pressed)
-	  DrawCountButton(choice,ED_BUTTON_PRESSED);
-	pressed = TRUE;
-	return_code = choice;
+	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	  break;
+
+	level_ypos -= step;
+	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_CTRL_ID_WRAP_DOWN:
+      if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
+      {
+	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	  break;
+
+	level_ypos += step;
+	if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
+	  level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+	if (button == 1)
+	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
+	else
+	  DrawMiniLevel(level_xpos, level_ypos);
+      }
+      break;
+
+    case ED_CTRL_ID_PROPERTIES:
+      properties_element = new_element;
+      DrawPropertiesWindow();
+      edit_mode = ED_MODE_PROPERTIES;
+      break;
+
+    case ED_CTRL_ID_RANDOM_PLACEMENT:
+      RandomPlacement(button);
+      break;
+
+    case ED_CTRL_ID_UNDO:
+      if (undo_buffer_steps == 0)
+      {
+	Request("Undo buffer empty !", REQ_CONFIRM);
+	break;
+      }
+
+      undo_buffer_position =
+	(undo_buffer_position - 1 + NUM_UNDO_STEPS) % NUM_UNDO_STEPS;
+      undo_buffer_steps--;
+
+      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);
+      break;
+
+    case ED_CTRL_ID_INFO:
+      if (edit_mode != ED_MODE_INFO)
+      {
+	DrawControlWindow();
+	edit_mode = ED_MODE_INFO;
+      }
+      else
+      {
+	AdjustLevelScrollPosition();
+	DrawMiniLevel(level_xpos, level_ypos);
+	edit_mode = ED_MODE_DRAWING;
+      }
+      break;
+
+    case ED_CTRL_ID_CLEAR:
+      for(x=0; x<MAX_LEV_FIELDX; x++) 
+	for(y=0; y<MAX_LEV_FIELDY; y++) 
+	  Feld[x][y] = new_element3;
+      CopyLevelToUndoBuffer();
+
+      DrawMiniLevel(level_xpos, level_ypos);
+      break;
+
+    case ED_CTRL_ID_SAVE:
+      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] != Ur[x][y])
+	    level_changed = TRUE;
+
+      if (!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) 
+	    player_present = TRUE;
+
+      if (!player_present)
+	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];
+	  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) 
+	    player_present = TRUE;
+
+      if (!player_present)
+	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++)
+	    OrigBackup[x][y] = Ur[x][y];
+
+	for(x=0; x<lev_fieldx; x++)
+	  for(y=0; y<lev_fieldy; y++)
+	    Ur[x][y] = Feld[x][y];
+
+	level_editor_test_game = TRUE;
+	game_status = PLAYING;
+	InitGame();
+      }
+      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;
+
+      if (!level_changed ||
+	  Request("Level has changed! Exit without saving ?",
+		  REQ_ASK | REQ_STAY_OPEN))
+      {
+	CloseDoor(DOOR_CLOSE_1);
+
+	/*
+	CloseDoor(DOOR_CLOSE_ALL);
+	*/
+
+	/* draw smaller door */
+	XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+		  DOOR_GFX_PAGEX7, 64,
+		  108, 64,
+		  EX - 4, EY - 12);
+	redraw_mask |= REDRAW_ALL;
+
+	game_status = MAINMENU;
+	DrawMainMenu();
+      }
+      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);
+      }
+      break;
+
+    default:
+      if (gi->event.type == GD_EVENT_PRESSED)
+	printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
+      else if (gi->event.type == GD_EVENT_RELEASED)
+	printf("default: HandleControlButtons: GD_EVENT_RELEASED\n");
+      else if (gi->event.type == GD_EVENT_MOVING)
+	printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
+      else
+	printf("default: HandleControlButtons: ?\n");
+      break;
   }
-  else				/* Maustaste wieder losgelassen */
+}
+
+void HandleLevelEditorKeyInput(KeySym key)
+{
+  if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
   {
-    if (ON_COUNT_BUTTON(mx,my) && COUNT_BUTTON(mx,my)==choice && pressed)
-    {
-      DrawCountButton(choice,ED_BUTTON_RELEASED);
-      choice = -1;
-      pressed = FALSE;
-    }
-    else
-    {
-      choice = -1;
-      pressed = FALSE;
-    }
+    char *keyname = getKeyNameFromKeySym(key);
+    char letter = 0;
+
+    if (strlen(keyname) == 1)
+      letter = keyname[0];
+    else if (strcmp(keyname, "space") == 0)
+      letter = ' ';
+    else if (strcmp(keyname, "less") == 0)
+      letter = '<';
+    else if (strcmp(keyname, "equal") == 0)
+      letter = '=';
+    else if (strcmp(keyname, "greater") == 0)
+      letter = '>';
+
+    /* map lower case letters to upper case */
+    if (letter >= 'a' && letter <= 'z')
+      letter += (int)('A' - 'a');
+    else if (letter == 'ä')
+      letter = 'Ä';
+    else if (letter == 'ä')
+      letter = 'Ö';
+    else if (letter == 'ä')
+      letter = 'Ü';
+
+    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);
   }
-
-  BackToFront();
-  return(return_code);
 }