Commit 283b125f authored by Laurent Aimar's avatar Laurent Aimar

Converted globalhotkeys to XCB.

The XLib support has been dropped, so xcb and xcb-keysyms is now needed for
this plugin.
parent 888c45ec
...@@ -3974,10 +3974,6 @@ AS_IF([test "${enable_x11}" != "no"], [ ...@@ -3974,10 +3974,6 @@ AS_IF([test "${enable_x11}" != "no"], [
VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}])
VLC_ADD_PLUGIN([x11]) VLC_ADD_PLUGIN([x11])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}])
...@@ -5366,6 +5362,18 @@ then ...@@ -5366,6 +5362,18 @@ then
fi fi
fi fi
dnl
dnl Global hotkeys using XCB
dnl
PKG_CHECK_MODULES(XCB, [xcb], [
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
PKG_CHECK_MODULES(XPROTO, [xproto], [
VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
], [ AC_MSG_WARN( [Xproto not found] ) ])
], [ AC_MSG_WARN( [XCB keysyms was not found]) ])
], [ AC_MSG_WARN( [XCB was not found]) ])
AC_ARG_WITH(,[Misc options:]) AC_ARG_WITH(,[Misc options:])
......
if HAVE_WIN32 if HAVE_WIN32
globalhotkeys_extra = win32.c globalhotkeys_extra = win32.c
else else
globalhotkeys_extra = x11.c globalhotkeys_extra = xcb.c
endif endif
SOURCES_globalhotkeys = \ SOURCES_globalhotkeys = \
......
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