Revert incomplete "Fix status reporting for braille patterns"

This reverts commit 8866f80d9f42e02093058cab027edbf127118105. That commit had been edited and was incomplete, by reverting and re-applying we get it right.

Revert incomplete "Fix status reporting for braille patterns"
a2fded2e · Ulrich Sibiller · bd43a064 · a2fded2e
Commit a2fded2e authored Oct 07, 2016 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 20 deletions

imLcLkup.c nx-X11/lib/X11/imLcLkup.c +6 -20

No files found.
--- a/nx-X11/lib/X11/imLcLkup.c
+++ b/nx-X11/lib/X11/imLcLkup.c
@@ -71,21 +71,12 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
 		if(status) *status = XBufferOverflow;
 		return(ret);
 	    }
-           if(keysym) *keysym = XK_braille_blank | pattern;
+	    if(keysym) {
-           if(ret > 0) {
+		*keysym = XK_braille_blank | pattern;
-               if (keysym) {
+		if(status) *status = XLookupBoth;
-                   if(status) *status = XLookupBoth;
+	    } else
-               } else {
+		if(status) *status = XLookupChars;
-                   if(status) *status = XLookupChars;
+	    memcpy(buffer, mb, ret);
-               }
-               memcpy(buffer, mb, ret);
-           } else {
-               if(keysym) {
-                   if(status) *status = XLookupKeySym;
-               } else {
-                   if(status) *status = XLookupNone;
-               }
-           }
 	} else { /* Composed Event */
 	    ret = strlen(&mb[b[ic->private.local.composed].mb]);
 	    if(ret > bytes) {
@@ -226,11 +217,6 @@ _XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
 	    buffer[0] = 0xe0 | ((BRL_UC_ROW >> 12) & 0x0f);
 	    buffer[1] = 0x80 | ((BRL_UC_ROW >> 8) & 0x30) | (pattern >> 6);
 	    buffer[2] = 0x80 | (pattern & 0x3f);
-	    if(keysym) {
-               *keysym = XK_braille_blank | pattern;
-               if(status) *status = XLookupBoth;
-            } else
-               if(status) *status = XLookupChars;
 	} else { /* Composed Event */
 	    ret = strlen(&utf8[b[ic->private.local.composed].utf8]);
 	    if(ret > bytes) {