public inbox for cygwin-xfree@sourceware.org
help / color / mirror / Atom feed
* Patch for keyboard handling
@ 2003-11-03  8:25 Takuma Murakami
  2003-11-03 14:30 ` Harold L Hunt II
  2003-11-04  2:39 ` Harold L Hunt II
  0 siblings, 2 replies; 7+ messages in thread
From: Takuma Murakami @ 2003-11-03  8:25 UTC (permalink / raw)
  To: cygwin-xfree

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

I have made a patch to improve keyboard handling.
Any comments would be appreciated.

The changes are:

1) win.h, winkeybd.c, winwndproc.c - Improve the
synchronization of mode key states between XWin
and Windows.

2) winmultiwindowwndproc.c - Enable mode key
synchronization in -multiwindow mode.

3) winwndproc.c - Make clean termination on
logoff or shutdown.

4) winconfig.c - Fix the lacks of KEYUP messages in
Japanese environments.  The solution was proposed
by Kensuke Matsuzaki.

5) winwndproc.c - Ignore Windows keyboard auto-repeats
so that XWin controls auto-repeats instead of Windows.

Takuma Murakami (murakami@ipl.t.u-tokyo.ac.jp)

[-- Attachment #2: xwin.kbd.patch --]
[-- Type: application/octet-stream, Size: 10352 bytes --]

Index: win.h
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/win.h,v
retrieving revision 1.5
diff -c -r1.5 win.h
*** win.h	4 Oct 2003 18:44:30 -0000	1.5
--- win.h	3 Nov 2003 07:26:57 -0000
***************
*** 435,442 ****
    DWORD			dwBlueMask;
    DWORD			dwBitsPerRGB;
  
-   DWORD			dwModeKeyStates;
- 
    /* Handle to icons that must be freed */
    HICON			hiconNotifyIcon;
  
--- 435,440 ----
***************
*** 944,953 ****
  winInitializeModeKeyStates (void);
  
  void
! winStoreModeKeyStates (ScreenPtr pScreen);
! 
! void
! winRestoreModeKeyStates (ScreenPtr pScreen);
  
  Bool
  winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam);
--- 942,948 ----
  winInitializeModeKeyStates (void);
  
  void
! winRestoreModeKeyStates (void);
  
  Bool
  winIsFakeCtrl_L (UINT message, WPARAM wParam, LPARAM lParam);
Index: winconfig.c
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/winconfig.c,v
retrieving revision 1.12
diff -c -r1.12 winconfig.c
*** winconfig.c	8 Oct 2003 10:49:15 -0000	1.12
--- winconfig.c	3 Nov 2003 07:26:58 -0000
***************
*** 309,314 ****
--- 309,326 ----
  	g_winInfo.xkb.options = pLayout->xkboptions; 
  	break;
        }
+ 
+     if ((layoutNum == 0x411) && keyboardType == 7)
+       {
+ 	/* Japanese layouts have problems with key event messages
+ 	   such as the lack of WM_KEYUP for Caps Lock key.
+ 	   Loading US layout fixes this problem. */
+ 	if (LoadKeyboardLayout("00000409", KLF_ACTIVATE) != NULL)
+ 	  winMsg (X_INFO, "Loading US keyboard layout.\n");
+ 	else
+ 	  winMsg (X_ERROR, "LoadKeyboardLaout failed.\n");
+       }
+ 	   
    }  
    
    g_winInfo.xkb.initialMap = NULL;
Index: winkeybd.c
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/winkeybd.c,v
retrieving revision 1.2
diff -c -r1.2 winkeybd.c
*** winkeybd.c	15 Sep 2003 18:14:05 -0000	1.2
--- winkeybd.c	3 Nov 2003 07:26:59 -0000
***************
*** 44,49 ****
--- 44,51 ----
  
  static Bool g_winKeyState[NUM_KEYCODES];
  
+ /* Stored to get internal mode key states.  Must be read-only.  */
+ static unsigned short *g_winInternalModeKeyStatesPtr = NULL;
  
  #if WIN_NEW_KEYBOARD_SUPPORT
  
***************
*** 415,421 ****
--- 417,425 ----
  				       modMap, winKeybdBell, winKeybdCtrl);
  	}
  #endif
+       g_winInternalModeKeyStatesPtr = &(pDeviceInt->key->state);
        break;
+       
      case DEVICE_ON: 
        pDevice->on = TRUE;
        break;
***************
*** 473,519 ****
  
  
  /*
-  * We have to store the last state of each mode
-  * key before we lose the keyboard focus.
-  */
- 
- void
- winStoreModeKeyStates (ScreenPtr pScreen)
- {
- #if !WIN_NEW_KEYBOARD_SUPPORT
-   winScreenPriv(pScreen);
- 
-   /* Initialize all mode key states to off */
-   pScreenPriv->dwModeKeyStates = 0x0L;
- 
-   pScreenPriv->dwModeKeyStates |= 
-     (GetKeyState (VK_NUMLOCK) & 0x0001) << NumLockMapIndex;
- 
-   pScreenPriv->dwModeKeyStates |=
-     (GetKeyState (VK_SCROLL) & 0x0001) << ScrollLockMapIndex;
- 
-   pScreenPriv->dwModeKeyStates |=
-     (GetKeyState (VK_CAPITAL) & 0x0001) << LockMapIndex;
- 
-   pScreenPriv->dwModeKeyStates |=
-     (GetKeyState (VK_KANA) & 0x0001) << KanaMapIndex;
- #endif
- }
- 
- 
- /*
   * Upon regaining the keyboard focus we must
   * resynchronize our internal mode key states
   * with the actual state of the keys.
   */
  
  void
! winRestoreModeKeyStates (ScreenPtr pScreen)
  {
  #if !WIN_NEW_KEYBOARD_SUPPORT
-   winScreenPriv(pScreen);
    DWORD			dwKeyState;
  
    /* 
     * NOTE: The C XOR operator, ^, will not work here because it is
     * a bitwise operator, not a logical operator.  C does not
--- 477,501 ----
  
  
  /*
   * Upon regaining the keyboard focus we must
   * resynchronize our internal mode key states
   * with the actual state of the keys.
   */
  
  void
! winRestoreModeKeyStates ()
  {
  #if !WIN_NEW_KEYBOARD_SUPPORT
    DWORD			dwKeyState;
+   unsigned short internalKeyStates;
  
+   /* X server is being initialized */
+   if (!g_winInternalModeKeyStatesPtr)
+     return;
+   
+   /* Read the mode key states of our X server */
+   internalKeyStates = *g_winInternalModeKeyStatesPtr;
+   
    /* 
     * NOTE: The C XOR operator, ^, will not work here because it is
     * a bitwise operator, not a logical operator.  C does not
***************
*** 522,528 ****
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_NUMLOCK) & 0x0001;
!   if (WIN_XOR (pScreenPriv->dwModeKeyStates & NumLockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_NumLock, TRUE);
        winSendKeyEvent (KEY_NumLock, FALSE);
--- 504,510 ----
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_NUMLOCK) & 0x0001;
!   if (WIN_XOR (internalKeyStates & NumLockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_NumLock, TRUE);
        winSendKeyEvent (KEY_NumLock, FALSE);
***************
*** 530,536 ****
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_CAPITAL) & 0x0001;
!   if (WIN_XOR (pScreenPriv->dwModeKeyStates & LockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_CapsLock, TRUE);
        winSendKeyEvent (KEY_CapsLock, FALSE);
--- 512,518 ----
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_CAPITAL) & 0x0001;
!   if (WIN_XOR (internalKeyStates & LockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_CapsLock, TRUE);
        winSendKeyEvent (KEY_CapsLock, FALSE);
***************
*** 538,544 ****
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_SCROLL) & 0x0001;
!   if (WIN_XOR (pScreenPriv->dwModeKeyStates & ScrollLockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_ScrollLock, TRUE);
        winSendKeyEvent (KEY_ScrollLock, FALSE);
--- 520,526 ----
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_SCROLL) & 0x0001;
!   if (WIN_XOR (internalKeyStates & ScrollLockMask, dwKeyState))
      {
        winSendKeyEvent (KEY_ScrollLock, TRUE);
        winSendKeyEvent (KEY_ScrollLock, FALSE);
***************
*** 546,552 ****
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_KANA) & 0x0001;
!   if (WIN_XOR (pScreenPriv->dwModeKeyStates & KanaMask, dwKeyState))
      {
        winSendKeyEvent (KEY_HKTG, TRUE);
        winSendKeyEvent (KEY_HKTG, FALSE);
--- 528,534 ----
  
    /* Has the key state changed? */
    dwKeyState = GetKeyState (VK_KANA) & 0x0001;
!   if (WIN_XOR (internalKeyStates & KanaMask, dwKeyState))
      {
        winSendKeyEvent (KEY_HKTG, TRUE);
        winSendKeyEvent (KEY_HKTG, FALSE);
Index: winmouse.c
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/winmouse.c,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 winmouse.c
*** winmouse.c	3 Jun 2003 11:12:55 -0000	1.1.1.2
--- winmouse.c	3 Nov 2003 07:26:59 -0000
***************
*** 37,42 ****
--- 37,43 ----
  void
  winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl)
  {
+ 
  }
  
  
Index: winmultiwindowwndproc.c
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v
retrieving revision 1.3
diff -c -r1.3 winmultiwindowwndproc.c
*** winmultiwindowwndproc.c	4 Oct 2003 18:44:30 -0000	1.3
--- winmultiwindowwndproc.c	3 Nov 2003 07:27:00 -0000
***************
*** 599,609 ****
        SendMessage (hwndScreen, message, wParam, lParam);
        return 0;
  
      case WM_KILLFOCUS:
        /* Pop any pressed keys since we are losing keyboard focus */
        winKeybdReleaseKeys ();
        return 0;
! 
      case WM_SYSDEADCHAR:      
      case WM_DEADCHAR:
        /*
--- 599,616 ----
        SendMessage (hwndScreen, message, wParam, lParam);
        return 0;
  
+     case WM_SETFOCUS:
+       if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
+ 	break;
+ 
+       winRestoreModeKeyStates ();
+       return 0;
+       
      case WM_KILLFOCUS:
        /* Pop any pressed keys since we are losing keyboard focus */
        winKeybdReleaseKeys ();
        return 0;
!       
      case WM_SYSDEADCHAR:      
      case WM_DEADCHAR:
        /*
Index: winwndproc.c
===================================================================
RCS file: /cvsroot/xoncygwin/xc/programs/Xserver/hw/xwin/winwndproc.c,v
retrieving revision 1.2
diff -c -r1.2 winwndproc.c
*** winwndproc.c	15 Sep 2003 18:14:05 -0000	1.2
--- winwndproc.c	3 Nov 2003 07:27:01 -0000
***************
*** 118,126 ****
        s_hwndLastPrivates = hwnd;
        SetProp (hwnd, WIN_SCR_PROP, s_pScreenPriv);
  
-       /* Store the mode key states so restore doesn't try to restore them */
-       winStoreModeKeyStates (s_pScreen);
- 
        /* Setup tray icon */
        if (!s_pScreenInfo->fNoTrayIcon)
  	{
--- 118,123 ----
***************
*** 837,852 ****
  	break;
  
        /* Restore the state of all mode keys */
!       winRestoreModeKeyStates (s_pScreen);
        return 0;
  
      case WM_KILLFOCUS:
        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
  	break;
  
-       /* Store the state of all mode keys */
-       winStoreModeKeyStates (s_pScreen);
- 
        /* Release any pressed keys */
        winKeybdReleaseKeys ();
        return 0;
--- 834,846 ----
  	break;
  
        /* Restore the state of all mode keys */
!       winRestoreModeKeyStates ();
        return 0;
  
      case WM_KILLFOCUS:
        if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
  	break;
  
        /* Release any pressed keys */
        winKeybdReleaseKeys ();
        return 0;
***************
*** 911,916 ****
--- 905,914 ----
        if (wParam == VK_LWIN || wParam == VK_RWIN)
  	break;
  
+       /* Discard presses generated from Windows auto-repeat */
+       if (lParam & (1<<30))
+ 	return 0;
+       
        /* Discard fake Ctrl_L presses that precede AltGR on non-US keyboards */
        if (winIsFakeCtrl_L (message, wParam, lParam))
  	return 0;
***************
*** 1055,1060 ****
--- 1053,1059 ----
  	}
        break;
  
+     case WM_ENDSESSION:
      case WM_GIVEUP:
         /* Tell X that we are giving up */
        winDeinitClipboard ();

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2003-11-07  9:57 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-11-03  8:25 Patch for keyboard handling Takuma Murakami
2003-11-03 14:30 ` Harold L Hunt II
2003-11-03 15:05   ` Takuma Murakami
2003-11-04  2:39 ` Harold L Hunt II
2003-11-04  9:04   ` Takuma Murakami
2003-11-05 21:22     ` Harold L Hunt II
2003-11-07  9:57       ` Takuma Murakami

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).