#include <d3d9.h>
#endif
#ifdef MODULE_NAME_IS_glwin32
-#include <GL/gl.h>
+#include "../opengl.h"
#endif
#include "common.h"
//WINSHELLAPI BOOL WINAPI SHFullScreen(HWND hwndRequester, DWORD dwState);
#endif
+static void CommonChangeThumbnailClip(vout_display_t *, bool show);
static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen);
static void DisableScreensaver(vout_display_t *);
var_Create(vd, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Create(vd, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
- /* FIXME remove mouse hide from msw */
- var_Create(vd, "mouse-hide-timeout", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
/* */
sys->event = EventThreadCreate(vd);
if (!sys->event)
cfg.use_desktop = sys->use_desktop;
#endif
#ifdef MODULE_NAME_IS_directx
- cfg.use_overlay = sys->b_using_overlay;
+ cfg.use_overlay = sys->use_overlay;
#endif
cfg.win.type = VOUT_WINDOW_TYPE_HWND;
- cfg.win.x = 0;
- cfg.win.y = 0;
+ cfg.win.x = var_InheritInteger(vd, "video-x");
+ cfg.win.y = var_InheritInteger(vd, "video-y");
cfg.win.width = vd->cfg->display.width;
cfg.win.height = vd->cfg->display.height;
vout_display_sys_t *sys = vd->sys;
if (sys->event) {
+ CommonChangeThumbnailClip(vd, false);
EventThreadStop(sys->event);
EventThreadDestroy(sys->event);
}
/* If we do not control our window, we check for geometry changes
* ourselves because the parent might not send us its events. */
- if (sys->hparent && !vd->cfg->is_fullscreen) {
+ if (sys->hparent) {
RECT rect_parent;
POINT point;
+ /* Check if the parent window has resized or moved */
GetClientRect(sys->hparent, &rect_parent);
point.x = point.y = 0;
ClientToScreen(sys->hparent, &point);
if (!EqualRect(&rect_parent, &sys->rect_parent)) {
sys->rect_parent = rect_parent;
- /* FIXME I find such #ifdef quite weirds. Are they really needed ? */
-
-#if defined(MODULE_NAME_IS_direct3d)
+ /* This code deals with both resize and move
+ *
+ * For most drivers(direct3d, gdi, opengl), move is never
+ * an issue. The surface automatically gets moved together
+ * with the associated window (hvideownd)
+ *
+ * For directx, it is still important to call UpdateRects
+ * on a move of the parent window, even if no resize occured
+ */
SetWindowPos(sys->hwnd, 0, 0, 0,
rect_parent.right - rect_parent.left,
rect_parent.bottom - rect_parent.top,
SWP_NOZORDER);
- UpdateRects(vd, NULL, NULL, true);
-#else
- /* This one is to force the update even if only
- * the position has changed */
- SetWindowPos(sys->hwnd, 0, 1, 1,
- rect_parent.right - rect_parent.left,
- rect_parent.bottom - rect_parent.top, 0);
-
- SetWindowPos(sys->hwnd, 0, 0, 0,
- rect_parent.right - rect_parent.left,
- rect_parent.bottom - rect_parent.top, 0);
-#if defined(MODULE_NAME_IS_wingdi) || defined(MODULE_NAME_IS_wingapi)
- unsigned int i_x, i_y, i_width, i_height;
- vout_PlacePicture(vd, rect_parent.right - rect_parent.left,
- rect_parent.bottom - rect_parent.top,
- &i_x, &i_y, &i_width, &i_height);
-
- SetWindowPos(sys->hvideownd, HWND_TOP,
- i_x, i_y, i_width, i_height, 0);
-#endif
-#endif
+ UpdateRects(vd, NULL, NULL, true);
}
}
- /* */
+ /* HasMoved means here resize or move */
if (EventThreadGetAndResetHasMoved(sys->event))
UpdateRects(vd, NULL, NULL, false);
+}
+
+/**
+ * It ensures that the video window is shown after the first picture
+ * is displayed.
+ */
+void CommonDisplay(vout_display_t *vd)
+{
+ vout_display_sys_t *sys = vd->sys;
+
+ if (!sys->is_first_display)
+ return;
+
+ /* Video window is initially hidden, show it now since we got a
+ * picture to show.
+ */
+ SetWindowPos(sys->hvideownd, 0, 0, 0, 0, 0,
+ SWP_ASYNCWINDOWPOS|
+ SWP_FRAMECHANGED|
+ SWP_SHOWWINDOW|
+ SWP_NOMOVE|
+ SWP_NOSIZE|
+ SWP_NOZORDER);
+ sys->is_first_display = false;
+}
+
+void AlignRect(RECT *r, int align_boundary, int align_size)
+{
+ if (align_boundary)
+ r->left = (r->left + align_boundary/2) & ~align_boundary;
+ if (align_size)
+ r->right = ((r->right - r->left + align_size/2) & ~align_size) + r->left;
+}
+
+/* */
+static void CommonChangeThumbnailClip(vout_display_t *vd, bool show)
+{
+#ifndef UNDER_CE
+ vout_display_sys_t *sys = vd->sys;
+
+ /* Windows 7 taskbar thumbnail code */
+ OSVERSIONINFO winVer;
+ winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+ if (!GetVersionEx(&winVer) || winVer.dwMajorVersion <= 5)
+ return;
+
+ CoInitialize(0);
- /* Pointer change */
- EventThreadMouseAutoHide(sys->event);
+ LPTASKBARLIST3 taskbl;
+ if (S_OK == CoCreateInstance(&clsid_ITaskbarList,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_ITaskbarList3,
+ &taskbl)) {
+ taskbl->vt->HrInit(taskbl);
+
+ HWND hroot = GetAncestor(sys->hwnd,GA_ROOT);
+ RECT relative;
+ if (show) {
+ RECT video, parent;
+ GetWindowRect(sys->hvideownd, &video);
+ GetWindowRect(hroot, &parent);
+ relative.left = video.left - parent.left - 8;
+ relative.top = video.top - parent.top - 10;
+
+ relative.right = video.right - video.left + relative.left;
+ relative.bottom = video.bottom - video.top + relative.top - 25;
+ }
+ if (S_OK != taskbl->vt->SetThumbnailClip(taskbl, hroot,
+ show ? &relative : NULL))
+ msg_Err(vd, "SetThumbNailClip failed");
+
+ taskbl->vt->Release(taskbl);
+ }
+ CoUninitialize();
+#endif
}
/*****************************************************************************
RECT rect;
POINT point;
+ /* */
+ if (!cfg)
+ cfg = vd->cfg;
+ if (!source)
+ source = &vd->source;
+
/* Retrieve the window size */
GetClientRect(sys->hwnd, &rect);
ClientToScreen(sys->hwnd, &point);
/* If nothing changed, we can return */
- bool has_changed;
- EventThreadUpdateWindowPosition(sys->event, &has_changed,
+ bool has_moved;
+ bool is_resized;
+ EventThreadUpdateWindowPosition(sys->event, &has_moved, &is_resized,
point.x, point.y,
rect.right, rect.bottom);
- if (!is_forced && !has_changed)
+ if (is_resized)
+ vout_display_SendEventDisplaySize(vd, rect.right, rect.bottom, cfg->is_fullscreen);
+ if (!is_forced && !has_moved && !is_resized )
return;
- /* */
- if (!cfg)
- cfg = vd->cfg;
- if (!source)
- source = &vd->source;
-
/* Update the window position and size */
vout_display_cfg_t place_cfg = *cfg;
place_cfg.display.width = rect.right;
place_cfg.display.height = rect.bottom;
vout_display_place_t place;
- vout_display_PlacePicture(&place, source, &place_cfg, true);
+ vout_display_PlacePicture(&place, source, &place_cfg, false);
EventThreadUpdateSourceAndPlace(sys->event, source, &place);
+#if defined(MODULE_NAME_IS_wingapi)
+ if (place.width != vd->fmt.i_width || place.height != vd->fmt.i_height)
+ vout_display_SendEventPicturesInvalid(vd);
+#endif
if (sys->hvideownd)
SetWindowPos(sys->hvideownd, 0,
#ifdef MODULE_NAME_IS_directx
/* Apply overlay hardware constraints */
- if (sys->b_using_overlay) {
- if (sys->i_align_dest_boundary)
- rect_dest.left = (rect_dest.left +
- sys->i_align_dest_boundary / 2) &
- ~sys->i_align_dest_boundary;
-
- if (sys->i_align_dest_size)
- rect_dest.right = ((rect_dest.right -
- rect_dest.left +
- sys->i_align_dest_size / 2) &
- ~sys->i_align_dest_size) + rect_dest.left;
- }
+ if (sys->use_overlay)
+ AlignRect(&rect_dest, sys->i_align_dest_boundary, sys->i_align_dest_size);
#endif
#endif
if (!IntersectRect(&rect_dest_clipped, &rect_dest,
&sys->rect_display)) {
SetRectEmpty(&rect_src_clipped);
- return;
+ goto exit;
}
#ifndef NDEBUG
if ((rect_dest_clipped.right - rect_dest_clipped.left) == 0 ||
(rect_dest_clipped.bottom - rect_dest_clipped.top) == 0) {
SetRectEmpty(&rect_src_clipped);
- return;
+ goto exit;
}
/* src image dimensions */
#ifdef MODULE_NAME_IS_directx
/* Apply overlay hardware constraints */
- if (sys->b_using_overlay) {
- if (sys->i_align_src_boundary)
- rect_src_clipped.left =
- (rect_src_clipped.left +
- sys->i_align_src_boundary / 2) &
- ~sys->i_align_src_boundary;
-
- if (sys->i_align_src_size)
- rect_src_clipped.right =
- ((rect_src_clipped.right - rect_src_clipped.left +
- sys->i_align_src_size / 2) &
- ~sys->i_align_src_size) + rect_src_clipped.left;
- }
+ if (sys->use_overlay)
+ AlignRect(&rect_src_clipped, sys->i_align_src_boundary, sys->i_align_src_size);
#elif defined(MODULE_NAME_IS_direct3d)
/* Needed at least with YUV content */
rect_src_clipped.left &= ~1;
rect_dest_clipped.right -= sys->rect_display.left;
rect_dest_clipped.top -= sys->rect_display.top;
rect_dest_clipped.bottom -= sys->rect_display.top;
-
- if (sys->b_using_overlay)
- DirectDrawUpdateOverlay(vd);
#endif
-#ifndef UNDER_CE
- /* Windows 7 taskbar thumbnail code */
- LPTASKBARLIST3 taskbl;
- OSVERSIONINFO winVer;
- winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- if (GetVersionEx(&winVer) && winVer.dwMajorVersion > 5) {
- CoInitialize(0);
-
- if (S_OK == CoCreateInstance(&clsid_ITaskbarList,
- NULL, CLSCTX_INPROC_SERVER,
- &IID_ITaskbarList3,
- &taskbl)) {
- RECT rect_video, rect_parent, rect_relative;
- HWND hroot = GetAncestor(sys->hwnd,GA_ROOT);
-
- taskbl->vt->HrInit(taskbl);
- GetWindowRect(sys->hvideownd, &rect_video);
- GetWindowRect(hroot, &rect_parent);
- rect_relative.left = rect_video.left - rect_parent.left - 8;
- rect_relative.right = rect_video.right - rect_video.left + rect_relative.left;
- rect_relative.top = rect_video.top - rect_parent.top - 10;
- rect_relative.bottom = rect_video.bottom - rect_video.top + rect_relative.top - 25;
-
- if (S_OK != taskbl->vt->SetThumbnailClip(taskbl, hroot, &rect_relative))
- msg_Err(vd, "SetThumbNailClip failed");
-
- taskbl->vt->Release(taskbl);
- }
- CoUninitialize();
- }
-#endif
+ CommonChangeThumbnailClip(vd, true);
+
+exit:
/* Signal the change in size/position */
sys->changes |= DX_POSITION_CHANGE;
SetWindowPlacement(hwnd, &window_placement);
ShowWindow(hwnd, SW_SHOWNORMAL);
}
-
- /* Make sure the mouse cursor is displayed */
- EventThreadMouseShow(sys->event);
}
return VLC_SUCCESS;
}
UpdateRects(vd, cfg, source, is_forced);
return VLC_SUCCESS;
}
- case VOUT_DISPLAY_CHANGE_ON_TOP: { /* int b_on_top */
- const bool is_on_top = va_arg(args, int);
+ case VOUT_DISPLAY_CHANGE_WINDOW_STATE: { /* unsigned state */
+ const unsigned state = va_arg(args, unsigned);
+ const bool is_on_top = (state & VOUT_WINDOW_STATE_ABOVE) != 0;
#ifdef MODULE_NAME_IS_direct3d
if (sys->use_desktop && is_on_top)
return VLC_EGENERIC;
#endif
if (sys->parent_window) {
- if (vout_window_SetOnTop(sys->parent_window, is_on_top))
+ if (vout_window_SetState(sys->parent_window, state))
return VLC_EGENERIC;
} else {
HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);
return CommonControlSetFullscreen(vd, cfg->is_fullscreen);
}
- case VOUT_DISPLAY_RESET_PICTURES:
case VOUT_DISPLAY_HIDE_MOUSE:
+ EventThreadMouseHide(sys->event);
+ return VLC_SUCCESS;
+ case VOUT_DISPLAY_RESET_PICTURES:
assert(0);
default:
return VLC_EGENERIC;