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
-IMAGE_TYPE *CreateShmImage ( vout_thread_t *,
- Display *, EXTRA_ARGS_SHM, int, int );
-#endif
static int i_shm_major = 0;
#endif
}
}
}
- p_vout->output.i_chroma = X112VLC_FOURCC(p_vout->output.i_chroma);
+ p_vout->output.i_chroma = vlc_fourcc_GetCodec( VIDEO_ES, X112VLC_FOURCC(p_vout->output.i_chroma) );
#elif defined(MODULE_NAME_IS_glx)
{
int i_opcode, i_evt, i_err = 0;
if( checkXvMCCap( p_vout ) == VLC_EGENERIC )
{
msg_Err( p_vout, "no XVMC capability found" );
- Deactivate( p_vout );
+ Deactivate( p_this );
return VLC_EGENERIC;
}
subpicture_t sub_pic;
#if XvVersion < 2 || ( XvVersion == 2 && XvRevision < 2 )
switch( p_vout->output.i_chroma )
{
- case VLC_FOURCC('R','V','1','6'):
+ case VLC_CODEC_RGB16:
#if defined( WORDS_BIGENDIAN )
p_vout->output.i_rmask = 0xf800;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0xf800;
#endif
break;
- case VLC_FOURCC('R','V','1','5'):
+ case VLC_CODEC_RGB15:
#if defined( WORDS_BIGENDIAN )
p_vout->output.i_rmask = 0x7c00;
p_vout->output.i_gmask = 0x03e0;
switch( p_vout->p_sys->i_screen_depth )
{
case 8: /* FIXME: set the palette */
- p_vout->output.i_chroma = VLC_FOURCC('R','G','B','2'); break;
+ p_vout->output.i_chroma = VLC_CODEC_RGB8; break;
case 15:
- p_vout->output.i_chroma = VLC_FOURCC('R','V','1','5'); break;
+ p_vout->output.i_chroma = VLC_CODEC_RGB15; break;
case 16:
- p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break;
+ p_vout->output.i_chroma = VLC_CODEC_RGB16; break;
case 24:
case 32:
- p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
+ p_vout->output.i_chroma = VLC_CODEC_RGB32; break;
default:
msg_Err( p_vout, "unknown screen depth %i",
p_vout->p_sys->i_screen_depth );
I_OUTPUTPICTURES++;
}
- if( p_vout->output.i_chroma == VLC_FOURCC('Y','V','1','2') )
+ if( p_vout->output.i_chroma == VLC_CODEC_YV12 )
{
/* 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');
+ p_vout->output.i_chroma = VLC_CODEC_I420;
+ p_vout->fmt_out.i_chroma = VLC_CODEC_I420;
}
return VLC_SUCCESS;
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 defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
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,
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
+#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,
p_vout->fmt_out.i_visible_width,
p_vout->fmt_out.i_visible_height,
False /* Don't put True here ! */ );
-# endif
+#endif
}
else
#endif /* HAVE_SYS_SHM_H */
val.i_int |= 1;
var_Set( p_vout, "mouse-button-down", val );
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
+
/* detect double-clicks */
if( ( ((XButtonEvent *)&xevent)->time -
p_vout->p_sys->i_time_button_last_pressed ) < 300 )
var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 4;
var_Set( p_vout, "mouse-button-down", val );
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
break;
case Button4:
var_Set( p_vout, "mouse-button-down", val );
var_SetBool( p_vout, "mouse-clicked", true );
- var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
}
break;
val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val );
- var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
}
break;
{
unsigned int i_width, i_height, i_x, i_y;
- p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
-
#ifdef MODULE_NAME_IS_x11
/* We need to signal the vout thread about the size change because it
* is doing the rescaling */
- p_vout->i_changes |= VOUT_SIZE_CHANGE;
+#else
+ p_vout->i_changes &= ~VOUT_SIZE_CHANGE;
#endif
vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
{
p_win->owner_window = vout_RequestXWindow( p_vout, &p_win->i_x,
&p_win->i_y, &p_win->i_width, &p_win->i_height );
+ if( !p_win->owner_window )
+ return VLC_EGENERIC;
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;
xsize_hints.y = p_win->i_y;
xsize_hints.flags |= PPosition;
}
+
+ /* Select events we are interested in. */
+ 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->handle.xid,
+ &(Window){ 0 }, &(int){ 0 }, &(int){ 0 },
+ &p_win->i_width,
+ &p_win->i_height,
+ &(unsigned){ 0 }, &(unsigned){ 0 } );
+
+ /* 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->handle.xid,
+ 0, 0,
+ p_win->i_width, p_win->i_height,
+ 0,
+ 0, CopyFromParent, 0,
+ CWBackingStore | CWBackPixel | CWEventMask,
+ &xwindow_attributes );
}
else
{
DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
p_win->i_height =
DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
- }
- if( !p_win->owner_window )
- {
/* Create the window and set hints - the window must receive
* ConfigureNotify events, and until it is displayed, Expose and
* MapNotify events. */
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,
- (char**)argv, 1 );
-
- 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
- {
- Window dummy1;
- int dummy2, dummy3;
- unsigned int dummy4, dummy5;
-
- /* Select events we are interested in. */
- 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->handle.xid,
- &dummy1, &dummy2, &dummy3,
- &p_win->i_width,
- &p_win->i_height,
- &dummy4, &dummy5 );
-
- /* 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->handle.xid,
- 0, 0,
- p_win->i_width, p_win->i_height,
- 0,
- 0, CopyFromParent, 0,
- CWBackingStore | CWBackPixel | CWEventMask,
- &xwindow_attributes );
}
if( (p_win->wm_protocols == None) /* use WM_DELETE_WINDOW */
XUnmapWindow( p_vout->p_sys->p_display, p_win->base_window );
XDestroyWindow( p_vout->p_sys->p_display, p_win->base_window );
+ /* make sure base window is destroyed before proceeding further */
+ bool b_destroy_notify = false;
+ do
+ {
+ XEvent xevent;
+ XWindowEvent( p_vout->p_sys->p_display, p_win->base_window,
+ SubstructureNotifyMask | StructureNotifyMask, &xevent);
+ if( (xevent.type == DestroyNotify)
+ && (xevent.xmap.window == p_win->base_window) )
+ {
+ b_destroy_notify = true;
+ }
+ } while( !b_destroy_notify );
+
vout_ReleaseWindow( p_win->owner_window );
}
#endif
/* Fill in picture_t fields */
- vout_InitPicture( VLC_OBJECT(p_vout), p_pic, p_vout->output.i_chroma,
- p_vout->output.i_width, p_vout->output.i_height,
- p_vout->output.i_aspect );
+ if( picture_Setup( p_pic, p_vout->output.i_chroma,
+ p_vout->output.i_width, p_vout->output.i_height,
+ p_vout->output.i_aspect ) )
+ return -1;
#ifdef HAVE_SYS_SHM_H
if( p_vout->p_sys->i_shm_opcode )
/* Create image using XShm extension */
p_pic->p_sys->p_image =
CreateShmImage( p_vout, p_vout->p_sys->p_display,
-# if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
+#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
p_vout->p_sys->i_xvport,
VLC2X11_FOURCC(p_vout->output.i_chroma),
-# else
+#else
p_vout->p_sys->p_visual,
p_vout->p_sys->i_screen_depth,
-# endif
+#endif
&p_pic->p_sys->shminfo,
p_vout->output.i_width, p_vout->output.i_height );
}
switch( p_vout->output.i_chroma )
{
#if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('Y','V','1','2'):
- case VLC_FOURCC('Y','2','1','1'):
- case VLC_FOURCC('Y','U','Y','2'):
- case VLC_FOURCC('U','Y','V','Y'):
- case VLC_FOURCC('R','V','1','5'):
- case VLC_FOURCC('R','V','1','6'):
- case VLC_FOURCC('R','V','2','4'): /* Fixme: pixel pitch == 4 ? */
- case VLC_FOURCC('R','V','3','2'):
+ case VLC_CODEC_I420:
+ case VLC_CODEC_YV12:
+ case VLC_CODEC_Y211:
+ case VLC_CODEC_YUYV:
+ case VLC_CODEC_UYVY:
+ case VLC_CODEC_RGB15:
+ case VLC_CODEC_RGB16:
+ case VLC_CODEC_RGB24: /* Fixme: pixel pitch == 4 ? */
+ case VLC_CODEC_RGB32:
for( i_plane = 0; i_plane < p_pic->p_sys->p_image->num_planes;
i_plane++ )
p_pic->p[i_plane].i_pitch =
p_pic->p_sys->p_image->pitches[i_plane];
}
- if( p_vout->output.i_chroma == VLC_FOURCC('Y','V','1','2') )
+ if( p_vout->output.i_chroma == VLC_CODEC_YV12 )
{
/* U and V inverted compared to I420
* Fixme: this should be handled by the vout core */
break;
#else
- case VLC_FOURCC('R','G','B','2'):
- case VLC_FOURCC('R','V','1','6'):
- case VLC_FOURCC('R','V','1','5'):
- case VLC_FOURCC('R','V','2','4'):
- case VLC_FOURCC('R','V','3','2'):
+ case VLC_CODEC_RGB8:
+ case VLC_CODEC_RGB16:
+ case VLC_CODEC_RGB15:
+ case VLC_CODEC_RGB24:
+ case VLC_CODEC_RGB32:
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->i_pitch = p_pic->p_sys->p_image->bytes_per_line;
/* p_pic->p->i_pixel_pitch = 4 for RV24 but this should be set
- * properly by vout_InitPicture() */
+ * properly by picture_Setup() */
p_pic->p->i_visible_pitch = p_pic->p->i_pixel_pitch
* p_pic->p_sys->p_image->width;
break;
Window parent_win;
Window child_win;
XWindowAttributes win_attr;
- int screen_x,screen_y;
+ int screen_x,screen_y,win_width,win_height;
XGetWindowAttributes(
p_vout->p_sys->p_display,
&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);
+ win_width = p_vout->p_sys->p_win->i_width;
+ win_height = p_vout->p_sys->p_win->i_height;
+ msg_Dbg( p_vout, "X %d/%d Y %d/%d",
+ win_width, screen_x, win_height, screen_y );
/* screen_x and screen_y are current position */
p_vout->p_sys->b_altfullscreen =
* otherwise use that screen where window is */
if( SCREEN >= i_num_screens || SCREEN < 0 )
{
+ int overlapping=0;
+ int rightmost_left=0;
+ int leftmost_right=0;
+ int bottommost_top=0;
+ int topmost_bottom=0;
+ int best_screen=0;
+ int best_overlapping=0;
+ int dx,dy;
msg_Dbg( p_vout, "requested screen number invalid (%d/%d)", SCREEN, i_num_screens );
-#define left screens[SCREEN].x_org
-#define right left + screens[SCREEN].width
+#define left ( screens[SCREEN].x_org )
+#define right ( left + screens[SCREEN].width )
#define top screens[SCREEN].y_org
-#define bottom top + screens[SCREEN].height
+#define bottom ( top + screens[SCREEN].height )
- for( SCREEN = i_num_screens-1; SCREEN > 0; SCREEN--)
+ /* Code mostly same as http://superswitcher.googlecode.com/svn/trunk/src/xinerama.c
+ * by Nigel Tao, as it was pretty clean implemention what's needed here. Checks what display
+ * contains most of the window, and use that as fullscreen screen instead screen what
+ * contains videowindows 0.0 */
+ for( SCREEN = i_num_screens-1; SCREEN >= 0; SCREEN--)
{
- if( left <= screen_x && screen_x <= right &&
- top <= screen_y && screen_y <= bottom )
- break;
+ rightmost_left = __MAX( left, screen_x );
+ leftmost_right = __MIN( right, screen_x + win_width );
+ bottommost_top = __MAX( top, screen_y );
+ topmost_bottom = __MIN( bottom , screen_y + win_height );
+ dx = leftmost_right - rightmost_left;
+ dy = topmost_bottom - bottommost_top;
+ overlapping=0;
+ if ( dx > 0 && dy > 0 )
+ overlapping = dx*dy;
+ if( SCREEN == (i_num_screens-1) ||
+ overlapping > best_overlapping )
+ {
+ best_overlapping = overlapping;
+ best_screen = SCREEN;
+ }
}
+ msg_Dbg( p_vout, "setting best screen to %d", best_screen );
+ SCREEN = best_screen;
#undef bottom
#undef top
#undef right
return NULL;
}
- /* Allocate shared memory segment - 0776 set the access permission
- * rights (like umask), they are not yet supported by all X servers */
- p_shm->shmid = shmget( IPC_PRIVATE, DATA_SIZE(p_image), IPC_CREAT | 0776 );
+ /* For too big image, the buffer returned is sometimes too small, prevent
+ * VLC to segfault because of it
+ * FIXME is it normal ? Is there a way to detect it
+ * before (XvQueryBestSize did not) ? */
+ if( p_image->width < i_width || p_image->height < i_height )
+ {
+ msg_Err( p_vout, "cannot allocate shared image data with the right size "
+ "(%dx%d instead of %dx%d)",
+ p_image->width, p_image->height,
+ i_width, i_height );
+ IMAGE_FREE( p_image );
+ return NULL;
+ }
+
+ /* Allocate shared memory segment. */
+ p_shm->shmid = shmget( IPC_PRIVATE, DATA_SIZE(p_image), IPC_CREAT | 0600 );
if( p_shm->shmid < 0 )
{
msg_Err( p_vout, "cannot allocate shared image data (%m)" );
{
bool b_arg;
unsigned int i_width, i_height;
- unsigned int *pi_width, *pi_height;
- Drawable d = 0;
switch( i_query )
{
*****************************************************************************/
static int WindowOnTop( vout_thread_t *p_vout, bool b_on_top )
{
- if( p_vout->p_sys->b_net_wm_state_stays_on_top )
- {
- XClientMessageEvent event;
+ XClientMessageEvent event;
- memset( &event, 0, sizeof( XClientMessageEvent ) );
+ memset( &event, 0, sizeof( XClientMessageEvent ) );
+ event.type = ClientMessage;
+ event.message_type = p_vout->p_sys->net_wm_state;
+ 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 ] = b_on_top; /* set property */
- event.type = ClientMessage;
- event.message_type = p_vout->p_sys->net_wm_state;
- 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 ] = b_on_top; /* set property */
+ if( p_vout->p_sys->b_net_wm_state_stays_on_top )
event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_stays_on_top;
-
- XSendEvent( p_vout->p_sys->p_display,
- DefaultRootWindow( p_vout->p_sys->p_display ),
- False, SubstructureRedirectMask,
- (XEvent*)&event );
- }
-
- /* use _NET_WM_STATE_ABOVE if window manager
- * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
else if( p_vout->p_sys->b_net_wm_state_above )
- {
- XClientMessageEvent event;
-
- memset( &event, 0, sizeof( XClientMessageEvent ) );
-
- event.type = ClientMessage;
- event.message_type = p_vout->p_sys->net_wm_state;
- 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 ] = b_on_top; /* set property */
+ /* use _NET_WM_STATE_ABOVE if window manager
+ * doesn't handle _NET_WM_STATE_STAYS_ON_TOP */
event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_above;
+ else
+ return VLC_EGENERIC;
- XSendEvent( p_vout->p_sys->p_display,
- DefaultRootWindow( p_vout->p_sys->p_display ),
- False, SubstructureRedirectMask,
- (XEvent*)&event );
- }
-
+ XSendEvent( p_vout->p_sys->p_display,
+ DefaultRootWindow( p_vout->p_sys->p_display ),
+ False, SubstructureRedirectMask,
+ (XEvent*)&event );
return VLC_SUCCESS;
}
projects / vlc / blobdiff