patch for bell in st

[st.git] / st.c

diff --git a/st.c b/st.c
index c90bed1..c61b90a 100644 (file)
--- a/st.c
+++ b/st.c
@@ -27,6 +27,7 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
+#include <X11/XKBlib.h>
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
@@ -2423,7 +2424,7 @@ tcontrolcode(uchar ascii) {
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)
-                               XBell(xw.dpy, bellvolume);
+                               XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
                }
                break;
        case '\033': /* ESC */
@@ -2431,11 +2432,9 @@ tcontrolcode(uchar ascii) {
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;
                return;
-       case '\016': /* SO */
-               term.charset = 0;
-               return;
-       case '\017': /* SI */
-               term.charset = 1;
+       case '\016': /* SO (LS1 -- Locking shift 1) */
+       case '\017': /* SI (LS0 -- Locking shift 0) */
+               term.charset = 1 - (ascii - '\016');
                return;
        case '\032': /* SUB */
                tsetchar(question, &term.c.attr, term.c.x, term.c.y);
@@ -2499,6 +2498,10 @@ eschandle(uchar ascii) {
        case 'k': /* old title set compatibility */
                tstrsequence(ascii);
                return 0;
+       case 'n': /* LS2 -- Locking shift 2 */
+       case 'o': /* LS3 -- Locking shift 3 */
+               term.charset = 2 + (ascii - 'n');
+               break;
        case '(': /* GZD4 -- set primary charset G0 */
        case ')': /* G1D4 -- set secondary charset G1 */
        case '*': /* G2D4 -- set tertiary charset G2 */