rnd-19990107-1
[rocksndiamonds.git] / src / editor.c
index 0c97b9eec82d6378dfd3149a99c5f609420d6201..6c1375652715fe1b6db18057fabe38ac2e7bb125 100644 (file)
 #define ED_SCROLL_UP           4
 #define ED_SCROLL_DOWN         8
 
-/* delay value to avoid too fast scrolling etc. */
-#define CHOICE_DELAY_VALUE     100
+/* 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)
 #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_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_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
 
-/* control button names */
+/* values for properties window */
+#define ED_PROPERTIES_XPOS     (TILEX - MINI_TILEX/2)
+/* values for counter gadgets */
+#define ED_COUNT_VALUE_XOFFSET 5
+#define ED_COUNT_VALUE_YOFFSET 3
+#define ED_COUNT_SCORE_XPOS    ED_PROPERTIES_XPOS
+#define ED_COUNT_SCORE_YPOS    (14 * MINI_TILEY)
+#define ED_COUNT_ELEMCONT_XPOS ED_PROPERTIES_XPOS
+#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_RECTANGLE           4
 #define ED_CTRL_ID_FILLED_BOX          5
 #define ED_CTRL_ID_WRAP_UP             6
-#define ED_CTRL_ID_ITEM_PROPERTIES     7
+#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_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_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
+
+/* text input identifiers */
+#define ED_CTRL_ID_LEVEL_NAME          36
+
+#define ED_NUM_GADGETS                 37
+
+/* 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 */
-void HandleDrawingFunctions(int, int, int);
-void HandlePressedControlButtons();
-void HandleControlButtons(struct GadgetInfo *);
+static void DrawDrawingWindow();
+static void DrawPropertiesWindow();
+static void CopyLevelToUndoBuffer();
+static void HandleControlButtons(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleTextInputGadgets(struct GadgetInfo *);
 
-static struct GadgetInfo *control_button_gadget[ED_NUM_CTRL_BUTTONS];
-static boolean control_button_gadgets_created = FALSE;
-static boolean control_button_gadgets_mapped = FALSE;
+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 last_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;
@@ -110,14 +174,19 @@ static int random_placement_method = RANDOM_USE_PERCENTAGE;
 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 boolean edit_mode;
+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;
 
-int element_shift;
+int element_shift = 0;
+
 int editor_element[] =
 {
   EL_CHAR_A + ('B' - 'A'),
@@ -141,7 +210,7 @@ int editor_element[] =
   EL_BETON,
 
   EL_FELSBODEN,
-  EL_SIEB2_LEER,
+  EL_SIEB2_INAKTIV,
   EL_AUSGANG_ZU,
   EL_AUSGANG_AUF,
 
@@ -188,7 +257,7 @@ int editor_element[] =
   EL_BETON,
   EL_MAUERWERK,
   EL_FELSBODEN,
-  EL_SIEB_LEER,
+  EL_SIEB_INAKTIV,
 
   EL_EDELSTEIN,
   EL_DIAMANT,
@@ -300,6 +369,11 @@ int editor_element[] =
   EL_MAUER_Y,
   EL_MAUER_XY,
 
+  EL_SPEED_PILL,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
   EL_CHAR_A + ('S' - 'A'),
   EL_CHAR_A + ('O' - 'A'),
   EL_CHAR_A + ('K' - 'A'),
@@ -315,6 +389,71 @@ int editor_element[] =
   EL_SOKOBAN_FELD_VOLL,
   EL_BETON,
 
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+  EL_LEERRAUM,
+
+  EL_CHAR('S'),
+  EL_CHAR('U'),
+  EL_CHAR('P'),
+  EL_CHAR('A'),
+
+  EL_CHAR('P'),
+  EL_CHAR('L'),
+  EL_CHAR('E'),
+  EL_CHAR('X'),
+
+  EL_SP_EMPTY,
+  EL_SP_ZONK,
+  EL_SP_BASE,
+  EL_SP_MURPHY,
+
+  EL_SP_INFOTRON,
+  EL_SP_CHIP_SINGLE,
+  EL_SP_HARD_GRAY,
+  EL_SP_EXIT,
+
+  EL_SP_DISK_ORANGE,
+  EL_SP_PORT1_RIGHT,
+  EL_SP_PORT1_DOWN,
+  EL_SP_PORT1_LEFT,
+
+  EL_SP_PORT1_UP,
+  EL_SP_PORT2_RIGHT,
+  EL_SP_PORT2_DOWN,
+  EL_SP_PORT2_LEFT,
+
+  EL_SP_PORT2_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_ELECTRON,
+  EL_SP_BUG,
+  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'),
@@ -409,11 +548,12 @@ int editor_element[] =
 
   EL_CHAR_OE,
   EL_CHAR_UE,
-  EL_CHAR_COPY
+  EL_CHAR_COPY,
+  EL_LEERRAUM
 };
 int elements_in_list = sizeof(editor_element)/sizeof(int);
 
-void ScrollMiniLevel(int from_x, int from_y, int scroll)
+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);
@@ -440,23 +580,62 @@ void ScrollMiniLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void CreateLevelEditorControlButtons()
+void InitLevelEditorGadgets()
 {
   int i;
 
-  if (control_button_gadgets_created)
-    return;
+  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_y;
+    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 ||
+       id == ED_CTRL_ID_PICK_ELEMENT)
+    {
+      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 (i < ED_NUM_CTRL1_BUTTONS)
+    if (id < ED_NUM_CTRL1_BUTTONS)
     {
       int x = i % ED_CTRL1_BUTTONS_HORIZ;
       int y = i / ED_CTRL1_BUTTONS_HORIZ;
@@ -479,24 +658,22 @@ void CreateLevelEditorControlButtons()
 
     gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset;
     gd_x2 = DOOR_GFX_PAGEX7 + gd_xoffset;
-    gd_y  = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset;
+    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;
 
-    if (i == ED_CTRL_ID_WRAP_LEFT ||
-       i == ED_CTRL_ID_WRAP_RIGHT ||
-       i == ED_CTRL_ID_WRAP_UP ||
-       i == ED_CTRL_ID_WRAP_DOWN)
-      event_mask = GD_EVENT_PRESSED;
-    else
-      event_mask = GD_EVENT_RELEASED;
-
-    gi = CreateGadget(GDI_X, EX + gd_xoffset,
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_X, EX + gd_xoffset,
                      GDI_Y, EY + gd_yoffset,
                      GDI_WIDTH, width,
                      GDI_HEIGHT, height,
-                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+                     GDI_TYPE, button_type,
                      GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
-                     GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+                     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);
@@ -504,36 +681,221 @@ void CreateLevelEditorControlButtons()
     if (gi == NULL)
       Error(ERR_EXIT, "cannot create gadget");
 
-    control_button_gadget[i] = gi;
+    level_editor_gadget[id] = gi;
   }
+}
+
+static void CreateCounterButtons()
+{
+  int i, j;
 
-  control_button_gadgets_created = TRUE;
+  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;
+    }
+  }
 }
 
