X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fx11%2Fxcommon.c;h=8533aff8072717efbc1de22be09894429b9e2699;hb=010ddefdfc9ce3b3749f6139641b9a322f01b085;hp=8099892e4dbdda9cbe30c1ad5f0979721dab023f;hpb=074f7be593767bd863a4584eb63f95a7b3da42b0;p=vlc diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c index 8099892e4d..8533aff807 100644 --- a/modules/video_output/x11/xcommon.c +++ b/modules/video_output/x11/xcommon.c @@ -1,13 +1,13 @@ /***************************************************************************** * xcommon.c: Functions common to the X11 and XVideo plugins ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: xcommon.c,v 1.36 2003/10/26 23:03:47 sigmunau Exp $ + * Copyright (C) 1998-2001 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin - * Samuel Hocevar + * Sam Hocevar * David Kennedy - * Gildas Bazin + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ #endif #include +#include #include #include #include @@ -67,6 +68,10 @@ # include #endif +#ifdef MODULE_NAME_IS_glx +# include +#endif + #ifdef HAVE_XINERAMA # include #endif @@ -83,6 +88,7 @@ static int InitVideo ( vout_thread_t * ); 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 * ); @@ -97,6 +103,7 @@ static IMAGE_TYPE *CreateImage ( vout_thread_t *, #ifdef HAVE_SYS_SHM_H static IMAGE_TYPE *CreateShmImage ( vout_thread_t *, Display *, EXTRA_ARGS_SHM, int, int ); +static vlc_bool_t b_shm = VLC_TRUE; #endif static void ToggleFullScreen ( vout_thread_t * ); @@ -119,6 +126,11 @@ static void SetPalette ( vout_thread_t *, #endif static void TestNetWMSupport( vout_thread_t * ); +static int ConvertKey( int ); + +static int WindowOnTop( vout_thread_t *, vlc_bool_t ); + +static int X11ErrorHandler( Display *, XErrorEvent * ); /***************************************************************************** * Activate: allocate X11 video thread output method @@ -130,7 +142,9 @@ static void TestNetWMSupport( vout_thread_t * ); 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; @@ -142,6 +156,7 @@ int E_(Activate) ( vlc_object_t *p_this ) 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 ) ); @@ -151,6 +166,8 @@ int E_(Activate) ( vlc_object_t *p_this ) 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" ); @@ -167,6 +184,9 @@ int E_(Activate) ( vlc_object_t *p_this ) } if( psz_display ) free( psz_display ); + /* Replace error handler so we can intercept some non-fatal errors */ + XSetErrorHandler( X11ErrorHandler ); + /* Get a screen ID matching the XOpenDisplay return value */ p_vout->p_sys->i_screen = DefaultScreen( p_vout->p_sys->p_display ); @@ -242,7 +262,7 @@ int E_(Activate) ( vlc_object_t *p_this ) /* Set main window's size */ p_vout->p_sys->original_window.i_width = p_vout->i_window_width; p_vout->p_sys->original_window.i_height = p_vout->i_window_height; - + var_Create( p_vout, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); /* Spawn base window - this window will include the video output window, * but also command buttons, subtitles and other indicators */ if( CreateWindow( p_vout, &p_vout->p_sys->original_window ) ) @@ -274,6 +294,11 @@ int E_(Activate) ( vlc_object_t *p_this ) 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; } @@ -304,7 +329,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) { 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 @@ -315,6 +340,7 @@ void E_(Deactivate) ( vlc_object_t *p_this ) XCloseDisplay( p_vout->p_sys->p_display ); /* Destroy structure */ + vlc_mutex_destroy( &p_vout->p_sys->lock ); free( p_vout->p_sys ); } @@ -339,6 +365,9 @@ static int InitVideo( vout_thread_t *p_vout ) p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + switch( p_vout->output.i_chroma ) { case VLC_FOURCC('R','V','1','5'): @@ -353,7 +382,7 @@ static int InitVideo( vout_thread_t *p_vout ) 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 ) @@ -365,7 +394,6 @@ static int InitVideo( vout_thread_t *p_vout ) case 16: p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6'); break; 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','3','2'); break; default: @@ -377,11 +405,33 @@ static int InitVideo( vout_thread_t *p_vout ) vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width, p_vout->p_sys->p_win->i_height, &i_index, &i_index, - &p_vout->output.i_width, &p_vout->output.i_height ); - - /* Assume we have square pixels */ - p_vout->output.i_aspect = p_vout->output.i_width - * VOUT_ASPECT_FACTOR / p_vout->output.i_height; + &p_vout->fmt_out.i_visible_width, + &p_vout->fmt_out.i_visible_height ); + + p_vout->fmt_out.i_chroma = p_vout->output.i_chroma; + + p_vout->output.i_width = p_vout->fmt_out.i_width = + p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_width / + p_vout->fmt_in.i_visible_width; + p_vout->output.i_height = p_vout->fmt_out.i_height = + p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_height / + p_vout->fmt_in.i_visible_height; + p_vout->fmt_out.i_x_offset = + p_vout->fmt_out.i_visible_width * p_vout->fmt_in.i_x_offset / + p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_y_offset = + p_vout->fmt_out.i_visible_height * p_vout->fmt_in.i_y_offset / + p_vout->fmt_in.i_visible_height; + + p_vout->fmt_out.i_sar_num = p_vout->fmt_out.i_sar_den = 1; + p_vout->output.i_aspect = p_vout->fmt_out.i_aspect = + p_vout->fmt_out.i_width * VOUT_ASPECT_FACTOR /p_vout->fmt_out.i_height; + + msg_Dbg( p_vout, "x11 image size %ix%i (%i,%i,%ix%i)", + p_vout->fmt_out.i_width, p_vout->fmt_out.i_height, + p_vout->fmt_out.i_x_offset, p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height ); #endif /* Try to initialize up to MAX_DIRECTBUFFERS direct buffers */ @@ -413,10 +463,18 @@ static int InitVideo( vout_thread_t *p_vout ) I_OUTPUTPICTURES++; } + 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_vout->output.i_chroma = VLC_FOURCC('I','4','2','0'); + p_vout->fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); + } + return VLC_SUCCESS; } - /***************************************************************************** +/***************************************************************************** * DisplayVideo: displays previously rendered output ***************************************************************************** * This function sends the currently rendered image to X11 server. @@ -430,6 +488,8 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) 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 ) { @@ -438,16 +498,21 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) 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, - 0 /*src_x*/, 0 /*src_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + 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 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, - 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + 0 /*dest_x*/, 0 /*dest_y*/, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, False /* Don't put True here ! */ ); # endif } @@ -459,20 +524,27 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) XvPutImage( 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, - 0 /*src_x*/, 0 /*src_y*/, - p_vout->output.i_width, p_vout->output.i_height, + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height, 0 /*dest_x*/, 0 /*dest_y*/, i_width, i_height ); #else XPutImage( 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, - 0 /*src_x*/, 0 /*src_y*/, 0 /*dest_x*/, 0 /*dest_y*/, - p_vout->output.i_width, p_vout->output.i_height ); + p_vout->fmt_out.i_x_offset, + p_vout->fmt_out.i_y_offset, + 0 /*dest_x*/, 0 /*dest_y*/, + p_vout->fmt_out.i_visible_width, + p_vout->fmt_out.i_visible_height ); #endif } /* 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 ); } /***************************************************************************** @@ -485,10 +557,29 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) 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 @@ -518,124 +609,44 @@ static int ManageVideo( vout_thread_t *p_vout ) /* Keyboard event */ else if( xevent.type == KeyPress ) { - vlc_value_t val; - val.i_int = 0; + 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_F1: - val.i_int = KEY_F1; - break; - case XK_F2: - val.i_int = KEY_F2; - break; - case XK_F3: - val.i_int = KEY_F3; - break; - case XK_F4: - val.i_int = KEY_F4; - break; - case XK_F5: - val.i_int = KEY_F5; - break; - case XK_F6: - val.i_int = KEY_F6; - break; - case XK_F7: - val.i_int = KEY_F7; - break; - case XK_F8: - val.i_int = KEY_F8; - break; - case XK_F9: - val.i_int = KEY_F9; - break; - case XK_F10: - val.i_int = KEY_F10; - break; - case XK_F11: - val.i_int = KEY_F11; - break; - case XK_F12: - val.i_int = KEY_F12; - break; - - case XK_Return: - case XK_KP_Enter: - val.i_int = KEY_ENTER; - break; - case XK_Escape: - val.i_int = KEY_ESC; - break; - case XK_Menu: - val.i_int = KEY_MENU; - break; - case XK_Left: - val.i_int = KEY_LEFT; - break; - case XK_Right: - val.i_int = KEY_RIGHT; - break; - case XK_Up: - val.i_int = KEY_UP; - break; - case XK_Down: - val.i_int = KEY_DOWN; - break; - case XK_Home: - val.i_int = KEY_HOME; - break; - case XK_End: - val.i_int = KEY_END; - break; - case XK_Page_Up: - val.i_int = KEY_PAGEUP; - break; - case XK_Page_Down: - val.i_int = KEY_PAGEDOWN; - break; - case XK_space: - val.i_int = KEY_SPACE; - break; + val.i_int = ConvertKey( (int)x_key_symbol ); - default: + xevent.xkey.state &= ~ShiftMask; + xevent.xkey.state &= ~ControlMask; + xevent.xkey.state &= ~Mod1Mask; + + 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. */ - - if( XLookupString( &xevent.xkey, &i_key, 1, NULL, NULL ) ) - { - /* FIXME: handle stuff here */ - val.i_int = i_key; - } - break; + val.i_int = i_key; } - if ( val.i_int ) + + if( val.i_int ) { - if ( xevent.xkey.state & ShiftMask ) + if( state & ShiftMask ) { val.i_int |= KEY_MODIFIER_SHIFT; } - if ( xevent.xkey.state & ControlMask ) + if( state & ControlMask ) { - msg_Dbg( p_vout, "control pressed, key value is %x", val.i_int ); val.i_int |= KEY_MODIFIER_CTRL; } - if ( xevent.xkey.state & Mod1Mask ) + if( state & Mod1Mask ) { val.i_int |= KEY_MODIFIER_ALT; } - if ( val.i_int == config_GetInt( p_vout, "fullscreen-key" ) ) - { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - } - else - { - var_Set( p_vout->p_vlc, "key-pressed", val ); - } + var_Set( p_vout->p_vlc, "key-pressed", val ); } } /* Mouse click */ @@ -647,7 +658,7 @@ static int ManageVideo( vout_thread_t *p_vout ) 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 ) @@ -663,25 +674,23 @@ static int ManageVideo( vout_thread_t *p_vout ) 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; } } @@ -698,7 +707,7 @@ static int ManageVideo( vout_thread_t *p_vout ) val.b_bool = VLC_TRUE; var_Set( p_vout, "mouse-clicked", val ); break; - + case Button2: { playlist_t *p_playlist; @@ -720,7 +729,7 @@ static int ManageVideo( vout_thread_t *p_vout ) } } break; - + case Button3: { intf_thread_t *p_intf; @@ -742,7 +751,7 @@ static int ManageVideo( vout_thread_t *p_vout ) 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 ); } @@ -760,7 +769,7 @@ static int ManageVideo( vout_thread_t *p_vout ) val.i_int &= ~16; var_Set( p_vout, "mouse-button-down", val ); break; - + } } /* Mouse move */ @@ -776,11 +785,13 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->p_sys->p_win->i_height, &i_x, &i_y, &i_width, &i_height ); - val.i_int = ( xevent.xmotion.x - i_x ) - * p_vout->render.i_width / i_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; var_Set( p_vout, "mouse-x", val ); - val.i_int = ( xevent.xmotion.y - i_y ) - * p_vout->render.i_height / i_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; var_Set( p_vout, "mouse-y", val ); val.b_bool = VLC_TRUE; @@ -866,6 +877,24 @@ static int ManageVideo( vout_thread_t *p_vout ) p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; } + if( p_vout->i_changes & VOUT_CROP_CHANGE || + p_vout->i_changes & VOUT_ASPECT_CHANGE ) + { + p_vout->i_changes &= ~VOUT_CROP_CHANGE; + p_vout->i_changes &= ~VOUT_ASPECT_CHANGE; + + p_vout->fmt_out.i_x_offset = p_vout->fmt_in.i_x_offset; + p_vout->fmt_out.i_y_offset = p_vout->fmt_in.i_y_offset; + p_vout->fmt_out.i_visible_width = p_vout->fmt_in.i_visible_width; + p_vout->fmt_out.i_visible_height = p_vout->fmt_in.i_visible_height; + p_vout->fmt_out.i_aspect = p_vout->fmt_in.i_aspect; + p_vout->fmt_out.i_sar_num = p_vout->fmt_in.i_sar_num; + p_vout->fmt_out.i_sar_den = p_vout->fmt_in.i_sar_den; + p_vout->output.i_aspect = p_vout->fmt_in.i_aspect; + + p_vout->i_changes |= VOUT_SIZE_CHANGE; + } + /* * Size change * @@ -903,6 +932,8 @@ static int ManageVideo( vout_thread_t *p_vout ) } } + vlc_mutex_unlock( &p_vout->p_sys->lock ); + return 0; } @@ -939,30 +970,53 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) vlc_bool_t b_expose = VLC_FALSE; 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( 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( !i_drawable ) + if( !p_win->owner_window ) { /* Create the window and set hints - the window must receive * ConfigureNotify events, and until it is displayed, Expose and @@ -971,7 +1025,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) 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, @@ -987,21 +1041,57 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) XSetCommand( p_vout->p_sys->p_display, p_win->base_window, p_vout->p_vlc->ppsz_argv, p_vout->p_vlc->i_argc ); - XStoreName( p_vout->p_sys->p_display, p_win->base_window, + 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 + { + 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)" + VOUT_TITLE " (X11 output)" +#elif defined(MODULE_NAME_IS_glx) + VOUT_TITLE " (GLX output)" #else - VOUT_TITLE " (XVideo output)" + VOUT_TITLE " (XVideo output)" #endif ); + } + else + { + XStoreName( p_vout->p_sys->p_display, + p_win->base_window, val.psz_string ); + } + } } } 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, @@ -1014,7 +1104,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) * 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, @@ -1047,11 +1137,17 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) XMapWindow( p_vout->p_sys->p_display, p_win->base_window ); do { - XNextEvent( p_vout->p_sys->p_display, &xevent); + XWindowEvent( p_vout->p_sys->p_display, p_win->base_window, + SubstructureNotifyMask | StructureNotifyMask | + ExposureMask, &xevent); if( (xevent.type == Expose) && (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) ) @@ -1138,11 +1234,16 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win ) /* 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 ); } /***************************************************************************** @@ -1152,6 +1253,8 @@ static void DestroyWindow( vout_thread_t *p_vout, x11_window_t *p_win ) *****************************************************************************/ 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 @@ -1167,8 +1270,8 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) /* 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 ); + 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 ) @@ -1177,7 +1280,8 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) 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, @@ -1185,14 +1289,16 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) &p_pic->p_sys->shminfo, p_vout->output.i_width, p_vout->output.i_height ); } - else + + if( !p_vout->p_sys->b_shm || !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, #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, @@ -1200,6 +1306,14 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) p_vout->p_sys->i_bytes_per_pixel, #endif 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 ) + { + msg_Warn( p_vout, "couldn't create SHM image, disabling SHM." ); + p_vout->p_sys->b_shm = VLC_FALSE; + } +#endif /* HAVE_SYS_SHM_H */ } if( p_pic->p_sys->p_image == NULL ) @@ -1248,6 +1362,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) 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_pitch = p_pic->p_sys->p_image->bytes_per_line; @@ -1269,6 +1384,8 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) return -1; } +#endif /* !MODULE_NAME_IS_glx */ + return 0; } @@ -1334,17 +1451,18 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) 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 @@ -1407,15 +1525,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) 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 ) ) @@ -1423,11 +1532,11 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) 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 ); @@ -1455,7 +1564,18 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) #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, @@ -1467,11 +1587,17 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) 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 @@ -1541,7 +1667,7 @@ static void DisableXScreenSaver( vout_thread_t *p_vout ) 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, @@ -1711,13 +1837,8 @@ static int XVideoGetPort( vout_thread_t *p_vout, 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 */ @@ -1754,50 +1875,28 @@ static int XVideoGetPort( vout_thread_t *p_vout, ( 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 ) @@ -1850,7 +1949,7 @@ static int InitDisplay( vout_thread_t *p_vout ) { #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 @@ -1983,9 +2082,15 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, int i_width, int i_height ) { IMAGE_TYPE *p_image; + Status result; /* 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 ); #else @@ -2024,7 +2129,10 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, p_shm->readOnly = True; /* Attach shared memory segment to X server */ - if( XShmAttach( p_display, p_shm ) == False ) + XSynchronize( p_display, True ); + b_shm = VLC_TRUE; + result = XShmAttach( p_display, p_shm ); + if( result == False || !b_shm ) { msg_Err( p_vout, "cannot attach shared memory to X server" ); IMAGE_FREE( p_image ); @@ -2032,6 +2140,7 @@ static IMAGE_TYPE * CreateShmImage( vout_thread_t *p_vout, shmdt( p_shm->shmaddr ); return NULL; } + XSynchronize( p_display, False ); /* Send image to X server. This instruction is required, since having * built a Shm XImage and not using it causes an error on XCloseDisplay, @@ -2066,8 +2175,13 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, /* 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 ); -#else +#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 @@ -2098,7 +2212,7 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, #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 @@ -2112,6 +2226,31 @@ static IMAGE_TYPE * CreateImage( vout_thread_t *p_vout, return p_image; } +/***************************************************************************** + * X11ErrorHandler: replace error handler so we can intercept some of them + *****************************************************************************/ +static int X11ErrorHandler( Display * display, XErrorEvent * event ) +{ + /* Ingnore errors on XSetInputFocus() + * (they happen when a window is not yet mapped) */ + if( event->request_code == X_SetInputFocus ) + { + fprintf(stderr, "XSetInputFocus failed\n"); + return 0; + } + + if( event->request_code == 150 /* MIT-SHM */ && + event->minor_code == X_ShmAttach ) + { + fprintf(stderr, "XShmAttach failed\n"); + b_shm = VLC_FALSE; + return 0; + } + + XSetErrorHandler(NULL); + return (XSetErrorHandler(X11ErrorHandler))( display, event ); +} + #ifdef MODULE_NAME_IS_x11 /***************************************************************************** * SetPalette: sets an 8 bpp palette @@ -2144,6 +2283,69 @@ static void SetPalette( vout_thread_t *p_vout, } #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 *****************************************************************************/ @@ -2151,7 +2353,10 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) { 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; @@ -2188,23 +2393,23 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) 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" ); @@ -2212,5 +2417,85 @@ static void TestNetWMSupport( vout_thread_t *p_vout ) } } - 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 }, + + { XK_Insert, KEY_INSERT }, + { XK_Delete, KEY_DELETE }, + + { 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; }