Make x11 event handling optional

Signed-off-b: Rémi Denis-Courmont <rdenis@simphalempin.com>

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 179e3d5a84b49a6ec62858d91b05a38d750bacc9..88522f878e77fe0d2f6a5d22b4a22ec0d1580c07 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -66,6 +66,16 @@ extern void Deactivate ( vlc_object_t * );
     "Screen to use in fullscreen mode. For instance " \
     "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 ()
     set_shortname( "X11" )
     set_category( CAT_VIDEO )
@@ -78,6 +88,8 @@ vlc_module_begin ()
 #ifdef HAVE_XINERAMA
     add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
 #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_capability( "video output", 70 )
     set_callbacks( Activate, Deactivate )

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index b6db11803b52f421a5ec6a21b43e5e78a34c9c71..db13559fb431504a48852d7684b7140b7455bf53 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -1529,12 +1529,22 @@ static int ManageVideo( vout_thread_t *p_vout )
                            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 */
     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_x11_event && p_vout->p_sys->b_mouse_pointer_visible )
         {
             ToggleCursor( p_vout );
         }
@@ -1790,10 +1800,21 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
         }
     } 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 --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,
+                      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 )