mirror of
https://github.com/mpv-player/mpv
synced 2024-12-27 09:32:40 +00:00
0c7978cf9c
If the mpv window is unfocus, clicking on the OSC should focus the
window (done by the window manager) and allow interaction with the OSC.
But somehow X sends a spurious LeaveNotify event, immediately followed
by an EnterNotify event. This happens at least with IceWM. The result is
that the OSC will disappear (due to receiving MOUSE_LEAVE). The OSC will
stay invisible, because EnterNotify isn't handled, and there's nothing
that could make the OSC appear again.
Solve this by handling EnterNotify. We cause a redundant MOUSE_MOVE
event to be sent, which triggers the code to make the OSC visible. We
have to remove the code from input.c, which ignores redundant mouse move
events.
Since the code ignoring redundant mouse move events is still needed on
Windows, move that code to w32_common.c. The need for this is documented
in the code, also see commit 03fd2fe. (The original idea was to save
some code by having this code in the core, but now it turns out that
this didn't quite work out.)
69 lines
1.7 KiB
C
69 lines
1.7 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_W32_COMMON_H
|
|
#define MPLAYER_W32_COMMON_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <windows.h>
|
|
|
|
struct vo_w32_state {
|
|
HWND window;
|
|
|
|
// last non-fullscreen extends (updated only on fullscreen or on initialization)
|
|
int prev_width;
|
|
int prev_height;
|
|
int prev_x;
|
|
int prev_y;
|
|
|
|
// whether the window position and size were intialized
|
|
bool window_bounds_initialized;
|
|
|
|
bool current_fs;
|
|
|
|
int window_x;
|
|
int window_y;
|
|
|
|
// video size
|
|
uint32_t o_dwidth;
|
|
uint32_t o_dheight;
|
|
|
|
bool disable_screensaver;
|
|
bool cursor_visible;
|
|
int event_flags;
|
|
int mon_cnt;
|
|
int mon_id;
|
|
|
|
BOOL tracking;
|
|
TRACKMOUSEEVENT trackEvent;
|
|
|
|
int mouse_x;
|
|
int mouse_y;
|
|
};
|
|
|
|
struct vo;
|
|
|
|
int vo_w32_init(struct vo *vo);
|
|
void vo_w32_uninit(struct vo *vo);
|
|
int vo_w32_control(struct vo *vo, int *events, int request, void *arg);
|
|
int vo_w32_check_events(struct vo *vo);
|
|
int vo_w32_config(struct vo *vo, uint32_t, uint32_t, uint32_t);
|
|
|
|
#endif /* MPLAYER_W32_COMMON_H */
|