X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=17c39c0407a887342dbdca3060dcaaf5dc1af68c;hb=e863b9777df452d4d666e63b4dca8ae957cddd6b;hp=37d078cf5497074e45f8dc6e55b500550abc7cad;hpb=eb6f957a5666e96d9d9d428bb6e91a5e44ef8601;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index 37d078cf..17c39c04 100644 --- a/src/events.c +++ b/src/events.c @@ -465,9 +465,11 @@ void HandleWindowEvent(WindowEvent *event) int new_xpercent = (100 * new_window_width / video.width); int new_ypercent = (100 * new_window_height / video.height); +#if 0 printf("::: RESIZED from %d, %d to %d, %d\n", video.window_width, video.window_height, new_window_width, new_window_height); +#endif setup.window_scaling_percent = video.window_scaling_percent = MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), @@ -476,11 +478,15 @@ void HandleWindowEvent(WindowEvent *event) video.window_width = new_window_width; video.window_height = new_window_height; +#if 0 printf("::: setup.window_scaling_percent set to %d\n", setup.window_scaling_percent); +#endif if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); + + SetWindowTitle(); } #else // prevent slightly wrong scaling factor due to rounding differences @@ -520,6 +526,7 @@ void HandleWindowEvent(WindowEvent *event) static struct { + boolean touched; SDL_FingerID finger_id; int counter; Key key; @@ -532,10 +539,12 @@ void HandleFingerEvent(FingerEvent *event) static Key button_key = KSYM_UNDEFINED; static float motion_x1, motion_y1; static float button_x1, button_y1; - static SDL_FingerID motion_id = 0; - static SDL_FingerID button_id = 0; - int trigger_distance_percent = 1; // percent of touchpad width/height - float trigger_distance = (float)trigger_distance_percent / 100; + static SDL_FingerID motion_id = -1; + static SDL_FingerID button_id = -1; + int move_trigger_distance_percent = 2; // percent of touchpad width/height + int drop_trigger_distance_percent = 5; // percent of touchpad width/height + float move_trigger_distance = (float)move_trigger_distance_percent / 100; + float drop_trigger_distance = (float)drop_trigger_distance_percent / 100; float event_x = event->x; float event_y = event->y; @@ -555,7 +564,13 @@ void HandleFingerEvent(FingerEvent *event) if (game_status != GAME_MODE_PLAYING) return; - if (1) +#if 1 + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) +#else + boolean use_virtual_button_control = FALSE; + + if (use_virtual_button_control) +#endif { int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : KEY_PRESSED); @@ -569,6 +584,16 @@ void HandleFingerEvent(FingerEvent *event) event->x < 5.0 / 6.0 ? setup.input[0].key.left : setup.input[0].key.right) : KSYM_UNDEFINED); +#if 0 + char *key_name = (key == setup.input[0].key.snap ? "SNAP" : + key == setup.input[0].key.drop ? "DROP" : + key == setup.input[0].key.up ? "UP" : + key == setup.input[0].key.down ? "DOWN" : + key == setup.input[0].key.left ? "LEFT" : + key == setup.input[0].key.right ? "RIGHT" : "(unknown)"); +#endif + char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" : + "KEY_PRESSED"); #else Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up : event->y > 2.0 / 3.0 ? setup.input[0].key.down : @@ -578,11 +603,19 @@ void HandleFingerEvent(FingerEvent *event) #endif int i; + Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]", + getKeyNameFromKey(key), key_status_name, event->fingerId); + // check if we already know this touch event's finger id for (i = 0; i < NUM_TOUCH_FINGERS; i++) { - if (touch_info[i].finger_id == event->fingerId) + if (touch_info[i].touched && + touch_info[i].finger_id == event->fingerId) + { + // Error(ERR_DEBUG, "MARK 1: %d", i); + break; + } } if (i >= NUM_TOUCH_FINGERS) @@ -598,16 +631,24 @@ void HandleFingerEvent(FingerEvent *event) { oldest_pos = i; oldest_counter = touch_info[i].counter; + + // Error(ERR_DEBUG, "MARK 2: %d", i); } - if (touch_info[i].finger_id == 0) + if (!touch_info[i].touched) + { + // Error(ERR_DEBUG, "MARK 3: %d", i); + break; + } } if (i >= NUM_TOUCH_FINGERS) { // all slots allocated -- use oldest slot i = oldest_pos; + + // Error(ERR_DEBUG, "MARK 4: %d", i); } } else @@ -615,7 +656,12 @@ void HandleFingerEvent(FingerEvent *event) // release of previously unknown key (should not happen) if (key != KSYM_UNDEFINED) + { HandleKey(key, KEY_RELEASED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [1]", + getKeyNameFromKey(key), "KEY_RELEASED", i); + } } } @@ -626,12 +672,23 @@ void HandleFingerEvent(FingerEvent *event) if (touch_info[i].key != key) { if (touch_info[i].key != KSYM_UNDEFINED) + { HandleKey(touch_info[i].key, KEY_RELEASED); + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + if (key != KSYM_UNDEFINED) + { HandleKey(key, KEY_PRESSED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [3]", + getKeyNameFromKey(key), "KEY_PRESSED", i); + } } + touch_info[i].touched = TRUE; touch_info[i].finger_id = event->fingerId; touch_info[i].counter = Counter(); touch_info[i].key = key; @@ -639,19 +696,34 @@ void HandleFingerEvent(FingerEvent *event) else { if (touch_info[i].key != KSYM_UNDEFINED) + { HandleKey(touch_info[i].key, KEY_RELEASED); + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [4]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + + touch_info[i].touched = FALSE; touch_info[i].finger_id = 0; touch_info[i].counter = 0; touch_info[i].key = 0; } } - Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status); +#if 0 +#if 1 + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d]", + key_name, key_status_name, i); +#else + Error(ERR_DEBUG, "=> key == %d, key_status == %d [%d]", key, key_status, i); +#endif +#endif return; } + // use touch direction control + if (event->type == EVENT_FINGERPRESS) { if (event_x > 1.0 / 3.0) @@ -688,7 +760,7 @@ void HandleFingerEvent(FingerEvent *event) { if (event->fingerId == motion_id) { - motion_id = 0; + motion_id = -1; if (motion_key_x != KSYM_UNDEFINED) HandleKey(motion_key_x, KEY_RELEASED); @@ -702,7 +774,7 @@ void HandleFingerEvent(FingerEvent *event) } else if (event->fingerId == button_id) { - button_id = 0; + button_id = -1; if (button_key != KSYM_UNDEFINED) HandleKey(button_key, KEY_RELEASED); @@ -725,16 +797,16 @@ void HandleFingerEvent(FingerEvent *event) event_y > motion_y1 ? setup.input[0].key.down : KSYM_UNDEFINED); - if (distance_x < trigger_distance / 2 || + if (distance_x < move_trigger_distance / 2 || distance_x < distance_y) new_motion_key_x = KSYM_UNDEFINED; - if (distance_y < trigger_distance / 2 || + if (distance_y < move_trigger_distance / 2 || distance_y < distance_x) new_motion_key_y = KSYM_UNDEFINED; - if (distance_x > trigger_distance || - distance_y > trigger_distance) + if (distance_x > move_trigger_distance || + distance_y > move_trigger_distance) { if (new_motion_key_x != motion_key_x) { @@ -766,8 +838,8 @@ void HandleFingerEvent(FingerEvent *event) float distance_x = ABS(event_x - button_x1); float distance_y = ABS(event_y - button_y1); - if (distance_x < trigger_distance / 2 && - distance_y > trigger_distance) + if (distance_x < drop_trigger_distance / 2 && + distance_y > drop_trigger_distance) { if (button_key == setup.input[0].key.snap) HandleKey(button_key, KEY_RELEASED); @@ -1027,11 +1099,20 @@ void HandleButton(int mx, int my, int button, int button_nr) old_my = my; } +#if defined(PLATFORM_ANDROID) + if (game_status != GAME_MODE_PLAYING && + HandleGadgets(mx, my, button)) + { + /* do not handle this button event anymore */ + mx = my = -32; /* force mouse event to be outside screen tiles */ + } +#else if (HandleGadgets(mx, my, button)) { /* do not handle this button event anymore */ mx = my = -32; /* force mouse event to be outside screen tiles */ } +#endif /* do not use scroll wheel button events for anything other than gadgets */ if (IS_WHEEL_BUTTON(button_nr)) @@ -1081,7 +1162,7 @@ void HandleButton(int mx, int my, int button, int button_nr) case GAME_MODE_PLAYING: #ifdef DEBUG - if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my)) + if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my)) DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); #endif break; @@ -1172,6 +1253,20 @@ static void HandleKeysSpecial(Key key) { DumpTape(&tape); } + else if (is_string_suffix(cheat_input, ":fix-tape") || + is_string_suffix(cheat_input, ":ft")) + { + /* fix single-player tapes that contain player input for more than one + player (due to a bug in 3.3.1.2 and earlier versions), which results + in playing levels with more than one player in multi-player mode, + even though the tape was originally recorded in single-player mode */ + + /* remove player input actions for all players but the first one */ + for (i = 1; i < MAX_PLAYERS; i++) + tape.player_participates[i] = FALSE; + + tape.changed = TRUE; + } else if (is_string_suffix(cheat_input, ":save-native-level") || is_string_suffix(cheat_input, ":snl")) { @@ -1630,6 +1725,7 @@ void HandleKey(Key key, int key_status) } break; +#if 0 case KSYM_s: if (!global.fps_slowdown) { @@ -1649,7 +1745,9 @@ void HandleKey(Key key, int key_status) printf("fps slowdown disabled\n"); } break; +#endif +#if 0 case KSYM_f: ScrollStepSize = TILEX / 8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); @@ -1669,6 +1767,7 @@ void HandleKey(Key key, int key_status) ScrollStepSize = TILEX; printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); break; +#endif case KSYM_v: printf("::: currently using game engine version %d\n",