/*****************************************************************************
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
- * Copyright (C) 1998-2001 the VideoLAN team
+ * 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.
*****************************************************************************/
/*****************************************************************************
# include <X11/extensions/Xinerama.h>
#endif
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+# include <X11/extensions/xf86vmode.h>
+#endif
+
#include "xcommon.h"
/*****************************************************************************
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;
}
{
val.i_int |= KEY_MODIFIER_ALT;
}
- var_Set( p_vout->p_vlc, "key-pressed", val );
+ var_Set( p_vout->p_libvlc, "key-pressed", val );
}
}
/* Mouse click */
{
/* (if this is the last a collection of expose events...) */
#if 0
- if( p_vout->p_vlc->p_input_bank->pp_input[0] != NULL )
+ if( p_vout->p_libvlc->p_input_bank->pp_input[0] != NULL )
{
- if( PAUSE_S == p_vout->p_vlc->p_input_bank->pp_input[0]
+ if( PAUSE_S == p_vout->p_libvlc->p_input_bank->pp_input[0]
->stream.control.i_status )
{
/* XVideoDisplay( p_vout )*/;
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_vlc->ppsz_argv, p_vout->p_vlc->i_argc );
+ p_vout->p_libvlc->ppsz_argv, p_vout->p_libvlc->i_argc );
if( !var_GetBool( p_vout, "video-deco") )
{
#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." );
+ msg_Warn( p_vout, "couldn't create SHM image, disabling SHM" );
p_vout->p_sys->b_shm = VLC_FALSE;
}
#endif /* HAVE_SYS_SHM_H */
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;
*****************************************************************************/
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 = 0;
+
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 );
+ if( i_query == VOUT_REPARENT ) 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 );