* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: xcommon.c,v 1.33 2003/10/24 21:27:06 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 */
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 );
+
+/* Object variables callbacks */
+static int OnTopCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
/*****************************************************************************
* 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, text;
+
#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 ) );
TestNetWMSupport( p_vout );
+ /* Add a variable to indicate if the window should be on top of others */
+ var_Create( p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ text.psz_string = _("Always on top");
+ var_Change( p_vout, "video-on-top", VLC_VAR_SETTEXT, &text, NULL );
+ var_AddCallback( p_vout, "video-on-top", OnTopCallback, NULL );
+ /* Trigger a callback right now */
+ var_Get( p_vout, "video-on-top", &val );
+ var_Set( p_vout, "video-on-top", val );
+
return VLC_SUCCESS;
}
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;
+ /* 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 )
+ {
+ if( (unsigned int)xevent.xconfigure.width
+ != p_vout->p_sys->p_win->i_width ||
+ (unsigned int)xevent.xconfigure.height
+ != p_vout->p_sys->p_win->i_height )
+ {
+ /* 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;
-
- 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 );
- }
+ val.i_int = ConvertKey( (int)x_key_symbol );
- 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;
+ xevent.xkey.state &= ~ShiftMask;
+ xevent.xkey.state &= ~ControlMask;
+ xevent.xkey.state &= ~Mod1Mask;
- 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;
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;
val.i_int &= ~16;
var_Set( p_vout, "mouse-button-down", val );
break;
-
+
}
}
/* Mouse move */
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 =
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;
- 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,
}
else
{
+ /* 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 */
Window dummy1;
unsigned int dummy2, dummy3;
- XGetGeometry( p_vout->p_sys->p_display, i_drawable,
+ 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,
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 );
}
/*****************************************************************************
/* 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 )
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 );
/* To my knowledge there are two ways to create a borderless 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
}
#endif
+/*****************************************************************************
+ * Control: control facility for the vout
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+ double f_arg;
+
+ switch( i_query )
+ {
+ case VOUT_SET_ZOOM:
+ f_arg = va_arg( args, double );
+
+ /* Update dimensions */
+ XResizeWindow( p_vout->p_sys->p_display,
+ p_vout->p_sys->p_win->base_window,
+ p_vout->render.i_width * f_arg,
+ p_vout->render.i_height * f_arg );
+
+ return VLC_SUCCESS;
+
+ default:
+ msg_Dbg( p_vout, "control query not supported" );
+ return VLC_EGENERIC;
+ }
+}
+
/*****************************************************************************
* TestNetWMSupport: tests for Extended Window Manager Hints support
*****************************************************************************/
0, 16384, False, AnyPropertyType,
&net_wm_supported,
&i_format, &i_items, &i_bytesafter,
- (unsigned char **)&p_args );
+ (unsigned char **)(intptr_t)&p_args );
if( i_ret != Success || i_items == 0 ) return;
XFree( p_args );
}
+
+/*****************************************************************************
+ * 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;
+}
+
+/*****************************************************************************
+ * object variables callbacks: a bunch of object variables are used by the
+ * interfaces to interact with the vout.
+ *****************************************************************************/
+static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+
+ 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 ] = newval.b_bool; /* 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;
+}
projects / vlc / blobdiff