/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_vout.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 );
+#endif
static int i_shm_major = 0;
#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 );
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
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 );
}
if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
{
- p_vout->p_sys->b_glx13 = VLC_FALSE;
+ p_vout->p_sys->b_glx13 = false;
msg_Dbg( p_this, "using GLX 1.2 API" );
}
else
{
- p_vout->p_sys->b_glx13 = VLC_TRUE;
+ p_vout->p_sys->b_glx13 = true;
msg_Dbg( p_this, "using GLX 1.3 API" );
}
}
/* 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
*****************************************************************************
* 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 );
#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,
XVMCUNLOCKDISPLAY( p_vout->p_sys->p_display );
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 );
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 );
+ val.b_bool = true;
+ var_Set( p_vout, "mouse-clicked", val );
+
+ vlc_value_t val; val.b_bool = false;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+ }
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;
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 );
- }
+ vlc_value_t val; val.b_bool = true;
+ var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
}
break;
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();
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_Yield( 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_fs, val_ontop;
-
/* Update the object variable and trigger callback */
- val_fs.b_bool = !p_vout->b_fullscreen;
-
- var_Set( p_vout, "fullscreen", val_fs );
-
- /* Disable "always on top" in fullscreen mode */
- var_Get( p_vout, "video-on-top", &val_ontop );
- if( val_ontop.b_bool )
- WindowOnTop( p_vout, val_fs.b_bool );
+ var_SetBool( p_vout, "fullscreen", !p_vout->b_fullscreen );
ToggleFullScreen( p_vout );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
/* 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 )
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,
+ void *ptr = vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
&p_win->i_width, &p_win->i_height );
-
+ p_win->owner_window = (uintptr_t)ptr;
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;
XStoreName( p_vout->p_sys->p_display,
p_win->base_window, val.psz_string );
}
- if( val.psz_string ) free( 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") )
{
&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. */
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;
}
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
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 */
#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
{
{
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 */
( 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 )
{
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
int major, evt, err;
if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major,
major, minor, pixmaps ? "" : "out",
p_vout->p_sys->i_shm_opcode );
}
-
-# endif
-
- if( !p_vout->p_sys->i_shm_opcode )
- {
- msg_Warn( p_vout, "XShm video extension is unavailable" );
- }
+ 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)
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
*****************************************************************************/
return 0;
}
+#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;
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,
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 );
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;
}
}
/*****************************************************************************
* 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