Patch to enable/disable key and mouse handling at vout level:

[vlc] / modules / video_output / x11 / xcommon.h

diff --git a/modules/video_output/x11/xcommon.h b/modules/video_output/x11/xcommon.h
index 17833ab8e6a969936878c2e03e4a38b6114e32ce..aaf82427fe71518397e24695a539664537436571 100644 (file)
--- a/modules/video_output/x11/xcommon.h
+++ b/modules/video_output/x11/xcommon.h
@@ -222,14 +222,19 @@ struct vout_sys_t
     x11_window_t        original_window;
     x11_window_t        fullscreen_window;
 
+    /* key and mouse event handling */
+    int                 i_vout_event;  /* 1(Fullsupport), 2(FullscreenOnly), 3(none) */
+
     /* X11 generic properties */
-    vlc_bool_t          b_altfullscreen;          /* which fullscreen method */
+    bool          b_altfullscreen;          /* which fullscreen method */
 #ifdef HAVE_SYS_SHM_H
     int                 i_shm_opcode;      /* shared memory extension opcode */
 #endif
 
 #if defined(MODULE_NAME_IS_xvideo) || defined(MODULE_NAME_IS_xvmc)
     int                 i_xvport;
+    bool          b_paint_colourkey;
+    int                 i_colourkey;
 #else
     Colormap            colormap;               /* colormap used (8bpp only) */
 
@@ -248,8 +253,9 @@ struct vout_sys_t
 #endif
 
     /* Mouse pointer properties */
-    vlc_bool_t          b_mouse_pointer_visible;
+    bool          b_mouse_pointer_visible;
     mtime_t             i_time_mouse_last_moved; /* used to auto-hide pointer*/
+    mtime_t             i_mouse_hide_timeout;      /* after time hide cursor */
     Cursor              blank_cursor;                   /* the hidden cursor */
     mtime_t             i_time_button_last_pressed;   /* to track dbl-clicks */
     Pixmap              cursor_pixmap;
@@ -257,13 +263,13 @@ struct vout_sys_t
     /* Window manager properties */
     Atom                net_wm_state;
     Atom                net_wm_state_fullscreen;
-    vlc_bool_t          b_net_wm_state_fullscreen;
+    bool          b_net_wm_state_fullscreen;
     Atom                net_wm_state_above;
-    vlc_bool_t          b_net_wm_state_above;
+    bool          b_net_wm_state_above;
     Atom                net_wm_state_stays_on_top;
-    vlc_bool_t          b_net_wm_state_stays_on_top;
+    bool          b_net_wm_state_stays_on_top;
     Atom                net_wm_state_below;
-    vlc_bool_t          b_net_wm_state_below;
+    bool          b_net_wm_state_below;
 
 #ifdef MODULE_NAME_IS_glx
     /* GLX properties */
@@ -336,8 +342,6 @@ struct vout_sys_t
     osso_context_t      *p_octx;
     int                 i_backlight_on_counter;
 #endif
-
- 
 };
 
 /*****************************************************************************