X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=d92e27781d48dbf20e0e95667e1a2917854e249c;hb=e6856beb007b3f09036a04290c6b162953ddfece;hp=4ae9f6fde6adc8acbf0a2d0280c1bab54d1f32b0;hpb=b4045ec83a11b71b7348575d2c76783cde14dccd;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 4ae9f6fd..d92e2778 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -48,6 +48,9 @@
 #define RANDOM_USE_PERCENTAGE	0
 #define RANDOM_USE_NUM_OBJECTS	1
 
+/* values for elements with content */
+#define MAX_ELEMCONT		8
+
 /* values for the control window */
 #define ED_CTRL_BUTTONS_GFX_YPOS 	236
 #define ED_CTRL_BUTTONS_ALT_GFX_YPOS 	142
@@ -68,11 +71,19 @@
 #define ED_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
 
-/* values for other gadgets */
-#define ED_SCORE_XPOS		TILEX
-#define ED_SCORE_YPOS		(7 * TILEY)
+/* 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
@@ -90,7 +101,7 @@
 #define ED_CTRL_ID_RANDOM_PLACEMENT	12
 #define ED_CTRL_ID_BRUSH		13
 #define ED_CTRL_ID_WRAP_DOWN		14
-#define ED_CTRL_ID_UNUSED2		15
+#define ED_CTRL_ID_PICK_ELEMENT		15
 #define ED_CTRL_ID_UNDO			16
 #define ED_CTRL_ID_INFO			17
 #define ED_CTRL_ID_SAVE			18
@@ -101,16 +112,25 @@
 /* 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	24
+#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			25
+#define ED_NUM_GADGETS			37
 
 /* values for counter gadgets */
 #define ED_COUNTER_SCORE		0
+#define ED_COUNTER_ELEMCONT		1
 
-#define ED_NUM_COUNTERS			1
+#define ED_NUM_COUNTERS			2
 
 static struct
 {
@@ -118,22 +138,29 @@ static struct
   int gadget_id;
 } counter_info[ED_NUM_COUNTERS] =
 {
-  { ED_SCORE_XPOS,	ED_SCORE_YPOS,		ED_CTRL_ID_SCORE_DOWN }
+  { ED_COUNT_SCORE_XPOS,	ED_COUNT_SCORE_YPOS,
+    ED_CTRL_ID_SCORE_DOWN },
+  { ED_COUNT_ELEMCONT_XPOS,	ED_COUNT_ELEMCONT_YPOS,
+    ED_CTRL_ID_ELEMCONT_DOWN }
 };
 
 /* forward declaration for internal use */
 static void DrawDrawingWindow();
-static void DrawPropertiesWindow(int);
+static void DrawPropertiesWindow();
 static void CopyLevelToUndoBuffer();
-static void HandleDrawingAreas(struct GadgetInfo *);
-static void HandleCounterButtons(struct GadgetInfo *);
 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;
 
 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;
@@ -149,6 +176,7 @@ static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
 
 /* pointer to score value */
 static int *gadget_score_value;
+static int *gadget_areas_value;
 
 static int level_xpos,level_ypos;
 static int edit_mode;
@@ -157,7 +185,8 @@ 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'),
@@ -181,7 +210,7 @@ int editor_element[] =
   EL_BETON,
 
   EL_FELSBODEN,
-  EL_SIEB2_LEER,
+  EL_SIEB2_INAKTIV,
   EL_AUSGANG_ZU,
   EL_AUSGANG_AUF,
 
@@ -228,7 +257,7 @@ int editor_element[] =
   EL_BETON,
   EL_MAUERWERK,
   EL_FELSBODEN,
-  EL_SIEB_LEER,
+  EL_SIEB_INAKTIV,
 
   EL_EDELSTEIN,
   EL_DIAMANT,
@@ -340,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'),
@@ -355,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'),
@@ -449,7 +548,8 @@ 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);
 
@@ -512,7 +612,8 @@ static void CreateControlButtons()
 	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_BRUSH ||
