Commit d603ab6b authored by Joseph Tulou's avatar Joseph Tulou Committed by Rémi Denis-Courmont

Make x11 event handling optional

Signed-off-b: Rémi Denis-Courmont <rdenis@simphalempin.com>
parent 4909d939
...@@ -66,6 +66,16 @@ extern void Deactivate ( vlc_object_t * ); ...@@ -66,6 +66,16 @@ extern void Deactivate ( vlc_object_t * );
"Screen to use in fullscreen mode. For instance " \ "Screen to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.") "set it to 0 for first screen, 1 for the second.")
#define X11_EVENT_TEXT N_("key and mouse event handling at X11 plugin level.")
#define X11_EVENT_LONGTEXT N_( \
"This parameter accepts values : 1 (full event handling support), " \
"2 (event handling only for fullscreen) or 3 (No event handling). " \
"Full event handling support is the default value.")
static const int pi_x11_event_values[] = { 1, 2, 3 };
static const char *const ppsz_x11_event_descriptions[] =
{ N_("FullSupport"), N_("Fullscreen-Only"), N_("None") };
vlc_module_begin () vlc_module_begin ()
set_shortname( "X11" ) set_shortname( "X11" )
set_category( CAT_VIDEO ) set_category( CAT_VIDEO )
...@@ -78,6 +88,8 @@ vlc_module_begin () ...@@ -78,6 +88,8 @@ vlc_module_begin ()
#ifdef HAVE_XINERAMA #ifdef HAVE_XINERAMA
add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true ) add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif #endif
add_integer( "x11-event", 1, NULL, X11_EVENT_TEXT, X11_EVENT_LONGTEXT, true )
change_integer_list( pi_x11_event_values, ppsz_x11_event_descriptions, NULL )
set_description( N_("X11 video output") ) set_description( N_("X11 video output") )
set_capability( "video output", 70 ) set_capability( "video output", 70 )
set_callbacks( Activate, Deactivate ) set_callbacks( Activate, Deactivate )
......
...@@ -1529,12 +1529,22 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -1529,12 +1529,22 @@ static int ManageVideo( vout_thread_t *p_vout )
i_x, i_y, i_width, i_height ); i_x, i_y, i_width, i_height );
} }
/* cursor hiding depending on --x11-event option
* activated if:
* value = 1 (Fullsupport) (default value)
* or value = 2 (Fullscreen-Only) and condition met
*/
int i_x11_event = var_CreateGetInteger( p_vout, "x11-event" );
bool b_x11_event = ( ( i_x11_event == 1 )
|| ( i_x11_event == 2 && p_vout->b_fullscreen )
);
/* Autohide Cursour */ /* Autohide Cursour */
if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > if( mdate() - p_vout->p_sys->i_time_mouse_last_moved >
p_vout->p_sys->i_mouse_hide_timeout ) p_vout->p_sys->i_mouse_hide_timeout )
{ {
/* Hide the mouse automatically */ /* Hide the mouse automatically */
if( p_vout->p_sys->b_mouse_pointer_visible ) if( b_x11_event && p_vout->p_sys->b_mouse_pointer_visible )
{ {
ToggleCursor( p_vout ); ToggleCursor( p_vout );
} }
...@@ -1790,6 +1800,17 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win ) ...@@ -1790,6 +1800,17 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
} }
} while( !( b_expose && b_configure_notify && b_map_notify ) ); } while( !( b_expose && b_configure_notify && b_map_notify ) );
/* key and mouse events handling depending on --x11-event option
* activated if:
* value = 1 (Fullsupport) (default value)
* or value = 2 (Fullscreen-Only) and condition met
*/
int i_x11_event = var_CreateGetInteger( p_vout, "x11-event" );
bool b_x11_event = ( ( i_x11_event == 1 )
|| ( i_x11_event == 2 && p_vout->b_fullscreen )
);
if ( b_x11_event )
XSelectInput( p_vout->p_sys->p_display, p_win->base_window, XSelectInput( p_vout->p_sys->p_display, p_win->base_window,
StructureNotifyMask | KeyPressMask | StructureNotifyMask | KeyPressMask |
ButtonPressMask | ButtonReleaseMask | ButtonPressMask | ButtonReleaseMask |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment