cocoa devdraw: reimplement handling of compose key

cocoa devdraw: reimplement handling of compose key

This implementation is simpler to understand.  It
removes conflicts with other modifiers and with
the virtual buttons.  Pressing alt during a
sequence now cancels it correctly.

[rsc, 2012-01-08 16:13:11]

Wow you've been busy.  I've been away for two weeks but will get to these
soon.
On Jan 1, 2012 7:53 PM, <djeannot24@gmail.com> wrote:

> Reviewers: rsc,
>
>
>
> Please review this at
http://codereview.appspot.com/**5507049/<http://codereview.appspot.com/5507049/>
>
> Affected files:
>  M src/cmd/devdraw/cocoa-screen.m
>  M src/cmd/devdraw/cocoa-srv.c
>
>
> Index: src/cmd/devdraw/cocoa-screen.m
> ==============================**==============================**=======
> --- a/src/cmd/devdraw/cocoa-**screen.m
> +++ b/src/cmd/devdraw/cocoa-**screen.m
> @@ -98,7 +98,6 @@
>  struct
>  {
>        NSCursor        *bigarrow;
> -       int             kalting;
>        int             kbuttons;
>        int             mbuttons;
>        NSPoint mpos;
> @@ -574,6 +573,7 @@
>  static void
>  getkeyboard(NSEvent *e)
>  {
> +       static int omod;
>        NSString *s;
>        char c;
>        int k, m;
> @@ -583,8 +583,6 @@
>
>        switch([e type]){
>        case NSKeyDown:
> -               in.kalting = 0;
> -
>                s = [e characters];
>                c = [s UTF8String][0];
>
> @@ -614,15 +612,14 @@
>                                in.kbuttons |= 4;
>                        sendmouse();
>                }else
> -               if(m & NSAlternateKeyMask){
> -                       in.kalting = 1;
> +               if(m&NSAlternateKeyMask && (omod&NSAlternateKeyMask)==0)
>                        keystroke(Kalt);
> -               }
>                break;
>
>        default:
>                panic("getkey: unexpected event type");
>        }
> +       omod = m;
>  }
>
>  /*
> @@ -694,12 +691,8 @@
>                if(b == 1){
>                        m = [e modifierFlags];
>                        if(m & NSAlternateKeyMask){
> +                               abortcompose();
>                                b = 2;
> -                               // Take the ALT away from the keyboard
> handler.
> -                               if(in.kalting){
> -                                       in.kalting = 0;
> -                                       keystroke(Kalt);
> -                               }
>                        }else
>                        if(m & NSCommandKeyMask)
>                                b = 4;
> Index: src/cmd/devdraw/cocoa-srv.c
> ==============================**==============================**=======
> --- a/src/cmd/devdraw/cocoa-srv.c
> +++ b/src/cmd/devdraw/cocoa-srv.c
> @@ -358,15 +358,25 @@
>        zunlock();
>  }
>
> +static int alting;
> +
> +void
> +abortcompose(void)
> +{
> +       if(alting)
> +               keystroke(Kalt);
> +}
> +
>  void
>  keystroke(int c)
>  {
>        static Rune k[10];
> -       static int alting, nk;
> +       static int nk;
>        int i;
>
>        if(c == Kalt){
>                alting = !alting;
> +               nk = 0;
>                return;
>        }
>        if(!alting){
>
>
>

[rsc, 2012-01-16 22:08:34]

*** Submitted as b6d1bcee69be ***

devdraw: fix handling of compose key on OS X

This implementation is simpler to understand.  It
removes conflicts with other modifiers and with
the virtual buttons.  Pressing alt during a
sequence now cancels it correctly.

R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/5507049

Committer: Russ Cox <rsc@swtch.com>