emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r112131: * configure.ac (HAVE_XKB): D


From: Jan D.
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r112131: * configure.ac (HAVE_XKB): Define if Xkb is present.
Date: Mon, 25 Mar 2013 18:58:35 +0100
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 112131
fixes bug: http://debbugs.gnu.org/14041
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-25 18:58:35 +0100
message:
  * configure.ac (HAVE_XKB): Define if Xkb is present.
  
  * src/xterm.c: Include X11/XKBlib.h
  (XTring_bell): Use XkbBell if HAVE_XKB.
modified:
  ChangeLog
  configure.ac
  src/xterm.c
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-24 00:49:50 +0000
+++ b/ChangeLog 2013-03-25 17:58:35 +0000
@@ -1,3 +1,7 @@
+2013-03-25  Jan Djärv  <address@hidden>
+
+       * configure.ac (HAVE_XKB): Define if Xkb is present.
+
 2013-03-24  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2013-03-18 05:26:56 +0000
+++ b/configure.ac      2013-03-25 17:58:35 +0000
@@ -1822,6 +1822,7 @@
   AC_MSG_RESULT($emacs_xkb)
   if test $emacs_xkb = yes; then
     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
 
   AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-03-24 12:59:45 +0000
+++ b/src/xterm.c       2013-03-25 17:58:35 +0000
@@ -130,6 +130,10 @@
 
 #include "bitmaps/gray.xbm"
 
+#ifdef HAVE_XKB
+#include <X11/XKBlib.h>
+#endif
+
 /* Default to using XIM if available.  */
 #ifdef USE_XIM
 int use_xim = 1;
@@ -3218,7 +3222,11 @@
       else
        {
          block_input ();
+#ifdef HAVE_XKB
+          XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
+#else
          XBell (FRAME_X_DISPLAY (f), 0);
+#endif
          XFlush (FRAME_X_DISPLAY (f));
          unblock_input ();
        }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]