+	id == ED_CTRL_ID_PICK_ELEMENT)
     {
       button_type = GD_TYPE_RADIO_BUTTON;
       radio_button_nr = 1;
@@ -584,43 +685,46 @@ static void CreateControlButtons()
   }
 }
 
-static void CreateCounterButtons(int counter_id)
+static void CreateCounterButtons()
 {
-  int i;
+  int i, j;
 
-  for (i=0; i<2; i++)
+  for (i=0; i<ED_NUM_COUNTERS; i++)
   {
-    Pixmap gd_pixmap = pix[PIX_DOOR];
-    struct GadgetInfo *gi;
-    int gd_xoffset;
-    int gd_x1, gd_x2, gd_y;
-    int id = counter_info[counter_id].gadget_id + i;
-    unsigned long event_mask;
-
-    event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
-
-    gd_xoffset = (i == 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[counter_id].x + gd_xoffset,
-		      GDI_Y, SY + counter_info[counter_id].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;
+    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;
+    }
   }
 }
 
@@ -628,12 +732,16 @@ static void CreateDrawingAreas()
 {
   struct GadgetInfo *gi;
   unsigned long event_mask;
+  int id;
+  int i;
 
   event_mask =
     GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING |
     GD_EVENT_OFF_BORDERS;
 
-  gi = CreateGadget(GDI_CUSTOM_ID, ED_CTRL_ID_DRAWING_LEVEL,
+  /* 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,
@@ -647,7 +755,82 @@ static void CreateDrawingAreas()
   if (gi == NULL)
     Error(ERR_EXIT, "cannot create gadget");
 
-  level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL] = gi;
+  level_editor_gadget[id] = gi;
+
+  /* ... up to eight areas for element content ... */
+  for (i=0; i<MAX_ELEMCONT; i++)
+  {
+    int gx = SX + ED_AREA_ELEMCONT_XPOS + 5 * (i % 4) * MINI_TILEX;
+    int gy = SX + ED_AREA_ELEMCONT_YPOS + 6 * (i / 4) * MINI_TILEY;
+
+    id = ED_CTRL_ID_ELEMCONT_0 + i;
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_X, gx,
+		      GDI_Y, gy,
+		      GDI_WIDTH, 3 * MINI_TILEX,
+		      GDI_HEIGHT, 3 * MINI_TILEY,
+		      GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		      GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK, HandleDrawingAreas,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+
+  /* ... and one for the amoeba content */
+  id = ED_CTRL_ID_AMOEBA_CONTENT;
+  gi = CreateGadget(GDI_CUSTOM_ID, id,
+		    GDI_X, SX + ED_AREA_ELEMCONT_XPOS,
+		    GDI_Y, SY + ED_AREA_ELEMCONT_YPOS,
+		    GDI_WIDTH, MINI_TILEX,
+		    GDI_HEIGHT, MINI_TILEY,
+		    GDI_TYPE, GD_TYPE_DRAWING_AREA,
+		    GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+		    GDI_EVENT_MASK, event_mask,
+		    GDI_CALLBACK, HandleDrawingAreas,
+		    GDI_END);
+
+  if (gi == NULL)
+    Error(ERR_EXIT, "cannot create gadget");
+
+  level_editor_gadget[id] = gi;
+}
+
+static void 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_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()
@@ -656,8 +839,9 @@ static void CreateLevelEditorGadgets()
     return;
 
   CreateControlButtons();
-  CreateCounterButtons(ED_COUNTER_SCORE);
+  CreateCounterButtons();
   CreateDrawingAreas();
+  CreateTextInputGadgets();
 
   level_editor_gadgets_created = TRUE;
 }
@@ -670,17 +854,32 @@ static void MapControlButtons()
     MapGadget(level_editor_gadget[i]);
 }
 
