Commit a4cedbf7 authored by Jan Djärv's avatar Jan Djärv

* 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
parent 553fabe7
2013-03-25 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac (HAVE_XKB): Define if Xkb is present.
2013-03-24 Paul Eggert <eggert@cs.ucla.edu> 2013-03-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating: Merge from gnulib, incorporating:
......
...@@ -1822,6 +1822,7 @@ if test "${HAVE_X11}" = "yes"; then ...@@ -1822,6 +1822,7 @@ if test "${HAVE_X11}" = "yes"; then
AC_MSG_RESULT($emacs_xkb) AC_MSG_RESULT($emacs_xkb)
if test $emacs_xkb = yes; then if test $emacs_xkb = yes; then
AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.]) AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.])
AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.])
fi fi
AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
......
...@@ -130,6 +130,10 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *); ...@@ -130,6 +130,10 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
#include "bitmaps/gray.xbm" #include "bitmaps/gray.xbm"
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#endif
/* Default to using XIM if available. */ /* Default to using XIM if available. */
#ifdef USE_XIM #ifdef USE_XIM
int use_xim = 1; int use_xim = 1;
...@@ -3218,7 +3222,11 @@ XTring_bell (struct frame *f) ...@@ -3218,7 +3222,11 @@ XTring_bell (struct frame *f)
else else
{ {
block_input (); block_input ();
#ifdef HAVE_XKB
XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
#else
XBell (FRAME_X_DISPLAY (f), 0); XBell (FRAME_X_DISPLAY (f), 0);
#endif
XFlush (FRAME_X_DISPLAY (f)); XFlush (FRAME_X_DISPLAY (f));
unblock_input (); unblock_input ();
} }
......
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