-void MapLevelEditorControlButtons()
+static void CreateDrawingAreas()
 {
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int id;
   int i;
 
-  if (!control_button_gadgets_created)
-    CreateLevelEditorControlButtons();
+  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);
 
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    MapGadget(control_button_gadget[i]);
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
 
-  control_button_gadgets_mapped = TRUE;
+  /* ... 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;
 }
 
-void UnmapLevelEditorControlButtons()
+static void CreateTextInputGadgets()
 {
-  int i;
+  Pixmap gd_pixmap = pix[PIX_DOOR];
+  int gd_x, gd_y;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int id;
 
-  if (!control_button_gadgets_created || !control_button_gadgets_mapped)
+  gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+  gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+  event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+
+  /* text input gadget for the level name */
+  id = ED_CTRL_ID_LEVEL_NAME;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+                   GDI_X, SX + ED_COUNT_ELEMCONT_XPOS,
+                   GDI_Y, SY + ED_AREA_ELEMCONT_YPOS + 3 * TILEX,
+                   GDI_TYPE, GD_TYPE_TEXTINPUT,
+                   GDI_TEXT_VALUE, level.name,
+                   GDI_TEXT_SIZE, 30,
+                   GDI_TEXT_BORDER, 3,
+                   GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
+                   GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
+                   GDI_EVENT_MASK, event_mask,
+                   GDI_CALLBACK, HandleTextInputGadgets,
+                   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();
+  CreateTextInputGadgets();
+
+  level_editor_gadgets_created = TRUE;
+}
+
+static void MapControlButtons()
+{
+  int i;
+
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    UnmapGadget(control_button_gadget[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]);
+}
 
