diff options
author | Jacek Antonelli | 2008-08-15 23:45:29 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:29 -0500 |
commit | 7bdb4845afdd157f95281293803567090e3f992a (patch) | |
tree | fbcada1c227d7407f9f37ccba360bfe6326d9c5e /linden/indra/llwindow | |
parent | Second Life viewer sources 1.19.0.0 (diff) | |
download | meta-impy-7bdb4845afdd157f95281293803567090e3f992a.zip meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.gz meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.bz2 meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.xz |
Second Life viewer sources 1.19.0.2
Diffstat (limited to 'linden/indra/llwindow')
-rw-r--r-- | linden/indra/llwindow/llwindowwin32.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp index 171cc09..e9315c9 100644 --- a/linden/indra/llwindow/llwindowwin32.cpp +++ b/linden/indra/llwindow/llwindowwin32.cpp | |||
@@ -2198,6 +2198,9 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2198 | case WM_SYSKEYUP: | 2198 | case WM_SYSKEYUP: |
2199 | eat_keystroke = FALSE; | 2199 | eat_keystroke = FALSE; |
2200 | case WM_KEYUP: | 2200 | case WM_KEYUP: |
2201 | { | ||
2202 | LLFastTimer t2(LLFastTimer::FTM_KEYHANDLER); | ||
2203 | |||
2201 | if (gDebugWindowProc) | 2204 | if (gDebugWindowProc) |
2202 | { | 2205 | { |
2203 | llinfos << "Debug WindowProc WM_KEYUP " | 2206 | llinfos << "Debug WindowProc WM_KEYUP " |
@@ -2211,7 +2214,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2211 | 2214 | ||
2212 | // pass on to windows | 2215 | // pass on to windows |
2213 | break; | 2216 | break; |
2214 | 2217 | } | |
2215 | case WM_IME_SETCONTEXT: | 2218 | case WM_IME_SETCONTEXT: |
2216 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) | 2219 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) |
2217 | { | 2220 | { |
@@ -2280,6 +2283,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2280 | 2283 | ||
2281 | case WM_LBUTTONDOWN: | 2284 | case WM_LBUTTONDOWN: |
2282 | { | 2285 | { |
2286 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2283 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) | 2287 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) |
2284 | { | 2288 | { |
2285 | window_imp->interruptLanguageTextInput(); | 2289 | window_imp->interruptLanguageTextInput(); |
@@ -2337,6 +2341,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2337 | 2341 | ||
2338 | case WM_LBUTTONUP: | 2342 | case WM_LBUTTONUP: |
2339 | { | 2343 | { |
2344 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2340 | //if (gDebugClicks) | 2345 | //if (gDebugClicks) |
2341 | //{ | 2346 | //{ |
2342 | // llinfos << "WndProc left button up" << llendl; | 2347 | // llinfos << "WndProc left button up" << llendl; |
@@ -2367,6 +2372,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2367 | case WM_RBUTTONDBLCLK: | 2372 | case WM_RBUTTONDBLCLK: |
2368 | case WM_RBUTTONDOWN: | 2373 | case WM_RBUTTONDOWN: |
2369 | { | 2374 | { |
2375 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2370 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) | 2376 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) |
2371 | { | 2377 | { |
2372 | window_imp->interruptLanguageTextInput(); | 2378 | window_imp->interruptLanguageTextInput(); |
@@ -2397,6 +2403,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2397 | 2403 | ||
2398 | case WM_RBUTTONUP: | 2404 | case WM_RBUTTONUP: |
2399 | { | 2405 | { |
2406 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2400 | // Because we move the cursor position in the app, we need to query | 2407 | // Because we move the cursor position in the app, we need to query |
2401 | // to find out where the cursor at the time the event is handled. | 2408 | // to find out where the cursor at the time the event is handled. |
2402 | // If we don't do this, many clicks could get buffered up, and if the | 2409 | // If we don't do this, many clicks could get buffered up, and if the |
@@ -2423,6 +2430,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2423 | case WM_MBUTTONDOWN: | 2430 | case WM_MBUTTONDOWN: |
2424 | // case WM_MBUTTONDBLCLK: | 2431 | // case WM_MBUTTONDBLCLK: |
2425 | { | 2432 | { |
2433 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2426 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) | 2434 | if (LLWinImm::isAvailable() && window_imp->mPreeditor) |
2427 | { | 2435 | { |
2428 | window_imp->interruptLanguageTextInput(); | 2436 | window_imp->interruptLanguageTextInput(); |
@@ -2453,6 +2461,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ | |||
2453 | 2461 | ||
2454 | case WM_MBUTTONUP: | 2462 | case WM_MBUTTONUP: |
2455 | { | 2463 | { |
2464 | LLFastTimer t2(LLFastTimer::FTM_MOUSEHANDLER); | ||
2456 | // Because we move the cursor position in tllviewerhe app, we need to query | 2465 | // Because we move the cursor position in tllviewerhe app, we need to query |
2457 | // to find out where the cursor at the time the event is handled. | 2466 | // to find out where the cursor at the time the event is handled. |
2458 | // If we don't do this, many clicks could get buffered up, and if the | 2467 | // If we don't do this, many clicks could get buffered up, and if the |