diff options
Diffstat (limited to 'libvo/w32_common.c')
| -rw-r--r-- | libvo/w32_common.c | 679 |
1 files changed, 409 insertions, 270 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 475327ce5c..ebe17bd154 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -18,11 +18,11 @@ #include <stdio.h> #include <limits.h> +#include <assert.h> #include <windows.h> #include <windowsx.h> -// To get "#define vo_ontop global_vo->opts->vo_ontop" etc -#include "old_vo_defines.h" +#include "options.h" #include "input/keycodes.h" #include "input/input.h" #include "mp_msg.h" @@ -30,47 +30,17 @@ #include "aspect.h" #include "w32_common.h" #include "mp_fifo.h" - -#ifndef WM_XBUTTONDOWN -# define WM_XBUTTONDOWN 0x020B -# define WM_XBUTTONUP 0x020C -# define WM_XBUTTONDBLCLK 0x020D -#endif - -#ifndef MONITOR_DEFAULTTOPRIMARY -#define MONITOR_DEFAULTTOPRIMARY 1 -#endif +#include "osdep/io.h" +#include "talloc.h" #define WIN_ID_TO_HWND(x) ((HWND)(uint32_t)(x)) -static const char classname[] = "MPlayer - The Movie Player"; -int vo_vm = 0; - -static int depthonscreen; -// last non-fullscreen extends -static int prev_width; -static int prev_height; -static int prev_x; -static int prev_y; - -static uint32_t o_dwidth; -static uint32_t o_dheight; - -static HINSTANCE hInstance; -#define vo_window vo_w32_window -HWND vo_window = 0; -/** HDC used when rendering to a device instead of window */ -static HDC dev_hdc; -static int event_flags; -static int mon_cnt; - -static HMONITOR (WINAPI* myMonitorFromWindow)(HWND, DWORD); -static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO); -static BOOL (WINAPI* myEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM); +static const wchar_t classname[] = L"mplayer2"; static const struct mp_keymap vk_map[] = { // special keys - {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB}, {VK_CONTROL, KEY_CTRL}, + {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB}, + {VK_RETURN, KEY_ENTER}, {VK_PAUSE, KEY_PAUSE}, {VK_SNAPSHOT, KEY_PRINT}, // cursor keys {VK_LEFT, KEY_LEFT}, {VK_UP, KEY_UP}, {VK_RIGHT, KEY_RIGHT}, {VK_DOWN, KEY_DOWN}, @@ -82,7 +52,7 @@ static const struct mp_keymap vk_map[] = { // F-keys {VK_F1, KEY_F+1}, {VK_F2, KEY_F+2}, {VK_F3, KEY_F+3}, {VK_F4, KEY_F+4}, {VK_F5, KEY_F+5}, {VK_F6, KEY_F+6}, {VK_F7, KEY_F+7}, {VK_F8, KEY_F+8}, - {VK_F9, KEY_F+9}, {VK_F10, KEY_F+10}, {VK_F11, KEY_F+11}, {VK_F1, KEY_F+12}, + {VK_F9, KEY_F+9}, {VK_F10, KEY_F+10}, {VK_F11, KEY_F+11}, {VK_F12, KEY_F+12}, // numpad {VK_NUMPAD0, KEY_KP0}, {VK_NUMPAD1, KEY_KP1}, {VK_NUMPAD2, KEY_KP2}, {VK_NUMPAD3, KEY_KP3}, {VK_NUMPAD4, KEY_KP4}, {VK_NUMPAD5, KEY_KP5}, @@ -92,47 +62,116 @@ static const struct mp_keymap vk_map[] = { {0, 0} }; -static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - RECT r; - POINT p; - int mpkey; +static void add_window_borders(HWND hwnd, RECT *rc) +{ + AdjustWindowRect(rc, GetWindowLong(hwnd, GWL_STYLE), 0); +} + +// basically a reverse AdjustWindowRect (win32 doesn't appear to have this) +static void subtract_window_borders(HWND hwnd, RECT *rc) +{ + RECT b = { 0, 0, 0, 0 }; + add_window_borders(hwnd, &b); + rc->left -= b.left; + rc->top -= b.top; + rc->right -= b.right; + rc->bottom -= b.bottom; +} + +// turn a WMSZ_* input value in v into the border that should be resized +// returns: 0=left, 1=top, 2=right, 3=bottom, -1=undefined +static int get_resize_border(int v) { + switch (v) { + case WMSZ_LEFT: return 3; + case WMSZ_TOP: return 2; + case WMSZ_RIGHT: return 3; + case WMSZ_BOTTOM: return 2; + case WMSZ_TOPLEFT: return 1; + case WMSZ_TOPRIGHT: return 1; + case WMSZ_BOTTOMLEFT: return 3; + case WMSZ_BOTTOMRIGHT: return 3; + default: return -1; + } +} + +static bool key_state(struct vo *vo, int vk) +{ + return GetKeyState(vk) & 0x8000; +} + +static int mod_state(struct vo *vo) +{ + int res = 0; + if (key_state(vo, VK_CONTROL)) + res |= KEY_MODIFIER_CTRL; + if (key_state(vo, VK_SHIFT)) + res |= KEY_MODIFIER_SHIFT; + if (key_state(vo, VK_MENU)) + res |= KEY_MODIFIER_ALT; + return res; +} + +static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, + LPARAM lParam) +{ + if (message == WM_NCCREATE) { + CREATESTRUCT *cs = (void*)lParam; + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)cs->lpCreateParams); + } + struct vo *vo = (void*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + // message before WM_NCCREATE, pray to Raymond Chen that it's not important + if (!vo) + return DefWindowProcW(hWnd, message, wParam, lParam); + struct vo_w32_state *w32 = vo->w32; + switch (message) { case WM_ERASEBKGND: // no need to erase background seperately return 1; case WM_PAINT: - event_flags |= VO_EVENT_EXPOSE; + w32->event_flags |= VO_EVENT_EXPOSE; break; - case WM_MOVE: - event_flags |= VO_EVENT_MOVE; - p.x = 0; - p.y = 0; - ClientToScreen(vo_window, &p); - vo_dx = p.x; - vo_dy = p.y; + case WM_MOVE: { + w32->event_flags |= VO_EVENT_MOVE; + POINT p = {0}; + ClientToScreen(w32->window, &p); + w32->window_x = p.x; + w32->window_y = p.y; + mp_msg(MSGT_VO, MSGL_V, "[vo] move window: %d:%d\n", + w32->window_x, w32->window_y); break; - case WM_SIZE: - event_flags |= VO_EVENT_RESIZE; - GetClientRect(vo_window, &r); - vo_dwidth = r.right; - vo_dheight = r.bottom; + } + case WM_SIZE: { + w32->event_flags |= VO_EVENT_RESIZE; + RECT r; + GetClientRect(w32->window, &r); + vo->dwidth = r.right; + vo->dheight = r.bottom; + mp_msg(MSGT_VO, MSGL_V, "[vo] resize window: %d:%d\n", + vo->dwidth, vo->dheight); break; - case WM_WINDOWPOSCHANGING: + } + case WM_SIZING: if (vo_keepaspect && !vo_fs && WinID < 0) { - WINDOWPOS *wpos = (WINDOWPOS*)lParam; - int xborder, yborder; - r.left = r.top = 0; - r.right = wpos->cx; - r.bottom = wpos->cy; - AdjustWindowRect(&r, GetWindowLong(vo_window, GWL_STYLE), 0); - xborder = (r.right - r.left) - wpos->cx; - yborder = (r.bottom - r.top) - wpos->cy; - wpos->cx -= xborder; wpos->cy -= yborder; - aspect_fit(global_vo, &wpos->cx, &wpos->cy, wpos->cx, wpos->cy); - wpos->cx += xborder; wpos->cy += yborder; + RECT *rc = (RECT*)lParam; + // get client area of the windows if it had the rect rc + // (subtracting the window borders) + RECT r = *rc; + subtract_window_borders(w32->window, &r); + int c_w = r.right - r.left, c_h = r.bottom - r.top; + float aspect = vo->aspdat.asp; + int d_w = c_h * aspect - c_w; + int d_h = c_w / aspect - c_h; + int d_corners[4] = { d_w, d_h, -d_w, -d_h }; + int corners[4] = { rc->left, rc->top, rc->right, rc->bottom }; + int corner = get_resize_border(wParam); + if (corner >= 0) + corners[corner] -= d_corners[corner]; + *rc = (RECT) { corners[0], corners[1], corners[2], corners[3] }; + return TRUE; } - return 0; + break; case WM_CLOSE: - mplayer_put_key(KEY_CLOSE_WIN); + mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN); break; case WM_SYSCOMMAND: switch (wParam) { @@ -143,16 +182,42 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l } break; case WM_KEYDOWN: - mpkey = lookup_keymap_table(vk_map, wParam); + case WM_SYSKEYDOWN: { + int mpkey = lookup_keymap_table(vk_map, wParam); if (mpkey) - mplayer_put_key(mpkey); + mplayer_put_key(vo->key_fifo, mpkey | mod_state(vo)); + if (wParam == VK_F10) + return 0; break; + } case WM_CHAR: - mplayer_put_key(wParam); + case WM_SYSCHAR: { + int mods = mod_state(vo); + int code = wParam; + // Windows enables Ctrl+Alt when AltGr (VK_RMENU) is pressed. + // E.g. AltGr+9 on a German keyboard would yield Ctrl+Alt+[ + // Warning: wine handles this differently. Don't test this on wine! + if (key_state(vo, VK_RMENU)) + mods &= ~(KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT); + // Apparently Ctrl+A to Ctrl+Z is special cased, and produces + // character codes from 1-26. Work it around. + // Also, enter/return (including the keypad variant) and CTRL+J both + // map to wParam==10. As a workaround, check VK_RETURN to + // distinguish these two key combinations. + if ((mods & KEY_MODIFIER_CTRL) && code >= 1 && code <= 26 + && !key_state(vo, VK_RETURN)) + code = code - 1 + (mods & KEY_MODIFIER_SHIFT ? 'A' : 'a'); + if (code >= 32 && code < (1<<21)) { + mplayer_put_key(vo->key_fifo, code | mods); + // At least with Alt+char, not calling DefWindowProcW stops + // Windows from emitting a beep. + return 0; + } break; + } case WM_LBUTTONDOWN: if (!vo_nomouse_input && (vo_fs || (wParam & MK_CONTROL))) { - mplayer_put_key(MOUSE_BTN0); + mplayer_put_key(vo->key_fifo, MOUSE_BTN0 | mod_state(vo)); break; } if (!vo_fs) { @@ -163,36 +228,36 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l break; case WM_MBUTTONDOWN: if (!vo_nomouse_input) - mplayer_put_key(MOUSE_BTN1); + mplayer_put_key(vo->key_fifo, MOUSE_BTN1 | mod_state(vo)); break; case WM_RBUTTONDOWN: if (!vo_nomouse_input) - mplayer_put_key(MOUSE_BTN2); + mplayer_put_key(vo->key_fifo, MOUSE_BTN2 | mod_state(vo)); break; case WM_MOUSEMOVE: - vo_mouse_movement(global_vo, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); + vo_mouse_movement(vo, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); break; case WM_MOUSEWHEEL: if (!vo_nomouse_input) { int x = GET_WHEEL_DELTA_WPARAM(wParam); if (x > 0) - mplayer_put_key(MOUSE_BTN3); + mplayer_put_key(vo->key_fifo, MOUSE_BTN3 | mod_state(vo)); else - mplayer_put_key(MOUSE_BTN4); + mplayer_put_key(vo->key_fifo, MOUSE_BTN4 | mod_state(vo)); } break; case WM_XBUTTONDOWN: if (!vo_nomouse_input) { int x = HIWORD(wParam); if (x == 1) - mplayer_put_key(MOUSE_BTN5); + mplayer_put_key(vo->key_fifo, MOUSE_BTN5 | mod_state(vo)); else // if (x == 2) - mplayer_put_key(MOUSE_BTN6); + mplayer_put_key(vo->key_fifo, MOUSE_BTN6 | mod_state(vo)); } break; } - return DefWindowProc(hWnd, message, wParam, lParam); + return DefWindowProcW(hWnd, message, wParam, lParam); } /** @@ -200,10 +265,6 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l * * This function should be placed inside libvo's function "check_events". * - * Global libvo variables changed: - * vo_dwidth: new window client area width - * vo_dheight: new window client area height - * * \return int with these flags possibly set, take care to handle in the right order * if it matters in your driver: * @@ -212,48 +273,53 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l * VO_EVENT_EXPOSE = The window was exposed. Call e.g. flip_frame() to redraw * the window if the movie is paused. */ -int vo_w32_check_events(void) { +int vo_w32_check_events(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; MSG msg; - event_flags = 0; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { + w32->event_flags = 0; + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } if (WinID >= 0) { BOOL res; RECT r; POINT p; - res = GetClientRect(vo_window, &r); - if (res && (r.right != vo_dwidth || r.bottom != vo_dheight)) { - vo_dwidth = r.right; vo_dheight = r.bottom; - event_flags |= VO_EVENT_RESIZE; + res = GetClientRect(w32->window, &r); + if (res && (r.right != vo->dwidth || r.bottom != vo->dheight)) { + vo->dwidth = r.right; vo->dheight = r.bottom; + w32->event_flags |= VO_EVENT_RESIZE; } p.x = 0; p.y = 0; - ClientToScreen(vo_window, &p); - if (p.x != vo_dx || p.y != vo_dy) { - vo_dx = p.x; vo_dy = p.y; - event_flags |= VO_EVENT_MOVE; + ClientToScreen(w32->window, &p); + if (p.x != w32->window_x || p.y != w32->window_y) { + w32->window_x = p.x; w32->window_y = p.y; + w32->event_flags |= VO_EVENT_MOVE; } res = GetClientRect(WIN_ID_TO_HWND(WinID), &r); - if (res && (r.right != vo_dwidth || r.bottom != vo_dheight)) - MoveWindow(vo_window, 0, 0, r.right, r.bottom, FALSE); + if (res && (r.right != vo->dwidth || r.bottom != vo->dheight)) + MoveWindow(w32->window, 0, 0, r.right, r.bottom, FALSE); if (!IsWindow(WIN_ID_TO_HWND(WinID))) // Window has probably been closed, e.g. due to program crash - mplayer_put_key(KEY_CLOSE_WIN); + mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN); } - return event_flags; + return w32->event_flags; } -static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) { +static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) +{ + struct vo *vo = (void*)p; + struct vo_w32_state *w32 = vo->w32; // this defaults to the last screen if specified number does not exist xinerama_x = r->left; xinerama_y = r->top; - vo_screenwidth = r->right - r->left; - vo_screenheight = r->bottom - r->top; - if (mon_cnt == xinerama_screen) + vo->opts->vo_screenwidth = r->right - r->left; + vo->opts->vo_screenheight = r->bottom - r->top; + if (w32->mon_cnt == xinerama_screen) return FALSE; - mon_cnt++; + w32->mon_cnt++; return TRUE; } @@ -271,67 +337,77 @@ static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) { * vo_screenwidth * vo_screenheight */ -void w32_update_xinerama_info(void) { +void w32_update_xinerama_info(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; xinerama_x = xinerama_y = 0; if (xinerama_screen < -1) { int tmp; xinerama_x = GetSystemMetrics(SM_XVIRTUALSCREEN); xinerama_y = GetSystemMetrics(SM_YVIRTUALSCREEN); tmp = GetSystemMetrics(SM_CXVIRTUALSCREEN); - if (tmp) vo_screenwidth = tmp; + if (tmp) vo->opts->vo_screenwidth = tmp; tmp = GetSystemMetrics(SM_CYVIRTUALSCREEN); - if (tmp) vo_screenheight = tmp; - } else if (xinerama_screen == -1 && myMonitorFromWindow && myGetMonitorInfo) { + if (tmp) vo->opts->vo_screenheight = tmp; + } else if (xinerama_screen == -1) { MONITORINFO mi; - HMONITOR m = myMonitorFromWindow(vo_window, MONITOR_DEFAULTTOPRIMARY); + HMONITOR m = MonitorFromWindow(w32->window, MONITOR_DEFAULTTOPRIMARY); mi.cbSize = sizeof(mi); - myGetMonitorInfo(m, &mi); + GetMonitorInfoW(m, &mi); xinerama_x = mi.rcMonitor.left; xinerama_y = mi.rcMonitor.top; - vo_screenwidth = mi.rcMonitor.right - mi.rcMonitor.left; - vo_screenheight = mi.rcMonitor.bottom - mi.rcMonitor.top; - } else if (xinerama_screen > 0 && myEnumDisplayMonitors) { - mon_cnt = 0; - myEnumDisplayMonitors(NULL, NULL, mon_enum, 0); + vo->opts->vo_screenwidth = mi.rcMonitor.right - mi.rcMonitor.left; + vo->opts->vo_screenheight = mi.rcMonitor.bottom - mi.rcMonitor.top; + } else if (xinerama_screen > 0) { + w32->mon_cnt = 0; + EnumDisplayMonitors(NULL, NULL, mon_enum, (LONG_PTR)vo); } - aspect_save_screenres(vo_screenwidth, vo_screenheight); + aspect_save_screenres(vo, vo->opts->vo_screenwidth, + vo->opts->vo_screenheight); } -static void updateScreenProperties(void) { +static void updateScreenProperties(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; DEVMODE dm; dm.dmSize = sizeof dm; dm.dmDriverExtra = 0; dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; if (!EnumDisplaySettings(0, ENUM_CURRENT_SETTINGS, &dm)) { - mp_msg(MSGT_VO, MSGL_ERR, "vo: win32: unable to enumerate display settings!\n"); + mp_msg(MSGT_VO, MSGL_ERR, + "vo: win32: unable to enumerate display settings!\n"); return; } - vo_screenwidth = dm.dmPelsWidth; - vo_screenheight = dm.dmPelsHeight; - depthonscreen = dm.dmBitsPerPel; - w32_update_xinerama_info(); + vo->opts->vo_screenwidth = dm.dmPelsWidth; + vo->opts->vo_screenheight = dm.dmPelsHeight; + w32->depthonscreen = dm.dmBitsPerPel; + w32_update_xinerama_info(vo); } -static void changeMode(void) { +static void changeMode(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; DEVMODE dm; dm.dmSize = sizeof dm; dm.dmDriverExtra = 0; dm.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - dm.dmBitsPerPel = depthonscreen; - dm.dmPelsWidth = vo_screenwidth; - dm.dmPelsHeight = vo_screenheight; + dm.dmBitsPerPel = w32->depthonscreen; + dm.dmPelsWidth = vo->opts->vo_screenwidth; + dm.dmPelsHeight = vo->opts->vo_screenheight; - if (vo_vm) { + if (w32->vm) { int bestMode = -1; int bestScore = INT_MAX; int i; for (i = 0; EnumDisplaySettings(0, i, &dm); ++i) { - int score = (dm.dmPelsWidth - o_dwidth) * (dm.dmPelsHeight - o_dheight); - if (dm.dmBitsPerPel != depthonscreen) continue; - if (dm.dmPelsWidth < o_dwidth) continue; - if (dm.dmPelsHeight < o_dheight) continue; + int score = (dm.dmPelsWidth - w32->o_dwidth) + * (dm.dmPelsHeight - w32->o_dheight); + if (dm.dmBitsPerPel != w32->depthonscreen + || dm.dmPelsWidth < w32->o_dwidth + || dm.dmPelsHeight < w32->o_dheight) + continue; if (score < bestScore) { bestScore = score; @@ -346,60 +422,101 @@ static void changeMode(void) { } } -static void resetMode(void) { - if (vo_vm) - ChangeDisplaySettings(0, 0); +static void resetMode(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; + if (w32->vm) + ChangeDisplaySettings(0, 0); } -static int createRenderingContext(void) { +static DWORD update_style(struct vo *vo, DWORD style) +{ + const DWORD NO_FRAME = WS_POPUP; + const DWORD FRAME = WS_OVERLAPPEDWINDOW | WS_SIZEBOX; + style &= ~(NO_FRAME | FRAME); + style |= (vo_border && !vo_fs) ? FRAME : NO_FRAME; + return style; +} + +// Update the window title, position, size, and border style from vo_* values. +static int reinit_window_state(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; HWND layer = HWND_NOTOPMOST; RECT r; - int style = (vo_border && !vo_fs) ? - (WS_OVERLAPPEDWINDOW | WS_SIZEBOX) : WS_POPUP; if (WinID >= 0) return 1; - if (vo_fs || vo_ontop) layer = HWND_TOPMOST; + wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(vo)); + SetWindowTextW(w32->window, title); + talloc_free(title); + + bool toggle_fs = w32->current_fs != vo_fs; + w32->current_fs = vo_fs; + + DWORD style = update_style(vo, GetWindowLong(w32->window, GWL_STYLE)); + + if (vo_fs || vo->opts->vo_ontop) + layer = HWND_TOPMOST; + + // xxx not sure if this can trigger any unwanted messages (WM_MOVE/WM_SIZE) if (vo_fs) { - changeMode(); + changeMode(vo); while (ShowCursor(0) >= 0) /**/ ; } else { - resetMode(); + resetMode(vo); while (ShowCursor(1) < 0) /**/ ; } - updateScreenProperties(); - ShowWindow(vo_window, SW_HIDE); - SetWindowLong(vo_window, GWL_STYLE, style); + updateScreenProperties(vo); + if (vo_fs) { - prev_width = vo_dwidth; - prev_height = vo_dheight; - prev_x = vo_dx; - prev_y = vo_dy; - vo_dwidth = vo_screenwidth; - vo_dheight = vo_screenheight; - vo_dx = xinerama_x; - vo_dy = xinerama_y; + // Save window position and size when switching to fullscreen. + if (toggle_fs) { + w32->prev_width = vo->dwidth; + w32->prev_height = vo->dheight; + w32->prev_x = w32->window_x; + w32->prev_y = w32->window_y; + mp_msg(MSGT_VO, MSGL_V, "[vo] save window bounds: %d:%d:%d:%d\n", + w32->prev_x, w32->prev_y, w32->prev_width, w32->prev_height); + } + vo->dwidth = vo->opts->vo_screenwidth; + vo->dheight = vo->opts->vo_screenheight; + w32->window_x = xinerama_x; + w32->window_y = xinerama_y; } else { - // make sure there are no "stale" resize events - // that would set vo_d* to wrong values - vo_w32_check_events(); - vo_dwidth = prev_width; - vo_dheight = prev_height; - vo_dx = prev_x; - vo_dy = prev_y; - // HACK around what probably is a windows focus bug: - // when pressing 'f' on the console, then 'f' again to - // return to windowed mode, any input into the video - // window is lost forever. - SetFocus(vo_window); + if (toggle_fs) { + // Restore window position and size when switching from fullscreen. + mp_msg(MSGT_VO, MSGL_V, "[vo] restore window bounds: %d:%d:%d:%d\n", + w32->prev_x, w32->prev_y, w32->prev_width, w32->prev_height); + vo->dwidth = w32->prev_width; + vo->dheight = w32->prev_height; + w32->window_x = w32->prev_x; + w32->window_y = w32->prev_y; + } } - r.left = vo_dx; - r.right = r.left + vo_dwidth; - r.top = vo_dy; - r.bottom = r.top + vo_dheight; - AdjustWindowRect(&r, style, 0); - SetWindowPos(vo_window, layer, r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_SHOWWINDOW); + + r.left = w32->window_x; + r.right = r.left + vo->dwidth; + r.top = w32->window_y; + r.bottom = r.top + vo->dheight; + + SetWindowLong(w32->window, GWL_STYLE, style); + add_window_borders(w32->window, &r); + + mp_msg(MSGT_VO, MSGL_V, "[vo] reset window bounds: %ld:%ld:%ld:%ld\n", + r.left, r.top, r.right - r.left, r.bottom - r.top); + + SetWindowPos(w32->window, layer, r.left, r.top, r.right - r.left, + r.bottom - r.top, SWP_FRAMECHANGED); + // For some reason, moving SWP_SHOWWINDOW to a second call works better + // with wine: returning from fullscreen doesn't cause a bogus resize to + // screen size. + // It's not needed on Windows XP or wine with a virtual desktop. + // It doesn't seem to have any negative effects. + SetWindowPos(w32->window, NULL, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW); + return 1; } @@ -409,16 +526,15 @@ static int createRenderingContext(void) { * This function should be called in libvo's "config" callback. * It configures a window and shows it on the screen. * - * Global libvo variables changed: - * vo_fs - * vo_vm - * * \return 1 - Success, 0 - Failure */ -int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) { +int vo_w32_config(struct vo *vo, uint32_t width, uint32_t height, + uint32_t flags) +{ + struct vo_w32_state *w32 = vo->w32; PIXELFORMATDESCRIPTOR pfd; int pf; - HDC vo_hdc = vo_w32_get_dc(vo_window); + HDC vo_hdc = vo_w32_get_dc(vo, w32->window); memset(&pfd, 0, sizeof pfd); pfd.nSize = sizeof pfd; @@ -432,44 +548,65 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) { pf = ChoosePixelFormat(vo_hdc, &pfd); if (!pf) { mp_msg(MSGT_VO, MSGL_ERR, "vo: win32: unable to select a valid pixel format!\n"); - vo_w32_release_dc(vo_window, vo_hdc); + vo_w32_release_dc(vo, w32->window, vo_hdc); return 0; } SetPixelFormat(vo_hdc, pf, &pfd); - vo_w32_release_dc(vo_window, vo_hdc); + vo_w32_release_dc(vo, w32->window, vo_hdc); // we already have a fully initialized window, so nothing needs to be done if (flags & VOFLAG_HIDDEN) return 1; - // store original size for videomode switching - o_dwidth = width; - o_dheight = height; + bool reset_size = !(w32->o_dwidth == width && w32->o_dheight == height); + + w32->o_dwidth = width; + w32->o_dheight = height; + + // the desired size is ignored in wid mode, it always matches the window size. if (WinID < 0) { - // the desired size is ignored in wid mode, it always matches the window size. - prev_width = vo_dwidth = width; - prev_height = vo_dheight = height; - prev_x = vo_dx; - prev_y = vo_dy; + if (w32->window_bounds_initialized) { + // restore vo_dwidth/vo_dheight, which are reset against our will + // in vo_config() + RECT r; + GetClientRect(w32->window, &r); + vo->dwidth = r.right; + vo->dheight = r.bottom; + } else { + // first vo_config call; vo_config() will always set vo_dx/dy so + // that the window is centered on the screen, and this is the only + // time we actually want to use vo_dy/dy (this is not sane, and + // video_out.h should provide a function to query the initial + // window position instead) + w32->window_bounds_initialized = true; + reset_size = true; + w32->window_x = w32->prev_x = vo->dx; + w32->window_y = w32->prev_y = vo->dy; + } + if (reset_size) { + w32->prev_width = vo->dwidth = width; + w32->prev_height = vo->dheight = height; + } } vo_fs = flags & VOFLAG_FULLSCREEN; - vo_vm = flags & VOFLAG_MODESWITCHING; - return createRenderingContext(); + w32->vm = flags & VOFLAG_MODESWITCHING; + return reinit_window_state(vo); } /** * \brief return the name of the selected device if it is indepedant * \return pointer to string, must be freed. */ -static char *get_display_name(void) { - DISPLAY_DEVICE disp; +static wchar_t *get_display_name(void) +{ + DISPLAY_DEVICEW disp; disp.cb = sizeof(disp); - EnumDisplayDevices(NULL, vo_adapter_num, &disp, 0); + EnumDisplayDevicesW(NULL, vo_adapter_num, &disp, 0); if (disp.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) return NULL; - return strdup(disp.DeviceName); + return wcsdup(disp.DeviceName); } /** @@ -488,65 +625,70 @@ static char *get_display_name(void) { * * \return 1 = Success, 0 = Failure */ -int vo_w32_init(void) { - HICON mplayerIcon = 0; - char exedir[MAX_PATH]; - HINSTANCE user32; - char *dev; - - if (vo_window) +int vo_w32_init(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; + if (w32 && w32->window) return 1; - hInstance = GetModuleHandle(0); + if (!w32) + w32 = vo->w32 = talloc_zero(vo, struct vo_w32_state); - if (GetModuleFileName(0, exedir, MAX_PATH)) - mplayerIcon = ExtractIcon(hInstance, exedir, 0); - if (!mplayerIcon) - mplayerIcon = LoadIcon(0, IDI_APPLICATION); + HINSTANCE hInstance = GetModuleHandleW(NULL); - { - WNDCLASSEX wcex = { sizeof wcex, CS_OWNDC | CS_DBLCLKS, WndProc, 0, 0, hInstance, mplayerIcon, LoadCursor(0, IDC_ARROW), NULL, 0, classname, mplayerIcon }; + HICON mplayerIcon = LoadIconW(hInstance, L"IDI_ICON1"); - if (!RegisterClassEx(&wcex)) { - mp_msg(MSGT_VO, MSGL_ERR, "vo: win32: unable to register window class!\n"); + WNDCLASSEXW wcex = { + .cbSize = sizeof wcex, + .style = CS_OWNDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + .lpfnWndProc = WndProc, + .hInstance = hInstance, + .hIcon = mplayerIcon, + .hCursor = LoadCursor(0, IDC_ARROW), + .lpszClassName = classname, + .hIconSm = mplayerIcon, + }; + + if (!RegisterClassExW(&wcex)) { + mp_msg(MSGT_VO, MSGL_ERR, + "vo: win32: unable to register window class!\n"); return 0; } - } - if (WinID >= 0) - { + if (WinID >= 0) { RECT r; GetClientRect(WIN_ID_TO_HWND(WinID), &r); - vo_dwidth = r.right; vo_dheight = r.bottom; - vo_window = CreateWindowEx(WS_EX_NOPARENTNOTIFY, classname, classname, - WS_CHILD | WS_VISIBLE, 0, 0, vo_dwidth, vo_dheight, - WIN_ID_TO_HWND(WinID), 0, hInstance, 0); - EnableWindow(vo_window, 0); - } else - vo_window = CreateWindowEx(0, classname, classname, - vo_border ? (WS_OVERLAPPEDWINDOW | WS_SIZEBOX) : WS_POPUP, - CW_USEDEFAULT, 0, 100, 100, 0, 0, hInstance, 0); - if (!vo_window) { + vo->dwidth = r.right; vo->dheight = r.bottom; + w32->window = CreateWindowExW(WS_EX_NOPARENTNOTIFY, classname, + classname, + WS_CHILD | WS_VISIBLE, + 0, 0, vo->dwidth, vo->dheight, + WIN_ID_TO_HWND(WinID), 0, hInstance, vo); + } else { + w32->window = CreateWindowExW(0, classname, + classname, + update_style(vo, 0), + CW_USEDEFAULT, 0, 100, 100, + 0, 0, hInstance, vo); + } + + if (!w32->window) { mp_msg(MSGT_VO, MSGL_ERR, "vo: win32: unable to create window!\n"); return 0; } - myMonitorFromWindow = NULL; - myGetMonitorInfo = NULL; - myEnumDisplayMonitors = NULL; - user32 = GetModuleHandle("user32.dll"); - if (user32) { - myMonitorFromWindow = (void *)GetProcAddress(user32, "MonitorFromWindow"); - myGetMonitorInfo = GetProcAddress(user32, "GetMonitorInfoA"); - myEnumDisplayMonitors = GetProcAddress(user32, "EnumDisplayMonitors"); - } - dev_hdc = 0; - dev = get_display_name(); - if (dev) dev_hdc = CreateDC(dev, NULL, NULL, NULL); + if (WinID >= 0) + EnableWindow(w32->window, 0); + + w32->dev_hdc = 0; + wchar_t *dev = get_display_name(); + if (dev) w32->dev_hdc = CreateDCW(dev, NULL, NULL, NULL); free(dev); - updateScreenProperties(); + updateScreenProperties(vo); - mp_msg(MSGT_VO, MSGL_V, "vo: win32: running at %dx%d with depth %d\n", vo_screenwidth, vo_screenheight, depthonscreen); + mp_msg(MSGT_VO, MSGL_V, "vo: win32: running at %dx%d with depth %d\n", + vo->opts->vo_screenwidth, vo->opts->vo_screenheight, + w32->depthonscreen); return 1; } @@ -555,50 +697,38 @@ int vo_w32_init(void) { * \brief Toogle fullscreen / windowed mode. * * Should be called on VOCTRL_FULLSCREEN event. The window is - * always resized after this call, so the rendering context + * always resized during this call, so the rendering context * should be reinitialized with the new dimensions. * It is unspecified if vo_check_events will create a resize * event in addition or not. - * - * Global libvo variables changed: - * vo_dwidth - * vo_dheight - * vo_fs */ -void vo_w32_fullscreen(void) { +void vo_w32_fullscreen(struct vo *vo) +{ vo_fs = !vo_fs; - - createRenderingContext(); + reinit_window_state(vo); } /** * \brief Toogle window border attribute. * * Should be called on VOCTRL_BORDER event. - * - * Global libvo variables changed: - * vo_border */ -void vo_w32_border(void) { +void vo_w32_border(struct vo *vo) +{ vo_border = !vo_border; - createRenderingContext(); + reinit_window_state(vo); } /** * \brief Toogle window ontop attribute. * * Should be called on VOCTRL_ONTOP event. - * - * Global libvo variables changed: - * vo_ontop */ -void vo_w32_ontop( void ) +void vo_w32_ontop(struct vo *vo) { - vo_ontop = !vo_ontop; - if (!vo_fs) { - createRenderingContext(); - } + vo->opts->vo_ontop = !vo->opts->vo_ontop; + reinit_window_state(vo); } /** @@ -608,16 +738,19 @@ void vo_w32_ontop( void ) * anything built on top of the created window e.g. rendering context inside * and call vo_w32_uninit at the end. */ -void vo_w32_uninit(void) { +void vo_w32_uninit(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; mp_msg(MSGT_VO, MSGL_V, "vo: win32: uninit\n"); - resetMode(); + if (!w32) + return; + resetMode(vo); ShowCursor(1); - depthonscreen = 0; - if (dev_hdc) DeleteDC(dev_hdc); - dev_hdc = 0; - DestroyWindow(vo_window); - vo_window = 0; - UnregisterClass(classname, 0); + if (w32->dev_hdc) DeleteDC(w32->dev_hdc); + DestroyWindow(w32->window); + UnregisterClassW(classname, 0); + talloc_free(w32); + vo->w32 = NULL; } /** @@ -625,8 +758,11 @@ void vo_w32_uninit(void) { * * \param wnd window the DC should belong to if it makes sense */ -HDC vo_w32_get_dc(HWND wnd) { - if (dev_hdc) return dev_hdc; +HDC vo_w32_get_dc(struct vo *vo, HWND wnd) +{ + struct vo_w32_state *w32 = vo->w32; + if (w32->dev_hdc) + return w32->dev_hdc; return GetDC(wnd); } @@ -635,7 +771,10 @@ HDC vo_w32_get_dc(HWND wnd) { * * \param wnd window the DC probably belongs to */ -void vo_w32_release_dc(HWND wnd, HDC dc) { - if (dev_hdc) return; +void vo_w32_release_dc(struct vo *vo, HWND wnd, HDC dc) +{ + struct vo_w32_state *w32 = vo->w32; + if (w32->dev_hdc) + return; ReleaseDC(wnd, dc); } |