X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=a189082a82c5cf01a8d7fc5390bd4fa0c0bd7b4d;hb=85a0523ca92c9c77a009233fe7f04109d8f8a9d7;hp=4c9ecc8b569b0629a879f0e41746c163f299d343;hpb=a8816d6e5319f9ec26a45346b08250f61e95c011;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index 4c9ecc8b..a189082a 100644 --- a/src/events.c +++ b/src/events.c @@ -162,18 +162,26 @@ void EventLoop(void) break; #if defined(TARGET_SDL2) + case SDL_WINDOWEVENT: + HandleWindowEvent((WindowEvent *) &event); + break; + case EVENT_FINGERPRESS: case EVENT_FINGERRELEASE: case EVENT_FINGERMOTION: HandleFingerEvent((FingerEvent *) &event); break; + + case EVENT_TEXTINPUT: + HandleTextEvent((TextEvent *) &event); + break; #endif case EVENT_KEYPRESS: case EVENT_KEYRELEASE: HandleKeyEvent((KeyEvent *) &event); break; - + default: HandleOtherEvents(&event); break; @@ -198,9 +206,15 @@ void EventLoop(void) playfield_cursor_set = FALSE; } +#if 0 HandleNoEvent(); +#endif } +#if 1 + HandleNoEvent(); +#endif + /* don't use all CPU time when idle; the main loop while playing has its own synchronization and is CPU friendly, too */ @@ -358,8 +372,10 @@ void HandleExposeEvent(ExposeEvent *event) void HandleButtonEvent(ButtonEvent *event) { #if DEBUG_EVENTS - printf("::: BUTTON EVENT: button %d %s\n", event->button, - event->type == EVENT_BUTTONPRESS ? "pressed" : "released"); + Error(ERR_DEBUG, "BUTTON EVENT: button %d %s, x/y %d/%d\n", + event->button, + event->type == EVENT_BUTTONPRESS ? "pressed" : "released", + event->x, event->y); #endif motion_status = FALSE; @@ -382,50 +398,617 @@ void HandleMotionEvent(MotionEvent *event) motion_status = TRUE; +#if DEBUG_EVENTS + Error(ERR_DEBUG, "MOTION EVENT: button %d moved, x/y %d/%d\n", + button_status, event->x, event->y); +#endif + HandleButton(event->x, event->y, button_status, button_status); } #if defined(TARGET_SDL2) +void HandleWindowEvent(WindowEvent *event) +{ +#if DEBUG_EVENTS + int subtype = event->event; + + char *event_name = + (subtype == SDL_WINDOWEVENT_SHOWN ? "SDL_WINDOWEVENT_SHOWN" : + subtype == SDL_WINDOWEVENT_HIDDEN ? "SDL_WINDOWEVENT_HIDDEN" : + subtype == SDL_WINDOWEVENT_EXPOSED ? "SDL_WINDOWEVENT_EXPOSED" : + subtype == SDL_WINDOWEVENT_MOVED ? "SDL_WINDOWEVENT_MOVED" : + subtype == SDL_WINDOWEVENT_SIZE_CHANGED ? "SDL_WINDOWEVENT_SIZE_CHANGED" : + subtype == SDL_WINDOWEVENT_RESIZED ? "SDL_WINDOWEVENT_RESIZED" : + subtype == SDL_WINDOWEVENT_MINIMIZED ? "SDL_WINDOWEVENT_MINIMIZED" : + subtype == SDL_WINDOWEVENT_MAXIMIZED ? "SDL_WINDOWEVENT_MAXIMIZED" : + subtype == SDL_WINDOWEVENT_RESTORED ? "SDL_WINDOWEVENT_RESTORED" : + subtype == SDL_WINDOWEVENT_ENTER ? "SDL_WINDOWEVENT_ENTER" : + subtype == SDL_WINDOWEVENT_LEAVE ? "SDL_WINDOWEVENT_LEAVE" : + subtype == SDL_WINDOWEVENT_FOCUS_GAINED ? "SDL_WINDOWEVENT_FOCUS_GAINED" : + subtype == SDL_WINDOWEVENT_FOCUS_LOST ? "SDL_WINDOWEVENT_FOCUS_LOST" : + subtype == SDL_WINDOWEVENT_CLOSE ? "SDL_WINDOWEVENT_CLOSE" : + "(UNKNOWN)"); + + Error(ERR_DEBUG, "WINDOW EVENT: '%s', %ld, %ld", + event_name, event->data1, event->data2); +#endif + + if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED || + event->event == SDL_WINDOWEVENT_RESIZED || + event->event == SDL_WINDOWEVENT_EXPOSED) + SDLRedrawWindow(); + +#if 0 + if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) + { + // if game started in fullscreen mode, window will also get fullscreen size + if (!video.fullscreen_enabled && video.fullscreen_initial) + { + SDLSetWindowScaling(setup.window_scaling_percent); + + // only do this correction once + video.fullscreen_initial = FALSE; + } + } +#endif + + if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled) + { +#if 1 + int new_window_width = event->data1; + int new_window_height = event->data2; + + // if window size has changed after resizing, calculate new scaling factor + if (new_window_width != video.window_width || + new_window_height != video.window_height) + { + int new_xpercent = (100 * new_window_width / video.width); + int new_ypercent = (100 * new_window_height / video.height); + + printf("::: RESIZED from %d, %d to %d, %d\n", + video.window_width, video.window_height, + new_window_width, new_window_height); + + setup.window_scaling_percent = video.window_scaling_percent = + MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), + MAX_WINDOW_SCALING_PERCENT); + + video.window_width = new_window_width; + video.window_height = new_window_height; + + printf("::: setup.window_scaling_percent set to %d\n", + setup.window_scaling_percent); + + if (game_status == GAME_MODE_SETUP) + RedrawSetupScreenAfterFullscreenToggle(); + } +#else + // prevent slightly wrong scaling factor due to rounding differences + float scaling_factor = (float)setup.window_scaling_percent / 100; + int old_xsize = (int)(scaling_factor * video.width); + int old_ysize = (int)(scaling_factor * video.height); + int new_xsize = event->data1; + int new_ysize = event->data2; + + // window size is unchanged when going from fullscreen to window mode, + // but reverse calculation of scaling factor might result in a scaling + // factor that is slightly different due to rounding differences; + // therefore compare old/new window size and not old/new scaling factor + if (old_xsize != new_xsize || + old_ysize != new_ysize) + { + int new_xpercent = (100 * new_xsize / video.width); + int new_ypercent = (100 * new_ysize / video.height); + + setup.window_scaling_percent = MIN(new_xpercent, new_ypercent); + + if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; + else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; + + printf("::: setup.window_scaling_percent set to %d\n", + setup.window_scaling_percent); + } +#endif + } +} + +#if 1 + +#define NUM_TOUCH_FINGERS 3 + +static struct +{ + boolean touched; + SDL_FingerID finger_id; + int counter; + Key key; +} touch_info[NUM_TOUCH_FINGERS]; + void HandleFingerEvent(FingerEvent *event) { - // #if DEBUG_EVENTS + static Key motion_key_x = KSYM_UNDEFINED; + static Key motion_key_y = KSYM_UNDEFINED; + 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; + float event_x = event->x; + float event_y = event->y; + +#if 1 +#if DEBUG_EVENTS Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", - (event->type == EVENT_FINGERPRESS ? "pressed" : - event->type == EVENT_FINGERRELEASE ? "released" : "moved"), + event->type == EVENT_FINGERPRESS ? "pressed" : + event->type == EVENT_FINGERRELEASE ? "released" : "moved", event->touchId, event->fingerId, event->x, event->y, event->dx, event->dy, event->pressure); - // #endif +#endif +#endif + if (game_status != GAME_MODE_PLAYING) + return; + + if (1) + { + int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : + KEY_PRESSED); #if 1 - CloseAllAndExit(0); + Key key = (event->x < 1.0 / 3.0 ? + (event->y < 1.0 / 2.0 ? setup.input[0].key.snap : + setup.input[0].key.drop) : + event->x > 2.0 / 3.0 ? + (event->y < 1.0 / 3.0 ? setup.input[0].key.up : + event->y > 2.0 / 3.0 ? setup.input[0].key.down : + event->x < 5.0 / 6.0 ? setup.input[0].key.left : + setup.input[0].key.right) : + KSYM_UNDEFINED); + 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)"); + 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 : + event->x < 1.0 / 3.0 ? setup.input[0].key.left : + event->x > 2.0 / 3.0 ? setup.input[0].key.right : + setup.input[0].key.snap); +#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].touched && + touch_info[i].finger_id == event->fingerId) + { + // Error(ERR_DEBUG, "MARK 1: %d", i); + + break; + } + } + + if (i >= NUM_TOUCH_FINGERS) + { + if (key_status == KEY_PRESSED) + { + int oldest_pos = 0, oldest_counter = touch_info[0].counter; + + // unknown finger id -- get new, empty slot, if available + for (i = 0; i < NUM_TOUCH_FINGERS; i++) + { + if (touch_info[i].counter < oldest_counter) + { + oldest_pos = i; + oldest_counter = touch_info[i].counter; + + // Error(ERR_DEBUG, "MARK 2: %d", i); + } + + 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 + { + // 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); + } + } + } + + if (i < NUM_TOUCH_FINGERS) + { + if (key_status == KEY_PRESSED) + { + 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; + } + 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; + } + } + +#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; + } + if (event->type == EVENT_FINGERPRESS) - button_status = event->button; + { + if (event_x > 1.0 / 3.0) + { + // motion area + + motion_id = event->fingerId; + + motion_x1 = event_x; + motion_y1 = event_y; + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- MOVE STARTED (WAIT) ----------"); + } + else + { + // button area + + button_id = event->fingerId; + + button_x1 = event_x; + button_y1 = event_y; + + button_key = setup.input[0].key.snap; + + HandleKey(button_key, KEY_PRESSED); + + Error(ERR_DEBUG, "---------- SNAP STARTED ----------"); + } + } + else if (event->type == EVENT_FINGERRELEASE) + { + if (event->fingerId == motion_id) + { + motion_id = 0; + + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- MOVE STOPPED ----------"); + } + else if (event->fingerId == button_id) + { + button_id = 0; + + if (button_key != KSYM_UNDEFINED) + HandleKey(button_key, KEY_RELEASED); + + button_key = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- SNAP STOPPED ----------"); + } + } + else if (event->type == EVENT_FINGERMOTION) + { + if (event->fingerId == motion_id) + { + float distance_x = ABS(event_x - motion_x1); + float distance_y = ABS(event_y - motion_y1); + Key new_motion_key_x = (event_x < motion_x1 ? setup.input[0].key.left : + event_x > motion_x1 ? setup.input[0].key.right : + KSYM_UNDEFINED); + Key new_motion_key_y = (event_y < motion_y1 ? setup.input[0].key.up : + event_y > motion_y1 ? setup.input[0].key.down : + KSYM_UNDEFINED); + + if (distance_x < trigger_distance / 2 || + distance_x < distance_y) + new_motion_key_x = KSYM_UNDEFINED; + + if (distance_y < trigger_distance / 2 || + distance_y < distance_x) + new_motion_key_y = KSYM_UNDEFINED; + + if (distance_x > trigger_distance || + distance_y > trigger_distance) + { + if (new_motion_key_x != motion_key_x) + { + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (new_motion_key_x != KSYM_UNDEFINED) + HandleKey(new_motion_key_x, KEY_PRESSED); + } + + if (new_motion_key_y != motion_key_y) + { + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + if (new_motion_key_y != KSYM_UNDEFINED) + HandleKey(new_motion_key_y, KEY_PRESSED); + } + + motion_x1 = event_x; + motion_y1 = event_y; + + motion_key_x = new_motion_key_x; + motion_key_y = new_motion_key_y; + + Error(ERR_DEBUG, "---------- MOVE STARTED (MOVE) ----------"); + } + } + else if (event->fingerId == button_id) + { + 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 (button_key == setup.input[0].key.snap) + HandleKey(button_key, KEY_RELEASED); + + button_x1 = event_x; + button_y1 = event_y; + + button_key = setup.input[0].key.drop; + + HandleKey(button_key, KEY_PRESSED); + + Error(ERR_DEBUG, "---------- DROP STARTED ----------"); + } + } + } +} + +#else + +void HandleFingerEvent(FingerEvent *event) +{ +#if 0 + static int num_events = 0; + int max_events = 10; +#endif + +#if 0 +#if DEBUG_EVENTS + Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", + event->type == EVENT_FINGERPRESS ? "pressed" : + event->type == EVENT_FINGERRELEASE ? "released" : "moved", + event->touchId, + event->fingerId, + event->x, event->y, + event->dx, event->dy, + event->pressure); +#endif +#endif + +#if 0 + int x = (int)(event->x * video.width); + int y = (int)(event->y * video.height); + int button = MB_LEFTBUTTON; + + Error(ERR_DEBUG, "=> screen x/y %d/%d", x, y); +#endif + +#if 0 + if (++num_events >= max_events) + CloseAllAndExit(0); +#endif + +#if 1 +#if 0 + if (event->type == EVENT_FINGERPRESS || + event->type == EVENT_FINGERMOTION) + button_status = button; else button_status = MB_RELEASED; - HandleButton(event->x, event->y, button_status, event->button); + int max_x = SX + SXSIZE; + int max_y = SY + SYSIZE; +#endif + +#if 1 + if (game_status == GAME_MODE_PLAYING) +#else + if (game_status == GAME_MODE_PLAYING && + x < max_x) +#endif + { + int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : + KEY_PRESSED); +#if 1 + Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up : + event->y > 2.0 / 3.0 ? setup.input[0].key.down : + event->x < 1.0 / 3.0 ? setup.input[0].key.left : + event->x > 2.0 / 3.0 ? setup.input[0].key.right : + setup.input[0].key.drop); +#else + Key key = (y < max_y / 3 ? setup.input[0].key.up : + y > 2 * max_y / 3 ? setup.input[0].key.down : + x < max_x / 3 ? setup.input[0].key.left : + x > 2 * max_x / 3 ? setup.input[0].key.right : + setup.input[0].key.drop); +#endif + + Error(ERR_DEBUG, "=> key == %d, key_status == %d", key, key_status); + + HandleKey(key, key_status); + } + else + { +#if 0 + Error(ERR_DEBUG, "::: button_status == %d, button == %d\n", + button_status, button); + + HandleButton(x, y, button_status, button); +#endif + } #endif } + +#endif + +static boolean checkTextInputKeyModState() +{ + // when playing, only handle raw key events and ignore text input + if (game_status == GAME_MODE_PLAYING) + return FALSE; + + return ((GetKeyModState() & KMOD_TextInput) != KMOD_None); +} + +void HandleTextEvent(TextEvent *event) +{ + char *text = event->text; + Key key = getKeyFromKeyName(text); + +#if DEBUG_EVENTS + Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s) [%04x]", + text, + strlen(text), + text[0], (int)(text[0]), + key, + getKeyNameFromKey(key), + GetKeyModState()); +#endif + + // if (game_status != GAME_MODE_PLAYING && GetKeyModState() != KMOD_None) + /* + if (game_status != GAME_MODE_PLAYING && + (GetKeyModState() & KMOD_TextInput) != KMOD_None) + */ + if (checkTextInputKeyModState()) + { + HandleKey(key, KEY_PRESSED); + HandleKey(key, KEY_RELEASED); + } +} #endif void HandleKeyEvent(KeyEvent *event) { - int key_status = (event->type==EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); + int key_status = (event->type == EVENT_KEYPRESS ? KEY_PRESSED : KEY_RELEASED); boolean with_modifiers = (game_status == GAME_MODE_PLAYING ? FALSE : TRUE); Key key = GetEventKey(event, with_modifiers); Key keymod = (with_modifiers ? GetEventKey(event, FALSE) : key); #if DEBUG_EVENTS - printf("::: KEY EVENT: %d %s\n", GetEventKey(event, TRUE), - event->type == EVENT_KEYPRESS ? "pressed" : "released"); + Error(ERR_DEBUG, "KEY EVENT: key was %s, keysym.scancode == %d, keysym.sym == %d, keymod = %d, GetKeyModState() = 0x%04x, resulting key == %d (%s)", + event->type == EVENT_KEYPRESS ? "pressed" : "released", + event->keysym.scancode, + event->keysym.sym, + keymod, + GetKeyModState(), + key, + getKeyNameFromKey(key)); +#endif + +#if 0 + if (key == KSYM_Menu) + Error(ERR_DEBUG, "menu key pressed"); + else if (key == KSYM_Back) + Error(ERR_DEBUG, "back key pressed"); +#endif + +#if defined(PLATFORM_ANDROID) + // always map the "back" button to the "escape" key on Android devices + if (key == KSYM_Back) + key = KSYM_Escape; #endif HandleKeyModState(keymod, key_status); + +#if defined(TARGET_SDL2) + + // if (game_status == GAME_MODE_PLAYING || GetKeyModState() == KMOD_None) + /* + if (game_status == GAME_MODE_PLAYING || + (GetKeyModState() & KMOD_TextInput) == KMOD_None) + */ + if (!checkTextInputKeyModState()) + HandleKey(key, key_status); +#else HandleKey(key, key_status); +#endif } void HandleFocusEvent(FocusChangeEvent *event) @@ -498,16 +1081,29 @@ 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)) return; +#if 0 + Error(ERR_DEBUG, "::: game_status == %d", game_status); +#endif + switch (game_status) { case GAME_MODE_TITLE: @@ -593,7 +1189,7 @@ static void HandleKeysSpecial(Key key) cheat_input[cheat_input_len] = '\0'; #if DEBUG_EVENTS - printf("::: '%s' [%d]\n", cheat_input, cheat_input_len); + Error(ERR_DEBUG, "SPECIAL KEY '%s' [%d]\n", cheat_input, cheat_input_len); #endif if (game_status == GAME_MODE_MAIN) @@ -850,7 +1446,34 @@ void HandleKey(Key key, int key_status) { setup.fullscreen = !setup.fullscreen; - ToggleFullscreenIfNeeded(); +#if 0 + printf("::: %d\n", setup.window_scaling_percent); +#endif + + ToggleFullscreenOrChangeWindowScalingIfNeeded(); + + if (game_status == GAME_MODE_SETUP) + RedrawSetupScreenAfterFullscreenToggle(); + + return; + } + + if ((key == KSYM_minus || key == KSYM_plus || key == KSYM_0) && + (GetKeyModState() & KMOD_Alt) && video.window_scaling_available && + !video.fullscreen_enabled) + { + if (key == KSYM_0) + setup.window_scaling_percent = STD_WINDOW_SCALING_PERCENT; + else + setup.window_scaling_percent += + (key == KSYM_minus ? -1 : +1) * STEP_WINDOW_SCALING_PERCENT; + + if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; + else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; + + ToggleFullscreenOrChangeWindowScalingIfNeeded(); if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); @@ -1139,7 +1762,13 @@ void HandleNoEvent() { HandleButton(0, 0, -button_status, button_status); +#if 0 return; +#endif + } + else + { + HandleJoystick(); } #if defined(NETWORK_AVALIABLE) @@ -1147,7 +1776,28 @@ void HandleNoEvent() HandleNetworking(); #endif - HandleJoystick(); + switch (game_status) + { + case GAME_MODE_MAIN: + DrawPreviewLevelAnimation(); + DoAnimation(); + break; + + case GAME_MODE_LEVELS: + case GAME_MODE_LEVELNR: + case GAME_MODE_SETUP: + case GAME_MODE_INFO: + case GAME_MODE_SCORES: + DoAnimation(); + break; + + case GAME_MODE_EDITOR: + HandleLevelEditorIdle(); + break; + + default: + break; + } } static int HandleJoystickForAllPlayers() @@ -1224,18 +1874,20 @@ void HandleJoystick() HandleHallOfFame(0, 0, dx, dy, !newbutton); break; +#if 0 case GAME_MODE_EDITOR: HandleLevelEditorIdle(); break; +#endif case GAME_MODE_PLAYING: if (tape.playing || keyboard) newbutton = ((joy & JOY_BUTTON) != 0); #if 0 - if (local_player->LevelSolved_GameEnd && newbutton) + if (newbutton && local_player->LevelSolved_GameEnd) #else - if (AllPlayersGone && newbutton) + if (newbutton && AllPlayersGone) #endif { GameEnd();