To: vim-dev@vim.org
Subject: Patch 6.1.291 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.291 (extra)
Problem:    Win32: CTRL-@ doesn't work.  Don't even get a message for it.
Solution:   Recognize the keycode for CTRL-@. (Yasuhiro Matsumoto)
Files:	    src/gui_w48.c


*** ../vim61.290/src/gui_w48.c	Wed Oct 16 20:29:46 2002
--- src/gui_w48.c	Thu Jan  9 20:16:55 2003
***************
*** 1585,1605 ****
  		    && !(GetKeyState(VK_SHIFT) & 0x8000)
  		    && !(GetKeyState(VK_MENU) & 0x8000))
  	    {
! 		if (vk == '6')
  		{
  		    string[0] = Ctrl_HAT;
  		    add_to_input_buf(string, 1);
  		}
! 		/* vk == 0xDB AZERTY for CTRL-'-', but CTRL-[ for * QWERTY! */
  		else if (vk == 0xBD)	/* QWERTY for CTRL-'-' */
  		{
  		    string[0] = Ctrl__;
  		    add_to_input_buf(string, 1);
  		}
! 		/* Japanese keyboard map '^' to vk == 0xDE */
! 		else if (MapVirtualKey(vk, 2) == (UINT)'^')
  		{
! 		    string[0] = Ctrl_HAT;
  		    add_to_input_buf(string, 1);
  		}
  		else
--- 1585,1606 ----
  		    && !(GetKeyState(VK_SHIFT) & 0x8000)
  		    && !(GetKeyState(VK_MENU) & 0x8000))
  	    {
! 		/* CTRL-6 is '^'; Japanese keyboard maps '^' to vk == 0xDE */
! 		if (vk == '6' || MapVirtualKey(vk, 2) == (UINT)'^')
  		{
  		    string[0] = Ctrl_HAT;
  		    add_to_input_buf(string, 1);
  		}
! 		/* vk == 0xBD AZERTY for CTRL-'-', but CTRL-[ for * QWERTY! */
  		else if (vk == 0xBD)	/* QWERTY for CTRL-'-' */
  		{
  		    string[0] = Ctrl__;
  		    add_to_input_buf(string, 1);
  		}
! 		/* CTRL-2 is '@'; Japanese keyboard maps '@' to vk == 0xC0 */
! 		else if (vk == '2' || MapVirtualKey(vk, 2) == (UINT)'@')
  		{
! 		    string[0] = Ctrl_AT;
  		    add_to_input_buf(string, 1);
  		}
  		else
*** ../vim61.290/src/version.c	Thu Jan 16 20:41:11 2003
--- src/version.c	Sun Jan 19 15:47:58 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     291,
  /**/

-- 
It doesn't really matter what you are able to do if you don't do it.
				(Bram Moolenaar)

 /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///