X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=9348533aaeed0e42d6e0f4a8107de44db1805c37;hp=b94e57c5cbfbce47c600abc665a2ac96c09f3439;hb=c271d9388070fd4ae23f7b75abab9045bd81bb73;hpb=85019a08c195ac31e548b0549053fbc9f71b427f diff --git a/src/events.c b/src/events.c index b94e57c5..9348533a 100644 --- a/src/events.c +++ b/src/events.c @@ -74,6 +74,9 @@ static int FilterEvents(const Event *event) { ((MotionEvent *)event)->x -= video.screen_xoffset; ((MotionEvent *)event)->y -= video.screen_yoffset; + + gfx.mouse_x = ((MotionEvent *)event)->x; + gfx.mouse_y = ((MotionEvent *)event)->y; } // non-motion events are directly passed to event handler functions @@ -1742,7 +1745,7 @@ void HandleButton(int mx, int my, int button, int button_nr) !virtual_button_pressed)); #endif - if (HandleGlobalAnimClicks(mx, my, button)) + if (HandleGlobalAnimClicks(mx, my, button, FALSE)) { // do not handle this button event anymore return; // force mouse event not to be handled at all @@ -2246,7 +2249,7 @@ void HandleKey(Key key, int key_status) if (HandleGlobalAnimClicks(-1, -1, (key == KSYM_space || key == KSYM_Return || - key == KSYM_Escape))) + key == KSYM_Escape), TRUE)) { // do not handle this key event anymore if (key != KSYM_Escape) // always allow ESC key to be handled @@ -2557,7 +2560,7 @@ void HandleJoystick(void) int dy = (up ? -1 : down ? 1 : 0); boolean use_delay_value_first = (joytest != joytest_last); - if (HandleGlobalAnimClicks(-1, -1, newbutton)) + if (HandleGlobalAnimClicks(-1, -1, newbutton, FALSE)) { // do not handle this button event anymore return;