/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
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
+#ifndef MODULE_NAME_IS_glx
static 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 * );
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 ) );
#ifdef HAVE_XSP
DisablePixelDoubling(p_vout);
#endif
-
+
DestroyCursor( p_vout );
EnableXScreenSaver( p_vout );
DestroyWindow( p_vout, &p_vout->p_sys->original_window );
#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)
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;
#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 ) {
}
}
#endif
-
+
vlc_mutex_unlock( &p_vout->p_sys->lock );
return 0;
}
if( !p_vout->b_fullscreen )
{
- p_win->owner_window =
- (Window)vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
+ p_win->owner_window = (Window)vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
&p_win->i_width, &p_win->i_height );
xsize_hints.base_width = xsize_hints.width = p_win->i_width;
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") )
{
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_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;
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
#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
{
#endif
#ifdef HAVE_SYS_SHM_H
- p_vout->p_sys->b_shm = 0;
+ p_vout->p_sys->i_shm_opcode = 0;
if( config_GetInt( p_vout, MODULE_STRING "-shm" ) )
{
-# ifdef __APPLE__
- /* FIXME: As of 2001-03-16, XFree4 for MacOS X does not support Xshm */
-# else
- p_vout->p_sys->b_shm =
- ( XShmQueryExtension( p_vout->p_sys->p_display ) == True );
-# endif
+ int major, evt, err;
- if( !p_vout->p_sys->b_shm )
+ if( XQueryExtension( p_vout->p_sys->p_display, "MIT-SHM", &major,
+ &evt, &err )
+ && XShmQueryExtension( p_vout->p_sys->p_display ) )
+ p_vout->p_sys->i_shm_opcode = major;
+
+ if( p_vout->p_sys->i_shm_opcode )
{
- msg_Warn( p_vout, "XShm video extension is unavailable" );
+ int major, minor;
+ Bool pixmaps;
+
+ XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor,
+ &pixmaps );
+ msg_Dbg( p_vout, "XShm video extension v%d.%d "
+ "(with%s pixmaps, opcode: %d)",
+ major, minor, pixmaps ? "" : "out",
+ p_vout->p_sys->i_shm_opcode );
}
+ else
+ msg_Warn( p_vout, "XShm video extension not available" );
}
else
- {
- msg_Dbg( p_vout, "disabling XShm video extension" );
- }
-
-#else
- msg_Warn( p_vout, "XShm video extension is unavailable" );
-
+ msg_Dbg( p_vout, "XShm video extension disabled" );
#endif
#ifdef MODULE_NAME_IS_xvideo
return VLC_SUCCESS;
}
+#ifndef MODULE_NAME_IS_glx
+
#ifdef HAVE_SYS_SHM_H
/*****************************************************************************
* CreateShmImage: create an XImage or XvImage using shared memory extension
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 );
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:
/* Ignore errors on XSetInputFocus()
* (they happen when a window is not yet mapped) */
return 0;
-
- case 150: /* MIT-SHM */
- case 146: /* MIT-SHM too, what gives? */
- if( event->minor_code == X_ShmAttach )
- {
- b_shm = VLC_FALSE;
- return 0;
- }
- break;
}
+#ifdef HAVE_SYS_SHM_H
+ if( event->request_code == i_shm_major ) /* MIT-SHM */
+ return i_shm_major = 0;
+#endif
+
XSetErrorHandler(NULL);
return (XSetErrorHandler(X11ErrorHandler))( display, event );
}
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 =
+ VLC_FALSE;
net_wm_supported =
XInternAtom( p_vout->p_sys->p_display, "_NET_SUPPORTED", False );