From 8cf3097c11fc14bf254bb5595d70d601fb6188b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 30 Jan 2010 17:22:25 +0200 Subject: [PATCH] Revert "vout_window_t: simplify via anynomous union" This reverts commit ec4682128ada4047b20763dd94a7ed63c9de3d55. Conflicts: modules/gui/qt4/qt4.cpp modules/video_output/msw/events_vo.c modules/video_output/x11/xcommon.c modules/video_output/xcb/common.c modules/video_output/xcb/window.c src/video_output/window.c --- include/vlc_vout_window.h | 2 +- modules/gui/hildon/maemo.c | 6 +++--- modules/gui/qt4/qt4.cpp | 8 ++++---- modules/gui/skins2/src/skin_main.cpp | 4 ++-- modules/video_output/drawable.c | 2 +- modules/video_output/msw/events.c | 2 +- modules/video_output/omapfb.c | 4 ++-- modules/video_output/xcb/common.c | 4 ++-- modules/video_output/xcb/events.c | 2 +- modules/video_output/xcb/glx.c | 11 ++++++----- modules/video_output/xcb/window.c | 16 ++++++++-------- modules/video_output/xcb/x11.c | 4 ++-- modules/video_output/xcb/xvideo.c | 6 +++--- src/video_output/window.c | 6 +++--- 14 files changed, 39 insertions(+), 38 deletions(-) diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h index 14e6db7c66..53e3665c00 100644 --- a/include/vlc_vout_window.h +++ b/include/vlc_vout_window.h @@ -90,7 +90,7 @@ struct vout_window_t { union { void *hwnd; /* Win32 window handle */ uint32_t xid; /* X11 windows ID */ - }; + } handle; /* display server (mandatory) */ union { diff --git a/modules/gui/hildon/maemo.c b/modules/gui/hildon/maemo.c index f6d74655ee..bcb0f404af 100644 --- a/modules/gui/hildon/maemo.c +++ b/modules/gui/hildon/maemo.c @@ -289,15 +289,15 @@ static int OpenWindow (vlc_object_t *obj) while ((intf = wnd_req.intf) == NULL) vlc_cond_wait (&wnd_req.wait, &wnd_req.lock); - wnd->xid = request_video( intf, vout ); + wnd->handle.xid = request_video( intf, vout ); vlc_mutex_unlock (&wnd_req.lock); vlc_object_release( vout ); - if (!wnd->xid) + if (!wnd->handle.xid) return VLC_EGENERIC; - msg_Dbg( intf, "Using handle %"PRIu32, wnd->xid ); + msg_Dbg( intf, "Using handle %"PRIu32, wnd->handle.xid ); wnd->control = ControlWindow; wnd->sys = (vout_window_sys_t*)intf; diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index e238dbd826..904c363d6d 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -537,14 +537,14 @@ static int WindowOpen( vlc_object_t *p_obj ) unsigned i_height = p_wnd->cfg->height; #if defined (Q_WS_X11) - p_wnd->xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); - if( !p_wnd->xid ) + p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); + if( !p_wnd->handle.xid ) return VLC_EGENERIC; p_wnd->x11_display = x11_display; #elif defined (Q_WS_WIN) - p_wnd->hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); - if( !p_wnd->hwnd ) + p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height ); + if( !p_wnd->handle.hwnd ) return VLC_EGENERIC; #else # error FIXME diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 2f27e17080..2a077f7cfb 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -356,9 +356,9 @@ static int WindowOpen( vlc_object_t *p_this ) vlc_mutex_lock( &serializer ); - pWnd->hwnd = VoutManager::getWindow( pIntf, pWnd ); + pWnd->handle.hwnd = VoutManager::getWindow( pIntf, pWnd ); - if( pWnd->hwnd ) + if( pWnd->handle.hwnd ) { pWnd->control = &VoutManager::controlWindow; pWnd->sys = (vout_window_sys_t*)pIntf; diff --git a/modules/video_output/drawable.c b/modules/video_output/drawable.c index 54f689cb89..35125fba26 100644 --- a/modules/video_output/drawable.c +++ b/modules/video_output/drawable.c @@ -101,7 +101,7 @@ skip: if (val == NULL) return VLC_EGENERIC; - wnd->hwnd = val; + wnd->handle.hwnd = val; wnd->control = Control; wnd->sys = val; return VLC_SUCCESS; diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index 815cf2890a..81822418e0 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -432,7 +432,7 @@ static int DirectXCreateWindow( event_thread_t *p_event ) /* If an external window was specified, we'll draw in it. */ p_event->parent_window = vout_display_NewWindow(vd, &p_event->wnd_cfg ); if( p_event->parent_window ) - p_event->hparent = p_event->parent_window->hwnd; + p_event->hparent = p_event->parent_window->handle.hwnd; else p_event->hparent = NULL; #ifdef MODULE_NAME_IS_direct3d diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c index bd530a4e2d..b29de5d7f7 100644 --- a/modules/video_output/omapfb.c +++ b/modules/video_output/omapfb.c @@ -611,7 +611,7 @@ static void CreateWindow( vout_sys_t *p_sys ) xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask | VisibilityChangeMask; p_sys->window = XCreateWindow( p_sys->p_display, - p_sys->owner_window->xid, + p_sys->owner_window->handle.xid, 0, 0, p_sys->main_window.i_width, p_sys->main_window.i_height, @@ -621,7 +621,7 @@ static void CreateWindow( vout_sys_t *p_sys ) &xwindow_attributes ); XMapWindow( p_sys->p_display, p_sys->window ); - XSelectInput( p_sys->p_display, p_sys->owner_window->xid, + XSelectInput( p_sys->p_display, p_sys->owner_window->handle.xid, StructureNotifyMask ); } diff --git a/modules/video_output/xcb/common.c b/modules/video_output/xcb/common.c index d1ce9bec10..4ebc26da55 100644 --- a/modules/video_output/xcb/common.c +++ b/modules/video_output/xcb/common.c @@ -140,14 +140,14 @@ vout_window_t *GetWindow (vout_display_t *vd, goto error; *pconn = conn; - *pscreen = FindWindow (VLC_OBJECT(vd), conn, wnd->xid, pdepth); + *pscreen = FindWindow (VLC_OBJECT(vd), conn, wnd->handle.xid, pdepth); if (*pscreen == NULL) { xcb_disconnect (conn); goto error; } - RegisterMouseEvents (VLC_OBJECT(vd), conn, wnd->xid); + RegisterMouseEvents (VLC_OBJECT(vd), conn, wnd->handle.xid); return wnd; error: diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c index b12c013dd2..e0245b9f94 100644 --- a/modules/video_output/xcb/events.c +++ b/modules/video_output/xcb/events.c @@ -61,7 +61,7 @@ int CheckError (vout_display_t *vd, xcb_connection_t *conn, int GetWindowSize (struct vout_window_t *wnd, xcb_connection_t *conn, unsigned *restrict width, unsigned *restrict height) { - xcb_get_geometry_cookie_t ck = xcb_get_geometry (conn, wnd->xid); + xcb_get_geometry_cookie_t ck = xcb_get_geometry (conn, wnd->handle.xid); xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply (conn, ck, NULL); if (!geo) diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c index 49b45b3db6..e018a0f34a 100644 --- a/modules/video_output/xcb/glx.c +++ b/modules/video_output/xcb/glx.c @@ -108,7 +108,7 @@ FindWindow (vout_display_t *vd, xcb_connection_t *conn, xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply (conn, - xcb_get_geometry (conn, sys->embed->xid), NULL); + xcb_get_geometry (conn, sys->embed->handle.xid), NULL); if (geo == NULL) { msg_Err (vd, "parent window not valid"); @@ -183,7 +183,7 @@ static int CreateWindow (vout_display_t *vd, xcb_connection_t *conn, xcb_void_cookie_t cc, cm; cc = xcb_create_window_checked (conn, depth, sys->window, - sys->embed->xid, 0, 0, + sys->embed->handle.xid, 0, 0, width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, vid, mask, values); @@ -236,7 +236,7 @@ static int Open (vlc_object_t *obj) xcb_connection_t *conn = XGetXCBConnection (dpy); assert (conn); - RegisterMouseEvents (obj, conn, sys->embed->xid); + RegisterMouseEvents (obj, conn, sys->embed->handle.xid); /* Find window parameters */ unsigned snum; @@ -263,7 +263,8 @@ static int Open (vlc_object_t *obj) xcb_get_window_attributes_reply_t *wa = xcb_get_window_attributes_reply (conn, - xcb_get_window_attributes (conn, sys->embed->xid), NULL); + xcb_get_window_attributes (conn, sys->embed->handle.xid), + NULL); if (wa == NULL) goto error; xcb_visualid_t visual = wa->visual; @@ -530,7 +531,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) * vout_display_t::info.b_hide_mouse is false */ case VOUT_DISPLAY_HIDE_MOUSE: xcb_change_window_attributes (XGetXCBConnection (sys->display), - sys->embed->xid, + sys->embed->handle.xid, XCB_CW_CURSOR, &(uint32_t){ sys->cursor }); return VLC_SUCCESS; diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c index 05591ea3f2..4bf2dce6b2 100644 --- a/modules/video_output/xcb/window.c +++ b/modules/video_output/xcb/window.c @@ -264,7 +264,7 @@ static int Open (vlc_object_t *obj) goto error; } - wnd->xid = window; + wnd->handle.xid = window; wnd->x11_display = display; wnd->control = Control; wnd->sys = p_sys; @@ -345,7 +345,7 @@ static int Open (vlc_object_t *obj) #ifdef MATCHBOX_HACK if (p_sys->mb_current_app_window) xcb_set_input_focus (p_sys->conn, XCB_INPUT_FOCUS_POINTER_ROOT, - wnd->xid, XCB_CURRENT_TIME); + wnd->handle.xid, XCB_CURRENT_TIME); #endif xcb_flush (conn); /* Make sure map_window is sent (should be useless) */ return VLC_SUCCESS; @@ -416,13 +416,13 @@ static void *Thread (void *data) xcb_get_property (conn, 0, pne->window, pne->atom, XA_WINDOW, 0, 4), NULL); if (r != NULL - && !memcmp (xcb_get_property_value (r), &wnd->xid, + && !memcmp (xcb_get_property_value (r), &wnd->handle.xid, 4)) { msg_Dbg (wnd, "asking Matchbox for input focus"); xcb_set_input_focus (conn, XCB_INPUT_FOCUS_POINTER_ROOT, - wnd->xid, pne->time); + wnd->handle.xid, pne->time); xcb_flush (conn); } free (r); @@ -452,7 +452,7 @@ static void set_wm_state (vout_window_t *wnd, bool on, xcb_atom_t state) xcb_client_message_event_t ev = { .response_type = XCB_CLIENT_MESSAGE, .format = 32, - .window = wnd->xid, + .window = wnd->handle.xid, .type = sys->wm_state, }; @@ -482,7 +482,7 @@ static int Control (vout_window_t *wnd, int cmd, va_list ap) unsigned height = va_arg (ap, unsigned); const uint32_t values[] = { width, height, }; - xcb_configure_window (conn, wnd->xid, + xcb_configure_window (conn, wnd->handle.xid, XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT, values); break; @@ -609,7 +609,7 @@ static int EmOpen (vlc_object_t *obj) if (p_sys == NULL || xcb_connection_has_error (conn)) goto error; - wnd->xid = window; + wnd->handle.xid = window; wnd->control = Control; wnd->sys = p_sys; @@ -657,7 +657,7 @@ error: static void EmClose (vlc_object_t *obj) { vout_window_t *wnd = (vout_window_t *)obj; - xcb_window_t window = wnd->xid; + xcb_window_t window = wnd->handle.xid; Close (obj); ReleaseDrawable (obj, window); diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 75c31eb15b..b4641f4267 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -256,7 +256,7 @@ static int Open (vlc_object_t *obj) c = xcb_create_window_checked (p_sys->conn, p_sys->depth, p_sys->window, - p_sys->embed->xid, 0, 0, + p_sys->embed->handle.xid, 0, 0, width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, vid, mask, values); @@ -502,7 +502,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) /* Hide the mouse. It will be send when * vout_display_t::info.b_hide_mouse is false */ case VOUT_DISPLAY_HIDE_MOUSE: - xcb_change_window_attributes (p_sys->conn, p_sys->embed->xid, + xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid, XCB_CW_CURSOR, &(uint32_t){ p_sys->cursor }); return VLC_SUCCESS; diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index c02cc85177..0c479bb8c0 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -331,7 +331,7 @@ static int Open (vlc_object_t *obj) /* Cache adaptors infos */ xcb_xv_query_adaptors_reply_t *adaptors = xcb_xv_query_adaptors_reply (conn, - xcb_xv_query_adaptors (conn, p_sys->embed->xid), NULL); + xcb_xv_query_adaptors (conn, p_sys->embed->handle.xid), NULL); if (adaptors == NULL) goto error; @@ -455,7 +455,7 @@ static int Open (vlc_object_t *obj) xcb_void_cookie_t c; c = xcb_create_window_checked (conn, f->depth, p_sys->window, - p_sys->embed->xid, 0, 0, 1, 1, 0, + p_sys->embed->handle.xid, 0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, f->visual, XCB_CW_EVENT_MASK, &mask); @@ -748,7 +748,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) /* Hide the mouse. It will be send when * vout_display_t::info.b_hide_mouse is false */ case VOUT_DISPLAY_HIDE_MOUSE: - xcb_change_window_attributes (p_sys->conn, p_sys->embed->xid, + xcb_change_window_attributes (p_sys->conn, p_sys->embed->handle.xid, XCB_CW_CURSOR, &(uint32_t){ p_sys->cursor }); return VLC_SUCCESS; case VOUT_DISPLAY_RESET_PICTURES: diff --git a/src/video_output/window.c b/src/video_output/window.c index 7a6338d216..c7d099341a 100644 --- a/src/video_output/window.c +++ b/src/video_output/window.c @@ -50,6 +50,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj, vout_window_t *window = &w->wnd; window->cfg = cfg; + memset(&window->handle, 0, sizeof(window->handle)); window->control = NULL; window->sys = NULL; @@ -60,12 +61,11 @@ vout_window_t *vout_window_New(vlc_object_t *obj, #ifdef WIN32 case VOUT_WINDOW_TYPE_HWND: type = "vout window hwnd"; - window->hwnd = NULL; break; #endif case VOUT_WINDOW_TYPE_XID: type = "vout window xid"; - window->xid = 0; + window->handle.xid = 0; window->x11_display = NULL; break; default: @@ -81,7 +81,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj, /* Hook for screensaver inhibition */ if (cfg->type == VOUT_WINDOW_TYPE_XID) { w->inhibit = vlc_inhibit_Create (VLC_OBJECT (window), - window->xid); + window->handle.xid); if (w->inhibit != NULL) vlc_inhibit_Set (w->inhibit, true); /* FIXME: ^ wait for vout activation, pause */ -- 2.39.2