diff options
| -rw-r--r-- | libvo/gl_common.c | 43 | ||||
| -rw-r--r-- | libvo/video_out.h | 1 | ||||
| -rw-r--r-- | libvo/vo_direct3d.c | 32 | ||||
| -rw-r--r-- | libvo/vo_directx.c | 24 | ||||
| -rw-r--r-- | libvo/w32_common.c | 509 | ||||
| -rw-r--r-- | libvo/w32_common.h | 57 |
6 files changed, 345 insertions, 321 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 414e52dbd2..2e0de9bc6a 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1775,7 +1775,7 @@ struct w32_context { static int create_window_w32(struct MPGLContext *ctx, uint32_t d_width, uint32_t d_height, uint32_t flags) { - if (!vo_w32_config(d_width, d_height, flags)) + if (!vo_w32_config(ctx->vo, d_width, d_height, flags)) return -1; return 0; } @@ -1799,7 +1799,7 @@ static void *w32gpa(const GLubyte *procName) static int create_window_w32_gl3(struct MPGLContext *ctx, int gl_flags, int gl_version, uint32_t d_width, uint32_t d_height, uint32_t flags) { - if (!vo_w32_config(d_width, d_height, flags)) + if (!vo_w32_config(ctx->vo, d_width, d_height, flags)) return -1; struct w32_context *w32_ctx = ctx->priv; @@ -1808,8 +1808,8 @@ static int create_window_w32_gl3(struct MPGLContext *ctx, int gl_flags, if (*context) // reuse existing context return 0; // not reusing it breaks gl3! - HWND win = vo_w32_window; - HDC windc = vo_w32_get_dc(win); + HWND win = ctx->vo->w32->window; + HDC windc = vo_w32_get_dc(ctx->vo, win); HGLRC new_context = 0; new_context = wglCreateContext(windc); @@ -1896,12 +1896,12 @@ out: static int setGlWindow_w32(MPGLContext *ctx) { - HWND win = vo_w32_window; + HWND win = ctx->vo->w32->window; struct w32_context *w32_ctx = ctx->priv; int *vinfo = &w32_ctx->vinfo; HGLRC *context = &w32_ctx->context; int new_vinfo; - HDC windc = vo_w32_get_dc(win); + HDC windc = vo_w32_get_dc(ctx->vo, win); HGLRC new_context = 0; int keep_context = 0; int res = SET_WINDOW_FAILED; @@ -1934,7 +1934,6 @@ static int setGlWindow_w32(MPGLContext *ctx) } // set new values - vo_w32_window = win; { RECT rect; GetClientRect(win, &rect); @@ -1955,7 +1954,7 @@ static int setGlWindow_w32(MPGLContext *ctx) res = SET_WINDOW_OK; out: - vo_w32_release_dc(win, windc); + vo_w32_release_dc(ctx->vo, win, windc); return res; } @@ -1974,18 +1973,10 @@ static void releaseGlContext_w32(MPGLContext *ctx) static void swapGlBuffers_w32(MPGLContext *ctx) { - HDC vo_hdc = vo_w32_get_dc(vo_w32_window); + HDC vo_hdc = vo_w32_get_dc(ctx->vo, ctx->vo->w32->window); SwapBuffers(vo_hdc); - vo_w32_release_dc(vo_w32_window, vo_hdc); + vo_w32_release_dc(ctx->vo, ctx->vo->w32->window, vo_hdc); } - -//trivial wrappers (w32 code uses old vo API) -static void new_vo_w32_ontop(struct vo *vo) { vo_w32_ontop(); } -static void new_vo_w32_border(struct vo *vo) { vo_w32_border(); } -static void new_vo_w32_fullscreen(struct vo *vo) { vo_w32_fullscreen(); } -static int new_vo_w32_check_events(struct vo *vo) { return vo_w32_check_events(); } -static void new_w32_update_xinerama_info(struct vo *vo) { w32_update_xinerama_info(); } -static void new_vo_w32_uninit(struct vo *vo) { vo_w32_uninit(); } #endif #ifdef CONFIG_GL_X11 @@ -2461,15 +2452,13 @@ MPGLContext *init_mpglcontext(enum MPGLType type, struct vo *vo) ctx->setGlWindow = setGlWindow_w32; ctx->releaseGlContext = releaseGlContext_w32; ctx->swapGlBuffers = swapGlBuffers_w32; - ctx->update_xinerama_info = new_w32_update_xinerama_info; - ctx->border = new_vo_w32_border; - ctx->check_events = new_vo_w32_check_events; - ctx->fullscreen = new_vo_w32_fullscreen; - ctx->ontop = new_vo_w32_ontop; - ctx->vo_uninit = new_vo_w32_uninit; - //the win32 code is hardcoded to use the deprecated vo API - global_vo = vo; - if (vo_w32_init()) + ctx->update_xinerama_info = w32_update_xinerama_info; + ctx->border = vo_w32_border; + ctx->check_events = vo_w32_check_events; + ctx->fullscreen = vo_w32_fullscreen; + ctx->ontop = vo_w32_ontop; + ctx->vo_uninit = vo_w32_uninit; + if (vo_w32_init(vo)) return ctx; break; #endif diff --git a/libvo/video_out.h b/libvo/video_out.h index 3dd3ca8a8d..1fe726def5 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -273,6 +273,7 @@ struct vo { void *priv; struct MPOpts *opts; struct vo_x11_state *x11; + struct vo_w32_state *w32; struct mp_fifo *key_fifo; struct input_ctx *input_ctx; int event_fd; // check_events() should be called when this has input diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index cffe7f81d0..fb2f58f5cc 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -32,8 +32,6 @@ #include "talloc.h" #include "video_out.h" #include "libmpcodecs/vfcap.h" -// for global_vo -#include "old_vo_wrapper.h" #include "csputils.h" #include "libmpcodecs/mp_image.h" #include "libmpcodecs/img_format.h" @@ -756,7 +754,7 @@ static void fill_d3d_presentparams(d3d_priv *priv, present_params->SwapEffect = priv->opt_swap_discard ? D3DSWAPEFFECT_DISCARD : D3DSWAPEFFECT_COPY; present_params->Flags = D3DPRESENTFLAG_VIDEO; - present_params->hDeviceWindow = vo_w32_window; /* w32_common var */ + present_params->hDeviceWindow = priv->vo->w32->window; present_params->BackBufferWidth = priv->cur_backbuf_width; present_params->BackBufferHeight = priv->cur_backbuf_height; present_params->MultiSampleType = D3DMULTISAMPLE_NONE; @@ -795,7 +793,7 @@ static bool change_d3d_backbuffer(d3d_priv *priv) if (!priv->d3d_device) { if (FAILED(IDirect3D9_CreateDevice(priv->d3d_handle, D3DADAPTER_DEFAULT, - DEVTYPE, vo_w32_window, + DEVTYPE, priv->vo->w32->window, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_params, &priv->d3d_device))) @@ -1468,8 +1466,7 @@ static int preinit_internal(struct vo *vo, const char *arg, bool allow_shaders) /* w32_common framework call. Configures window on the screen, gets * fullscreen dimensions and does other useful stuff. */ - global_vo = vo; - if (!vo_w32_init()) { + if (!vo_w32_init(vo)) { mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Configuring onscreen window failed.\n"); goto err_out; @@ -1509,7 +1506,7 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_DRAW_IMAGE: return d3d_upload_and_render_frame(priv, data); case VOCTRL_FULLSCREEN: - vo_w32_fullscreen(); + vo_w32_fullscreen(vo); resize_d3d(priv); return VO_TRUE; case VOCTRL_RESET: @@ -1546,13 +1543,13 @@ static int control(struct vo *vo, uint32_t request, void *data) >= 0 ? VO_TRUE : VO_NOTIMPL; } case VOCTRL_ONTOP: - vo_w32_ontop(); + vo_w32_ontop(vo); return VO_TRUE; case VOCTRL_BORDER: - vo_w32_border(); + vo_w32_border(vo); return VO_TRUE; case VOCTRL_UPDATE_SCREENINFO: - w32_update_xinerama_info(); + w32_update_xinerama_info(vo); return VO_TRUE; case VOCTRL_SET_PANSCAN: calc_fs_rect(priv); @@ -1606,7 +1603,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, /* w32_common framework call. Creates window on the screen with * the given coordinates. */ - if (!vo_w32_config(d_width, d_height, options)) { + if (!vo_w32_config(vo, d_width, d_height, options)) { mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>Creating window failed.\n"); return VO_ERROR; } @@ -1670,7 +1667,7 @@ static void uninit(struct vo *vo) mp_msg(MSGT_VO, MSGL_V, "<vo_direct3d>uninit called.\n"); uninit_d3d(priv); - vo_w32_uninit(); /* w32_common framework call */ + vo_w32_uninit(vo); if (priv->d3d9_dll) FreeLibrary(priv->d3d9_dll); priv->d3d9_dll = NULL; @@ -1682,12 +1679,7 @@ static void check_events(struct vo *vo) { d3d_priv *priv = vo->priv; - int flags; - /* w32_common framework call. Handles video window events. - * Updates global libvo's vo_dwidth/vo_dheight upon resize - * with the new window width/height. - */ - flags = vo_w32_check_events(); + int flags = vo_w32_check_events(vo); if (flags & VO_EVENT_RESIZE) resize_d3d(priv); @@ -1914,9 +1906,9 @@ static mp_image_t *get_window_screenshot(d3d_priv *priv) goto error_exit; } - GetClientRect(vo_w32_window, &window_rc); + GetClientRect(priv->vo->w32->window, &window_rc); pt = (POINT) { 0, 0 }; - ClientToScreen(vo_w32_window, &pt); + ClientToScreen(priv->vo->w32->window, &pt); window_rc.left = pt.x; window_rc.top = pt.y; window_rc.right += window_rc.left; diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index f4ab2a7f7f..0a20e5e33a 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -36,6 +36,8 @@ #include "sub/sub.h" #include "w32_common.h" +#define vo_w32_window (global_vo->w32->window) + static LPDIRECTDRAWCOLORCONTROL g_cc = NULL; //color control interface static LPDIRECTDRAW7 g_lpdd = NULL; //DirectDraw Object static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL; //Primary Surface: viewport through the Desktop @@ -335,7 +337,7 @@ static void uninit(void) hddraw_dll = NULL; mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>ddraw.dll freed\n"); mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>uninitialized\n"); - vo_w32_uninit(); + vo_w32_uninit(global_vo); } static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) @@ -607,15 +609,15 @@ static uint32_t Directx_ManageDisplay(void) static void check_events(void) { - int evt = vo_w32_check_events(); + int evt = vo_w32_check_events(global_vo); if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE)) Directx_ManageDisplay(); if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE | VO_EVENT_EXPOSE)) { - HDC dc = vo_w32_get_dc(vo_w32_window); + HDC dc = vo_w32_get_dc(global_vo, vo_w32_window); RECT r; GetClientRect(vo_w32_window, &r); FillRect(dc, &r, vo_fs || vidmode ? blackbrush : colorbrush); - vo_w32_release_dc(vo_w32_window, dc); + vo_w32_release_dc(global_vo, vo_w32_window, dc); } } @@ -749,9 +751,9 @@ static int preinit(const char *arg) windowcolor = vo_colorkey; colorbrush = CreateSolidBrush(windowcolor); blackbrush = (HBRUSH)GetStockObject(BLACK_BRUSH); - if (!vo_w32_init()) + if (!vo_w32_init(global_vo)) return 1; - if (!vo_w32_config(100, 100, VOFLAG_HIDDEN)) + if (!vo_w32_config(global_vo, 100, 100, VOFLAG_HIDDEN)) return 1; if (Directx_InitDirectDraw() != 0) @@ -958,7 +960,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ g_lpddsPrimary = NULL; mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>overlay surfaces released\n"); - if (!vo_w32_config(d_width, d_height, options)) + if (!vo_w32_config(global_vo, d_width, d_height, options)) return 1; /*create the surfaces*/ @@ -1108,11 +1110,11 @@ static int control(uint32_t request, void *data) case VOCTRL_DRAW_IMAGE: return put_image(data); case VOCTRL_BORDER: - vo_w32_border(); + vo_w32_border(global_vo); Directx_ManageDisplay(); return VO_TRUE; case VOCTRL_ONTOP: - vo_w32_ontop(); + vo_w32_ontop(global_vo); return VO_TRUE; case VOCTRL_ROOTWIN: if (WinID != -1) @@ -1128,7 +1130,7 @@ static int control(uint32_t request, void *data) } return VO_TRUE; case VOCTRL_FULLSCREEN: - vo_w32_fullscreen(); + vo_w32_fullscreen(global_vo); Directx_ManageDisplay(); return VO_TRUE; case VOCTRL_SET_EQUALIZER: { @@ -1140,7 +1142,7 @@ static int control(uint32_t request, void *data) return color_ctrl_get(args->name, args->valueptr); } case VOCTRL_UPDATE_SCREENINFO: - w32_update_xinerama_info(); + w32_update_xinerama_info(global_vo); return VO_TRUE; } return VO_NOTIMPL; diff --git a/libvo/w32_common.c b/libvo/w32_common.c index 9f15d2434d..f6ebe10b81 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -22,8 +22,7 @@ #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" @@ -34,47 +33,9 @@ #include "osdep/io.h" #include "talloc.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 - #define WIN_ID_TO_HWND(x) ((HWND)(uint32_t)(x)) static const wchar_t classname[] = L"mplayer2"; -int vo_vm = 0; - -static int depthonscreen; -// last non-fullscreen extends (updated only on fullscreen or on initialization) -static int prev_width; -static int prev_height; -static int prev_x; -static int prev_y; - -// whether the window position and size were intialized -static bool window_bounds_initialized; - -static bool current_fs; - -static int window_x; -static int window_y; - -// video size -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 const struct mp_keymap vk_map[] = { // special keys @@ -101,16 +62,16 @@ static const struct mp_keymap vk_map[] = { {0, 0} }; -static void vo_rect_add_window_borders(RECT *rc) +static void add_window_borders(HWND hwnd, RECT *rc) { - AdjustWindowRect(rc, GetWindowLong(vo_window, GWL_STYLE), 0); + AdjustWindowRect(rc, GetWindowLong(hwnd, GWL_STYLE), 0); } // basically a reverse AdjustWindowRect (win32 doesn't appear to have this) -static void subtract_window_borders(RECT *rc) +static void subtract_window_borders(HWND hwnd, RECT *rc) { RECT b = { 0, 0, 0, 0 }; - vo_rect_add_window_borders(&b); + add_window_borders(hwnd, &b); rc->left -= b.left; rc->top -= b.top; rc->right -= b.right; @@ -133,59 +94,71 @@ static int get_resize_border(int v) { } } -static bool key_state(int vk) +static bool key_state(struct vo *vo, int vk) { return GetKeyState(vk) & 0x8000; } -static int mod_state(void) +static int mod_state(struct vo *vo) { int res = 0; - if (key_state(VK_CONTROL)) + if (key_state(vo, VK_CONTROL)) res |= KEY_MODIFIER_CTRL; - if (key_state(VK_SHIFT)) + if (key_state(vo, VK_SHIFT)) res |= KEY_MODIFIER_SHIFT; - if (key_state(VK_MENU)) + if (key_state(vo, VK_MENU)) res |= KEY_MODIFIER_ALT; return res; } -static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - RECT r; - POINT p; +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); - window_x = p.x; - window_y = 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", - window_x, window_y); + 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); + vo->dwidth, vo->dheight); break; + } case WM_SIZING: if (vo_keepaspect && !vo_fs && WinID < 0) { RECT *rc = (RECT*)lParam; // get client area of the windows if it had the rect rc // (subtracting the window borders) - r = *rc; - subtract_window_borders(&r); + RECT r = *rc; + subtract_window_borders(w32->window, &r); int c_w = r.right - r.left, c_h = r.bottom - r.top; - float aspect = global_vo->aspdat.asp; + 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 }; @@ -198,7 +171,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l } 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) { @@ -212,14 +185,14 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l case WM_SYSKEYDOWN: { int mpkey = lookup_keymap_table(vk_map, wParam); if (mpkey) - mplayer_put_key(mpkey | mod_state()); + mplayer_put_key(vo->key_fifo, mpkey | mod_state(vo)); if (wParam == VK_F10) return 0; break; } case WM_CHAR: case WM_SYSCHAR: { - int mods = mod_state(); + int mods = mod_state(vo); int code = wParam; // Apparently Ctrl+A to Ctrl+Z is special cased, and produces // character codes from 1-26. Work it around. @@ -227,10 +200,10 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l // 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(VK_RETURN)) + && !key_state(vo, VK_RETURN)) code = code - 1 + (mods & KEY_MODIFIER_SHIFT ? 'A' : 'a'); if (code >= 32 && code < (1<<21)) { - mplayer_put_key(code | mods); + mplayer_put_key(vo->key_fifo, code | mods); // At least with Alt+char, not calling DefWindowProcW stops // Windows from emitting a beep. return 0; @@ -239,7 +212,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l } case WM_LBUTTONDOWN: if (!vo_nomouse_input && (vo_fs || (wParam & MK_CONTROL))) { - mplayer_put_key(MOUSE_BTN0 | mod_state()); + mplayer_put_key(vo->key_fifo, MOUSE_BTN0 | mod_state(vo)); break; } if (!vo_fs) { @@ -250,31 +223,31 @@ 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 | mod_state()); + mplayer_put_key(vo->key_fifo, MOUSE_BTN1 | mod_state(vo)); break; case WM_RBUTTONDOWN: if (!vo_nomouse_input) - mplayer_put_key(MOUSE_BTN2 | mod_state()); + 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 | mod_state()); + mplayer_put_key(vo->key_fifo, MOUSE_BTN3 | mod_state(vo)); else - mplayer_put_key(MOUSE_BTN4 | mod_state()); + 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 | mod_state()); + mplayer_put_key(vo->key_fifo, MOUSE_BTN5 | mod_state(vo)); else // if (x == 2) - mplayer_put_key(MOUSE_BTN6 | mod_state()); + mplayer_put_key(vo->key_fifo, MOUSE_BTN6 | mod_state(vo)); } break; } @@ -287,10 +260,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: * @@ -299,9 +268,11 @@ 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; + w32->event_flags = 0; while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); DispatchMessageW(&msg); @@ -310,37 +281,40 @@ int vo_w32_check_events(void) { 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 != window_x || p.y != window_y) { - window_x = p.x; window_y = 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; } @@ -358,67 +332,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; + if (tmp) vo->opts->vo_screenheight = tmp; } else if (xinerama_screen == -1) { MONITORINFO mi; - HMONITOR m = MonitorFromWindow(vo_window, MONITOR_DEFAULTTOPRIMARY); + HMONITOR m = MonitorFromWindow(w32->window, MONITOR_DEFAULTTOPRIMARY); mi.cbSize = sizeof(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; + 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) { - mon_cnt = 0; - EnumDisplayMonitors(NULL, NULL, mon_enum, 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; @@ -433,90 +417,99 @@ static void changeMode(void) { } } -static void resetMode(void) { - if (vo_vm) +static void resetMode(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; + if (w32->vm) ChangeDisplaySettings(0, 0); } +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(void) { - const LONG NO_FRAME = WS_POPUP; - const LONG FRAME = WS_OVERLAPPEDWINDOW | WS_SIZEBOX; +static int reinit_window_state(struct vo *vo) +{ + struct vo_w32_state *w32 = vo->w32; HWND layer = HWND_NOTOPMOST; RECT r; if (WinID >= 0) return 1; - wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(global_vo)); - SetWindowTextW(vo_window, title); + wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(vo)); + SetWindowTextW(w32->window, title); talloc_free(title); - bool toggle_fs = current_fs != vo_fs; - current_fs = vo_fs; + bool toggle_fs = w32->current_fs != vo_fs; + w32->current_fs = vo_fs; - LONG style = GetWindowLong(vo_window, GWL_STYLE); - style &= ~(NO_FRAME | FRAME); - style |= (vo_border && !vo_fs) ? FRAME : NO_FRAME; + DWORD style = update_style(vo, GetWindowLong(w32->window, GWL_STYLE)); - if (vo_fs || vo_ontop) + 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(); + updateScreenProperties(vo); if (vo_fs) { // Save window position and size when switching to fullscreen. if (toggle_fs) { - prev_width = vo_dwidth; - prev_height = vo_dheight; - prev_x = window_x; - prev_y = window_y; + 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", - prev_x, prev_y, prev_width, prev_height); + w32->prev_x, w32->prev_y, w32->prev_width, w32->prev_height); } - vo_dwidth = vo_screenwidth; - vo_dheight = vo_screenheight; - window_x = xinerama_x; - window_y = xinerama_y; + vo->dwidth = vo->opts->vo_screenwidth; + vo->dheight = vo->opts->vo_screenheight; + w32->window_x = xinerama_x; + w32->window_y = xinerama_y; } else { 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", - prev_x, prev_y, prev_width, prev_height); - vo_dwidth = prev_width; - vo_dheight = prev_height; - window_x = prev_x; - window_y = prev_y; + 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 = window_x; - r.right = r.left + vo_dwidth; - r.top = window_y; - r.bottom = r.top + vo_dheight; + r.left = w32->window_x; + r.right = r.left + vo->dwidth; + r.top = w32->window_y; + r.bottom = r.top + vo->dheight; - SetWindowLong(vo_window, GWL_STYLE, style); - vo_rect_add_window_borders(&r); + 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(vo_window, layer, r.left, r.top, r.right - r.left, + 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(vo_window, NULL, 0, 0, 0, 0, + SetWindowPos(w32->window, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW); return 1; @@ -530,10 +523,13 @@ static int reinit_window_state(void) { * * \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); m |