X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fx11%2Fxcommon.c;h=d2dcbf25238d9d99dc3f8c9e8c745364c5ae69a4;hb=1548a691c730bac930e9630d80f9ff8f3939c251;hp=b2a8bcb4a767d7382a76a9a08509ed2555f18813;hpb=84509c429fde2caf5e1e0d36fb9c5b1e713c29ed;p=vlc diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index b2a8bcb4a7..d2dcbf2523 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -1,13 +1,13 @@ /***************************************************************************** * xcommon.c: Functions common to the X11 and XVideo plugins ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: xcommon.c,v 1.29 2003/08/13 18:39:52 gbazin Exp $ + * Copyright (C) 1998-2006 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin - * Samuel Hocevar + * Sam Hocevar * David Kennedy - * Gildas Bazin + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -34,6 +34,7 @@ #include #include #include +#include #ifdef HAVE_MACHINE_PARAM_H /* BSD */ @@ -51,6 +52,7 @@ #endif #include +#include #include #include #include @@ -66,10 +68,18 @@ # include #endif +#ifdef MODULE_NAME_IS_glx +# include +#endif + #ifdef HAVE_XINERAMA # include #endif +#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H +# include +#endif + #include "xcommon.h" /***************************************************************************** @@ -82,6 +92,7 @@ static int InitVideo ( vout_thread_t * ); static void EndVideo ( vout_thread_t * ); static void DisplayVideo ( vout_thread_t *, picture_t * ); static int ManageVideo ( vout_thread_t * ); +static int Control ( vout_thread_t *, int, va_list ); static int InitDisplay ( vout_thread_t * ); @@ -96,6 +107,7 @@ static IMAGE_TYPE *CreateImage ( vout_thread_t *, #ifdef HAVE_SYS_SHM_H static IMAGE_TYPE *CreateShmImage ( vout_thread_t *, Display *, EXTRA_ARGS_SHM, int, int ); +static vlc_bool_t b_shm = VLC_TRUE; #endif static void ToggleFullScreen ( vout_thread_t * ); @@ -118,6 +130,11 @@ static void SetPalette ( vout_thread_t *, #endif static void TestNetWMSupport( vout_thread_t * ); +static int ConvertKey( int ); + +static int WindowOnTop( vout_thread_t *, vlc_bool_t ); + +static int X11ErrorHandler( Display *, XErrorEvent * ); /***************************************************************************** * Activate: allocate X11 video thread output method @@ -129,7 +146,9 @@ static void TestNetWMSupport( vout_thread_t * ); int E_(Activate) ( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; - char * psz_display; + char * psz_display; + vlc_value_t val; + #ifdef MODULE_NAME_IS_xvideo char * psz_chroma; vlc_fourcc_t i_chroma = 0; @@ -141,6 +160,7 @@ int E_(Activate) ( vlc_object_t *p_this ) p_vout->pf_manage = ManageVideo; p_vout->pf_render = NULL; p_vout->pf_display = DisplayVideo; + p_vout->pf_control = Control; /* Allocate structure */ p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); @@ -150,6 +170,8 @@ int E_(Activate) ( vlc_object_t *p_this ) return VLC_ENOMEM; } + vlc_mutex_init( p_vout, &p_vout->p_sys->lock ); + /* Open display, using the "display" config variable or the DISPLAY * environment variable */ psz_display = config_GetPsz( p_vout, MODULE_STRING "-display" ); @@ -166,6 +188,9 @@ int E_(Activate) ( vlc_object_t *p_this ) } if( psz_display ) free( psz_display ); + /* Replace error handler so we can intercept some non-fatal errors */ + XSetErrorHandler( X11ErrorHandler ); + /* Get a screen ID matching the XOpenDisplay return value */ p_vout->p_sys->i_screen = DefaultScreen( p_vout->p_sys->p_display ); @@ -241,7 +266,7 @@ int E_(Activate) ( vlc_object_t *p_this ) /* Set main window's size */ p_vout->p_sys->original_window.i_width = p_vout->i_window_width; p_vout->p_sys->original_window.i_height = p_vout->i_window_height; - + var_Create( p_vout, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); /* Spawn base window - this window will include the video output window, * but also command buttons, subtitles and other indicators */ if( CreateWindow( p_vout, &p_vout->p_sys->original_window ) ) @@ -273,6 +298,11 @@ int E_(Activate) ( vlc_object_t *p_this ) TestNetWMSupport( p_vout ); + /* Variable to indicate if the window should be on top of others */ + /* Trigger a callback right now */ + var_Get( p_vout, "video-on-top", &val ); + var_Set( p_vout, "video-on-top", val ); + return VLC_SUCCESS; } @@ -303,7 +333,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) { XFreeColormap( p_vout->p_sys->p_display, p_vout->p_sys->colormap ); } -#else +#elif defined(MODULE_NAME_IS_xvideo) XVideoReleasePort( p_vout, p_vout->p_sys->i_xvport ); #endif @@ -314,6 +344,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) XCloseDisplay( p_vout->p_sys->p_display ); /* Destroy structure */ + vlc_mutex_destroy( &p_vout->p_sys->lock ); free( p_vout->p_sys ); } @@ -338,6 +369,9 @@ static int InitVideo( vout_thread_t *p_vout ) p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + switch( p_vout->output.i_chroma ) { case VLC_FOURCC('R','V','1','5'): @@ -352,7 +386,7 @@ static int InitVideo( vout_thread_t *p_vout ) break; } -#else +#elif defined(MODULE_NAME_IS_x11) /* Initialize the output structure: RGB with square pixels, whatever * the input format is, since it's the only format we know */ switch( p_vout->p_sys->i_screen_depth ) @@ -364,9 +398,8 @@ static int InitVideo( vout_thread_t *p_vout ) case 16: p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break; case 24: - p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break; case 32: - p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break; + p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break; default: msg_Err( p_vout, "unknown screen depth %i", p_vout->p_sys->i_screen_depth ); @@ -376,11 +409,33 @@ static int InitVideo( vout_thread_t *p_vout ) vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width, p_vout->p_sys->p_win->i_height, &i_index, &i_index, - &p_vout->output.i_width, &p_vout->output.i_height ); - - /* Assume we have square pixels */ - p_vout->output.i_aspect = p_vout->output.i_width - * VOUT_ASPECT_FACTOR / p_vout->output.i_height; + &p_vout->fmt_out.i_visible_width, + &p_vout->fmt_out.i_visible_height ); + + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + + p_vout->output.i_width = p_vout->fmt_out.i_width = + p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_width / + p_vout->fmt_in.i_visible_width; + p_vout->output.i_height = p_vout->fmt_out.i_height = + p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_height / + p_vout->fmt_in.i_visible_height; + p_vout->fmt_out.i_x_offset = + p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_x_offset / + p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_y_offset = + p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_y_offset / + p_vout->fmt_in.i_visible_height; + + p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1; + p_vout->output.i_aspect = p_vout->fmt_out.i_aspect = + p_vout->fmt_out.i_width * VOUT_ASPECT_FACTOR /p_vout->fmt_out.i_height; + + msg_Dbg( p_vout, "x11 image size %ix%i (%i,%i,%ix%i)", + p_vout->fmt_out.i_width, p_vout->fmt_out.i_height, + p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height ); #endif /* Try to initialize up to MAX_DIRECTBUFFERS direct buffers */ @@ -412,10 +467,18 @@ static int InitVideo( vout_thread_t *p_vout ) I_OUTPUTPICTURES++; } + if( p_vout->output.i_chroma == VLC_FOURCC('Y','V','1','2') ) + { + /* U and V inverted compared to I420 + * Fixme: this should be handled by the vout core */ + p_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); + p_vout->fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); + } + return VLC_SUCCESS; } - /***************************************************************************** +/***************************************************************************** * DisplayVideo: displays previously rendered output ***************************************************************************** * This function sends the currently rendered image to X11 server. @@ -429,6 +492,8 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->p_sys->p_win->i_height, &i_x, &i_y, &i_width, &i_height ); + vlc_mutex_lock( &p_vout->p_sys->lock ); + #ifdef HAVE_SYS_SHM_H if( p_vout->p_sys->b_shm ) { @@ -437,16 +502,21 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) XvShmPutImage( p_vout->p_sys->p_display, p_vout->p_sys->i_xvport, p_vout->p_sys->p_win->video_window, p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image, - 0 /*src_x*/, 0 /*src_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, 0 /*dest_x*/, 0 /*dest_y*/, i_width, i_height, False /* Don't put True here or you'll waste your CPU */ ); # else XShmPutImage( p_vout->p_sys->p_display, p_vout->p_sys->p_win->video_window, p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image, - 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + 0 /*dest_x*/, 0 /*dest_y*/, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, False /* Don't put True here ! */ ); # endif } @@ -458,20 +528,27 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) XvPutImage( p_vout->p_sys->p_display, p_vout->p_sys->i_xvport, p_vout->p_sys->p_win->video_window, p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image, - 0 /*src_x*/, 0 /*src_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, 0 /*dest_x*/, 0 /*dest_y*/, i_width, i_height ); #else XPutImage( p_vout->p_sys->p_display, p_vout->p_sys->p_win->video_window, p_vout->p_sys->p_win->gc, p_pic->p_sys->p_image, - 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/, - p_vout->output.i_width, p_vout->output.i_height ); + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + 0 /*dest_x*/, 0 /*dest_y*/, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height ); #endif } /* Make sure the command is sent now - do NOT use XFlush !*/ XSync( p_vout->p_sys->p_display, False ); + + vlc_mutex_unlock( &p_vout->p_sys->lock ); } /***************************************************************************** @@ -484,10 +561,29 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) static int ManageVideo( vout_thread_t *p_vout ) { XEvent xevent; /* X11 event */ - char i_key; /* ISO Latin-1 key */ - KeySym x_key_symbol; vlc_value_t val; + vlc_mutex_lock( &p_vout->p_sys->lock ); + + /* Handle events from the owner window */ + if( p_vout->p_sys->p_win->owner_window ) + { + while( XCheckWindowEvent( p_vout->p_sys->p_display, + p_vout->p_sys->p_win->owner_window, + StructureNotifyMask, &xevent ) == True ) + { + /* ConfigureNotify event: prepare */ + if( xevent.type == ConfigureNotify ) + { + /* Update dimensions */ + XResizeWindow( p_vout->p_sys->p_display, + p_vout->p_sys->p_win->base_window, + xevent.xconfigure.width, + xevent.xconfigure.height ); + } + } + } + /* Handle X11 events: ConfigureNotify events are parsed to know if the * output window's size changed, MapNotify and UnmapNotify to know if the * window is mapped (and if the display is useful), and ClientMessages @@ -517,119 +613,44 @@ static int ManageVideo( vout_thread_t *p_vout ) /* Keyboard event */ else if( xevent.type == KeyPress ) { + unsigned int state = xevent.xkey.state; + KeySym x_key_symbol; + char i_key; /* ISO Latin-1 key */ + /* We may have keys like F1 trough F12, ESC ... */ x_key_symbol = XKeycodeToKeysym( p_vout->p_sys->p_display, xevent.xkey.keycode, 0 ); - switch( (int)x_key_symbol ) - { - case XK_Escape: - if( p_vout->b_fullscreen ) - { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - } - else - { - /* the user wants to close the window */ - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_vout, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist != NULL ) - { - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); - } - } - break; - case XK_Menu: - { - intf_thread_t *p_intf; - playlist_t * p_playlist; + val.i_int = ConvertKey( (int)x_key_symbol ); - p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF, - FIND_ANYWHERE ); - if( p_intf ) - { - p_intf->b_menu_change = 1; - vlc_object_release( p_intf ); - } + xevent.xkey.state &= ~ShiftMask; + xevent.xkey.state &= ~ControlMask; + xevent.xkey.state &= ~Mod1Mask; - p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist != NULL ) - { - vlc_value_t val; - var_Set( p_playlist, "intf-popupmenu", val ); - vlc_object_release( p_playlist ); - } - } - break; - case XK_Left: -/* input_Seek( p_vout, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */ - val.psz_string = "LEFT"; - var_Set( p_vout, "key-pressed", val ); - break; - case XK_Right: -/* input_Seek( p_vout, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */ - val.psz_string = "RIGHT"; - var_Set( p_vout, "key-pressed", val ); - break; - case XK_Up: -/* input_Seek( p_vout, 60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */ - val.psz_string = "UP"; - var_Set( p_vout, "key-pressed", val ); - break; - case XK_Down: -/* input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */ - val.psz_string = "DOWN"; - var_Set( p_vout, "key-pressed", val ); - break; - case XK_Return: - case XK_KP_Enter: - val.psz_string = "ENTER"; - var_Set( p_vout, "key-pressed", val ); - break; - case XK_Home: - input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_SET ); - break; - case XK_End: - input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_END ); - break; - case XK_Page_Up: - input_Seek( p_vout, 10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - break; - case XK_Page_Down: - input_Seek( p_vout, -10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); - break; - case XK_space: - input_SetStatus( p_vout, INPUT_STATUS_PAUSE ); - break; - - default: + if( !val.i_int && + XLookupString( &xevent.xkey, &i_key, 1, NULL, NULL ) ) + { /* "Normal Keys" * The reason why I use this instead of XK_0 is that * with XLookupString, we don't have to care about * keymaps. */ + val.i_int = i_key; + } - if( XLookupString( &xevent.xkey, &i_key, 1, NULL, NULL ) ) + if( val.i_int ) + { + if( state & ShiftMask ) { - /* FIXME: handle stuff here */ - switch( i_key ) - { - case 'q': - case 'Q': - p_vout->p_vlc->b_die = 1; - break; - case 'f': - case 'F': - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - break; - - default: - break; - } + val.i_int |= KEY_MODIFIER_SHIFT; } - break; + if( state & ControlMask ) + { + val.i_int |= KEY_MODIFIER_CTRL; + } + if( state & Mod1Mask ) + { + val.i_int |= KEY_MODIFIER_ALT; + } + var_Set( p_vout->p_vlc, "key-pressed", val ); } } /* Mouse click */ @@ -641,7 +662,7 @@ static int ManageVideo( vout_thread_t *p_vout ) var_Get( p_vout, "mouse-button-down", &val ); val.i_int |= 1; var_Set( p_vout, "mouse-button-down", val ); - + /* detect double-clicks */ if( ( ((XButtonEvent *)&xevent)->time - p_vout->p_sys->i_time_button_last_pressed ) < 300 ) @@ -657,25 +678,23 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int |= 2; var_Set( p_vout, "mouse-button-down", val ); break; - + case Button3: var_Get( p_vout, "mouse-button-down", &val ); val.i_int |= 4; var_Set( p_vout, "mouse-button-down", val ); break; - + case Button4: var_Get( p_vout, "mouse-button-down", &val ); val.i_int |= 8; var_Set( p_vout, "mouse-button-down", val ); - input_Seek( p_vout, 15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); break; case Button5: var_Get( p_vout, "mouse-button-down", &val ); val.i_int |= 16; var_Set( p_vout, "mouse-button-down", val ); - input_Seek( p_vout, -15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); break; } } @@ -692,7 +711,7 @@ static int ManageVideo( vout_thread_t *p_vout ) val.b_bool = VLC_TRUE; var_Set( p_vout, "mouse-clicked", val ); break; - + case Button2: { playlist_t *p_playlist; @@ -714,7 +733,7 @@ static int ManageVideo( vout_thread_t *p_vout ) } } break; - + case Button3: { intf_thread_t *p_intf; @@ -736,7 +755,7 @@ static int ManageVideo( vout_thread_t *p_vout ) FIND_ANYWHERE ); if( p_playlist != NULL ) { - vlc_value_t val; + vlc_value_t val; val.b_bool = VLC_TRUE; var_Set( p_playlist, "intf-popupmenu", val ); vlc_object_release( p_playlist ); } @@ -754,7 +773,7 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int &= ~16; var_Set( p_vout, "mouse-button-down", val ); break; - + } } /* Mouse move */ @@ -770,11 +789,13 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->p_sys->p_win->i_height, &i_x, &i_y, &i_width, &i_height ); - val.i_int = ( xevent.xmotion.x - i_x ) - * p_vout->render.i_width / i_width; + val.i_int = ( xevent.xmotion.x - i_x ) * + p_vout->fmt_in.i_visible_width / i_width + + p_vout->fmt_in.i_x_offset; var_Set( p_vout, "mouse-x", val ); - val.i_int = ( xevent.xmotion.y - i_y ) - * p_vout->render.i_height / i_height; + val.i_int = ( xevent.xmotion.y - i_y ) * + p_vout->fmt_in.i_visible_height / i_height + + p_vout->fmt_in.i_y_offset; var_Set( p_vout, "mouse-y", val ); val.b_bool = VLC_TRUE; @@ -860,6 +881,24 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; } + if( p_vout->i_changes & VOUT_CROP_CHANGE || + p_vout->i_changes & VOUT_ASPECT_CHANGE ) + { + p_vout->i_changes &= ~VOUT_CROP_CHANGE; + p_vout->i_changes &= ~VOUT_ASPECT_CHANGE; + + p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset; + p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset; + p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height; + p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect; + p_vout->fmt_out.i_sar_num = p_vout->fmt_in.i_sar_num; + p_vout->fmt_out.i_sar_den = p_vout->fmt_in.i_sar_den; + p_vout->output.i_aspect = p_vout->fmt_in.i_aspect; + + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } + /* * Size change * @@ -882,11 +921,9 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->p_sys->p_win->i_height, &i_x, &i_y, &i_width, &i_height ); - XResizeWindow( p_vout->p_sys->p_display, - p_vout->p_sys->p_win->video_window, i_width, i_height ); - - XMoveWindow( p_vout->p_sys->p_display, - p_vout->p_sys->p_win->video_window, i_x, i_y ); + XMoveResizeWindow( p_vout->p_sys->p_display, + p_vout->p_sys->p_win->video_window, + i_x, i_y, i_width, i_height ); } /* Autohide Cursour */ @@ -899,6 +936,8 @@ static int ManageVideo( vout_thread_t *p_vout ) } } + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return 0; } @@ -935,30 +974,53 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) vlc_bool_t b_expose = VLC_FALSE; vlc_bool_t b_configure_notify = VLC_FALSE; vlc_bool_t b_map_notify = VLC_FALSE; - vlc_value_t val; - long long int i_drawable; /* Prepare window manager hints and properties */ - xsize_hints.base_width = p_win->i_width; - xsize_hints.base_height = p_win->i_height; - xsize_hints.flags = PSize; p_win->wm_protocols = XInternAtom( p_vout->p_sys->p_display, "WM_PROTOCOLS", True ); p_win->wm_delete_window = XInternAtom( p_vout->p_sys->p_display, "WM_DELETE_WINDOW", True ); + /* Never have a 0-pixel-wide window */ + xsize_hints.min_width = 2; + xsize_hints.min_height = 1; + /* Prepare window attributes */ xwindow_attributes.backing_store = Always; /* save the hidden part */ xwindow_attributes.background_pixel = BlackPixel(p_vout->p_sys->p_display, p_vout->p_sys->i_screen); xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask; - /* Check whether someone provided us with a window ID */ - var_Get( p_vout->p_vlc, "drawable", &val ); - i_drawable = p_vout->b_fullscreen ? 0 : val.i_int; + if( !p_vout->b_fullscreen ) + { + p_win->owner_window = + (Window)vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y, + &p_win->i_width, &p_win->i_height ); + + xsize_hints.base_width = xsize_hints.width = p_win->i_width; + xsize_hints.base_height = xsize_hints.height = p_win->i_height; + xsize_hints.flags = PSize | PMinSize; - if( !i_drawable ) + if( p_win->i_x >=0 || p_win->i_y >= 0 ) + { + xsize_hints.x = p_win->i_x; + xsize_hints.y = p_win->i_y; + xsize_hints.flags |= PPosition; + } + } + else + { + /* Fullscreen window size and position */ + p_win->owner_window = 0; + p_win->i_x = p_win->i_y = 0; + p_win->i_width = + DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); + p_win->i_height = + DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); + } + + if( !p_win->owner_window ) { /* Create the window and set hints - the window must receive * ConfigureNotify events, and until it is displayed, Expose and @@ -967,7 +1029,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) p_win->base_window = XCreateWindow( p_vout->p_sys->p_display, DefaultRootWindow( p_vout->p_sys->p_display ), - 0, 0, + p_win->i_x, p_win->i_y, p_win->i_width, p_win->i_height, 0, 0, InputOutput, 0, @@ -983,21 +1045,57 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) XSetCommand( p_vout->p_sys->p_display, p_win->base_window, p_vout->p_vlc->ppsz_argv, p_vout->p_vlc->i_argc ); - XStoreName( p_vout->p_sys->p_display, p_win->base_window, + if( !var_GetBool( p_vout, "video-deco") ) + { + Atom prop; + mwmhints_t mwmhints; + + mwmhints.flags = MWM_HINTS_DECORATIONS; + mwmhints.decorations = False; + + prop = XInternAtom( p_vout->p_sys->p_display, "_MOTIF_WM_HINTS", + False ); + + XChangeProperty( p_vout->p_sys->p_display, + p_win->base_window, + prop, prop, 32, PropModeReplace, + (unsigned char *)&mwmhints, + PROP_MWM_HINTS_ELEMENTS ); + } + else + { + var_Get( p_vout, "video-title", &val ); + if( !val.psz_string || !*val.psz_string ) + { + XStoreName( p_vout->p_sys->p_display, p_win->base_window, #ifdef MODULE_NAME_IS_x11 - VOUT_TITLE " (X11 output)" + VOUT_TITLE " (X11 output)" +#elif defined(MODULE_NAME_IS_glx) + VOUT_TITLE " (GLX output)" #else - VOUT_TITLE " (XVideo output)" + VOUT_TITLE " (XVideo output)" #endif ); + } + else + { + XStoreName( p_vout->p_sys->p_display, + p_win->base_window, val.psz_string ); + } + } } } else { - /* Get the parent window's geometry information */ Window dummy1; unsigned int dummy2, dummy3; - XGetGeometry( p_vout->p_sys->p_display, i_drawable, + + /* Select events we are interested in. */ + XSelectInput( p_vout->p_sys->p_display, p_win->owner_window, + StructureNotifyMask ); + + /* Get the parent window's geometry information */ + XGetGeometry( p_vout->p_sys->p_display, p_win->owner_window, &dummy1, &dummy2, &dummy3, &p_win->i_width, &p_win->i_height, @@ -1010,7 +1108,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) * ButtonPress event, so we need to open a new window anyway. */ p_win->base_window = XCreateWindow( p_vout->p_sys->p_display, - i_drawable, + p_win->owner_window, 0, 0, p_win->i_width, p_win->i_height, 0, @@ -1043,11 +1141,17 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) XMapWindow( p_vout->p_sys->p_display, p_win->base_window ); do { - XNextEvent( p_vout->p_sys->p_display, &xevent); + XWindowEvent( p_vout->p_sys->p_display, p_win->base_window, + SubstructureNotifyMask | StructureNotifyMask | + ExposureMask, &xevent); if( (xevent.type == Expose) && (xevent.xexpose.window == p_win->base_window) ) { b_expose = VLC_TRUE; + /* ConfigureNotify isn't sent if there isn't a window manager. + * Expose should be the last event to be received so it should + * be fine to assume we won't receive it anymore. */ + b_configure_notify = VLC_TRUE; } else if( (xevent.type == MapNotify) && (xevent.xmap.window == p_win->base_window) ) @@ -1134,11 +1238,16 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win ) /* Do NOT use XFlush here ! */ XSync( p_vout->p_sys->p_display, False ); - XDestroyWindow( p_vout->p_sys->p_display, p_win->video_window ); + if( p_win->video_window != None ) + XDestroyWindow( p_vout->p_sys->p_display, p_win->video_window ); + XFreeGC( p_vout->p_sys->p_display, p_win->gc ); XUnmapWindow( p_vout->p_sys->p_display, p_win->base_window ); XDestroyWindow( p_vout->p_sys->p_display, p_win->base_window ); + + if( p_win->owner_window ) + vout_ReleaseWindow( p_vout, (void *)p_win->owner_window ); } /***************************************************************************** @@ -1148,6 +1257,12 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win ) *****************************************************************************/ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) { +#ifndef MODULE_NAME_IS_glx + +#ifdef MODULE_NAME_IS_xvideo + int i_plane; +#endif + /* We know the chroma, allocate a buffer which will be used * directly by the decoder */ p_pic->p_sys = malloc( sizeof( picture_sys_t ) ); @@ -1157,6 +1272,11 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) return -1; } + /* Fill in picture_t fields */ + vout_InitPicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma, + p_vout->output.i_width, p_vout->output.i_height, + p_vout->output.i_aspect ); + #ifdef HAVE_SYS_SHM_H if( p_vout->p_sys->b_shm ) { @@ -1164,7 +1284,8 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_pic->p_sys->p_image = CreateShmImage( p_vout, p_vout->p_sys->p_display, # ifdef MODULE_NAME_IS_xvideo - p_vout->p_sys->i_xvport, p_vout->output.i_chroma, + p_vout->p_sys->i_xvport, + VLC2X11_FOURCC(p_vout->output.i_chroma), # else p_vout->p_sys->p_visual, p_vout->p_sys->i_screen_depth, @@ -1172,20 +1293,31 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) &p_pic->p_sys->shminfo, p_vout->output.i_width, p_vout->output.i_height ); } - else + + if( !p_vout->p_sys->b_shm || !p_pic->p_sys->p_image ) #endif /* HAVE_SYS_SHM_H */ { /* Create image without XShm extension */ p_pic->p_sys->p_image = CreateImage( p_vout, p_vout->p_sys->p_display, #ifdef MODULE_NAME_IS_xvideo - p_vout->p_sys->i_xvport, p_vout->output.i_chroma, + p_vout->p_sys->i_xvport, + VLC2X11_FOURCC(p_vout->output.i_chroma), + p_pic->format.i_bits_per_pixel, #else p_vout->p_sys->p_visual, p_vout->p_sys->i_screen_depth, p_vout->p_sys->i_bytes_per_pixel, #endif p_vout->output.i_width, p_vout->output.i_height ); + +#ifdef HAVE_SYS_SHM_H + if( p_pic->p_sys->p_image && p_vout->p_sys->b_shm ) + { + msg_Warn( p_vout, "couldn't create SHM image, disabling SHM." ); + p_vout->p_sys->b_shm = VLC_FALSE; + } +#endif /* HAVE_SYS_SHM_H */ } if( p_pic->p_sys->p_image == NULL ) @@ -1198,148 +1330,51 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) { #ifdef MODULE_NAME_IS_xvideo case VLC_FOURCC('I','4','2','0'): - - p_pic->Y_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p[Y_PLANE].i_lines = p_vout->output.i_height; - p_pic->p[Y_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[0]; - p_pic->p[Y_PLANE].i_pixel_pitch = 1; - p_pic->p[Y_PLANE].i_visible_pitch = p_vout->output.i_width; - - p_pic->U_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[1]; - p_pic->p[U_PLANE].i_lines = p_vout->output.i_height / 2; - p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[1]; - p_pic->p[U_PLANE].i_pixel_pitch = 1; - p_pic->p[U_PLANE].i_visible_pitch = p_vout->output.i_width / 2; - - p_pic->V_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[2]; - p_pic->p[V_PLANE].i_lines = p_vout->output.i_height / 2; - p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[2]; - p_pic->p[V_PLANE].i_pixel_pitch = 1; - p_pic->p[V_PLANE].i_visible_pitch = p_vout->output.i_width / 2; - - p_pic->i_planes = 3; - break; - case VLC_FOURCC('Y','V','1','2'): - - p_pic->Y_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p[Y_PLANE].i_lines = p_vout->output.i_height; - p_pic->p[Y_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[0]; - p_pic->p[Y_PLANE].i_pixel_pitch = 1; - p_pic->p[Y_PLANE].i_visible_pitch = p_pic->p[Y_PLANE].i_pitch; - p_pic->p[Y_PLANE].i_visible_pitch = p_vout->output.i_width; - - p_pic->U_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[2]; - p_pic->p[U_PLANE].i_lines = p_vout->output.i_height / 2; - p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[2]; - p_pic->p[U_PLANE].i_pixel_pitch = 1; - p_pic->p[U_PLANE].i_visible_pitch = p_vout->output.i_width / 2; - - p_pic->V_PIXELS = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[1]; - p_pic->p[V_PLANE].i_lines = p_vout->output.i_height / 2; - p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[1]; - p_pic->p[V_PLANE].i_pixel_pitch = 1; - p_pic->p[V_PLANE].i_visible_pitch = p_vout->output.i_width / 2; - - p_pic->i_planes = 3; - break; - case VLC_FOURCC('Y','2','1','1'): - - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p->i_lines = p_vout->output.i_height; - /* XXX: this just looks so plain wrong... check it out ! */ - p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0] / 4; - p_pic->p->i_pixel_pitch = 4; - p_pic->p->i_visible_pitch = p_vout->output.i_width * 4; - - p_pic->i_planes = 1; - break; - case VLC_FOURCC('Y','U','Y','2'): case VLC_FOURCC('U','Y','V','Y'): - - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p->i_lines = p_vout->output.i_height; - p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0]; - p_pic->p->i_pixel_pitch = 4; - p_pic->p->i_visible_pitch = p_vout->output.i_width * 4; - - p_pic->i_planes = 1; - break; - case VLC_FOURCC('R','V','1','5'): - - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p->i_lines = p_vout->output.i_height; - p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0]; - p_pic->p->i_pixel_pitch = 2; - p_pic->p->i_visible_pitch = p_vout->output.i_width * 2; - - p_pic->i_planes = 1; - break; - case VLC_FOURCC('R','V','1','6'): + case VLC_FOURCC('R','V','2','4'): /* Fixme: pixel pitch == 4 ? */ + case VLC_FOURCC('R','V','3','2'): - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->offsets[0]; - p_pic->p->i_lines = p_vout->output.i_height; - p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0]; - p_pic->p->i_pixel_pitch = 2; - p_pic->p->i_visible_pitch = p_vout->output.i_width * 2; - - p_pic->i_planes = 1; + for( i_plane = 0; i_plane < p_pic->p_sys->p_image->num_planes; + i_plane++ ) + { + p_pic->p[i_plane].p_pixels = p_pic->p_sys->p_image->data + + p_pic->p_sys->p_image->offsets[i_plane]; + p_pic->p[i_plane].i_pitch = + p_pic->p_sys->p_image->pitches[i_plane]; + } + if( p_vout->output.i_chroma == VLC_FOURCC('Y','V','1','2') ) + { + /* U and V inverted compared to I420 + * Fixme: this should be handled by the vout core */ + p_pic->U_PIXELS = p_pic->p_sys->p_image->data + + p_pic->p_sys->p_image->offsets[2]; + p_pic->V_PIXELS = p_pic->p_sys->p_image->data + + p_pic->p_sys->p_image->offsets[1]; + } break; #else case VLC_FOURCC('R','G','B','2'): - - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->xoffset; - p_pic->p->i_lines = p_pic->p_sys->p_image->height; - p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line; - p_pic->p->i_pixel_pitch = p_pic->p_sys->p_image->depth; - p_pic->p->i_visible_pitch = p_pic->p_sys->p_image->width; - - p_pic->i_planes = 1; - - break; - case VLC_FOURCC('R','V','1','6'): case VLC_FOURCC('R','V','1','5'): - - p_pic->p->p_pixels = p_pic->p_sys->p_image->data - + p_pic->p_sys->p_image->xoffset; - p_pic->p->i_lines = p_pic->p_sys->p_image->height; - p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line; - p_pic->p->i_pixel_pitch = p_pic->p_sys->p_image->depth; - p_pic->p->i_visible_pitch = 2 * p_pic->p_sys->p_image->width; - - p_pic->i_planes = 1; - - break; - - case VLC_FOURCC('R','V','3','2'): case VLC_FOURCC('R','V','2','4'): + case VLC_FOURCC('R','V','3','2'): + p_pic->p->i_lines = p_pic->p_sys->p_image->height; + p_pic->p->i_visible_lines = p_pic->p_sys->p_image->height; p_pic->p->p_pixels = p_pic->p_sys->p_image->data + p_pic->p_sys->p_image->xoffset; - p_pic->p->i_lines = p_pic->p_sys->p_image->height; p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line; - p_pic->p->i_pixel_pitch = p_pic->p_sys->p_image->depth; - p_pic->p->i_visible_pitch = 4 * p_pic->p_sys->p_image->width; - - p_pic->i_planes = 1; + /* p_pic->p->i_pixel_pitch = 4 for RV24 but this should be set + * properly by vout_InitPicture() */ + p_pic->p->i_visible_pitch = p_pic->p->i_pixel_pitch + * p_pic->p_sys->p_image->width; break; #endif @@ -1353,6 +1388,8 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) return -1; } +#endif /* !MODULE_NAME_IS_glx */ + return 0; } @@ -1418,17 +1455,18 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) config_GetInt( p_vout, MODULE_STRING "-altfullscreen" ); XUnmapWindow( p_vout->p_sys->p_display, - p_vout->p_sys->p_win->base_window); + p_vout->p_sys->p_win->base_window ); p_vout->p_sys->p_win = &p_vout->p_sys->fullscreen_window; - /* fullscreen window size and position */ - p_vout->p_sys->p_win->i_width = - DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); - p_vout->p_sys->p_win->i_height = - DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); - CreateWindow( p_vout, p_vout->p_sys->p_win ); + XDestroyWindow( p_vout->p_sys->p_display, + p_vout->p_sys->fullscreen_window.video_window ); + XReparentWindow( p_vout->p_sys->p_display, + p_vout->p_sys->original_window.video_window, + p_vout->p_sys->fullscreen_window.base_window, 0, 0 ); + p_vout->p_sys->fullscreen_window.video_window = + p_vout->p_sys->original_window.video_window; /* To my knowledge there are two ways to create a borderless window. * There's the generic way which is to tell x to bypass the window @@ -1491,15 +1529,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) DefaultRootWindow( p_vout->p_sys->p_display ), 0, 0 ); - /* fullscreen window size and position */ - p_vout->p_sys->p_win->i_width = - DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); - p_vout->p_sys->p_win->i_height = - DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen ); - - p_vout->p_sys->p_win->i_x = 0; - p_vout->p_sys->p_win->i_y = 0; - #ifdef HAVE_XINERAMA if( XineramaQueryExtension( p_vout->p_sys->p_display, &i_d1, &i_d2 ) && XineramaIsActive( p_vout->p_sys->p_display ) ) @@ -1507,22 +1536,21 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) XineramaScreenInfo *screens; /* infos for xinerama */ int i_num_screens; - msg_Dbg( p_vout, "Using XFree Xinerama extension"); + msg_Dbg( p_vout, "using XFree Xinerama extension"); #define SCREEN p_vout->p_sys->p_win->i_screen - /* Get Informations about Xinerama (num of screens) */ + /* Get Information about Xinerama (num of screens) */ screens = XineramaQueryScreens( p_vout->p_sys->p_display, &i_num_screens ); - if( !SCREEN ) - SCREEN = config_GetInt( p_vout, + SCREEN = config_GetInt( p_vout, MODULE_STRING "-xineramascreen" ); /* just check that user has entered a good value */ if( SCREEN >= i_num_screens || SCREEN < 0 ) { - msg_Dbg( p_vout, "requested screen number invalid" ); + msg_Dbg( p_vout, "requested screen number invalid (%d/%d)", SCREEN, i_num_screens ); SCREEN = 0; } @@ -1539,7 +1567,45 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) #undef SCREEN } + else #endif + { + /* The window wasn't necessarily created at the requested size */ + p_vout->p_sys->p_win->i_x = p_vout->p_sys->p_win->i_y = 0; + +#ifdef HAVE_XF86VIDMODE + XF86VidModeModeLine mode; + int i_dummy; + + if( XF86VidModeGetModeLine( p_vout->p_sys->p_display, + p_vout->p_sys->i_screen, &i_dummy, + &mode ) ) + { + p_vout->p_sys->p_win->i_width = mode.hdisplay; + p_vout->p_sys->p_win->i_height = mode.vdisplay; + + /* move cursor to the middle of the window to prevent + * unwanted display move if the display is smaller than the + * full desktop */ + XWarpPointer( p_vout->p_sys->p_display, None, + p_vout->p_sys->p_win->base_window, 0, 0, 0, 0, + mode.hdisplay / 2 , mode.vdisplay / 2 ); + /* force desktop view to upper left corner */ + XF86VidModeSetViewPort( p_vout->p_sys->p_display, + p_vout->p_sys->i_screen, 0, 0 ); + } + else +#endif + { + p_vout->p_sys->p_win->i_width = + DisplayWidth( p_vout->p_sys->p_display, + p_vout->p_sys->i_screen ); + p_vout->p_sys->p_win->i_height = + DisplayHeight( p_vout->p_sys->p_display, + p_vout->p_sys->i_screen ); + } + + } XMoveResizeWindow( p_vout->p_sys->p_display, p_vout->p_sys->p_win->base_window, @@ -1551,11 +1617,17 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) else { msg_Dbg( p_vout, "leaving fullscreen mode" ); + + XReparentWindow( p_vout->p_sys->p_display, + p_vout->p_sys->original_window.video_window, + p_vout->p_sys->original_window.base_window, 0, 0 ); + + p_vout->p_sys->fullscreen_window.video_window = None; DestroyWindow( p_vout, &p_vout->p_sys->fullscreen_window ); p_vout->p_sys->p_win = &p_vout->p_sys->original_window; XMapWindow( p_vout->p_sys->p_display, - p_vout->p_sys->p_win->base_window); + p_vout->p_sys->p_win->base_window ); } /* Unfortunately, using XSync() here is not enough to ensure the @@ -1625,7 +1697,7 @@ static void DisableXScreenSaver( vout_thread_t *p_vout ) int dummy; #endif - /* Save screen saver informations */ + /* Save screen saver information */ XGetScreenSaver( p_vout->p_sys->p_display, &p_vout->p_sys->i_ss_timeout, &p_vout->p_sys->i_ss_interval, &p_vout->p_sys->i_ss_blanking, @@ -1795,13 +1867,8 @@ static int XVideoGetPort( vout_thread_t *p_vout, i_format < i_num_formats && ( i_selected_port == -1 ); i_format++ ) { - /* Code removed, we can get this through xvinfo anyway */ -#if 0 - XvEncodingInfo *p_enc; - int i_enc, i_num_encodings; XvAttribute *p_attr; int i_attr, i_num_attributes; -#endif /* If this is not the format we want, or at least a * similar one, forget it */ @@ -1838,50 +1905,28 @@ static int XVideoGetPort( vout_thread_t *p_vout, ( p_formats[ i_format ].format == XvPacked ) ? "packed" : "planar" ); -#if 0 - msg_Dbg( p_vout, " encoding list:" ); - - if( XvQueryEncodings( p_vout->p_sys->p_display, i_selected_port, - &i_num_encodings, &p_enc ) - != Success ) - { - msg_Dbg( p_vout, " XvQueryEncodings failed" ); - continue; - } - - for( i_enc = 0; i_enc < i_num_encodings; i_enc++ ) - { - msg_Dbg( p_vout, " id=%ld, name=%s, size=%ldx%ld," - " numerator=%d, denominator=%d", - p_enc[i_enc].encoding_id, p_enc[i_enc].name, - p_enc[i_enc].width, p_enc[i_enc].height, - p_enc[i_enc].rate.numerator, - p_enc[i_enc].rate.denominator ); - } - - if( p_enc != NULL ) - { - XvFreeEncodingInfo( p_enc ); - } - - msg_Dbg( p_vout, " attribute list:" ); + /* Make sure XV_AUTOPAINT_COLORKEY is set */ p_attr = XvQueryPortAttributes( p_vout->p_sys->p_display, i_selected_port, &i_num_attributes ); + for( i_attr = 0; i_attr < i_num_attributes; i_attr++ ) { - msg_Dbg( p_vout, " name=%s, flags=[%s%s ], min=%i, max=%i", - p_attr[i_attr].name, - (p_attr[i_attr].flags & XvGettable) ? " get" : "", - (p_attr[i_attr].flags & XvSettable) ? " set" : "", - p_attr[i_attr].min_value, p_attr[i_attr].max_value ); + if( !strcmp( p_attr[i_attr].name, "XV_AUTOPAINT_COLORKEY" ) ) + { + const Atom autopaint = + XInternAtom( p_vout->p_sys->p_display, + "XV_AUTOPAINT_COLORKEY", False ); + XvSetPortAttribute( p_vout->p_sys->p_display, + i_selected_port, autopaint, 1 ); + break; + } } if( p_attr != NULL ) { XFree( p_attr ); } -#endif } if( p_formats != NULL ) @@ -1934,7 +1979,7 @@ static int InitDisplay( vout_thread_t *p_vout ) { #ifdef MODULE_NAME_IS_x11 XPixmapFormatValues * p_formats; /* pixmap formats */ - XVisualInfo * p_xvisual; /* visuals informations */ + XVisualInfo * p_xvisual; /* visuals information */ XVisualInfo xvisual_template; /* visual template */ int i_count; /* array size */ #endif @@ -1944,7 +1989,7 @@ static int InitDisplay( vout_thread_t *p_vout ) if( config_GetInt( p_vout, MODULE_STRING "-shm" ) ) { -# ifdef SYS_DARWIN +# ifdef __APPLE__ /* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */ # else p_vout->p_sys->b_shm = @@ -2067,9 +2112,15 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, int i_width, int i_height ) { IMAGE_TYPE *p_image; + Status result; /* Create XImage / XvImage */ #ifdef MODULE_NAME_IS_xvideo + + /* Make sure the buffer is aligned to multiple of 16 */ + i_height = ( i_height + 15 ) >> 4 << 4; + i_width = ( i_width + 15 ) >> 4 << 4; + p_image = XvShmCreateImage( p_display, i_xvport, i_chroma, 0, i_width, i_height, p_shm ); #else @@ -2108,7 +2159,10 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, p_shm->readOnly = True; /* Attach shared memory segment to X server */ - if( XShmAttach( p_display, p_shm ) == False ) + XSynchronize( p_display, True ); + b_shm = VLC_TRUE; + result = XShmAttach( p_display, p_shm ); + if( result == False || !b_shm ) { msg_Err( p_vout, "cannot attach shared memory to X server" ); IMAGE_FREE( p_image ); @@ -2116,6 +2170,7 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, shmdt( p_shm->shmaddr ); return NULL; } + XSynchronize( p_display, False ); /* Send image to X server. This instruction is required, since having * built a Shm XImage and not using it causes an error on XCloseDisplay, @@ -2150,8 +2205,13 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, /* Allocate memory for image */ #ifdef MODULE_NAME_IS_xvideo - p_data = (byte_t *) malloc( i_width * i_height * 2 ); /* XXX */ -#else + + /* Make sure the buffer is aligned to multiple of 16 */ + i_height = ( i_height + 15 ) >> 4 << 4; + i_width = ( i_width + 15 ) >> 4 << 4; + + p_data = (byte_t *) malloc( i_width * i_height * i_bits_per_pixel / 8 ); +#elif defined(MODULE_NAME_IS_x11) i_bytes_per_line = i_width * i_bytes_per_pixel; p_data = (byte_t *) malloc( i_bytes_per_line * i_height ); #endif @@ -2182,7 +2242,7 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, #ifdef MODULE_NAME_IS_xvideo p_image = XvCreateImage( p_display, i_xvport, i_chroma, p_data, i_width, i_height ); -#else +#elif defined(MODULE_NAME_IS_x11) p_image = XCreateImage( p_display, p_visual, i_depth, ZPixmap, 0, p_data, i_width, i_height, i_quantum, 0 ); #endif @@ -2196,6 +2256,31 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, return p_image; } +/***************************************************************************** + * X11ErrorHandler: replace error handler so we can intercept some of them + *****************************************************************************/ +static int X11ErrorHandler( Display * display, XErrorEvent * event ) +{ + /* Ingnore errors on XSetInputFocus() + * (they happen when a window is not yet mapped) */ + if( event->request_code == X_SetInputFocus ) + { + fprintf(stderr, "XSetInputFocus failed\n"); + return 0; + } + + if( event->request_code == 150 /* MIT-SHM */ && + event->minor_code == X_ShmAttach ) + { + fprintf(stderr, "XShmAttach failed\n"); + b_shm = VLC_FALSE; + return 0; + } + + XSetErrorHandler(NULL); + return (XSetErrorHandler(X11ErrorHandler))( display, event ); +} + #ifdef MODULE_NAME_IS_x11 /***************************************************************************** * SetPalette: sets an 8 bpp palette @@ -2228,6 +2313,85 @@ static void SetPalette( vout_thread_t *p_vout, } #endif +/***************************************************************************** + * Control: control facility for the vout + *****************************************************************************/ +static int Control( vout_thread_t *p_vout, int i_query, va_list args ) +{ + vlc_bool_t b_arg; + unsigned int i_width, i_height; + unsigned int *pi_width, *pi_height; + + switch( i_query ) + { + case VOUT_GET_SIZE: + if( p_vout->p_sys->p_win->owner_window ) + return vout_ControlWindow( p_vout, + (void *)p_vout->p_sys->p_win->owner_window, i_query, args); + + pi_width = va_arg( args, unsigned int * ); + pi_height = va_arg( args, unsigned int * ); + + vlc_mutex_lock( &p_vout->p_sys->lock ); + *pi_width = p_vout->p_sys->p_win->i_width; + *pi_height = p_vout->p_sys->p_win->i_height; + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return VLC_SUCCESS; + + case VOUT_SET_SIZE: + if( p_vout->p_sys->p_win->owner_window ) + return vout_ControlWindow( p_vout, + (void *)p_vout->p_sys->p_win->owner_window, i_query, args); + + vlc_mutex_lock( &p_vout->p_sys->lock ); + + i_width = va_arg( args, unsigned int ); + i_height = va_arg( args, unsigned int ); + if( !i_width ) i_width = p_vout->i_window_width; + if( !i_height ) i_height = p_vout->i_window_height; + + /* Update dimensions */ + XResizeWindow( p_vout->p_sys->p_display, + p_vout->p_sys->p_win->base_window, + i_width, i_height ); + + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return VLC_SUCCESS; + + case VOUT_CLOSE: + vlc_mutex_lock( &p_vout->p_sys->lock ); + XUnmapWindow( p_vout->p_sys->p_display, + p_vout->p_sys->original_window.base_window ); + vlc_mutex_unlock( &p_vout->p_sys->lock ); + /* Fall through */ + + case VOUT_REPARENT: + vlc_mutex_lock( &p_vout->p_sys->lock ); + XReparentWindow( p_vout->p_sys->p_display, + p_vout->p_sys->original_window.base_window, + DefaultRootWindow( p_vout->p_sys->p_display ), + 0, 0 ); + XSync( p_vout->p_sys->p_display, False ); + p_vout->p_sys->original_window.owner_window = 0; + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return vout_vaControlDefault( p_vout, i_query, args ); + + case VOUT_SET_STAY_ON_TOP: + if( p_vout->p_sys->p_win->owner_window ) + return vout_ControlWindow( p_vout, + (void *)p_vout->p_sys->p_win->owner_window, i_query, args); + + b_arg = va_arg( args, vlc_bool_t ); + vlc_mutex_lock( &p_vout->p_sys->lock ); + WindowOnTop( p_vout, b_arg ); + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return VLC_SUCCESS; + + default: + return vout_vaControlDefault( p_vout, i_query, args ); + } +} + /***************************************************************************** * TestNetWMSupport: tests for Extended Window Manager Hints support *****************************************************************************/ @@ -2235,7 +2399,10 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) { int i_ret, i_format; unsigned long i, i_items, i_bytesafter; - Atom net_wm_supported, *p_args = NULL; + Atom net_wm_supported; + union { Atom *p_atom; unsigned char *p_char; } p_args; + + p_args.p_atom = NULL; p_vout->p_sys->b_net_wm_state_fullscreen = VLC_FALSE; p_vout->p_sys->b_net_wm_state_above = VLC_FALSE; @@ -2272,23 +2439,23 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) for( i = 0; i < i_items; i++ ) { - if( p_args[i] == p_vout->p_sys->net_wm_state_fullscreen ) + if( p_args.p_atom[i] == p_vout->p_sys->net_wm_state_fullscreen ) { msg_Dbg( p_vout, "Window manager supports _NET_WM_STATE_FULLSCREEN" ); p_vout->p_sys->b_net_wm_state_fullscreen = VLC_TRUE; } - else if( p_args[i] == p_vout->p_sys->net_wm_state_above ) + else if( p_args.p_atom[i] == p_vout->p_sys->net_wm_state_above ) { msg_Dbg( p_vout, "Window manager supports _NET_WM_STATE_ABOVE" ); p_vout->p_sys->b_net_wm_state_above = VLC_TRUE; } - else if( p_args[i] == p_vout->p_sys->net_wm_state_below ) + else if( p_args.p_atom[i] == p_vout->p_sys->net_wm_state_below ) { msg_Dbg( p_vout, "Window manager supports _NET_WM_STATE_BELOW" ); p_vout->p_sys->b_net_wm_state_below = VLC_TRUE; } - else if( p_args[i] == p_vout->p_sys->net_wm_state_stays_on_top ) + else if( p_args.p_atom[i] == p_vout->p_sys->net_wm_state_stays_on_top ) { msg_Dbg( p_vout, "Window manager supports _NET_WM_STATE_STAYS_ON_TOP" ); @@ -2296,5 +2463,85 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) } } - XFree( p_args ); + XFree( p_args.p_atom ); +} + +/***************************************************************************** + * Key events handling + *****************************************************************************/ +static struct +{ + int i_x11key; + int i_vlckey; + +} x11keys_to_vlckeys[] = +{ + { XK_F1, KEY_F1 }, { XK_F2, KEY_F2 }, { XK_F3, KEY_F3 }, { XK_F4, KEY_F4 }, + { XK_F5, KEY_F5 }, { XK_F6, KEY_F6 }, { XK_F7, KEY_F7 }, { XK_F8, KEY_F8 }, + { XK_F9, KEY_F9 }, { XK_F10, KEY_F10 }, { XK_F11, KEY_F11 }, + { XK_F12, KEY_F12 }, + + { XK_Return, KEY_ENTER }, + { XK_KP_Enter, KEY_ENTER }, + { XK_space, KEY_SPACE }, + { XK_Escape, KEY_ESC }, + + { XK_Menu, KEY_MENU }, + { XK_Left, KEY_LEFT }, + { XK_Right, KEY_RIGHT }, + { XK_Up, KEY_UP }, + { XK_Down, KEY_DOWN }, + + { XK_Home, KEY_HOME }, + { XK_End, KEY_END }, + { XK_Page_Up, KEY_PAGEUP }, + { XK_Page_Down, KEY_PAGEDOWN }, + + { XK_Insert, KEY_INSERT }, + { XK_Delete, KEY_DELETE }, + + { 0, 0 } +}; + +static int ConvertKey( int i_key ) +{ + int i; + + for( i = 0; x11keys_to_vlckeys[i].i_x11key != 0; i++ ) + { + if( x11keys_to_vlckeys[i].i_x11key == i_key ) + { + return x11keys_to_vlckeys[i].i_vlckey; + } + } + + return 0; +} + +/***************************************************************************** + * WindowOnTop: Switches the "always on top" state of the video window. + *****************************************************************************/ +static int WindowOnTop( vout_thread_t *p_vout, vlc_bool_t b_on_top ) +{ + if( p_vout->p_sys->b_net_wm_state_stays_on_top ) + { + XClientMessageEvent event; + + memset( &event, 0, sizeof( XClientMessageEvent ) ); + + event.type = ClientMessage; + event.message_type = p_vout->p_sys->net_wm_state; + event.display = p_vout->p_sys->p_display; + event.window = p_vout->p_sys->p_win->base_window; + event.format = 32; + event.data.l[ 0 ] = b_on_top; /* set property */ + event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_stays_on_top; + + XSendEvent( p_vout->p_sys->p_display, + DefaultRootWindow( p_vout->p_sys->p_display ), + False, SubstructureRedirectMask, + (XEvent*)&event ); + } + + return VLC_SUCCESS; }