X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=a18b397617d2a493834a076fed51bd86ec7176ee;hb=caf79a7cd47eeeb43746bdeae08ec5f738d3bf61;hp=d3d81c2599b3649dd4cd973152fad2f86178bd44;hpb=c5728b1ebc2a1d3753a6eea5a0f6335d077eef6b;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index d3d81c25..a18b3976 100644 --- a/src/editor.c +++ b/src/editor.c @@ -37,7 +37,7 @@ #define ED_SCROLL_DOWN 8 /* screens in the level editor */ -#define ED_MODE_EDIT 0 +#define ED_MODE_DRAWING 0 #define ED_MODE_INFO 1 #define ED_MODE_PROPERTIES 2 @@ -48,8 +48,13 @@ #define RANDOM_USE_PERCENTAGE 0 #define RANDOM_USE_NUM_OBJECTS 1 +/* values for elements with content */ +#define MAX_ELEMCONT 8 + /* values for the control window */ -#define ED_CTRL_BUTTONS_GFX_YPOS 236 +#define ED_CTRL_BUTTONS_GFX_YPOS 236 +#define ED_CTRL_BUTTONS_ALT_GFX_YPOS 142 + #define ED_CTRL1_BUTTONS_HORIZ 4 #define ED_CTRL1_BUTTONS_VERT 4 #define ED_CTRL1_BUTTON_XSIZE 22 @@ -66,14 +71,17 @@ #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 counter gadgets */ #define ED_COUNT_VALUE_XOFFSET 5 #define ED_COUNT_VALUE_YOFFSET 3 +#define ED_COUNT_SCORE_XPOS (TILEX) +#define ED_COUNT_SCORE_YPOS (14 * MINI_TILEY) +#define ED_COUNT_ELEMCONT_XPOS (TILEX) +#define ED_COUNT_ELEMCONT_YPOS (17 * MINI_TILEY) -/* identifiers for DrawValueField() */ -#define ED_SCORE_FIELD 0 +/* 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 @@ -86,10 +94,12 @@ #define ED_CTRL_ID_PROPERTIES 7 #define ED_CTRL_ID_FLOOD_FILL 8 #define ED_CTRL_ID_WRAP_LEFT 9 +#define ED_CTRL_ID_UNUSED1 10 #define ED_CTRL_ID_WRAP_RIGHT 11 #define ED_CTRL_ID_RANDOM_PLACEMENT 12 #define ED_CTRL_ID_BRUSH 13 #define ED_CTRL_ID_WRAP_DOWN 14 +#define ED_CTRL_ID_UNUSED2 15 #define ED_CTRL_ID_UNDO 16 #define ED_CTRL_ID_INFO 17 #define ED_CTRL_ID_SAVE 18 @@ -97,23 +107,53 @@ #define ED_CTRL_ID_TEST 20 #define ED_CTRL_ID_EXIT 21 -/* other gadget identifiers */ +/* counter button identifiers */ #define ED_CTRL_ID_SCORE_DOWN 22 #define ED_CTRL_ID_SCORE_UP 23 +#define ED_CTRL_ID_ELEMCONT_DOWN 24 +#define ED_CTRL_ID_ELEMCONT_UP 25 + +/* drawing area identifiers */ +#define ED_CTRL_ID_DRAWING_LEVEL 26 +#define ED_CTRL_ID_ELEMCONT_0 27 +#define ED_CTRL_ID_ELEMCONT_7 34 +#define ED_CTRL_ID_AMOEBA_CONTENT 35 + +#define ED_NUM_GADGETS 36 + +/* values for counter gadgets */ +#define ED_COUNTER_SCORE 0 +#define ED_COUNTER_ELEMCONT 1 -#define ED_NUM_GADGETS 24 +#define ED_NUM_COUNTERS 2 + +static struct +{ + int x, y; + int gadget_id; +} counter_info[ED_NUM_COUNTERS] = +{ + { ED_COUNT_SCORE_XPOS, ED_COUNT_SCORE_YPOS, + ED_CTRL_ID_SCORE_DOWN }, + { ED_COUNT_ELEMCONT_XPOS, ED_COUNT_ELEMCONT_YPOS, + ED_CTRL_ID_ELEMCONT_DOWN } +}; /* forward declaration for internal use */ +static void DrawDrawingWindow(); +static void DrawPropertiesWindow(); static void CopyLevelToUndoBuffer(); -static void HandleDrawingFunctions(int, int, int); -static void HandlePressedControlButtons(); +static void HandleDrawingAreas(struct GadgetInfo *); +static void HandleCounterButtons(struct GadgetInfo *); static void HandleControlButtons(struct GadgetInfo *); static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS]; static boolean level_editor_gadgets_created = FALSE; static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS; +static int properties_element = 0; +static short ElementContent[MAX_ELEMCONT][3][3]; static short OrigBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY]; static int undo_buffer_position = 0; @@ -129,6 +169,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; @@ -477,11 +518,44 @@ static void CreateControlButtons() Pixmap gd_pixmap = pix[PIX_DOOR]; struct GadgetInfo *gi; int gd_xoffset, gd_yoffset; - int gd_x1, gd_x2, gd_y; + int gd_x1, gd_x2, gd_y1, gd_y2; int width, height; + int button_type; + int radio_button_nr; + boolean radio_button_pressed; unsigned long event_mask; + int id = i; + + if (id == ED_CTRL_ID_SINGLE_ITEMS || + id == ED_CTRL_ID_CONNECTED_ITEMS || + id == ED_CTRL_ID_LINE || + id == ED_CTRL_ID_TEXT || + id == ED_CTRL_ID_RECTANGLE || + id == ED_CTRL_ID_FILLED_BOX || + id == ED_CTRL_ID_FLOOD_FILL || + id == ED_CTRL_ID_BRUSH) + { + button_type = GD_TYPE_RADIO_BUTTON; + radio_button_nr = 1; + radio_button_pressed = (id == drawing_function ? TRUE : FALSE); + event_mask = GD_EVENT_PRESSED; + } + else + { + button_type = GD_TYPE_NORMAL_BUTTON; + radio_button_nr = 0; + radio_button_pressed = FALSE; + + if (id == ED_CTRL_ID_WRAP_LEFT || + id == ED_CTRL_ID_WRAP_RIGHT || + id == ED_CTRL_ID_WRAP_UP || + id == ED_CTRL_ID_WRAP_DOWN) + event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED; + else + event_mask = GD_EVENT_RELEASED; + } - if (i < ED_NUM_CTRL1_BUTTONS) + if (id < ED_NUM_CTRL1_BUTTONS) { int x = i % ED_CTRL1_BUTTONS_HORIZ; int y = i / ED_CTRL1_BUTTONS_HORIZ; @@ -504,24 +578,22 @@ static void CreateControlButtons() gd_x1 = DOOR_GFX_PAGEX8 + gd_xoffset; gd_x2 = DOOR_GFX_PAGEX7 + gd_xoffset; - gd_y = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset; + gd_y1 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_GFX_YPOS + gd_yoffset; + gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset; - if (i == ED_CTRL_ID_WRAP_LEFT || - i == ED_CTRL_ID_WRAP_RIGHT || - i == ED_CTRL_ID_WRAP_UP || - i == ED_CTRL_ID_WRAP_DOWN) - event_mask = GD_EVENT_PRESSED; - else - event_mask = GD_EVENT_RELEASED; - - gi = CreateGadget(GDI_X, EX + gd_xoffset, + gi = CreateGadget(GDI_CUSTOM_ID, id, + GDI_X, EX + gd_xoffset, GDI_Y, EY + gd_yoffset, GDI_WIDTH, width, GDI_HEIGHT, height, - GDI_TYPE, GD_TYPE_NORMAL_BUTTON, + GDI_TYPE, button_type, GDI_STATE, GD_BUTTON_UNPRESSED, - GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y, - GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y, + GDI_RADIO_NR, radio_button_nr, + GDI_RADIO_PRESSED, radio_button_pressed, + GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1, + GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1, + GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2, + GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2, GDI_EVENT_MASK, event_mask, GDI_CALLBACK, HandleControlButtons, GDI_END); @@ -529,43 +601,123 @@ static void CreateControlButtons() if (gi == NULL) Error(ERR_EXIT, "cannot create gadget"); - level_editor_gadget[i] = gi; + level_editor_gadget[id] = gi; + } +} + +static void CreateCounterButtons() +{ + int i, j; + + for (i=0; ielements_in_list-MAX_ELEM_X*MAX_ELEM_Y) @@ -1022,9 +1196,16 @@ void LevelEd(int mx, int my, int button) DY+ED_WIN_MB_RIGHT_YPOS, el2gfx(new_element3)); redraw_mask |= REDRAW_DOOR_1; + + /* + properties_element = new_element; + if (edit_mode == ED_MODE_PROPERTIES) + DrawPropertiesWindow(); + */ + } - if (edit_mode == ED_MODE_EDIT) /********** EDIT-FENSTER **********/ + if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/ { @@ -1175,7 +1356,7 @@ 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); @@ -1321,7 +1502,7 @@ void LevelEd(int mx, int my, int button) VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2); OpenDoor(DOOR_OPEN_2); - edit_mode = ED_MODE_EDIT; + edit_mode = ED_MODE_DRAWING; break; case ED_BUTTON_CLEAR: if (Request("Are you sure to clear this level ?",REQ_ASK)) @@ -1570,63 +1751,240 @@ void LevelNameTyping(KeySym key) } } -static void DrawValueField(int field, int value) +static void DrawCounterValueField(int counter_id, int value) { - int i = 0; - int screen_pos[][3] = - { - { ED_SCORE_FIELD, - ED_SCORE_XPOS + ED_WIN_COUNT_XPOS, ED_SCORE_YPOS }, - { -1, 0, 0 } - }; + int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS; + int y = SY + counter_info[counter_id].y; - while (screen_pos[i][0] != -1) - { - int x = SX + screen_pos[i][1]; - int y = SY + screen_pos[i][2]; + 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); - if (screen_pos[i++][0] != field) - continue; + 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); +} - 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); +static void DrawElementContentAreas() +{ + static int num_areas = MAX_ELEMCONT; + int area_x = ED_AREA_ELEMCONT_XPOS / MINI_TILEX; + int area_y = ED_AREA_ELEMCONT_YPOS / MINI_TILEY; + int area_sx = SX + ED_AREA_ELEMCONT_XPOS; + int area_sy = SY + ED_AREA_ELEMCONT_YPOS; + int i, x, y; - DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET, - int2str(value, 3), FS_SMALL, FC_YELLOW); + for (i=0; i to_x) + swap_numbers(&from_x, &to_x); + + if (from_y > to_y) + swap_numbers(&from_y, &to_y); + + from_sx = SX + from_x * MINI_TILEX; + from_sy = SY + from_y * MINI_TILEY; + to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1; + to_sy = SY + to_y * MINI_TILEY + MINI_TILEY - 1; + + XSetForeground(display, gc, WhitePixel(display, screen)); + + XDrawLine(display, drawto, gc, from_sx, from_sy, to_sx, from_sy); + XDrawLine(display, drawto, gc, to_sx, from_sy, to_sx, to_sy); + XDrawLine(display, drawto, gc, to_sx, to_sy, from_sx, to_sy); + XDrawLine(display, drawto, gc, from_sx, to_sy, from_sx, from_sy); + + XSetForeground(display, gc, BlackPixel(display, screen)); + + if (from_x == to_x && from_y == to_y) + MarkTileDirty(from_x/2, from_y/2); + else + redraw_mask |= REDRAW_FIELD; +} + +static void SelectArea(int from_x, int from_y, int to_x, int to_y, + int element, boolean change_level) +{ + if (element == -1 || change_level) + DrawRectangle(from_x, from_y, to_x, to_y, -1, FALSE); + else + DrawAreaBorder(from_x, from_y, to_x, to_y); +} + +/* values for CopyBrushExt() */ +#define CB_AREA_TO_BRUSH 0 +#define CB_BRUSH_TO_LEVEL 1 + +static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y, int mode) +{ + static short brush_buffer[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; + static brush_from_x, brush_from_y; + static brush_to_x, brush_to_y; + int x, y; + + if (from_x > to_x) + swap_numbers(&from_x, &to_x); + + if (from_y > to_y) + swap_numbers(&from_y, &to_y); + + if (mode == CB_AREA_TO_BRUSH) + { + for (y=from_y; y<=to_y; y++) + for (x=from_x; x<=to_x; x++) + brush_buffer[x][y] = Feld[x][y]; + + brush_from_x = from_x; + brush_from_y = from_y; + brush_to_x = to_x; + brush_to_y = to_y; + } + else + { + for (y=brush_from_y; y<=brush_to_y; y++) + for (x=brush_from_x; x<=brush_to_x; x++) + Feld[x][y] = brush_buffer[x][y]; + CopyLevelToUndoBuffer(); + } +} + +static void CopyAreaToBrush(int from_x, int from_y, int to_x, int to_y) +{ + CopyBrushExt(from_x, from_y, to_x, to_y, CB_AREA_TO_BRUSH); +} + +#if 0 +static void CopyBrushToLevel() +{ + CopyBrushExt(0, 0, 0, 0, CB_BRUSH_TO_LEVEL); +} +#endif + static void FloodFill(int from_x, int from_y, int fill_element) { int i,x,y; @@ -1774,6 +2221,99 @@ static void FloodFill(int from_x, int from_y, int fill_element) safety--; } +/* values for DrawLevelText() modes */ +#define TEXT_INIT 0 +#define TEXT_SETCURSOR 1 +#define TEXT_WRITECHAR 2 +#define TEXT_BACKSPACE 3 +#define TEXT_NEWLINE 4 +#define TEXT_END 5 + +static void DrawLevelText(int sx, int sy, char letter, int mode) +{ + static short delete_buffer[MAX_LEV_FIELDX]; + static int start_sx, start_sy; + static int last_sx, last_sy; + static boolean typing = FALSE; + int letter_element = EL_CHAR_ASCII0 + letter; + int lx, ly; + + if (mode != TEXT_INIT) + { + if (!typing) + return; + + if (mode != TEXT_SETCURSOR) + { + sx = last_sx; + sy = last_sy; + } + + lx = last_sx + level_xpos; + ly = last_sy + level_ypos; + } + + switch (mode) + { + case TEXT_INIT: + if (typing) + DrawLevelText(0, 0, 0, TEXT_END); + + typing = TRUE; + start_sx = last_sx = sx; + start_sy = last_sy = sy; + DrawLevelText(sx, sy, 0, TEXT_SETCURSOR); + break; + + case TEXT_SETCURSOR: + DrawMiniElement(last_sx, last_sy, Feld[lx][ly]); + DrawAreaBorder(sx, sy, sx, sy); + last_sx = sx; + last_sy = sy; + break; + + case TEXT_WRITECHAR: + if (letter_element >= EL_CHAR_START && letter_element <= EL_CHAR_END) + { + delete_buffer[sx - start_sx] = Feld[lx][ly]; + Feld[lx][ly] = letter_element; + + if (sx + 1 < 2*SCR_FIELDX && lx + 1 < lev_fieldx) + DrawLevelText(sx + 1, sy, 0, TEXT_SETCURSOR); + else if (sy + 1 < 2*SCR_FIELDY && ly + 1 < lev_fieldy) + DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR); + else + DrawLevelText(0, 0, 0, TEXT_END); + } + break; + + case TEXT_BACKSPACE: + if (sx > start_sx) + { + Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1]; + DrawMiniElement(sx - 1, sy, new_element3); + DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR); + } + break; + + case TEXT_NEWLINE: + if (sy + 1 < 2*SCR_FIELDY - 1 && ly + 1 < lev_fieldy - 1) + DrawLevelText(start_sx, sy + 1, 0, TEXT_SETCURSOR); + else + DrawLevelText(0, 0, 0, TEXT_END); + break; + + case TEXT_END: + CopyLevelToUndoBuffer(); + DrawMiniElement(sx, sy, Feld[lx][ly]); + typing = FALSE; + break; + + default: + break; + } +} + static void CopyLevelToUndoBuffer() { int x, y; @@ -1786,12 +2326,6 @@ static void CopyLevelToUndoBuffer() for(x=0; xevent.off_borders; boolean button_press_event; boolean button_release_event; + boolean draw_level = (gi->custom_id == ED_CTRL_ID_DRAWING_LEVEL); int new_element; - int 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; - if (edit_mode != ED_MODE_EDIT) + /* + if (edit_mode != ED_MODE_DRAWING) return; + */ - button_press_event = (last_button == 0 && button != 0); - button_release_event = (last_button != 0 && button == 0); - last_button = button; + button_press_event = (gi->event.type == GD_EVENT_PRESSED); + button_release_event = (gi->event.type == GD_EVENT_RELEASED); + + 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); + lx = sx + level_xpos; + ly = sy + level_ypos; + + lx = (lx < 0 ? 0 : lx > lev_fieldx - 1 ? lev_fieldx - 1 : lx); + ly = (ly < 0 ? 0 : ly > lev_fieldy - 1 ? lev_fieldy - 1 : ly); + sx = lx - level_xpos; + sy = ly - level_ypos; + } + else + { + sx = (sx < 0 ? 0 : sx > 2 ? 2 : sx); + sy = (sy < 0 ? 0 : sy > 2 ? 2 : sy); + } - if (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 ((!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= 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)); } break; @@ -1921,6 +2492,7 @@ static void HandleDrawingFunctions(int mx, int my, int button) case ED_CTRL_ID_LINE: case ED_CTRL_ID_RECTANGLE: case ED_CTRL_ID_FILLED_BOX: + case ED_CTRL_ID_BRUSH: { static int last_sx = -1; static int last_sy = -1; @@ -1932,18 +2504,27 @@ static void HandleDrawingFunctions(int mx, int my, int button) draw_func = DrawLine; else if (drawing_function == ED_CTRL_ID_RECTANGLE) draw_func = DrawRectangle; - else + else if (drawing_function == ED_CTRL_ID_FILLED_BOX) draw_func = DrawFilledBox; + else + draw_func = SelectArea; if (button_press_event) { - last_sx = start_sx = sx; - last_sy = start_sy = sy; + draw_func(sx, sy, sx, sy, new_element, FALSE); + start_sx = last_sx = sx; + start_sy = last_sy = sy; } else if (button_release_event) { - draw_func(start_sx, start_sy, sx, sy, last_element, TRUE); - CopyLevelToUndoBuffer(); + draw_func(start_sx, start_sy, sx, sy, new_element, TRUE); + if (drawing_function == ED_CTRL_ID_BRUSH) + { + CopyAreaToBrush(start_sx, start_sy, sx, sy); + draw_with_brush = TRUE; + } + else + CopyLevelToUndoBuffer(); } else if (last_sx != sx || last_sy != sy) { @@ -1955,6 +2536,11 @@ static void HandleDrawingFunctions(int mx, int my, int button) } break; + case ED_CTRL_ID_TEXT: + if (button_press_event) + DrawLevelText(sx, sy, 0, TEXT_INIT); + break; + case ED_CTRL_ID_FLOOD_FILL: if (button_press_event && Feld[lx][ly] != new_element) { @@ -1967,145 +2553,65 @@ static void HandleDrawingFunctions(int mx, int my, int button) default: break; } - - last_element = new_element; } -static void HandlePressedControlButtons() +static void HandleCounterButtons(struct GadgetInfo *gi) { - static unsigned long button_delay = 0; - int i = 0; + int id = gi->custom_id; + int button = gi->event.button; + int step = (button == 1 ? 1 : button == 2 ? 5 : 10); - /* buttons with action when held pressed */ - int gadget_id[] = + switch (id) { - ED_CTRL_ID_WRAP_UP, - ED_CTRL_ID_WRAP_LEFT, - ED_CTRL_ID_WRAP_RIGHT, - ED_CTRL_ID_WRAP_DOWN, - ED_CTRL_ID_SCORE_DOWN, - ED_CTRL_ID_SCORE_UP, - -1 - }; + case ED_CTRL_ID_SCORE_DOWN: + case ED_CTRL_ID_SCORE_UP: + *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step); + if (*gadget_score_value < 0) + *gadget_score_value = 0; + else if (*gadget_score_value > 255) + *gadget_score_value = 255; + + DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value); + break; - if (!DelayReached(&button_delay, GADGET_FRAME_DELAY)) - return; + case ED_CTRL_ID_ELEMCONT_DOWN: + case ED_CTRL_ID_ELEMCONT_UP: + *gadget_areas_value += (id == ED_CTRL_ID_ELEMCONT_DOWN ? -step : step); + if (*gadget_areas_value < 1) + *gadget_areas_value = 1; + else if (*gadget_areas_value > MAX_ELEMCONT) + *gadget_areas_value = MAX_ELEMCONT; - while (gadget_id[i] != -1) - { - int id = gadget_id[i++]; - int state = level_editor_gadget[id]->state; - int button = level_editor_gadget[id]->event.button; - int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + DrawCounterValueField(ED_COUNTER_ELEMCONT, *gadget_areas_value); + DrawElementContentAreas(); + break; - if (state != GD_BUTTON_PRESSED) - continue; - - switch (id) - { - case ED_CTRL_ID_WRAP_LEFT: - if (level_xpos >= 0) - { - if (lev_fieldx < 2*SCR_FIELDX - 2) - break; - - level_xpos -= step; - if (level_xpos <- 1) - level_xpos = -1; - if (button == 1) - ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT); - else - DrawMiniLevel(level_xpos, level_ypos); - } - break; - - case ED_CTRL_ID_WRAP_RIGHT: - if (level_xpos <= lev_fieldx - 2*SCR_FIELDX) - { - if (lev_fieldx < 2*SCR_FIELDX - 2) - break; - - level_xpos += step; - if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1) - level_xpos = lev_fieldx - 2*SCR_FIELDX + 1; - if (button == 1) - ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT); - else - DrawMiniLevel(level_xpos, level_ypos); - } - break; - - case ED_CTRL_ID_WRAP_UP: - if (level_ypos >= 0) - { - if (lev_fieldy < 2*SCR_FIELDY - 2) - break; - - level_ypos -= step; - if (level_ypos < -1) - level_ypos = -1; - if (button == 1) - ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN); - else - DrawMiniLevel(level_xpos, level_ypos); - } - break; - - case ED_CTRL_ID_WRAP_DOWN: - if (level_ypos <= lev_fieldy - 2*SCR_FIELDY) - { - if (lev_fieldy < 2*SCR_FIELDY - 2) - break; - - level_ypos += step; - if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1) - level_ypos = lev_fieldy - 2*SCR_FIELDY + 1; - if (button == 1) - ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP); - else - DrawMiniLevel(level_xpos, level_ypos); - } - break; - - 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; - - DrawValueField(ED_SCORE_FIELD, *gadget_score_value); - break; - - default: - break; - } + default: + break; } } static void HandleControlButtons(struct GadgetInfo *gi) { - /* - int event_type = gi->event.type; - */ + int id = gi->custom_id; int button = gi->event.button; + int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + int new_element; int player_present = FALSE; int level_changed = FALSE; - int id = -1; - int i, x, y; + int x, y; - /* get the button id */ - for (i=0; iid == level_editor_gadget[i]->id) - id = i; + new_element = (button == 1 ? new_element1 : + button == 2 ? new_element2 : + button == 3 ? new_element3 : 0); + + if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT) + DrawLevelText(0, 0, 0, TEXT_END); - if (id >= 0 && id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_EDIT) + if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING) { - UnmapLevelEditorWindowGadgets(); - AdjustLevelScrollPosition(); - DrawMiniLevel(level_xpos, level_ypos); - edit_mode = ED_MODE_EDIT; + DrawDrawingWindow(); + edit_mode = ED_MODE_DRAWING; } switch (id) @@ -2121,14 +2627,78 @@ static void HandleControlButtons(struct GadgetInfo *gi) 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(button); + 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: @@ -2158,7 +2728,7 @@ static void HandleControlButtons(struct GadgetInfo *gi) { AdjustLevelScrollPosition(); DrawMiniLevel(level_xpos, level_ypos); - edit_mode = ED_MODE_EDIT; + edit_mode = ED_MODE_DRAWING; } break; @@ -2269,14 +2839,51 @@ static void HandleControlButtons(struct GadgetInfo *gi) break; default: - /* - if (event_type == GD_EVENT_PRESSED) - printf("HandleControlButtons: GD_EVENT_PRESSED\n"); - else if (event_type == GD_EVENT_RELEASED) - printf("HandleControlButtons: GD_EVENT_RELEASED\n"); + if (gi->event.type == GD_EVENT_PRESSED) + printf("default: HandleControlButtons: GD_EVENT_PRESSED\n"); + else if (gi->event.type == GD_EVENT_RELEASED) + printf("default: HandleControlButtons: GD_EVENT_RELEASED\n"); + else if (gi->event.type == GD_EVENT_MOVING) + printf("default: HandleControlButtons: GD_EVENT_MOVING\n"); else - printf("HandleControlButtons: ?\n"); - */ + printf("default: HandleControlButtons: ?\n"); break; } } + +void HandleLevelEditorKeyInput(KeySym key) +{ + if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT) + { + char *keyname = getKeyNameFromKeySym(key); + char letter = 0; + + if (strlen(keyname) == 1) + letter = keyname[0]; + else if (strcmp(keyname, "space") == 0) + letter = ' '; + else if (strcmp(keyname, "less") == 0) + letter = '<'; + else if (strcmp(keyname, "equal") == 0) + letter = '='; + else if (strcmp(keyname, "greater") == 0) + letter = '>'; + + /* map lower case letters to upper case */ + if (letter >= 'a' && letter <= 'z') + letter += (int)('A' - 'a'); + else if (letter == 'ä') + letter = 'Ä'; + else if (letter == 'ä') + letter = 'Ö'; + else if (letter == 'ä') + letter = 'Ü'; + + if (letter) + DrawLevelText(0, 0, letter, TEXT_WRITECHAR); + else if (key == XK_Delete || key == XK_BackSpace) + DrawLevelText(0, 0, 0, TEXT_BACKSPACE); + else if (key == XK_Return) + DrawLevelText(0, 0, 0, TEXT_NEWLINE); + } +}