X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=7d885e14920f23e15f48600485cfba00240d4d99;hb=0c2b6a7610933f9098ec233f7b4c2b52eac3535c;hp=1e4d4f5f33df68ab649e41bb75a9611c7b802d61;hpb=209871b6f17880f98d41cf7d7953f6bf2227a16c;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 1e4d4f5f..7d885e14 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -18,6 +18,7 @@
 #include "buttons.h"
 #include "files.h"
 #include "game.h"
+#include "tape.h"
 
 /* positions in the level editor */
 #define ED_WIN_MB_LEFT_XPOS	7
@@ -85,6 +86,24 @@
 #define ED_AREA_ELEMCONT_XPOS	(TILEX)
 #define ED_AREA_ELEMCONT_YPOS	(10 * TILEY)
 
+/* values for scrolling gadgets */
+#define ED_SCROLL_UP_XPOS	(SXSIZE - ED_SCROLLBUTTON_XSIZE)
+#define ED_SCROLL_UP_YPOS	(0)
+#define ED_SCROLL_DOWN_XPOS	ED_SCROLL_UP_XPOS
+#define ED_SCROLL_DOWN_YPOS	(SYSIZE - TILEX - ED_SCROLLBUTTON_YSIZE)
+#define ED_SCROLL_LEFT_XPOS	(0)
+#define ED_SCROLL_LEFT_YPOS	(SYSIZE - ED_SCROLLBUTTON_YSIZE)
+#define ED_SCROLL_RIGHT_XPOS	(SXSIZE - TILEX - ED_SCROLLBUTTON_XSIZE)
+#define ED_SCROLL_RIGHT_YPOS	ED_SCROLL_LEFT_YPOS
+#define ED_SCROLL_VERTICAL_XPOS		ED_SCROLL_UP_XPOS
+#define ED_SCROLL_VERTICAL_YPOS		(ED_SCROLL_UP_YPOS + 20)
+#define ED_SCROLL_VERTICAL_XSIZE	30
+#define ED_SCROLL_VERTICAL_YSIZE	(SYSIZE - TILEY - 2 * 20)
+#define ED_SCROLL_HORIZONTAL_XPOS	(ED_SCROLL_LEFT_XPOS + 30)
+#define ED_SCROLL_HORIZONTAL_YPOS	(SYSIZE - 30)
+#define ED_SCROLL_HORIZONTAL_XSIZE	(SXSIZE - TILEX - 2*30)
+#define ED_SCROLL_HORIZONTAL_YSIZE	30
+
 /* control button identifiers */
 #define ED_CTRL_ID_SINGLE_ITEMS		0
 #define ED_CTRL_ID_CONNECTED_ITEMS	1
@@ -121,33 +140,88 @@
 #define ED_CTRL_ID_ELEMCONT_7		34
 #define ED_CTRL_ID_AMOEBA_CONTENT	35
 
-#define ED_NUM_GADGETS			36
+/* text input identifiers */
+#define ED_CTRL_ID_LEVEL_NAME		36
+
+/* gadgets for scrolling of drawing area */
+#define ED_CTRL_ID_SCROLL_UP		37
+#define ED_CTRL_ID_SCROLL_DOWN		38
+#define ED_CTRL_ID_SCROLL_LEFT		39
+#define ED_CTRL_ID_SCROLL_RIGHT		40
+#define ED_CTRL_ID_SCROLL_VERTICAL	41
+#define ED_CTRL_ID_SCROLL_HORIZONTAL	42
+
+#define ED_NUM_GADGETS			43
 
 /* values for counter gadgets */
 #define ED_COUNTER_SCORE		0
 #define ED_COUNTER_ELEMCONT		1
 
-#define ED_NUM_COUNTERS			2
+#define ED_NUM_COUNTERBUTTONS		2
+#define ED_NUM_SCROLLBUTTONS		4
+#define ED_NUM_SCROLLBARS		2
+
+/* values for CopyLevelToUndoBuffer() */
+#define UNDO_IMMEDIATE			0
+#define UNDO_ACCUMULATE			1
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+} counterbutton_info[ED_NUM_COUNTERBUTTONS] =
+{
+  { 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 }
+};
+
+static struct
+{
+  int xpos, ypos;
+  int x, y;
+  int gadget_id;
+} scrollbutton_info[ED_NUM_SCROLLBUTTONS] =
+{
+  { ED_BUTTON_UP_XPOS,      ED_BUTTON_UP_YPOS,
+    ED_SCROLL_UP_XPOS,      ED_SCROLL_UP_YPOS,      ED_CTRL_ID_SCROLL_UP },
+  { ED_BUTTON_DOWN_XPOS,    ED_BUTTON_DOWN_YPOS,
+    ED_SCROLL_DOWN_XPOS,    ED_SCROLL_DOWN_YPOS,    ED_CTRL_ID_SCROLL_DOWN },
+  { ED_BUTTON_LEFT_XPOS,    ED_BUTTON_LEFT_YPOS,
+    ED_SCROLL_LEFT_XPOS,    ED_SCROLL_LEFT_YPOS,    ED_CTRL_ID_SCROLL_LEFT },
+  { ED_BUTTON_RIGHT_XPOS,   ED_BUTTON_RIGHT_YPOS,
+    ED_SCROLL_RIGHT_XPOS,   ED_SCROLL_RIGHT_YPOS,   ED_CTRL_ID_SCROLL_RIGHT }
+};
 
 static struct
 {
+  int xpos, ypos;
   int x, y;
+  int width, height;
+  int type;
   int gadget_id;
-} counter_info[ED_NUM_COUNTERS] =
+} scrollbar_info[ED_NUM_SCROLLBARS] =
 {
-  { 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 }
+  { GAME_CONTROL_XPOS,		GAME_CONTROL_YPOS - GAME_BUTTON_YSIZE,
+    ED_SCROLL_VERTICAL_XPOS,	ED_SCROLL_VERTICAL_YPOS,
+    ED_SCROLL_VERTICAL_XSIZE,	ED_SCROLL_VERTICAL_YSIZE,
+    GD_TYPE_SCROLLBAR_VERTICAL,
+    ED_CTRL_ID_SCROLL_VERTICAL },
+  { GAME_CONTROL_XPOS,		GAME_CONTROL_YPOS - GAME_BUTTON_YSIZE,
+    ED_SCROLL_HORIZONTAL_XPOS,	ED_SCROLL_HORIZONTAL_YPOS,
+    ED_SCROLL_HORIZONTAL_XSIZE,	ED_SCROLL_HORIZONTAL_YSIZE,
+    GD_TYPE_SCROLLBAR_HORIZONTAL,
+    ED_CTRL_ID_SCROLL_HORIZONTAL },
 };
 
+
 /* 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 CopyLevelToUndoBuffer(int);
 static void HandleControlButtons(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleTextInputGadgets(struct GadgetInfo *);
 
 static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
 static boolean level_editor_gadgets_created = FALSE;
@@ -157,7 +231,7 @@ 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 FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static int undo_buffer_position = 0;
 static int undo_buffer_steps = 0;
@@ -552,24 +626,27 @@ 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);
+  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));
+  XCopyArea(display, drawto, drawto, gc,
+	    SX + (dx == -1 ? MINI_TILEX : 0),
+	    SY + (dy == -1 ? MINI_TILEY : 0),
+	    (ED_FIELDX * MINI_TILEX) - (dx != 0 ? MINI_TILEX : 0),
+	    (ED_FIELDY * MINI_TILEY) - (dy != 0 ? MINI_TILEY : 0),
+	    SX + (dx == +1 ? MINI_TILEX : 0),
+	    SY + (dy == +1 ? MINI_TILEY : 0));
   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);
+    x = (dx == 1 ? 0 : ED_FIELDX - 1);
+    for(y=0; y<ED_FIELDY; y++)
+      DrawMiniElementOrWall(x, y, from_x, from_y);
   }
   else if (dy)
   {
-    y = (dy==1 ? 0 : 2*SCR_FIELDY-1);
-    for(x=0;x<2*SCR_FIELDX;x++)
-      DrawMiniElementOrWall(x,y,from_x,from_y);
+    y = (dy == 1 ? 0 : ED_FIELDY - 1);
+    for(x=0; x<ED_FIELDX; x++)
+      DrawMiniElementOrWall(x, y, from_x, from_y);
   }
 
   redraw_mask |= REDRAW_FIELD;
@@ -586,20 +663,21 @@ void InitLevelEditorGadgets()
 
 static void CreateControlButtons()
 {
+  Pixmap gd_pixmap = pix[PIX_DOOR];
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
   int i;
 
+  /* create toolbox buttons */
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
   {
-    Pixmap gd_pixmap = pix[PIX_DOOR];
-    struct GadgetInfo *gi;
+    int id = i;
+    int width, height;
     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 ||
@@ -679,21 +757,52 @@ static void CreateControlButtons()
 
     level_editor_gadget[id] = gi;
   }
+
+  /* create buttons for scrolling of drawing area */
+  for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+  {
+    int id = scrollbutton_info[i].gadget_id;
+    int gd_x1, gd_x2, gd_y;
+
+    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+
+    gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
+    gd_x2 = DOOR_GFX_PAGEX5 + scrollbutton_info[i].xpos;
+    gd_y  = DOOR_GFX_PAGEY2 + scrollbutton_info[i].ypos;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, SX + scrollbutton_info[i].x,
+		      GDI_Y, SY + scrollbutton_info[i].y,
+		      GDI_WIDTH, ED_SCROLLBUTTON_XSIZE,
+		      GDI_HEIGHT, ED_SCROLLBUTTON_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, 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 (i=0; i<ED_NUM_COUNTERBUTTONS; i++)
   {
     for (j=0; j<2; j++)
     {
       Pixmap gd_pixmap = pix[PIX_DOOR];
       struct GadgetInfo *gi;
+      int id = counterbutton_info[i].gadget_id + j;
       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;
@@ -704,8 +813,8 @@ static void CreateCounterButtons()
       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_X, SX + counterbutton_info[i].x + gd_xoffset,
+			GDI_Y, SY + counterbutton_info[i].y,
 			GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
 			GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
 			GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
@@ -740,9 +849,14 @@ static void CreateDrawingAreas()
   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_AREA_SIZE, ED_FIELDX, ED_FIELDY,
 		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
 		    GDI_EVENT_MASK, event_mask,
 		    GDI_CALLBACK, HandleDrawingAreas,
@@ -796,6 +910,95 @@ static void CreateDrawingAreas()
   level_editor_gadget[id] = gi;
 }
 
+static void CreateTextInputGadgets()
+{
+  Pixmap gd_pixmap = pix[PIX_DOOR];
+  int gd_x, gd_y;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+  int id;
+
+  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_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
+		    GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
+		    GDI_DESIGN_BORDER, 3,
+		    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 CreateScrollbarGadgets()
+{
+  int i;
+
+  for (i=0; i<ED_NUM_SCROLLBARS; i++)
+  {
+    int id = scrollbar_info[i].gadget_id;
+    Pixmap gd_pixmap = pix[PIX_DOOR];
+    int gd_x1, gd_x2, gd_y;
+    struct GadgetInfo *gi;
+    int items_max, items_visible, item_position;
+    unsigned long event_mask;
+
+    if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+    {
+      items_max = lev_fieldx + 2;
+      items_visible = ED_FIELDX;
+      item_position = 0;
+    }
+    else
+    {
+      items_max = lev_fieldy + 2;
+      items_visible = ED_FIELDY;
+      item_position = 0;
+    }
+
+    event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+    gd_x1 = DOOR_GFX_PAGEX4 + scrollbar_info[i].xpos;
+    gd_x2 = DOOR_GFX_PAGEX3 + scrollbar_info[i].xpos;
+    gd_y  = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, SX + scrollbar_info[i].x,
+		      GDI_Y, SY + scrollbar_info[i].y,
+		      GDI_WIDTH, scrollbar_info[i].width,
+		      GDI_HEIGHT, scrollbar_info[i].height,
+		      GDI_TYPE, scrollbar_info[i].type,
+		      GDI_SCROLLBAR_ITEMS_MAX, items_max,
+		      GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+		      GDI_SCROLLBAR_ITEM_POSITION, item_position,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+		      GDI_DESIGN_BORDER, 3,
+		      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 CreateLevelEditorGadgets()
 {
   if (level_editor_gadgets_created)
@@ -804,6 +1007,8 @@ static void CreateLevelEditorGadgets()
   CreateControlButtons();
   CreateCounterButtons();
   CreateDrawingAreas();
+  CreateTextInputGadgets();
+  CreateScrollbarGadgets();
 
   level_editor_gadgets_created = TRUE;
 }
@@ -821,7 +1026,7 @@ static void MapCounterButtons(int id)
   int i;
 
   for (i=0; i<2; i++)
-    MapGadget(level_editor_gadget[counter_info[id].gadget_id + i]);
+    MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id + i]);
 }
 
 static void MapDrawingArea(int id)
@@ -829,8 +1034,21 @@ static void MapDrawingArea(int id)
   MapGadget(level_editor_gadget[id]);
 }
 
+static void MapTextInputGadget(int id)
+{
+  MapGadget(level_editor_gadget[id]);
+}
+
 static void MapMainDrawingArea()
 {
+  int i;
+
+  for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+    MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
+
+  for (i=0; i<ED_NUM_SCROLLBARS; i++)
+    MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
+
   MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
 }
 
@@ -859,13 +1077,15 @@ void DrawLevelEd()
 {
   int i, x, y, graphic;
 
-  level_xpos=-1;
-  level_ypos=-1;
+  level_xpos = -1;
+  level_ypos = -1;
   edit_mode = ED_MODE_DRAWING;
   name_typing = FALSE;
 
   CloseDoor(DOOR_CLOSE_ALL);
 
+  OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
+
   if (level_editor_test_game)
   {
     for(x=0; x<lev_fieldx; x++)
@@ -874,7 +1094,7 @@ void DrawLevelEd()
 
     for(x=0; x<lev_fieldx; x++)
       for(y=0; y<lev_fieldy; y++)
-	Ur[x][y] = OrigBackup[x][y];
+	Ur[x][y] = FieldBackup[x][y];
 
     level_editor_test_game = FALSE;
   }
@@ -882,11 +1102,13 @@ void DrawLevelEd()
   {
     undo_buffer_position = -1;
     undo_buffer_steps = -1;
-    CopyLevelToUndoBuffer();
+    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
   }
 
-  DrawMiniLevel(level_xpos,level_ypos);
+  /*
+  DrawMiniLevel(level_xpos, level_ypos);
   FadeToFront();
+  */
 
   XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
 	    DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
@@ -968,7 +1190,13 @@ void DrawLevelEd()
     CreateLevelEditorGadgets();
 
   MapControlButtons();
+
+  /*
   MapMainDrawingArea();
+  */
+
+  DrawDrawingWindow();
+  FadeToFront();
 
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
@@ -1138,16 +1366,16 @@ void AdjustLevelScrollPosition()
 {
   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 - ED_FIELDX + 1)
+    level_xpos = lev_fieldx - ED_FIELDX + 1;
+  if (lev_fieldx < ED_FIELDX - 2)
     level_xpos = -1;
 
   if (level_ypos < -1)
     level_ypos = -1;
-  if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
-    level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
-  if (lev_fieldy < 2*SCR_FIELDY - 2)
+  if (level_ypos > lev_fieldy - ED_FIELDY + 1)
+    level_ypos = lev_fieldy - ED_FIELDY + 1;
+  if (lev_fieldy < ED_FIELDY - 2)
     level_ypos = -1;
 }
 
@@ -1216,9 +1444,9 @@ void LevelEd(int mx, int my, int button)
 
 	if (x>lev_fieldx || y>lev_fieldy ||
 	    (x==0 && level_xpos<0) ||
-	    (x==2*SCR_FIELDX-1 && level_xpos>lev_fieldx-2*SCR_FIELDX) ||
+	    (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
 	    (y==0 && level_ypos<0) ||
-	    (y==2*SCR_FIELDY-1 && level_ypos>lev_fieldy-2*SCR_FIELDY))
+	    (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY))
 	  return;
 
 	from_x = x+level_xpos;
@@ -1323,7 +1551,7 @@ void LevelEd(int mx, int my, int button)
 	  {
 	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
-	    if (lev_fieldx<2*SCR_FIELDX-2)
+	    if (lev_fieldx<ED_FIELDX-2)
 	      break;
 
 	    level_xpos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
@@ -1336,16 +1564,16 @@ void LevelEd(int mx, int my, int button)
 	  }
 	  break;
 	case ED_BUTTON_RIGHT:
-	  if (level_xpos<=lev_fieldx-2*SCR_FIELDX)
+	  if (level_xpos<=lev_fieldx-ED_FIELDX)
 	  {
 	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
-	    if (lev_fieldx<2*SCR_FIELDX-2)
+	    if (lev_fieldx<ED_FIELDX-2)
 	      break;
 
 	    level_xpos += (button==1 ? 1 : button==2 ? 5 : lev_fieldx);
-	    if (level_xpos>lev_fieldx-2*SCR_FIELDX+1)
-	      level_xpos = lev_fieldx-2*SCR_FIELDX+1;
+	    if (level_xpos>lev_fieldx-ED_FIELDX+1)
+	      level_xpos = lev_fieldx-ED_FIELDX+1;
 	    if (button==1)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_LEFT);
 	    else
@@ -1357,7 +1585,7 @@ void LevelEd(int mx, int my, int button)
 	  {
 	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
-	    if (lev_fieldy<2*SCR_FIELDY-2)
+	    if (lev_fieldy<ED_FIELDY-2)
 	      break;
 
 	    level_ypos -= (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
@@ -1370,16 +1598,16 @@ void LevelEd(int mx, int my, int button)
 	  }
 	  break;
 	case ED_BUTTON_DOWN:
-	  if (level_ypos<=lev_fieldy-2*SCR_FIELDY)
+	  if (level_ypos<=lev_fieldy-ED_FIELDY)
 	  {
 	    if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY))
 	      break;
-	    if (lev_fieldy<2*SCR_FIELDY-2)
+	    if (lev_fieldy<ED_FIELDY-2)
 	      break;
 
 	    level_ypos += (button==1 ? 1 : button==2 ? 5 : lev_fieldy);
-	    if (level_ypos>lev_fieldy-2*SCR_FIELDY+1)
-	      level_ypos = lev_fieldy-2*SCR_FIELDY+1;
+	    if (level_ypos>lev_fieldy-ED_FIELDY+1)
+	      level_ypos = lev_fieldy-ED_FIELDY+1;
 	    if (button==1)
 	      ScrollMiniLevel(level_xpos,level_ypos,ED_SCROLL_UP);
 	    else
@@ -1405,9 +1633,9 @@ void LevelEd(int mx, int my, int button)
 
 	if (!button || !in_field_pressed || button<1 || button>3 ||
 	    (y==0 && level_ypos<0) ||
-	    (y==2*SCR_FIELDY-1 && level_ypos>lev_fieldy-2*SCR_FIELDY) ||
+	    (y==ED_FIELDY-1 && level_ypos>lev_fieldy-ED_FIELDY) ||
 	    (x==0 && level_xpos<0) ||
-	    (x==2*SCR_FIELDX-1 && level_xpos>lev_fieldx-2*SCR_FIELDX) ||
+	    (x==ED_FIELDX-1 && level_xpos>lev_fieldx-ED_FIELDX) ||
 	    x>lev_fieldx || y>lev_fieldy)
 	  return;
 
@@ -1426,8 +1654,8 @@ void LevelEd(int mx, int my, int button)
 	      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)
+		if (x-level_xpos>=0 && x-level_xpos<ED_FIELDX &&
+		    y-level_ypos>=0 && y-level_ypos<ED_FIELDY)
 		  DrawMiniElement(x-level_xpos,y-level_ypos,EL_LEERRAUM);
 	      }
 	    }
@@ -1628,7 +1856,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)
@@ -1842,8 +2072,8 @@ 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;
+  int x = SX + counterbutton_info[counter_id].x + ED_WIN_COUNT_XPOS;
+  int y = SY + counterbutton_info[counter_id].y;
 
   XCopyArea(display, pix[PIX_DOOR], drawto, gc,
 	    DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
@@ -1884,8 +2114,8 @@ static void DrawElementContentAreas()
   /* 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;
+  x = counterbutton_info[ED_COUNTER_ELEMCONT].x + DXSIZE;
+  y = counterbutton_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);
@@ -2067,8 +2297,8 @@ static void DrawPropertiesWindow()
   {
     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;
+      int x = counterbutton_info[ED_COUNTER_SCORE].x + DXSIZE;
+      int y = counterbutton_info[ED_COUNTER_SCORE].y;
 
       gadget_score_value = elements_with_counter[i].counter_value;
       DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
@@ -2086,6 +2316,9 @@ static void DrawPropertiesWindow()
     else
       DrawElementContentAreas();
   }
+
+  /* TEST ONLY: level name text input gadget */
+  MapTextInputGadget(ED_CTRL_ID_LEVEL_NAME);
 }
 
 static void swap_numbers(int *i1, int *i2)
@@ -2275,7 +2508,7 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, int mode)
     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();
+    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
   }
 }
 
@@ -2379,9 +2612,9 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
 	delete_buffer[sx - start_sx] = Feld[lx][ly];
 	Feld[lx][ly] = letter_element;
 
-	if (sx + 1 < 2*SCR_FIELDX && lx + 1 < lev_fieldx)
+	if (sx + 1 < ED_FIELDX && lx + 1 < lev_fieldx)
 	  DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR);
-	else if (sy + 1 < 2*SCR_FIELDY && ly + 1 < lev_fieldy)
+	else if (sy + 1 < ED_FIELDY && ly + 1 < lev_fieldy)
 	  DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
 	else
 	  DrawLevelText(0, 0, 0, TEXT_END);
@@ -2398,14 +2631,14 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
       break;
 
     case TEXT_NEWLINE:
-      if (sy + 1 < 2*SCR_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
+      if (sy + 1 < ED_FIELDY - 1 && ly + 1 < lev_fieldy - 1)
 	DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR);
       else
 	DrawLevelText(0, 0, 0, TEXT_END);
       break;
 
     case TEXT_END:
-      CopyLevelToUndoBuffer();
+      CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       DrawMiniElement(sx, sy, Feld[lx][ly]);
       typing = FALSE;
       break;
@@ -2415,18 +2648,45 @@ static void DrawLevelText(int sx, int sy, char letter, int mode)
   }
 }
 
-static void CopyLevelToUndoBuffer()
+static void CopyLevelToUndoBuffer(int mode)
 {
+  static boolean accumulated_undo = FALSE;
+  boolean new_undo_buffer_position = TRUE;
   int x, y;
 
-  undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
+  switch (mode)
+  {
+    case UNDO_IMMEDIATE:
+      accumulated_undo = FALSE;
+      break;
 
-  if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
-    undo_buffer_steps++;
+    case UNDO_ACCUMULATE:
+      if (accumulated_undo)
+	new_undo_buffer_position = FALSE;
+      accumulated_undo = TRUE;
+      break;
+
+    default:
+      break;
+  }
+
+  if (new_undo_buffer_position)
+  {
+    /* new position in undo buffer ring */
+    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];
+#if 0
+#ifdef DEBUG
+  printf("level saved to undo buffer\n");
+#endif
+#endif
 }
 
 static void RandomPlacement(int button)
@@ -2463,7 +2723,26 @@ static void RandomPlacement(int button)
   }
 
   DrawMiniLevel(level_xpos, level_ypos);
-  CopyLevelToUndoBuffer();
+  CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
+
+void WrapLevel(int dx, int dy)
+{
+  int wrap_dx = lev_fieldx - dx;
+  int wrap_dy = lev_fieldy - dy;
+  int x, y;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++)
+      FieldBackup[x][y] = Feld[x][y];
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++)
+      Feld[x][y] =
+	FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
+
+  DrawMiniLevel(level_xpos, level_ypos);
+  CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
 static void HandleDrawingAreas(struct GadgetInfo *gi)
@@ -2478,7 +2757,11 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   int new_element;
   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;
 
   /*
@@ -2489,23 +2772,24 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   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)
   {
-    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);
+    /* get positions inside level field */
     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);
+    /* 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;
   }
-  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;
@@ -2529,7 +2813,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       if (draw_level)
       {
 	if (button_release_event)
-	  CopyLevelToUndoBuffer();
+	  CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 
 	if (!button)
 	  break;
@@ -2546,8 +2830,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 		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)
+		  if (x - level_xpos >= 0 && x - level_xpos < ED_FIELDX &&
+		      y - level_ypos >= 0 && y - level_ypos < ED_FIELDY)
 		    DrawMiniElement(x - level_xpos, y - level_ypos,
 				    EL_LEERRAUM);
 		}
@@ -2584,7 +2868,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	static int last_sy = -1;
 
 	if (button_release_event)
-	  CopyLevelToUndoBuffer();
+	  CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 
 	if (button)
 	{
@@ -2632,7 +2916,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	    draw_with_brush = TRUE;
 	  }
 	  else
-	    CopyLevelToUndoBuffer();
+	    CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 	}
 	else if (last_sx != sx || last_sy != sy)
 	{
@@ -2654,7 +2938,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       {
 	FloodFill(lx, ly, new_element);
 	DrawMiniLevel(level_xpos, level_ypos);
-	CopyLevelToUndoBuffer();
+	CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       }
       break;
 
@@ -2723,7 +3007,8 @@ static void HandleControlButtons(struct GadgetInfo *gi)
   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)
+  if (id < ED_NUM_CTRL1_BUTTONS && id != ED_CTRL_ID_PROPERTIES &&
+      edit_mode != ED_MODE_DRAWING)
   {
     DrawDrawingWindow();
     edit_mode = ED_MODE_DRAWING;
@@ -2731,55 +3016,58 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
   switch (id)
   {
-    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:
-    case ED_CTRL_ID_PICK_ELEMENT:
-      last_drawing_function = drawing_function;
-      drawing_function = id;
-      break;
-
-    case ED_CTRL_ID_WRAP_LEFT:
+    case ED_CTRL_ID_SCROLL_LEFT:
       if (level_xpos >= 0)
       {
-	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+	struct GadgetScrollbar *gs = &gi->scrollbar;
+
+	if (lev_fieldx < ED_FIELDX - 2)
 	  break;
 
 	level_xpos -= step;
-	if (level_xpos <- 1)
+	if (level_xpos < -1)
 	  level_xpos = -1;
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
 	else
 	  DrawMiniLevel(level_xpos, level_ypos);
+
+	AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
       }
       break;
 
-    case ED_CTRL_ID_WRAP_RIGHT:
-      if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
+    case ED_CTRL_ID_SCROLL_RIGHT:
+      if (level_xpos <= lev_fieldx - ED_FIELDX)
       {
-	if (lev_fieldx < 2*SCR_FIELDX - 2)
+	int gadget_id = ED_CTRL_ID_SCROLL_HORIZONTAL;
+	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+	struct GadgetScrollbar *gs = &gi->scrollbar;
+
+	if (lev_fieldx < ED_FIELDX - 2)
 	  break;
 
 	level_xpos += step;
-	if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
-	  level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+	if (level_xpos > lev_fieldx - ED_FIELDX + 1)
+	  level_xpos = lev_fieldx - ED_FIELDX + 1;
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
 	else
 	  DrawMiniLevel(level_xpos, level_ypos);
+
+	AdjustScrollbar(gi, gs->items_max, level_xpos + 1);
       }
       break;
 
-    case ED_CTRL_ID_WRAP_UP:
+    case ED_CTRL_ID_SCROLL_UP:
       if (level_ypos >= 0)
       {
-	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+	struct GadgetScrollbar *gs = &gi->scrollbar;
+
+	if (lev_fieldy < ED_FIELDY - 2)
 	  break;
 
 	level_ypos -= step;
@@ -2789,35 +3077,90 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
 	else
 	  DrawMiniLevel(level_xpos, level_ypos);
+
+	AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
       }
       break;
 
-    case ED_CTRL_ID_WRAP_DOWN:
-      if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
+    case ED_CTRL_ID_SCROLL_DOWN:
+      if (level_ypos <= lev_fieldy - ED_FIELDY)
       {
-	if (lev_fieldy < 2*SCR_FIELDY - 2)
+	int gadget_id = ED_CTRL_ID_SCROLL_VERTICAL;
+	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+	struct GadgetScrollbar *gs = &gi->scrollbar;
+
+	if (lev_fieldy < ED_FIELDY - 2)
 	  break;
 
 	level_ypos += step;
-	if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
-	  level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+	if (level_ypos > lev_fieldy - ED_FIELDY + 1)
+	  level_ypos = lev_fieldy - ED_FIELDY + 1;
 	if (button == 1)
 	  ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
 	else
 	  DrawMiniLevel(level_xpos, level_ypos);
+
+	AdjustScrollbar(gi, gs->items_max, level_ypos + 1);
       }
       break;
 
-    case ED_CTRL_ID_PROPERTIES:
-      properties_element = new_element;
-      DrawPropertiesWindow();
-      edit_mode = ED_MODE_PROPERTIES;
+    case ED_CTRL_ID_SCROLL_HORIZONTAL:
+      level_xpos = gi->event.item_position - 1;
+      DrawMiniLevel(level_xpos, level_ypos);
+      break;
+
+    case ED_CTRL_ID_SCROLL_VERTICAL:
+      level_ypos = gi->event.item_position - 1;
+      DrawMiniLevel(level_xpos, level_ypos);
+      break;
+
+    case ED_CTRL_ID_WRAP_LEFT:
+      WrapLevel(-step, 0);
+      break;
+
+    case ED_CTRL_ID_WRAP_RIGHT:
+      WrapLevel(step, 0);
+      break;
+
+    case ED_CTRL_ID_WRAP_UP:
+      WrapLevel(0, -step);
+      break;
+
+    case ED_CTRL_ID_WRAP_DOWN:
+      WrapLevel(0, step);
+      break;
+
+    case ED_CTRL_ID_SINGLE_ITEMS:
+    case ED_CTRL_ID_CONNECTED_ITEMS:
+    case ED_CTRL_ID_LINE:
+    case ED_CTRL_ID_TEXT:
+    case ED_CTRL_ID_RECTANGLE:
+    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_RANDOM_PLACEMENT:
       RandomPlacement(button);
       break;
 
+    case ED_CTRL_ID_PROPERTIES:
+      if (edit_mode != ED_MODE_PROPERTIES)
+      {
+	properties_element = new_element;
+	DrawPropertiesWindow();
+	edit_mode = ED_MODE_PROPERTIES;
+      }
+      else
+      {
+	DrawDrawingWindow();
+	edit_mode = ED_MODE_DRAWING;
+      }
+      break;
+
     case ED_CTRL_ID_UNDO:
       if (undo_buffer_steps == 0)
       {
@@ -2852,7 +3195,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       for(x=0; x<MAX_LEV_FIELDX; x++) 
 	for(y=0; y<MAX_LEV_FIELDY; y++) 
 	  Feld[x][y] = new_element3;
-      CopyLevelToUndoBuffer();
+      CopyLevelToUndoBuffer(ED_CTRL_ID_CLEAR);
 
       DrawMiniLevel(level_xpos, level_ypos);
       break;
@@ -2877,7 +3220,9 @@ static 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)
@@ -2897,7 +3242,9 @@ static 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)
@@ -2906,14 +3253,31 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       {
 	for(x=0; x<lev_fieldx; x++)
 	  for(y=0; y<lev_fieldy; y++)
-	    OrigBackup[x][y] = Ur[x][y];
+	    FieldBackup[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];
 
+	UnmapLevelEditorGadgets();
+
+	/* draw smaller door */
+	XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+		  DOOR_GFX_PAGEX7, 64,
+		  108, 64,
+		  EX - 4, EY - 12);
+	redraw_mask |= REDRAW_ALL;
+
+	CloseDoor(DOOR_CLOSE_ALL);
+
+	DrawCompleteVideoDisplay();
+
+	if (setup.autorecord)
+	  TapeStartRecording();
+
 	level_editor_test_game = TRUE;
 	game_status = PLAYING;
+
 	InitGame();
       }
       break;
@@ -2955,6 +3319,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     default:
+#ifdef DEBUG
       if (gi->event.type == GD_EVENT_PRESSED)
 	printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
       else if (gi->event.type == GD_EVENT_RELEASED)
@@ -2963,6 +3328,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 	printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
       else
 	printf("default: HandleControlButtons: ?\n");
+#endif
       break;
   }
 }
@@ -2971,19 +3337,7 @@ void HandleLevelEditorKeyInput(KeySym key)
 {
   if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT)
   {
-    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 = '>';
+    char letter = getCharFromKeySym(key);
 
     /* map lower case letters to upper case */
     if (letter >= 'a' && letter <= 'z')
@@ -3003,3 +3357,18 @@ void HandleLevelEditorKeyInput(KeySym key)
       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;
+  }
+}