X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fx11%2Fxcommon.c;h=deb9569e3ba6196c8c132740a2a91c35eaeb0e86;hb=85c5476d316e6697abe423ef65894942eb999367;hp=03c8630505145a55b8e661ea1eb28a37a73c889a;hpb=e3b4a2c7fad771e31d33650ca887ee907fb9e780;p=vlc diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index 03c8630505..deb9569e3b 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -27,9 +27,9 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* ENOMEM */ -#include /* free() */ -#include /* strerror() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include @@ -37,6 +37,8 @@ #include #include +#include /* ENOMEM */ + #ifdef HAVE_MACHINE_PARAM_H /* BSD */ # include @@ -96,8 +98,8 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -int E_(Activate) ( vlc_object_t * ); -void E_(Deactivate) ( vlc_object_t * ); +int Activate ( vlc_object_t * ); +void Deactivate ( vlc_object_t * ); static int InitVideo ( vout_thread_t * ); static void EndVideo ( vout_thread_t * ); @@ -113,12 +115,17 @@ static void DestroyWindow ( vout_thread_t *, x11_window_t * ); static int NewPicture ( vout_thread_t *, picture_t * ); static void FreePicture ( vout_thread_t *, picture_t * ); +#ifndef MODULE_NAME_IS_glx static IMAGE_TYPE *CreateImage ( vout_thread_t *, Display *, EXTRA_ARGS, int, int ); +#endif + #ifdef HAVE_SYS_SHM_H -static IMAGE_TYPE *CreateShmImage ( vout_thread_t *, +#ifndef MODULE_NAME_IS_glx +IMAGE_TYPE *CreateShmImage ( vout_thread_t *, Display *, EXTRA_ARGS_SHM, int, int ); -static vlc_bool_t b_shm = VLC_TRUE; +#endif +static int i_shm_major = 0; #endif static void ToggleFullScreen ( vout_thread_t * ); @@ -149,7 +156,7 @@ static void xvmc_update_XV_DOUBLE_BUFFER( vout_thread_t *p_vout ); static void TestNetWMSupport( vout_thread_t * ); static int ConvertKey( int ); -static int WindowOnTop( vout_thread_t *, vlc_bool_t ); +static int WindowOnTop( vout_thread_t *, bool ); static int X11ErrorHandler( Display *, XErrorEvent * ); @@ -171,7 +178,7 @@ static const int i_backlight_on_interval = 300; * vout properties to choose the window size, and change them according to the * actual properties of the display. *****************************************************************************/ -int E_(Activate) ( vlc_object_t *p_this ) +int Activate ( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; char * psz_display; @@ -182,7 +189,7 @@ int E_(Activate) ( vlc_object_t *p_this ) #if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc) char * psz_chroma; vlc_fourcc_t i_chroma = 0; - vlc_bool_t b_chroma = 0; + bool b_chroma = 0; #endif p_vout->pf_init = InitVideo; @@ -199,12 +206,9 @@ int E_(Activate) ( vlc_object_t *p_this ) /* Allocate structure */ p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); if( p_vout->p_sys == NULL ) - { - msg_Err( p_vout, "out of memory" ); return VLC_ENOMEM; - } - vlc_mutex_init( p_vout, &p_vout->p_sys->lock ); + vlc_mutex_init( &p_vout->p_sys->lock ); /* Open display, using the "display" config variable or the DISPLAY * environment variable */ @@ -212,15 +216,15 @@ int E_(Activate) ( vlc_object_t *p_this ) p_vout->p_sys->p_display = XOpenDisplay( psz_display ); - if( p_vout->p_sys->p_display == NULL ) /* error */ + if( p_vout->p_sys->p_display == NULL ) /* error */ { msg_Err( p_vout, "cannot open display %s", XDisplayName( psz_display ) ); free( p_vout->p_sys ); - if( psz_display ) free( psz_display ); + free( psz_display ); return VLC_EGENERIC; } - if( psz_display ) free( psz_display ); + free( psz_display ); /* Replace error handler so we can intercept some non-fatal errors */ XSetErrorHandler( X11ErrorHandler ); @@ -290,10 +294,53 @@ int E_(Activate) ( vlc_object_t *p_this ) } } p_vout->output.i_chroma = X112VLC_FOURCC(p_vout->output.i_chroma); +#elif defined(MODULE_NAME_IS_glx) + { + int i_opcode, i_evt, i_err = 0; + int i_maj, i_min = 0; + + /* Check for GLX extension */ + if( !XQueryExtension( p_vout->p_sys->p_display, "GLX", + &i_opcode, &i_evt, &i_err ) ) + { + msg_Err( p_this, "GLX extension not supported" ); + XCloseDisplay( p_vout->p_sys->p_display ); + free( p_vout->p_sys ); + return VLC_EGENERIC; + } + if( !glXQueryExtension( p_vout->p_sys->p_display, &i_err, &i_evt ) ) + { + msg_Err( p_this, "glXQueryExtension failed" ); + XCloseDisplay( p_vout->p_sys->p_display ); + free( p_vout->p_sys ); + return VLC_EGENERIC; + } + + /* Check GLX version */ + if (!glXQueryVersion( p_vout->p_sys->p_display, &i_maj, &i_min ) ) + { + msg_Err( p_this, "glXQueryVersion failed" ); + XCloseDisplay( p_vout->p_sys->p_display ); + free( p_vout->p_sys ); + return VLC_EGENERIC; + } + if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) ) + { + p_vout->p_sys->b_glx13 = false; + msg_Dbg( p_this, "using GLX 1.2 API" ); + } + else + { + p_vout->p_sys->b_glx13 = true; + msg_Dbg( p_this, "using GLX 1.3 API" ); + } + } #endif /* Create blank cursor (for mouse cursor autohiding) */ p_vout->p_sys->i_time_mouse_last_moved = mdate(); + p_vout->p_sys->i_mouse_hide_timeout = + var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; p_vout->p_sys->b_mouse_pointer_visible = 1; CreateCursor( p_vout ); @@ -376,12 +423,13 @@ int E_(Activate) ( vlc_object_t *p_this ) msg_Dbg(p_vout, "Deinterlace = %d", p_vout->p_sys->xvmc_deinterlace_method); msg_Dbg(p_vout, "Crop = %d", p_vout->p_sys->xvmc_crop_style); - if( !checkXvMCCap( p_vout ) ) + if( checkXvMCCap( p_vout ) == VLC_EGENERIC ) { msg_Err( p_vout, "no XVMC capability found" ); - E_(Deactivate)( p_vout ); + Deactivate( p_vout ); return VLC_EGENERIC; } + subpicture_t sub_pic; sub_pic.p_sys = NULL; p_vout->p_sys->last_date = 0; #endif @@ -389,9 +437,9 @@ int E_(Activate) ( vlc_object_t *p_this ) #ifdef HAVE_XSP p_vout->p_sys->i_hw_scale = 1; #endif - + #ifdef HAVE_OSSO - p_vout->p_sys->i_backlight_on_counter = i_backlight_on_interval; + p_vout->p_sys->i_backlight_on_counter = i_backlight_on_interval; p_vout->p_sys->p_octx = osso_initialize( "vlc", VERSION, 0, NULL ); if ( p_vout->p_sys->p_octx == NULL ) { msg_Err( p_vout, "Could not get osso context" ); @@ -399,7 +447,7 @@ int E_(Activate) ( vlc_object_t *p_this ) msg_Dbg( p_vout, "Initialized osso context" ); } #endif - + /* 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 ); @@ -413,7 +461,7 @@ int E_(Activate) ( vlc_object_t *p_this ) ***************************************************************************** * Terminate an output method created by Open *****************************************************************************/ -void E_(Deactivate) ( vlc_object_t *p_this ) +void Deactivate ( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; @@ -460,7 +508,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) #ifdef HAVE_XSP DisablePixelDoubling(p_vout); #endif - + DestroyCursor( p_vout ); EnableXScreenSaver( p_vout ); DestroyWindow( p_vout, &p_vout->p_sys->original_window ); @@ -478,7 +526,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) osso_deinitialize( p_vout->p_sys->p_octx ); } #endif - + free( p_vout->p_sys ); } @@ -549,11 +597,11 @@ static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic ) return; } +#if 0 vlc_mutex_lock( &p_vout->lastsubtitle_lock ); - - if (p_vout->p_last_subtitle != NULL) + if (p_vout->p_sys->p_last_subtitle != NULL) { - if( p_vout->p_sys->p_last_subtitle_save != p_vout->p_last_subtitle ) + if( p_vout->p_sys->p_last_subtitle_save != p_vout->p_sys->p_last_subtitle ) { p_vout->p_sys->new_subpic = xxmc_xvmc_alloc_subpicture( p_vout, &p_vout->p_sys->context, @@ -707,6 +755,7 @@ static void RenderVideo( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->p_sys->p_last_subtitle_save = p_vout->p_last_subtitle; vlc_mutex_unlock( &p_vout->lastsubtitle_lock ); +#endif xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); vlc_mutex_unlock( &p_vout->p_sys->lock ); @@ -917,20 +966,21 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) #ifdef MODULE_NAME_IS_xvmc xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); - vlc_xxmc_t *xxmc = &p_picture->p_sys->xxmc_data; + vlc_xxmc_t *xxmc = &p_pic->p_sys->xxmc_data; if( !xxmc->decoded || - !xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) ) + !xxmc_xvmc_surface_valid( p_vout, p_pic->p_sys->xvmc_surf ) ) { msg_Dbg( p_vout, "DisplayVideo decoded=%d\tsurfacevalid=%d", xxmc->decoded, - xxmc_xvmc_surface_valid( p_vout, p_picture->p_sys->xvmc_surf ) ); + xxmc_xvmc_surface_valid( p_vout, p_pic->p_sys->xvmc_surf ) ); vlc_mutex_unlock( &p_vout->p_sys->lock ); xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); return; } - src_width = p_vout->output.i_width; - src_height = p_vout->output.i_height; + int src_width = p_vout->output.i_width; + int src_height = p_vout->output.i_height; + int src_x, src_y; if( p_vout->p_sys->xvmc_crop_style == 1 ) { @@ -959,17 +1009,18 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) src_y = 0; } + int first_field; if( p_vout->p_sys->xvmc_deinterlace_method > 0 ) { /* BOB DEINTERLACE */ - if( (p_picture->p_sys->nb_display == 0) || + if( (p_pic->p_sys->nb_display == 0) || (p_vout->p_sys->xvmc_deinterlace_method == 1) ) { - first_field = (p_picture->b_top_field_first) ? + first_field = (p_pic->b_top_field_first) ? XVMC_BOTTOM_FIELD : XVMC_TOP_FIELD; } else { - first_field = (p_picture->b_top_field_first) ? + first_field = (p_pic->b_top_field_first) ? XVMC_TOP_FIELD : XVMC_BOTTOM_FIELD; } } @@ -979,10 +1030,10 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) } XVMCLOCKDISPLAY( p_vout->p_sys->p_display ); - XvMCFlushSurface( p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf ); + XvMCFlushSurface( p_vout->p_sys->p_display, p_pic->p_sys->xvmc_surf ); /* XvMCSyncSurface(p_vout->p_sys->p_display, p_picture->p_sys->xvmc_surf); */ XvMCPutSurface( p_vout->p_sys->p_display, - p_picture->p_sys->xvmc_surf, + p_pic->p_sys->xvmc_surf, p_vout->p_sys->p_win->video_window, src_x, src_y, @@ -995,38 +1046,38 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) first_field); XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display ); - if( p_vout->p_sys->xvmc_deinterlace_method == 2 ) + if( p_vout->p_sys->xvmc_deinterlace_method == 2 ) { /* BOB DEINTERLACE */ - if( p_picture->p_sys->nb_display == 0 )/* && ((t2-t1) < 15000)) */ + if( p_pic->p_sys->nb_display == 0 )/* && ((t2-t1) < 15000)) */ { - mtime_t last_date = p_picture->date; + mtime_t last_date = p_pic->date; vlc_mutex_lock( &p_vout->picture_lock ); if( !p_vout->p_sys->last_date ) { - p_picture->date += 20000; + p_pic->date += 20000; } else { - p_picture->date = ((3 * p_picture->date - + p_pic->date = ((3 * p_pic->date - p_vout->p_sys->last_date) / 2 ); } p_vout->p_sys->last_date = last_date; - p_picture->b_force = 1; - p_picture->p_sys->nb_display = 1; + p_pic->b_force = 1; + p_pic->p_sys->nb_display = 1; vlc_mutex_unlock( &p_vout->picture_lock ); } else { - p_picture->p_sys->nb_display = 0; - p_picture->b_force = 0; + p_pic->p_sys->nb_display = 0; + p_pic->b_force = 0; } } xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); #endif #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { /* Display rendered image using shared memory extension */ # if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc) @@ -1239,12 +1290,24 @@ static int ManageVideo( vout_thread_t *p_vout ) switch( ((XButtonEvent *)&xevent)->button ) { case Button1: - var_Get( p_vout, "mouse-button-down", &val ); - val.i_int &= ~1; - var_Set( p_vout, "mouse-button-down", val ); + { + playlist_t *p_playlist; - val.b_bool = VLC_TRUE; - var_Set( p_vout, "mouse-clicked", val ); + var_Get( p_vout, "mouse-button-down", &val ); + val.i_int &= ~1; + var_Set( p_vout, "mouse-button-down", val ); + + val.b_bool = true; + var_Set( p_vout, "mouse-clicked", val ); + + p_playlist = pl_Yield( p_vout ); + if( p_playlist != NULL ) + { + vlc_value_t val; val.b_bool = false; + var_Set( p_playlist, "intf-popupmenu", val ); + pl_Release( p_playlist ); + } + } break; case Button2: @@ -1255,16 +1318,14 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int &= ~2; var_Set( p_vout, "mouse-button-down", val ); - p_playlist = vlc_object_find( p_vout, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_playlist = pl_Yield( p_vout ); if( p_playlist != NULL ) { vlc_value_t val; var_Get( p_playlist, "intf-show", &val ); val.b_bool = !val.b_bool; var_Set( p_playlist, "intf-show", val ); - vlc_object_release( p_playlist ); + pl_Release( p_playlist ); } } break; @@ -1285,14 +1346,12 @@ static int ManageVideo( vout_thread_t *p_vout ) vlc_object_release( p_intf ); } - p_playlist = vlc_object_find( p_vout, - VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_playlist = pl_Yield( p_vout ); if( p_playlist != NULL ) { - vlc_value_t val; val.b_bool = VLC_TRUE; + vlc_value_t val; val.b_bool = true; var_Set( p_playlist, "intf-popupmenu", val ); - vlc_object_release( p_playlist ); + pl_Release( p_playlist ); } } break; @@ -1324,16 +1383,33 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->p_sys->p_win->i_height, &i_x, &i_y, &i_width, &i_height ); + /* Compute the x coordinate and check if the value is + in [0,p_vout->fmt_in.i_visible_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; + + if( (int)(xevent.xmotion.x - i_x) < 0 ) + val.i_int = 0; + else if( (unsigned int)val.i_int > p_vout->fmt_in.i_visible_width ) + val.i_int = p_vout->fmt_in.i_visible_width; + var_Set( p_vout, "mouse-x", val ); + + /* compute the y coordinate and check if the value is + in [0,p_vout->fmt_in.i_visible_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; + + if( (int)(xevent.xmotion.y - i_y) < 0 ) + val.i_int = 0; + else if( (unsigned int)val.i_int > p_vout->fmt_in.i_visible_height ) + val.i_int = p_vout->fmt_in.i_visible_height; + var_Set( p_vout, "mouse-y", val ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_vout, "mouse-moved", val ); p_vout->p_sys->i_time_mouse_last_moved = mdate(); @@ -1365,6 +1441,22 @@ static int ManageVideo( vout_thread_t *p_vout ) if( ((XExposeEvent *)&xevent)->count == 0 ) { /* (if this is the last a collection of expose events...) */ + +#if defined(MODULE_NAME_IS_xvideo) + x11_window_t *p_win = p_vout->p_sys->p_win; + + /* Paint the colour key if needed */ + if( p_vout->p_sys->b_paint_colourkey && + xevent.xexpose.window == p_win->video_window ) + { + XSetForeground( p_vout->p_sys->p_display, + p_win->gc, p_vout->p_sys->i_colourkey ); + XFillRectangle( p_vout->p_sys->p_display, + p_win->video_window, p_win->gc, 0, 0, + p_win->i_width, p_win->i_height ); + } +#endif + #if 0 if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL ) { @@ -1390,13 +1482,11 @@ static int ManageVideo( vout_thread_t *p_vout ) == p_vout->p_sys->p_win->wm_delete_window ) ) { /* the user wants to close the window */ - playlist_t * p_playlist = - (playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_vout ); if( p_playlist != NULL ) { playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + pl_Release( p_playlist ); } } } @@ -1406,41 +1496,8 @@ static int ManageVideo( vout_thread_t *p_vout ) */ if ( p_vout->i_changes & VOUT_FULLSCREEN_CHANGE ) { - vlc_value_t val; - /* Update the object variable and trigger callback */ - val.b_bool = !p_vout->b_fullscreen; - - /* - * FIXME FIXME FIXME FIXME: EXPLICIT HACK. - * On the one hand, we cannot hold the lock while triggering a - * callback, as it causes a deadlock with video-on-top handling. - * On the other hand, we have to lock while triggering the - * callback to: - * 1/ make sure video-on-top remains in sync with fullscreen - * (i.e. unlocking creates a race condition if fullscreen is - * switched on and off VERY FAST). - * 2/ avoid possible corruption bugs if another thread gets the - * mutex and modifies our data in-between. - * - * This is obviously contradictory. Correct solutions may include: - * - putting the fullscreen NAND video-on-top logic out of libvlc, - * back into the video output plugins (ugly code duplication...), - * - serializing fullscreen and video-on-top handling properly - * instead of doing it via the fullscreen callback. That's got to - * be the correct one. - */ -#ifdef MODULE_NAME_IS_xvmc - xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); -#endif - vlc_mutex_unlock( &p_vout->p_sys->lock ); - - var_Set( p_vout, "fullscreen", val ); - - vlc_mutex_lock( &p_vout->p_sys->lock ); -#ifdef MODULE_NAME_IS_xvmc - xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); -#endif + var_SetBool( p_vout, "fullscreen", !p_vout->b_fullscreen ); ToggleFullScreen( p_vout ); p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; @@ -1492,7 +1549,8 @@ static int ManageVideo( vout_thread_t *p_vout ) } /* Autohide Cursour */ - if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 ) + if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > + p_vout->p_sys->i_mouse_hide_timeout ) { /* Hide the mouse automatically */ if( p_vout->p_sys->b_mouse_pointer_visible ) @@ -1504,13 +1562,13 @@ static int ManageVideo( vout_thread_t *p_vout ) #ifdef MODULE_NAME_IS_xvmc xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); #endif - + #ifdef HAVE_OSSO if ( p_vout->p_sys->p_octx != NULL ) { if ( p_vout->p_sys->i_backlight_on_counter == i_backlight_on_interval ) { if ( osso_display_blanking_pause( p_vout->p_sys->p_octx ) != OSSO_OK ) { msg_Err( p_vout, "Could not disable backlight blanking" ); - } else { + } else { msg_Dbg( p_vout, "Backlight blanking disabled" ); } p_vout->p_sys->i_backlight_on_counter = 0; @@ -1519,7 +1577,7 @@ static int ManageVideo( vout_thread_t *p_vout ) } } #endif - + vlc_mutex_unlock( &p_vout->p_sys->lock ); return 0; } @@ -1554,9 +1612,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) XGCValues xgcvalues; XEvent xevent; - vlc_bool_t b_expose = VLC_FALSE; - vlc_bool_t b_configure_notify = VLC_FALSE; - vlc_bool_t b_map_notify = VLC_FALSE; + bool b_expose = false; + bool b_configure_notify = false; + bool b_map_notify = false; vlc_value_t val; /* Prepare window manager hints and properties */ @@ -1577,9 +1635,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) 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 ); + 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; @@ -1619,14 +1677,36 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) CWBackingStore | CWBackPixel | CWEventMask, &xwindow_attributes ); + 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)" +#elif defined(MODULE_NAME_IS_glx) + VOUT_TITLE " (GLX output)" +#else + VOUT_TITLE " (XVideo output)" +#endif + ); + } + else + { + XStoreName( p_vout->p_sys->p_display, + p_win->base_window, val.psz_string ); + } + free( val.psz_string ); + if( !p_vout->b_fullscreen ) { + const char *argv[] = { "vlc", NULL }; + /* Set window manager hints and properties: size hints, command, * window's name, and accepted protocols */ XSetWMNormalHints( p_vout->p_sys->p_display, p_win->base_window, &xsize_hints ); XSetCommand( p_vout->p_sys->p_display, p_win->base_window, - p_vout->p_libvlc->ppsz_argv, p_vout->p_libvlc->i_argc ); + (char**)argv, 1 ); if( !var_GetBool( p_vout, "video-deco") ) { @@ -1645,28 +1725,6 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) (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)" -#elif defined(MODULE_NAME_IS_glx) - VOUT_TITLE " (GLX output)" -#else - VOUT_TITLE " (XVideo output)" -#endif - ); - } - else - { - XStoreName( p_vout->p_sys->p_display, - p_win->base_window, val.psz_string ); - } - if( val.psz_string ) free( val.psz_string ); - } } } else @@ -1687,7 +1745,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) &dummy4, &dummy5 ); /* We are already configured */ - b_configure_notify = VLC_TRUE; + b_configure_notify = true; /* From man XSelectInput: only one client at a time can select a * ButtonPress event, so we need to open a new window anyway. */ @@ -1732,21 +1790,21 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) if( (xevent.type == Expose) && (xevent.xexpose.window == p_win->base_window) ) { - b_expose = VLC_TRUE; + b_expose = 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; + b_configure_notify = true; } else if( (xevent.type == MapNotify) && (xevent.xmap.window == p_win->base_window) ) { - b_map_notify = VLC_TRUE; + b_map_notify = true; } else if( (xevent.type == ConfigureNotify) && (xevent.xconfigure.window == p_win->base_window) ) { - b_configure_notify = VLC_TRUE; + b_configure_notify = true; p_win->i_width = xevent.xconfigure.width; p_win->i_height = xevent.xconfigure.height; } @@ -1862,7 +1920,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_pic->p_sys->xvmc_surf = NULL; p_pic->p_sys->xxmc_data.decoded = 0; p_pic->p_sys->xxmc_data.proc_xxmc_update_frame = xxmc_do_update_frame; - p_pic->p_accel_data = &p_pic->p_sys->xxmc_data; + // p_pic->p_accel_data = &p_pic->p_sys->xxmc_data; p_pic->p_sys->nb_display = 0; #endif @@ -1872,7 +1930,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->output.i_aspect ); #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { /* Create image using XShm extension */ p_pic->p_sys->p_image = @@ -1888,14 +1946,14 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->output.i_width, p_vout->output.i_height ); } - if( !p_vout->p_sys->b_shm || !p_pic->p_sys->p_image ) + if( !p_vout->p_sys->i_shm_opcode || !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, #if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc) - p_vout->p_sys->i_xvport, + p_vout->p_sys->i_xvport, VLC2X11_FOURCC(p_vout->output.i_chroma), p_pic->format.i_bits_per_pixel, #else @@ -1906,10 +1964,10 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) 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 ) + if( p_pic->p_sys->p_image && p_vout->p_sys->i_shm_opcode ) { msg_Warn( p_vout, "couldn't create SHM image, disabling SHM" ); - p_vout->p_sys->b_shm = VLC_FALSE; + p_vout->p_sys->i_shm_opcode = 0; } #endif /* HAVE_SYS_SHM_H */ } @@ -1936,7 +1994,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) 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[i_plane].p_pixels = (uint8_t*)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]; @@ -1945,9 +2003,9 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) { /* 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->U_PIXELS = (uint8_t*)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->V_PIXELS = (uint8_t*)p_pic->p_sys->p_image->data + p_pic->p_sys->p_image->offsets[1]; } break; @@ -1961,7 +2019,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) 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->p_pixels = (uint8_t*)p_pic->p_sys->p_image->data + p_pic->p_sys->p_image->xoffset; p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line; @@ -1981,6 +2039,9 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_pic->i_planes = 0; return -1; } +#else + + VLC_UNUSED(p_vout); VLC_UNUSED(p_pic); #endif /* !MODULE_NAME_IS_glx */ @@ -1999,7 +2060,7 @@ static void FreePicture( vout_thread_t *p_vout, picture_t *p_pic ) { /* The order of operations is correct */ #ifdef HAVE_SYS_SHM_H - if( p_vout->p_sys->b_shm ) + if( p_vout->p_sys->i_shm_opcode ) { XShmDetach( p_vout->p_sys->p_display, &p_pic->p_sys->shminfo ); IMAGE_FREE( p_pic->p_sys->p_image ); @@ -2007,8 +2068,7 @@ static void FreePicture( vout_thread_t *p_vout, picture_t *p_pic ) shmctl( p_pic->p_sys->shminfo.shmid, IPC_RMID, 0 ); if( shmdt( p_pic->p_sys->shminfo.shmaddr ) ) { - msg_Err( p_vout, "cannot detach shared memory (%s)", - strerror(errno) ); + msg_Err( p_vout, "cannot detach shared memory (%m)" ); } } else @@ -2219,7 +2279,28 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) #ifdef HAVE_XSP EnablePixelDoubling( p_vout ); #endif - + + /* Activate the window (give it the focus) */ + XClientMessageEvent event; + + memset( &event, 0, sizeof( XClientMessageEvent ) ); + + event.type = ClientMessage; + event.message_type = + XInternAtom( p_vout->p_sys->p_display, "_NET_ACTIVE_WINDOW", False ); + 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 ] = 1; /* source indication (1 = from an application */ + event.data.l[ 1 ] = 0; /* timestamp */ + event.data.l[ 2 ] = 0; /* requestor's currently active window */ + /* XXX: window manager would be more likely to obey if we already have + * an active window (and give it to the event), such as an interface */ + + XSendEvent( p_vout->p_sys->p_display, + DefaultRootWindow( p_vout->p_sys->p_display ), + False, SubstructureRedirectMask, + (XEvent*)&event ); } else { @@ -2484,6 +2565,7 @@ static int XVideoGetPort( vout_thread_t *p_vout, { XvAttribute *p_attr; int i_attr, i_num_attributes; + Atom autopaint = None, colorkey = None; /* If this is not the format we want, or at least a * similar one, forget it */ @@ -2520,7 +2602,8 @@ static int XVideoGetPort( vout_thread_t *p_vout, ( p_formats[ i_format ].format == XvPacked ) ? "packed" : "planar" ); - /* Make sure XV_AUTOPAINT_COLORKEY is set */ + /* Use XV_AUTOPAINT_COLORKEY if supported, otherwise we will + * manually paint the colour key */ p_attr = XvQueryPortAttributes( p_vout->p_sys->p_display, i_selected_port, &i_num_attributes ); @@ -2529,14 +2612,23 @@ static int XVideoGetPort( vout_thread_t *p_vout, { if( !strcmp( p_attr[i_attr].name, "XV_AUTOPAINT_COLORKEY" ) ) { - const Atom autopaint = - XInternAtom( p_vout->p_sys->p_display, - "XV_AUTOPAINT_COLORKEY", False ); + 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( !strcmp( p_attr[i_attr].name, "XV_COLORKEY" ) ) + { + /* Find out the default colour key */ + colorkey = XInternAtom( p_vout->p_sys->p_display, + "XV_COLORKEY", False ); + XvGetPortAttribute( p_vout->p_sys->p_display, + i_selected_port, colorkey, + &p_vout->p_sys->i_colourkey ); } } + p_vout->p_sys->b_paint_colourkey = + autopaint == None && colorkey != None; if( p_attr != NULL ) { @@ -2600,30 +2692,34 @@ static int InitDisplay( vout_thread_t *p_vout ) #endif #ifdef HAVE_SYS_SHM_H - p_vout->p_sys->b_shm = 0; + p_vout->p_sys->i_shm_opcode = 0; if( config_GetInt( p_vout, MODULE_STRING "-shm" ) ) { -# ifdef __APPLE__ - /* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */ -# else - p_vout->p_sys->b_shm = - ( XShmQueryExtension( p_vout->p_sys->p_display ) == True ); -# endif + int major, evt, err; - if( !p_vout->p_sys->b_shm ) + if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major, + &evt, &err ) + && XShmQueryExtension( p_vout->p_sys->p_display ) ) + p_vout->p_sys->i_shm_opcode = major; + + if( p_vout->p_sys->i_shm_opcode ) { - msg_Warn( p_vout, "XShm video extension is unavailable" ); + int major, minor; + Bool pixmaps; + + XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor, + &pixmaps ); + msg_Dbg( p_vout, "XShm video extension v%d.%d " + "(with%s pixmaps, opcode: %d)", + major, minor, pixmaps ? "" : "out", + p_vout->p_sys->i_shm_opcode ); } + else + msg_Warn( p_vout, "XShm video extension not available" ); } else - { - msg_Dbg( p_vout, "disabling XShm video extension" ); - } - -#else - msg_Warn( p_vout, "XShm video extension is unavailable" ); - + msg_Dbg( p_vout, "XShm video extension disabled" ); #endif #ifdef MODULE_NAME_IS_xvideo @@ -2728,6 +2824,8 @@ static int InitDisplay( vout_thread_t *p_vout ) return VLC_SUCCESS; } +#ifndef MODULE_NAME_IS_glx + #ifdef HAVE_SYS_SHM_H /***************************************************************************** * CreateShmImage: create an XImage or XvImage using shared memory extension @@ -2737,7 +2835,7 @@ static int InitDisplay( vout_thread_t *p_vout ) * document by J.Corbet and K.Packard. Most of the parameters were copied from * there. See http://ftp.xfree86.org/pub/XFree86/4.0/doc/mit-shm.TXT *****************************************************************************/ -static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, +IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, Display* p_display, EXTRA_ARGS_SHM, int i_width, int i_height ) { @@ -2771,8 +2869,7 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, p_shm->shmid = shmget( IPC_PRIVATE, DATA_SIZE(p_image), IPC_CREAT | 0776 ); if( p_shm->shmid < 0 ) { - msg_Err( p_vout, "cannot allocate shared image data (%s)", - strerror( errno ) ); + msg_Err( p_vout, "cannot allocate shared image data (%m)" ); IMAGE_FREE( p_image ); return NULL; } @@ -2781,8 +2878,7 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, p_shm->shmaddr = p_image->data = shmat( p_shm->shmid, 0, 0 ); if(! p_shm->shmaddr ) { - msg_Err( p_vout, "cannot attach shared memory (%s)", - strerror(errno)); + msg_Err( p_vout, "cannot attach shared memory (%m)" ); IMAGE_FREE( p_image ); shmctl( p_shm->shmid, IPC_RMID, 0 ); return NULL; @@ -2793,9 +2889,9 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, /* Attach shared memory segment to X server */ XSynchronize( p_display, True ); - b_shm = VLC_TRUE; + i_shm_major = p_vout->p_sys->i_shm_opcode; result = XShmAttach( p_display, p_shm ); - if( result == False || !b_shm ) + if( result == False || !i_shm_major ) { msg_Err( p_vout, "cannot attach shared memory to X server" ); IMAGE_FREE( p_image ); @@ -2829,7 +2925,7 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, Display *p_display, EXTRA_ARGS, int i_width, int i_height ) { - byte_t * p_data; /* image data storage zone */ + uint8_t * p_data; /* image data storage zone */ IMAGE_TYPE *p_image; #ifdef MODULE_NAME_IS_x11 int i_quantum; /* XImage quantum (see below) */ @@ -2843,16 +2939,13 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, 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 ); + p_data = 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 ); + p_data = malloc( i_bytes_per_line * i_height ); #endif if( !p_data ) - { - msg_Err( p_vout, "out of memory" ); return NULL; - } #ifdef MODULE_NAME_IS_x11 /* Optimize the quantum of a scanline regarding its size - the quantum is @@ -2889,30 +2982,40 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, return p_image; } +#endif /***************************************************************************** * X11ErrorHandler: replace error handler so we can intercept some of them *****************************************************************************/ static int X11ErrorHandler( Display * display, XErrorEvent * event ) { + char txt[1024]; + + XGetErrorText( display, event->error_code, txt, sizeof( txt ) ); + fprintf( stderr, + "[????????] x11 video output error: X11 request %u.%u failed " + "with error code %u:\n %s\n", + event->request_code, event->minor_code, event->error_code, txt ); + switch( event->request_code ) { case X_SetInputFocus: - /* Ingnore errors on XSetInputFocus() + /* Ignore errors on XSetInputFocus() * (they happen when a window is not yet mapped) */ return 0; - - case 150: /* MIT-SHM */ - case 146: /* MIT-SHM too, what gives? */ - if( event->minor_code == X_ShmAttach ) - { - b_shm = VLC_FALSE; - return 0; - } - break; } +#ifdef HAVE_SYS_SHM_H + if( event->request_code == i_shm_major ) /* MIT-SHM */ + return i_shm_major = 0; +#endif + +#ifndef HAVE_OSSO XSetErrorHandler(NULL); return (XSetErrorHandler(X11ErrorHandler))( display, event ); +#else + /* Work-around Maemo Xvideo bug */ + return 0; +#endif } #ifdef MODULE_NAME_IS_x11 @@ -2952,7 +3055,7 @@ static void SetPalette( vout_thread_t *p_vout, *****************************************************************************/ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) { - vlc_bool_t b_arg; + bool b_arg; unsigned int i_width, i_height; unsigned int *pi_width, *pi_height; Drawable d = 0; @@ -3009,6 +3112,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) vlc_mutex_lock( &p_vout->p_sys->lock ); if( i_query == VOUT_REPARENT ) d = (Drawable)va_arg( args, int ); if( !d ) + { #ifdef MODULE_NAME_IS_xvmc xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); #endif @@ -3016,6 +3120,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) p_vout->p_sys->original_window.base_window, DefaultRootWindow( p_vout->p_sys->p_display ), 0, 0 ); + } else XReparentWindow( p_vout->p_sys->p_display, p_vout->p_sys->original_window.base_window, @@ -3033,7 +3138,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) 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 ); + b_arg = (bool) va_arg( args, int ); vlc_mutex_lock( &p_vout->p_sys->lock ); #ifdef MODULE_NAME_IS_xvmc xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock ); @@ -3062,10 +3167,11 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) 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; - p_vout->p_sys->b_net_wm_state_below = VLC_FALSE; - p_vout->p_sys->b_net_wm_state_stays_on_top = VLC_FALSE; + p_vout->p_sys->b_net_wm_state_fullscreen = + p_vout->p_sys->b_net_wm_state_above = + p_vout->p_sys->b_net_wm_state_below = + p_vout->p_sys->b_net_wm_state_stays_on_top = + false; net_wm_supported = XInternAtom( p_vout->p_sys->p_display, "_NET_SUPPORTED", False ); @@ -3101,23 +3207,23 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) { msg_Dbg( p_vout, "Window manager supports _NET_WM_STATE_FULLSCREEN" ); - p_vout->p_sys->b_net_wm_state_fullscreen = VLC_TRUE; + p_vout->p_sys->b_net_wm_state_fullscreen = true; } 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; + p_vout->p_sys->b_net_wm_state_above = true; } 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; + p_vout->p_sys->b_net_wm_state_below = true; } 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" ); - p_vout->p_sys->b_net_wm_state_stays_on_top = VLC_TRUE; + p_vout->p_sys->b_net_wm_state_stays_on_top = true; } } @@ -3186,7 +3292,7 @@ static int ConvertKey( int i_key ) /***************************************************************************** * 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 ) +static int WindowOnTop( vout_thread_t *p_vout, bool b_on_top ) { if( p_vout->p_sys->b_net_wm_state_stays_on_top ) {