Skip to content
Permalink
Browse files

Fixed bug #634

If TranslateMessage() isn't done, then IME messages aren't generated.
  • Loading branch information
slouken committed Oct 10, 2009
1 parent 04823fa commit fde2112afba519590e5a828d62f45d6f3e876f78
Showing with 9 additions and 2 deletions.
  1. +2 −1 src/video/windib/SDL_dibevents.c
  2. +7 −1 src/video/windx5/SDL_dx5events.c
@@ -198,7 +198,7 @@ LRESULT DIB_HandleMessage(_THIS, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
m.wParam = wParam;
m.lParam = lParam;
m.time = 0;
if ( TranslateMessage(&m) && PeekMessage(&m, hwnd, 0, WM_USER, PM_NOREMOVE) && (m.message == WM_CHAR) ) {
if ( PeekMessage(&m, hwnd, 0, WM_USER, PM_NOREMOVE) && (m.message == WM_CHAR) ) {
GetMessage(&m, hwnd, 0, WM_USER);
wParam = m.wParam;
}
@@ -363,6 +363,7 @@ void DIB_PumpEvents(_THIS)

while ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
@@ -655,6 +655,7 @@ static int DX5_CheckInput(_THIS, int timeout, BOOL processInput)
while ( ! posted &&
PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
TranslateMessage(&msg);
DispatchMessage(&msg);
} else {
return(-1);
@@ -713,12 +714,17 @@ static int DX5_CheckInput(_THIS, int timeout, BOOL processInput)
}
if ( event != WAIT_TIMEOUT ) {
/* Maybe there was a windows message? */
if ( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
posted = 0;
while ( ! posted &&
PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) ) {
if ( GetMessage(&msg, NULL, 0, 0) > 0 ) {
TranslateMessage(&msg);
DispatchMessage(&msg);
} else {
return(-1);
}
}
if ( posted ) {
return(1);
}
}

0 comments on commit fde2112

Please sign in to comment.