r=mkaply, a=brendan
OS/2 bring up - Trap when typing in URL bar
This commit is contained in:
mkaply%us.ibm.com 2000-06-20 13:24:52 +00:00
parent c8e8241728
commit 37a3743cdd
2 changed files with 22 additions and 18 deletions

View File

@ -2385,25 +2385,28 @@ PRUint32 WMChar2KeyCode( MPARAM mp1, MPARAM mp2)
if( !(flags & (KC_VIRTUALKEY | KC_DEADKEY)))
{
rc = SHORT1FROMMP(mp2);
// Need nls-correct way of doing this...
if( isalnum( rc))
rc = toupper( rc); // no lower case
else switch( rc)
if( rc < 0xFF)
{
case ';': rc = NS_VK_SEMICOLON; break;
case '=': rc = NS_VK_EQUALS; break;
case '*': rc = NS_VK_MULTIPLY; break;
case '+': rc = NS_VK_ADD; break;
case '-': rc = NS_VK_SUBTRACT; break;
case '.': rc = NS_VK_PERIOD; break; // NS_VK_DECIMAL ?
case '|': rc = NS_VK_SEPARATOR; break;
case ',': rc = NS_VK_COMMA; break;
case '/': rc = NS_VK_SLASH; break; // NS_VK_DIVIDE ?
case '`': rc = NS_VK_BACK_QUOTE; break;
case '(': rc = NS_VK_OPEN_BRACKET; break;
case '\\': rc = NS_VK_BACK_SLASH; break;
case ')': rc = NS_VK_CLOSE_BRACKET; break;
case '\'': rc = NS_VK_QUOTE; break;
// Need nls-correct way of doing this...
if( isalnum( rc))
rc = toupper( rc); // no lower case
else switch( rc)
{
case ';': rc = NS_VK_SEMICOLON; break;
case '=': rc = NS_VK_EQUALS; break;
case '*': rc = NS_VK_MULTIPLY; break;
case '+': rc = NS_VK_ADD; break;
case '-': rc = NS_VK_SUBTRACT; break;
case '.': rc = NS_VK_PERIOD; break; // NS_VK_DECIMAL ?
case '|': rc = NS_VK_SEPARATOR; break;
case ',': rc = NS_VK_COMMA; break;
case '/': rc = NS_VK_SLASH; break; // NS_VK_DIVIDE ?
case '`': rc = NS_VK_BACK_QUOTE; break;
case '(': rc = NS_VK_OPEN_BRACKET; break;
case '\\': rc = NS_VK_BACK_SLASH; break;
case ')': rc = NS_VK_CLOSE_BRACKET; break;
case '\'': rc = NS_VK_QUOTE; break;
}
}
}
else if( flags & KC_VIRTUALKEY)

View File

@ -149,6 +149,7 @@ class nsWindow : public nsBaseWidget,
USHORT GetNextCmdID() { return mNextCmdID++; }
void NS2PM_PARENT( POINTL &ptl);
void NS2PM( POINTL &ptl);
void NS2PM( RECTL &rcl);
// void SetContextMenu( nsContextMenu *aMenu);
protected: