X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=4ae9f6fde6adc8acbf0a2d0280c1bab54d1f32b0;hb=b4045ec83a11b71b7348575d2c76783cde14dccd;hp=d3d81c2599b3649dd4cd973152fad2f86178bd44;hpb=c5728b1ebc2a1d3753a6eea5a0f6335d077eef6b;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index d3d81c25..4ae9f6fd 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 @@ -49,7 +49,9 @@ #define RANDOM_USE_NUM_OBJECTS 1 /* 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 @@ -72,9 +74,6 @@ #define ED_COUNT_VALUE_XOFFSET 5 #define ED_COUNT_VALUE_YOFFSET 3 -/* identifiers for DrawValueField() */ -#define ED_SCORE_FIELD 0 - /* control button identifiers */ #define ED_CTRL_ID_SINGLE_ITEMS 0 #define ED_CTRL_ID_CONNECTED_ITEMS 1 @@ -86,10 +85,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,16 +98,35 @@ #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_NUM_GADGETS 24 +/* 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 */ +static void DrawDrawingWindow(); +static void DrawPropertiesWindow(int); 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]; @@ -477,11 +497,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 +557,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,11 +580,11 @@ 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 id) +static void CreateCounterButtons(int counter_id) { int i; @@ -543,41 +594,70 @@ static void CreateCounterButtons(int id) 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_X, SX + ED_SCORE_XPOS + gd_xoffset, - GDI_Y, SY + ED_SCORE_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, GD_EVENT_PRESSED, - GDI_CALLBACK, HandleControlButtons, + GDI_EVENT_MASK, event_mask, + GDI_CALLBACK, HandleCounterButtons, GDI_END); if (gi == NULL) Error(ERR_EXIT, "cannot create gadget"); - level_editor_gadget[id + i] = gi; + level_editor_gadget[id] = gi; } } +static void CreateDrawingAreas() +{ + struct GadgetInfo *gi; + unsigned long event_mask; + + 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, + 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; +} + static void CreateLevelEditorGadgets() { if (level_editor_gadgets_created) return; - /* create main control buttons */ CreateControlButtons(); - - /* create element score buttons */ - CreateCounterButtons(ED_CTRL_ID_SCORE_DOWN); + CreateCounterButtons(ED_COUNTER_SCORE); + CreateDrawingAreas(); level_editor_gadgets_created = TRUE; } @@ -590,12 +670,17 @@ static void MapControlButtons() MapGadget(level_editor_gadget[i]); } -static void MapCounterButtons(int id) +static void MapCounterButtons(int counter_id) { int i; for (i=0; i<2; i++) - MapGadget(level_editor_gadget[id + 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() @@ -620,7 +705,7 @@ void DrawLevelEd() level_xpos=-1; level_ypos=-1; - edit_mode = ED_MODE_EDIT; + edit_mode = ED_MODE_DRAWING; name_typing = FALSE; element_shift = 0; @@ -728,6 +813,7 @@ void DrawLevelEd() CreateLevelEditorGadgets(); MapControlButtons(); + MapMainDrawingArea(); /* OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2); @@ -922,9 +1008,10 @@ void LevelEd(int mx, int my, int button) int y = (my-SY)/MINI_TILEY; */ - + /* HandlePressedControlButtons(); HandleDrawingFunctions(mx, my, button); + */ if (use_floodfill) /********** FLOOD FILL **********/ { @@ -978,11 +1065,18 @@ void LevelEd(int mx, int my, int button) element_shiftelements_in_list-MAX_ELEM_X*MAX_ELEM_Y) @@ -1022,9 +1116,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 == ED_MODE_EDIT) /********** EDIT-FENSTER **********/ + if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/ { @@ -1175,7 +1272,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 +1418,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 +1667,122 @@ 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); +} - 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); +#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" - DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET, - int2str(value, 3), FS_SMALL, FC_YELLOW); - } +static void DrawDrawingWindow() +{ + ClearWindow(); + UnmapLevelEditorWindowGadgets(); + MapMainDrawingArea(); + AdjustLevelScrollPosition(); + DrawMiniLevel(level_xpos, level_ypos); } -static void DrawPropertiesWindow(int button) +static void DrawPropertiesWindow(int element) { - int x, y; - int new_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(); - new_element = (button == 1 ? new_element1 : - button == 2 ? new_element2 : - button == 3 ? new_element3 : 0); - - DrawGraphic(1, 1, el2gfx(new_element)); + 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 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_TILEX; + to_sx = SX + to_x * MINI_TILEX + MINI_TILEX - 1; + to_sy = SY + to_y * MINI_TILEX + MINI_TILEY - 1; + + XSetForeground(display, gc, border_color); + + 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); +} + static void FloodFill(int from_x, int from_y, int fill_element) { int i,x,y; @@ -1774,6 +1971,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 +2076,6 @@ static void CopyLevelToUndoBuffer() for(x=0; xevent.off_borders; boolean button_press_event; boolean button_release_event; 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); + + 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; - 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) || @@ -1921,6 +2216,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,17 +2228,20 @@ 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); + draw_func(start_sx, start_sy, sx, sy, new_element, TRUE); CopyLevelToUndoBuffer(); } else if (last_sx != sx || last_sy != sy) @@ -1955,6 +2254,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 +2271,53 @@ 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; - - /* 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; + int id = gi->custom_id; + int button = gi->event.button; + int step = (button == 1 ? 1 : button == 2 ? 5 : 10); - while (gadget_id[i] != -1) + switch (id) { - 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); + 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 (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 (id >= 0 && id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_EDIT) + if (edit_mode == ED_MODE_DRAWING && drawing_function == ED_CTRL_ID_TEXT) + DrawLevelText(0, 0, 0, TEXT_END); + + if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING) { - UnmapLevelEditorWindowGadgets(); - AdjustLevelScrollPosition(); - DrawMiniLevel(level_xpos, level_ypos); - edit_mode = ED_MODE_EDIT; + DrawDrawingWindow(); + edit_mode = ED_MODE_DRAWING; } switch (id) @@ -2121,8 +2333,72 @@ 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); + DrawPropertiesWindow(new_element); edit_mode = ED_MODE_PROPERTIES; break; @@ -2158,7 +2434,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 +2545,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); + } +}