Changeset 10280 for trunk/src

Timestamp:

Oct 22, 2003, 11:48:08 AM (22 years ago)

Author:

sandervl

Message:

DF: Fix for NLS layer switching (alt-shift)

File:

• trunk/src/pmkbdhk/pmkbdhk.cpp (modified) (2 diffs)

trunk/src/pmkbdhk/pmkbdhk.cpp

@@ -1 @@
-/* $Id: pmkbdhk.cpp,v 1.5 2003-07-07 12:26:08 sandervl Exp $ */
+/* $Id: pmkbdhk.cpp,v 1.6 2003-10-22 09:48:08 sandervl Exp $ */
 /*
  * OS/2 native Presentation Manager hooks
@@ -454 +454 @@
             case PMSCAN_SHIFTRIGHT:
                 if( SHORT1FROMMP(pqmsg->mp1) & KC_ALT )
-                    // Let PM process CP switching msg
-                    return FALSE;
+                {
+                  BOOL      fsuccess;
+                  ULONG     ulLayerID;
+
+                  if( CHAR4FROMMP(pqmsg->mp1) == PMSCAN_SHIFTLEFT )
+                    ulLayerID= KL_NATIONAL;
+                  else
+                    ulLayerID= KL_LATIN;
+                  fsuccess= WinSetKbdLayer( pqmsg->hwnd /* HWND_DESKTOP */
+                                          , ulLayerID        /* First country/language layout       */
+                                          , SKLF_SENDMSG );  /* Post the WM_KBDLAYERCHANGED message */
+                  HWND hwnd;
+                  /* Store layerFlag in parent(frame) window data */
+                  hwnd= WinQueryWindow( pqmsg->hwnd, QW_PARENT );
+                  WinSetWindowULong( hwnd, QWL_KBDLAYER, ulLayerID );
+                }
+                //no break
+
             // Intercept PM Window Hotkeys such as 
             // Alt-F7 do enable window moving by keyboard.