X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=e68ec1a8d37efb07cee16488cc4a1c64f5a1a93f;hp=8c38785210b777bfdcb744723d2b1faf4a1d25a4;hb=7ecbe0a730dc19d8a46ffe6bbcb052f20d0c4152;hpb=94f017e57e45fae89e35a4948fe7005bdf3f13ba diff --git a/src/screens.c b/src/screens.c index 8c387852..e68ec1a8 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* screens.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// screens.c +// ============================================================================ #include "libgame/libgame.h" @@ -38,6 +36,8 @@ #define MAX_INFO_MODES 8 /* screens on the setup screen */ +/* (must match GFX_SPECIAL_ARG_SETUP_* values as defined in src/main.h) */ +/* (should also match corresponding entries in src/conf_gfx.c) */ #define SETUP_MODE_MAIN 0 #define SETUP_MODE_GAME 1 #define SETUP_MODE_EDITOR 2 @@ -45,29 +45,38 @@ #define SETUP_MODE_SOUND 4 #define SETUP_MODE_ARTWORK 5 #define SETUP_MODE_INPUT 6 -#define SETUP_MODE_SHORTCUTS 7 -#define SETUP_MODE_SHORTCUTS_1 8 -#define SETUP_MODE_SHORTCUTS_2 9 -#define SETUP_MODE_SHORTCUTS_3 10 -#define SETUP_MODE_SHORTCUTS_4 11 -#define SETUP_MODE_SHORTCUTS_5 12 +#define SETUP_MODE_TOUCH 7 +#define SETUP_MODE_SHORTCUTS 8 +#define SETUP_MODE_SHORTCUTS_1 9 +#define SETUP_MODE_SHORTCUTS_2 10 +#define SETUP_MODE_SHORTCUTS_3 11 +#define SETUP_MODE_SHORTCUTS_4 12 +#define SETUP_MODE_SHORTCUTS_5 13 /* sub-screens on the setup screen (generic) */ -#define SETUP_MODE_CHOOSE_ARTWORK 13 -#define SETUP_MODE_CHOOSE_OTHER 14 +#define SETUP_MODE_CHOOSE_ARTWORK 14 +#define SETUP_MODE_CHOOSE_OTHER 15 /* sub-screens on the setup screen (specific) */ -#define SETUP_MODE_CHOOSE_GAME_SPEED 15 -#define SETUP_MODE_CHOOSE_SCREEN_MODE 16 +#define SETUP_MODE_CHOOSE_GAME_SPEED 16 #define SETUP_MODE_CHOOSE_SCROLL_DELAY 17 -#define SETUP_MODE_CHOOSE_GRAPHICS 18 -#define SETUP_MODE_CHOOSE_SOUNDS 19 -#define SETUP_MODE_CHOOSE_MUSIC 20 -#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 21 -#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 22 -#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 23 - -#define MAX_SETUP_MODES 24 +#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 18 +#define SETUP_MODE_CHOOSE_SCREEN_MODE 19 +#define SETUP_MODE_CHOOSE_WINDOW_SIZE 20 +#define SETUP_MODE_CHOOSE_SCALING_TYPE 21 +#define SETUP_MODE_CHOOSE_GRAPHICS 22 +#define SETUP_MODE_CHOOSE_SOUNDS 23 +#define SETUP_MODE_CHOOSE_MUSIC 24 +#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 25 +#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 26 +#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 27 +#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 28 +#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 29 +#define SETUP_MODE_CHOOSE_DROP_DISTANCE 30 + +#define MAX_SETUP_MODES 31 + +#define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES) /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -78,14 +87,30 @@ /* for various menu stuff */ #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 -#define MENU_SCREEN_VALUE_XPOS 14 +#define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) #define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) #define MENU_TITLE1_YPOS 8 #define MENU_TITLE2_YPOS 46 -#define MAX_INFO_ELEMENTS_ON_SCREEN 10 +#define MENU_SCREEN_INFO_XSTART 16 +#define MENU_SCREEN_INFO_YSTART1 100 +#define MENU_SCREEN_INFO_YSTART2 128 +#define MENU_SCREEN_INFO_YSTEP (TILEY + 4) +#define MENU_SCREEN_INFO_YBOTTOM (SYSIZE - 20) +#define MENU_SCREEN_INFO_YSIZE (MENU_SCREEN_INFO_YBOTTOM - \ + MENU_SCREEN_INFO_YSTART2 - \ + TILEY / 2) +#define MAX_INFO_ELEMENTS_ON_SCREEN 128 +#define STD_INFO_ELEMENTS_ON_SCREEN (MENU_SCREEN_INFO_YSIZE / \ + MENU_SCREEN_INFO_YSTEP) +#define NUM_INFO_ELEMENTS_FROM_CONF \ + (menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] > 0 ? \ + menu.list_size_info[GFX_SPECIAL_ARG_INFO_ELEMENTS] : \ + MAX_MENU_ENTRIES_ON_SCREEN) +#define NUM_INFO_ELEMENTS_ON_SCREEN MIN(MIN(STD_INFO_ELEMENTS_ON_SCREEN, \ + MAX_INFO_ELEMENTS_ON_SCREEN), \ + NUM_INFO_ELEMENTS_FROM_CONF) #define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - MENU_SCREEN_START_YPOS) -#define MAX_MENU_TEXT_LENGTH_BIG (MENU_SCREEN_VALUE_XPOS - \ - MENU_SCREEN_START_XPOS) +#define MAX_MENU_TEXT_LENGTH_BIG 13 #define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) /* buttons and scrollbars identifiers */ @@ -142,16 +167,15 @@ static void CalibrateJoystick(int); static void execSetupGame(void); static void execSetupGraphics(void); static void execSetupSound(void); +static void execSetupTouch(void); static void execSetupArtwork(void); static void HandleChooseTree(int, int, int, int, int, TreeInfo **); static void DrawChooseLevelSet(void); static void DrawChooseLevelNr(void); static void DrawInfoScreen(void); -static void DrawAndFadeInInfoScreen(int); static void DrawSetupScreen(void); -static void DrawInfoScreenExt(int, int); static void DrawInfoScreen_NotAvailable(char *, char *); static void DrawInfoScreen_HelpAnim(int, int, boolean); static void DrawInfoScreen_HelpText(int, int, int, int); @@ -164,6 +188,7 @@ static void HandleInfoScreen_Program(int); static void HandleInfoScreen_Version(int); static void MapScreenMenuGadgets(int); +static void MapScreenGadgets(int); static void MapScreenTreeGadgets(TreeInfo *); static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS]; @@ -174,9 +199,18 @@ static int setup_mode = SETUP_MODE_MAIN; static TreeInfo *screen_modes = NULL; static TreeInfo *screen_mode_current = NULL; +static TreeInfo *window_sizes = NULL; +static TreeInfo *window_size_current = NULL; + +static TreeInfo *scaling_types = NULL; +static TreeInfo *scaling_type_current = NULL; + static TreeInfo *scroll_delays = NULL; static TreeInfo *scroll_delay_current = NULL; +static TreeInfo *snapshot_modes = NULL; +static TreeInfo *snapshot_mode_current = NULL; + static TreeInfo *game_speeds = NULL; static TreeInfo *game_speed_current = NULL; @@ -189,9 +223,53 @@ static TreeInfo *volume_loops_current = NULL; static TreeInfo *volumes_music = NULL; static TreeInfo *volume_music_current = NULL; +static TreeInfo *touch_controls = NULL; +static TreeInfo *touch_control_current = NULL; + +static TreeInfo *move_distances = NULL; +static TreeInfo *move_distance_current = NULL; + +static TreeInfo *drop_distances = NULL; +static TreeInfo *drop_distance_current = NULL; + static TreeInfo *level_number = NULL; static TreeInfo *level_number_current = NULL; +static struct +{ + int value; + char *text; +} window_sizes_list[] = +{ + { 50, "50 %" }, + { 80, "80 %" }, + { 90, "90 %" }, + { 100, "100 % (Default)" }, + { 110, "110 %" }, + { 120, "120 %" }, + { 130, "130 %" }, + { 140, "140 %" }, + { 150, "150 %" }, + { 200, "200 %" }, + { 250, "250 %" }, + { 300, "300 %" }, + + { -1, NULL }, +}; + +static struct +{ + char *value; + char *text; +} scaling_types_list[] = +{ + { SCALING_QUALITY_NEAREST, "None" }, + { SCALING_QUALITY_LINEAR, "Linear" }, + { SCALING_QUALITY_BEST, "Anisotropic" }, + + { NULL, NULL }, +}; + static struct { int value; @@ -242,6 +320,19 @@ static struct { -1, NULL }, }; +static struct +{ + char *value; + char *text; +} snapshot_modes_list[] = +{ + { STR_SNAPSHOT_MODE_OFF, "Off" }, + { STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" }, + { STR_SNAPSHOT_MODE_EVERY_MOVE, "Every Move" }, + + { NULL, NULL }, +}; + static struct { int value; @@ -249,6 +340,9 @@ static struct } volumes_list[] = { { 0, "0 %" }, + { 1, "1 %" }, + { 2, "2 %" }, + { 5, "5 %" }, { 10, "10 %" }, { 20, "20 %" }, { 30, "30 %" }, @@ -263,6 +357,37 @@ static struct { -1, NULL }, }; +static struct +{ + char *value; + char *text; +} touch_controls_list[] = +{ + { TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" }, + { TOUCH_CONTROL_WIPE_GESTURES, "Wipe Gestures" }, + + { NULL, NULL }, +}; + +static struct +{ + int value; + char *text; +} distances_list[] = +{ + { 1, "1 %" }, + { 2, "2 %" }, + { 3, "3 %" }, + { 4, "4 %" }, + { 5, "5 %" }, + { 10, "10 %" }, + { 15, "15 %" }, + { 20, "20 %" }, + { 25, "25 %" }, + + { -1, NULL }, +}; + #define DRAW_MODE(s) ((s) >= GAME_MODE_MAIN && \ (s) <= GAME_MODE_SETUP ? (s) : \ (s) == GAME_MODE_PSEUDO_TYPENAME ? \ @@ -312,10 +437,8 @@ static struct menu.list_size[game_status] : \ MAX_MENU_ENTRIES_ON_SCREEN) -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) -#define NUM_SCROLLBAR_BITMAPS 2 -static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS]; -#endif +#define IN_VIS_MENU(x, y) IN_FIELD(x, y, SCR_FIELDX, \ + NUM_MENU_ENTRIES_ON_SCREEN) /* title display and control definitions */ @@ -323,6 +446,9 @@ static Bitmap *scrollbar_bitmap[NUM_SCROLLBAR_BITMAPS]; #define MAX_NUM_TITLE_SCREENS (2 * MAX_NUM_TITLE_IMAGES + \ 2 * MAX_NUM_TITLE_MESSAGES) +#define NO_DIRECT_LEVEL_SELECT (-1) + + static int num_title_screens = 0; struct TitleControlInfo @@ -384,9 +510,6 @@ static char *main_text_level_year = NULL; static char *main_text_level_imported_from = NULL; static char *main_text_level_imported_by = NULL; static char *main_text_level_tested_by = NULL; -static char *main_text_title_1 = PROGRAM_TITLE_STRING; -static char *main_text_title_2 = PROGRAM_COPYRIGHT_STRING; -static char *main_text_title_3 = PROGRAM_GAME_BY_STRING; struct MainControlInfo { @@ -536,19 +659,19 @@ static struct MainControlInfo main_controls[] = { MAIN_CONTROL_TITLE_1, NULL, -1, - &menu.main.text.title_1, &main_text_title_1, + &menu.main.text.title_1, &setup.internal.program_title, NULL, NULL, }, { MAIN_CONTROL_TITLE_2, NULL, -1, - &menu.main.text.title_2, &main_text_title_2, + &menu.main.text.title_2, &setup.internal.program_copyright, NULL, NULL, }, { MAIN_CONTROL_TITLE_3, NULL, -1, - &menu.main.text.title_3, &main_text_title_3, + &menu.main.text.title_3, &setup.internal.program_company, NULL, NULL, }, @@ -719,11 +842,6 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci) } } -#if 0 - if (ti.anim_mode == ANIM_NONE) - ti.fade_delay = ti.post_delay = 0; -#endif - return ti; } @@ -767,12 +885,6 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) Bitmap *bitmap = graphic_info[graphic].bitmap; int sort_priority = graphic_info[graphic].sort_priority; -#if 0 - /* skip images and messages (fonts!) when using forced custom graphics */ - if (setup.override_level_graphics && !initial) - continue; -#endif - if (bitmap != NULL) InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority); } @@ -783,12 +895,6 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) char *filename = getLevelSetTitleMessageFilename(i, initial); int sort_priority = tmi->sort_priority; -#if 0 - /* skip images and messages (fonts!) when using forced custom graphics */ - if (setup.override_level_graphics) - continue; -#endif - if (filename != NULL) InitializeTitleControlsExt_AddTitleInfo(FALSE, initial, i, sort_priority); } @@ -798,11 +904,9 @@ static void InitializeTitleControls(boolean show_title_initial) { num_title_screens = 0; -#if 1 /* 1st step: initialize title screens for game start (only when starting) */ if (show_title_initial) InitializeTitleControls_CheckTitleInfo(TRUE); -#endif /* 2nd step: initialize title screens for current level set */ InitializeTitleControls_CheckTitleInfo(FALSE); @@ -853,13 +957,8 @@ static void InitializeMainControls() char *text = (mci->text ? *mci->text : NULL); char *input = (mci->input ? *mci->input : NULL); int button_graphic = mci->button_graphic; -#if 1 int font_text = (pos_text ? pos_text->font : -1); int font_input = (pos_input ? pos_input->font : -1); -#else - int font_text = mci->font_text; - int font_input = mci->font_input; -#endif int font_text_width = (font_text != -1 ? getFontWidth(font_text) : 0); int font_text_height = (font_text != -1 ? getFontHeight(font_text) : 0); @@ -879,59 +978,34 @@ static void InitializeMainControls() if (nr == MAIN_CONTROL_NAME) { -#if 0 - if (menu.main.input.name.x == -1) - menu.main.input.name.x = menu.main.text.name.x + text_width; - if (menu.main.input.name.y == -1) - menu.main.input.name.y = menu.main.text.name.y; -#endif - -#if 1 menu.main.input.name.width = input_width; menu.main.input.name.height = input_height; -#else - menu.main.input.name.width = font_input_width * MAX_PLAYER_NAME_LEN; - menu.main.input.name.height = font_input_height; -#endif } if (pos_button != NULL) /* (x/y may be -1/-1 here) */ { - if (pos_button->width == 0) - pos_button->width = button_width; - if (pos_button->height == 0) - pos_button->height = button_height; + pos_button->width = button_width; + pos_button->height = button_height; } if (pos_text != NULL) /* (x/y may be -1/-1 here) */ { -#if 1 /* calculate size for non-clickable text -- needed for text alignment */ boolean calculate_text_size = (pos_button == NULL && text != NULL); -#else - /* calculate width for non-clickable text -- needed for text alignment */ - boolean calculate_text_width = (pos_button == NULL && text != NULL); -#endif + + if (pos_text->width == -1 || calculate_text_size) + pos_text->width = text_width; + if (pos_text->height == -1 || calculate_text_size) + pos_text->height = text_height; if (visibleMenuPos(pos_button)) { if (pos_text->x == -1) pos_text->x = pos_button->x + pos_button->width; if (pos_text->y == -1) - pos_text->y = pos_button->y; + pos_text->y = + pos_button->y + (pos_button->height - pos_text->height) / 2; } - -#if 1 - if (pos_text->width == -1 || calculate_text_size) - pos_text->width = text_width; - if (pos_text->height == -1 || calculate_text_size) - pos_text->height = text_height; -#else - if (pos_text->width == -1 || calculate_text_width) - pos_text->width = text_width; - if (pos_text->height == -1) - pos_text->height = text_height; -#endif } if (pos_input != NULL) /* (x/y may be -1/-1 here) */ @@ -952,8 +1026,24 @@ static void InitializeMainControls() } } +static void DrawPressedGraphicThruMask(int dst_x, int dst_y, + int graphic, boolean pressed) +{ + struct GraphicInfo *g = &graphic_info[graphic]; + Bitmap *src_bitmap; + int src_x, src_y; + int xoffset = (pressed ? g->pressed_xoffset : 0); + int yoffset = (pressed ? g->pressed_yoffset : 0); + + getFixedGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); + + BlitBitmapMasked(src_bitmap, drawto, src_x + xoffset, src_y + yoffset, + g->width, g->height, dst_x, dst_y); +} + static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, - boolean active_input) + boolean active_input, + boolean pressed_button) { int i; @@ -969,13 +1059,8 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, char *text = (mci->text ? *mci->text : NULL); char *input = (mci->input ? *mci->input : NULL); int button_graphic = mci->button_graphic; -#if 1 int font_text = (pos_text ? pos_text->font : -1); int font_input = (pos_input ? pos_input->font : -1); -#else - int font_text = mci->font_text; - int font_input = mci->font_input; -#endif if (active_text) { @@ -995,7 +1080,7 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, int y = mSY + pos->y; DrawBackgroundForGraphic(x, y, pos->width, pos->height, button_graphic); - DrawFixedGraphicThruMaskExt(drawto, x, y, button_graphic, 0); + DrawPressedGraphicThruMask(x, y, button_graphic, pressed_button); } if (visibleTextPos(pos_text) && text != NULL) @@ -1027,15 +1112,17 @@ static void DrawCursorAndText_Main_Ext(int nr, boolean active_text, } } -static void DrawCursorAndText_Main(int nr, boolean active_text) +static void DrawCursorAndText_Main(int nr, boolean active_text, + boolean pressed_button) { - DrawCursorAndText_Main_Ext(nr, active_text, FALSE); + DrawCursorAndText_Main_Ext(nr, active_text, FALSE, pressed_button); } #if 0 -static void DrawCursorAndText_Main_Input(int nr, boolean active_text) +static void DrawCursorAndText_Main_Input(int nr, boolean active_text, + boolean pressed_button) { - DrawCursorAndText_Main_Ext(nr, active_text, TRUE); + DrawCursorAndText_Main_Ext(nr, active_text, TRUE, pressed_button); } #endif @@ -1081,13 +1168,41 @@ static boolean insideTextPosRect(struct TextPosInfo *rect, int x, int y) y >= rect_y && y < rect_y + rect->height); } +static void AdjustScrollbar(int id, int items_max, int items_visible, + int item_position) +{ + struct GadgetInfo *gi = screen_gadget[id]; + + if (item_position > items_max - items_visible) + item_position = items_max - items_visible; + + ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max, + GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible, + GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); +} + +static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti) +{ + AdjustScrollbar(id, numTreeInfoInGroup(ti), NUM_MENU_ENTRIES_ON_SCREEN, + first_entry); +} + +static void clearMenuListArea() +{ + int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; + + /* correct scrollbar position if placed outside menu (playfield) area */ + if (scrollbar_xpos > SX + SC_SCROLLBAR_XPOS) + scrollbar_xpos = SX + SC_SCROLLBAR_XPOS; + + /* clear menu list area, but not title or scrollbar */ + DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, + scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32); +} + static void drawCursorExt(int xpos, int ypos, boolean active, int graphic) { -#if 1 static int cursor_array[MAX_LEV_FIELDY]; -#else - static int cursor_array[SCR_FIELDY]; -#endif int x = mSX + TILEX * xpos; int y = mSY + TILEY * (MENU_SCREEN_START_YPOS + ypos); @@ -1125,11 +1240,6 @@ static void drawChooseTreeCursor(int ypos, boolean active) { int last_game_status = game_status; /* save current game status */ -#if 0 - /* force LEVELS draw offset on artwork setup screen */ - game_status = GAME_MODE_LEVELS; -#endif - drawCursorExt(0, ypos, active, -1); game_status = last_game_status; /* restore current game status */ @@ -1137,38 +1247,9 @@ static void drawChooseTreeCursor(int ypos, boolean active) void DrawHeadline() { - DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, PROGRAM_TITLE_STRING); - DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, PROGRAM_COPYRIGHT_STRING); -} - -#if 0 -static int getPrevlevelButtonPos() -{ - return 10; -} - -static int getCurrentLevelTextPos() -{ - return (getPrevlevelButtonPos() + 1); -} - -static int getNextLevelButtonPos() -{ - return getPrevlevelButtonPos() + 3 + 1; -} - -static int getLevelRangeTextPos() -{ - return getNextLevelButtonPos() + 1; -} -#endif - -int effectiveGameStatus() -{ - if (game_status == GAME_MODE_INFO && info_mode == INFO_MODE_TITLE) - return GAME_MODE_TITLE; - - return game_status; + DrawTextSCentered(MENU_TITLE1_YPOS, FONT_TITLE_1, getProgramTitleString()); + DrawTextSCentered(MENU_TITLE2_YPOS, FONT_TITLE_2, + setup.internal.program_copyright); } void DrawTitleScreenImage(int nr, boolean initial) @@ -1208,10 +1289,7 @@ void DrawTitleScreenImage(int nr, boolean initial) ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE); if (DrawingOnBackground(dst_x, dst_y)) - { - SetClipOrigin(bitmap, bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y); BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); - } else BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y); @@ -1258,10 +1336,6 @@ void DrawTitleScreen() { KeyboardAutoRepeatOff(); -#if 0 - SetMainBackgroundImage(IMG_BACKGROUND_TITLE); -#endif - HandleTitleScreen(0, 0, 0, 0, MB_MENU_INITIALIZE); StopAnimation(); @@ -1284,10 +1358,13 @@ boolean CheckTitleScreen(boolean levelset_has_changed) return (show_titlescreen && num_title_screens > 0); } -void DrawMainMenuExt(int fade_mask, boolean do_fading) +void DrawMainMenu() { static LevelDirTree *leveldir_last_valid = NULL; boolean levelset_has_changed = FALSE; + int fade_mask = REDRAW_FIELD; + + LimitScreenUpdates(FALSE); FadeSetLeaveScreen(); @@ -1299,9 +1376,6 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) KeyboardAutoRepeatOn(); ActivateJoystick(); - SetDrawDeactivationMask(REDRAW_NONE); - SetDrawBackgroundMask(REDRAW_FIELD); - audio.sound_deactivated = FALSE; GetPlayerConfig(); @@ -1316,7 +1390,8 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) } /* needed if last screen was the setup screen and fullscreen state changed */ - ToggleFullscreenIfNeeded(); + // (moved to "execSetupGraphics()" to change fullscreen state directly) + // ToggleFullscreenOrChangeWindowScalingIfNeeded(); /* leveldir_current may be invalid (level group, parent link) */ if (!validLevelSeries(leveldir_current)) @@ -1333,31 +1408,25 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) /* needed if last screen (level choice) changed graphics, sounds or music */ ReloadCustomArtwork(0); + /* needed if different viewport properties defined for menues */ + ChangeViewportPropertiesIfNeeded(); + if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; -#if 1 + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; + FadeOut(fade_mask); /* needed if last screen was the editor screen */ UndrawSpecialEditorDoor(); -#if 0 - if (fade_mask == REDRAW_FIELD) - BackToFront(); -#endif -#endif - -#if 1 - /* needed if different viewport properties defined for menues */ - ChangeViewportPropertiesIfNeeded(); -#endif -#if defined(TARGET_SDL) SetDrawtoField(DRAW_BACKBUFFER); -#endif if (CheckTitleScreen(levelset_has_changed)) { + game_status_last_screen = GAME_MODE_MAIN; game_status = GAME_MODE_TITLE; DrawTitleScreen(); @@ -1372,25 +1441,23 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) LoadLevel(level_nr); LoadScore(level_nr); + // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it) + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + SetMainBackgroundImage(IMG_BACKGROUND_MAIN); -#if 1 +#if 0 if (fade_mask == REDRAW_ALL) - { - // int door_state = GetDoorState(); - - RedrawBackground(); - - // OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - } + RedrawGlobalBorder(); #endif ClearField(); InitializeMainControls(); - DrawCursorAndText_Main(-1, FALSE); - DrawPreviewLevel(TRUE); + DrawCursorAndText_Main(-1, FALSE, FALSE); + DrawPreviewLevelInitial(); HandleMainMenu(0, 0, 0, 0, MB_MENU_INITIALIZE); @@ -1410,27 +1477,20 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) MapTapeButtons(); MapScreenMenuGadgets(SCREEN_MASK_MAIN); -#if 1 - if (fade_mask == REDRAW_ALL) - { - int door_state = GetDoorState(); - - // RedrawBackground(); + /* copy actual game door content to door double buffer for OpenDoor() */ + BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); + BlitBitmap(drawto, bitmap_db_door_2, VX, VY, VXSIZE, VYSIZE, 0, 0); - OpenDoor(door_state | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - } -#endif + OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - DrawMaskedBorder(REDRAW_ALL); + DrawMaskedBorder(fade_mask); FadeIn(fade_mask); FadeSetEnterMenu(); -#if 1 /* update screen area with special editor door */ redraw_mask |= REDRAW_ALL; BackToFront(); -#endif SetMouseCursor(CURSOR_DEFAULT); @@ -1439,21 +1499,11 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2); } -void DrawAndFadeInMainMenu(int fade_mask) -{ - DrawMainMenuExt(fade_mask, TRUE); -} - -void DrawMainMenu() -{ - DrawMainMenuExt(REDRAW_ALL, FALSE); -} - -#if defined(CREATE_SPECIAL_EDITION_RND_JUE) static void gotoTopLevelDir() { - /* move upwards to top level directory */ - while (leveldir_current->node_parent) + /* move upwards until inside (but not above) top level directory */ + while (leveldir_current->node_parent && + !strEqual(leveldir_current->node_parent->subdir, STRING_TOP_DIRECTORY)) { /* write a "path" into level tree for easy navigation to last level */ if (leveldir_current->node_parent->node_group->cl_first == -1) @@ -1478,7 +1528,6 @@ static void gotoTopLevelDir() leveldir_current = leveldir_current->node_parent; } } -#endif void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { @@ -1486,7 +1535,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) static int title_screen_nr = 0; static int last_sound = -1, last_music = -1; boolean return_to_main_menu = FALSE; - boolean use_fading_main_menu = TRUE; struct TitleControlInfo *tci; struct TitleFadingInfo fading_default; struct TitleFadingInfo fading_last = fading; @@ -1502,7 +1550,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_sound = SND_UNDEFINED; last_music = MUS_UNDEFINED; - if (game_status == GAME_MODE_INFO) + if (game_status_last_screen == GAME_MODE_INFO) { if (num_title_screens == 0) { @@ -1514,11 +1562,14 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) FadeSoundsAndMusic(); -#if 1 FadeOut(REDRAW_ALL); -#endif + + /* only required to update logic for redrawing global border */ + ClearField(); } + ChangeViewportPropertiesIfNeeded(); + if (tci->is_image) DrawTitleScreenImage(tci->local_nr, tci->initial); else @@ -1528,22 +1579,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) fading = fading_next = getTitleFading(tci); -#if 1 -#if 1 if (!(fading_last.fade_mode & FADE_TYPE_TRANSFORM) && fading_next.fade_mode & FADE_TYPE_TRANSFORM) { fading.fade_mode = FADE_MODE_FADE; fading.fade_delay = fading_default.fade_delay; } -#else - if (fading_last.fade_mode != FADE_MODE_CROSSFADE && - fading_next.fade_mode == FADE_MODE_CROSSFADE) - fading.fade_mode = FADE_MODE_FADE; -#endif -#endif -#if 1 sound = getTitleSound(tci); music = getTitleMusic(tci); @@ -1554,13 +1596,10 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_sound = sound; last_music = music; -#endif SetMouseCursor(CURSOR_NONE); -#if 1 FadeIn(REDRAW_ALL); -#endif fading = fading_next; @@ -1569,31 +1608,23 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) return; } -#if 1 if (fading.auto_delay > 0 && DelayReached(&title_delay, fading.auto_delay)) button = MB_MENU_CHOICE; -#else - if (fading.auto_delay > -1 && DelayReached(&title_delay, fading.auto_delay)) - button = MB_MENU_CHOICE; -#endif if (button == MB_MENU_LEAVE) { return_to_main_menu = TRUE; - use_fading_main_menu = FALSE; } else if (button == MB_MENU_CHOICE) { - if (game_status == GAME_MODE_INFO && num_title_screens == 0) + if (game_status_last_screen == GAME_MODE_INFO && num_title_screens == 0) { -#if 0 - FadeOut(REDRAW_FIELD); -#endif - FadeSetEnterScreen(); + game_status = GAME_MODE_INFO; info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + + DrawInfoScreen(); return; } @@ -1611,9 +1642,7 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (music == MUS_UNDEFINED || music != last_music) FadeMusic(); -#if 1 FadeOut(REDRAW_ALL); -#endif if (tci->is_image) DrawTitleScreenImage(tci->local_nr, tci->initial); @@ -1622,7 +1651,6 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) fading_next = getTitleFading(tci); -#if 1 sound = getTitleSound(tci); music = getTitleMusic(tci); @@ -1633,23 +1661,13 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) last_sound = sound; last_music = music; -#endif -#if 1 /* last screen already faded out, next screen has no animation */ if (!(fading.fade_mode & FADE_TYPE_TRANSFORM) && fading_next.fade_mode == FADE_MODE_NONE) fading = fading_next; -#else - /* last screen already faded out, next screen has no animation */ - if (fading.fade_mode != FADE_MODE_CROSSFADE && - fading_next.fade_mode == FADE_MODE_NONE) - fading = fading_next; -#endif -#if 1 FadeIn(REDRAW_ALL); -#endif fading = fading_next; @@ -1665,39 +1683,37 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (return_to_main_menu) { -#if 0 - RedrawBackground(); -#endif - SetMouseCursor(CURSOR_DEFAULT); - if (game_status == GAME_MODE_INFO) - { -#if 0 - OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); -#endif + /* force full menu screen redraw after displaying title screens */ + redraw_mask = REDRAW_ALL; + if (game_status_last_screen == GAME_MODE_INFO) + { + game_status = GAME_MODE_INFO; info_mode = INFO_MODE_MAIN; - DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu); + + DrawInfoScreen(); } else /* default: return to main menu */ { -#if 0 - OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); -#endif - game_status = GAME_MODE_MAIN; - DrawMainMenuExt(REDRAW_ALL, use_fading_main_menu); + + DrawMainMenu(); } } } -void HandleMainMenu_SelectLevel(int step, int direction) +void HandleMainMenu_SelectLevel(int step, int direction, int selected_level_nr) { int old_level_nr = level_nr; int new_level_nr; - new_level_nr = old_level_nr + step * direction; + if (selected_level_nr != NO_DIRECT_LEVEL_SELECT) + new_level_nr = selected_level_nr; + else + new_level_nr = old_level_nr + step * direction; + if (new_level_nr < leveldir_current->first_level) new_level_nr = leveldir_current->first_level; if (new_level_nr > leveldir_current->last_level) @@ -1706,8 +1722,8 @@ void HandleMainMenu_SelectLevel(int step, int direction) if (setup.handicap && new_level_nr > leveldir_current->handicap_level) { /* skipping levels is only allowed when trying to skip single level */ - if (setup.skip_levels && step == 1 && - Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK)) + if (setup.skip_levels && new_level_nr == old_level_nr + 1 && + Request("Level still unsolved! Skip despite handicap?", REQ_ASK)) { leveldir_current->handicap_level++; SaveLevelSetup_SeriesInfo(); @@ -1729,27 +1745,29 @@ void HandleMainMenu_SelectLevel(int step, int direction) mci->pos_text->font); LoadLevel(level_nr); - DrawPreviewLevel(TRUE); + DrawPreviewLevelInitial(); TapeErase(); LoadTape(level_nr); DrawCompleteVideoDisplay(); - /* needed because DrawPreviewLevel() takes some time */ + /* needed because DrawPreviewLevelInitial() takes some time */ BackToFront(); - SyncDisplay(); + /* SyncDisplay(); */ } } void HandleMainMenu(int mx, int my, int dx, int dy, int button) { static int choice = MAIN_CONTROL_GAME; + static boolean button_pressed_last = FALSE; + boolean button_pressed = FALSE; int pos = choice; int i; if (button == MB_MENU_INITIALIZE) { - DrawCursorAndText_Main(choice, TRUE); + DrawCursorAndText_Main(choice, TRUE, FALSE); return; } @@ -1760,24 +1778,32 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) for (i = 0; main_controls[i].nr != -1; i++) { -#if 0 - printf("::: check click (%d, %d) for %d [%d] ...\n", - mx - mSX, my - mSY, i, main_controls[i].nr); -#endif - if (insideMenuPosRect(main_controls[i].pos_button, mx - mSX, my - mSY) || insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY) || insideTextPosRect(main_controls[i].pos_input, mx - mSX, my - mSY)) { -#if 0 - printf("::: inside %d\n", i); -#endif - pos = main_controls[i].nr; break; } } + + // handle pressed/unpressed state for active/inactive menu buttons + // (if pos != -1, "i" contains index position corresponding to "pos") + if (button && + pos >= MAIN_CONTROL_NAME && pos <= MAIN_CONTROL_QUIT && + insideMenuPosRect(main_controls[i].pos_button, mx - mSX, my - mSY)) + button_pressed = TRUE; + + if (button_pressed != button_pressed_last) + { + DrawCursorAndText_Main(choice, TRUE, button_pressed); + + if (button_pressed) + PlaySound(SND_MENU_BUTTON_PRESSING); + else + PlaySound(SND_MENU_BUTTON_RELEASING); + } } else if (dx || dy) /* keyboard input */ { @@ -1790,20 +1816,26 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (pos == MAIN_CONTROL_LEVELS && dx != 0 && button) { - HandleMainMenu_SelectLevel(1, dx < 0 ? -1 : +1); + HandleMainMenu_SelectLevel(1, (dx < 0 ? -1 : +1), NO_DIRECT_LEVEL_SELECT); } else if (pos == MAIN_CONTROL_FIRST_LEVEL && !button) { - HandleMainMenu_SelectLevel(MAX_LEVELS, -1); + HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT); } else if (pos == MAIN_CONTROL_LAST_LEVEL && !button) { - HandleMainMenu_SelectLevel(MAX_LEVELS, +1); + HandleMainMenu_SelectLevel(MAX_LEVELS, +1, NO_DIRECT_LEVEL_SELECT); } else if (pos == MAIN_CONTROL_LEVEL_NUMBER && !button) { + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); + game_status = GAME_MODE_LEVELNR; + ChangeViewportPropertiesIfNeeded(); + DrawChooseLevelNr(); } else if (pos >= MAIN_CONTROL_NAME && pos <= MAIN_CONTROL_QUIT) @@ -1814,8 +1846,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { PlaySound(SND_MENU_ITEM_ACTIVATING); - DrawCursorAndText_Main(choice, FALSE); - DrawCursorAndText_Main(pos, TRUE); + DrawCursorAndText_Main(choice, FALSE, FALSE); + DrawCursorAndText_Main(pos, TRUE, button_pressed); choice = pos; } @@ -1834,20 +1866,29 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { if (leveldir_first) { + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); + game_status = GAME_MODE_LEVELS; SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); -#if defined(CREATE_SPECIAL_EDITION_RND_JUE) - gotoTopLevelDir(); -#endif + if (setup.internal.choose_from_top_leveldir) + gotoTopLevelDir(); + + ChangeViewportPropertiesIfNeeded(); DrawChooseLevelSet(); } } else if (pos == MAIN_CONTROL_SCORES) { + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); + game_status = GAME_MODE_SCORES; DrawHallOfFame(-1); @@ -1856,35 +1897,48 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) { if (leveldir_current->readonly && !strEqual(setup.player_name, "Artsoft")) - Request("This level is read only !", REQ_CONFIRM); + Request("This level is read only!", REQ_CONFIRM); + + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); game_status = GAME_MODE_EDITOR; FadeSetEnterScreen(); -#if 0 - /* needed if different viewport properties defined for editor */ - ChangeViewportPropertiesIfNeeded(); -#endif - DrawLevelEd(); } else if (pos == MAIN_CONTROL_INFO) { + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); + game_status = GAME_MODE_INFO; info_mode = INFO_MODE_MAIN; + ChangeViewportPropertiesIfNeeded(); + DrawInfoScreen(); } else if (pos == MAIN_CONTROL_GAME) { + StopAnimation(); + StartGameActions(options.network, setup.autorecord, level.random_seed); } else if (pos == MAIN_CONTROL_SETUP) { + StopAnimation(); + + CloseDoor(DOOR_CLOSE_2); + game_status = GAME_MODE_SETUP; setup_mode = SETUP_MODE_MAIN; + ChangeViewportPropertiesIfNeeded(); + DrawSetupScreen(); } else if (pos == MAIN_CONTROL_QUIT) @@ -1892,17 +1946,13 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) SaveLevelSetup_LastSeries(); SaveLevelSetup_SeriesInfo(); - if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED)) + if (Request("Do you really want to quit?", REQ_ASK | REQ_STAY_CLOSED)) game_status = GAME_MODE_QUIT; } } } - if (game_status == GAME_MODE_MAIN) - { - DrawPreviewLevel(FALSE); - DoAnimation(); - } + button_pressed_last = button_pressed; } @@ -1911,7 +1961,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) /* ========================================================================= */ static struct TokenInfo *info_info; -static int num_info_info; +static int num_info_info; /* number of info entries shown on screen */ +static int max_info_info; /* total number of info entries in list */ static void execInfoTitleScreen() { @@ -1966,7 +2017,7 @@ static void execExitInfo() { game_status = GAME_MODE_MAIN; - DrawMainMenuExt(REDRAW_FIELD, FALSE); + DrawMainMenu(); } static struct TokenInfo info_info_main[] = @@ -1984,26 +2035,122 @@ static struct TokenInfo info_info_main[] = { 0, NULL, NULL } }; -static void DrawCursorAndText_Info(int pos, boolean active) +static int getMenuTextFont(int type) +{ + if (type & (TYPE_SWITCH | + TYPE_YES_NO | + TYPE_YES_NO_AUTO | + TYPE_STRING | + TYPE_ECS_AGA | + TYPE_KEYTEXT | + TYPE_ENTER_LIST)) + return FONT_MENU_2; + else + return FONT_MENU_1; +} + +static struct TokenInfo *setup_info; +static struct TokenInfo setup_info_input[]; + +static struct TokenInfo *menu_info; + +static void DrawCursorAndText_Menu_Ext(struct TokenInfo *token_info, + int screen_pos, int menu_info_pos_raw, + boolean active) { + int pos = (menu_info_pos_raw < 0 ? screen_pos : menu_info_pos_raw); + struct TokenInfo *ti = &token_info[pos]; int xpos = MENU_SCREEN_START_XPOS; - int ypos = MENU_SCREEN_START_YPOS + pos; - int font_nr = FONT_MENU_1; + int ypos = MENU_SCREEN_START_YPOS + screen_pos; + int font_nr = getMenuTextFont(ti->type); + + if (token_info == setup_info_input) + font_nr = FONT_MENU_1; if (active) font_nr = FONT_ACTIVE(font_nr); - DrawText(mSX + xpos * 32, mSY + ypos * 32, info_info[pos].text, font_nr); + DrawText(mSX + xpos * 32, mSY + ypos * 32, ti->text, font_nr); + + if (ti->type & ~TYPE_SKIP_ENTRY) + drawCursor(screen_pos, active); +} + +static void DrawCursorAndText_Menu(int screen_pos, int menu_info_pos_raw, + boolean active) +{ + DrawCursorAndText_Menu_Ext(menu_info, screen_pos, menu_info_pos_raw, active); +} + +static void DrawCursorAndText_Setup(int screen_pos, int menu_info_pos_raw, + boolean active) +{ + DrawCursorAndText_Menu_Ext(setup_info, screen_pos, menu_info_pos_raw, active); +} + +static char *screen_mode_text; +static char *window_size_text; +static char *scaling_type_text; + +static void drawSetupValue(int, int); + +static void drawMenuInfoList(int first_entry, int num_page_entries, + int max_page_entries) +{ + int i; + + if (first_entry + num_page_entries > max_page_entries) + first_entry = 0; + + clearMenuListArea(); + + for (i = 0; i < num_page_entries; i++) + { + int menu_info_pos = first_entry + i; + struct TokenInfo *si = &menu_info[menu_info_pos]; + void *value_ptr = si->value; + + /* set some entries to "unchangeable" according to other variables */ + if ((value_ptr == &setup.sound_simple && !audio.sound_available) || + (value_ptr == &setup.sound_loops && !audio.loops_available) || + (value_ptr == &setup.sound_music && !audio.music_available) || + (value_ptr == &setup.fullscreen && !video.fullscreen_available) || + (value_ptr == &screen_mode_text && !video.fullscreen_available) || + (value_ptr == &window_size_text && !video.window_scaling_available) || + (value_ptr == &scaling_type_text && !video.window_scaling_available)) + si->type |= TYPE_GHOSTED; + + if (si->type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) + initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); + else if (si->type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) + initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); + else if (si->type & ~TYPE_SKIP_ENTRY) + initCursor(i, IMG_MENU_BUTTON); + + DrawCursorAndText_Menu(i, menu_info_pos, FALSE); - if (info_info[pos].type & ~TYPE_SKIP_ENTRY) - drawCursor(pos, active); + if (si->type & TYPE_VALUE && + menu_info == setup_info) + drawSetupValue(i, menu_info_pos); + } } -static void DrawInfoScreen_Main(int fade_mask, boolean do_fading) +static void DrawInfoScreen_Main() { + int fade_mask = REDRAW_FIELD; int i; + if (redraw_mask & REDRAW_ALL) + fade_mask = REDRAW_ALL; + + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; + UnmapAllGadgets(); + + FreeScreenGadgets(); + CreateScreenGadgets(); + CloseDoor(DOOR_CLOSE_2); /* (needed after displaying title screens which disable auto repeat) */ @@ -2011,46 +2158,32 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading) FadeSetLeaveScreen(); -#if 1 FadeOut(fade_mask); -#endif -#if 1 - if (fade_mask == REDRAW_ALL) - { - RedrawBackground(); + ChangeViewportPropertiesIfNeeded(); - OpenDoor(DOOR_CLOSE_1 | DOOR_CLOSE_2 | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); - } -#endif + OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); ClearField(); DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Info Screen"); info_info = info_info_main; - num_info_info = 0; -#if 1 - for (i = 0; info_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) -#else + // determine maximal number of info entries that can be displayed on screen + num_info_info = 0; for (i = 0; info_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) -#endif - { - if (info_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) - initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); - else if (info_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) - initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); - else if (info_info[i].type & ~TYPE_SKIP_ENTRY) - initCursor(i, IMG_MENU_BUTTON); - - DrawCursorAndText_Info(i, FALSE); - num_info_info++; - } + + // determine maximal number of info entries available for menu of info screen + max_info_info = 0; + for (i = 0; info_info[i].type != 0; i++) + max_info_info++; HandleInfoScreen_Main(0, 0, 0, 0, MB_MENU_INITIALIZE); + MapScreenGadgets(max_info_info); + PlayMenuSound(); PlayMenuMusic(); @@ -2061,38 +2194,90 @@ static void DrawInfoScreen_Main(int fade_mask, boolean do_fading) InitAnimation(); } -void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) +static void changeSetupValue(int, int, int); + +void HandleMenuScreen(int mx, int my, int dx, int dy, int button, + int mode, int num_page_entries, int max_page_entries) { - static int choice_store[MAX_INFO_MODES]; - int choice = choice_store[info_mode]; /* always starts with 0 */ + static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; + static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; + static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES]; + int *num_page_entries_last = num_page_entries_all_last[game_status]; + int *choice_store = choice_stores[game_status]; + int *first_entry_store = first_entry_stores[game_status]; + int choice = choice_store[mode]; /* starts with 0 */ + int first_entry = first_entry_store[mode]; /* starts with 0 */ int x = 0; - int y = choice; + int y = choice - first_entry; + int y_old = y; + boolean position_set_by_scrollbar = (dx == 999); + int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + int i; if (button == MB_MENU_INITIALIZE) { + // check if number of menu page entries has changed (may happen by change + // of custom artwork definition value for 'list_size' for this menu screen) + // (in this case, the last menu position most probably has to be corrected) + if (num_page_entries != num_page_entries_last[mode]) + { + choice_store[mode] = first_entry_store[mode] = 0; + + choice = first_entry = 0; + y = y_old = 0; + + num_page_entries_last[mode] = num_page_entries; + } + /* advance to first valid menu entry */ - while (choice < num_info_info && - info_info[choice].type & TYPE_SKIP_ENTRY) + while (choice < num_page_entries && + menu_info[choice].type & TYPE_SKIP_ENTRY) choice++; - choice_store[info_mode] = choice; - DrawCursorAndText_Info(choice, TRUE); + if (position_set_by_scrollbar) + first_entry = first_entry_store[mode] = dy; + else + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + + drawMenuInfoList(first_entry, num_page_entries, max_page_entries); + + if (choice < first_entry) + { + choice = first_entry; + + if (menu_info[choice].type & TYPE_SKIP_ENTRY) + choice++; + } + else if (choice > first_entry + num_page_entries - 1) + { + choice = first_entry + num_page_entries - 1; + + if (menu_info[choice].type & TYPE_SKIP_ENTRY) + choice--; + } + + choice_store[mode] = choice; + + DrawCursorAndText_Menu(choice - first_entry, choice, TRUE); return; } else if (button == MB_MENU_LEAVE) { - for (y = 0; y < num_info_info; y++) + PlaySound(SND_MENU_ITEM_SELECTING); + + for (i = 0; i < max_page_entries; i++) { - if (info_info[y].type & TYPE_LEAVE_MENU) + if (menu_info[i].type & TYPE_LEAVE_MENU) { - void (*menu_callback_function)(void) = info_info[y].value; + void (*menu_callback_function)(void) = menu_info[i].value; FadeSetLeaveMenu(); menu_callback_function(); - break; /* absolutely needed because function changes 'info_info'! */ + break; /* absolutely needed because function changes 'menu_info'! */ } } @@ -2104,65 +2289,202 @@ void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; } - else if (dx || dy) /* keyboard input */ + else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */ { + /* move cursor instead of scrolling when already at start/end of list */ + if (dy == -1 * SCROLL_LINE && first_entry == 0) + dy = -1; + else if (dy == +1 * SCROLL_LINE && + first_entry + num_page_entries == max_page_entries) + dy = 1; + + /* handle scrolling screen one line or page */ + if (y + dy < 0 || + y + dy > num_page_entries - 1) + { + boolean redraw = FALSE; + + if (ABS(dy) == SCROLL_PAGE) + step = num_page_entries - 1; + + if (dy < 0 && first_entry > 0) + { + /* scroll page/line up */ + + first_entry -= step; + if (first_entry < 0) + first_entry = 0; + + redraw = TRUE; + } + else if (dy > 0 && first_entry + num_page_entries < max_page_entries) + { + /* scroll page/line down */ + + first_entry += step; + if (first_entry + num_page_entries > max_page_entries) + first_entry = MAX(0, max_page_entries - num_page_entries); + + redraw = TRUE; + } + + if (redraw) + { + choice += first_entry - first_entry_store[mode]; + + if (choice < first_entry) + { + choice = first_entry; + + if (menu_info[choice].type & TYPE_SKIP_ENTRY) + choice++; + } + else if (choice > first_entry + num_page_entries - 1) + { + choice = first_entry + num_page_entries - 1; + + if (menu_info[choice].type & TYPE_SKIP_ENTRY) + choice--; + } + else if (menu_info[choice].type & TYPE_SKIP_ENTRY) + { + choice += SIGN(dy); + + if (choice < first_entry || + choice > first_entry + num_page_entries - 1) + first_entry += SIGN(dy); + } + + first_entry_store[mode] = first_entry; + choice_store[mode] = choice; + + drawMenuInfoList(first_entry, num_page_entries, max_page_entries); + + DrawCursorAndText_Menu(choice - first_entry, choice, TRUE); + + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + } + + return; + } + if (dx) { int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER); - if (info_info[choice].type & menu_navigation_type || - info_info[choice].type & TYPE_ENTER_SCREEN || - info_info[choice].type & TYPE_BOOLEAN_STYLE || - info_info[choice].type & TYPE_YES_NO_AUTO) + if (menu_info[choice].type & menu_navigation_type || + menu_info[choice].type & TYPE_BOOLEAN_STYLE || + menu_info[choice].type & TYPE_YES_NO_AUTO) button = MB_MENU_CHOICE; } else if (dy) - y = choice + dy; + y += dy; /* jump to next non-empty menu entry (up or down) */ - while (y > 0 && y < num_info_info - 1 && - info_info[y].type & TYPE_SKIP_ENTRY) + while (first_entry + y > 0 && + first_entry + y < max_page_entries - 1 && + menu_info[first_entry + y].type & TYPE_SKIP_ENTRY) y += dy; + + if (!IN_VIS_MENU(x, y)) + { + choice += y - y_old; + + if (choice < first_entry) + first_entry = choice; + else if (choice > first_entry + num_page_entries - 1) + first_entry = choice - num_page_entries + 1; + + if (first_entry >= 0 && + first_entry + num_page_entries <= max_page_entries) + { + first_entry_store[mode] = first_entry; + + if (choice < first_entry) + choice = first_entry; + else if (choice > first_entry + num_page_entries - 1) + choice = first_entry + num_page_entries - 1; + + choice_store[mode] = choice; + + drawMenuInfoList(first_entry, num_page_entries, max_page_entries); + + DrawCursorAndText_Menu(choice - first_entry, choice, TRUE); + + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_page_entries, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + } + + return; + } } - if (IN_VIS_FIELD(x, y) && - y >= 0 && y < num_info_info && info_info[y].type & ~TYPE_SKIP_ENTRY) + if (!anyScrollbarGadgetActive() && + IN_VIS_MENU(x, y) && + mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && + y >= 0 && y < num_page_entries) { if (button) { - if (y != choice) + if (first_entry + y != choice && + menu_info[first_entry + y].type & ~TYPE_SKIP_ENTRY) { PlaySound(SND_MENU_ITEM_ACTIVATING); - DrawCursorAndText_Info(choice, FALSE); - DrawCursorAndText_Info(y, TRUE); + DrawCursorAndText_Menu(choice - first_entry, choice, FALSE); + DrawCursorAndText_Menu(y, first_entry + y, TRUE); - choice = choice_store[info_mode] = y; + choice = choice_store[mode] = first_entry + y; } } - else if (!(info_info[y].type & TYPE_GHOSTED)) + else if (!(menu_info[first_entry + y].type & TYPE_GHOSTED)) { PlaySound(SND_MENU_ITEM_SELECTING); - if (info_info[y].type & TYPE_ENTER_OR_LEAVE) + /* when selecting key headline, execute function for key value change */ + if (menu_info[first_entry + y].type & TYPE_KEYTEXT && + menu_info[first_entry + y + 1].type & TYPE_KEY) + y++; + + /* when selecting string value, execute function for list selection */ + if (menu_info[first_entry + y].type & TYPE_STRING && y > 0 && + menu_info[first_entry + y - 1].type & TYPE_ENTER_LIST) + y--; + + if (menu_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE) { - void (*menu_callback_function)(void) = info_info[choice].value; + void (*menu_callback_function)(void) = + menu_info[first_entry + y].value; - FadeSetFromType(info_info[y].type); + FadeSetFromType(menu_info[first_entry + y].type); menu_callback_function(); } + else if (menu_info[first_entry + y].type & TYPE_VALUE && + menu_info == setup_info) + { + changeSetupValue(y, first_entry + y, dx); + } } } } +void HandleInfoScreen_Main(int mx, int my, int dx, int dy, int button) +{ + menu_info = info_info; + + HandleMenuScreen(mx, my, dx, dy, button, + info_mode, num_info_info, max_info_info); +} + void DrawInfoScreen_NotAvailable(char *text_title, char *text_error) { int ystart1 = mSY - SY + 100; int ystart2 = mSY - SY + 150; int ybottom = mSY - SY + SYSIZE - 20; - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO); FadeOut(REDRAW_FIELD); @@ -2182,11 +2504,11 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) { static int infoscreen_step[MAX_INFO_ELEMENTS_ON_SCREEN]; static int infoscreen_frame[MAX_INFO_ELEMENTS_ON_SCREEN]; - int xstart = mSX + 16; - int ystart1 = mSY - SY + 100; - int ystart2 = mSY + 64 + 2 * 32; - int ybottom = mSY - SY + SYSIZE - 20; - int ystep = TILEY + 4; + int xstart = mSX + MENU_SCREEN_INFO_XSTART; + int ystart1 = mSY - SY + MENU_SCREEN_INFO_YSTART1; + int ystart2 = mSY + MENU_SCREEN_INFO_YSTART2; + int ybottom = mSY - SY + MENU_SCREEN_INFO_YBOTTOM; + int ystep = MENU_SCREEN_INFO_YSTEP; int element, action, direction; int graphic; int delay; @@ -2195,7 +2517,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) if (init) { - for (i = 0; i < MAX_INFO_ELEMENTS_ON_SCREEN; i++) + for (i = 0; i < NUM_INFO_ELEMENTS_ON_SCREEN; i++) infoscreen_step[i] = infoscreen_frame[i] = 0; ClearField(); @@ -2212,7 +2534,7 @@ void DrawInfoScreen_HelpAnim(int start, int max_anims, boolean init) i = j = 0; while (helpanim_info[j].element != HELPANIM_LIST_END) { - if (i >= start + MAX_INFO_ELEMENTS_ON_SCREEN || + if (i >= start + NUM_INFO_ELEMENTS_ON_SCREEN || i >= max_anims) break; else if (i < start) @@ -2343,6 +2665,9 @@ void DrawInfoScreen_HelpText(int element, int action, int direction, int ypos) void DrawInfoScreen_TitleScreen() { + game_status_last_screen = GAME_MODE_INFO; + game_status = GAME_MODE_TITLE; + DrawTitleScreen(); } @@ -2373,7 +2698,7 @@ void HandleInfoScreen_Elements(int button) static int num_anims; static int num_pages; static int page; - int anims_per_page = MAX_INFO_ELEMENTS_ON_SCREEN; + int anims_per_page = NUM_INFO_ELEMENTS_ON_SCREEN; int i; if (button == MB_MENU_INITIALIZE) @@ -2420,15 +2745,13 @@ void HandleInfoScreen_Elements(int button) FadeSoundsAndMusic(); info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); return; } -#if 1 if (page > 0) FadeSetNextScreen(); -#endif if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); @@ -2452,9 +2775,7 @@ void DrawInfoScreen_Music() { SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_MUSIC); -#if 1 FadeOut(REDRAW_FIELD); -#endif ClearField(); DrawHeadline(); @@ -2463,9 +2784,7 @@ void DrawInfoScreen_Music() HandleInfoScreen_Music(MB_MENU_INITIALIZE); -#if 1 FadeIn(REDRAW_FIELD); -#endif } void HandleInfoScreen_Music(int button) @@ -2525,17 +2844,15 @@ void HandleInfoScreen_Music(int button) FadeSoundsAndMusic(); info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); return; } FadeSoundsAndMusic(); -#if 1 if (list != music_file_info) FadeSetNextScreen(); -#endif if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); @@ -2707,7 +3024,7 @@ static void DrawInfoScreen_CreditsScreen(int screen_nr) DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_2, "and"); DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_3, - "Jürgen Bonhagen"); + "J\xfcrgen Bonhagen"); DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "for the continuous creation"); DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_2, @@ -2761,7 +3078,7 @@ static void DrawInfoScreen_CreditsScreen(int screen_nr) DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "Thanks to"); DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, - "Karl Hörnell"); + "Karl H\xf6rnell"); DrawTextSCentered(ystart2 + 6 * ystep, FONT_TEXT_2, "for some additional toons"); } @@ -2789,15 +3106,11 @@ void DrawInfoScreen_Credits() FadeSoundsAndMusic(); -#if 1 FadeOut(REDRAW_FIELD); -#endif HandleInfoScreen_Credits(MB_MENU_INITIALIZE); -#if 1 FadeIn(REDRAW_FIELD); -#endif } void HandleInfoScreen_Credits(int button) @@ -2835,15 +3148,13 @@ void HandleInfoScreen_Credits(int button) FadeSoundsAndMusic(); info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); return; } -#if 1 if (screen_nr > 0) FadeSetNextScreen(); -#endif if (button != MB_MENU_INITIALIZE) FadeOut(REDRAW_FIELD); @@ -2868,9 +3179,7 @@ void DrawInfoScreen_Program() SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_PROGRAM); -#if 1 FadeOut(REDRAW_FIELD); -#endif ClearField(); DrawHeadline(); @@ -2882,47 +3191,22 @@ void DrawInfoScreen_Program() DrawTextSCentered(ystart2 + 1 * ystep, FONT_TEXT_2, "If you like it, send e-mail to:"); DrawTextSCentered(ystart2 + 2 * ystep, FONT_TEXT_3, - PROGRAM_EMAIL_STRING); -#if 1 + setup.internal.program_email); DrawTextSCentered(ystart2 + 4 * ystep, FONT_TEXT_2, "More information and levels:"); DrawTextSCentered(ystart2 + 5 * ystep, FONT_TEXT_3, - PROGRAM_WEBSITE_STRING); + setup.internal.program_website); DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2, "If you have created new levels,"); DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_2, "send them to me to include them!"); DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2, ":-)"); -#else - DrawTextSCentered(ystart2 + 3 * ystep, FONT_TEXT_2, - "or SnailMail to:"); - DrawTextSCentered(ystart2 + 4 * ystep + 0, FONT_TEXT_3, - "Holger Schemel"); - DrawTextSCentered(ystart2 + 4 * ystep + 20, FONT_TEXT_3, - "Detmolder Strasse 189"); - DrawTextSCentered(ystart2 + 4 * ystep + 40, FONT_TEXT_3, - "33604 Bielefeld"); - DrawTextSCentered(ystart2 + 4 * ystep + 60, FONT_TEXT_3, - "Germany"); - DrawTextSCentered(ystart2 + 7 * ystep, FONT_TEXT_2, - "More information and levels:"); - DrawTextSCentered(ystart2 + 8 * ystep, FONT_TEXT_3, - PROGRAM_WEBSITE_STRING); - DrawTextSCentered(ystart2 + 9 * ystep, FONT_TEXT_2, - "If you have created new levels,"); - DrawTextSCentered(ystart2 + 10 * ystep, FONT_TEXT_2, - "send them to me to include them!"); - DrawTextSCentered(ystart2 + 11 * ystep, FONT_TEXT_2, - ":-)"); -#endif DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); -#if 1 FadeIn(REDRAW_FIELD); -#endif } void HandleInfoScreen_Program(int button) @@ -2942,12 +3226,8 @@ void HandleInfoScreen_Program(int button) FadeSoundsAndMusic(); -#if 0 - FadeOut(REDRAW_FIELD); -#endif - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); } else { @@ -2964,21 +3244,22 @@ void DrawInfoScreen_Version() int ystart1 = mSY - SY + 100; int ystart2 = mSY - SY + 150; int ybottom = mSY - SY + SYSIZE - 20; - int xstart1 = mSX + 2 * xstep; - int xstart2 = mSX + 19 * xstep; -#if defined(TARGET_SDL) - int xstart3 = mSX + 29 * xstep; + int xstart1 = mSX - SX + 2 * xstep; + int xstart2 = mSX - SX + 18 * xstep; + int xstart3 = mSX - SX + 28 * xstep; SDL_version sdl_version_compiled; const SDL_version *sdl_version_linked; - int driver_name_len = 8; + int driver_name_len = 10; +#if defined(TARGET_SDL2) + SDL_version sdl_version_linked_ext; + const char *driver_name = NULL; +#else char driver_name[driver_name_len]; #endif SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_VERSION); -#if 1 FadeOut(REDRAW_FIELD); -#endif ClearField(); DrawHeadline(); @@ -2986,11 +3267,11 @@ void DrawInfoScreen_Version() DrawTextSCentered(ystart1, FONT_TEXT_1, "Version Information:"); DrawTextF(xstart1, ystart2, font_header, "Name"); - DrawTextF(xstart2, ystart2, font_text, PROGRAM_TITLE_STRING); + DrawTextF(xstart2, ystart2, font_text, getProgramTitleString()); ystart2 += ystep; DrawTextF(xstart1, ystart2, font_header, "Version"); - DrawTextF(xstart2, ystart2, font_text, getProgramFullVersionString()); + DrawTextF(xstart2, ystart2, font_text, getProgramVersionString()); ystart2 += ystep; DrawTextF(xstart1, ystart2, font_header, "Platform"); @@ -3004,14 +3285,18 @@ void DrawInfoScreen_Version() DrawTextF(xstart1, ystart2, font_header, "Compile time"); DrawTextF(xstart2, ystart2, font_text, getCompileDateString()); -#if defined(TARGET_SDL) ystart2 += 3 * ystep; DrawTextF(xstart1, ystart2, font_header, "Library"); DrawTextF(xstart2, ystart2, font_header, "compiled"); DrawTextF(xstart3, ystart2, font_header, "linked"); SDL_VERSION(&sdl_version_compiled); +#if defined(TARGET_SDL2) + SDL_GetVersion(&sdl_version_linked_ext); + sdl_version_linked = &sdl_version_linked_ext; +#else sdl_version_linked = SDL_Linked_Version(); +#endif ystart2 += 2 * ystep; DrawTextF(xstart1, ystart2, font_text, "SDL"); @@ -3071,27 +3356,32 @@ void DrawInfoScreen_Version() DrawTextF(xstart2, ystart2, font_header, "Requested"); DrawTextF(xstart3, ystart2, font_header, "Used"); +#if defined(TARGET_SDL2) + driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len); +#else SDL_VideoDriverName(driver_name, driver_name_len); +#endif ystart2 += 2 * ystep; DrawTextF(xstart1, ystart2, font_text, "SDL_VideoDriver"); DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_videodriver); DrawTextF(xstart3, ystart2, font_text, "%s", driver_name); +#if defined(TARGET_SDL2) + driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len); +#else SDL_AudioDriverName(driver_name, driver_name_len); +#endif ystart2 += ystep; DrawTextF(xstart1, ystart2, font_text, "SDL_AudioDriver"); DrawTextF(xstart2, ystart2, font_text, "%s", setup.system.sdl_audiodriver); DrawTextF(xstart3, ystart2, font_text, "%s", driver_name); -#endif DrawTextSCentered(ybottom, FONT_TEXT_4, "Press any key or button for info menu"); -#if 1 FadeIn(REDRAW_FIELD); -#endif } void HandleInfoScreen_Version(int button) @@ -3111,12 +3401,8 @@ void HandleInfoScreen_Version(int button) FadeSoundsAndMusic(); -#if 0 - FadeOut(REDRAW_FIELD); -#endif - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); } else { @@ -3128,6 +3414,41 @@ void DrawInfoScreen_LevelSet() { struct TitleMessageInfo *tmi = &readme; char *filename = getLevelSetInfoFilename(); + char *title = "Level Set Information:"; + int ystart1 = mSY - SY + 100; + int ybottom = mSY - SY + SYSIZE - 20; + + if (filename == NULL) + { + DrawInfoScreen_NotAvailable(title, "No information for this level set."); + + return; + } + + SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); + + FadeOut(REDRAW_FIELD); + + ClearField(); + DrawHeadline(); + + DrawTextSCentered(ystart1, FONT_TEXT_1, title); + + /* if x position set to "-1", automatically determine by playfield width */ + if (tmi->x == -1) + tmi->x = SXSIZE / 2; + + /* if y position set to "-1", use static default value */ + if (tmi->y == -1) + tmi->y = 150; + + /* if width set to "-1", automatically determine by playfield width */ + if (tmi->width == -1) + tmi->width = SXSIZE - 2 * TILEX; + + /* if height set to "-1", automatically determine by playfield height */ + if (tmi->height == -1) + tmi->height = SYSIZE - 20 - tmi->y - 10; /* if chars set to "-1", automatically determine by text and font width */ if (tmi->chars == -1) @@ -3141,31 +3462,14 @@ void DrawInfoScreen_LevelSet() else tmi->height = tmi->lines * getFontHeight(tmi->font); - SetMainBackgroundImageIfDefined(IMG_BACKGROUND_INFO_LEVELSET); - -#if 1 - FadeOut(REDRAW_FIELD); -#endif - - ClearField(); - DrawHeadline(); - - DrawTextCentered(mSY + 100, FONT_TEXT_1, "Level Set Information:"); - - if (filename != NULL) - DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), - filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1, - tmi->autowrap, tmi->centered, tmi->parse_comments); - else - DrawTextCentered(mSY + ALIGNED_TEXT_YPOS(tmi), FONT_TEXT_2, - "No information for this level set."); + DrawTextFile(mSX + ALIGNED_TEXT_XPOS(tmi), mSY + ALIGNED_TEXT_YPOS(tmi), + filename, tmi->font, tmi->chars, -1, tmi->lines, 0, -1, + tmi->autowrap, tmi->centered, tmi->parse_comments); - DrawTextCentered(mSY + SYSIZE - 20, FONT_TEXT_4, - "Press any key or button for info menu"); + DrawTextSCentered(ybottom, FONT_TEXT_4, + "Press any key or button for info menu"); -#if 1 FadeIn(REDRAW_FIELD); -#endif } void HandleInfoScreen_LevelSet(int button) @@ -3185,12 +3489,8 @@ void HandleInfoScreen_LevelSet(int button) FadeSoundsAndMusic(); -#if 0 - FadeOut(REDRAW_FIELD); -#endif - info_mode = INFO_MODE_MAIN; - DrawAndFadeInInfoScreen(REDRAW_FIELD); + DrawInfoScreen(); } else { @@ -3198,7 +3498,7 @@ void HandleInfoScreen_LevelSet(int button) } } -static void DrawInfoScreenExt(int fade_mask, boolean do_fading) +static void DrawInfoScreen() { SetMainBackgroundImage(IMG_BACKGROUND_INFO); @@ -3217,7 +3517,7 @@ static void DrawInfoScreenExt(int fade_mask, boolean do_fading) else if (info_mode == INFO_MODE_LEVELSET) DrawInfoScreen_LevelSet(); else - DrawInfoScreen_Main(fade_mask, do_fading); + DrawInfoScreen_Main(); if (info_mode != INFO_MODE_MAIN && info_mode != INFO_MODE_TITLE && @@ -3228,16 +3528,6 @@ static void DrawInfoScreenExt(int fade_mask, boolean do_fading) } } -void DrawAndFadeInInfoScreen(int fade_mask) -{ - DrawInfoScreenExt(fade_mask, TRUE); -} - -void DrawInfoScreen() -{ - DrawInfoScreenExt(REDRAW_FIELD, FALSE); -} - void HandleInfoScreen(int mx, int my, int dx, int dy, int button) { if (info_mode == INFO_MODE_TITLE) @@ -3256,8 +3546,6 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button) HandleInfoScreen_LevelSet(button); else HandleInfoScreen_Main(mx, my, dx, dy, button); - - DoAnimation(); } @@ -3287,6 +3575,10 @@ void HandleTypeName(int newxpos, Key key) strcpy(last_player_name, setup.player_name); xpos = newxpos; + +#if defined(TARGET_SDL2) + SDL_StartTextInput(); +#endif } else if (is_valid_key_char && xpos < MAX_PLAYER_NAME_LEN) { @@ -3332,6 +3624,10 @@ void HandleTypeName(int newxpos, Key key) startx = mSX + ALIGNED_TEXT_XPOS(pos); DrawText(startx, starty, setup.player_name, font_nr); + +#if defined(TARGET_SDL2) + SDL_StopTextInput(); +#endif } } @@ -3342,6 +3638,20 @@ void HandleTypeName(int newxpos, Key key) static void DrawChooseTree(TreeInfo **ti_ptr) { + int fade_mask = REDRAW_FIELD; + + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; + + if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY)) + { + game_status = GAME_MODE_MAIN; + + DrawMainMenu(); + + return; + } + UnmapAllGadgets(); FreeScreenGadgets(); @@ -3349,37 +3659,20 @@ static void DrawChooseTree(TreeInfo **ti_ptr) CloseDoor(DOOR_CLOSE_2); -#if 1 - FadeOut(REDRAW_FIELD); -#endif + FadeOut(fade_mask); + + OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); ClearField(); HandleChooseTree(0, 0, 0, 0, MB_MENU_INITIALIZE, ti_ptr); MapScreenTreeGadgets(*ti_ptr); -#if 1 - FadeIn(REDRAW_FIELD); -#endif - - InitAnimation(); -} - -static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti) -{ - struct GadgetInfo *gi = screen_gadget[id]; - int items_max, items_visible, item_position; - - items_max = numTreeInfoInGroup(ti); - items_visible = NUM_MENU_ENTRIES_ON_SCREEN; - item_position = first_entry; + DrawMaskedBorder(fade_mask); - if (item_position > items_max - items_visible) - item_position = items_max - items_visible; + FadeIn(fade_mask); - ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max, - GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible, - GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); + InitAnimation(); } static void drawChooseTreeList(int first_entry, int num_page_entries, @@ -3397,22 +3690,7 @@ static void drawChooseTreeList(int first_entry, int num_page_entries, DrawTextSCentered(mSY - SY + yoffset, FONT_TITLE_1, title_string); -#if 0 - /* force LEVELS font on artwork setup screen */ - game_status = GAME_MODE_LEVELS; -#endif - -#if 1 - /* clear tree list area, but not title or scrollbar */ - DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, - SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset, - NUM_MENU_ENTRIES_ON_SCREEN * 32); -#else - /* clear tree list area, but not title or scrollbar */ - DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32, - SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset, - MAX_MENU_ENTRIES_ON_SCREEN * 32); -#endif + clearMenuListArea(); for (i = 0; i < num_page_entries; i++) { @@ -3469,7 +3747,6 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) DrawBackgroundForFont(SX, SY + ypos, SXSIZE, getFontHeight(font_nr), font_nr); -#if 1 if (node->parent_link) DrawTextFCentered(ypos, font_nr, "leave \"%s\"", node->node_parent->name); @@ -3480,20 +3757,9 @@ static void drawChooseTreeInfo(int entry_pos, TreeInfo *ti) DrawTextFCentered(ypos, font_nr, "%3d %s (%s)", node->levels, (node->levels > 1 ? "levels" : "level"), node->class_desc); -#else - if (node->parent_link) - DrawTextFCentered(ypos, font_nr, "leave group \"%s\"", - node->class_desc); - else if (node->level_group) - DrawTextFCentered(ypos, font_nr, "enter group \"%s\"", - node->class_desc); - else if (ti->type == TREE_TYPE_LEVEL_DIR) - DrawTextFCentered(ypos, font_nr, "%3d levels (%s)", - node->levels, node->class_desc); -#endif /* let BackToFront() redraw only what is needed */ - redraw_mask = last_redraw_mask | REDRAW_TILES; + redraw_mask = last_redraw_mask; for (x = 0; x < SCR_FIELDX; x++) MarkTileDirty(x, 1); } @@ -3510,11 +3776,6 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, int last_game_status = game_status; /* save current game status */ boolean position_set_by_scrollbar = (dx == 999); -#if 0 - /* force LEVELS draw offset on choose level and artwork setup screen */ - game_status = GAME_MODE_LEVELS; -#endif - if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN) num_page_entries = num_entries; else @@ -3567,26 +3828,37 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else if (game_status == GAME_MODE_SETUP) { - if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY || + setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE) execSetupGame(); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || - setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE || + setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE) execSetupGraphics(); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE || setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS || setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC) execSetupSound(); + else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL || + setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE || + setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + execSetupTouch(); else execSetupArtwork(); } else { if (game_status == GAME_MODE_LEVELNR) - level_nr = atoi(level_number_current->identifier); + { + int new_level_nr = atoi(level_number_current->identifier); + + HandleMainMenu_SelectLevel(0, 0, new_level_nr); + } game_status = GAME_MODE_MAIN; - DrawMainMenuExt(REDRAW_FIELD, FALSE); + DrawMainMenu(); } return; @@ -3596,11 +3868,6 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, { int last_game_status = game_status; /* save current game status */ -#if 0 - /* force LEVELS draw offset on artwork setup screen */ - game_status = GAME_MODE_LEVELS; -#endif - x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; @@ -3619,6 +3886,8 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (ti->cl_cursor + dy < 0 || ti->cl_cursor + dy > num_page_entries - 1) { + boolean redraw = FALSE; + if (ABS(dy) == SCROLL_PAGE) step = num_page_entries - 1; @@ -3630,12 +3899,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (ti->cl_first < 0) ti->cl_first = 0; - drawChooseTreeList(ti->cl_first, num_page_entries, ti); - drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti); - drawChooseTreeCursor(ti->cl_cursor, TRUE); - - AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, - ti->cl_first, ti); + redraw = TRUE; } else if (dy > 0 && ti->cl_first + num_page_entries < num_entries) { @@ -3645,6 +3909,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (ti->cl_first + num_page_entries > num_entries) ti->cl_first = MAX(0, num_entries - num_page_entries); + redraw = TRUE; + } + + if (redraw) + { drawChooseTreeList(ti->cl_first, num_page_entries, ti); drawChooseTreeInfo(ti->cl_first + ti->cl_cursor, ti); drawChooseTreeCursor(ti->cl_cursor, TRUE); @@ -3695,7 +3964,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } if (!anyScrollbarGadgetActive() && - IN_VIS_FIELD(x, y) && + IN_VIS_MENU(x, y) && mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && y >= 0 && y < num_page_entries) { @@ -3740,7 +4009,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, } else { - FadeSetEnterScreen(); + FadeSetEnterMenu(); node_cursor->cl_first = ti->cl_first; node_cursor->cl_cursor = ti->cl_cursor; @@ -3757,22 +4026,33 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, if (game_status == GAME_MODE_SETUP) { - if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) + if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED || + setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY || + setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE) execSetupGame(); else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE || - setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) + setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE || + setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE) execSetupGraphics(); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_SIMPLE || setup_mode == SETUP_MODE_CHOOSE_VOLUME_LOOPS || setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC) execSetupSound(); + else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL || + setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE || + setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + execSetupTouch(); else execSetupArtwork(); } else { if (game_status == GAME_MODE_LEVELNR) - level_nr = atoi(level_number_current->identifier); + { + int new_level_nr = atoi(level_number_current->identifier); + + HandleMainMenu_SelectLevel(0, 0, new_level_nr); + } game_status = GAME_MODE_MAIN; @@ -3796,8 +4076,6 @@ void DrawChooseLevelSet() void HandleChooseLevelSet(int mx, int my, int dx, int dy, int button) { HandleChooseTree(mx, my, dx, dy, button, &leveldir_current); - - DoAnimation(); } void DrawChooseLevelNr() @@ -3850,11 +4128,7 @@ void DrawChooseLevelNr() SetMainBackgroundImage(IMG_BACKGROUND_LEVELNR); -#if 1 DrawChooseTree(&level_number_current); -#else - DrawChooseTree(&leveldir_current); -#endif PlayMenuSound(); PlayMenuMusic(); @@ -3862,17 +4136,22 @@ void DrawChooseLevelNr() void HandleChooseLevelNr(int mx, int my, int dx, int dy, int button) { -#if 1 HandleChooseTree(mx, my, dx, dy, button, &level_number_current); -#else - HandleChooseTree(mx, my, dx, dy, button, &leveldir_current); -#endif - - DoAnimation(); } void DrawHallOfFame(int highlight_position) { + int fade_mask = REDRAW_FIELD; + + /* required before door position may be changed in next step */ + CloseDoor(DOOR_CLOSE_ALL); + + /* needed if different viewport properties defined for scores */ + ChangeViewportPropertiesIfNeeded(); + + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; + UnmapAllGadgets(); FadeSoundsAndMusic(); @@ -3884,34 +4163,30 @@ void DrawHallOfFame(int highlight_position) SetDrawDeactivationMask(REDRAW_NONE); SetDrawBackgroundMask(REDRAW_FIELD); - CloseDoor(DOOR_CLOSE_2); - if (highlight_position < 0) LoadScore(level_nr); FadeSetEnterScreen(); - // printf("::: %d: %d\n", game_status, menu.enter_screen[game_status]); - -#if 1 - FadeOut(REDRAW_FIELD); -#endif + FadeOut(fade_mask); InitAnimation(); PlayMenuSound(); PlayMenuMusic(); + OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); + HandleHallOfFame(highlight_position, 0, 0, 0, MB_MENU_INITIALIZE); -#if 1 - FadeIn(REDRAW_FIELD); -#endif + DrawMaskedBorder(fade_mask); + + FadeIn(fade_mask); } static void drawHallOfFameList(int first_entry, int highlight_position) { - int i; + int i, j; SetMainBackgroundImage(IMG_BACKGROUND_SCORES); ClearField(); @@ -3930,12 +4205,15 @@ static void drawHallOfFameList(int first_entry, int highlight_position) int font_nr4 = (active ? FONT_TEXT_4_ACTIVE : FONT_TEXT_4); int dx1 = 3 * getFontWidth(font_nr1); int dx2 = dx1 + getFontWidth(font_nr1); - int dx3 = dx2 + 25 * getFontWidth(font_nr3); + int dx3 = SXSIZE - 2 * (mSX - SX) - 5 * getFontWidth(font_nr4); + int num_dots = (dx3 - dx2) / getFontWidth(font_nr3); int sy = mSY + 64 + i * 32; DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1); DrawText(mSX + dx1, sy, ".", font_nr1); - DrawText(mSX + dx2, sy, ".........................", font_nr3); + + for (j = 0; j < num_dots; j++) + DrawText(mSX + dx2 + j * getFontWidth(font_nr3), sy, ".", font_nr3); if (!strEqual(highscore[entry].Name, EMPTY_PLAYER_NAME)) DrawText(mSX + dx2, sy, highscore[entry].Name, font_nr2); @@ -4002,19 +4280,13 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) FadeSound(SND_BACKGROUND_SCORES); -#if 0 - FadeOut(REDRAW_FIELD); -#endif - game_status = GAME_MODE_MAIN; - DrawAndFadeInMainMenu(REDRAW_FIELD); + DrawMainMenu(); } if (game_status == GAME_MODE_SCORES) PlayMenuSoundIfLoop(); - - DoAnimation(); } @@ -4023,10 +4295,14 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button) /* ========================================================================= */ static struct TokenInfo *setup_info; -static int num_setup_info; +static int num_setup_info; /* number of setup entries shown on screen */ +static int max_setup_info; /* total number of setup entries in list */ static char *screen_mode_text; +static char *window_size_text; +static char *scaling_type_text; static char *scroll_delay_text; +static char *snapshot_mode_text; static char *game_speed_text; static char *graphics_set_name; static char *sounds_set_name; @@ -4034,6 +4310,9 @@ static char *music_set_name; static char *volume_simple_text; static char *volume_loops_text; static char *volume_music_text; +static char *touch_controls_text; +static char *move_distance_text; +static char *drop_distance_text; static void execSetupMain() { @@ -4042,7 +4321,7 @@ static void execSetupMain() DrawSetupScreen(); } -static void execSetupGame() +static void execSetupGame_setGameSpeeds() { if (game_speeds == NULL) { @@ -4090,85 +4369,10 @@ static void execSetupGame() /* needed for displaying game speed text instead of identifier */ game_speed_text = game_speed_current->name; - - setup_mode = SETUP_MODE_GAME; - - DrawSetupScreen(); -} - -static void execSetupChooseGameSpeed() -{ - setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; - - DrawSetupScreen(); -} - -static void execSetupEditor() -{ - setup_mode = SETUP_MODE_EDITOR; - - DrawSetupScreen(); } -static void execSetupGraphics() +static void execSetupGame_setScrollDelays() { - if (video.fullscreen_available && screen_modes == NULL) - { - int i; - - for (i = 0; video.fullscreen_modes[i].width != -1; i++) - { - TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); - char identifier[32], name[32]; - int x = video.fullscreen_modes[i].width; - int y = video.fullscreen_modes[i].height; - int xx, yy; - - get_aspect_ratio_from_screen_mode(&video.fullscreen_modes[i], &xx, &yy); - - ti->node_top = &screen_modes; - ti->sort_priority = x * 10000 + y; - - sprintf(identifier, "%dx%d", x, y); - sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy); - - setString(&ti->identifier, identifier); - setString(&ti->name, name); - setString(&ti->name_sorting, name); - setString(&ti->infotext, "Fullscreen Mode"); - - pushTreeInfo(&screen_modes, ti); - } - - /* sort fullscreen modes to start with lowest available screen resolution */ - sortTreeInfo(&screen_modes); - - /* set current screen mode for fullscreen mode to configured setup value */ - screen_mode_current = getTreeInfoFromIdentifier(screen_modes, - setup.fullscreen_mode); - - /* if that fails, set current screen mode to reliable default value */ - if (screen_mode_current == NULL) - screen_mode_current = getTreeInfoFromIdentifier(screen_modes, - DEFAULT_FULLSCREEN_MODE); - - /* if that also fails, set current screen mode to first available mode */ - if (screen_mode_current == NULL) - screen_mode_current = screen_modes; - - if (screen_mode_current == NULL) - video.fullscreen_available = FALSE; - } - - if (video.fullscreen_available) - { - setup.fullscreen_mode = screen_mode_current->identifier; - - /* needed for displaying screen mode name instead of identifier */ - screen_mode_text = screen_mode_current->name; - } - -#if 1 if (scroll_delays == NULL) { int i; @@ -4189,45 +4393,98 @@ static void execSetupGraphics() setString(&ti->identifier, identifier); setString(&ti->name, name); setString(&ti->name_sorting, name); - setString(&ti->infotext, "Scroll Delay"); + setString(&ti->infotext, "Scaling Type"); pushTreeInfo(&scroll_delays, ti); } - /* sort scroll delay values to start with lowest scroll delay value */ + /* sort scaling type values to start with lowest scaling type value */ sortTreeInfo(&scroll_delays); - /* set current scroll delay value to configured scroll delay value */ + /* set current scaling type value to configured scaling type value */ scroll_delay_current = getTreeInfoFromIdentifier(scroll_delays,i_to_a(setup.scroll_delay_value)); - /* if that fails, set current scroll delay to reliable default value */ + /* if that fails, set current scaling type to reliable default value */ if (scroll_delay_current == NULL) scroll_delay_current = getTreeInfoFromIdentifier(scroll_delays, i_to_a(STD_SCROLL_DELAY)); - /* if that also fails, set current scroll delay to first available value */ + /* if that also fails, set current scaling type to first available value */ if (scroll_delay_current == NULL) scroll_delay_current = scroll_delays; } setup.scroll_delay_value = atoi(scroll_delay_current->identifier); - /* needed for displaying scroll delay text instead of identifier */ + /* needed for displaying scaling type text instead of identifier */ scroll_delay_text = scroll_delay_current->name; -#endif - - setup_mode = SETUP_MODE_GRAPHICS; +} - DrawSetupScreen(); +static void execSetupGame_setSnapshotModes() +{ + if (snapshot_modes == NULL) + { + int i; + + for (i = 0; snapshot_modes_list[i].value != NULL; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + char *value = snapshot_modes_list[i].value; + char *text = snapshot_modes_list[i].text; + + ti->node_top = &snapshot_modes; + ti->sort_priority = i; + + sprintf(identifier, "%s", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Snapshot Mode"); + + pushTreeInfo(&snapshot_modes, ti); + } + + /* sort snapshot mode values to start with lowest snapshot mode value */ + sortTreeInfo(&snapshot_modes); + + /* set current snapshot mode value to configured snapshot mode value */ + snapshot_mode_current = + getTreeInfoFromIdentifier(snapshot_modes, setup.engine_snapshot_mode); + + /* if that fails, set current snapshot mode to reliable default value */ + if (snapshot_mode_current == NULL) + snapshot_mode_current = + getTreeInfoFromIdentifier(snapshot_modes, STR_SNAPSHOT_MODE_DEFAULT); + + /* if that also fails, set current snapshot mode to first available value */ + if (snapshot_mode_current == NULL) + snapshot_mode_current = snapshot_modes; + } + + setup.engine_snapshot_mode = snapshot_mode_current->identifier; + + /* needed for displaying snapshot mode text instead of identifier */ + snapshot_mode_text = snapshot_mode_current->name; } -static void execSetupChooseScreenMode() +static void execSetupGame() { - if (!video.fullscreen_available) - return; + execSetupGame_setGameSpeeds(); + execSetupGame_setScrollDelays(); + execSetupGame_setSnapshotModes(); - setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE; + setup_mode = SETUP_MODE_GAME; + + DrawSetupScreen(); +} + +static void execSetupChooseGameSpeed() +{ + setup_mode = SETUP_MODE_CHOOSE_GAME_SPEED; DrawSetupScreen(); } @@ -4239,6 +4496,274 @@ static void execSetupChooseScrollDelay() DrawSetupScreen(); } +static void execSetupChooseSnapshotMode() +{ + setup_mode = SETUP_MODE_CHOOSE_SNAPSHOT_MODE; + + DrawSetupScreen(); +} + +static void execSetupEditor() +{ + setup_mode = SETUP_MODE_EDITOR; + + DrawSetupScreen(); +} + +static void execSetupGraphics_setWindowSizes(boolean update_list) +{ + if (window_sizes != NULL && update_list) + { + freeTreeInfo(window_sizes); + + window_sizes = NULL; + } + + if (window_sizes == NULL) + { + boolean current_window_size_found = FALSE; + int i; + + for (i = 0; window_sizes_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = window_sizes_list[i].value; + char *text = window_sizes_list[i].text; + + ti->node_top = &window_sizes; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Window Scaling"); + + pushTreeInfo(&window_sizes, ti); + + if (value == setup.window_scaling_percent) + current_window_size_found = TRUE; + } + + if (!current_window_size_found) + { + // add entry for non-preset window scaling value + + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = setup.window_scaling_percent; + + ti->node_top = &window_sizes; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%d %% (Current)", value); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Window Scaling"); + + pushTreeInfo(&window_sizes, ti); + } + + /* sort window size values to start with lowest window size value */ + sortTreeInfo(&window_sizes); + + /* set current window size value to configured window size value */ + window_size_current = + getTreeInfoFromIdentifier(window_sizes, + i_to_a(setup.window_scaling_percent)); + + /* if that fails, set current window size to reliable default value */ + if (window_size_current == NULL) + window_size_current = + getTreeInfoFromIdentifier(window_sizes, + i_to_a(STD_WINDOW_SCALING_PERCENT)); + + /* if that also fails, set current window size to first available value */ + if (window_size_current == NULL) + window_size_current = window_sizes; + } + + setup.window_scaling_percent = atoi(window_size_current->identifier); + + /* needed for displaying window size text instead of identifier */ + window_size_text = window_size_current->name; +} + +static void execSetupGraphics_setScalingTypes() +{ + if (scaling_types == NULL) + { + int i; + + for (i = 0; scaling_types_list[i].value != NULL; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + char *value = scaling_types_list[i].value; + char *text = scaling_types_list[i].text; + + ti->node_top = &scaling_types; + ti->sort_priority = i; + + sprintf(identifier, "%s", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Anti-Aliasing"); + + pushTreeInfo(&scaling_types, ti); + } + + /* sort scaling type values to start with lowest scaling type value */ + sortTreeInfo(&scaling_types); + + /* set current scaling type value to configured scaling type value */ + scaling_type_current = + getTreeInfoFromIdentifier(scaling_types, setup.window_scaling_quality); + + /* if that fails, set current scaling type to reliable default value */ + if (scaling_type_current == NULL) + scaling_type_current = + getTreeInfoFromIdentifier(scaling_types, SCALING_QUALITY_DEFAULT); + + /* if that also fails, set current scaling type to first available value */ + if (scaling_type_current == NULL) + scaling_type_current = scaling_types; + } + + setup.window_scaling_quality = scaling_type_current->identifier; + + /* needed for displaying scaling type text instead of identifier */ + scaling_type_text = scaling_type_current->name; +} + +static void execSetupGraphics_setScreenModes() +{ + // if (screen_modes == NULL && video.fullscreen_available) + if (screen_modes == NULL && video.fullscreen_modes != NULL) + { + int i; + + for (i = 0; video.fullscreen_modes[i].width != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int x = video.fullscreen_modes[i].width; + int y = video.fullscreen_modes[i].height; + int xx, yy; + + get_aspect_ratio_from_screen_mode(&video.fullscreen_modes[i], &xx, &yy); + + ti->node_top = &screen_modes; + ti->sort_priority = x * 10000 + y; + + sprintf(identifier, "%dx%d", x, y); + sprintf(name, "%d x %d [%d:%d]", x, y, xx, yy); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Fullscreen Mode"); + + pushTreeInfo(&screen_modes, ti); + } + + /* sort fullscreen modes to start with lowest available screen resolution */ + sortTreeInfo(&screen_modes); + + /* set current screen mode for fullscreen mode to configured setup value */ + screen_mode_current = getTreeInfoFromIdentifier(screen_modes, + setup.fullscreen_mode); + + /* if that fails, set current screen mode to reliable default value */ + if (screen_mode_current == NULL) + screen_mode_current = getTreeInfoFromIdentifier(screen_modes, + DEFAULT_FULLSCREEN_MODE); + + /* if that also fails, set current screen mode to first available mode */ + if (screen_mode_current == NULL) + screen_mode_current = screen_modes; + + if (screen_mode_current == NULL) + video.fullscreen_available = FALSE; + } + + // if (video.fullscreen_available) + if (screen_mode_current != NULL) + { + setup.fullscreen_mode = screen_mode_current->identifier; + + /* needed for displaying screen mode name instead of identifier */ + screen_mode_text = screen_mode_current->name; + } +} + +static void execSetupGraphics() +{ + if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) + { + // update "setup.window_scaling_percent" from list selection + execSetupGraphics_setWindowSizes(FALSE); + } + else + { + // update list selection from "setup.window_scaling_percent" + execSetupGraphics_setWindowSizes(TRUE); + } + + execSetupGraphics_setScalingTypes(); + execSetupGraphics_setScreenModes(); + + setup_mode = SETUP_MODE_GRAPHICS; + + DrawSetupScreen(); + +#if defined(TARGET_SDL2) + // window scaling may have changed at this point + ToggleFullscreenOrChangeWindowScalingIfNeeded(); + + // window scaling quality may have changed at this point + if (!strEqual(setup.window_scaling_quality, video.window_scaling_quality)) + SDLSetWindowScalingQuality(setup.window_scaling_quality); +#endif +} + +#if !defined(PLATFORM_ANDROID) +#if defined(TARGET_SDL2) +static void execSetupChooseWindowSize() +{ + setup_mode = SETUP_MODE_CHOOSE_WINDOW_SIZE; + + DrawSetupScreen(); +} + +static void execSetupChooseScalingType() +{ + setup_mode = SETUP_MODE_CHOOSE_SCALING_TYPE; + + DrawSetupScreen(); +} +#else +static void execSetupChooseScreenMode() +{ + if (!video.fullscreen_available) + return; + + setup_mode = SETUP_MODE_CHOOSE_SCREEN_MODE; + + DrawSetupScreen(); +} +#endif +#endif + static void execSetupChooseVolumeSimple() { setup_mode = SETUP_MODE_CHOOSE_VOLUME_SIMPLE; @@ -4262,9 +4787,9 @@ static void execSetupChooseVolumeMusic() static void execSetupSound() { -#if 1 if (volumes_simple == NULL) { + boolean current_volume_simple_found = FALSE; int i; for (i = 0; volumes_list[i].value != -1; i++) @@ -4286,6 +4811,31 @@ static void execSetupSound() setString(&ti->infotext, "Sound Volume"); pushTreeInfo(&volumes_simple, ti); + + if (value == setup.volume_simple) + current_volume_simple_found = TRUE; + } + + if (!current_volume_simple_found) + { + // add entry for non-preset volume value + + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = setup.volume_simple; + + ti->node_top = &volumes_simple; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%d %% (Current)", value); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Sound Volume"); + + pushTreeInfo(&volumes_simple, ti); } /* sort volume values to start with lowest volume value */ @@ -4307,6 +4857,7 @@ static void execSetupSound() if (volumes_loops == NULL) { + boolean current_volume_loops_found = FALSE; int i; for (i = 0; volumes_list[i].value != -1; i++) @@ -4328,6 +4879,31 @@ static void execSetupSound() setString(&ti->infotext, "Loops Volume"); pushTreeInfo(&volumes_loops, ti); + + if (value == setup.volume_loops) + current_volume_loops_found = TRUE; + } + + if (!current_volume_loops_found) + { + // add entry for non-preset volume value + + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = setup.volume_loops; + + ti->node_top = &volumes_loops; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%d %% (Current)", value); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Loops Volume"); + + pushTreeInfo(&volumes_loops, ti); } /* sort volume values to start with lowest volume value */ @@ -4349,6 +4925,7 @@ static void execSetupSound() if (volumes_music == NULL) { + boolean current_volume_music_found = FALSE; int i; for (i = 0; volumes_list[i].value != -1; i++) @@ -4370,6 +4947,31 @@ static void execSetupSound() setString(&ti->infotext, "Music Volume"); pushTreeInfo(&volumes_music, ti); + + if (value == setup.volume_music) + current_volume_music_found = TRUE; + } + + if (!current_volume_music_found) + { + // add entry for non-preset volume value + + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = setup.volume_music; + + ti->node_top = &volumes_music; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%d %% (Current)", value); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Music Volume"); + + pushTreeInfo(&volumes_music, ti); } /* sort volume values to start with lowest volume value */ @@ -4397,13 +4999,177 @@ static void execSetupSound() volume_simple_text = volume_simple_current->name; volume_loops_text = volume_loops_current->name; volume_music_text = volume_music_current->name; -#endif setup_mode = SETUP_MODE_SOUND; DrawSetupScreen(); } +static void execSetupChooseTouchControls() +{ + setup_mode = SETUP_MODE_CHOOSE_TOUCH_CONTROL; + + DrawSetupScreen(); +} + +static void execSetupChooseMoveDistance() +{ + setup_mode = SETUP_MODE_CHOOSE_MOVE_DISTANCE; + + DrawSetupScreen(); +} + +static void execSetupChooseDropDistance() +{ + setup_mode = SETUP_MODE_CHOOSE_DROP_DISTANCE; + + DrawSetupScreen(); +} + +static void execSetupTouch() +{ + if (touch_controls == NULL) + { + int i; + + for (i = 0; touch_controls_list[i].value != NULL; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + char *value = touch_controls_list[i].value; + char *text = touch_controls_list[i].text; + + ti->node_top = &touch_controls; + ti->sort_priority = i; + + sprintf(identifier, "%s", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Control Type"); + + pushTreeInfo(&touch_controls, ti); + } + + /* sort touch control values to start with lowest touch control value */ + sortTreeInfo(&touch_controls); + + /* set current touch control value to configured touch control value */ + touch_control_current = + getTreeInfoFromIdentifier(touch_controls, setup.touch.control_type); + + /* if that fails, set current touch control to reliable default value */ + if (touch_control_current == NULL) + touch_control_current = + getTreeInfoFromIdentifier(touch_controls, TOUCH_CONTROL_DEFAULT); + + /* if that also fails, set current touch control to first available value */ + if (touch_control_current == NULL) + touch_control_current = touch_controls; + } + + if (move_distances == NULL) + { + int i; + + for (i = 0; distances_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = distances_list[i].value; + char *text = distances_list[i].text; + + ti->node_top = &move_distances; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Move Distance"); + + pushTreeInfo(&move_distances, ti); + } + + /* sort distance values to start with lowest distance value */ + sortTreeInfo(&move_distances); + + /* set current distance value to configured distance value */ + move_distance_current = + getTreeInfoFromIdentifier(move_distances, + i_to_a(setup.touch.move_distance)); + + /* if that fails, set current distance to reliable default value */ + if (move_distance_current == NULL) + move_distance_current = + getTreeInfoFromIdentifier(move_distances, i_to_a(1)); + + /* if that also fails, set current distance to first available value */ + if (move_distance_current == NULL) + move_distance_current = move_distances; + } + + if (drop_distances == NULL) + { + int i; + + for (i = 0; distances_list[i].value != -1; i++) + { + TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED); + char identifier[32], name[32]; + int value = distances_list[i].value; + char *text = distances_list[i].text; + + ti->node_top = &drop_distances; + ti->sort_priority = value; + + sprintf(identifier, "%d", value); + sprintf(name, "%s", text); + + setString(&ti->identifier, identifier); + setString(&ti->name, name); + setString(&ti->name_sorting, name); + setString(&ti->infotext, "Drop Distance"); + + pushTreeInfo(&drop_distances, ti); + } + + /* sort distance values to start with lowest distance value */ + sortTreeInfo(&drop_distances); + + /* set current distance value to configured distance value */ + drop_distance_current = + getTreeInfoFromIdentifier(drop_distances, + i_to_a(setup.touch.drop_distance)); + + /* if that fails, set current distance to reliable default value */ + if (drop_distance_current == NULL) + drop_distance_current = + getTreeInfoFromIdentifier(drop_distances, i_to_a(1)); + + /* if that also fails, set current distance to first available value */ + if (drop_distance_current == NULL) + drop_distance_current = drop_distances; + } + + setup.touch.control_type = touch_control_current->identifier; + setup.touch.move_distance = atoi(move_distance_current->identifier); + setup.touch.drop_distance = atoi(drop_distance_current->identifier); + + /* needed for displaying volume text instead of identifier */ + touch_controls_text = touch_control_current->name; + move_distance_text = move_distance_current->name; + drop_distance_text = drop_distance_current->name; + + setup_mode = SETUP_MODE_TOUCH; + + DrawSetupScreen(); +} + static void execSetupArtwork() { #if 0 @@ -4451,12 +5217,14 @@ static void execSetupChooseMusic() DrawSetupScreen(); } +#if !defined(PLATFORM_ANDROID) static void execSetupInput() { setup_mode = SETUP_MODE_INPUT; DrawSetupScreen(); } +#endif static void execSetupShortcuts() { @@ -4504,7 +5272,7 @@ static void execExitSetup() { game_status = GAME_MODE_MAIN; - DrawMainMenuExt(REDRAW_FIELD, FALSE); + DrawMainMenu(); } static void execSaveAndExitSetup() @@ -4520,7 +5288,12 @@ static struct TokenInfo setup_info_main[] = { TYPE_ENTER_MENU, execSetupGraphics, "Graphics" }, { TYPE_ENTER_MENU, execSetupSound, "Sound & Music" }, { TYPE_ENTER_MENU, execSetupArtwork, "Custom Artwork" }, +#if !defined(PLATFORM_ANDROID) { TYPE_ENTER_MENU, execSetupInput, "Input Devices" }, + { TYPE_ENTER_MENU, execSetupTouch, "Touch Controls" }, +#else + { TYPE_ENTER_MENU, execSetupTouch, "Touch Controls" }, +#endif { TYPE_ENTER_MENU, execSetupShortcuts, "Key Shortcuts" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execExitSetup, "Exit" }, @@ -4539,6 +5312,13 @@ static struct TokenInfo setup_info_game[] = { TYPE_SWITCH, &setup.autorecord, "Auto-Record Tapes:" }, { TYPE_ENTER_LIST, execSetupChooseGameSpeed, "Game Speed:" }, { TYPE_STRING, &game_speed_text, "" }, +#if 1 + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, + { TYPE_STRING, &scroll_delay_text, "" }, +#endif + { TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" }, + { TYPE_STRING, &snapshot_mode_text, "" }, + { TYPE_SWITCH, &setup.show_snapshot_buttons,"Show Snapshot Buttons:" }, { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -4580,16 +5360,21 @@ static struct TokenInfo setup_info_editor[] = static struct TokenInfo setup_info_graphics[] = { +#if !defined(PLATFORM_ANDROID) { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, +#if defined(TARGET_SDL2) + { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, + { TYPE_STRING, &window_size_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseScalingType, "Anti-Aliasing:" }, + { TYPE_STRING, &scaling_type_text, "" }, +#else { TYPE_ENTER_LIST, execSetupChooseScreenMode, "Fullscreen Mode:" }, { TYPE_STRING, &screen_mode_text, "" }, -#if 0 - { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, #endif - { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay Value:" }, - { TYPE_STRING, &scroll_delay_text, "" }, +#endif #if 0 - { TYPE_SWITCH, &setup.soft_scrolling, "Soft Scrolling:" }, + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, + { TYPE_STRING, &scroll_delay_text, "" }, #endif { TYPE_SWITCH, &setup.fade_screens, "Fade Screens:" }, { TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" }, @@ -4632,23 +5417,9 @@ static struct TokenInfo setup_info_artwork[] = { TYPE_ENTER_LIST, execSetupChooseMusic, "Custom Music:" }, { TYPE_STRING, &music_set_name, "" }, { TYPE_EMPTY, NULL, "" }, -#if 1 -#if 1 { TYPE_YES_NO_AUTO,&setup.override_level_graphics,"Override Level Graphics:"}, { TYPE_YES_NO_AUTO,&setup.override_level_sounds, "Override Level Sounds:" }, { TYPE_YES_NO_AUTO,&setup.override_level_music, "Override Level Music:" }, -#else - { TYPE_YES_NO, &setup.override_level_graphics,"Override Level Graphics:" }, - { TYPE_YES_NO, &setup.override_level_sounds, "Override Level Sounds:" }, - { TYPE_YES_NO, &setup.override_level_music, "Override Level Music:" }, - { TYPE_YES_NO, &setup.auto_override_artwork, "Auto-Override Non-CE Sets:" }, -#endif -#else - { TYPE_STRING, NULL, "Override Level Artwork:"}, - { TYPE_YES_NO, &setup.override_level_graphics, "Graphics:" }, - { TYPE_YES_NO, &setup.override_level_sounds, "Sounds:" }, - { TYPE_YES_NO, &setup.override_level_music, "Music:" }, -#endif { TYPE_EMPTY, NULL, "" }, { TYPE_LEAVE_MENU, execSetupMain, "Back" }, @@ -4675,6 +5446,21 @@ static struct TokenInfo setup_info_input[] = { 0, NULL, NULL } }; +static struct TokenInfo setup_info_touch[] = +{ + { TYPE_ENTER_LIST, execSetupChooseTouchControls, "Touch Control Type:" }, + { TYPE_STRING, &touch_controls_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_ENTER_LIST, execSetupChooseMoveDistance, "Move Trigger Distance:" }, + { TYPE_STRING, &move_distance_text, "" }, + { TYPE_ENTER_LIST, execSetupChooseDropDistance, "Drop Trigger Distance:" }, + { TYPE_STRING, &drop_distance_text, "" }, + { TYPE_EMPTY, NULL, "" }, + { TYPE_LEAVE_MENU, execSetupMain, "Back" }, + + { 0, NULL, NULL } +}; + static struct TokenInfo setup_info_shortcuts[] = { { TYPE_ENTER_MENU, execSetupShortcuts1, "Various Keys" }, @@ -4820,20 +5606,6 @@ static Key getSetupKey() return key; } -static int getSetupTextFont(int type) -{ - if (type & (TYPE_SWITCH | - TYPE_YES_NO | - TYPE_YES_NO_AUTO | - TYPE_STRING | - TYPE_ECS_AGA | - TYPE_KEYTEXT | - TYPE_ENTER_LIST)) - return FONT_MENU_2; - else - return FONT_MENU_1; -} - static int getSetupValueFont(int type, void *value) { if (type & TYPE_KEY) @@ -4851,24 +5623,24 @@ static int getSetupValueFont(int type, void *value) return FONT_VALUE_1; } -static void drawSetupValue(int pos) +static void drawSetupValue(int screen_pos, int setup_info_pos_raw) { + int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw); + struct TokenInfo *si = &setup_info[si_pos]; boolean font_draw_xoffset_modified = FALSE; int font_draw_xoffset_old = -1; - int xpos = MENU_SCREEN_VALUE_XPOS; - int ypos = MENU_SCREEN_START_YPOS + pos; + int xoffset = (num_setup_info < max_setup_info ? -1 : 0); + int menu_screen_value_xpos = MENU_SCREEN_VALUE_XPOS + xoffset; + int menu_screen_max_xpos = MENU_SCREEN_MAX_XPOS + xoffset; + int xpos = menu_screen_value_xpos; + int ypos = MENU_SCREEN_START_YPOS + screen_pos; int startx = mSX + xpos * 32; int starty = mSY + ypos * 32; - int font_nr, font_width; -#if 0 - int font_height; -#endif - int type = setup_info[pos].type; - void *value = setup_info[pos].value; + int font_nr, font_width; + int type = si->type; + void *value = si->value; char *value_string = getSetupValue(type, value); -#if 1 int i; -#endif if (value_string == NULL) return; @@ -4891,34 +5663,34 @@ static void drawSetupValue(int pos) } else if (type & TYPE_YES_NO_AUTO) { - xpos = MENU_SCREEN_VALUE_XPOS - 1; + xpos = menu_screen_value_xpos - 1; } startx = mSX + xpos * 32; starty = mSY + ypos * 32; font_nr = getSetupValueFont(type, value); font_width = getFontWidth(font_nr); -#if 0 - font_height = getFontHeight(font_nr); -#endif /* downward compatibility correction for Juergen Bonhagen's menu settings */ if (setup_mode != SETUP_MODE_INPUT) { + int max_menu_text_length_big = (menu_screen_value_xpos - + MENU_SCREEN_START_XPOS); + int max_menu_text_length_medium = max_menu_text_length_big * 2; int check_font_nr = FONT_OPTION_ON; /* known font that needs correction */ int font1_xoffset = getFontBitmapInfo(font_nr)->draw_xoffset; int font2_xoffset = getFontBitmapInfo(check_font_nr)->draw_xoffset; int text_startx = mSX + MENU_SCREEN_START_XPOS * 32; - int text_font_nr = getSetupTextFont(FONT_MENU_2); + int text_font_nr = getMenuTextFont(FONT_MENU_2); int text_font_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset; - int text_width = MAX_MENU_TEXT_LENGTH_MEDIUM * getFontWidth(text_font_nr); + int text_width = max_menu_text_length_medium * getFontWidth(text_font_nr); boolean correct_font_draw_xoffset = FALSE; if (xpos == MENU_SCREEN_START_XPOS && startx + font1_xoffset < text_startx + text_font_xoffset) correct_font_draw_xoffset = TRUE; - if (xpos == MENU_SCREEN_VALUE_XPOS && + if (xpos == menu_screen_value_xpos && startx + font2_xoffset < text_startx + text_width + text_font_xoffset) correct_font_draw_xoffset = TRUE; @@ -4933,16 +5705,12 @@ static void drawSetupValue(int pos) getFontBitmapInfo(font_nr)->draw_xoffset += 2 * getFontWidth(font_nr); else if (!(type & TYPE_STRING)) getFontBitmapInfo(font_nr)->draw_xoffset = text_font_xoffset + 20 - - MAX_MENU_TEXT_LENGTH_MEDIUM * (16 - getFontWidth(text_font_nr)); + max_menu_text_length_medium * (16 - getFontWidth(text_font_nr)); } } -#if 0 - DrawBackground(startx, starty, SX + SXSIZE - startx, font_height); -#else - for (i = 0; i <= MENU_SCREEN_MAX_XPOS - xpos; i++) + for (i = 0; i <= menu_screen_max_xpos - xpos; i++) DrawText(startx + i * font_width, starty, " ", font_nr); -#endif DrawText(startx, starty, value_string, font_nr); @@ -4950,79 +5718,67 @@ static void drawSetupValue(int pos) getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; } -static void changeSetupValue(int pos, int dx) +static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) { - if (setup_info[pos].type & TYPE_BOOLEAN_STYLE) + int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw); + struct TokenInfo *si = &setup_info[si_pos]; + + if (si->type & TYPE_BOOLEAN_STYLE) { - *(boolean *)setup_info[pos].value ^= TRUE; + *(boolean *)si->value ^= TRUE; } - else if (setup_info[pos].type & TYPE_YES_NO_AUTO) + else if (si->type & TYPE_YES_NO_AUTO) { - *(int *)setup_info[pos].value = + *(int *)si->value = (dx == -1 ? - (*(int *)setup_info[pos].value == AUTO ? TRUE : - *(int *)setup_info[pos].value == TRUE ? FALSE : AUTO) : - (*(int *)setup_info[pos].value == TRUE ? AUTO : - *(int *)setup_info[pos].value == AUTO ? FALSE : TRUE)); + (*(int *)si->value == AUTO ? TRUE : + *(int *)si->value == TRUE ? FALSE : AUTO) : + (*(int *)si->value == TRUE ? AUTO : + *(int *)si->value == AUTO ? FALSE : TRUE)); } - else if (setup_info[pos].type & TYPE_KEY) + else if (si->type & TYPE_KEY) { Key key; - setup_info[pos].type |= TYPE_QUERY; - drawSetupValue(pos); - setup_info[pos].type &= ~TYPE_QUERY; + si->type |= TYPE_QUERY; + drawSetupValue(screen_pos, setup_info_pos_raw); + si->type &= ~TYPE_QUERY; key = getSetupKey(); if (key != KSYM_UNDEFINED) - *(Key *)setup_info[pos].value = key; + *(Key *)si->value = key; } - drawSetupValue(pos); -} - -static void DrawCursorAndText_Setup(int pos, boolean active) -{ - int xpos = MENU_SCREEN_START_XPOS; - int ypos = MENU_SCREEN_START_YPOS + pos; - int font_nr = getSetupTextFont(setup_info[pos].type); - - if (setup_info == setup_info_input) - font_nr = FONT_MENU_1; - - if (active) - font_nr = FONT_ACTIVE(font_nr); + drawSetupValue(screen_pos, setup_info_pos_raw); - DrawText(mSX + xpos * 32, mSY + ypos * 32, setup_info[pos].text, font_nr); - - if (setup_info[pos].type & ~TYPE_SKIP_ENTRY) - drawCursor(pos, active); + // fullscreen state may have changed at this point + if (si->value == &setup.fullscreen) + ToggleFullscreenOrChangeWindowScalingIfNeeded(); } static void DrawSetupScreen_Generic() { + int fade_mask = REDRAW_FIELD; boolean redraw_all = FALSE; char *title_string = NULL; int i; + if (CheckIfGlobalBorderHasChanged()) + fade_mask = REDRAW_ALL; + UnmapAllGadgets(); + + FreeScreenGadgets(); + CreateScreenGadgets(); + CloseDoor(DOOR_CLOSE_2); if (redraw_mask & REDRAW_ALL) redraw_all = TRUE; -#if 0 - printf("::: %s\n", (redraw_mask & REDRAW_FIELD ? "REDRAW_FIELD" : - redraw_mask & REDRAW_ALL ? "REDRAW_ALL" : - int2str(0, redraw_mask))); -#endif + FadeOut(fade_mask); -#if 0 - /* !!! usually REDRAW_NONE => DOES NOT WORK (with fade) => CHECK THIS !!! */ - FadeOut(redraw_mask); -#else - FadeOut(REDRAW_FIELD); -#endif + OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW); ClearField(); @@ -5056,6 +5812,11 @@ static void DrawSetupScreen_Generic() setup_info = setup_info_artwork; title_string = "Custom Artwork"; } + else if (setup_mode == SETUP_MODE_TOUCH) + { + setup_info = setup_info_touch; + title_string = "Setup Touch Ctrls"; + } else if (setup_mode == SETUP_MODE_SHORTCUTS) { setup_info = setup_info_shortcuts; @@ -5089,203 +5850,54 @@ static void DrawSetupScreen_Generic() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); + // determine maximal number of setup entries that can be displayed on screen num_setup_info = 0; -#if 1 - for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) -#else for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) -#endif - { - void *value_ptr = setup_info[i].value; - - /* set some entries to "unchangeable" according to other variables */ - if ((value_ptr == &setup.sound_simple && !audio.sound_available) || - (value_ptr == &setup.sound_loops && !audio.loops_available) || - (value_ptr == &setup.sound_music && !audio.music_available) || - (value_ptr == &setup.fullscreen && !video.fullscreen_available) || - (value_ptr == &screen_mode_text && !video.fullscreen_available)) - setup_info[i].type |= TYPE_GHOSTED; - - if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) - initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); - else if (setup_info[i].type & (TYPE_LEAVE_MENU|TYPE_LEAVE_LIST)) - initCursor(i, IMG_MENU_BUTTON_LEAVE_MENU); - else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) - initCursor(i, IMG_MENU_BUTTON); - - DrawCursorAndText_Setup(i, FALSE); - - if (setup_info[i].type & TYPE_VALUE) - drawSetupValue(i); - num_setup_info++; - } -#if 0 - DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, - "Joysticks deactivated in setup menu"); -#endif + // determine maximal number of setup entries available for this setup screen + max_setup_info = 0; + for (i = 0; setup_info[i].type != 0; i++) + max_setup_info++; -#if 1 HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); -#endif + + MapScreenGadgets(max_setup_info); if (redraw_all) - redraw_mask = REDRAW_ALL; + redraw_mask = fade_mask = REDRAW_ALL; -#if 1 - FadeIn(redraw_mask); -#else - FadeIn(REDRAW_FIELD); -#endif + DrawMaskedBorder(fade_mask); + + FadeIn(fade_mask); InitAnimation(); -#if 0 - HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); -#endif } void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) { - static int choice_store[MAX_SETUP_MODES]; - int choice = choice_store[setup_mode]; /* always starts with 0 */ - int x = 0; - int y = choice; - - if (button == MB_MENU_INITIALIZE) - { - /* advance to first valid menu entry */ - while (choice < num_setup_info && - setup_info[choice].type & TYPE_SKIP_ENTRY) - choice++; - choice_store[setup_mode] = choice; - - DrawCursorAndText_Setup(choice, TRUE); - - return; - } - else if (button == MB_MENU_LEAVE) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - for (y = 0; y < num_setup_info; y++) - { - if (setup_info[y].type & TYPE_LEAVE_MENU) - { - void (*menu_callback_function)(void) = setup_info[y].value; - - FadeSetLeaveMenu(); - - menu_callback_function(); - - break; /* absolutely needed because function changes 'setup_info'! */ - } - } - - return; - } - - if (mx || my) /* mouse input */ - { - x = (mx - mSX) / 32; - y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; - } - else if (dx || dy) /* keyboard input */ - { - if (dx) - { - int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER); - - if (setup_info[choice].type & menu_navigation_type || - setup_info[choice].type & TYPE_BOOLEAN_STYLE || - setup_info[choice].type & TYPE_YES_NO_AUTO) - button = MB_MENU_CHOICE; - } - else if (dy) - y = choice + dy; - - /* jump to next non-empty menu entry (up or down) */ - while (y > 0 && y < num_setup_info - 1 && - setup_info[y].type & TYPE_SKIP_ENTRY) - y += dy; - } - - if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info) - { - if (button) - { - if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY) - { - PlaySound(SND_MENU_ITEM_ACTIVATING); - - DrawCursorAndText_Setup(choice, FALSE); - DrawCursorAndText_Setup(y, TRUE); - - choice = choice_store[setup_mode] = y; - } - } - else if (!(setup_info[y].type & TYPE_GHOSTED)) - { - PlaySound(SND_MENU_ITEM_SELECTING); - - /* when selecting key headline, execute function for key value change */ - if (setup_info[y].type & TYPE_KEYTEXT && - setup_info[y + 1].type & TYPE_KEY) - y++; - - /* when selecting string value, execute function for list selection */ - if (setup_info[y].type & TYPE_STRING && y > 0 && - setup_info[y - 1].type & TYPE_ENTER_LIST) - y--; - - if (setup_info[y].type & TYPE_ENTER_OR_LEAVE) - { - void (*menu_callback_function)(void) = setup_info[y].value; - - FadeSetFromType(setup_info[y].type); + menu_info = setup_info; - menu_callback_function(); - } - else - { - if (setup_info[y].type & TYPE_VALUE) - changeSetupValue(y, dx); - } - } - } + HandleMenuScreen(mx, my, dx, dy, button, + setup_mode, num_setup_info, max_setup_info); } void DrawSetupScreen_Input() { int i; -#if 1 FadeOut(REDRAW_FIELD); -#endif ClearField(); -#if 1 setup_info = setup_info_input; -#endif DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Setup Input"); -#if 1 -#if 1 DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, "Joysticks deactivated on this screen"); -#else - DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, - "Joysticks deactivated on this screen"); -#endif -#endif -#if 1 for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) -#else - for (i = 0; setup_info[i].type != 0 && i < NUM_MENU_ENTRIES_ON_SCREEN; i++) -#endif { if (setup_info[i].type & (TYPE_ENTER_MENU|TYPE_ENTER_LIST)) initCursor(i, IMG_MENU_BUTTON_ENTER_MENU); @@ -5294,23 +5906,9 @@ void DrawSetupScreen_Input() else if (setup_info[i].type & ~TYPE_SKIP_ENTRY) initCursor(i, IMG_MENU_BUTTON); - DrawCursorAndText_Setup(i, FALSE); + DrawCursorAndText_Setup(i, -1, FALSE); } -#if 0 - DeactivateJoystickForCalibration(); -#endif - -#if 0 -#if 1 - DrawTextSCentered(SYSIZE - 20, FONT_TITLE_2, - "Joysticks deactivated on this screen"); -#else - DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, - "Joysticks deactivated on this screen"); -#endif -#endif - /* create gadgets for setup input menu screen */ FreeScreenGadgets(); CreateScreenGadgets(); @@ -5320,9 +5918,7 @@ void DrawSetupScreen_Input() HandleSetupScreen_Input(0, 0, 0, 0, MB_MENU_INITIALIZE); -#if 1 FadeIn(REDRAW_FIELD); -#endif InitAnimation(); } @@ -5463,7 +6059,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { drawPlayerSetupInputInfo(input_player_nr, (choice == 2)); - DrawCursorAndText_Setup(choice, TRUE); + DrawCursorAndText_Setup(choice, -1, TRUE); return; } @@ -5500,7 +6096,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { HandleSetupScreen_Input_Player(1, dx < 0 ? -1 : +1); } - else if (IN_VIS_FIELD(x, y) && + else if (IN_VIS_FIELD(x, y) && // (does not use "IN_VIS_MENU()" yet) y >= pos_start && y <= pos_end && !(y >= pos_empty1 && y <= pos_empty2)) { @@ -5508,8 +6104,8 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) { if (y != choice) { - DrawCursorAndText_Setup(choice, FALSE); - DrawCursorAndText_Setup(y, TRUE); + DrawCursorAndText_Setup(choice, -1, FALSE); + DrawCursorAndText_Setup(y, -1, TRUE); drawPlayerSetupInputInfo(input_player_nr, (y == 2)); @@ -5595,11 +6191,6 @@ void CustomizeKeyboard(int player_nr) DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, "Keyboard Input"); -#if 0 - BackToFront(); - InitAnimation(); -#endif - step_nr = 0; DrawText(mSX, mSY + (2 + 2 * step_nr) * 32, customize_step[step_nr].text, FONT_INPUT_1_ACTIVE); @@ -5608,11 +6199,9 @@ void CustomizeKeyboard(int player_nr) DrawText(mSX + 4 * 32, mSY + (2 + 2 * step_nr + 1) * 32, getKeyNameFromKey(*customize_step[step_nr].key), FONT_VALUE_OLD); -#if 1 FadeIn(REDRAW_FIELD); InitAnimation(); -#endif while (!finished) { @@ -5849,20 +6438,6 @@ static boolean CalibrateJoystickMain(int player_nr) check[x+1][y+1] = TRUE; check_remaining--; } - -#if 0 -#ifdef DEBUG - printf("LEFT / MIDDLE / RIGHT == %d / %d / %d\n", - setup.input[player_nr].joy.xleft, - setup.input[player_nr].joy.xmiddle, - setup.input[player_nr].joy.xright); - printf("UP / MIDDLE / DOWN == %d / %d / %d\n", - setup.input[player_nr].joy.yupper, - setup.input[player_nr].joy.ymiddle, - setup.input[player_nr].joy.ylower); -#endif -#endif - } DoAnimation(); @@ -5881,10 +6456,6 @@ static boolean CalibrateJoystickMain(int player_nr) StopAnimation(); -#if 0 - DrawSetupScreen_Input(); -#endif - /* wait until the last pressed button was released */ while (Joystick(player_nr) & JOY_BUTTON) { @@ -5922,9 +6493,7 @@ void CalibrateJoystick(int player_nr) ClearEventQueue(); } -#if 1 DrawSetupScreen_Input(); -#endif } void DrawSetupScreen() @@ -5937,10 +6506,16 @@ void DrawSetupScreen() DrawSetupScreen_Input(); else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) DrawChooseTree(&game_speed_current); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) - DrawChooseTree(&screen_mode_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) DrawChooseTree(&scroll_delay_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE) + DrawChooseTree(&snapshot_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + DrawChooseTree(&screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) + DrawChooseTree(&window_size_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE) + DrawChooseTree(&scaling_type_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) DrawChooseTree(&artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -5953,6 +6528,12 @@ void DrawSetupScreen() DrawChooseTree(&volume_loops_current); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC) DrawChooseTree(&volume_music_current); + else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL) + DrawChooseTree(&touch_control_current); + else if (setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE) + DrawChooseTree(&move_distance_current); + else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + DrawChooseTree(&drop_distance_current); else DrawSetupScreen_Generic(); @@ -5962,8 +6543,14 @@ void DrawSetupScreen() void RedrawSetupScreenAfterFullscreenToggle() { - if (setup_mode == SETUP_MODE_GRAPHICS) + if (setup_mode == SETUP_MODE_GRAPHICS || + setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) + { + // update list selection from "setup.window_scaling_percent" + execSetupGraphics_setWindowSizes(TRUE); + DrawSetupScreen(); + } } void HandleSetupScreen(int mx, int my, int dx, int dy, int button) @@ -5972,10 +6559,16 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleSetupScreen_Input(mx, my, dx, dy, button); else if (setup_mode == SETUP_MODE_CHOOSE_GAME_SPEED) HandleChooseTree(mx, my, dx, dy, button, &game_speed_current); - else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) - HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current); else if (setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY) HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE) + HandleChooseTree(mx, my, dx, dy, button, &snapshot_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCREEN_MODE) + HandleChooseTree(mx, my, dx, dy, button, &screen_mode_current); + else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE) + HandleChooseTree(mx, my, dx, dy, button, &window_size_current); + else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE) + HandleChooseTree(mx, my, dx, dy, button, &scaling_type_current); else if (setup_mode == SETUP_MODE_CHOOSE_GRAPHICS) HandleChooseTree(mx, my, dx, dy, button, &artwork.gfx_current); else if (setup_mode == SETUP_MODE_CHOOSE_SOUNDS) @@ -5988,10 +6581,14 @@ void HandleSetupScreen(int mx, int my, int dx, int dy, int button) HandleChooseTree(mx, my, dx, dy, button, &volume_loops_current); else if (setup_mode == SETUP_MODE_CHOOSE_VOLUME_MUSIC) HandleChooseTree(mx, my, dx, dy, button, &volume_music_current); + else if (setup_mode == SETUP_MODE_CHOOSE_TOUCH_CONTROL) + HandleChooseTree(mx, my, dx, dy, button, &touch_control_current); + else if (setup_mode == SETUP_MODE_CHOOSE_MOVE_DISTANCE) + HandleChooseTree(mx, my, dx, dy, button, &move_distance_current); + else if (setup_mode == SETUP_MODE_CHOOSE_DROP_DISTANCE) + HandleChooseTree(mx, my, dx, dy, button, &drop_distance_current); else HandleSetupScreen_Generic(mx, my, dx, dy, button); - - DoAnimation(); } void HandleGameActions() @@ -6012,27 +6609,15 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) { switch (gadget_id) { -#if 1 - case SCREEN_CTRL_ID_PREV_LEVEL: - *x = mSX + menu.main.button.prev_level.x; - *y = mSY + menu.main.button.prev_level.y; - break; - - case SCREEN_CTRL_ID_NEXT_LEVEL: - *x = mSX + menu.main.button.next_level.x; - *y = mSY + menu.main.button.next_level.y; - break; -#else case SCREEN_CTRL_ID_PREV_LEVEL: - *x = mSX + TILEX * getPrevlevelButtonPos(); - *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1); + *x = mSX + GDI_ACTIVE_POS(menu.main.button.prev_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.prev_level.y); break; case SCREEN_CTRL_ID_NEXT_LEVEL: - *x = mSX + TILEX * getNextLevelButtonPos(); - *y = mSY + TILEY * (MENU_SCREEN_START_YPOS + 1); + *x = mSX + GDI_ACTIVE_POS(menu.main.button.next_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y); break; -#endif case SCREEN_CTRL_ID_PREV_PLAYER: *x = mSX + TILEX * 10; @@ -6098,21 +6683,13 @@ static struct { { IMG_MENU_BUTTON_UP, IMG_MENU_BUTTON_UP_ACTIVE, -#if 1 -1, -1, /* these values are not constant, but can change at runtime */ -#else - SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS, -#endif SCREEN_CTRL_ID_SCROLL_UP, "scroll up" }, { IMG_MENU_BUTTON_DOWN, IMG_MENU_BUTTON_DOWN_ACTIVE, -#if 1 -1, -1, /* these values are not constant, but can change at runtime */ -#else - SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS, -#endif SCREEN_CTRL_ID_SCROLL_DOWN, "scroll down" } @@ -6120,11 +6697,7 @@ static struct static struct { -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - Bitmap **gfx_unpressed, **gfx_pressed; -#else int gfx_unpressed, gfx_pressed; -#endif int x, y; int width, height; int type; @@ -6133,18 +6706,9 @@ static struct } scrollbar_info[NUM_SCREEN_SCROLLBARS] = { { -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - &scrollbar_bitmap[0], &scrollbar_bitmap[1], -#else IMG_MENU_SCROLLBAR, IMG_MENU_SCROLLBAR_ACTIVE, -#endif -#if 1 -1, -1, /* these values are not constant, but can change at runtime */ -1, -1, /* these values are not constant, but can change at runtime */ -#else - SC_SCROLL_VERTICAL_XPOS, SC_SCROLL_VERTICAL_YPOS, - SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE, -#endif GD_TYPE_SCROLLBAR_VERTICAL, SCREEN_CTRL_ID_SCROLL_VERTICAL, "scroll level series vertically" @@ -6231,6 +6795,10 @@ static void CreateScreenScrollbuttons() width = SC_SCROLLBUTTON_XSIZE; height = SC_SCROLLBUTTON_YSIZE; + /* correct scrollbar position if placed outside menu (playfield) area */ + if (x > SX + SC_SCROLL_UP_XPOS) + x = SX + SC_SCROLL_UP_XPOS; + if (id == SCREEN_CTRL_ID_SCROLL_DOWN) y = mSY + (SC_SCROLL_VERTICAL_YPOS + (NUM_MENU_ENTRIES_ON_SCREEN - 2) * SC_SCROLLBUTTON_YSIZE); @@ -6280,9 +6848,7 @@ static void CreateScreenScrollbars() for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++) { Bitmap *gd_bitmap_unpressed, *gd_bitmap_pressed; -#if !defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) int gfx_unpressed, gfx_pressed; -#endif int x, y, width, height; int gd_x1, gd_x2, gd_y1, gd_y2; struct GadgetInfo *gi; @@ -6298,6 +6864,10 @@ static void CreateScreenScrollbars() width = scrollbar_info[i].width; height = scrollbar_info[i].height; + /* correct scrollbar position if placed outside menu (playfield) area */ + if (x > SX + SC_SCROLL_VERTICAL_XPOS) + x = SX + SC_SCROLL_VERTICAL_XPOS; + if (id == SCREEN_CTRL_ID_SCROLL_VERTICAL) height = (NUM_MENU_ENTRIES_ON_SCREEN - 2) * SC_SCROLLBUTTON_YSIZE; @@ -6305,14 +6875,6 @@ static void CreateScreenScrollbars() items_visible = num_page_entries; item_position = 0; -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - gd_bitmap_unpressed = *scrollbar_info[i].gfx_unpressed; - gd_bitmap_pressed = *scrollbar_info[i].gfx_pressed; - gd_x1 = 0; - gd_y1 = 0; - gd_x2 = 0; - gd_y2 = 0; -#else gfx_unpressed = scrollbar_info[i].gfx_unpressed; gfx_pressed = scrollbar_info[i].gfx_pressed; gd_bitmap_unpressed = graphic_info[gfx_unpressed].bitmap; @@ -6321,7 +6883,6 @@ static void CreateScreenScrollbars() gd_y1 = graphic_info[gfx_unpressed].src_y; gd_x2 = graphic_info[gfx_pressed].src_x; gd_y2 = graphic_info[gfx_pressed].src_y; -#endif gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_CUSTOM_TYPE_ID, i, @@ -6334,17 +6895,10 @@ static void CreateScreenScrollbars() GDI_SCROLLBAR_ITEMS_MAX, items_max, GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible, GDI_SCROLLBAR_ITEM_POSITION, item_position, -#if 1 GDI_WHEEL_AREA_X, SX, GDI_WHEEL_AREA_Y, SY, GDI_WHEEL_AREA_WIDTH, SXSIZE, GDI_WHEEL_AREA_HEIGHT, SYSIZE, -#else - GDI_WHEEL_AREA_X, 0, - GDI_WHEEL_AREA_Y, 0, - GDI_WHEEL_AREA_WIDTH, WIN_XSIZE, - GDI_WHEEL_AREA_HEIGHT, WIN_YSIZE, -#endif GDI_STATE, GD_BUTTON_UNPRESSED, GDI_DESIGN_UNPRESSED, gd_bitmap_unpressed, gd_x1, gd_y1, GDI_DESIGN_PRESSED, gd_bitmap_pressed, gd_x2, gd_y2, @@ -6365,34 +6919,8 @@ void CreateScreenGadgets() { int last_game_status = game_status; /* save current game status */ -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - int i; - - for (i = 0; i < NUM_SCROLLBAR_BITMAPS; i++) - { - scrollbar_bitmap[i] = CreateBitmap(TILEX, TILEY, DEFAULT_DEPTH); - - /* copy pointers to clip mask and GC */ - scrollbar_bitmap[i]->clip_mask = - graphic_info[IMG_MENU_SCROLLBAR + i].clip_mask; - scrollbar_bitmap[i]->stored_clip_gc = - graphic_info[IMG_MENU_SCROLLBAR + i].clip_gc; - - BlitBitmap(graphic_info[IMG_MENU_SCROLLBAR + i].bitmap, - scrollbar_bitmap[i], - graphic_info[IMG_MENU_SCROLLBAR + i].src_x, - graphic_info[IMG_MENU_SCROLLBAR + i].src_y, - TILEX, TILEY, 0, 0); - } -#endif - CreateScreenMenubuttons(); -#if 0 - /* force LEVELS draw offset for scrollbar / scrollbutton gadgets */ - game_status = GAME_MODE_LEVELS; -#endif - CreateScreenScrollbuttons(); CreateScreenScrollbars(); @@ -6403,17 +6931,6 @@ void FreeScreenGadgets() { int i; -#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - for (i = 0; i < NUM_SCROLLBAR_BITMAPS; i++) - { - /* prevent freeing clip mask and GC twice */ - scrollbar_bitmap[i]->clip_mask = None; - scrollbar_bitmap[i]->stored_clip_gc = None; - - FreeBitmap(scrollbar_bitmap[i]); - } -#endif - for (i = 0; i < NUM_SCREEN_GADGETS; i++) FreeGadget(screen_gadget[i]); } @@ -6427,9 +6944,8 @@ void MapScreenMenuGadgets(int screen_mask) MapGadget(screen_gadget[menubutton_info[i].gadget_id]); } -void MapScreenTreeGadgets(TreeInfo *ti) +void MapScreenGadgets(int num_entries) { - int num_entries = numTreeInfoInGroup(ti); int i; if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN) @@ -6442,6 +6958,11 @@ void MapScreenTreeGadgets(TreeInfo *ti) MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); } +void MapScreenTreeGadgets(TreeInfo *ti) +{ + MapScreenGadgets(numTreeInfoInGroup(ti)); +} + static void HandleScreenGadgets(struct GadgetInfo *gi) { int id = gi->custom_id; @@ -6451,11 +6972,11 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) switch (id) { case SCREEN_CTRL_ID_PREV_LEVEL: - HandleMainMenu_SelectLevel(step, -1); + HandleMainMenu_SelectLevel(step, -1, NO_DIRECT_LEVEL_SELECT); break; case SCREEN_CTRL_ID_NEXT_LEVEL: - HandleMainMenu_SelectLevel(step, +1); + HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT); break; case SCREEN_CTRL_ID_PREV_PLAYER: @@ -6473,6 +6994,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleChooseLevelNr(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) HandleSetupScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0,0, 0, -1 * SCROLL_LINE, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_DOWN: @@ -6482,6 +7005,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleChooseLevelNr(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) HandleSetupScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0,0, 0, +1 * SCROLL_LINE, MB_MENU_MARK); break; case SCREEN_CTRL_ID_SCROLL_VERTICAL: @@ -6491,6 +7016,8 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleChooseLevelNr(0,0,999,gi->event.item_position,MB_MENU_INITIALIZE); else if (game_status == GAME_MODE_SETUP) HandleSetupScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); + else if (game_status == GAME_MODE_INFO) + HandleInfoScreen(0,0, 999,gi->event.item_position,MB_MENU_INITIALIZE); break; default: