rnd-19981217-2
[rocksndiamonds.git] / src / editor.c
index bcecaa8848529d57450a55acb412473da730a1b5..88b7d7dcd7b746b474c2204ef6569920a7c6b6bf 100644 (file)
@@ -17,6 +17,7 @@
 #include "misc.h"
 #include "buttons.h"
 #include "files.h"
+#include "game.h"
 
 /* positions in the level editor */
 #define ED_WIN_MB_LEFT_XPOS    7
 #define ED_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
+#define NUM_UNDO_STEPS         (10 + 1)
+
+/* values for random placement */
+#define RANDOM_USE_PERCENTAGE  0
+#define RANDOM_USE_NUM_OBJECTS 1
 
 /* values for the control window */
 #define ED_CTRL_BUTTONS_GFX_YPOS 236
 #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 other gadgets */
+#define ED_SCORE_XPOS          TILEX
+#define ED_SCORE_YPOS          (7 * TILEY)
+#define ED_COUNT_VALUE_XOFFSET 5
+#define ED_COUNT_VALUE_YOFFSET 3
+
+/* control button identifiers */
 #define ED_CTRL_ID_SINGLE_ITEMS                0
 #define ED_CTRL_ID_CONNECTED_ITEMS     1
 #define ED_CTRL_ID_LINE                        2
@@ -67,7 +80,7 @@
 #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_WRAP_RIGHT          11
 #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
+
+/* drawing area identifiers */
+#define ED_CTRL_ID_DRAWING_LEVEL       24
+
+#define ED_NUM_GADGETS                 25
+
+/* values for counter gadgets */
+#define ED_COUNTER_SCORE               0
+
+#define ED_NUM_COUNTERS                        1
+
+static struct
+{
+  int x, y;
+  int gadget_id;
+} counter_info[ED_NUM_COUNTERS] =
+{
+  { ED_SCORE_XPOS,     ED_SCORE_YPOS,          ED_CTRL_ID_SCORE_DOWN }
+};
+
 /* forward declaration for internal use */
-void HandleDrawingFunction(int, int, int);
+static void DrawDrawingWindow();
+static void DrawPropertiesWindow(int);
+static void CopyLevelToUndoBuffer();
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
 
-static struct GadgetInfo *control_button_gadget[ED_NUM_CTRL_BUTTONS];
-static boolean control_button_gadgets_created = 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 short OrigBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 static int undo_buffer_position = 0;
 static int undo_buffer_steps = 0;
 
+static int random_placement_percentage = 10;
+static int random_placement_num_objects = 10;
+#if 0
+static int random_placement_method = RANDOM_USE_PERCENTAGE;
+#else
+static int random_placement_method = RANDOM_USE_NUM_OBJECTS;
+#endif
+
+/* pointer to score value */
+static int *gadget_score_value;
+
 static int 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;
@@ -396,7 +449,7 @@ int editor_element[] =
 };
 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);
@@ -423,224 +476,18 @@ void ScrollMiniLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void HandlePressedControlButtons()
-{
-  static unsigned long button_delay = 0;
-  int i = 0;
-
-  /* buttons with action when held pressed */
-  int gadget_id[] =
-  {
-    ED_CTRL_ID_WRAP_UP,
-    ED_CTRL_ID_WRAP_LEFT,
-    ED_CTRL_ID_WRAP_RIGHT,
-    ED_CTRL_ID_WRAP_DOWN,
-    -1
-  };
-
-  if (!DelayReached(&button_delay, CHOICE_DELAY_VALUE))
-    return;
-
-  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);
-
-    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;
-    }
-  }
-}
-
-void HandleLevelEditorControlButtons(struct GadgetInfo *gi)
+void InitLevelEditorGadgets()
 {
-  int event_type = gi->event.type;
-
-  /*
-  int button = gi->event.button;
-  */
-
-  int id;
-  int i, 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;
-
-  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_RANDOM_PLACEMENT:
-    case ED_CTRL_ID_BRUSH:
-      drawing_function = id;
-      break;
-
-    case ED_CTRL_ID_CLEAR:
-      if (Request("Are you sure to clear this level ?", REQ_ASK))
-      {
-       for(x=0; x<MAX_LEV_FIELDX; x++) 
-         for(y=0; y<MAX_LEV_FIELDY; y++) 
-           Feld[x][y] = EL_ERDREICH;
-
-       DrawMiniLevel(level_xpos, level_ypos);
-      }
-      break;
-
-    case ED_CTRL_ID_SAVE:
-      {
-       int player_present = FALSE;
-
-       if (leveldir[leveldir_nr].readonly)
-       {
-         Request("This level is read only !", REQ_CONFIRM);
-         break;
-       }
-
-       for(y=0; y<lev_fieldy; y++) 
-         for(x=0; x<lev_fieldx; x++)
-           if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1) 
-             player_present = TRUE;
-
-       if (!player_present)
-         Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
-       else
-       {
-         if (Request("Save this level and kill the old ?", REQ_ASK))
-         {
-           for(x=0; x<lev_fieldx; x++)
-             for(y=0; y<lev_fieldy; y++) 
-               Ur[x][y] = Feld[x][y];
-           SaveLevel(level_nr);
-         }
-       }
-      }
-      break;
-
-    case ED_CTRL_ID_EXIT:
-      if (Request("Exit level editor ?", REQ_ASK | REQ_STAY_OPEN))
-      {
-       CloseDoor(DOOR_CLOSE_1);
-
-       /*
-       CloseDoor(DOOR_CLOSE_BOTH);
-       */
-
-       /* draw smaller door */
-       XCopyArea(display, pix[PIX_DOOR], drawto, gc,
-                 DOOR_GFX_PAGEX7, 64,
-                 108, 64,
-                 EX - 4, EY - 12);
-       redraw_mask |= REDRAW_ALL;
-
-       game_status = MAINMENU;
-       DrawMainMenu();
-      }
-      else
-      {
-       CloseDoor(DOOR_CLOSE_1);
-       XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc,
-                 DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
-                 DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-       OpenDoor(DOOR_OPEN_1);
-      }
-      break;
+  int i;
 
-    default:
-      if (event_type == GD_EVENT_PRESSED)
-       printf("test_func2: GD_EVENT_PRESSED\n");
-      else if (event_type == GD_EVENT_RELEASED)
-       printf("test_func2: GD_EVENT_RELEASED\n");
-      else
-       printf("test_func2: ?\n");
-      break;
-  }
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    level_editor_gadget[i] = NULL;
 }
 
-void CreateLevelEditorControlButtons()
+static void CreateControlButtons()
 {
   int i;
 
-  if (control_button_gadgets_created)
-    return;
-
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
   {
     Pixmap gd_pixmap = pix[PIX_DOOR];
@@ -649,6 +496,7 @@ void CreateLevelEditorControlButtons()
     int gd_x1, gd_x2, gd_y;
     int width, height;
     unsigned long event_mask;
+    int id = i;
 
     if (i < ED_NUM_CTRL1_BUTTONS)
     {
@@ -679,11 +527,12 @@ void CreateLevelEditorControlButtons()
        i == ED_CTRL_ID_WRAP_RIGHT ||
        i == ED_CTRL_ID_WRAP_UP ||
        i == ED_CTRL_ID_WRAP_DOWN)
-      event_mask = GD_EVENT_PRESSED;
+      event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
     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,
@@ -692,38 +541,153 @@ void CreateLevelEditorControlButtons()
                      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, HandleLevelEditorControlButtons,
+                     GDI_CALLBACK, HandleControlButtons,
                      GDI_END);
 
     if (gi == NULL)
       Error(ERR_EXIT, "cannot create gadget");
 
-    control_button_gadget[i] = gi;
+    level_editor_gadget[id] = gi;
   }
+}
 
-  control_button_gadgets_created = TRUE;
+
+
+#if 0
+
+static void test1(struct GadgetInfo *gi)
+{
+  int event_type = gi->event.type;
+
+  printf("HandleControlButtons: (%d,%d) (%d,%d) [%d] ",
+        gi->x, gi->y,
+        gi->event.x, gi->event.y, gi->event.button);
+
+  if (event_type == GD_EVENT_PRESSED)
+    printf("GD_EVENT_PRESSED\n");
+  else if (event_type == GD_EVENT_RELEASED)
+    printf("GD_EVENT_RELEASED\n");
+  else if (event_type == GD_EVENT_MOVING)
+    printf("GD_EVENT_MOVING\n");
+  else
+    printf("?\n");
 }
 
-void MapLevelEditorControlButtons()
+#endif
+
+
+
+static void CreateCounterButtons(int counter_id)
 {
   int i;
 
-  if (!control_button_gadgets_created)
-    CreateLevelEditorControlButtons();
+  for (i=0; i<2; 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;
 
-  for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
-    MapGadget(control_button_gadget[i]);
+    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;
+  }
 }
 
-void UnmapLevelEditorControlButtons()
+static void CreateDrawingAreas()
 {
-  int i;
+  struct GadgetInfo *gi;
+  unsigned long event_mask;
+
+  event_mask = GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING;
+
+  gi = CreateGadget(GDI_CUSTOM_ID, ED_CTRL_ID_DRAWING_LEVEL,
+                   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[ED_CTRL_ID_DRAWING_LEVEL] = gi;
+}
 
-  if (!control_button_gadgets_created)
+static void CreateLevelEditorGadgets()
+{
+  if (level_editor_gadgets_created)
     return;
 
+  CreateControlButtons();
+  CreateCounterButtons(ED_COUNTER_SCORE);
+  CreateDrawingAreas();
+
+  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 counter_id)
+{
+  int i;
+
+  for (i=0; i<2; i++)
+    MapGadget(level_editor_gadget[counter_info[counter_id].gadget_id + i]);
+}
+
+static void MapMainDrawingArea()
+{
+  MapGadget(level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL]);
+}
+
+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()
@@ -732,20 +696,33 @@ 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_2);
+  CloseDoor(DOOR_CLOSE_ALL);
 
-  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];
+  if (level_editor_test_game)
+  {
+    for(x=0; x<lev_fieldx; x++)
+      for(y=0; y<lev_fieldy; y++)
+       Feld[x][y] = Ur[x][y];
 
-  DrawMiniLevel(level_xpos,level_ypos);
-  FadeToFront();
+    for(x=0; x<lev_fieldx; x++)
+      for(y=0; y<lev_fieldy; y++)
+       Ur[x][y] = OrigBackup[x][y];
+
+    level_editor_test_game = FALSE;
+  }
+  else
+  {
+    undo_buffer_position = -1;
+    undo_buffer_steps = -1;
+    CopyLevelToUndoBuffer();
+  }
+
+  DrawMiniLevel(level_xpos,level_ypos);
+  FadeToFront();
 
   XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
            DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
@@ -823,7 +800,11 @@ void DrawLevelEd()
 
   OpenDoor(DOOR_OPEN_1);
 
-  MapLevelEditorControlButtons();
+  if (!level_editor_gadgets_created)
+    CreateLevelEditorGadgets();
+
+  MapControlButtons();
+  MapMainDrawingArea();
 
   /*
   OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
@@ -835,6 +816,7 @@ void DrawControlWindow()
   int i,x,y;
 
   ClearWindow();
+  UnmapLevelEditorWindowGadgets();
 
   /* Inhalt der Mampfer */
   DrawText(ED_COUNT_GADGET_XPOS+1,SY+6,
@@ -990,18 +972,18 @@ void DrawControlWindow()
 
 void AdjustLevelScrollPosition()
 {
-  if (level_xpos<-1)
+  if (level_xpos < -1)
     level_xpos = -1;
-  if (level_xpos>lev_fieldx-2*SCR_FIELDX+1)
-    level_xpos = lev_fieldx-2*SCR_FIELDX+1;
-  if (lev_fieldx<2*SCR_FIELDX-2)
+  if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
+    level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+  if (lev_fieldx < 2*SCR_FIELDX - 2)
     level_xpos = -1;
 
-  if (level_ypos<-1)
+  if (level_ypos < -1)
     level_ypos = -1;
-  if (level_ypos>lev_fieldy-2*SCR_FIELDY+1)
-    level_ypos = lev_fieldy-2*SCR_FIELDY+1;
-  if (lev_fieldy<2*SCR_FIELDY-2)
+  if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
+    level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+  if (lev_fieldy < 2*SCR_FIELDY - 2)
     level_ypos = -1;
 }
 
@@ -1017,9 +999,10 @@ void LevelEd(int mx, int my, int button)
   int y = (my-SY)/MINI_TILEY; 
   */
 
-
+  /*
   HandlePressedControlButtons();
-  HandleDrawingFunction(mx, my, button);
+  HandleDrawingFunctions(mx, my, button);
+  */
 
   if (use_floodfill)           /********** FLOOD FILL **********/
   {
@@ -1071,7 +1054,7 @@ 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;
 
@@ -1117,9 +1100,12 @@ void LevelEd(int mx, int my, int button)
                         DY+ED_WIN_MB_RIGHT_YPOS,
                         el2gfx(new_element3));
       redraw_mask |= REDRAW_DOOR_1;
+
+      if (edit_mode == ED_MODE_PROPERTIES)
+       DrawPropertiesWindow(new_element);
     }
   
-    if (edit_mode)             /********** EDIT-FENSTER **********/
+    if (edit_mode == ED_MODE_DRAWING)  /********** EDIT-FENSTER **********/
     {
 
 
@@ -1136,7 +1122,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);
@@ -1146,7 +1132,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;
@@ -1163,7 +1149,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;
@@ -1180,7 +1166,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;
@@ -1197,7 +1183,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;
@@ -1270,13 +1256,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;
@@ -1416,7 +1402,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))
@@ -1431,7 +1417,7 @@ void LevelEd(int mx, int my, int button)
          if (leveldir[leveldir_nr].readonly ||
              Request("Exit without saving ?",REQ_ASK | REQ_STAY_OPEN))
          {
-           CloseDoor(DOOR_CLOSE_BOTH);
+           CloseDoor(DOOR_CLOSE_ALL);
            game_status=MAINMENU;
            DrawMainMenu();
          }
@@ -1469,7 +1455,7 @@ void LevelEd(int mx, int my, int button)
                    Ur[x][y]=Feld[x][y];
                SaveLevel(level_nr);
              }
-             CloseDoor(DOOR_CLOSE_BOTH);
+             CloseDoor(DOOR_CLOSE_ALL);
              game_status=MAINMENU;
              DrawMainMenu();
            }
@@ -1665,6 +1651,124 @@ 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);
+}
+
+#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();
+  UnmapLevelEditorWindowGadgets();
+  MapMainDrawingArea();
+  AdjustLevelScrollPosition();
+  DrawMiniLevel(level_xpos, level_ypos);
+}
+
+static void DrawPropertiesWindow(int element)
+{
+  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_LEER,    &level.dauer_sieb,      TEXT_DURATION },
+    { EL_ABLENK_AUS,   &level.dauer_ablenk,    TEXT_DURATION },
+    { -1, NULL, NULL }
+  };
+
+  ClearWindow();
+  UnmapLevelEditorWindowGadgets();
+
+  DrawGraphic(1, 1, el2gfx(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)
+       num_elements_in_level++;
+
+  DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
+           num_elements_in_level);
+
+  for (i=0; elements_with_counter[i].element != -1; i++)
+  {
+    if (elements_with_counter[i].element == element)
+    {
+      int x = SX + counter_info[ED_COUNTER_SCORE].x + DXSIZE;
+      int y = SY + 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);
+      MapCounterButtons(ED_COUNTER_SCORE);
+      break;
+    }
+  }
+}
+
 static void swap_numbers(int *i1, int *i2)
 {
   int help = *i1;
@@ -1696,8 +1800,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 */
   {
@@ -1758,8 +1862,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);
@@ -1767,8 +1871,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;
 
@@ -1779,7 +1883,7 @@ 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 FloodFill(int from_x, int from_y, int fill_element)
 {
   int i,x,y;
   int old_element;
@@ -1810,28 +1914,96 @@ void FloodFill(int from_x, int from_y, int fill_element)
   safety--;
 }
 
-void HandleDrawingFunction(int mx, int my, int button)
+static void CopyLevelToUndoBuffer()
 {
-  static int last_button = 0;
-  static int last_element = 0;
+  int x, y;
+
+  undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
+
+  if (undo_buffer_steps < NUM_UNDO_STEPS - 1)
+    undo_buffer_steps++;
+
+  for(x=0; x<lev_fieldx; x++)
+    for(y=0; y<lev_fieldy; y++)
+      UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+
+
+
+  /*
+    printf("state saved to undo buffer %d\n", undo_buffer_position);
+  */
+}
+
+static void RandomPlacement(int button)
+{
+  int new_element;
+  int x, y;
+
+  new_element = (button == 1 ? new_element1 :
+                button == 2 ? new_element2 :
+                button == 3 ? new_element3 : 0);
+
+  if (random_placement_method == RANDOM_USE_PERCENTAGE)
+  {
+    for(x=0; x<lev_fieldx; x++)
+      for(y=0; y<lev_fieldy; y++)
+       if (RND(100) < random_placement_percentage)
+         Feld[x][y] = new_element;
+  }
+  else
+  {
+    int elements_left = random_placement_num_objects;
+
+    while (elements_left > 0)
+    {
+      x = RND(lev_fieldx);
+      y = RND(lev_fieldy);
+
+      if (Feld[x][y] != new_element)
+      {
+       Feld[x][y] = new_element;
+       elements_left--;
+      }
+    }
+  }
+
+  DrawMiniLevel(level_xpos, level_ypos);
+}
+
+static void HandleDrawingAreas(struct GadgetInfo *gi)
+{
+  static boolean started_inside_drawing_area = FALSE;
+  boolean inside_drawing_area = !gi->event.off_borders;
   boolean button_press_event;
   boolean button_release_event;
-  boolean copy_to_undo_buffer = FALSE;
   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 lx, ly;
   int x, y;
 
-  button_press_event = (last_button == 0 && button != 0);
-  button_release_event = (last_button != 0 && button == 0);
-  last_button = button;
+  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;
 
-  if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE)
+  if (button_press_event)
+    started_inside_drawing_area = inside_drawing_area;
+
+  if (!started_inside_drawing_area)
     return;
 
-  if (sx > lev_fieldx || sy > lev_fieldy ||
+  printf("%d,%d, %d,%d, %d,%d.\n",
+        gi->event.x, gi->event.y, sx, sy, lx, ly);
+
+  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) ||
@@ -1846,7 +2018,7 @@ void HandleDrawingFunction(int mx, int my, int button)
   {
     case ED_CTRL_ID_SINGLE_ITEMS:
       if (button_release_event)
-       copy_to_undo_buffer = TRUE;
+       CopyLevelToUndoBuffer();
 
       if (!button)
        break;
@@ -1882,7 +2054,7 @@ void HandleDrawingFunction(int mx, int my, int button)
        static int last_sy = -1;
 
        if (button_release_event)
-         copy_to_undo_buffer = TRUE;
+         CopyLevelToUndoBuffer();
 
        if (button)
        {
@@ -1916,11 +2088,12 @@ void HandleDrawingFunction(int mx, int my, int button)
        {
          last_sx = start_sx = sx;
          last_sy = start_sy = sy;
+         draw_func(sx, sy, sx, sy, new_element, FALSE);
        }
        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);
+         CopyLevelToUndoBuffer();
        }
        else if (last_sx != sx || last_sy != sy)
        {
@@ -1932,65 +2105,418 @@ void HandleDrawingFunction(int mx, int my, int button)
       }
       break;
 
-    case 999:
+    case ED_CTRL_ID_FLOOD_FILL:
+      if (button_press_event && Feld[lx][ly] != new_element)
       {
-       static int last_sx = -1;
-       static int last_sy = -1;
+       FloodFill(lx, ly, new_element);
+       DrawMiniLevel(level_xpos, level_ypos);
+       CopyLevelToUndoBuffer();
+      }
+      break;
 
-       if (last_sx == -1)
-       {
-         Feld[lx][ly] = new_element;
-         DrawMiniElement(sx, sy, new_element);
+    default:
+      break;
+  }
+}
 
-         last_sx = sx;
-         last_sy = sy;
-       }
-       else if (last_sx != sx || last_sy != sy)
-       {
-         DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE);
 
-         last_sx = -1;
-         last_sy = -1;
-       }
 
-       /*
-       last_sx = sx;
-       last_sy = sy;
-       */
-      }
+#if 0
+
+static void HandlePressedControlButtons()
+{
+  static unsigned long button_delay = 0;
+  int i;
+
+  /* buttons with action when held pressed */
+  int gadget_id[] =
+  {
+    ED_CTRL_ID_WRAP_UP,
+    ED_CTRL_ID_WRAP_LEFT,
+    ED_CTRL_ID_WRAP_RIGHT,
+    ED_CTRL_ID_WRAP_DOWN,
+    ED_CTRL_ID_SCORE_DOWN,
+    ED_CTRL_ID_SCORE_UP,
+    -1
+  };
+
+  if (!DelayReached(&button_delay, GADGET_FRAME_DELAY))
+    return;
+
+  for (i=0; gadget_id[i] != -1; i++)
+  {
+    int id = gadget_id[i];
+    int state = level_editor_gadget[id]->state;
+    int button = level_editor_gadget[id]->event.button;
+    int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+
+    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;
+
+      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;
+  
+      default:
+       break;
+    }
+  }
+}
+
+#endif
+
+
+
+static void HandleCounterButtons(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+
+  switch (id)
+  {
+    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;
 
+    default:
+      break;
+  }
+}
+
+static void HandleControlButtons(struct GadgetInfo *gi)
+{
+  int id = gi->custom_id;
+  int button = gi->event.button;
+  int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+  int new_element;
+  int player_present = FALSE;
+  int level_changed = FALSE;
+  int x, y;
+
+  new_element = (button == 1 ? new_element1 :
+                button == 2 ? new_element2 :
+                button == 3 ? new_element3 : 0);
+
+  if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
+  {
+    DrawDrawingWindow();
+    edit_mode = ED_MODE_DRAWING;
+  }
+
+  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:
-      if (!button)
+    case ED_CTRL_ID_BRUSH:
+      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:
+      DrawPropertiesWindow(new_element);
+      edit_mode = ED_MODE_PROPERTIES;
+      break;
+
+    case ED_CTRL_ID_RANDOM_PLACEMENT:
+      RandomPlacement(button);
+      CopyLevelToUndoBuffer();
+      break;
+
+    case ED_CTRL_ID_UNDO:
+      if (undo_buffer_steps == 0)
+      {
+       Request("Undo buffer empty !", REQ_CONFIRM);
        break;
+      }
 
-      if (button_press_event && Feld[lx][ly] != new_element)
+      undo_buffer_position =
+       (undo_buffer_position - 1 + NUM_UNDO_STEPS) % NUM_UNDO_STEPS;
+      undo_buffer_steps--;
+
+      for(x=0; x<lev_fieldx; x++)
+       for(y=0; y<lev_fieldy; y++)
+         Feld[x][y] = UndoBuffer[undo_buffer_position][x][y];
+      DrawMiniLevel(level_xpos,level_ypos);
+      break;
+
+    case ED_CTRL_ID_INFO:
+      if (edit_mode != ED_MODE_INFO)
       {
-       FloodFill(lx, ly, new_element);
+       DrawControlWindow();
+       edit_mode = ED_MODE_INFO;
+      }
+      else
+      {
+       AdjustLevelScrollPosition();
        DrawMiniLevel(level_xpos, level_ypos);
-       copy_to_undo_buffer = TRUE;
+       edit_mode = ED_MODE_DRAWING;
       }
       break;
 
-    default:
+    case ED_CTRL_ID_CLEAR:
+      for(x=0; x<MAX_LEV_FIELDX; x++) 
+       for(y=0; y<MAX_LEV_FIELDY; y++) 
+         Feld[x][y] = new_element3;
+      CopyLevelToUndoBuffer();
+
+      DrawMiniLevel(level_xpos, level_ypos);
       break;
-  }
 
-  last_element = new_element;
+    case ED_CTRL_ID_SAVE:
+      if (leveldir[leveldir_nr].readonly)
+      {
+       Request("This level is read only !", REQ_CONFIRM);
+       break;
+      }
 
-  if (copy_to_undo_buffer)
-  {
-    undo_buffer_position = (undo_buffer_position + 1) % NUM_UNDO_STEPS;
+      for(y=0; y<lev_fieldy; y++) 
+       for(x=0; x<lev_fieldx; x++)
+         if (Feld[x][y] != Ur[x][y])
+           level_changed = TRUE;
 
-    if (undo_buffer_steps < NUM_UNDO_STEPS)
-      undo_buffer_steps++;
+      if (!level_changed)
+      {
+       Request("Level has not changed !", REQ_CONFIRM);
+       break;
+      }
 
-    for(x=0; x<lev_fieldx; x++)
-      for(y=0; y<lev_fieldy; y++)
-       UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
+      for(y=0; y<lev_fieldy; y++) 
+       for(x=0; x<lev_fieldx; x++)
+         if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1) 
+           player_present = TRUE;
 
-    copy_to_undo_buffer = FALSE;
+      if (!player_present)
+       Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
+      else
+      {
+       if (Request("Save this level and kill the old ?", REQ_ASK))
+       {
+         for(x=0; x<lev_fieldx; x++)
+           for(y=0; y<lev_fieldy; y++) 
+             Ur[x][y] = Feld[x][y];
+         SaveLevel(level_nr);
+       }
+      }
+      break;
 
-    printf("state saved to undo buffer %d\n", undo_buffer_position);
+    case ED_CTRL_ID_TEST:
+      for(y=0; y<lev_fieldy; y++) 
+       for(x=0; x<lev_fieldx; x++)
+         if (Feld[x][y] == EL_SPIELFIGUR || Feld[x][y] == EL_SPIELER1) 
+           player_present = TRUE;
+
+      if (!player_present)
+       Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
+      else
+      {
+       for(x=0; x<lev_fieldx; x++)
+         for(y=0; y<lev_fieldy; y++)
+           OrigBackup[x][y] = Ur[x][y];
+
+       for(x=0; x<lev_fieldx; x++)
+         for(y=0; y<lev_fieldy; y++)
+           Ur[x][y] = Feld[x][y];
+
+       level_editor_test_game = TRUE;
+       game_status = PLAYING;
+       InitGame();
+      }
+      break;
+
+    case ED_CTRL_ID_EXIT:
+      for(y=0; y<lev_fieldy; y++) 
+       for(x=0; x<lev_fieldx; x++)
+         if (Feld[x][y] != Ur[x][y])
+           level_changed = TRUE;
+
+      if (!level_changed ||
+         Request("Level has changed! Exit without saving ?",
+                 REQ_ASK | REQ_STAY_OPEN))
+      {
+       CloseDoor(DOOR_CLOSE_1);
+
+       /*
+       CloseDoor(DOOR_CLOSE_ALL);
+       */
+
+       /* draw smaller door */
+       XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+                 DOOR_GFX_PAGEX7, 64,
+                 108, 64,
+                 EX - 4, EY - 12);
+       redraw_mask |= REDRAW_ALL;
+
+       game_status = MAINMENU;
+       DrawMainMenu();
+      }
+      else
+      {
+       CloseDoor(DOOR_CLOSE_1);
+       XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc,
+                 DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
+                 DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+       OpenDoor(DOOR_OPEN_1);
+      }
+      break;
+
+    default:
+      if (gi->event.type == GD_EVENT_PRESSED)
+       printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
+      else if (gi->event.type == GD_EVENT_RELEASED)
+       printf("default: HandleControlButtons: GD_EVENT_RELEASED\n");
+      else if (gi->event.type == GD_EVENT_MOVING)
+       printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
+      else
+       printf("default: HandleControlButtons: ?\n");
+      break;
   }
 }