Commit b7320893 authored by Laurent Aimar's avatar Laurent Aimar

Added x11 global hotkeys support (linux).

parent e939adf8
...@@ -3886,6 +3886,9 @@ if test "${enable_x11}" != "no" && ...@@ -3886,6 +3886,9 @@ if test "${enable_x11}" != "no" &&
VLC_ADD_PLUGIN([panoramix]) VLC_ADD_PLUGIN([panoramix])
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}])
AC_CHECK_LIB(Xext, XShmAttach, [ AC_CHECK_LIB(Xext, XShmAttach, [
VLC_ADD_PLUGIN([x11]) VLC_ADD_PLUGIN([x11])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
......
...@@ -353,7 +353,7 @@ enum vlc_config_properties ...@@ -353,7 +353,7 @@ enum vlc_config_properties
add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, \ add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, \
p_callback, value ) p_callback, value )
#ifndef WIN32 #if !defined(WIN32) && !defined(SYS_LINUX)
#define add_key( name, value, p_callback, text, longtext, advc ) \ #define add_key( name, value, p_callback, text, longtext, advc ) \
add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, \ add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, \
value ) value )
......
...@@ -5,7 +5,6 @@ SOURCES_telnet = telnet.c ...@@ -5,7 +5,6 @@ SOURCES_telnet = telnet.c
SOURCES_netsync = netsync.c SOURCES_netsync = netsync.c
SOURCES_ntservice = ntservice.c SOURCES_ntservice = ntservice.c
SOURCES_hotkeys = hotkeys.c SOURCES_hotkeys = hotkeys.c
SOURCES_globalhotkeys = globalhotkeys.c
SOURCES_lirc = lirc.c SOURCES_lirc = lirc.c
SOURCES_rc = rc.c SOURCES_rc = rc.c
SOURCES_dbus = dbus.c dbus.h SOURCES_dbus = dbus.c dbus.h
......
if HAVE_WIN32 if HAVE_WIN32
globalhotkeys_extra = win32.c globalhotkeys_extra = win32.c
else
globalhotkeys_extra = x11.c
endif endif
SOURCES_globalhotkeys = \ SOURCES_globalhotkeys = \
......
/***************************************************************************** /*****************************************************************************
* globalhotkeys.c: Global-Hotkey handling for vlc * win32.c: Global-Hotkey WIN32 handling for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2008-2009 the VideoLAN team * Copyright (C) 2008-2009 the VideoLAN team
* *
......
This diff is collapsed.
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