diff options
| -rw-r--r-- | DOCS/man/input.rst | 9 | ||||
| -rw-r--r-- | video/out/w32_common.c | 52 |
2 files changed, 58 insertions, 3 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index 8e61c22daa..c7a9d26cac 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1492,7 +1492,10 @@ Property list ``display-names`` Names of the displays that the mpv window covers. On X11, these - are the xrandr names (LVDS1, HDMI1, DP1, VGA1, etc.). + are the xrandr names (LVDS1, HDMI1, DP1, VGA1, etc.). On Windows, these + are the GDI names (\\.\DISPLAY1, \\.\DISPLAY2, etc.) and the first display + in the list will be the one that Windows considers associated with the + window (as determined by the MonitorFromWindow API.) ``display-fps`` (RW) The refresh rate of the current display. Currently, this is the lowest FPS @@ -1528,12 +1531,12 @@ Property list ``dvb-channel`` (W) Pair of integers: card,channel of current DVB stream. - Can be switched to switch to another channel on the same card. + Can be switched to switch to another channel on the same card. ``dvb-channel-name`` (RW) Name of current DVB program. On write, a channel-switch to the named channel on the same - card is performed. Can also be used for channel switching. + card is performed. Can also be used for channel switching. ``sub-text`` Return the current subtitle text. Formatting is stripped. If a subtitle diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 736da59dff..f4fbb20ea9 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -722,6 +722,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, ClientToScreen(w32->window, &p); w32->window_x = p.x; w32->window_y = p.y; + + // Window may intersect with new monitors (see VOCTRL_GET_DISPLAY_NAMES) + signal_events(w32, VO_EVENT_WIN_STATE); + update_display_info(w32); // if we moved between monitors MP_VERBOSE(w32, "move window: %d:%d\n", w32->window_x, w32->window_y); break; @@ -1482,6 +1486,51 @@ fail: return 0; } +struct disp_names_data { + HMONITOR assoc; + int count; + char **names; +}; + +static BOOL CALLBACK disp_names_proc(HMONITOR mon, HDC dc, LPRECT r, LPARAM p) +{ + struct disp_names_data *data = (struct disp_names_data*)p; + + // get_disp_names() adds data->assoc to the list, so skip it here + if (mon == data->assoc) + return TRUE; + + MONITORINFOEXW mi = { .cbSize = sizeof mi }; + if (GetMonitorInfoW(mon, (MONITORINFO*)&mi)) { + MP_TARRAY_APPEND(NULL, data->names, data->count, + mp_to_utf8(NULL, mi.szDevice)); + } + return TRUE; +} + +static char **get_disp_names(struct vo_w32_state *w32) +{ + // Get the client area of the window in screen space + RECT rect = { 0 }; + GetClientRect(w32->window, &rect); + MapWindowPoints(w32->window, NULL, (POINT*)&rect, 2); + + struct disp_names_data data = { .assoc = w32->monitor }; + + // Make sure the monitor that Windows considers to be associated with the + // window is first in the list + MONITORINFOEXW mi = { .cbSize = sizeof mi }; + if (GetMonitorInfoW(data.assoc, (MONITORINFO*)&mi)) { + MP_TARRAY_APPEND(NULL, data.names, data.count, + mp_to_utf8(NULL, mi.szDevice)); + } + + // Get the names of the other monitors that intersect the client rect + EnumDisplayMonitors(NULL, &rect, disp_names_proc, (LPARAM)&data); + MP_TARRAY_APPEND(NULL, data.names, data.count, NULL); + return data.names; +} + static int gui_thread_control(struct vo_w32_state *w32, int request, void *arg) { switch (request) { @@ -1563,6 +1612,9 @@ static int gui_thread_control(struct vo_w32_state *w32, int request, void *arg) update_display_info(w32); *(double*) arg = w32->display_fps; return VO_TRUE; + case VOCTRL_GET_DISPLAY_NAMES: + *(char ***)arg = get_disp_names(w32); + return VO_TRUE; case VOCTRL_GET_ICC_PROFILE: update_display_info(w32); if (w32->color_profile) { |