OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Fix use of the return key as a control key

Browse Source 
broken by revision f251606
This commit is contained in:
Christian Walther
2012-01-22 16:08:56 +01:00
parent 1c2defef26
commit 859aef9e97
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
View File

@ -186,10 +186,6 @@ void plKeyboardDevice::HandleKeyEvent(plOSMsg message, plKeyDef key, bool bKeyDo
plAvatarInputInterface::GetInstance()->ForceAlwaysRun(fCapsLockLock);
}
}
if (key == KEY_ENTER)
{
c = '\n';
}
// send a key event...
plKeyEventMsg* pMsg = TRACKED_NEW plKeyEventMsg;

10
Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
View File

@ -293,8 +293,8 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
{
// These are handled by KEYUP/KEYDOWN and should not be sent
// We don't like garbage getting in string fields
if (Wparam == KEY_BACKSPACE || Wparam == 0x0A || Wparam == KEY_ESCAPE ||
Wparam == KEY_TAB || Wparam == 0x0D)
if (Wparam == KEY_BACKSPACE || Wparam == KEY_ESCAPE ||
Wparam == KEY_TAB)
break;
BYTE scan = Lparam >> 16;
@ -303,8 +303,12 @@ void plInputManager::HandleWin32ControlEvent(UINT message, WPARAM Wparam, LPARAM
bExtended = Lparam >> 24 & 1;
hsBool bRepeat = ((Lparam >> 29) & 0xf) != 0;
bool down = !(Lparam >> 31);
wchar_t ch = (wchar_t)Wparam;
// for the return key, Windows sends CR, but multiline text input fields want LF (CR is rendered as a wide horizontal space)
if (ch == 0x0D)
ch = 0x0A;
for (int i=0; i<fInputDevices.Count(); i++)
fInputDevices[i]->HandleKeyEvent( CHAR_MSG, (plKeyDef)vkey, down, bRepeat, (wchar_t)Wparam );
fInputDevices[i]->HandleKeyEvent( CHAR_MSG, (plKeyDef)vkey, down, bRepeat, ch );
}
break;
case MOUSEWHEEL: