X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=d28e4d228bb209dee643647144afc39e43f59b47;hp=c15d68b6466f07be46446ee6ea72f19d0ad31e18;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=92b6a44481d43254055576a02ce4e335eeab12e9 diff --git a/src/screens.c b/src/screens.c index c15d68b6..d28e4d22 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" @@ -47,31 +45,35 @@ #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_SCROLL_DELAY 16 -#define SETUP_MODE_CHOOSE_SCREEN_MODE 17 -#define SETUP_MODE_CHOOSE_WINDOW_SIZE 18 -#define SETUP_MODE_CHOOSE_SCALING_TYPE 19 -#define SETUP_MODE_CHOOSE_GRAPHICS 20 -#define SETUP_MODE_CHOOSE_SOUNDS 21 -#define SETUP_MODE_CHOOSE_MUSIC 22 -#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 23 -#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 24 -#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 25 - -#define MAX_SETUP_MODES 26 +#define SETUP_MODE_CHOOSE_GAME_SPEED 16 +#define SETUP_MODE_CHOOSE_SCROLL_DELAY 17 +#define SETUP_MODE_CHOOSE_SCREEN_MODE 18 +#define SETUP_MODE_CHOOSE_WINDOW_SIZE 19 +#define SETUP_MODE_CHOOSE_SCALING_TYPE 20 +#define SETUP_MODE_CHOOSE_GRAPHICS 21 +#define SETUP_MODE_CHOOSE_SOUNDS 22 +#define SETUP_MODE_CHOOSE_MUSIC 23 +#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 24 +#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 25 +#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 26 +#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 27 +#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 28 +#define SETUP_MODE_CHOOSE_DROP_DISTANCE 29 + +#define MAX_SETUP_MODES 30 /* for input setup functions */ #define SETUPINPUT_SCREEN_POS_START 0 @@ -82,8 +84,13 @@ /* for various menu stuff */ #define MENU_SCREEN_START_XPOS 1 #define MENU_SCREEN_START_YPOS 2 +#if 1 +#define MENU_SCREEN_VALUE_XPOS (SCR_FIELDX - 3) +#define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) +#else #define MENU_SCREEN_VALUE_XPOS 14 #define MENU_SCREEN_MAX_XPOS (SCR_FIELDX - 1) +#endif #define MENU_TITLE1_YPOS 8 #define MENU_TITLE2_YPOS 46 #define MENU_SCREEN_INFO_XSTART 16 @@ -103,9 +110,14 @@ #define NUM_INFO_ELEMENTS_ON_SCREEN 10 #endif #define MAX_MENU_ENTRIES_ON_SCREEN (SCR_FIELDY - MENU_SCREEN_START_YPOS) +#if 1 +#define MAX_MENU_TEXT_LENGTH_BIG 13 +#define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) +#else #define MAX_MENU_TEXT_LENGTH_BIG (MENU_SCREEN_VALUE_XPOS - \ MENU_SCREEN_START_XPOS) #define MAX_MENU_TEXT_LENGTH_MEDIUM (MAX_MENU_TEXT_LENGTH_BIG * 2) +#endif /* buttons and scrollbars identifiers */ #define SCREEN_CTRL_ID_PREV_LEVEL 0 @@ -161,6 +173,7 @@ 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 **); @@ -183,6 +196,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]; @@ -214,6 +228,15 @@ 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; @@ -323,6 +346,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 ? \ @@ -372,11 +426,6 @@ 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 - /* title display and control definitions */ @@ -1487,7 +1536,8 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) #endif #if 1 - if (fade_mask == REDRAW_ALL) + // if (fade_mask == REDRAW_ALL) + // (always redraw current door state) { int door_state = GetDoorState(); @@ -1497,6 +1547,12 @@ void DrawMainMenuExt(int fade_mask, boolean do_fading) } #endif +#if 0 + redraw_mask |= REDRAW_ALL; + BackToFront(); + Delay(3000); +#endif + DrawMaskedBorder(REDRAW_ALL); FadeIn(fade_mask); @@ -3485,8 +3541,25 @@ static void DrawChooseTree(TreeInfo **ti_ptr) InitAnimation(); } +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) { +#if 1 + AdjustScrollbar(id, numTreeInfoInGroup(ti), NUM_MENU_ENTRIES_ON_SCREEN, + first_entry); +#else struct GadgetInfo *gi = screen_gadget[id]; int items_max, items_visible, item_position; @@ -3500,6 +3573,7 @@ static void AdjustChooseTreeScrollbar(int id, int first_entry, TreeInfo *ti) ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max, GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible, GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END); +#endif } static void drawChooseTreeList(int first_entry, int num_page_entries, @@ -3698,6 +3772,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, 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(); } @@ -3741,6 +3819,45 @@ 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) { +#if 1 + boolean redraw = FALSE; + + if (ABS(dy) == SCROLL_PAGE) + step = num_page_entries - 1; + + if (dy < 0 && ti->cl_first > 0) + { + /* scroll page/line up */ + + ti->cl_first -= step; + if (ti->cl_first < 0) + ti->cl_first = 0; + + redraw = TRUE; + } + else if (dy > 0 && ti->cl_first + num_page_entries < num_entries) + { + /* scroll page/line down */ + + ti->cl_first += step; + 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); + + AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, + ti->cl_first, ti); + } + +#else + if (ABS(dy) == SCROLL_PAGE) step = num_page_entries - 1; @@ -3774,6 +3891,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, AdjustChooseTreeScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, ti->cl_first, ti); } +#endif return; } @@ -3821,6 +3939,11 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && y >= 0 && y < num_page_entries) { +#if 0 + printf("::: TEST/HandleChooseTree [%d, %d, %d, %d]\n", Counter(), + button, mx, screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x); +#endif + if (button) { if (y != ti->cl_cursor) @@ -3894,6 +4017,10 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, 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(); } @@ -4167,7 +4294,8 @@ 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; @@ -4180,6 +4308,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() { @@ -4743,6 +4874,173 @@ static void execSetupSound() 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 1 + 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; +#endif + + setup_mode = SETUP_MODE_TOUCH; + + DrawSetupScreen(); +} + static void execSetupArtwork() { #if 0 @@ -4859,7 +5157,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" }, @@ -4941,7 +5244,7 @@ static struct TokenInfo setup_info_graphics[] = { TYPE_SWITCH, &setup.scroll_delay, "Scroll Delay:" }, #endif #if 0 - { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay Value:" }, + { TYPE_ENTER_LIST, execSetupChooseScrollDelay, "Scroll Delay:" }, { TYPE_STRING, &scroll_delay_text, "" }, #endif #if 0 @@ -5031,6 +5334,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" }, @@ -5207,20 +5525,26 @@ static int getSetupValueFont(int type, void *value) return FONT_VALUE_1; } -static void drawSetupValue(int pos) +#if 1 +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 type = si->type; + void *value = si->value; char *value_string = getSetupValue(type, value); #if 1 int i; @@ -5247,7 +5571,7 @@ 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; @@ -5258,23 +5582,31 @@ static void drawSetupValue(int pos) font_height = getFontHeight(font_nr); #endif +#if 0 + if (menu_screen_value_xpos < 1 + MAX_MENU_TEXT_LENGTH_BIG) + 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_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; @@ -5289,44 +5621,189 @@ 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 + // printf("::: startx == %d\n", startx); + DrawText(startx, starty, value_string, font_nr); if (font_draw_xoffset_modified) getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; } -static void changeSetupValue(int pos, int dx) +#else + +static void drawSetupValue(int pos) { - if (setup_info[pos].type & TYPE_BOOLEAN_STYLE) - { - *(boolean *)setup_info[pos].value ^= TRUE; - } - else if (setup_info[pos].type & TYPE_YES_NO_AUTO) + 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 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; + char *value_string = getSetupValue(type, value); +#if 1 + int i; +#endif + + if (value_string == NULL) + return; + + if (type & TYPE_KEY) { - *(int *)setup_info[pos].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)); + xpos = MENU_SCREEN_START_XPOS; + + if (type & TYPE_QUERY) + value_string = ""; } - else if (setup_info[pos].type & TYPE_KEY) + else if (type & TYPE_STRING) { - Key key; + int max_value_len = (SCR_FIELDX - 2) * 2; + + xpos = MENU_SCREEN_START_XPOS; + + if (strlen(value_string) > max_value_len) + value_string[max_value_len] = '\0'; + } + else if (type & TYPE_YES_NO_AUTO) + { + 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 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_xoffset = getFontBitmapInfo(text_font_nr)->draw_xoffset; + 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 && + startx + font2_xoffset < text_startx + text_width + text_font_xoffset) + correct_font_draw_xoffset = TRUE; + + /* check if setup value would overlap with setup text when printed */ + /* (this can happen for extreme/wrong values for font draw offset) */ + if (correct_font_draw_xoffset) + { + font_draw_xoffset_old = getFontBitmapInfo(font_nr)->draw_xoffset; + font_draw_xoffset_modified = TRUE; + + if (type & TYPE_KEY) + 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)); + } + } + +#if 0 + DrawBackground(startx, starty, SX + SXSIZE - startx, font_height); +#else + 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); + + if (font_draw_xoffset_modified) + getFontBitmapInfo(font_nr)->draw_xoffset = font_draw_xoffset_old; +} +#endif + +#if 1 +static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx) +{ + 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 *)si->value ^= TRUE; + } + else if (si->type & TYPE_YES_NO_AUTO) + { + *(int *)si->value = + (dx == -1 ? + (*(int *)si->value == AUTO ? TRUE : + *(int *)si->value == TRUE ? FALSE : AUTO) : + (*(int *)si->value == TRUE ? AUTO : + *(int *)si->value == AUTO ? FALSE : TRUE)); + } + else if (si->type & TYPE_KEY) + { + Key key; + + si->type |= TYPE_QUERY; + drawSetupValue(screen_pos, setup_info_pos_raw); + si->type &= ~TYPE_QUERY; + + key = getSetupKey(); + if (key != KSYM_UNDEFINED) + *(Key *)si->value = key; + } + + drawSetupValue(screen_pos, setup_info_pos_raw); + + // fullscreen state may have changed at this point + if (si->value == &setup.fullscreen) + ToggleFullscreenOrChangeWindowScalingIfNeeded(); +} + +#else + +static void changeSetupValue(int pos, int dx) +{ + if (setup_info[pos].type & TYPE_BOOLEAN_STYLE) + { + *(boolean *)setup_info[pos].value ^= TRUE; + } + else if (setup_info[pos].type & TYPE_YES_NO_AUTO) + { + *(int *)setup_info[pos].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)); + } + else if (setup_info[pos].type & TYPE_KEY) + { + Key key; setup_info[pos].type |= TYPE_QUERY; - drawSetupValue(pos); + drawSetupValue(pos, -1); setup_info[pos].type &= ~TYPE_QUERY; key = getSetupKey(); @@ -5334,13 +5811,36 @@ static void changeSetupValue(int pos, int dx) *(Key *)setup_info[pos].value = key; } - drawSetupValue(pos); + drawSetupValue(pos, -1); // fullscreen state may have changed at this point if (setup_info[pos].value == &setup.fullscreen) ToggleFullscreenOrChangeWindowScalingIfNeeded(); } +#endif + +#if 1 +static void DrawCursorAndText_Setup(int screen_pos, int setup_info_pos_raw, + boolean active) +{ + int si_pos = (setup_info_pos_raw < 0 ? screen_pos : setup_info_pos_raw); + struct TokenInfo *si = &setup_info[si_pos]; + int xpos = MENU_SCREEN_START_XPOS; + int ypos = MENU_SCREEN_START_YPOS + screen_pos; + int font_nr = getSetupTextFont(si->type); + if (setup_info == setup_info_input) + font_nr = FONT_MENU_1; + + if (active) + font_nr = FONT_ACTIVE(font_nr); + + DrawText(mSX + xpos * 32, mSY + ypos * 32, si->text, font_nr); + + if (si->type & ~TYPE_SKIP_ENTRY) + drawCursor(screen_pos, active); +} +#else static void DrawCursorAndText_Setup(int pos, boolean active) { int xpos = MENU_SCREEN_START_XPOS; @@ -5358,6 +5858,58 @@ static void DrawCursorAndText_Setup(int pos, boolean active) if (setup_info[pos].type & ~TYPE_SKIP_ENTRY) drawCursor(pos, active); } +#endif + +static void drawSetupInfoList(struct TokenInfo *setup_info, + int first_entry, int num_page_entries) +{ + int i; + + if (num_page_entries > NUM_MENU_ENTRIES_ON_SCREEN) + num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN; + + if (num_page_entries > max_setup_info) + num_page_entries = max_setup_info; + + if (first_entry + num_page_entries > max_setup_info) + first_entry = 0; + +#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); +#endif + + for (i = 0; i < num_page_entries; i++) + { + int setup_info_pos = first_entry + i; + struct TokenInfo *si = &setup_info[setup_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_Setup(i, setup_info_pos, FALSE); + + if (si->type & TYPE_VALUE) + drawSetupValue(i, setup_info_pos); + } +} static void DrawSetupScreen_Generic() { @@ -5366,6 +5918,12 @@ static void DrawSetupScreen_Generic() int i; UnmapAllGadgets(); + +#if 1 + FreeScreenGadgets(); + CreateScreenGadgets(); +#endif + CloseDoor(DOOR_CLOSE_2); if (redraw_mask & REDRAW_ALL) @@ -5416,6 +5974,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; @@ -5449,6 +6012,22 @@ static void DrawSetupScreen_Generic() DrawTextSCentered(mSY - SY + 16, FONT_TITLE_1, title_string); +#if 1 + + num_setup_info = 0; + for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) + num_setup_info++; + + max_setup_info = 0; + for (i = 0; setup_info[i].type != 0; i++) + max_setup_info++; + +#if 0 + drawSetupInfoList(setup_info, 0, NUM_MENU_ENTRIES_ON_SCREEN); +#endif + +#else + num_setup_info = 0; #if 1 for (i = 0; setup_info[i].type != 0 && i < MAX_MENU_ENTRIES_ON_SCREEN; i++) @@ -5482,6 +6061,7 @@ static void DrawSetupScreen_Generic() num_setup_info++; } +#endif #if 0 DrawTextSCentered(SYSIZE - 20, FONT_TEXT_4, @@ -5492,6 +6072,10 @@ static void DrawSetupScreen_Generic() HandleSetupScreen_Generic(0, 0, 0, 0, MB_MENU_INITIALIZE); #endif +#if 1 + MapScreenGadgets(max_setup_info); +#endif + if (redraw_all) redraw_mask = REDRAW_ALL; @@ -5510,9 +6094,23 @@ static void DrawSetupScreen_Generic() 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 */ + static int first_entry_store[MAX_SETUP_MODES]; + int choice = choice_store[setup_mode]; /* starts with 0 */ + int first_entry = first_entry_store[setup_mode]; /* starts with 0 */ int x = 0; +#if 1 + int y = choice - first_entry; + int y_old = y; +#else int y = choice; +#endif + boolean position_set_by_scrollbar = (dx == 999); +#if 1 + int step = (button == 1 ? 1 : button == 2 ? 5 : 10); + int num_page_entries; + + num_page_entries = MIN(max_setup_info, NUM_MENU_ENTRIES_ON_SCREEN); +#endif if (button == MB_MENU_INITIALIZE) { @@ -5520,22 +6118,56 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) while (choice < num_setup_info && setup_info[choice].type & TYPE_SKIP_ENTRY) choice++; +#if 0 + choice_store[setup_mode] = choice; +#endif + +#if 1 + if (position_set_by_scrollbar) + first_entry = first_entry_store[setup_mode] = dy; + else + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + + drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN); +#endif + +#if 1 + if (choice < first_entry) + { + choice = first_entry; + + if (setup_info[choice].type & TYPE_SKIP_ENTRY) + choice++; + } + else if (choice > first_entry + num_page_entries - 1) + { + choice = first_entry + num_page_entries - 1; + + if (setup_info[choice].type & TYPE_SKIP_ENTRY) + choice--; + } + choice_store[setup_mode] = choice; - DrawCursorAndText_Setup(choice, TRUE); + DrawCursorAndText_Setup(choice - first_entry, choice, TRUE); +#else + DrawCursorAndText_Setup(choice, -1, TRUE); +#endif return; } else if (button == MB_MENU_LEAVE) { + int i; + PlaySound(SND_MENU_ITEM_SELECTING); - // for (y = 0; y < num_setup_info; y++) - for (y = 0; setup_info[y].type != 0; y++) + for (i = 0; setup_info[i].type != 0; i++) { - if (setup_info[y].type & TYPE_LEAVE_MENU) + if (setup_info[i].type & TYPE_LEAVE_MENU) { - void (*menu_callback_function)(void) = setup_info[y].value; + void (*menu_callback_function)(void) = setup_info[i].value; FadeSetLeaveMenu(); @@ -5553,8 +6185,94 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) x = (mx - mSX) / 32; y = (my - mSY) / 32 - MENU_SCREEN_START_YPOS; } +#if 1 + else if (dx || dy) /* keyboard or scrollbar/scrollbutton input */ +#else else if (dx || dy) /* keyboard input */ +#endif { + /* 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_setup_info) + 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_setup_info) + { + /* scroll page/line down */ + + first_entry += step; + if (first_entry + num_page_entries > max_setup_info) + first_entry = MAX(0, max_setup_info - num_page_entries); + + redraw = TRUE; + } + + if (redraw) + { + choice += first_entry - first_entry_store[setup_mode]; + + if (choice < first_entry) + { + choice = first_entry; + + if (setup_info[choice].type & TYPE_SKIP_ENTRY) + choice++; + } + else if (choice > first_entry + num_page_entries - 1) + { + choice = first_entry + num_page_entries - 1; + + if (setup_info[choice].type & TYPE_SKIP_ENTRY) + choice--; + } +#if 1 + else if (setup_info[choice].type & TYPE_SKIP_ENTRY) + { + choice += SIGN(dy); + + if (choice < first_entry || + choice > first_entry + num_page_entries - 1) + first_entry += SIGN(dy); + } +#endif + + // printf("::: MARK 1: %d\n", first_entry); + + first_entry_store[setup_mode] = first_entry; + choice_store[setup_mode] = choice; + + drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN); + + DrawCursorAndText_Setup(choice - first_entry, choice, TRUE); + + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + } + + return; + } + if (dx) { int menu_navigation_type = (dx < 0 ? TYPE_LEAVE : TYPE_ENTER); @@ -5564,29 +6282,132 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) setup_info[choice].type & TYPE_YES_NO_AUTO) button = MB_MENU_CHOICE; } +#if 1 + else if (dy) + y += dy; +#else else if (dy) y = choice + dy; +#endif /* jump to next non-empty menu entry (up or down) */ +#if 1 + while (first_entry + y > 0 && + first_entry + y < max_setup_info - 1 && + setup_info[first_entry + y].type & TYPE_SKIP_ENTRY) + y += dy; +#else while (y > 0 && y < num_setup_info - 1 && - setup_info[y].type & TYPE_SKIP_ENTRY) + setup_info[first_entry + y].type & TYPE_SKIP_ENTRY) y += dy; +#endif + + if (!IN_VIS_FIELD(x, y)) + { + choice += y - y_old; +#if 1 + if (choice < first_entry) + first_entry = choice; + else if (choice > first_entry + num_page_entries - 1) + first_entry = choice - num_page_entries + 1; +#else + first_entry += y - y_old; +#endif + + if (first_entry >= 0 && + first_entry + num_page_entries <= max_setup_info) + { + first_entry_store[setup_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[setup_mode] = choice; + + drawSetupInfoList(setup_info, first_entry, NUM_MENU_ENTRIES_ON_SCREEN); + + DrawCursorAndText_Setup(choice - first_entry, choice, TRUE); + + AdjustScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL, max_setup_info, + NUM_MENU_ENTRIES_ON_SCREEN, first_entry); + } + + return; + } } +#if 1 + if (!anyScrollbarGadgetActive() && + IN_VIS_FIELD(x, y) && + mx < screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x && + y >= 0 && y < num_page_entries) +#else if (IN_VIS_FIELD(x, y) && y >= 0 && y < num_setup_info) +#endif { +#if 0 + printf("::: TEST/HandleSetupScreen_Generic [%d, %d, %d, %d]\n", Counter(), + button, mx, screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x); +#endif + if (button) { +#if 1 + if (first_entry + y != choice && + setup_info[first_entry + y].type & ~TYPE_SKIP_ENTRY) + { + PlaySound(SND_MENU_ITEM_ACTIVATING); + + DrawCursorAndText_Setup(choice - first_entry, choice, FALSE); + DrawCursorAndText_Setup(y, first_entry + y, TRUE); + + choice = choice_store[setup_mode] = first_entry + y; + } +#else if (y != choice && setup_info[y].type & ~TYPE_SKIP_ENTRY) { PlaySound(SND_MENU_ITEM_ACTIVATING); - DrawCursorAndText_Setup(choice, FALSE); - DrawCursorAndText_Setup(y, TRUE); + DrawCursorAndText_Setup(choice, -1, FALSE); + DrawCursorAndText_Setup(y, -1, TRUE); choice = choice_store[setup_mode] = y; } +#endif + } +#if 1 + else if (!(setup_info[first_entry + y].type & TYPE_GHOSTED)) + { + PlaySound(SND_MENU_ITEM_SELECTING); + + /* when selecting key headline, execute function for key value change */ + if (setup_info[first_entry + y].type & TYPE_KEYTEXT && + setup_info[first_entry + y + 1].type & TYPE_KEY) + y++; + + /* when selecting string value, execute function for list selection */ + if (setup_info[first_entry + y].type & TYPE_STRING && y > 0 && + setup_info[first_entry + y - 1].type & TYPE_ENTER_LIST) + y--; + + if (setup_info[first_entry + y].type & TYPE_ENTER_OR_LEAVE) + { + void (*menu_callback_function)(void) = + setup_info[first_entry + y].value; + + FadeSetFromType(setup_info[first_entry + y].type); + + menu_callback_function(); + } + else + { + if (setup_info[first_entry + y].type & TYPE_VALUE) + changeSetupValue(y, first_entry + y, dx); + } } +#else else if (!(setup_info[y].type & TYPE_GHOSTED)) { PlaySound(SND_MENU_ITEM_SELECTING); @@ -5615,6 +6436,7 @@ void HandleSetupScreen_Generic(int mx, int my, int dx, int dy, int button) changeSetupValue(y, dx); } } +#endif } } @@ -5657,7 +6479,7 @@ 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 @@ -5826,7 +6648,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; } @@ -5871,8 +6693,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)); @@ -6320,6 +7142,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(); @@ -6370,6 +7198,12 @@ 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); @@ -6504,11 +7338,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; @@ -6517,11 +7347,7 @@ 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 */ @@ -6664,9 +7490,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; @@ -6689,14 +7513,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; @@ -6705,7 +7521,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, @@ -6749,27 +7564,6 @@ 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 @@ -6787,17 +7581,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]); } @@ -6811,8 +7594,25 @@ void MapScreenMenuGadgets(int screen_mask) MapGadget(screen_gadget[menubutton_info[i].gadget_id]); } +void MapScreenGadgets(int num_entries) +{ + int i; + + if (num_entries <= NUM_MENU_ENTRIES_ON_SCREEN) + return; + + for (i = 0; i < NUM_SCREEN_SCROLLBUTTONS; i++) + MapGadget(screen_gadget[scrollbutton_info[i].gadget_id]); + + for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++) + MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); +} + void MapScreenTreeGadgets(TreeInfo *ti) { +#if 1 + MapScreenGadgets(numTreeInfoInGroup(ti)); +#else int num_entries = numTreeInfoInGroup(ti); int i; @@ -6824,6 +7624,7 @@ void MapScreenTreeGadgets(TreeInfo *ti) for (i = 0; i < NUM_SCREEN_SCROLLBARS; i++) MapGadget(screen_gadget[scrollbar_info[i].gadget_id]); +#endif } static void HandleScreenGadgets(struct GadgetInfo *gi)