diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2022-01-19 00:45:43 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:08:46 +0200 |
| commit | 4875a15ca61358a1c95b156b2279fce092451278 (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/modules/im/ximcp/imLcFlt.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| download | nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2 nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip | |
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/modules/im/ximcp/imLcFlt.c')
| -rw-r--r-- | nx-X11/lib/modules/im/ximcp/imLcFlt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nx-X11/lib/modules/im/ximcp/imLcFlt.c b/nx-X11/lib/modules/im/ximcp/imLcFlt.c index 50f4c252a..0bd1e262c 100644 --- a/nx-X11/lib/modules/im/ximcp/imLcFlt.c +++ b/nx-X11/lib/modules/im/ximcp/imLcFlt.c @@ -47,7 +47,8 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data) unsigned currstate; DefTree *b = ic->private.local.base.tree; DTIndex t; - Bool braille = False, anymodifier = False; + Bool anymodifier = False; + unsigned char braillePattern = 0; if(ev->xkey.keycode == 0) return (False); @@ -67,10 +68,11 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data) } ic->private.local.brl_pressed &= ~(1<<(keysym-XK_braille_dot_1)); if(!ic->private.local.brl_pressed && ic->private.local.brl_committing) { - /* Commited a braille pattern, let it go through compose tree */ + /* Committed a braille pattern, let it go through compose tree */ keysym = XK_braille_blank | ic->private.local.brl_committing; ev->type = KeyPress; - braille = True; + braillePattern = ic->private.local.brl_committing; + ic->private.local.brl_committing = 0; } else { return(True); } @@ -138,16 +140,16 @@ _XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data) (ev->type == KeyRelease && !anymodifier)) { goto emit_braille; } - /* Error (Sequence Unmatch occured) */ + /* Error (Sequence Unmatch occurred) */ /* initialize internal state for next key sequence */ ic->private.local.context = ((Xim)ic->core.im)->private.local.top; return (ev->type == KeyPress); } emit_braille: - if(braille) { + if(braillePattern) { /* Braille pattern is not in compose tree, emit alone */ - ic->private.local.brl_committed = ic->private.local.brl_committing; + ic->private.local.brl_committed = braillePattern; ic->private.local.composed = 0; ev->xkey.keycode = 0; _XPutBackEvent(d, ev); |