-  control_button_gadgets_mapped = FALSE;
+static void MapDrawingArea(int id)
+{
+  MapGadget(level_editor_gadget[id]);
+}
+
+static void MapTextInputGadget(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()
@@ -542,9 +904,8 @@ void DrawLevelEd()
 
   level_xpos=-1;
   level_ypos=-1;
-  edit_mode = TRUE;
+  edit_mode = ED_MODE_DRAWING;
   name_typing = FALSE;
-  element_shift = 0;
 
   CloseDoor(DOOR_CLOSE_ALL);
 
@@ -562,11 +923,9 @@ void DrawLevelEd()
   }
   else
   {
-    undo_buffer_position = 0;
-    undo_buffer_steps = 0;
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-       UndoBuffer[0][x][y] = Ur[x][y];
+    undo_buffer_position = -1;
+    undo_buffer_steps = -1;
+    CopyLevelToUndoBuffer();
   }
 
   DrawMiniLevel(level_xpos,level_ypos);
@@ -586,7 +945,7 @@ void DrawLevelEd()
   for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
   {
     if (i < elements_in_list)
-      graphic = el2gfx(editor_element[i]);
+      graphic = el2gfx(editor_element[i + element_shift]);
     else
       graphic = GFX_LEERRAUM;
 
@@ -648,7 +1007,11 @@ void DrawLevelEd()
 
   OpenDoor(DOOR_OPEN_1);
 
-  MapLevelEditorControlButtons();
+  if (!level_editor_gadgets_created)
+    CreateLevelEditorGadgets();
+
+  MapControlButtons();
+  MapMainDrawingArea();
 
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
@@ -660,6 +1023,7 @@ void DrawControlWindow()
   int i,x,y;
 
   ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
   /* Inhalt der Mampfer */
   DrawText(ED_COUNT_GADGET_XPOS+1,SY+6,
@@ -830,6 +1194,39 @@ void AdjustLevelScrollPosition()
     level_ypos = -1;
 }
 
+static void PickDrawingElement(int button, int element)
+{
+  if (button < 1 || button > 3)
+    return;
+
+  if (button == 1)
+  {
+    new_element1 = element;
+    DrawMiniGraphicExt(drawto, gc,
+                      DX + ED_WIN_MB_LEFT_XPOS,
+                      DY + ED_WIN_MB_LEFT_YPOS,
+                      el2gfx(new_element1));
+  }
+  else if (button == 2)
+  {
+    new_element2 = element;
+    DrawMiniGraphicExt(drawto, gc,
+                      DX + ED_WIN_MB_MIDDLE_XPOS,
+                      DY + ED_WIN_MB_MIDDLE_YPOS,
+                      el2gfx(new_element2));
+  }
+  else
+  {
+    new_element3 = element;
+    DrawMiniGraphicExt(drawto, gc,
+                      DX + ED_WIN_MB_RIGHT_XPOS,
+                      DY + ED_WIN_MB_RIGHT_YPOS,
+                      el2gfx(new_element3));
+  }
+
+  redraw_mask |= REDRAW_DOOR_1;
+}
+
 void LevelEd(int mx, int my, int button)
 {
   static int last_button = 0;
@@ -842,9 +1239,10 @@ void LevelEd(int mx, int my, int button)
   int y = (my-SY)/MINI_TILEY; 
   */
 
-
+  /*
   HandlePressedControlButtons();
   HandleDrawingFunctions(mx, my, button);
+  */
 
   if (use_floodfill)           /********** FLOOD FILL **********/
   {
@@ -896,13 +1294,20 @@ void LevelEd(int mx, int my, int button)
     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, CHOICE_DELAY_VALUE))
+       DelayReached(&choice_delay, GADGET_FRAME_DELAY))
     {
-      int i, step;
+      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 (element_shift<0)
        element_shift = 0;
       if (element_shift>elements_in_list-MAX_ELEM_X*MAX_ELEM_Y)
@@ -922,29 +1327,17 @@ void LevelEd(int mx, int my, int button)
       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;
+      PickDrawingElement(last_button, new_element);
+
+      if (!HAS_CONTENT(properties_element))
+      {
+       properties_element = new_element;
+       if (edit_mode == ED_MODE_PROPERTIES)
+         DrawPropertiesWindow();
+      }
     }
   
-    if (edit_mode)             /********** EDIT-FENSTER **********/
+    if (edit_mode == ED_MODE_DRAWING)  /********** EDIT-FENSTER **********/
     {
 
 
@@ -961,7 +1354,7 @@ 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:
          Request("Caution ! Flood fill mode ! Choose area !",REQ_OPEN);
@@ -971,7 +1364,7 @@ void LevelEd(int mx, int my, int button)
        case ED_BUTTON_LEFT:
          if (level_xpos>=0)
          {
-           if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+           if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
              break;
            if (lev_fieldx<2*SCR_FIELDX-2)
              break;
@@ -988,7 +1381,7 @@ void LevelEd(int mx, int my, int button)
        case ED_BUTTON_RIGHT:
          if (level_xpos<=lev_fieldx-2*SCR_FIELDX)
          {
-           if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+           if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
              break;
            if (lev_fieldx<2*SCR_FIELDX-2)
              break;
@@ -1005,7 +1398,7 @@ void LevelEd(int mx, int my, int button)
        case ED_BUTTON_UP:
          if (level_ypos>=0)
          {
-           if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+           if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
              break;
            if (lev_fieldy<2*SCR_FIELDY-2)
              break;
@@ -1022,7 +1415,7 @@ void LevelEd(int mx, int my, int button)
        case ED_BUTTON_DOWN:
          if (level_ypos<=lev_fieldy-2*SCR_FIELDY)
          {
-           if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE))
+           if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
              break;
            if (lev_fieldy<2*SCR_FIELDY-2)
              break;
@@ -1095,13 +1488,13 @@ void LevelEd(int mx, int my, int button)
 
 
     }
-    else                       /********** KONTROLL-FENSTER **********/
+    else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/
     {
       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, CHOICE_DELAY_VALUE))
+         DelayReached(&choice_delay, GADGET_FRAME_DELAY))
       {
        if (!(choice % 2))
          step = -step;
@@ -1241,7 +1634,7 @@ 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 (Request("Are you sure to clear this level ?",REQ_ASK))
@@ -1278,7 +1671,9 @@ void LevelEd(int mx, int my, int button)
 
            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_SPIELFIGUR ||
+                   Feld[x][y] == EL_SPIELER1 ||
+                   Feld[x][y] == EL_SP_MURPHY) 
                  figur_vorhanden = TRUE;
 
            if (!figur_vorhanden)
@@ -1490,6 +1885,257 @@ void LevelNameTyping(KeySym key)
   }
 }
 
+static void DrawCounterValueField(int counter_id, int value)
+{
+  int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS;
+  int y = SY + counter_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);
+
+  DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+          int2str(value, 3), FS_SMALL, FC_YELLOW);
+}
+
+static void DrawDrawingWindow()
+{
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
+  MapMainDrawingArea();
+  AdjustLevelScrollPosition();
+  DrawMiniLevel(level_xpos, level_ypos);
+}
+
+static void DrawElementContentAreas()
+{
+  int *num_areas = &MampferMax;
+  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] = level.mampfer_inhalt[i][x][y];
+
+  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);
+  }
+
+  /* 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);
+
+  DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
+          "Content", FS_SMALL, FC_YELLOW);
+  DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 1 * MINI_TILEY + 1,
+          "when", FS_SMALL, FC_YELLOW);
+  DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
+          "smashed", FS_SMALL, FC_YELLOW);
+
+  for (i=0; i<*num_areas; i++)
+  {
+    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);
+  }
+
+  for (i=0; i<*num_areas; i++)
+    MapDrawingArea(ED_CTRL_ID_ELEMCONT_0 + i);
+}
+
+static void DrawAmoebaContentArea()
+{
+  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;
+
+  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);
+}
+
+#define TEXT_COLLECTING                "Score for collecting"
+#define TEXT_SMASHING          "Score for smashing"
+#define TEXT_CRACKING          "Score for cracking"
+#define TEXT_SPEED             "Speed of amoeba growth"
+#define TEXT_DURATION          "Duration when activated"
+
+static void DrawPropertiesWindow()
+{
+  int i, x, y;
+  int num_elements_in_level;
+  static struct
+  {
+    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_INAKTIV, &level.dauer_sieb,      TEXT_DURATION },
+    { EL_ABLENK_AUS,   &level.dauer_ablenk,    TEXT_DURATION },
+    { -1, NULL, NULL }
+  };
+
+  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(ED_PROPERTIES_XPOS, 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++)
+  {
+    if (elements_with_counter[i].element == properties_element)
+    {
+      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;
+    }
+  }
+
+  if (HAS_CONTENT(properties_element))
+  {
+    if (IS_AMOEBOID(properties_element))
+      DrawAmoebaContentArea();
+    else
+      DrawElementContentAreas();
+  }
+
+  /* TEST ONLY: level name text input gadget */
+  MapTextInputGadget(ED_CTRL_ID_LEVEL_NAME);
+}
+
 static void swap_numbers(int *i1, int *i2)
 {
   int help = *i1;
@@ -1521,8 +2167,8 @@ static void DrawLineElement(int sx, int sy, int element, boolean change_level)
     Feld[lx][ly] = element;
 }
 
-void DrawLine(int from_x, int from_y, int to_x, int to_y, int element,
-             boolean change_level)
+static void DrawLine(int from_x, int from_y, int to_x, int to_y,
+                    int element, boolean change_level)
 {
   if (from_y == to_y)                  /* horizontal line */
   {
@@ -1583,8 +2229,8 @@ void DrawLine(int from_x, int from_y, int to_x, int to_y, int element,
   }
 }
 
-void DrawRectangle(int from_x, int from_y, int to_x, int to_y, int element,
-                  boolean change_level)
+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);
@@ -1592,8 +2238,8 @@ void DrawRectangle(int from_x, int from_y, int to_x, int to_y, int element,
   DrawLine(to_x, from_y, from_x, from_y, element, change_level);
 }
 
-void DrawFilledBox(int from_x, int from_y, int to_x, int to_y, int element,
-                  boolean change_level)
+static void DrawFilledBox(int from_x, int from_y, int to_x, int to_y,
+                         int element, boolean change_level)
 {
   int y;
 
@@ -1604,7 +2250,96 @@ void DrawFilledBox(int from_x, int from_y, int to_x, int to_y, int element,
     DrawLine(from_x, y, to_x, y, element, change_level);
 }
 
-void FloodFill(int from_x, int from_y, int fill_element)
+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
+  {
+    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();
+  }
+}
+
+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
+
+static void FloodFill(int from_x, int from_y, int fill_element)
 {
   int i,x,y;
   int old_element;
@@ -1635,7 +2370,100 @@ void FloodFill(int from_x, int from_y, int fill_element)
   safety--;
 }
 
-void CopyLevelToUndoBuffer()
+/* 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 (!typing)
+      return;
+
+    if (mode != TEXT_SETCURSOR)
+    {
+      sx = last_sx;
+      sy = last_sy;
+    }
+
+    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)
+      {
+       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);
+      }
+      break;
+
+    case TEXT_BACKSPACE:
+      if (sx > start_sx)
+      {
+       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;
+  }
+}
+
+static void CopyLevelToUndoBuffer()
 {
   int x, y;
 
@@ -1647,15 +2475,9 @@ void CopyLevelToUndoBuffer()
   for(x=0; x<lev_fieldx; x++)
     for(y=0; y<lev_fieldy; y++)
       UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
-
-
-
-  /*
-    printf("state saved to undo buffer %d\n", undo_buffer_position);
-  */
 }
 
-void RandomPlacement(int button)
+static void RandomPlacement(int button)
 {
   int new_element;
   int x, y;
@@ -1664,8 +2486,6 @@ void RandomPlacement(int button)
                 button == 2 ? new_element2 :
                 button == 3 ? new_element3 : 0);
 
-  CopyLevelToUndoBuffer();
-
   if (random_placement_method == RANDOM_USE_PERCENTAGE)
   {
     for(x=0; x<lev_fieldx; x++)
@@ -1691,75 +2511,123 @@ void RandomPlacement(int button)
   }
 
   DrawMiniLevel(level_xpos, level_ypos);
+  CopyLevelToUndoBuffer();
 }
 
-void HandleDrawingFunctions(int mx, int my, int button)
+static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
-  static int last_button = 0;
-  static int last_element = 0;
+  static boolean started_inside_drawing_area = FALSE;
+  static boolean draw_with_brush = FALSE;
+  int id = gi->custom_id;
+  boolean inside_drawing_area = !gi->event.off_borders;
   boolean button_press_event;
   boolean button_release_event;
-  boolean copy_to_undo_buffer = FALSE;
+  boolean draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL);
   int new_element;
-  int sx = (mx - SX) / MINI_TILEX; 
-  int sy = (my - SY) / MINI_TILEY; 
-  int lx = sx + level_xpos;
-  int ly = sy + level_ypos;
+  int button = gi->event.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 min_lx = 0, min_ly = 0;
+  int max_lx = lev_fieldx - 1, max_ly = lev_fieldy - 1;
   int x, y;
 
-  if (!edit_mode)
+  /*
+  if (edit_mode != ED_MODE_DRAWING)
     return;
+  */
 
-  button_press_event = (last_button == 0 && button != 0);
-  button_release_event = (last_button != 0 && button == 0);
-  last_button = button;
+  button_press_event = (gi->event.type == GD_EVENT_PRESSED);
+  button_release_event = (gi->event.type == GD_EVENT_RELEASED);
+
+  /* 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 (draw_level)
+  {
+    /* get positions inside level field */
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
+
+    /* 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);
+
+    /* correct drawing area positions accordingly */
+    sx = lx - level_xpos;
+    sy = ly - level_ypos;
+  }
+
+  if (button_press_event)
+    started_inside_drawing_area = inside_drawing_area;
 
-  if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE)
+  if (!started_inside_drawing_area)
     return;
 
-  if ((!button && !button_release_event) ||
-      sx > lev_fieldx || sy > lev_fieldy ||
-      (sx == 0 && level_xpos<0) ||
-      (sx == 2*SCR_FIELDX - 1 && level_xpos > lev_fieldx - 2*SCR_FIELDX) ||
-      (sy == 0 && level_ypos < 0) ||
-      (sy == 2*SCR_FIELDY - 1 && level_ypos > lev_fieldy - 2*SCR_FIELDY))
+  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 (button_release_event)
-       copy_to_undo_buffer = TRUE;
+      if (draw_level)
+      {
+       if (button_release_event)
+         CopyLevelToUndoBuffer();
 
-      if (!button)
-       break;
+       if (!button)
+         break;
 
-      if (new_element != Feld[lx][ly])
-      {
-       if (new_element == EL_SPIELFIGUR)
+       if (new_element != Feld[lx][ly])
        {
-         /* remove player at old position */
-         for(y=0; y<lev_fieldy; y++)
+         if (new_element == EL_SPIELFIGUR)
          {
-           for(x=0; x<lev_fieldx; x++)
+           /* remove player at old position */
+           for(y=0; y<lev_fieldy; y++)
            {
-             if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1)
+             for(x=0; x<lev_fieldx; x++)
              {
-               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);
+               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);
+         Feld[lx][ly] = new_element;
+         DrawMiniElement(sx, sy, new_element);
+       }
+      }
+      else
+      {
+       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));
+
+       if (id == ED_CTRL_ID_AMOEBA_CONTENT)
+         level.amoebe_inhalt = new_element;
+       else if (id >= ED_CTRL_ID_ELEMCONT_0 && id <= ED_CTRL_ID_ELEMCONT_7)
+         level.mampfer_inhalt[id - ED_CTRL_ID_ELEMCONT_0][sx][sy] =
+           new_element;
       }
       break;
 
@@ -1769,7 +2637,7 @@ void HandleDrawingFunctions(int mx, int my, int button)
        static int last_sy = -1;
 
        if (button_release_event)
-         copy_to_undo_buffer = TRUE;
+         CopyLevelToUndoBuffer();
 
        if (button)
        {
@@ -1785,6 +2653,7 @@ void HandleDrawingFunctions(int mx, int my, int button)
     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;
@@ -1796,18 +2665,27 @@ void HandleDrawingFunctions(int mx, int my, int button)
          draw_func = DrawLine;
        else if (drawing_function == ED_CTRL_ID_RECTANGLE)
          draw_func = DrawRectangle;
-       else
+       else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
          draw_func = DrawFilledBox;
+       else
+         draw_func = SelectArea;
 
        if (button_press_event)
        {
-         last_sx = start_sx = sx;
-         last_sy = start_sy = sy;
+         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, last_element, TRUE);
-         copy_to_undo_buffer = TRUE;
+         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)
        {
@@ -1819,145 +2697,89 @@ void HandleDrawingFunctions(int mx, int my, int button)
       }
       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);
-       copy_to_undo_buffer = TRUE;
+       CopyLevelToUndoBuffer();
       }
       break;
 
+    case ED_CTRL_ID_PICK_ELEMENT:
+      if (button_press_event)
+       PickDrawingElement(button, Feld[lx][ly]);
+      if (button_release_event)
+       ClickOnGadget(level_editor_gadget[last_drawing_function]);
+      break;
+
     default:
       break;
   }
-
-  last_element = new_element;
-
-  if (copy_to_undo_buffer)
-    CopyLevelToUndoBuffer();
-  copy_to_undo_buffer = FALSE;
 }
 
-void HandlePressedControlButtons()
+static void HandleCounterButtons(struct GadgetInfo *gi)
 {
-  static unsigned long button_delay = 0;
-  int i = 0;
+  int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
 
-  /* buttons with action when held pressed */
-  int gadget_id[] =
+  switch (id)
   {
-    ED_CTRL_ID_WRAP_UP,
-    ED_CTRL_ID_WRAP_LEFT,
-    ED_CTRL_ID_WRAP_RIGHT,
-    ED_CTRL_ID_WRAP_DOWN,
-    -1
-  };
+    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;
 
-  if (!DelayReached(&button_delay, CHOICE_DELAY_VALUE))
-    return;
+    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;
 
-  while (gadget_id[i] != -1)
-  {
-    int id = gadget_id[i++];
-    int state = control_button_gadget[id]->state;
-    int button = control_button_gadget[id]->event.button;
-    int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+      DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+      DrawElementContentAreas();
+      break;
 
-    if (state != GD_BUTTON_PRESSED)
-      continue;
-  
-    switch (id)
-    {
-      case ED_CTRL_ID_WRAP_LEFT:
-       if (level_xpos >= 0)
-       {
-         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);
-       }
-       break;
-  
-      case ED_CTRL_ID_WRAP_RIGHT:
-       if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
-       {
-         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);
-       }
-       break;
-  
-      case ED_CTRL_ID_WRAP_UP:
-       if (level_ypos >= 0)
-       {
-         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;
-  
-      default:
-       break;
-    }
+    default:
+      break;
   }
 }
 
-void HandleControlButtons(struct GadgetInfo *gi)
+static void HandleControlButtons(struct GadgetInfo *gi)
 {
-  int event_type = gi->event.type;
+  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 id;
-  int i, x, y;
+  int x, y;
 
-  /* get the button id */
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    if (gi->id == control_button_gadget[i]->id)
-      id = i;
+  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)
+  if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
   {
-    AdjustLevelScrollPosition();
-    DrawMiniLevel(level_xpos, level_ypos);
-    edit_mode = TRUE;
+    DrawDrawingWindow();
+    edit_mode = ED_MODE_DRAWING;
   }
 
   switch (id)
@@ -1970,9 +2792,81 @@ void HandleControlButtons(struct GadgetInfo *gi)
     case ED_CTRL_ID_FILLED_BOX:
     case ED_CTRL_ID_FLOOD_FILL:
     case ED_CTRL_ID_BRUSH:
+    case ED_CTRL_ID_PICK_ELEMENT:
+      last_drawing_function = drawing_function;
       drawing_function = id;
       break;
 
+    case ED_CTRL_ID_WRAP_LEFT:
+      if (level_xpos >= 0)
+      {
+       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);
+      }
+      break;
+
+    case ED_CTRL_ID_WRAP_RIGHT:
+      if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
+      {
+       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);
+      }
+      break;
+
+    case ED_CTRL_ID_WRAP_UP:
+      if (level_ypos >= 0)
+      {
+       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;
@@ -1995,25 +2889,23 @@ void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case ED_CTRL_ID_INFO:
-      if (edit_mode)
+      if (edit_mode != ED_MODE_INFO)
       {
        DrawControlWindow();
-       edit_mode = FALSE;
+       edit_mode = ED_MODE_INFO;
       }
       else
       {
-       AdjustLevelScrollPosition();
-       DrawMiniLevel(level_xpos, level_ypos);
-       edit_mode = TRUE;
+       DrawDrawingWindow();
+       edit_mode = ED_MODE_DRAWING;
       }
       break;
 
     case ED_CTRL_ID_CLEAR:
-      CopyLevelToUndoBuffer();
-
       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;
@@ -2030,7 +2922,7 @@ void HandleControlButtons(struct GadgetInfo *gi)
          if (Feld[x][y] != Ur[x][y])
            level_changed = TRUE;
 
-      if (!level_changed)
+      if (0 && !level_changed)
       {
        Request("Level has not changed !", REQ_CONFIRM);
        break;
@@ -2038,7 +2930,9 @@ void HandleControlButtons(struct GadgetInfo *gi)
 
       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_SPIELFIGUR ||
+             Feld[x][y] == EL_SPIELER1 ||
+             Feld[x][y] == EL_SP_MURPHY) 
            player_present = TRUE;
 
       if (!player_present)
@@ -2058,7 +2952,9 @@ void HandleControlButtons(struct GadgetInfo *gi)
     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) 
+         if (Feld[x][y] == EL_SPIELFIGUR ||
+             Feld[x][y] == EL_SPIELER1 ||
+             Feld[x][y] == EL_SP_MURPHY) 
            player_present = TRUE;
 
       if (!player_present)
@@ -2116,12 +3012,55 @@ void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     default:
-      if (event_type == GD_EVENT_PRESSED)
-       printf("HandleControlButtons: GD_EVENT_PRESSED\n");
-      else if (event_type == GD_EVENT_RELEASED)
-       printf("HandleControlButtons: GD_EVENT_RELEASED\n");
+      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("HandleControlButtons: ?\n");
+       printf("default: HandleControlButtons: ?\n");
+      break;
+  }
+}
+
+void HandleLevelEditorKeyInput(KeySym key)
+{
+  if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
+  {
+    char letter = getCharFromKeySym(key);
+
+    /* 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);
+  }
+}
+
+
+static void HandleTextInputGadgets(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+
+  switch (id)
+  {
+    case ED_CTRL_ID_LEVEL_NAME:
+      strcpy(level.name, gi->text_value);
+      break;
+
+    default:
       break;
   }
 }