Increase XmbLookupString buffer

[st.git] / x.c

diff --git a/x.c b/x.c
index 8f570c2..e000894 100644 (file)
--- a/x.c
+++ b/x.c
@@ -426,7 +426,8 @@ mouseaction(XEvent *e, uint release)
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                if (ms->release == release &&
                    ms->button == e->xbutton.button &&
        for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
                if (ms->release == release &&
                    ms->button == e->xbutton.button &&

-                   match(ms->mod, e->xbutton.state & ~forcemousemod)) {
+                   (match(ms->mod, e->xbutton.state) ||  /* exact or forced */
+                    match(ms->mod, e->xbutton.state & ~forcemousemod))) {

                        ms->func(&(ms->arg));
                        return 1;
                }
                        ms->func(&(ms->arg));
                        return 1;
                }


@@ -1153,8 +1154,8 @@ xinit(int cols, int rows)
 
        win.mode = MODE_NUMLOCK;
        resettitle();
 
        win.mode = MODE_NUMLOCK;
        resettitle();

-       XMapWindow(xw.dpy, xw.win);

        xhints();
        xhints();

+       XMapWindow(xw.dpy, xw.win);

        XSync(xw.dpy, False);
 
        clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);
        XSync(xw.dpy, False);
 
        clock_gettime(CLOCK_MONOTONIC, &xsel.tclick1);


@@ -1742,7 +1743,7 @@ kpress(XEvent *ev)
 {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
 {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;

-       char buf[32], *customkey;
+       char buf[64], *customkey;

        int len;
        Rune c;
        Status status;
        int len;
        Rune c;
        Status status;