vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Tue Nov 29 19:51:12 2016 +0200| [6e6297e170cd0691f9d8710c9bacc51db946bf11] | committer: Rémi Denis-Courmont
Revert "qt5: unsubscribe disable motion and XI2 mouse events" This reverts commit 4e55554c37e7c55586c41a5e9fc50f393167ac0b. This explicit hack (by design) inhibited XI2 support. It no longer serves any purpose. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6e6297e170cd0691f9d8710c9bacc51db946bf11 --- configure.ac | 10 ---------- modules/gui/qt/components/interface_widgets.cpp | 21 --------------------- 2 files changed, 31 deletions(-) diff --git a/configure.ac b/configure.ac index 643ef36..0083586 100644 --- a/configure.ac +++ b/configure.ac @@ -3758,16 +3758,6 @@ AS_IF([test "${enable_qt}" != "no"], [ PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ VLC_ADD_LIBS([qt],[${QTX11_LIBS}]) VLC_ADD_CXXFLAGS([qt],[${QTX11_CFLAGS} -DQT5_HAS_X11]) - PKG_CHECK_MODULES([XI], [xi], [ - VLC_ADD_LIBS([qt], [${XI_LIBS}]) - VLC_ADD_CXXFLAGS([qt], [${XI_CFLAGS} -DHAVE_XI]) - ], [ - PKG_CHECK_EXISTS([Qt5Gui >= 5.5], [ - AC_MSG_ERROR([${XI_PKG_ERRORS}.]) - ], [ - AC_MSG_WARN([${XI_PKG_ERRORS}.]) - ]) - ]) ],[ AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) ]) diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp index db590c5..89e2b78 100644 --- a/modules/gui/qt/components/interface_widgets.cpp +++ b/modules/gui/qt/components/interface_widgets.cpp @@ -56,9 +56,6 @@ #ifdef Q_WS_X11 # include <X11/Xlib.h> -# ifdef HAVE_XI -# include <X11/extensions/XInput2.h> -# endif # include <qx11info_x11.h> #endif @@ -153,25 +150,7 @@ WId VideoWidget::request( struct vout_window_t *p_wnd, unsigned int *pi_width, XGetWindowAttributes( dpy, w, &attr ); attr.your_event_mask &= ~(ButtonPressMask|ButtonReleaseMask); - attr.your_event_mask &= ~PointerMotionMask; XSelectInput( dpy, w, attr.your_event_mask ); -# ifdef HAVE_XI - int n; - XIEventMask *xi_masks = XIGetSelectedEvents( dpy, w, &n ); - if( xi_masks != NULL ) - { - for( int i = 0; i < n; i++ ) - if( xi_masks[i].mask_len >= 1 ) - { - xi_masks[i].mask[0] &= ~XI_ButtonPressMask; - xi_masks[i].mask[0] &= ~XI_ButtonReleaseMask; - xi_masks[i].mask[0] &= ~XI_MotionMask; - } - - XISelectEvents( dpy, w, xi_masks, n ); - XFree( xi_masks ); - } -# endif #endif sync(); p_window = p_wnd; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
