Fw: Problems with ABNT2 Layout

[Mauro Carvalho Chehab - BrTurbo]

----- Original Message -----
From: "Mauro Carvalho Chehab - BrTurbo" <mchehab at brturbo.com>
To: "Mike McCormack" <mike at codeweavers.com>
Cc: <mchehab at brasiltelecom.com.br>
Sent: Friday, November 29, 2002 5:14 PM
Subject: Re: Problems with ABNT2 Layout


> Olá, Mike,
> >
> > Ola Mauro,
> >
> > You should send your changes in the 'diff -uw' format so that we can
> > easily understand them.
> >
> > You can do this by copying the original file like this:
> >
> > cp dlls/x11drv/keyboard.c dlls/x11drv/keyboard.c.old
> >
> > then changing the file, then doing
> >
> > diff -uw dlls/x11drv/keyboard.c.old dlls/x11drv/keyboard.c
>
>     Ok. It is included at the end of this e-mail
> >
> > This is the standard way of mailing patches to wine-patches, and it
> > makes it very easy to understand what you have changed and make your
> > changes to the master wine source.
>
>     Sorry, next time I will use this format.
>
>     By the way, even with the right keyboard, I couldn´t use dead key
> sequences, like acute-<a> for á, <grave>a for â and so on. Is there a way
to
> activate dead keys? Wow?
> >
> > obrigado,
> >
> > Mike
> >
> Obrigado,
> Mauro.
>
> ########
> # Diff File
> ########
>
> --- keyboard_old.c 2002-11-28 22:33:07.000000000 -0200
> +++ keyboard.c 2002-11-28 22:55:09.000000000 -0200
> @@ -63,7 +63,7 @@
>  static char KEYBOARD_MapDeadKeysym(KeySym keysym);
>
>  /* Keyboard translation tables */
> -#define MAIN_LEN 48
> +#define MAIN_LEN 49
>  static const WORD main_key_scan_qwerty[MAIN_LEN] =
>  {
>  /* this is my (102-key) keyboard layout, sorry if it doesn't quite match
> yours */
> @@ -75,7 +75,8 @@
>     0x1E,0x1F,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x2B,
>   /* z    x    c    v    b    n    m    ,    .    / */
>     0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,
> -   0x56 /* the 102nd key (actually to the right of l-shift) */
> +   0x56, /* the 102nd key (actually to the right of l-shift) */
> +   0x5e  /* VK_OEM_5 used on Brasilian Keyboard) */
>  };
>
>  static const WORD main_key_scan_dvorak[MAIN_LEN] =
> @@ -98,7 +99,8 @@
>     VK_Q,VK_W,VK_E,VK_R,VK_T,VK_Y,VK_U,VK_I,VK_O,VK_P,VK_OEM_4,VK_OEM_6,
>
VK_A,VK_S,VK_D,VK_F,VK_G,VK_H,VK_J,VK_K,VK_L,VK_OEM_1,VK_OEM_7,VK_OEM_5,
>
VK_Z,VK_X,VK_C,VK_V,VK_B,VK_N,VK_M,VK_OEM_COMMA,VK_OEM_PERIOD,VK_OEM_2,
> -   VK_OEM_102 /* the 102nd key (actually to the right of l-shift) */
> +   VK_OEM_102, /* the 102nd key (actually to the right of l-shift) */
> +   VK_OEM_5    /* VK_OEM_5 used on Brasilian Keyboard) */
>  };
>
>  static const WORD main_key_vkey_azerty[MAIN_LEN] =
> @@ -500,7 +502,18 @@
>   "'\"","1!","2@","3#","4$","5%","6¨","7&","8*","9(","0)","-_","=+",
>   "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","´`","[{",
>   "aA","sS","dD","fF","gG","hH","jJ","kK","lL","çÇ","~^","]}",
> - "zZ","xX","cC","vV","bB","nN","mM",",<",".>",";:","/?"
> + "zZ","xX","cC","vV","bB","nN","mM",",<",".>",";:","/?",
> + "\\|"
> +};
> +
> +/*** Brazilian ABNT-2 keyboard layout with <ALT GR> (contributed by Mauro
> Carvalho Chehab) */
> +static const char main_key_PT_br_alt_gr[MAIN_LEN][4] =
> +{
> +
"'\"¹","1!²","2@³","3#£","4$¢","5%¬","6¨","7&","8*","9(","0)","-_","=+§",
> + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","´`","[{ª",
> + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","çÇ","~^","]}º",
> + "zZ","xX","cC","vV","bB","nN","mM",",<",".>",";:","/?°",
> + "\\|"
>  };
>
>  /*** US international keyboard layout (contributed by Gustavo Noronha
> (kov at debian.org)) */
> @@ -641,6 +654,7 @@
>   {"Swiss French keyboard layout", 28605, &main_key_SF,
> &main_key_scan_qwerty, &main_key_vkey_qwerty},
>   {"Portuguese keyboard layout", 28605, &main_key_PT,
&main_key_scan_qwerty,
> &main_key_vkey_qwerty},
>   {"Brazilian ABNT-2 keyboard layout", 28591, &main_key_PT_br,
> &main_key_scan_qwerty, &main_key_vkey_qwerty},
> + {"Brazilian ABNT-2 keyboard layout ALT GR", 28591,
&main_key_PT_br_alt_gr,
> &main_key_scan_qwerty, &main_key_vkey_qwerty},
>   {"United States International keyboard layout", 28591,
&main_key_US_intl,
> &main_key_scan_qwerty, &main_key_vkey_qwerty},
>   {"Finnish keyboard layout", 28605, &main_key_FI, &main_key_scan_qwerty,
> &main_key_vkey_qwerty},
>   {"Bulgarian bds keyboard layout", 1251, &main_key_BG_bds,
> &main_key_scan_qwerty, &main_key_vkey_qwerty},
>