Changeset 2261 for trunk/src/user32/winaccel.cpp

Timestamp:

Dec 30, 1999, 10:31:03 AM (26 years ago)

Author:

sandervl

Message:

BvL: Added accelerator support

File:

• trunk/src/user32/winaccel.cpp (modified) (6 diffs)

trunk/src/user32/winaccel.cpp

@@ -1 @@
-/* $Id: winaccel.cpp,v 1.2 1999-10-24 12:30:29 sandervl Exp $ */
+/* $Id: winaccel.cpp,v 1.3 1999-12-30 09:31:03 sandervl Exp $ */
 /*
- * Win32 accelartor key functions for OS/2
- *
- * Copyright 1999 Sander van Leeuwen
+ * Win32 accelerator key functions for OS/2
+ *
+ * Copyright 1999 Bart van Leeuwen
  *
  *
@@ -12 +12 @@
 #include <misc.h>
 #include <win32wbase.h>
-
-//******************************************************************************
-//******************************************************************************
+#include <winaccel.h>
+
+/*****************************************************************************
+ * Name      : HACCEL WIN32API LoadAcceleratorsA
+ * Purpose   : Load accelerator resource and return handle to it
+ * Parameters: HINSTANCE hinst, LPCSTR lpszAcc
+ * Variables :
+ * Result    : Global Handle of resource
+ * Remark    : see code
+ * Status    : OK
+ *
+ * Author    : Bart van Leeuwen  [Sun, 1998/12/26 17:01]
+ *****************************************************************************/
 HACCEL WIN32API LoadAcceleratorsA(HINSTANCE hinst, LPCSTR lpszAcc)
 {
@@ -24 +34 @@
     return(rc);
 }
-//******************************************************************************
-//******************************************************************************
+/*****************************************************************************
+ * Name      : HACCEL WIN32API LoadAcceleratorsW
+ * Purpose   : Load accelerator resource and return handle to it
+ * Parameters: HINSTANCE hinst, LPCSTR lpszAcc
+ * Variables :
+ * Result    : Global Handle of resource
+ * Remark    : see code
+ * Status    : OK
+ *
+ * Author    : Bart van Leeuwen  [Sun, 1998/12/26 17:01]
+ *****************************************************************************/
+
 HACCEL WIN32API LoadAcceleratorsW(HINSTANCE hinst, LPCWSTR lpszAccel)
 {
@@ -31 +51 @@
 
     rc = (HACCEL)FindResourceW(hinst, lpszAccel, RT_ACCELERATORW);
+
 
     dprintf(("LoadAcceleratorsW returned %d\n", rc));
@@ -41 +62 @@
  Win32Resource *winres;
 
-    if(HIWORD(haccel) == 0) {
-        dprintf(("DestroyAcceleratorTable: invalid haccel %x", haccel));
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
     dprintf(("DestroyAcceleratorTable %x\n", haccel));
     winres = (Win32Resource *)haccel;
@@ -51 +67 @@
     return TRUE;
 }
-//******************************************************************************
-//TODO: Do more than just return?
-//******************************************************************************
+/*****************************************************************************
+ * Name      : int WIN32API TranslateAcceleratorA
+ * Purpose   : Translate WM_*KEYDOWN messages to WM_COMMAND messages
+ *             according to Accelerator table
+ * Parameters: HWND hwnd, HACCEL haccel, LPMSG lpmsg
+ * Variables :
+ * Result    : int FALSE (no accelerator found) TRUE (accelerator found)
+ * Remark    : if a accelerator is found it is not neccesarely executed
+ *             depends on window stat
+ * Status    : finished but not fully tested
+ *
+ * Author    : Bart van Leeuwen  [Sun, 1998/12/26 17:01]
+ *****************************************************************************/
 int WIN32API TranslateAcceleratorA(HWND hwnd, HACCEL haccel, LPMSG lpmsg)
 {
- Win32BaseWindow *window;
-
-    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!window) {
-//Msg for (non-client) child of our frame window
-//      dprintf(("TranslateAcceleratorA, window %x not found", hwnd));
-        return FALSE;
+ Win32BaseWindow *window,*parentWindow,*childWindow;
+ LPWINACCEL lpAccelTbl;
+ WINACCEL tmpAccel;
+ HACCEL temp2;
+ HGLOBAL GlobHandle;
+ HWND hwndMenu,parent,child,msgHwnd;
+ int i,keyMask;
+ INT16 menuStat;
+ BOOL sendMessage;
+
+
+    //bvl: check if messages come from keyboard
+    if ((lpmsg->message != WM_KEYDOWN &&
+         lpmsg->message != WM_SYSKEYDOWN))
+         {
+           //dprintf(("TranslateAcceleratorA called by invalid message"));
+           SetLastError(ERROR_SUCCESS);
+           return FALSE;
+         }
+
+    window = Win32BaseWindow::GetWindowFromHandle(lpmsg->hwnd);
+
+    if(!window)
+    {
+      dprintf(("TranslateAcceleratorA, window %x not found", hwnd));
+      SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+      return FALSE;
     }
-    if(window->GetAccelTable() != haccel) {
-        dprintf(("TranslateAcceleratorA %X %X %X", hwnd, haccel, lpmsg->hwnd));
-        window->SetAccelTable(haccel);
-    }
-
-    //SvL: OS/2 automatically translates accelerator keys
+
+    //bvl: Get memory pointer here
+    GlobHandle = LoadResource(NULL,haccel);
+    lpAccelTbl = (LPWINACCEL) LockResource(GlobHandle);
+
+    keyMask=0;
+    if(GetKeyState(VK_SHIFT) & 0x8000) keyMask |= FSHIFT;
+    if(GetKeyState(VK_CONTROL) & 0x8000) keyMask |= FCONTROL;
+    if(GetKeyState(VK_MENU) & 0x8000) keyMask |= FALT;
+
+    i=0;
+    do
+    {
+       if ((lpAccelTbl[i].key == lpmsg->wParam)&&(keyMask == (lpAccelTbl[i].fVirt &
+           (FSHIFT | FCONTROL | FALT))))
+        {
+         //bvl: Accelerator found
+         dprintf(("Accelerator found for command: %X",lpAccelTbl[i].cmd));
+         //bvl: this is not right, check control and win stat
+         // SendMessageA(hwnd,WM_COMMAND,lpAccelTbl[i].cmd,0x00010000L);
+
+         sendMessage = FALSE;
+
+         if (window->isFrameWindow())
+           {
+            if ( !window->IsIconic() )
+             {
+              //bvl: this is a frame window so just use that menuhandle
+              hwndMenu = window->GetMenu();
+              if ( hwndMenu == NULL )
+               {
+                //bvl: window does not have a menu so command isn't a menu
+                dprintf(("framenomenu"));
+                sendMessage = TRUE;
+               }
+               else
+               {
+                //bvl: get menuitem  status
+                menuStat = GetMenuState(hwndMenu,lpAccelTbl[i++].cmd,MF_BYCOMMAND);
+                //bvl: -1 means no menu Item
+                if( !menuStat == -1)
+                 {
+                  if( menuStat  & !(MF_DISABLED|MF_GRAYED) )
+                   {
+                     //bvl: its a menu item and its enabled
+                     dprintf(("framemenu"));
+                     sendMessage = TRUE;
+                   }
+                   else
+                   {
+                    //bvl: its a menu Item but disabled
+                    sendMessage = FALSE;
+                   }
+                 }
+                 else
+                 {
+                  //bvl: the message is probably not a menu msg so process it
+                  dprintf(("framemenunoitem"));
+                  sendMessage = TRUE;
+                 }
+               }
+             }
+           }
+           else
+           {
+              //bvl: the message is probably not a menu msg so process it
+              dprintf(("noframe"));
+              sendMessage = TRUE;
+           }
+
+         if ( sendMessage )
+         {
+          //bvl: previous checks indicated that command can be send.
+          SendMessageA(hwnd,WM_COMMAND,lpAccelTbl[i].cmd,0x00010000L);
+          return TRUE;
+
+         }
+        }
+
+    } while ((lpAccelTbl[i++].fVirt & 0x80) == 0);
+
+    SetLastError(ERROR_SUCCESS);
     return FALSE;
 }
-//******************************************************************************
-//******************************************************************************
+/*****************************************************************************
+ * Name      : int WIN32API TranslateAcceleratorA
+ * Remark    : See TranslateAcceleratorA
+ * Status    : finished but not fully tested
+ *
+ * Author    : Bart van Leeuwen  [Sun, 1998/12/26 17:01]
+ *****************************************************************************/
+
 int WIN32API TranslateAcceleratorW( HWND hwnd, HACCEL hAccel, LPMSG lpMsg)
 {