* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.31 2003/09/01 18:30:01 gbazin Exp $
+ * $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
* David Kennedy <dkennedy@tinytoad.com>
* Gildas Bazin <gbazin@netcourrier.com>
*
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/vout.h>
+#include <vlc_keys.h>
#ifdef HAVE_MACHINE_PARAM_H
/* BSD */
# include <X11/extensions/Xvlib.h>
#endif
+#ifdef MODULE_NAME_IS_glx
+# include <GL/glx.h>
+#endif
+
#ifdef HAVE_XINERAMA
# include <X11/extensions/Xinerama.h>
#endif
static void EndVideo ( vout_thread_t * );
static void DisplayVideo ( vout_thread_t *, picture_t * );
static int ManageVideo ( vout_thread_t * );
+static int Control ( vout_thread_t *, int, va_list );
static int InitDisplay ( vout_thread_t * );
#endif
static void TestNetWMSupport( vout_thread_t * );
+static int ConvertKey( int );
+
+static int WindowOnTop( vout_thread_t *, vlc_bool_t );
/*****************************************************************************
* Activate: allocate X11 video thread output method
int E_(Activate) ( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- char * psz_display;
+ char * psz_display;
+ vlc_value_t val;
+
#ifdef MODULE_NAME_IS_xvideo
char * psz_chroma;
vlc_fourcc_t i_chroma = 0;
p_vout->pf_manage = ManageVideo;
p_vout->pf_render = NULL;
p_vout->pf_display = DisplayVideo;
+ p_vout->pf_control = Control;
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
return VLC_ENOMEM;
}
+ vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
+
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
psz_display = config_GetPsz( p_vout, MODULE_STRING "-display" );
TestNetWMSupport( p_vout );
+ /* Variable to indicate if the window should be on top of others */
+ /* Trigger a callback right now */
+ var_Get( p_vout, "video-on-top", &val );
+ var_Set( p_vout, "video-on-top", val );
+
return VLC_SUCCESS;
}
{
XFreeColormap( p_vout->p_sys->p_display, p_vout->p_sys->colormap );
}
-#else
+#elif defined(MODULE_NAME_IS_xvideo)
XVideoReleasePort( p_vout, p_vout->p_sys->i_xvport );
#endif
XCloseDisplay( p_vout->p_sys->p_display );
/* Destroy structure */
+ vlc_mutex_destroy( &p_vout->p_sys->lock );
free( p_vout->p_sys );
}
break;
}
-#else
+#elif defined(MODULE_NAME_IS_x11)
/* Initialize the output structure: RGB with square pixels, whatever
* the input format is, since it's the only format we know */
switch( p_vout->p_sys->i_screen_depth )
case 24:
p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
case 32:
- p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4'); break;
+ p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2'); break;
default:
msg_Err( p_vout, "unknown screen depth %i",
p_vout->p_sys->i_screen_depth );
return VLC_SUCCESS;
}
- /*****************************************************************************
+/*****************************************************************************
* DisplayVideo: displays previously rendered output
*****************************************************************************
* This function sends the currently rendered image to X11 server.
p_vout->p_sys->p_win->i_height,
&i_x, &i_y, &i_width, &i_height );
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+
#ifdef HAVE_SYS_SHM_H
if( p_vout->p_sys->b_shm )
{
/* Make sure the command is sent now - do NOT use XFlush !*/
XSync( p_vout->p_sys->p_display, False );
+
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
}
/*****************************************************************************
static int ManageVideo( vout_thread_t *p_vout )
{
XEvent xevent; /* X11 event */
- char i_key; /* ISO Latin-1 key */
- KeySym x_key_symbol;
vlc_value_t val;
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+
+ /* Handle events from the owner window */
+ 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,
+ StructureNotifyMask, &xevent ) == True )
+ {
+ /* ConfigureNotify event: prepare */
+ if( xevent.type == ConfigureNotify )
+ {
+ /* Update dimensions */
+ XResizeWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window,
+ xevent.xconfigure.width,
+ xevent.xconfigure.height );
+ }
+ }
+ }
+
/* Handle X11 events: ConfigureNotify events are parsed to know if the
* output window's size changed, MapNotify and UnmapNotify to know if the
* window is mapped (and if the display is useful), and ClientMessages
/* Keyboard event */
else if( xevent.type == KeyPress )
{
+ unsigned int state = xevent.xkey.state;
+ KeySym x_key_symbol;
+ char i_key; /* ISO Latin-1 key */
+
/* We may have keys like F1 trough F12, ESC ... */
x_key_symbol = XKeycodeToKeysym( p_vout->p_sys->p_display,
xevent.xkey.keycode, 0 );
- switch( (int)x_key_symbol )
- {
- case XK_Escape:
- if( p_vout->b_fullscreen )
- {
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- }
- else
- {
- /* the user wants to close the window */
- playlist_t * p_playlist =
- (playlist_t *)vlc_object_find( p_vout,
- VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
- }
- }
- break;
- case XK_Menu:
- {
- intf_thread_t *p_intf;
- playlist_t * p_playlist;
+ val.i_int = ConvertKey( (int)x_key_symbol );
- 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 );
- }
+ xevent.xkey.state &= ~ShiftMask;
+ xevent.xkey.state &= ~ControlMask;
+ xevent.xkey.state &= ~Mod1Mask;
- p_playlist = vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- vlc_value_t val;
- var_Set( p_playlist, "intf-popupmenu", val );
- vlc_object_release( p_playlist );
- }
- }
- break;
- case XK_Left:
-/* input_Seek( p_vout, -5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
- val.psz_string = "LEFT";
- var_Set( p_vout, "key-pressed", val );
- break;
- case XK_Right:
-/* input_Seek( p_vout, 5, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
- val.psz_string = "RIGHT";
- var_Set( p_vout, "key-pressed", val );
- break;
- case XK_Up:
-/* input_Seek( p_vout, 60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
- val.psz_string = "UP";
- var_Set( p_vout, "key-pressed", val );
- break;
- case XK_Down:
-/* input_Seek( p_vout, -60, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR ); */
- val.psz_string = "DOWN";
- var_Set( p_vout, "key-pressed", val );
- break;
- case XK_Return:
- case XK_KP_Enter:
- val.psz_string = "ENTER";
- var_Set( p_vout, "key-pressed", val );
- break;
- case XK_Home:
- input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_SET );
- break;
- case XK_End:
- input_Seek( p_vout, 0, INPUT_SEEK_BYTES | INPUT_SEEK_END );
- break;
- case XK_Page_Up:
- input_Seek( p_vout, 10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
- case XK_Page_Down:
- input_Seek( p_vout, -10, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
- break;
- case XK_space:
- input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
- break;
-
- default:
+ if( !val.i_int &&
+ XLookupString( &xevent.xkey, &i_key, 1, NULL, NULL ) )
+ {
/* "Normal Keys"
* The reason why I use this instead of XK_0 is that
* with XLookupString, we don't have to care about
* keymaps. */
+ val.i_int = i_key;
+ }
- if( XLookupString( &xevent.xkey, &i_key, 1, NULL, NULL ) )
+ if( val.i_int )
+ {
+ if( state & ShiftMask )
{
- /* FIXME: handle stuff here */
- switch( i_key )
- {
- case 'q':
- case 'Q':
- p_vout->p_vlc->b_die = 1;
- break;
- case 'f':
- case 'F':
- p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
- break;
-
- default:
- break;
- }
+ val.i_int |= KEY_MODIFIER_SHIFT;
}
- break;
+ if( state & ControlMask )
+ {
+ val.i_int |= KEY_MODIFIER_CTRL;
+ }
+ if( state & Mod1Mask )
+ {
+ val.i_int |= KEY_MODIFIER_ALT;
+ }
+ var_Set( p_vout->p_vlc, "key-pressed", val );
}
}
/* Mouse click */
var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 1;
var_Set( p_vout, "mouse-button-down", val );
-
+
/* detect double-clicks */
if( ( ((XButtonEvent *)&xevent)->time -
p_vout->p_sys->i_time_button_last_pressed ) < 300 )
val.i_int |= 2;
var_Set( p_vout, "mouse-button-down", val );
break;
-
+
case Button3:
var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 4;
var_Set( p_vout, "mouse-button-down", val );
break;
-
+
case Button4:
var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 8;
var_Set( p_vout, "mouse-button-down", val );
- input_Seek( p_vout, 15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
case Button5:
var_Get( p_vout, "mouse-button-down", &val );
val.i_int |= 16;
var_Set( p_vout, "mouse-button-down", val );
- input_Seek( p_vout, -15, INPUT_SEEK_SECONDS | INPUT_SEEK_CUR );
break;
}
}
val.b_bool = VLC_TRUE;
var_Set( p_vout, "mouse-clicked", val );
break;
-
+
case Button2:
{
playlist_t *p_playlist;
}
}
break;
-
+
case Button3:
{
intf_thread_t *p_intf;
FIND_ANYWHERE );
if( p_playlist != NULL )
{
- vlc_value_t val;
+ vlc_value_t val; val.b_bool = VLC_TRUE;
var_Set( p_playlist, "intf-popupmenu", val );
vlc_object_release( p_playlist );
}
val.i_int &= ~16;
var_Set( p_vout, "mouse-button-down", val );
break;
-
+
}
}
/* Mouse move */
}
}
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+
return 0;
}
vlc_bool_t b_configure_notify = VLC_FALSE;
vlc_bool_t b_map_notify = VLC_FALSE;
- vlc_value_t val;
- long long int i_drawable;
-
/* Prepare window manager hints and properties */
- xsize_hints.base_width = p_win->i_width;
- xsize_hints.base_height = p_win->i_height;
- xsize_hints.flags = PSize;
p_win->wm_protocols =
XInternAtom( p_vout->p_sys->p_display, "WM_PROTOCOLS", True );
p_win->wm_delete_window =
XInternAtom( p_vout->p_sys->p_display, "WM_DELETE_WINDOW", True );
+ /* Never have a 0-pixel-wide window */
+ xsize_hints.min_width = 2;
+ xsize_hints.min_height = 1;
+
/* Prepare window attributes */
xwindow_attributes.backing_store = Always; /* save the hidden part */
xwindow_attributes.background_pixel = BlackPixel(p_vout->p_sys->p_display,
p_vout->p_sys->i_screen);
xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask;
- /* Check whether someone provided us with a window ID */
- var_Get( p_vout->p_vlc, "drawable", &val );
- i_drawable = p_vout->b_fullscreen ? 0 : val.i_int;
+ 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 );
+
+ 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;
- if( !i_drawable )
+ if( p_win->i_x >=0 || p_win->i_y >= 0 )
+ {
+ xsize_hints.x = p_win->i_x;
+ xsize_hints.y = p_win->i_y;
+ xsize_hints.flags |= PPosition;
+ }
+ }
+ else
+ {
+ /* Fullscreen window size and position */
+ p_win->owner_window = 0;
+ 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 );
+ 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
p_win->base_window =
XCreateWindow( p_vout->p_sys->p_display,
DefaultRootWindow( p_vout->p_sys->p_display ),
- 0, 0,
+ p_win->i_x, p_win->i_y,
p_win->i_width, p_win->i_height,
0,
0, InputOutput, 0,
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
{
- /* Get the parent window's geometry information */
Window dummy1;
unsigned int dummy2, dummy3;
- XGetGeometry( p_vout->p_sys->p_display, i_drawable,
+
+ /* Select events we are interested in. */
+ XSelectInput( p_vout->p_sys->p_display, p_win->owner_window,
+ StructureNotifyMask );
+
+ /* Get the parent window's geometry information */
+ XGetGeometry( p_vout->p_sys->p_display, p_win->owner_window,
&dummy1, &dummy2, &dummy3,
&p_win->i_width,
&p_win->i_height,
* ButtonPress event, so we need to open a new window anyway. */
p_win->base_window =
XCreateWindow( p_vout->p_sys->p_display,
- i_drawable,
+ p_win->owner_window,
0, 0,
p_win->i_width, p_win->i_height,
0,
&& (xevent.xexpose.window == p_win->base_window) )
{
b_expose = VLC_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;
}
else if( (xevent.type == MapNotify)
&& (xevent.xmap.window == p_win->base_window) )
/* Do NOT use XFlush here ! */
XSync( p_vout->p_sys->p_display, False );
- XDestroyWindow( p_vout->p_sys->p_display, p_win->video_window );
+ if( p_win->video_window != None )
+ XDestroyWindow( p_vout->p_sys->p_display, p_win->video_window );
+
XFreeGC( p_vout->p_sys->p_display, p_win->gc );
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 );
}
/*****************************************************************************
*****************************************************************************/
static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic )
{
+#ifndef MODULE_NAME_IS_glx
+
+#ifdef MODULE_NAME_IS_xvideo
+ int i_plane;
+#endif
+
/* We know the chroma, allocate a buffer which will be used
* directly by the decoder */
p_pic->p_sys = malloc( sizeof( picture_sys_t ) );
return -1;
}
+ /* 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 );
+
#ifdef HAVE_SYS_SHM_H
if( p_vout->p_sys->b_shm )
{
p_pic->p_sys->p_image =
CreateShmImage( p_vout, p_vout->p_sys->p_display,
# ifdef MODULE_NAME_IS_xvideo
- p_vout->p_sys->i_xvport, p_vout->output.i_chroma,
+ p_vout->p_sys->i_xvport,
+ VLC2X11_FOURCC(p_vout->output.i_chroma),
# else
p_vout->p_sys->p_visual,
p_vout->p_sys->i_screen_depth,
p_pic->p_sys->p_image =
CreateImage( p_vout, p_vout->p_sys->p_display,
#ifdef MODULE_NAME_IS_xvideo
- p_vout->p_sys->i_xvport, p_vout->output.i_chroma,
+ p_vout->p_sys->i_xvport,
+ VLC2X11_FOURCC(p_vout->output.i_chroma),
+ p_pic->format.i_bits_per_pixel,
#else
p_vout->p_sys->p_visual,
p_vout->p_sys->i_screen_depth,
{
#ifdef MODULE_NAME_IS_xvideo
case VLC_FOURCC('I','4','2','0'):
-
- p_pic->Y_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p[Y_PLANE].i_lines = p_vout->output.i_height;
- p_pic->p[Y_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[0];
- p_pic->p[Y_PLANE].i_pixel_pitch = 1;
- p_pic->p[Y_PLANE].i_visible_pitch = p_vout->output.i_width;
-
- p_pic->U_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[1];
- p_pic->p[U_PLANE].i_lines = p_vout->output.i_height / 2;
- p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[1];
- p_pic->p[U_PLANE].i_pixel_pitch = 1;
- p_pic->p[U_PLANE].i_visible_pitch = p_vout->output.i_width / 2;
-
- p_pic->V_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[2];
- p_pic->p[V_PLANE].i_lines = p_vout->output.i_height / 2;
- p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[2];
- p_pic->p[V_PLANE].i_pixel_pitch = 1;
- p_pic->p[V_PLANE].i_visible_pitch = p_vout->output.i_width / 2;
-
- p_pic->i_planes = 3;
- break;
-
case VLC_FOURCC('Y','V','1','2'):
-
- p_pic->Y_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p[Y_PLANE].i_lines = p_vout->output.i_height;
- p_pic->p[Y_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[0];
- p_pic->p[Y_PLANE].i_pixel_pitch = 1;
- p_pic->p[Y_PLANE].i_visible_pitch = p_pic->p[Y_PLANE].i_pitch;
- p_pic->p[Y_PLANE].i_visible_pitch = p_vout->output.i_width;
-
- p_pic->U_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[2];
- p_pic->p[U_PLANE].i_lines = p_vout->output.i_height / 2;
- p_pic->p[U_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[2];
- p_pic->p[U_PLANE].i_pixel_pitch = 1;
- p_pic->p[U_PLANE].i_visible_pitch = p_vout->output.i_width / 2;
-
- p_pic->V_PIXELS = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[1];
- p_pic->p[V_PLANE].i_lines = p_vout->output.i_height / 2;
- p_pic->p[V_PLANE].i_pitch = p_pic->p_sys->p_image->pitches[1];
- p_pic->p[V_PLANE].i_pixel_pitch = 1;
- p_pic->p[V_PLANE].i_visible_pitch = p_vout->output.i_width / 2;
-
- p_pic->i_planes = 3;
- break;
-
case VLC_FOURCC('Y','2','1','1'):
-
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p->i_lines = p_vout->output.i_height;
- /* XXX: this just looks so plain wrong... check it out ! */
- p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0] / 4;
- p_pic->p->i_pixel_pitch = 4;
- p_pic->p->i_visible_pitch = p_vout->output.i_width * 4;
-
- p_pic->i_planes = 1;
- break;
-
case VLC_FOURCC('Y','U','Y','2'):
case VLC_FOURCC('U','Y','V','Y'):
-
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p->i_lines = p_vout->output.i_height;
- p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0];
- p_pic->p->i_pixel_pitch = 2;
- p_pic->p->i_visible_pitch = p_vout->output.i_width * 2;
-
- p_pic->i_planes = 1;
- break;
-
case VLC_FOURCC('R','V','1','5'):
-
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p->i_lines = p_vout->output.i_height;
- p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0];
- p_pic->p->i_pixel_pitch = 2;
- p_pic->p->i_visible_pitch = p_vout->output.i_width * 2;
-
- p_pic->i_planes = 1;
- break;
-
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'):
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->offsets[0];
- p_pic->p->i_lines = p_vout->output.i_height;
- p_pic->p->i_pitch = p_pic->p_sys->p_image->pitches[0];
- p_pic->p->i_pixel_pitch = 2;
- p_pic->p->i_visible_pitch = p_vout->output.i_width * 2;
-
- p_pic->i_planes = 1;
+ 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_sys->p_image->offsets[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') )
+ {
+ /* 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->p_sys->p_image->offsets[2];
+ p_pic->V_PIXELS = p_pic->p_sys->p_image->data
+ + p_pic->p_sys->p_image->offsets[1];
+ }
break;
#else
case VLC_FOURCC('R','G','B','2'):
-
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->xoffset;
- p_pic->p->i_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 = p_pic->p_sys->p_image->depth;
- p_pic->p->i_visible_pitch = p_pic->p_sys->p_image->width;
-
- p_pic->i_planes = 1;
-
- break;
-
case VLC_FOURCC('R','V','1','6'):
case VLC_FOURCC('R','V','1','5'):
-
- p_pic->p->p_pixels = p_pic->p_sys->p_image->data
- + p_pic->p_sys->p_image->xoffset;
- p_pic->p->i_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 = p_pic->p_sys->p_image->depth;
- p_pic->p->i_visible_pitch = 2 * p_pic->p_sys->p_image->width;
-
- p_pic->i_planes = 1;
-
- break;
-
- case VLC_FOURCC('R','V','3','2'):
case VLC_FOURCC('R','V','2','4'):
+ case VLC_FOURCC('R','V','3','2'):
+ 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_sys->p_image->xoffset;
- p_pic->p->i_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 = p_pic->p_sys->p_image->depth;
- p_pic->p->i_visible_pitch = 4 * p_pic->p_sys->p_image->width;
-
- p_pic->i_planes = 1;
+ /* p_pic->p->i_pixel_pitch = 4 for RV24 but this should be set
+ * properly by vout_InitPicture() */
+ p_pic->p->i_visible_pitch = p_pic->p->i_pixel_pitch
+ * p_pic->p_sys->p_image->width;
break;
#endif
return -1;
}
+#endif /* !MODULE_NAME_IS_glx */
+
return 0;
}
config_GetInt( p_vout, MODULE_STRING "-altfullscreen" );
XUnmapWindow( p_vout->p_sys->p_display,
- p_vout->p_sys->p_win->base_window);
+ p_vout->p_sys->p_win->base_window );
p_vout->p_sys->p_win = &p_vout->p_sys->fullscreen_window;
- /* fullscreen window size and position */
- p_vout->p_sys->p_win->i_width =
- DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
- p_vout->p_sys->p_win->i_height =
- DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
-
CreateWindow( p_vout, p_vout->p_sys->p_win );
+ XDestroyWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->fullscreen_window.video_window );
+ XReparentWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->original_window.video_window,
+ p_vout->p_sys->fullscreen_window.base_window, 0, 0 );
+ p_vout->p_sys->fullscreen_window.video_window =
+ p_vout->p_sys->original_window.video_window;
/* To my knowledge there are two ways to create a borderless window.
* There's the generic way which is to tell x to bypass the window
DefaultRootWindow( p_vout->p_sys->p_display ),
0, 0 );
- /* fullscreen window size and position */
- p_vout->p_sys->p_win->i_width =
- DisplayWidth( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
- p_vout->p_sys->p_win->i_height =
- DisplayHeight( p_vout->p_sys->p_display, p_vout->p_sys->i_screen );
-
- p_vout->p_sys->p_win->i_x = 0;
- p_vout->p_sys->p_win->i_y = 0;
-
#ifdef HAVE_XINERAMA
if( XineramaQueryExtension( p_vout->p_sys->p_display, &i_d1, &i_d2 ) &&
XineramaIsActive( p_vout->p_sys->p_display ) )
XineramaScreenInfo *screens; /* infos for xinerama */
int i_num_screens;
- msg_Dbg( p_vout, "Using XFree Xinerama extension");
+ msg_Dbg( p_vout, "using XFree Xinerama extension");
#define SCREEN p_vout->p_sys->p_win->i_screen
- /* Get Informations about Xinerama (num of screens) */
+ /* Get Information about Xinerama (num of screens) */
screens = XineramaQueryScreens( p_vout->p_sys->p_display,
&i_num_screens );
#undef SCREEN
}
+ else
#endif
+ {
+ /* The window wasn't necessarily created at the requested size */
+ p_vout->p_sys->p_win->i_x = p_vout->p_sys->p_win->i_y = 0;
+ p_vout->p_sys->p_win->i_width =
+ DisplayWidth( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen );
+ p_vout->p_sys->p_win->i_height =
+ DisplayHeight( p_vout->p_sys->p_display,
+ p_vout->p_sys->i_screen );
+ }
XMoveResizeWindow( p_vout->p_sys->p_display,
p_vout->p_sys->p_win->base_window,
else
{
msg_Dbg( p_vout, "leaving fullscreen mode" );
+
+ XReparentWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->original_window.video_window,
+ p_vout->p_sys->original_window.base_window, 0, 0 );
+
+ p_vout->p_sys->fullscreen_window.video_window = None;
DestroyWindow( p_vout, &p_vout->p_sys->fullscreen_window );
p_vout->p_sys->p_win = &p_vout->p_sys->original_window;
XMapWindow( p_vout->p_sys->p_display,
- p_vout->p_sys->p_win->base_window);
+ p_vout->p_sys->p_win->base_window );
}
/* Unfortunately, using XSync() here is not enough to ensure the
int dummy;
#endif
- /* Save screen saver informations */
+ /* Save screen saver information */
XGetScreenSaver( p_vout->p_sys->p_display, &p_vout->p_sys->i_ss_timeout,
&p_vout->p_sys->i_ss_interval,
&p_vout->p_sys->i_ss_blanking,
i_format < i_num_formats && ( i_selected_port == -1 );
i_format++ )
{
- /* Code removed, we can get this through xvinfo anyway */
-#if 0
- XvEncodingInfo *p_enc;
- int i_enc, i_num_encodings;
XvAttribute *p_attr;
int i_attr, i_num_attributes;
-#endif
/* If this is not the format we want, or at least a
* similar one, forget it */
( p_formats[ i_format ].format == XvPacked ) ?
"packed" : "planar" );
-#if 0
- msg_Dbg( p_vout, " encoding list:" );
-
- if( XvQueryEncodings( p_vout->p_sys->p_display, i_selected_port,
- &i_num_encodings, &p_enc )
- != Success )
- {
- msg_Dbg( p_vout, " XvQueryEncodings failed" );
- continue;
- }
-
- for( i_enc = 0; i_enc < i_num_encodings; i_enc++ )
- {
- msg_Dbg( p_vout, " id=%ld, name=%s, size=%ldx%ld,"
- " numerator=%d, denominator=%d",
- p_enc[i_enc].encoding_id, p_enc[i_enc].name,
- p_enc[i_enc].width, p_enc[i_enc].height,
- p_enc[i_enc].rate.numerator,
- p_enc[i_enc].rate.denominator );
- }
-
- if( p_enc != NULL )
- {
- XvFreeEncodingInfo( p_enc );
- }
-
- msg_Dbg( p_vout, " attribute list:" );
+ /* Make sure XV_AUTOPAINT_COLORKEY is set */
p_attr = XvQueryPortAttributes( p_vout->p_sys->p_display,
i_selected_port,
&i_num_attributes );
+
for( i_attr = 0; i_attr < i_num_attributes; i_attr++ )
{
- msg_Dbg( p_vout, " name=%s, flags=[%s%s ], min=%i, max=%i",
- p_attr[i_attr].name,
- (p_attr[i_attr].flags & XvGettable) ? " get" : "",
- (p_attr[i_attr].flags & XvSettable) ? " set" : "",
- p_attr[i_attr].min_value, p_attr[i_attr].max_value );
+ if( !strcmp( p_attr[i_attr].name, "XV_AUTOPAINT_COLORKEY" ) )
+ {
+ const Atom 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( p_attr != NULL )
{
XFree( p_attr );
}
-#endif
}
if( p_formats != NULL )
{
#ifdef MODULE_NAME_IS_x11
XPixmapFormatValues * p_formats; /* pixmap formats */
- XVisualInfo * p_xvisual; /* visuals informations */
+ XVisualInfo * p_xvisual; /* visuals information */
XVisualInfo xvisual_template; /* visual template */
int i_count; /* array size */
#endif
/* Allocate memory for image */
#ifdef MODULE_NAME_IS_xvideo
- p_data = (byte_t *) malloc( i_width * i_height * 2 ); /* XXX */
-#else
+ p_data = (byte_t *) 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 );
#endif
#ifdef MODULE_NAME_IS_xvideo
p_image = XvCreateImage( p_display, i_xvport, i_chroma,
p_data, i_width, i_height );
-#else
+#elif defined(MODULE_NAME_IS_x11)
p_image = XCreateImage( p_display, p_visual, i_depth, ZPixmap, 0,
p_data, i_width, i_height, i_quantum, 0 );
#endif
}
#endif
+/*****************************************************************************
+ * Control: control facility for the vout
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+ double f_arg;
+ vlc_bool_t b_arg;
+
+ switch( i_query )
+ {
+ case VOUT_SET_ZOOM:
+ if( p_vout->p_sys->p_win->owner_window )
+ return vout_ControlWindow( p_vout,
+ (void *)p_vout->p_sys->p_win->owner_window, i_query, args);
+
+ f_arg = va_arg( args, double );
+
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+
+ /* Update dimensions */
+ /* FIXME: export InitWindowSize() from vout core */
+ XResizeWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window,
+ p_vout->i_window_width * f_arg,
+ p_vout->i_window_height * f_arg );
+
+ 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 );
+ XReparentWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->original_window.base_window,
+ DefaultRootWindow( p_vout->p_sys->p_display ),
+ 0, 0 );
+ XSync( p_vout->p_sys->p_display, False );
+ p_vout->p_sys->original_window.owner_window = 0;
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+ return vout_vaControlDefault( p_vout, i_query, args );
+
+ 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);
+
+ b_arg = va_arg( args, vlc_bool_t );
+ vlc_mutex_lock( &p_vout->p_sys->lock );
+ WindowOnTop( p_vout, b_arg );
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
+ return VLC_SUCCESS;
+
+ default:
+ return vout_vaControlDefault( p_vout, i_query, args );
+ }
+}
+
/*****************************************************************************
* TestNetWMSupport: tests for Extended Window Manager Hints support
*****************************************************************************/
{
int i_ret, i_format;
unsigned long i, i_items, i_bytesafter;
- Atom net_wm_supported, *p_args = NULL;
+ Atom net_wm_supported;
+ union { Atom *p_atom; unsigned char *p_char; } p_args;
+
+ 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;
for( i = 0; i < i_items; i++ )
{
- if( p_args[i] == p_vout->p_sys->net_wm_state_fullscreen )
+ if( p_args.p_atom[i] == p_vout->p_sys->net_wm_state_fullscreen )
{
msg_Dbg( p_vout,
"Window manager supports _NET_WM_STATE_FULLSCREEN" );
p_vout->p_sys->b_net_wm_state_fullscreen = VLC_TRUE;
}
- else if( p_args[i] == p_vout->p_sys->net_wm_state_above )
+ 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;
}
- else if( p_args[i] == p_vout->p_sys->net_wm_state_below )
+ 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;
}
- else if( p_args[i] == p_vout->p_sys->net_wm_state_stays_on_top )
+ 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" );
}
}
- XFree( p_args );
+ XFree( p_args.p_atom );
+}
+
+/*****************************************************************************
+ * Key events handling
+ *****************************************************************************/
+static struct
+{
+ int i_x11key;
+ int i_vlckey;
+
+} x11keys_to_vlckeys[] =
+{
+ { XK_F1, KEY_F1 }, { XK_F2, KEY_F2 }, { XK_F3, KEY_F3 }, { XK_F4, KEY_F4 },
+ { XK_F5, KEY_F5 }, { XK_F6, KEY_F6 }, { XK_F7, KEY_F7 }, { XK_F8, KEY_F8 },
+ { XK_F9, KEY_F9 }, { XK_F10, KEY_F10 }, { XK_F11, KEY_F11 },
+ { XK_F12, KEY_F12 },
+
+ { XK_Return, KEY_ENTER },
+ { XK_KP_Enter, KEY_ENTER },
+ { XK_space, KEY_SPACE },
+ { XK_Escape, KEY_ESC },
+
+ { XK_Menu, KEY_MENU },
+ { XK_Left, KEY_LEFT },
+ { XK_Right, KEY_RIGHT },
+ { XK_Up, KEY_UP },
+ { XK_Down, KEY_DOWN },
+
+ { XK_Home, KEY_HOME },
+ { XK_End, KEY_END },
+ { XK_Page_Up, KEY_PAGEUP },
+ { XK_Page_Down, KEY_PAGEDOWN },
+ { 0, 0 }
+};
+
+static int ConvertKey( int i_key )
+{
+ int i;
+
+ for( i = 0; x11keys_to_vlckeys[i].i_x11key != 0; i++ )
+ {
+ if( x11keys_to_vlckeys[i].i_x11key == i_key )
+ {
+ return x11keys_to_vlckeys[i].i_vlckey;
+ }
+ }
+
+ return 0;
+}
+
+/*****************************************************************************
+ * 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 )
+{
+ if( p_vout->p_sys->b_net_wm_state_stays_on_top )
+ {
+ 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 */
+ 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 );
+ }
+
+ return VLC_SUCCESS;
}