/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* free() */
-#include <string.h> /* strerror() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_vout.h>
+#include <vlc_window.h>
#include <vlc_keys.h>
+#include <errno.h> /* ENOMEM */
+
#ifdef HAVE_MACHINE_PARAM_H
/* BSD */
# include <machine/param.h>
/*****************************************************************************
* 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 * );
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 * );
static void ToggleCursor ( vout_thread_t * );
#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
-static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, vlc_fourcc_t * );
+static int XVideoGetPort ( vout_thread_t *, vlc_fourcc_t, picture_heap_t * );
static void XVideoReleasePort( vout_thread_t *, int );
#endif
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 * );
* 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;
#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;
/* 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 );
+
+ /* key and mouse event handling */
+ p_vout->p_sys->i_vout_event = var_CreateGetInteger( p_vout, "vout-event" );
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
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 );
/* Check that we have access to an XVideo port providing this chroma */
p_vout->p_sys->i_xvport = XVideoGetPort( p_vout, VLC2X11_FOURCC(i_chroma),
- &p_vout->output.i_chroma );
+ &p_vout->output );
if( p_vout->p_sys->i_xvport < 0 )
{
/* If a specific chroma format was requested, then we don't try to
* conversion, but at least it has got scaling. */
p_vout->p_sys->i_xvport =
XVideoGetPort( p_vout, X11_FOURCC('Y','U','Y','2'),
- &p_vout->output.i_chroma );
+ &p_vout->output );
if( p_vout->p_sys->i_xvport < 0 )
{
/* It failed, but it's not completely lost ! We try to open an
* an YUV conversion, but at least it has got scaling. */
p_vout->p_sys->i_xvport =
XVideoGetPort( p_vout, X11_FOURCC('R','V','1','6'),
- &p_vout->output.i_chroma );
+ &p_vout->output );
if( p_vout->p_sys->i_xvport < 0 )
{
XCloseDisplay( p_vout->p_sys->p_display );
}
}
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 );
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
#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" );
*****************************************************************************
* 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;
#ifdef HAVE_XSP
DisablePixelDoubling(p_vout);
#endif
-
+
DestroyCursor( p_vout );
EnableXScreenSaver( p_vout );
DestroyWindow( p_vout, &p_vout->p_sys->original_window );
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,
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 );
p_vout->fmt_out = p_vout->fmt_in;
p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
+#if XvVersion < 2 || ( XvVersion == 2 && XvRevision < 2 )
switch( p_vout->output.i_chroma )
{
case VLC_FOURCC('R','V','1','6'):
#endif
break;
}
+#endif
#elif defined(MODULE_NAME_IS_x11)
/* Initialize the output structure: RGB with square pixels, whatever
#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 )
{
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;
}
}
}
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,
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)
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,
+ p_vout->p_sys->p_win->owner_window->handle.xid,
StructureNotifyMask, &xevent ) == True )
{
/* ConfigureNotify event: prepare */
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 );
+ {
+ var_Get( p_vout, "mouse-button-down", &val );
+ val.i_int &= ~1;
+ var_Set( p_vout, "mouse-button-down", val );
- val.b_bool = VLC_TRUE;
- var_Set( p_vout, "mouse-clicked", val );
+ var_SetBool( p_vout, "mouse-clicked", true );
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
+ }
break;
case Button2:
{
- playlist_t *p_playlist;
-
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~2;
var_Set( p_vout, "mouse-button-down", val );
- p_playlist = vlc_object_find( p_vout,
- VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- 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 );
- }
+ var_Get( p_vout->p_libvlc, "intf-show", &val );
+ val.b_bool = !val.b_bool;
+ var_Set( p_vout->p_libvlc, "intf-show", val );
}
break;
case Button3:
{
- intf_thread_t *p_intf;
- playlist_t *p_playlist;
-
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val );
- 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 );
- }
-
- p_playlist = vlc_object_find( p_vout,
- VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- vlc_value_t val; val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "intf-popupmenu", val );
- vlc_object_release( p_playlist );
- }
+
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
}
break;
else if( xevent.type == MotionNotify )
{
unsigned int i_width, i_height, i_x, i_y;
- vlc_value_t val;
/* somewhat different use for vout_PlacePicture:
* here the values are needed to give to mouse coordinates
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;
- var_Set( p_vout, "mouse-moved", val );
+ var_SetBool( p_vout, "mouse-moved", true );
p_vout->p_sys->i_time_mouse_last_moved = mdate();
if( ! p_vout->p_sys->b_mouse_pointer_visible )
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 )
{
== 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_Hold( p_vout );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+ pl_Release( 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;
+ var_SetBool( p_vout, "fullscreen", !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 );
+ ToggleFullScreen( p_vout );
+ p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+ }
- var_Set( p_vout, "fullscreen", val );
+ /* autoscale toggle */
+ if( p_vout->i_changes & VOUT_SCALE_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_SCALE_CHANGE;
- vlc_mutex_lock( &p_vout->p_sys->lock );
-#ifdef MODULE_NAME_IS_xvmc
- xvmc_context_reader_lock( &p_vout->p_sys->xvmc_lock );
-#endif
+ p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
+ p_vout->i_zoom = ZOOM_FP_FACTOR;
- ToggleFullScreen( p_vout );
- p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+ }
+
+ /* scaling factor */
+ if( p_vout->i_changes & VOUT_ZOOM_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_ZOOM_CHANGE;
+
+ p_vout->b_autoscale = false;
+ p_vout->i_zoom =
+ (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
+
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
}
if( p_vout->i_changes & VOUT_CROP_CHANGE ||
i_x, i_y, i_width, i_height );
}
+ /* cursor hiding depending on --vout-event option
+ * activated if:
+ * value = 1 (Fullsupport) (default value)
+ * or value = 2 (Fullscreen-Only) and condition met
+ */
+ bool b_vout_event = ( ( p_vout->p_sys->i_vout_event == 1 )
+ || ( p_vout->p_sys->i_vout_event == 2 && p_vout->b_fullscreen )
+ );
+
/* 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 )
+ if( b_vout_event && p_vout->p_sys->b_mouse_pointer_visible )
{
ToggleCursor( 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;
}
}
#endif
-
+
vlc_mutex_unlock( &p_vout->p_sys->lock );
return 0;
}
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 */
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 = vout_RequestXWindow( 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;
else
{
/* Fullscreen window size and position */
- p_win->owner_window = 0;
+ p_win->owner_window = NULL;
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 );
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") )
{
(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
unsigned int dummy4, dummy5;
/* Select events we are interested in. */
- XSelectInput( p_vout->p_sys->p_display, p_win->owner_window,
- StructureNotifyMask );
+ XSelectInput( p_vout->p_sys->p_display,
+ p_win->owner_window->handle.xid, StructureNotifyMask );
/* Get the parent window's geometry information */
- XGetGeometry( p_vout->p_sys->p_display, p_win->owner_window,
+ XGetGeometry( p_vout->p_sys->p_display,
+ p_win->owner_window->handle.xid,
&dummy1, &dummy2, &dummy3,
&p_win->i_width,
&p_win->i_height,
&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. */
p_win->base_window =
XCreateWindow( p_vout->p_sys->p_display,
- p_win->owner_window,
+ p_win->owner_window->handle.xid,
0, 0,
p_win->i_width, p_win->i_height,
0,
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;
}
} while( !( b_expose && b_configure_notify && b_map_notify ) );
- XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
- StructureNotifyMask | KeyPressMask |
- ButtonPressMask | ButtonReleaseMask |
- PointerMotionMask );
+ /* key and mouse events handling depending on --vout-event option
+ * activated if:
+ * value = 1 (Fullsupport) (default value)
+ * or value = 2 (Fullscreen-Only) and condition met
+ */
+ bool b_vout_event = ( ( p_vout->p_sys->i_vout_event == 1 )
+ || ( p_vout->p_sys->i_vout_event == 2 && p_vout->b_fullscreen )
+ );
+ if ( b_vout_event )
+ XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
+ StructureNotifyMask | KeyPressMask |
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask );
#ifdef MODULE_NAME_IS_x11
if( XDefaultDepth(p_vout->p_sys->p_display, p_vout->p_sys->i_screen) == 8 )
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 );
+ vout_ReleaseWindow( p_win->owner_window );
}
/*****************************************************************************
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
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 =
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
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 */
}
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];
{
/* 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;
#else
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;
p_pic->i_planes = 0;
return -1;
}
+#else
+
+ VLC_UNUSED(p_vout); VLC_UNUSED(p_pic);
#endif /* !MODULE_NAME_IS_glx */
{
/* 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 );
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
{
msg_Dbg( p_vout, "entering fullscreen mode" );
+ /* Getting current window position */
+ Window root_win;
+ Window* child_windows;
+ unsigned int num_child_windows;
+ Window parent_win;
+ Window child_win;
+ XWindowAttributes win_attr;
+ int screen_x,screen_y;
+
+ XGetWindowAttributes(
+ p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->video_window,
+ &win_attr);
+
+ XQueryTree(
+ p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->video_window,
+ &root_win,
+ &parent_win,
+ &child_windows,
+ &num_child_windows);
+ XFree(child_windows);
+
+ XTranslateCoordinates(
+ p_vout->p_sys->p_display,
+ parent_win, win_attr.root,
+ win_attr.x,win_attr.y,
+ &screen_x,&screen_y,
+ &child_win);
+
+ msg_Dbg( p_vout, "X %d/%d Y %d/%d", win_attr.x,screen_x,win_attr.y,screen_y);
+ /* screen_x and screen_y are current position */
+
p_vout->p_sys->b_altfullscreen =
config_GetInt( p_vout, MODULE_STRING "-altfullscreen" );
(XEvent*)&event );
}
+/* "bad fullscreen" - set this to 0. doing fullscreen this way is problematic
+ * for many reasons and basically fights with the window manager as the wm
+ * reparents AND vlc goes and reparents - multiple times. don't do it. it just
+ * makes it more inefficient and less "nice" to the x11 citizenry. this turns
+ * it off */
+#define BADFS 0
+/* explicitly asking for focus when you fullscreened is a little silly. the
+ * window manager SHOULD be handling this itself based on its own focus
+ * policies. if the user is "using" a given xinerama/xrandr screen or x11
+ * multihead screen AND vlc wants to fullscreen the wm should also focus it
+ * as its the only thing on the screen. if vlc fullscreens and its on
+ * "another monitor" to the one the user is using - this may "steal" the focus
+ * as really the wm should be deciding if, on fullscreening of a window
+ * the focus should go there or not, so let the wm decided */
+#define APPFOCUS 0
/* Make sure the change is effective */
XReparentWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
SCREEN = config_GetInt( p_vout,
MODULE_STRING "-xineramascreen" );
- /* just check that user has entered a good value */
+ /* just check that user has entered a good value,
+ * otherwise use that screen where window is */
if( SCREEN >= i_num_screens || SCREEN < 0 )
{
msg_Dbg( p_vout, "requested screen number invalid (%d/%d)", SCREEN, i_num_screens );
- SCREEN = 0;
+#define left screens[SCREEN].x_org
+#define right left + screens[SCREEN].width
+#define top screens[SCREEN].y_org
+#define bottom top + screens[SCREEN].height
+
+ for( SCREEN = i_num_screens-1; SCREEN > 0; SCREEN--)
+ {
+ if( left <= screen_x && screen_x <= right &&
+ top <= screen_y && screen_y <= bottom )
+ break;
+ }
+#undef bottom
+#undef top
+#undef right
+#undef left
}
/* Get the X/Y upper left corner coordinate of the above screen */
#ifdef HAVE_XSP
EnablePixelDoubling( p_vout );
#endif
-
+
+#if APPFOCUS // RASTER: let the wm do focus policy
+ /* 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 );
+#endif
}
else
{
* window has already been mapped because the XMapWindow() request
* has not necessarily been sent directly to our window (remember,
* the call is first redirected to the window manager) */
+
+#if BADFS // RASTER: this is silly... if we have already mapped before
do
{
XWindowEvent( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
StructureNotifyMask, &xevent );
} while( xevent.type != MapNotify );
+#else
+ XSync(p_vout->p_sys->p_display, False);
+#endif
/* Be careful, this can generate a BadMatch error if the window is not
* already mapped by the server (see above) */
* XVideoGetPort: get YUV12 port
*****************************************************************************/
static int XVideoGetPort( vout_thread_t *p_vout,
- vlc_fourcc_t i_chroma, vlc_fourcc_t *pi_newchroma )
+ vlc_fourcc_t i_chroma, picture_heap_t *p_heap )
{
XvAdaptorInfo *p_adaptor;
unsigned int i;
{
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 */
== Success )
{
i_selected_port = i_port;
- *pi_newchroma = p_formats[ i_format ].id;
+ p_heap->i_chroma = p_formats[ i_format ].id;
+#if XvVersion > 2 || ( XvVersion == 2 && XvRevision >= 2 )
+ p_heap->i_rmask = p_formats[ i_format ].red_mask;
+ p_heap->i_gmask = p_formats[ i_format ].green_mask;
+ p_heap->i_bmask = p_formats[ i_format ].blue_mask;
+#endif
}
}
( 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 );
{
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 )
{
#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" ) )
+ if( config_GetInt( p_vout, MODULE_STRING "-shm" ) > 0 )
{
-# 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 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
return VLC_SUCCESS;
}
+#ifndef MODULE_NAME_IS_glx
+
#ifdef HAVE_SYS_SHM_H
/*****************************************************************************
* CreateShmImage: create an XImage or XvImage using shared memory extension
* 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 )
{
/* 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 );
#elif defined(MODULE_NAME_IS_xvmc)
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;
}
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;
/* 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 );
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) */
/* 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 );
+ 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
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 */
+ {
+ fprintf( stderr,
+ "[????????] x11 video output notice:"
+ " buggy X11 server claims shared memory\n"
+ "[????????] x11 video output notice:"
+ " support though it does not work (OpenSSH?)\n" );
+ 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
*****************************************************************************/
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;
{
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);
+ return vout_ControlWindow( 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 * );
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);
+ return vout_ControlWindow( p_vout->p_sys->p_win->owner_window,
+ i_query, args);
vlc_mutex_lock( &p_vout->p_sys->lock );
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 );
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
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;
#ifdef MODULE_NAME_IS_xvmc
xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
#endif
vlc_mutex_unlock( &p_vout->p_sys->lock );
- return vout_vaControlDefault( p_vout, i_query, args );
+ vout_ReleaseWindow( p_vout->p_sys->p_win->owner_window );
+ p_vout->p_sys->original_window.owner_window = NULL;
+ return VLC_SUCCESS;
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);
+ return vout_ControlWindow( 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 );
return VLC_SUCCESS;
default:
- return vout_vaControlDefault( p_vout, i_query, args );
+ return VLC_EGENERIC;
}
}
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 );
{
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;
}
}
/*****************************************************************************
* Key events handling
*****************************************************************************/
-static struct
+static const struct
{
int i_x11key;
int i_vlckey;
/*****************************************************************************
* 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 )
{
projects / vlc / blobdiff