/*****************************************************************************
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
+ * Copyright (C) 1998-2006 the VideoLAN team
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
* 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.
*****************************************************************************/
/*****************************************************************************
#endif
#include <X11/Xlib.h>
+#include <X11/Xproto.h>
#include <X11/Xmd.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
# include <X11/extensions/Xinerama.h>
#endif
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+# include <X11/extensions/xf86vmode.h>
+#endif
+
#include "xcommon.h"
/*****************************************************************************
#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 * );
static int WindowOnTop( vout_thread_t *, vlc_bool_t );
+static int X11ErrorHandler( Display *, XErrorEvent * );
+
/*****************************************************************************
* Activate: allocate X11 video thread output method
*****************************************************************************
}
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 );
/* 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 ) )
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'):
+ case VLC_FOURCC('R','V','1','6'):
+#if defined( WORDS_BIGENDIAN )
+ p_vout->output.i_rmask = 0xf800;
+ p_vout->output.i_gmask = 0x07e0;
+ p_vout->output.i_bmask = 0x001f;
+#else
p_vout->output.i_rmask = 0x001f;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0xf800;
+#endif
break;
- case VLC_FOURCC('R','V','1','6'):
+ case VLC_FOURCC('R','V','1','5'):
+#if defined( WORDS_BIGENDIAN )
+ p_vout->output.i_rmask = 0x7c00;
+ p_vout->output.i_gmask = 0x03e0;
+ p_vout->output.i_bmask = 0x001f;
+#else
p_vout->output.i_rmask = 0x001f;
p_vout->output.i_gmask = 0x03e0;
p_vout->output.i_bmask = 0x7c00;
+#endif
break;
}
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 */
/* 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;
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
}
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
}
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;
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
*
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;
/* Prepare window manager hints and properties */
p_win->wm_protocols =
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)"
+ 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
&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_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 )
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;
}
{
/* 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;
- 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 );
+
+#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,
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 =
*/
xvisual_template.screen = p_vout->p_sys->i_screen;
xvisual_template.class = TrueColor;
+/* In some cases, we get a truecolor class adaptor that has a different
+ color depth. So try to get a real true color one first */
+ xvisual_template.depth = p_vout->p_sys->i_screen_depth;
+
p_xvisual = XGetVisualInfo( p_vout->p_sys->p_display,
- VisualScreenMask | VisualClassMask,
+ VisualScreenMask | VisualClassMask |
+ VisualDepthMask,
&xvisual_template, &i_count );
if( p_xvisual == NULL )
{
- msg_Err( p_vout, "no TrueColor visual available" );
- return VLC_EGENERIC;
+ msg_Warn( p_vout, "No screen matching the required color depth" );
+ p_xvisual = XGetVisualInfo( p_vout->p_sys->p_display,
+ VisualScreenMask | VisualClassMask,
+ &xvisual_template, &i_count );
+ if( p_xvisual == NULL )
+ {
+
+ msg_Err( p_vout, "no TrueColor visual available" );
+ return VLC_EGENERIC;
+ }
}
p_vout->output.i_rmask = p_xvisual->red_mask;
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
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 );
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,
/* Allocate memory for image */
#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_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;
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
*****************************************************************************/
static int Control( vout_thread_t *p_vout, int i_query, va_list args )
{
- double f_arg;
vlc_bool_t b_arg;
-
+ unsigned int i_width, i_height;
+ unsigned int *pi_width, *pi_height;
+ Drawable d;
+
switch( i_query )
{
- case VOUT_SET_ZOOM:
+ 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);
- f_arg = va_arg( args, double );
+ 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 */
- /* FIXME: export InitWindowSize() from vout core */
XResizeWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
- p_vout->i_window_width * f_arg,
- p_vout->i_window_height * f_arg );
+ i_width, i_height );
vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
case VOUT_REPARENT:
vlc_mutex_lock( &p_vout->p_sys->lock );
+ d = (Drawable)va_arg( args, int );
+ if ( !d )
XReparentWindow( p_vout->p_sys->p_display,
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,
+ d,
+ 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 );
{ XK_End, KEY_END },
{ XK_Page_Up, KEY_PAGEUP },
{ XK_Page_Down, KEY_PAGEDOWN },
+
+ { XK_Insert, KEY_INSERT },
+ { XK_Delete, KEY_DELETE },
+
{ 0, 0 }
};
projects / vlc / blobdiff