aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJan Djärv2013-03-25 18:58:35 +0100
committerJan Djärv2013-03-25 18:58:35 +0100
commita4cedbf77462c751f2eab4aa295a0187f855e397 (patch)
tree2011d6c27b79136c9797f8ff611595397b76c6dd /src/xterm.c
parent553fabe73ac34fa9f24daa48201923af04da7d88 (diff)
downloademacs-a4cedbf77462c751f2eab4aa295a0187f855e397.tar.gz
emacs-a4cedbf77462c751f2eab4aa295a0187f855e397.zip
* configure.ac (HAVE_XKB): Define if Xkb is present.
* src/xterm.c: Include X11/XKBlib.h (XTring_bell): Use XkbBell if HAVE_XKB. Fixes: debbugs:14041
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index d8c2dfdda82..e4a681031ef 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -130,6 +130,10 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
130 130
131#include "bitmaps/gray.xbm" 131#include "bitmaps/gray.xbm"
132 132
133#ifdef HAVE_XKB
134#include <X11/XKBlib.h>
135#endif
136
133/* Default to using XIM if available. */ 137/* Default to using XIM if available. */
134#ifdef USE_XIM 138#ifdef USE_XIM
135int use_xim = 1; 139int use_xim = 1;
@@ -3218,7 +3222,11 @@ XTring_bell (struct frame *f)
3218 else 3222 else
3219 { 3223 {
3220 block_input (); 3224 block_input ();
3225#ifdef HAVE_XKB
3226 XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
3227#else
3221 XBell (FRAME_X_DISPLAY (f), 0); 3228 XBell (FRAME_X_DISPLAY (f), 0);
3229#endif
3222 XFlush (FRAME_X_DISPLAY (f)); 3230 XFlush (FRAME_X_DISPLAY (f));
3223 unblock_input (); 3231 unblock_input ();
3224 } 3232 }