#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_vout.h>
+#include <vlc_window.h>
#include <vlc_keys.h>
#include <errno.h> /* ENOMEM */
vlc_mutex_init( &p_vout->p_sys->lock );
+ /* key and mouse event handling */
+ p_vout->p_sys->i_vout_event = var_CreateGetInteger( p_vout, "vout-event" );
+
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
psz_display = config_GetPsz( p_vout, MODULE_STRING "-display" );
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,
+ p_vout->p_sys->p_win->owner_window->handle.xid,
StructureNotifyMask, &xevent ) == True )
{
/* ConfigureNotify event: prepare */
val.i_int &= ~1;
var_Set( p_vout, "mouse-button-down", val );
- val.b_bool = true;
- var_Set( p_vout, "mouse-clicked", val );
-
- vlc_value_t val; val.b_bool = false;
- var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+ var_SetBool( p_vout, "mouse-clicked", true );
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
}
break;
case Button3:
{
- intf_thread_t *p_intf;
-
var_Get( p_vout, "mouse-button-down", &val );
val.i_int &= ~4;
var_Set( p_vout, "mouse-button-down", val );
- 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 );
- }
-
- vlc_value_t val; val.b_bool = true;
- var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+
+ var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
}
break;
else if( xevent.type == MotionNotify )
{
unsigned int i_width, i_height, i_x, i_y;
- vlc_value_t val;
/* somewhat different use for vout_PlacePicture:
* here the values are needed to give to mouse coordinates
var_Set( p_vout, "mouse-y", val );
- val.b_bool = true;
- var_Set( p_vout, "mouse-moved", val );
+ var_SetBool( p_vout, "mouse-moved", true );
p_vout->p_sys->i_time_mouse_last_moved = mdate();
if( ! p_vout->p_sys->b_mouse_pointer_visible )
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
+ /* autoscale toggle */
+ if( p_vout->i_changes & VOUT_SCALE_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_SCALE_CHANGE;
+
+ p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
+ p_vout->i_zoom = ZOOM_FP_FACTOR;
+
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+ }
+
+ /* scaling factor */
+ if( p_vout->i_changes & VOUT_ZOOM_CHANGE )
+ {
+ p_vout->i_changes &= ~VOUT_ZOOM_CHANGE;
+
+ p_vout->b_autoscale = false;
+ p_vout->i_zoom =
+ (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
+
+ p_vout->i_changes |= VOUT_SIZE_CHANGE;
+ }
+
if( p_vout->i_changes & VOUT_CROP_CHANGE ||
p_vout->i_changes & VOUT_ASPECT_CHANGE )
{
i_x, i_y, i_width, i_height );
}
+ /* cursor hiding depending on --vout-event option
+ * activated if:
+ * value = 1 (Fullsupport) (default value)
+ * or value = 2 (Fullscreen-Only) and condition met
+ */
+ bool b_vout_event = ( ( p_vout->p_sys->i_vout_event == 1 )
+ || ( p_vout->p_sys->i_vout_event == 2 && p_vout->b_fullscreen )
+ );
+
/* Autohide Cursour */
if( mdate() - p_vout->p_sys->i_time_mouse_last_moved >
p_vout->p_sys->i_mouse_hide_timeout )
{
/* Hide the mouse automatically */
- if( p_vout->p_sys->b_mouse_pointer_visible )
+ if( b_vout_event && p_vout->p_sys->b_mouse_pointer_visible )
{
ToggleCursor( p_vout );
}
if( !p_vout->b_fullscreen )
{
- void *ptr = vout_RequestWindow( p_vout, &p_win->i_x, &p_win->i_y,
- &p_win->i_width, &p_win->i_height );
- p_win->owner_window = (uintptr_t)ptr;
+ p_win->owner_window = vout_RequestXWindow( 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;
else
{
/* Fullscreen window size and position */
- p_win->owner_window = 0;
+ p_win->owner_window = NULL;
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 );
unsigned int dummy4, dummy5;
/* Select events we are interested in. */
- XSelectInput( p_vout->p_sys->p_display, p_win->owner_window,
- StructureNotifyMask );
+ 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,
+ XGetGeometry( p_vout->p_sys->p_display,
+ p_win->owner_window->handle.xid,
&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,
- p_win->owner_window,
+ p_win->owner_window->handle.xid,
0, 0,
p_win->i_width, p_win->i_height,
0,
}
} while( !( b_expose && b_configure_notify && b_map_notify ) );
- XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
- StructureNotifyMask | KeyPressMask |
- ButtonPressMask | ButtonReleaseMask |
- PointerMotionMask );
+ /* key and mouse events handling depending on --vout-event option
+ * activated if:
+ * value = 1 (Fullsupport) (default value)
+ * or value = 2 (Fullscreen-Only) and condition met
+ */
+ bool b_vout_event = ( ( p_vout->p_sys->i_vout_event == 1 )
+ || ( p_vout->p_sys->i_vout_event == 2 && p_vout->b_fullscreen )
+ );
+ if ( b_vout_event )
+ XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
+ StructureNotifyMask | KeyPressMask |
+ ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask );
#ifdef MODULE_NAME_IS_x11
if( XDefaultDepth(p_vout->p_sys->p_display, p_vout->p_sys->i_screen) == 8 )
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 );
+ vout_ReleaseWindow( p_win->owner_window );
}
/*****************************************************************************
/* Getting current window position */
Window root_win;
Window* child_windows;
- int num_child_windows;
+ unsigned int num_child_windows;
Window parent_win;
Window child_win;
XWindowAttributes win_attr;
#ifdef HAVE_SYS_SHM_H
p_vout->p_sys->i_shm_opcode = 0;
- if( config_GetInt( p_vout, MODULE_STRING "-shm" ) )
+ if( config_GetInt( p_vout, MODULE_STRING "-shm" ) > 0 )
{
int major, evt, err;
if( p_vout->p_sys->i_shm_opcode )
{
- int major, minor;
+ int minor;
Bool pixmaps;
XShmQueryVersion( p_vout->p_sys->p_display, &major, &minor,
{
case VOUT_GET_SIZE:
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);
+ return vout_ControlWindow( p_vout->p_sys->p_win->owner_window,
+ i_query, args);
pi_width = va_arg( args, unsigned int * );
pi_height = va_arg( args, unsigned int * );
case VOUT_SET_SIZE:
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);
+ return vout_ControlWindow( p_vout->p_sys->p_win->owner_window,
+ i_query, args);
vlc_mutex_lock( &p_vout->p_sys->lock );
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 );
if( i_query == VOUT_REPARENT ) d = (Drawable)va_arg( args, int );
p_vout->p_sys->original_window.base_window,
d, 0, 0);
XSync( p_vout->p_sys->p_display, False );
- p_vout->p_sys->original_window.owner_window = 0;
#ifdef MODULE_NAME_IS_xvmc
xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
#endif
vlc_mutex_unlock( &p_vout->p_sys->lock );
- return vout_vaControlDefault( p_vout, i_query, args );
+ vout_ReleaseWindow( p_vout->p_sys->p_win->owner_window );
+ p_vout->p_sys->original_window.owner_window = NULL;
+ return VLC_SUCCESS;
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);
+ return vout_ControlWindow( p_vout->p_sys->p_win->owner_window,
+ i_query, args);
b_arg = (bool) va_arg( args, int );
vlc_mutex_lock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
default:
- return vout_vaControlDefault( p_vout, i_query, args );
+ return VLC_EGENERIC;
}
}
projects / vlc / blobdiff