X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=2067ee28f8592e08bfe4136b27de1bdeba03f7c9;hp=f5ffa0c5aaaccee049586c9048c86e5a511b4b3f;hb=b275388df382d188bdce63b9e68783cb7139fc11;hpb=64e7c54dce6ea8c063f04198c64c5057d751c928 diff --git a/src/screens.c b/src/screens.c index f5ffa0c5..2067ee28 100644 --- a/src/screens.c +++ b/src/screens.c @@ -174,18 +174,21 @@ // screen gadget identifiers #define SCREEN_CTRL_ID_PREV_LEVEL 0 #define SCREEN_CTRL_ID_NEXT_LEVEL 1 -#define SCREEN_CTRL_ID_PREV_PLAYER 2 -#define SCREEN_CTRL_ID_NEXT_PLAYER 3 -#define SCREEN_CTRL_ID_INSERT_SOLUTION 4 -#define SCREEN_CTRL_ID_PLAY_SOLUTION 5 -#define SCREEN_CTRL_ID_SCROLL_UP 6 -#define SCREEN_CTRL_ID_SCROLL_DOWN 7 -#define SCREEN_CTRL_ID_SCROLL_VERTICAL 8 -#define SCREEN_CTRL_ID_NETWORK_SERVER 9 - -#define NUM_SCREEN_GADGETS 10 - -#define NUM_SCREEN_MENUBUTTONS 6 +#define SCREEN_CTRL_ID_FIRST_LEVEL 2 +#define SCREEN_CTRL_ID_LAST_LEVEL 3 +#define SCREEN_CTRL_ID_LEVEL_NUMBER 4 +#define SCREEN_CTRL_ID_PREV_PLAYER 5 +#define SCREEN_CTRL_ID_NEXT_PLAYER 6 +#define SCREEN_CTRL_ID_INSERT_SOLUTION 7 +#define SCREEN_CTRL_ID_PLAY_SOLUTION 8 +#define SCREEN_CTRL_ID_SCROLL_UP 9 +#define SCREEN_CTRL_ID_SCROLL_DOWN 10 +#define SCREEN_CTRL_ID_SCROLL_VERTICAL 11 +#define SCREEN_CTRL_ID_NETWORK_SERVER 12 + +#define NUM_SCREEN_GADGETS 13 + +#define NUM_SCREEN_MENUBUTTONS 9 #define NUM_SCREEN_SCROLLBUTTONS 2 #define NUM_SCREEN_SCROLLBARS 1 #define NUM_SCREEN_TEXTINPUT 1 @@ -724,36 +727,33 @@ static struct MainControlInfo main_controls[] = &menu.main.text.quit, &main_text_quit, NULL, NULL, }, -#if 0 - // (these two buttons are real gadgets) { MAIN_CONTROL_PREV_LEVEL, - &menu.main.button.prev_level, IMG_MENU_BUTTON_PREV_LEVEL, + NULL, -1, NULL, NULL, NULL, NULL, }, { MAIN_CONTROL_NEXT_LEVEL, - &menu.main.button.next_level, IMG_MENU_BUTTON_NEXT_LEVEL, + NULL, -1, NULL, NULL, NULL, NULL, }, -#endif { MAIN_CONTROL_FIRST_LEVEL, - &menu.main.button.first_level, IMG_MENU_BUTTON_FIRST_LEVEL, + NULL, -1, &menu.main.text.first_level, &main_text_first_level, NULL, NULL, }, { MAIN_CONTROL_LAST_LEVEL, - &menu.main.button.last_level, IMG_MENU_BUTTON_LAST_LEVEL, + NULL, -1, &menu.main.text.last_level, &main_text_last_level, NULL, NULL, }, { MAIN_CONTROL_LEVEL_NUMBER, - &menu.main.button.level_number, IMG_MENU_BUTTON_LEVEL_NUMBER, + NULL, -1, &menu.main.text.level_number, &main_text_level_number, NULL, NULL, }, @@ -1593,7 +1593,7 @@ void DrawMainMenu(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; FadeOut(fade_mask); @@ -2035,9 +2035,23 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button) if (pos == MAIN_CONTROL_NAME) { - SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + if ((mx || my) && + insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY)) + { + // special case: menu text "name/team" clicked -- toggle team mode + setup.team_mode = !setup.team_mode; - HandleTypeName(strlen(setup.player_name), 0); + InitializeMainControls(); + DrawCursorAndText_Main(choice, TRUE, FALSE); + + DrawPreviewPlayers(); + } + else + { + SetGameStatus(GAME_MODE_PSEUDO_TYPENAME); + + HandleTypeName(strlen(setup.player_name), 0); + } } else if (pos == MAIN_CONTROL_LEVELS) { @@ -2324,7 +2338,7 @@ static void DrawInfoScreen_Main(void) if (redraw_mask & REDRAW_ALL) fade_mask = REDRAW_ALL; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -3601,12 +3615,8 @@ static void DrawInfoScreen_Version(void) SDL_version sdl_version_compiled; const SDL_version *sdl_version_linked; 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); @@ -3657,12 +3667,8 @@ static void DrawInfoScreen_Version(void) ystart += ystep_head; 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 DrawTextF(xstart1, ystart, font_text, "SDL"); DrawTextF(xstart2, ystart, font_text, "%d.%d.%d", @@ -3722,22 +3728,14 @@ static void DrawInfoScreen_Version(void) DrawTextF(xstart3, ystart, font_head, "Used"); ystart += ystep_head; -#if defined(TARGET_SDL2) driver_name = getStringCopyNStatic(SDL_GetVideoDriver(0), driver_name_len); -#else - SDL_VideoDriverName(driver_name, driver_name_len); -#endif DrawTextF(xstart1, ystart, font_text, "SDL_VideoDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_videodriver); DrawTextF(xstart3, ystart, font_text, "%s", driver_name); ystart += ystep_line; -#if defined(TARGET_SDL2) driver_name = getStringCopyNStatic(SDL_GetAudioDriver(0), driver_name_len); -#else - SDL_AudioDriverName(driver_name, driver_name_len); -#endif DrawTextF(xstart1, ystart, font_text, "SDL_AudioDriver"); DrawTextF(xstart2, ystart, font_text, "%s", setup.system.sdl_audiodriver); @@ -3996,7 +3994,7 @@ static void DrawChooseTree(TreeInfo **ti_ptr) { int fade_mask = REDRAW_FIELD; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; if (strEqual((*ti_ptr)->subdir, STRING_TOP_DIRECTORY)) @@ -4533,7 +4531,7 @@ void DrawHallOfFame(int level_nr, int highlight_position) { int fade_mask = REDRAW_FIELD; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -5216,7 +5214,6 @@ static void execSetupGraphics(void) if (check_game_speed) ModifyGameSpeedIfNeeded(); -#if defined(TARGET_SDL2) // window scaling may have changed at this point ToggleFullscreenOrChangeWindowScalingIfNeeded(); @@ -5229,7 +5226,6 @@ static void execSetupGraphics(void) // screen vsync mode may have changed at this point SDLSetScreenVsyncMode(setup.vsync_mode); -#endif } static void execSetupChooseWindowSize(void) @@ -6218,7 +6214,7 @@ static struct TokenInfo setup_info_editor[] = static struct TokenInfo setup_info_graphics[] = { -#if defined(TARGET_SDL2) && !defined(PLATFORM_ANDROID) +#if !defined(PLATFORM_ANDROID) { TYPE_SWITCH, &setup.fullscreen, "Fullscreen:" }, { TYPE_ENTER_LIST, execSetupChooseWindowSize, "Window Scaling:" }, { TYPE_STRING, &window_size_text, "" }, @@ -6777,7 +6773,7 @@ static void DrawSetupScreen_Generic(void) char *title_string = NULL; int i; - if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged()) + if (CheckFadeAll()) fade_mask = REDRAW_ALL; UnmapAllGadgets(); @@ -7383,7 +7379,6 @@ void CustomizeKeyboard(int player_nr) static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) { -#if defined(TARGET_SDL2) static boolean bitmaps_initialized = FALSE; boolean screen_initialized = FALSE; static Bitmap *controller, *button, *axis_x, *axis_y; @@ -7603,8 +7598,8 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) break; case SDL_JOYHATMOTION: - /* ignore centering; we're probably just coming back - to the center from the previous item we set */ + // ignore centering; we're probably just coming back + // to the center from the previous item we set if (event.jhat.value == SDL_HAT_CENTERED) break; @@ -7729,9 +7724,6 @@ static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) while (NextValidEvent(&event)); return success; -#else - return TRUE; -#endif } static int ConfigureJoystickMain(int player_nr) @@ -7895,19 +7887,13 @@ static boolean ConfigureVirtualButtonsMain(void) // press 'Enter' to keep the existing key binding if (key == KSYM_Return || -#if defined(TARGET_SDL2) key == KSYM_Menu || -#endif key == KSYM_space) { step_nr++; } - else if (key == KSYM_BackSpace -#if defined(TARGET_SDL2) - || - key == KSYM_Back -#endif - ) + else if (key == KSYM_BackSpace || + key == KSYM_Back) { if (step_nr == 0) { @@ -7996,7 +7982,6 @@ static boolean ConfigureVirtualButtonsMain(void) } break; -#if defined(TARGET_SDL2) case SDL_WINDOWEVENT: HandleWindowEvent((WindowEvent *) &event); @@ -8019,7 +8004,6 @@ static boolean ConfigureVirtualButtonsMain(void) case SDL_APP_DIDENTERFOREGROUND: HandlePauseResumeEvent((PauseResumeEvent *) &event); break; -#endif default: HandleOtherEvents(&event); @@ -8248,6 +8232,21 @@ static void getScreenMenuButtonPos(int *x, int *y, int gadget_id) *y = mSY + GDI_ACTIVE_POS(menu.main.button.next_level.y); break; + case SCREEN_CTRL_ID_FIRST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.first_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.first_level.y); + break; + + case SCREEN_CTRL_ID_LAST_LEVEL: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.last_level.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.last_level.y); + break; + + case SCREEN_CTRL_ID_LEVEL_NUMBER: + *x = mSX + GDI_ACTIVE_POS(menu.main.button.level_number.x); + *y = mSY + GDI_ACTIVE_POS(menu.main.button.level_number.y); + break; + case SCREEN_CTRL_ID_PREV_PLAYER: *x = mSX + TILEX * 10; *y = mSY + TILEY * MENU_SCREEN_START_YPOS; @@ -8279,6 +8278,7 @@ static struct void (*get_gadget_position)(int *, int *, int); int gadget_id; int screen_mask; + unsigned int event_mask; char *infotext; } menubutton_info[NUM_SCREEN_MENUBUTTONS] = { @@ -8287,27 +8287,55 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_LEVEL, SCREEN_MASK_MAIN, - "last level" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous level" }, { IMG_MENU_BUTTON_NEXT_LEVEL, IMG_MENU_BUTTON_NEXT_LEVEL_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_LEVEL, SCREEN_MASK_MAIN, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next level" }, + { + IMG_MENU_BUTTON_FIRST_LEVEL, IMG_MENU_BUTTON_FIRST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_FIRST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "first level" + }, + { + IMG_MENU_BUTTON_LAST_LEVEL, IMG_MENU_BUTTON_LAST_LEVEL_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LAST_LEVEL, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "last level" + }, + { + IMG_MENU_BUTTON_LEVEL_NUMBER, IMG_MENU_BUTTON_LEVEL_NUMBER_ACTIVE, + getScreenMenuButtonPos, + SCREEN_CTRL_ID_LEVEL_NUMBER, + SCREEN_MASK_MAIN, + GD_EVENT_RELEASED, + "level number" + }, { IMG_MENU_BUTTON_LEFT, IMG_MENU_BUTTON_LEFT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_PREV_PLAYER, SCREEN_MASK_INPUT, - "last player" + GD_EVENT_PRESSED | GD_EVENT_REPEATED, + "previous player" }, { IMG_MENU_BUTTON_RIGHT, IMG_MENU_BUTTON_RIGHT_ACTIVE, getScreenMenuButtonPos, SCREEN_CTRL_ID_NEXT_PLAYER, SCREEN_MASK_INPUT, + GD_EVENT_PRESSED | GD_EVENT_REPEATED, "next player" }, { @@ -8315,6 +8343,7 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_INSERT_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, "insert solution tape" }, { @@ -8322,6 +8351,7 @@ static struct getScreenMenuButtonPos, SCREEN_CTRL_ID_PLAY_SOLUTION, SCREEN_MASK_MAIN_HAS_SOLUTION, + GD_EVENT_RELEASED, "play solution tape" }, }; @@ -8402,10 +8432,7 @@ static void CreateScreenMenubuttons(void) int gd_x1, gd_x2, gd_y1, gd_y2; int id = menubutton_info[i].gadget_id; - if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION) - event_mask = GD_EVENT_RELEASED; - else - event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED; + event_mask = menubutton_info[i].event_mask; menubutton_info[i].get_gadget_position(&x, &y, id); @@ -8739,6 +8766,20 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) HandleMainMenu_SelectLevel(step, +1, NO_DIRECT_LEVEL_SELECT); break; + case SCREEN_CTRL_ID_FIRST_LEVEL: + HandleMainMenu_SelectLevel(MAX_LEVELS, -1, NO_DIRECT_LEVEL_SELECT); + break; + + case SCREEN_CTRL_ID_LAST_LEVEL: + HandleMainMenu_SelectLevel(MAX_LEVELS, +1, NO_DIRECT_LEVEL_SELECT); + break; + + case SCREEN_CTRL_ID_LEVEL_NUMBER: + CloseDoor(DOOR_CLOSE_2); + SetGameStatus(GAME_MODE_LEVELNR); + DrawChooseLevelNr(); + break; + case SCREEN_CTRL_ID_PREV_PLAYER: HandleSetupScreen_Input_Player(step, -1); break;