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

Timestamp:

Jul 31, 2003, 5:58:58 PM (22 years ago)

Author:

sandervl

Message:

KOMH: DBCS updates/fixes

File:

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

trunk/src/user32/winaccel.cpp

@@ -1 @@
-/* $Id: winaccel.cpp,v 1.11 2003-04-02 12:58:02 sandervl Exp $ */
+/* $Id: winaccel.cpp,v 1.12 2003-07-31 15:56:47 sandervl Exp $ */
 /*
  * Win32 accelerator key functions for OS/2
@@ -18 +18 @@
 #include <misc.h>
 #include <heapstring.h>
-#include "win32wbase.h"
 #include <win\winnls.h>
 
@@ -24 +23 @@
 #include "dbglocal.h"
 
-/**********************************************************************
- *           KBD_translate_accelerator
- *
- * FIXME: should send some WM_INITMENU or/and WM_INITMENUPOPUP  -messages
- */
-static BOOL KBD_translate_accelerator(HWND hWnd,LPMSG msg,
-                                      BYTE fVirt,WORD key,WORD cmd)
-{
-    BOOL sendmsg = FALSE;
-
-    if(msg->wParam == key)
-    {
-        if (msg->message == WM_CHAR) {
-            if ( !(fVirt & FALT) && !(fVirt & FVIRTKEY) )
-            {
-                dprintf(("TranslateAccelerator: found accel for WM_CHAR: ('%c')\n", msg->wParam&0xff));
-                sendmsg=TRUE;
-            }
-        }
-        else
-        {
-            if(fVirt & FVIRTKEY) {
-                INT mask = 0;
-                if(GetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT;
-                if(GetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
-                if(GetKeyState(VK_MENU) & 0x8000) mask |= FALT;
-
-                if(mask == (fVirt & (FSHIFT | FCONTROL | FALT)))
-                        sendmsg=TRUE;
-                else    dprintf(("TranslateAccelerator: but incorrect SHIFT/CTRL/ALT-state %x != %x", mask, fVirt));
-            }
-            else
-            {
-                if (!(msg->lParam & 0x01000000))  /* no special_key */
-                {
-                    if ((fVirt & FALT) && (msg->lParam & 0x20000000))
-                    {                                                   /* ^^ ALT pressed */
-                        dprintf(("TranslateAccelerator: found accel for Alt-%c\n", msg->wParam&0xff));
-                        sendmsg=TRUE;
-                    }
-                }
-            }
-        }
-
-        if (sendmsg)      /* found an accelerator, but send a message... ? */
-        {
-            INT  iSysStat,iStat,mesg=0;
-            HMENU hMenu;
-
-            if (msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) {
-                mesg=1;
-            }
-            else
-                if (GetCapture())
-                    mesg=2;
-                else
-                if (!IsWindowEnabled(hWnd))
-                    mesg=3;
-                else
-                {
-                    Win32BaseWindow *window;
-
-                    window = Win32BaseWindow::GetWindowFromHandle(hWnd);
-                    if(!window) {
-                        return FALSE; //should never happen! (already checked)
-                    }
-
-                    hMenu = GetMenu(hWnd);
-
-                    iSysStat = (window->GetSysMenu()) ? GetMenuState(GetSubMenu(window->GetSysMenu(), 0),
-                                                                     cmd, MF_BYCOMMAND) : -1 ;
-                    iStat = (hMenu) ? GetMenuState(hMenu, cmd, MF_BYCOMMAND) : -1 ;
-
-                    if (iSysStat!=-1)
-                    {
-                        if (iSysStat & (MF_DISABLED|MF_GRAYED))
-                            mesg=4;
-                        else
-                            mesg=WM_SYSCOMMAND;
-                    }
-                    else
-                    {
-                        if (iStat!=-1)
-                        {
-                            if (IsIconic(hWnd)) {
-                                mesg=5;
-                            }
-                            else
-                            {
-                                if (iStat & (MF_DISABLED|MF_GRAYED))
-                                    mesg=6;
-                                else
-                                    mesg=WM_COMMAND;
-                            }
-                        }
-                        else
-                            mesg=WM_COMMAND;
-                    }
-                    RELEASE_WNDOBJ(window);
-                }
-                if ( mesg==WM_COMMAND || mesg==WM_SYSCOMMAND )
-                {
-                    SendMessageA(hWnd, mesg, cmd, 0x00010000L);
-                }
-                else
-                {
-                    /*  some reasons for NOT sending the WM_{SYS}COMMAND message:
-                     *   #0: unknown (please report!)
-                     *   #1: for WM_KEYUP,WM_SYSKEYUP
-                     *   #2: mouse is captured
-                     *   #3: window is disabled
-                     *   #4: it's a disabled system menu option
-                     *   #5: it's a menu option, but window is iconic
-                     *   #6: it's a menu option, but disabled
-                     */
-                    if(mesg==0)
-                            dprintf(("ERROR: unknown reason - please report!"));
-                    else    dprintf(("but won't send WM_{SYS}COMMAND, reason is #%d\n",mesg));
-
-                }
-                return TRUE;
-            }
-            dprintf(("TranslateAccelerator: not match for %x %x %x", fVirt, key, cmd));
-    }
-    return FALSE;
-}
-/*****************************************************************************
- * 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
- *
- *****************************************************************************/
-INT WINAPI TranslateAcceleratorA(HWND hWnd, HACCEL hAccel, LPMSG msg)
-{
-    /* YES, Accel16! */
-    LPACCEL lpAccelTbl;
-    int i;
-
-    SetLastError(ERROR_SUCCESS);
-    if (msg == NULL)
-    {
-          dprintf(("TranslateAcceleratorAmsg null; should hang here to be win compatible"));
-          SetLastError(ERROR_INVALID_PARAMETER);
-          return 0;
-    }
-    if (!hAccel || !(lpAccelTbl = (LPACCEL)GlobalLock(hAccel)))
-    {
-          dprintf(("TranslateAcceleratorA: invalid accel handle=%x", hAccel));
-          SetLastError(ERROR_INVALID_PARAMETER);
-          return 0;
-    }
-    if(!IsWindow(hWnd)) {
-          dprintf(("TranslateAccelerator, window %x not found", hWnd));
-          SetLastError(ERROR_INVALID_WINDOW_HANDLE);
-          return 0;
-    }
-    if ((msg->message != WM_KEYDOWN &&
-         msg->message != WM_KEYUP &&
-         msg->message != WM_SYSKEYDOWN &&
-         msg->message != WM_SYSKEYUP &&
-         msg->message != WM_CHAR))
-    {
-          return 0;
-    }
-
-/*    TRACE_(accel)("TranslateAccelerators hAccel=%04x, hWnd=%04x,"
-      "msg->hwnd=%04x, msg->message=%04x, wParam=%08x, lParam=%lx\n",
-      hAccel,hWnd,msg->hwnd,msg->message,msg->wParam,msg->lParam); */
-
-    i = 0;
-    do
-    {
-        if (KBD_translate_accelerator(hWnd,msg,lpAccelTbl[i].fVirt,
-                                      lpAccelTbl[i].key,lpAccelTbl[i].cmd))
-        {
-            return 1;
-        }
-    }
-    while ((lpAccelTbl[i++].fVirt & 0x80) == 0);
-
-//    WARN_(accel)("couldn't translate accelerator key\n");
-    return 0;
-}
 /**********************************************************************
  *                      LoadAccelerators32W     [USER.177]