-static void MapCounterButtons(int counter_id)
+static void MapCounterButtons(int id)
 {
   int i;
 
   for (i=0; i<2; i++)
-    MapGadget(level_editor_gadget[counter_info[counter_id].gadget_id + i]);
+    MapGadget(level_editor_gadget[counter_info[id].gadget_id + i]);
+}
+
+static void MapDrawingArea(int id)
+{
+  MapGadget(level_editor_gadget[id]);
+}
+
+static void MapTextInputGadget(int id)
+{
+  MapGadget(level_editor_gadget[id]);
 }
 
 static void MapMainDrawingArea()
 {
-  MapGadget(level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL]);
+  MapDrawingArea(ED_CTRL_ID_DRAWING_LEVEL);
+}
+
+static void UnmapDrawingArea(int id)
+{
+  UnmapGadget(level_editor_gadget[id]);
 }
 
 void UnmapLevelEditorWindowGadgets()
@@ -707,7 +906,6 @@ void DrawLevelEd()
   level_ypos=-1;
   edit_mode = ED_MODE_DRAWING;
   name_typing = FALSE;
-  element_shift = 0;
 
   CloseDoor(DOOR_CLOSE_ALL);
 
@@ -747,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;
 
@@ -996,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;
@@ -1096,29 +1327,14 @@ 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;
-
-      if (edit_mode == ED_MODE_PROPERTIES)
-	DrawPropertiesWindow(new_element);
+      PickDrawingElement(last_button, new_element);
+
+      if (!HAS_CONTENT(properties_element))
+      {
+	properties_element = new_element;
+	if (edit_mode == ED_MODE_PROPERTIES)
+	  DrawPropertiesWindow();
+      }
     }
   
     if (edit_mode == ED_MODE_DRAWING)	/********** EDIT-FENSTER **********/
@@ -1682,12 +1898,6 @@ static void DrawCounterValueField(int counter_id, int value)
 	   int2str(value, 3), FS_SMALL, FC_YELLOW);
 }
 
-#define TEXT_COLLECTING		"Score for collecting"
-#define TEXT_SMASHING		"Score for smashing"
-#define TEXT_CRACKING		"Score for cracking"
-#define TEXT_SPEED		"Speed of growth"
-#define TEXT_DURATION		"Duration when activated"
-
 static void DrawDrawingWindow()
 {
   ClearWindow();
@@ -1697,7 +1907,118 @@ static void DrawDrawingWindow()
   DrawMiniLevel(level_xpos, level_ypos);
 }
 
-static void DrawPropertiesWindow(int element)
+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;
@@ -1747,7 +2068,7 @@ static void DrawPropertiesWindow(int element)
     { EL_AMOEBE_NORM,	&level.tempo_amoebe,	TEXT_SPEED },
     { EL_AMOEBE_VOLL,	&level.tempo_amoebe,	TEXT_SPEED },
     { EL_AMOEBE_BD,	&level.tempo_amoebe,	TEXT_SPEED },
-    { EL_SIEB_LEER,	&level.dauer_sieb,	TEXT_DURATION },
+    { EL_SIEB_INAKTIV,	&level.dauer_sieb,	TEXT_DURATION },
     { EL_ABLENK_AUS,	&level.dauer_ablenk,	TEXT_DURATION },
     { -1, NULL, NULL }
   };
@@ -1755,34 +2076,62 @@ static void DrawPropertiesWindow(int element)
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
-  DrawGraphic(1, 1, el2gfx(element));
+  /* 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] == element)
+  for (y=0; y<lev_fieldy; y++) 
+    for (x=0; x<lev_fieldx; x++)
+      if (Feld[x][y] == properties_element)
 	num_elements_in_level++;
 
-  DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
+  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 == element)
+    if (elements_with_counter[i].element == properties_element)
     {
-      int x = SX + counter_info[ED_COUNTER_SCORE].x + DXSIZE;
-      int y = SY + counter_info[ED_COUNTER_SCORE].y;
+      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);
-      DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
-	       elements_with_counter[i].text, FS_SMALL, FC_YELLOW);
+      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)
@@ -1901,7 +2250,6 @@ static void DrawFilledBox(int from_x, int from_y, int to_x, int to_y,
 
 static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
 {
-  unsigned long border_color = ReadPixel(pix[PIX_SMALLFONT], 2, 16);
   int from_sx, from_sy;
   int to_sx, to_sy;
 
@@ -1912,18 +2260,18 @@ static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
     swap_numbers(&from_y, &to_y);
 
   from_sx = SX + from_x * MINI_TILEX;
-  from_sy = SY + from_y * 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_TILEX + MINI_TILEY - 1;
+  to_sy = SY + to_y * MINI_TILEY + MINI_TILEY - 1;
 
-  XSetForeground(display, gc, border_color);
+  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));
+  XSetForeground(display, gc, BlackPixel(display, screen));
 
   if (from_x == to_x && from_y == to_y)
     MarkTileDirty(from_x/2, from_y/2);
@@ -1940,6 +2288,55 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
     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;
@@ -2112,35 +2509,54 @@ static void RandomPlacement(int button)
   }
 
   DrawMiniLevel(level_xpos, level_ypos);
+  CopyLevelToUndoBuffer();
 }
 
 static void HandleDrawingAreas(struct GadgetInfo *gi)
 {
   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 draw_level = (id == ED_CTRL_ID_DRAWING_LEVEL);
   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;
 
+  /*
   if (edit_mode != ED_MODE_DRAWING)
     return;
+  */
 
   button_press_event = (gi->event.type == GD_EVENT_PRESSED);
   button_release_event = (gi->event.type == GD_EVENT_RELEASED);
 
-  sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
-  sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
-  lx = sx + level_xpos;
-  ly = sy + level_ypos;
+  /* 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);
 
-  lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx);
-  ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly);
-  sx = lx - level_xpos;
-  sy = ly - level_ypos;
+  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;
@@ -2148,49 +2564,68 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   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)
-	CopyLevelToUndoBuffer();
+      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;
 
@@ -2242,7 +2677,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	else if (button_release_event)
 	{
 	  draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
-	  CopyLevelToUndoBuffer();
+	  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)
 	{
@@ -2268,6 +2709,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       }
       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;
   }
@@ -2292,6 +2740,18 @@ static void HandleCounterButtons(struct GadgetInfo *gi)
       DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
       break;
 
+    case ED_CTRL_ID_ELEMCONT_DOWN:
+    case ED_CTRL_ID_ELEMCONT_UP:
+      *gadget_areas_value += (id == ED_CTRL_ID_ELEMCONT_DOWN ? -step : step);
+      if (*gadget_areas_value < 1)
+	*gadget_areas_value = 1;
+      else if (*gadget_areas_value > MAX_ELEMCONT)
+	*gadget_areas_value = MAX_ELEMCONT;
+
+      DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value);
+      DrawElementContentAreas();
+      break;
+
     default:
       break;
   }
@@ -2330,6 +2790,8 @@ static 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;
 
@@ -2398,13 +2860,13 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case ED_CTRL_ID_PROPERTIES:
-      DrawPropertiesWindow(new_element);
+      properties_element = new_element;
+      DrawPropertiesWindow();
       edit_mode = ED_MODE_PROPERTIES;
       break;
 
     case ED_CTRL_ID_RANDOM_PLACEMENT:
       RandomPlacement(button);
-      CopyLevelToUndoBuffer();
       break;
 
     case ED_CTRL_ID_UNDO:
@@ -2432,8 +2894,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       }
       else
       {
-	AdjustLevelScrollPosition();
-	DrawMiniLevel(level_xpos, level_ypos);
+	DrawDrawingWindow();
 	edit_mode = ED_MODE_DRAWING;
       }
       break;
@@ -2459,7 +2920,7 @@ static 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;
@@ -2561,19 +3022,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')
@@ -2593,3 +3042,19 @@ 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;
+  }
+}