diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llwindow/llwindowsdl.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index 9756e09..ad39c84 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp | |||
@@ -2,6 +2,8 @@ | |||
2 | * @file llwindowsdl.cpp | 2 | * @file llwindowsdl.cpp |
3 | * @brief SDL implementation of LLWindow class | 3 | * @brief SDL implementation of LLWindow class |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | ||
6 | * | ||
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 7 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 8 | * |
7 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
@@ -24,6 +26,7 @@ | |||
24 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 26 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
25 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 27 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
26 | * COMPLETENESS OR PERFORMANCE. | 28 | * COMPLETENESS OR PERFORMANCE. |
29 | * $/LicenseInfo$ | ||
27 | */ | 30 | */ |
28 | 31 | ||
29 | #if LL_SDL | 32 | #if LL_SDL |
@@ -2035,10 +2038,6 @@ void LLWindowSDL::gatherInput() | |||
2035 | if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0) | 2038 | if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0) |
2036 | SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243 | 2039 | SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243 |
2037 | 2040 | ||
2038 | // This is a testing hack to pop up a dialog when 4 is pressed | ||
2039 | //if (event.key.keysym.sym == SDLK_4) | ||
2040 | //OSMessageBox("a whole bunch of text goes right here, whee! test test test.", "this is the title!", OSMB_YESNO); | ||
2041 | |||
2042 | gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod); | 2041 | gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod); |
2043 | break; | 2042 | break; |
2044 | 2043 | ||
@@ -2119,9 +2118,9 @@ void LLWindowSDL::gatherInput() | |||
2119 | else if (event.button.button == SDL_BUTTON_RIGHT) // right ... yes, it's 3, not 2, in SDL... | 2118 | else if (event.button.button == SDL_BUTTON_RIGHT) // right ... yes, it's 3, not 2, in SDL... |
2120 | mCallbacks->handleRightMouseUp(this, openGlCoord, mask); | 2119 | mCallbacks->handleRightMouseUp(this, openGlCoord, mask); |
2121 | else if (event.button.button == SDL_BUTTON_MIDDLE) // middle | 2120 | else if (event.button.button == SDL_BUTTON_MIDDLE) // middle |
2122 | { | 2121 | { |
2123 | mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask); | 2122 | mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask); |
2124 | } | 2123 | } |
2125 | // don't handle mousewheel here... | 2124 | // don't handle mousewheel here... |
2126 | 2125 | ||
2127 | break; | 2126 | break; |
@@ -2175,18 +2174,18 @@ void LLWindowSDL::gatherInput() | |||
2175 | } | 2174 | } |
2176 | if (event.active.state & SDL_APPACTIVE) | 2175 | if (event.active.state & SDL_APPACTIVE) |
2177 | { | 2176 | { |
2178 | // Change in iconification/minimization state. | 2177 | // Change in iconification/minimization state. |
2179 | if ((!event.active.gain) != mIsMinimized) | 2178 | if ((!event.active.gain) != mIsMinimized) |
2180 | { | 2179 | { |
2181 | mCallbacks->handleActivate(this, !!event.active.gain); | 2180 | mCallbacks->handleActivate(this, !!event.active.gain); |
2182 | llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl; | 2181 | llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl; |
2183 | 2182 | ||
2184 | mIsMinimized = (!event.active.gain); | 2183 | mIsMinimized = (!event.active.gain); |
2185 | } | 2184 | } |
2186 | else | 2185 | else |
2187 | { | 2186 | { |
2188 | llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl; | 2187 | llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl; |
2189 | } | 2188 | } |
2190 | } | 2189 | } |
2191 | break; | 2190 | break; |
2192 | 2191 | ||
@@ -2713,6 +2712,7 @@ void spawn_web_browser(const char* escaped_url) | |||
2713 | cmd += "launch_url.sh"; | 2712 | cmd += "launch_url.sh"; |
2714 | char* const argv[] = {(char*)cmd.c_str(), (char*)escaped_url, NULL}; | 2713 | char* const argv[] = {(char*)cmd.c_str(), (char*)escaped_url, NULL}; |
2715 | 2714 | ||
2715 | fflush(NULL); | ||
2716 | pid_t pid = fork(); | 2716 | pid_t pid = fork(); |
2717 | if (pid == 0) | 2717 | if (pid == 0) |
2718 | { // child | 2718 | { // child |