X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=a5bc5ac1b7009f31f46d5831681f9705d7eb8d2e;hp=d9abbb6f5b822b4ed7b99dad6d95dbea52c001b3;hb=f6d6f94c5738467ae3f3ba639f01244581d8ea1f;hpb=c104460647804f7fb64c02cb4619d18d1abba23c diff --git a/src/screens.c b/src/screens.c index d9abbb6f..a5bc5ac1 100644 --- a/src/screens.c +++ b/src/screens.c @@ -163,7 +163,7 @@ static void HandleScreenGadgets(struct GadgetInfo *); static void HandleSetupScreen_Generic(int, int, int, int, int); static void HandleSetupScreen_Input(int, int, int, int, int); static void CustomizeKeyboard(int); -static void CalibrateJoystick(int); +static void ConfigureJoystick(int); static void execSetupGame(void); static void execSetupGraphics(void); static void execSetupSound(void); @@ -5443,7 +5443,7 @@ static struct TokenInfo setup_info_input[] = { { TYPE_SWITCH, NULL, "Player:" }, { TYPE_SWITCH, NULL, "Device:" }, - { TYPE_ENTER_MENU, NULL, "" }, + { TYPE_SWITCH, NULL, "" }, { TYPE_EMPTY, NULL, "" }, { TYPE_EMPTY, NULL, "" }, { TYPE_EMPTY, NULL, "" }, @@ -6003,12 +6003,12 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active) char *text; } custom[] = { - { &custom_key.left, "Joystick Left" }, - { &custom_key.right, "Joystick Right" }, - { &custom_key.up, "Joystick Up" }, - { &custom_key.down, "Joystick Down" }, - { &custom_key.snap, "Button 1" }, - { &custom_key.drop, "Button 2" } + { &custom_key.left, "Axis/Pad Left" }, + { &custom_key.right, "Axis/Pad Right" }, + { &custom_key.up, "Axis/Pad Up" }, + { &custom_key.down, "Axis/Pad Down" }, + { &custom_key.snap, "Button 1/A/X" }, + { &custom_key.drop, "Button 2/B/Y" } }; static char *joystick_name[MAX_PLAYERS] = { @@ -6038,7 +6038,7 @@ static void drawPlayerSetupInputInfo(int player_nr, boolean active) int font_nr = (joystick_active ? FONT_VALUE_1 : FONT_VALUE_OLD); DrawText(mSX + 8 * 32, mSY + 3 * 32, text, font_nr); - DrawText(mSX + 32, mSY + 4 * 32, "Calibrate", text_font_nr); + DrawText(mSX + 32, mSY + 4 * 32, "Configure", text_font_nr); } else { @@ -6131,7 +6131,6 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) if (dx && choice == 0) x = (dx < 0 ? 10 : 12); else if ((dx && choice == 1) || - (dx == +1 && choice == 2) || (dx == -1 && choice == pos_end)) button = MB_MENU_CHOICE; else if (dy) @@ -6190,7 +6189,7 @@ void HandleSetupScreen_Input(int mx, int my, int dx, int dy, int button) else if (y == 2) { if (setup.input[input_player_nr].use_joystick) - CalibrateJoystick(input_player_nr); + ConfigureJoystick(input_player_nr); else CustomizeKeyboard(input_player_nr); } @@ -6337,7 +6336,8 @@ void CustomizeKeyboard(int player_nr) DrawSetupScreen_Input(); } -static boolean CalibrateJoystickMain(int player_nr) +#if 0 +static boolean OLD_CalibrateJoystickMain(int player_nr) { int new_joystick_xleft = JOYSTICK_XMIDDLE; int new_joystick_xright = JOYSTICK_XMIDDLE; @@ -6508,23 +6508,415 @@ static boolean CalibrateJoystickMain(int player_nr) return TRUE; } +#endif + +/* game controller mapping generator by Gabriel Jacobo */ -void CalibrateJoystick(int player_nr) +#define MARKER_BUTTON 1 +#define MARKER_AXIS_X 2 +#define MARKER_AXIS_Y 3 + +static boolean ConfigureJoystickMapButtonsAndAxes(SDL_Joystick *joystick) { - if (!CalibrateJoystickMain(player_nr)) +#if defined(TARGET_SDL2) + static boolean bitmaps_initialized = FALSE; + boolean screen_initialized = FALSE; + static Bitmap *controller, *button, *axis_x, *axis_y; + char *name; + boolean success = TRUE; + boolean done = FALSE, next = FALSE; + Event event; + int alpha = 200, alpha_step = -1; + int alpha_ticks = 0; + char mapping[4096], temp[4096]; + int font_name = FONT_TEXT_1; + int font_info = FONT_REQUEST; + int ystep1 = getFontHeight(font_name) + 2; + int ystep2 = getFontHeight(font_info) + 2; + int i, j; + + struct + { + int x, y; + int marker; + char *field; + int axis, button, hat, hat_value; + char mapping[4096]; + } + *step, *prev_step, steps[] = + { + { 356, 155, MARKER_BUTTON, "a", }, + { 396, 122, MARKER_BUTTON, "b", }, + { 320, 125, MARKER_BUTTON, "x", }, + { 358, 95, MARKER_BUTTON, "y", }, + { 162, 125, MARKER_BUTTON, "back", }, + { 216, 125, MARKER_BUTTON, "guide", }, + { 271, 125, MARKER_BUTTON, "start", }, + { 110, 200, MARKER_BUTTON, "dpleft", }, + { 146, 228, MARKER_BUTTON, "dpdown", }, + { 178, 200, MARKER_BUTTON, "dpright", }, + { 146, 172, MARKER_BUTTON, "dpup", }, + { 50, 40, MARKER_BUTTON, "leftshoulder", }, + { 88, -10, MARKER_AXIS_Y, "lefttrigger", }, + { 382, 40, MARKER_BUTTON, "rightshoulder", }, + { 346, -10, MARKER_AXIS_Y, "righttrigger", }, + { 73, 141, MARKER_BUTTON, "leftstick", }, + { 282, 210, MARKER_BUTTON, "rightstick", }, + { 73, 141, MARKER_AXIS_X, "leftx", }, + { 73, 141, MARKER_AXIS_Y, "lefty", }, + { 282, 210, MARKER_AXIS_X, "rightx", }, + { 282, 210, MARKER_AXIS_Y, "righty", }, + }; + + unsigned int event_frame_delay = 0; + unsigned int event_frame_delay_value = GAME_FRAME_DELAY; + + ResetDelayCounter(&event_frame_delay); + + if (!bitmaps_initialized) { + controller = LoadCustomImage("joystick/controller.png"); + button = LoadCustomImage("joystick/button.png"); + axis_x = LoadCustomImage("joystick/axis_x.png"); + axis_y = LoadCustomImage("joystick/axis_y.png"); + + bitmaps_initialized = TRUE; + } + + name = getFormattedJoystickName(SDL_JoystickName(joystick)); + + /* print info about the joystick we are watching */ + Error(ERR_DEBUG, "watching joystick %d: (%s)\n", + SDL_JoystickInstanceID(joystick), name); + Error(ERR_DEBUG, "joystick has %d axes, %d hats, %d balls, and %d buttons\n", + SDL_JoystickNumAxes(joystick), SDL_JoystickNumHats(joystick), + SDL_JoystickNumBalls(joystick), SDL_JoystickNumButtons(joystick)); + + /* initialize mapping with GUID and name */ + SDL_JoystickGetGUIDString(SDL_JoystickGetGUID(joystick), temp, sizeof(temp)); + + snprintf(mapping, sizeof(mapping), "%s,%s,platform:%s,", + temp, name, SDL_GetPlatform()); + + /* loop through all steps (buttons and axes), getting joystick events */ + for (i = 0; i < SDL_arraysize(steps) && !done;) + { + Bitmap *marker = button; /* initialize with reliable default value */ + + step = &steps[i]; + strcpy(step->mapping, mapping); + step->axis = -1; + step->button = -1; + step->hat = -1; + step->hat_value = -1; + + marker = (step->marker == MARKER_BUTTON ? button : + step->marker == MARKER_AXIS_X ? axis_x : + step->marker == MARKER_AXIS_Y ? axis_y : marker); + + next = FALSE; + + while (!done && !next) + { + alpha += alpha_step * (int)(SDL_GetTicks() - alpha_ticks) / 5; + alpha_ticks = SDL_GetTicks(); + + if (alpha >= 255) + { + alpha = 255; + alpha_step = -1; + } + else if (alpha < 128) + { + alpha = 127; + alpha_step = 1; + } + + int controller_x = SX + (SXSIZE - controller->width) / 2; + int controller_y = SY + ystep2; + + int marker_x = controller_x + step->x; + int marker_y = controller_y + step->y; + + int ystart1 = mSY - 2 * SY + controller_y + controller->height; + int ystart2 = ystart1 + ystep1 + ystep2; + + ClearField(); + + DrawTextSCentered(ystart1, font_name, name); + + DrawTextSCentered(ystart2 + 0 * ystep2, font_info, + "Press buttons and move axes on"); + DrawTextSCentered(ystart2 + 1 * ystep2, font_info, + "your controller when indicated."); + DrawTextSCentered(ystart2 + 2 * ystep2, font_info, + "(Your controller may look different.)"); + +#if defined(PLATFORM_ANDROID) + DrawTextSCentered(ystart2 + 4 * ystep2, font_info, + "To correct a mistake,"); + DrawTextSCentered(ystart2 + 5 * ystep2, font_info, + "press the 'back' button."); + DrawTextSCentered(ystart2 + 6 * ystep2, font_info, + "To skip a button or axis,"); + DrawTextSCentered(ystart2 + 7 * ystep2, font_info, + "press the 'menu' button."); +#else + DrawTextSCentered(ystart2 + 4 * ystep2, font_info, + "To correct a mistake,"); + DrawTextSCentered(ystart2 + 5 * ystep2, font_info, + "press the 'backspace' key."); + DrawTextSCentered(ystart2 + 6 * ystep2, font_info, + "To skip a button or axis,"); + DrawTextSCentered(ystart2 + 7 * ystep2, font_info, + "press the 'return' key."); + + DrawTextSCentered(ystart2 + 8 * ystep2, font_info, + "To exit, press the 'escape' key."); +#endif + + BlitBitmapMasked(controller, drawto, 0, 0, + controller->width, controller->height, + controller_x, controller_y); + + SDL_SetSurfaceAlphaMod(marker->surface_masked, alpha); + + BlitBitmapMasked(marker, drawto, 0, 0, + marker->width, marker->height, + marker_x, marker_y); + + if (!screen_initialized) + FadeIn(REDRAW_FIELD); + else + BackToFront(); + + screen_initialized = TRUE; + + while (NextValidEvent(&event)) + { + switch (event.type) + { + case SDL_JOYAXISMOTION: + if (event.jaxis.value > 20000 || + event.jaxis.value < -20000) + { + for (j = 0; j < i; j++) + if (steps[j].axis == event.jaxis.axis) + break; + + if (j == i) + { + if (step->marker != MARKER_AXIS_X && + step->marker != MARKER_AXIS_Y) + break; + + step->axis = event.jaxis.axis; + strcat(mapping, step->field); + snprintf(temp, sizeof(temp), ":a%u,", event.jaxis.axis); + strcat(mapping, temp); + i++; + next = TRUE; + } + } + + break; + + case SDL_JOYHATMOTION: + /* 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; + + for (j = 0; j < i; j++) + if (steps[j].hat == event.jhat.hat && + steps[j].hat_value == event.jhat.value) + break; + + if (j == i) + { + step->hat = event.jhat.hat; + step->hat_value = event.jhat.value; + strcat(mapping, step->field); + snprintf(temp, sizeof(temp), ":h%u.%u,", + event.jhat.hat, event.jhat.value ); + strcat(mapping, temp); + i++; + next = TRUE; + } + + break; + + case SDL_JOYBALLMOTION: + break; + + case SDL_JOYBUTTONUP: + for (j = 0; j < i; j++) + if (steps[j].button == event.jbutton.button) + break; + + if (j == i) + { + step->button = event.jbutton.button; + strcat(mapping, step->field); + snprintf(temp, sizeof(temp), ":b%u,", event.jbutton.button); + strcat(mapping, temp); + i++; + next = TRUE; + } + + break; + + case SDL_FINGERDOWN: + case SDL_MOUSEBUTTONDOWN: + /* skip this step */ + i++; + next = TRUE; + + break; + + case SDL_KEYDOWN: + if (event.key.keysym.sym == KSYM_BackSpace || + event.key.keysym.sym == KSYM_Back) + { + if (i == 0) + { + /* leave screen */ + success = FALSE; + done = TRUE; + } + + /* undo this step */ + prev_step = &steps[i - 1]; + strcpy(mapping, prev_step->mapping); + i--; + next = TRUE; + + break; + } + + if (event.key.keysym.sym == KSYM_space || + event.key.keysym.sym == KSYM_Return || + event.key.keysym.sym == KSYM_Menu) + { + /* skip this step */ + i++; + next = TRUE; + + break; + } + + if (event.key.keysym.sym == KSYM_Escape) + { + /* leave screen */ + success = FALSE; + done = TRUE; + } + + break; + + case SDL_QUIT: + program.exit_function(0); + break; + + default: + break; + } + + // do not handle events for longer than standard frame delay period + if (DelayReached(&event_frame_delay, event_frame_delay_value)) + break; + } + } + } + + if (success) + { + Error(ERR_DEBUG, "New game controller mapping:\n\n%s\n\n", mapping); + + // activate mapping for this game + SDL_GameControllerAddMapping(mapping); + + // save mapping to personal mappings + SaveSetup_AddGameControllerMapping(mapping); + } + + /* wait until the last pending event was removed from event queue */ + while (NextValidEvent(&event)); + + return success; +#else + return TRUE; +#endif +} + +static int ConfigureJoystickMain(int player_nr) +{ + char *device_name = setup.input[player_nr].joy.device_name; + int joystick_nr = getJoystickNrFromDeviceName(device_name); + boolean joystick_active = CheckJoystickOpened(joystick_nr); + int success = FALSE; + int i; + + if (joystick.status == JOYSTICK_NOT_AVAILABLE) + return JOYSTICK_NOT_AVAILABLE; + + if (!joystick_active || !setup.input[player_nr].use_joystick) + return JOYSTICK_NOT_AVAILABLE; + + FadeSetEnterMenu(); + FadeOut(REDRAW_FIELD); + + // close all joystick devices (potentially opened as game controllers) + for (i = 0; i < SDL_NumJoysticks(); i++) + SDLCloseJoystick(i); + + // open joystick device as plain joystick to configure as game controller + SDL_Joystick *joystick = SDL_JoystickOpen(joystick_nr); + + // as the joystick was successfully opened before, this should not happen + if (joystick == NULL) + return FALSE; + + // create new game controller mapping (buttons and axes) for joystick device + success = ConfigureJoystickMapButtonsAndAxes(joystick); + + // close joystick (and maybe re-open as configured game controller later) + SDL_JoystickClose(joystick); + + // re-open all joystick devices (potentially as game controllers) + for (i = 0; i < SDL_NumJoysticks(); i++) + SDLOpenJoystick(i); + + // clear all joystick input actions for all joystick devices + SDLClearJoystickState(); + + return (success ? JOYSTICK_CONFIGURED : JOYSTICK_NOT_CONFIGURED); +} + +void ConfigureJoystick(int player_nr) +{ + boolean state = ConfigureJoystickMain(player_nr); + + if (state != JOYSTICK_NOT_CONFIGURED) + { + boolean success = (state == JOYSTICK_CONFIGURED); + char *message = (success ? " IS CONFIGURED! " : " NOT AVAILABLE! "); char *device_name = setup.input[player_nr].joy.device_name; int nr = getJoystickNrFromDeviceName(device_name) + 1; int xpos = mSX - SX; int ypos = mSY - SY; + unsigned int wait_frame_delay = 0; + unsigned int wait_frame_delay_value = 2000; + + ResetDelayCounter(&wait_frame_delay); ClearField(); DrawTextF(xpos + 16, ypos + 6 * 32, FONT_TITLE_1, " JOYSTICK %d ", nr); - DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, " NOT AVAILABLE! "); - BackToFront(); + DrawTextF(xpos + 16, ypos + 7 * 32, FONT_TITLE_1, message); - Delay(2000); /* show error message for a short time */ + while (!DelayReached(&wait_frame_delay, wait_frame_delay_value)) + BackToFront(); ClearEventQueue(); }