xkb: Use consumed2 API when available

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2017-05-04 23:42:01 +02:00
parent 0cde9a9d0e
commit 6f117c3589
No known key found for this signature in database
GPG Key ID: AC203F96E2C34BB7
2 changed files with 6 additions and 0 deletions

View File

@ -117,6 +117,7 @@ dnl PKG_CONFIG based dependencies
dnl ---------------------------------------------------------------------
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0])
GW_CHECK_XCB([xcb-aux xcb-xkb xkbcommon >= 0.5.0 xkbcommon-x11 xcb-ewmh xcb-icccm xcb-xrm xcb-randr xcb-xinerama])
PKG_CHECK_EXISTS([xkbcommon >= 0.7.0], [AC_DEFINE([XkBCOMMON_HAS_CONSUMED2], [1], [If xkbcommon has the consumed2 API])])
PKG_CHECK_MODULES([pango], [pango pangocairo])
PKG_CHECK_MODULES([cairo], [cairo cairo-xcb])
PKG_CHECK_MODULES([libsn], [libstartup-notification-1.0 ])

View File

@ -68,6 +68,11 @@
#include "theme.h"
#include "xcb.h"
#ifdef XkBCOMMON_HAS_CONSUMED2
#define xkb_state_key_get_consumed_mods(s, k) xkb_state_key_get_consumed_mods2(s, k, XKB_CONSUMED_MODE_GTK)
#endif
/**
* @param state The handle to the view
* @param qr Indicate if queue_redraw should be called on changes.