Skip to content

W
wine-cw
Commit a0815f30 authored by David Faure's avatar David Faure Committed by Alexandre Julliard
Browse files
Options

Added KEYBOARD_UpdateState, to read the modifiers when the wine app is

activated. Uses the new KEYBOARD_UpdateOneState. Fixed a problem with menu accelerators (Alt-letter generates a down arrow event which beeps if not filtered). Speeded up ToAscii16/32() a little bit.
parent 5ce602ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 40 deletions
include/keyboard.h
View file @ a0815f30
...@@ -15,5 +15,6 @@ extern BYTE AsyncKeyStateTable[256]; ...@@ -15,5 +15,6 @@ extern BYTE AsyncKeyStateTable[256];
extern BOOL32 KEYBOARD_Init(void); extern BOOL32 KEYBOARD_Init(void);
extern void KEYBOARD_HandleEvent( WND *pWnd, XKeyEvent *event ); extern void KEYBOARD_HandleEvent( WND *pWnd, XKeyEvent *event );
extern void KEYBOARD_UpdateState( void );
#endif /* __WINE_KEYBOARD_H */ #endif /* __WINE_KEYBOARD_H */
windows/event.c
View file @ a0815f30
...@@ -728,7 +728,10 @@ static void EVENT_FocusIn( WND *pWnd, XFocusChangeEvent *event ) ...@@ -728,7 +728,10 @@ static void EVENT_FocusIn( WND *pWnd, XFocusChangeEvent *event )
HWND32 hwnd = pWnd->hwndSelf; HWND32 hwnd = pWnd->hwndSelf;
if (hwnd != GetActiveWindow32()) if (hwnd != GetActiveWindow32())
{
WINPOS_ChangeActiveWindow( hwnd, FALSE ); WINPOS_ChangeActiveWindow( hwnd, FALSE );
KEYBOARD_UpdateState();
}
if ((hwnd != GetFocus32()) && !IsChild32( hwnd, GetFocus32())) if ((hwnd != GetFocus32()) && !IsChild32( hwnd, GetFocus32()))
SetFocus32( hwnd ); SetFocus32( hwnd );
} }
...@@ -1134,12 +1137,11 @@ void EVENT_MapNotify( HWND32 hWnd, XMapEvent *event ) ...@@ -1134,12 +1137,11 @@ void EVENT_MapNotify( HWND32 hWnd, XMapEvent *event )
*/ */
HWND32 EVENT_Capture(HWND32 hwnd, INT16 ht) HWND32 EVENT_Capture(HWND32 hwnd, INT16 ht)
{ {
Window win;
HWND32 capturePrev = captureWnd; HWND32 capturePrev = captureWnd;
if (!hwnd) if (!hwnd)
{ {
captureWnd = NULL; captureWnd = 0L;
captureHT = 0; captureHT = 0;
} }
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment