6 files changed, 121 insertions, 15 deletions

diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 134e606..cad1dc4 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -125,6 +125,16 @@ BOOL LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos
         return FALSE;
 }
 
+BOOL LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+        return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+        return FALSE;
+}
+
 BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
 {
         return FALSE;
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index a52aff6..2bb49e9 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -96,6 +96,8 @@ public:
         virtual void handleQuit(LLWindow *window);
         virtual BOOL handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual BOOL handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
+        virtual BOOL handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
+        virtual BOOL handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual BOOL handleActivate(LLWindow *window, BOOL activated);
         virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
         virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index b2a1ccf..0c5d6ed 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2177,6 +2177,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseDown(this, outCoords, mask);
                                                 break;
+                                        
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseDown(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2199,6 +2203,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseUp(this, outCoords, mask);
                                                 break;
+
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseUp(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2231,7 +2239,13 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
         case kEventClassWindow:
                 switch(evtKind)
-                {
+                {               
+                case kEventWindowActivated:
+                        mCallbacks->handleFocus(this);
+                        break;
+                case kEventWindowDeactivated:
+                        mCallbacks->handleFocusLost(this);
+                        break;
                 case kEventWindowBoundsChanging:
                         {
                                 Rect currentBounds;
diff --git a/linden/indra/llwindow/llwindowmesaheadless.h b/linden/indra/llwindow/llwindowmesaheadless.h
index 599db72..f0ad50e 100644
--- a/linden/indra/llwindow/llwindowmesaheadless.h
+++ b/linden/indra/llwindow/llwindowmesaheadless.h
@@ -32,6 +32,7 @@
 #if LL_MESA_HEADLESS
 
 #include "llwindow.h"
+#include "GL/glu.h"
 #include "GL/osmesa.h"
 
 class LLWindowMesaHeadless : public LLWindow
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index f7b4071..a1cdeb3 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -296,9 +296,9 @@ static SDL_Surface *Load_BMP_Resource(const char *basename)
 #if LL_X11
 // This is an XFree86/XOrg-specific hack for detecting the amount of Video RAM
 // on this machine.  It works by searching /var/log/var/log/Xorg.?.log or
-// /var/log/XFree86.?.log for a ': VideoRAM: (%d+) kB' regex, where '?' is
-// the X11 display number derived from $DISPLAY
-static int x11_detect_VRAM_kb_fp(FILE *fp)
+// /var/log/XFree86.?.log for a ': (VideoRAM|Memory): (%d+) kB' regex, where
+// '?' is the X11 display number derived from $DISPLAY
+static int x11_detect_VRAM_kb_fp(FILE *fp, const char *prefix_str)
 {
         const int line_buf_size = 1000;
         char line_buf[line_buf_size];
@@ -310,7 +310,7 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
                 // favourite regex implementation - libboost_regex - is
                 // quite a heavy and troublesome dependency for the client, so
                 // it seems a shame to introduce it for such a simple task.
-                const char part1_template[] = ": VideoRAM: ";
+                const char *part1_template = prefix_str;
                 const char part2_template[] = " kB";
                 char *part1 = strstr(line_buf, part1_template);
                 if (part1) // found start of matching line
@@ -325,7 +325,6 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
                                 int rtn = 0;
                                 for (; part1 < part2; ++part1)
                                 {
-                                        //lldebugs << "kB" << *part1 << llendl;
                                         if (*part1 < '0' || *part1 > '9')
                                         {
                                                 // unexpected char, abort parse
@@ -345,6 +344,7 @@ static int x11_detect_VRAM_kb_fp(FILE *fp)
         }
         return 0; // 'could not detect'
 }
+
 static int x11_detect_VRAM_kb()
 {
         std::string x_log_location("/var/log/");
@@ -363,7 +363,7 @@ static int x11_detect_VRAM_kb()
         // *TODO: we could be smarter and see which of Xorg/XFree86 has the
         // freshest time-stamp.
 
-        // Try XOrg log first
+        // Try Xorg log first
         fname = x_log_location;
         fname += "Xorg.";
         fname += ('0' + display_num);
@@ -371,12 +371,25 @@ static int x11_detect_VRAM_kb()
         fp = fopen(fname.c_str(), "r");
         if (fp)
         {
-                rtn = x11_detect_VRAM_kb_fp(fp);
+                llinfos << "Looking in " << fname
+                        << " for VRAM info..." << llendl;
+                rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
                 fclose(fp);
+                if (0 == rtn)
+                {
+                        fp = fopen(fname.c_str(), "r");
+                        if (fp)
+                        {
+                                rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
+                                fclose(fp);
+                        }
+                }
         }
-        // Try old XFree86 log otherwise
-        if (rtn == 0)
+        else
         {
+                llinfos << "Could not open " << fname
+                        << " - skipped." << llendl;     
+                // Try old XFree86 log otherwise
                 fname = x_log_location;
                 fname += "XFree86.";
                 fname += ('0' + display_num);
@@ -384,8 +397,24 @@ static int x11_detect_VRAM_kb()
                 fp = fopen(fname.c_str(), "r");
                 if (fp)
                 {
-                        rtn = x11_detect_VRAM_kb_fp(fp);
+                        llinfos << "Looking in " << fname
+                                << " for VRAM info..." << llendl;
+                        rtn = x11_detect_VRAM_kb_fp(fp, ": VideoRAM: ");
                         fclose(fp);
+                        if (0 == rtn)
+                        {
+                                fp = fopen(fname.c_str(), "r");
+                                if (fp)
+                                {
+                                        rtn = x11_detect_VRAM_kb_fp(fp, ": Memory: ");
+                                        fclose(fp);
+                                }
+                        }
+                }
+                else
+                {
+                        llinfos << "Could not open " << fname
+                                << " - skipped." << llendl;
                 }
         }
         return rtn;
@@ -2023,7 +2052,9 @@ void LLWindowSDL::gatherInput()
                 }
 
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-                                    ;  // Middle mouse isn't handled right now in Second Life ... mCallbacks->handleMiddleMouseDown(this, openGlCoord, mask);
+                                {
+                                    mCallbacks->handleMiddleMouseDown(this, openGlCoord, mask);
+                                }
                 else if (event.button.button == 4)  // mousewheel up...thanks to X11 for making SDL consider these "buttons".
                                         mCallbacks->handleScrollWheel(this, -1);
                 else if (event.button.button == 5)  // mousewheel down...thanks to X11 for making SDL consider these "buttons".
@@ -2044,8 +2075,9 @@ void LLWindowSDL::gatherInput()
                 else if (event.button.button == SDL_BUTTON_RIGHT)  // right ... yes, it's 3, not 2, in SDL...
                                     mCallbacks->handleRightMouseUp(this, openGlCoord, mask);
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-                                    ;  // UNUSED IN SECOND LIFE RIGHT NOW mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
-
+                                {
+                                        mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
+                                }
                 // don't handle mousewheel here...
 
                 break;
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 3c2e730..2cd1353 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2072,7 +2072,54 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         break;
 
                 case WM_MBUTTONDOWN:
-                        // Handle middle button click
+//              case WM_MBUTTONDBLCLK:
+                        {
+                                // Because we move the cursor position in tllviewerhe app, we need to query
+                                // to find out where the cursor at the time the event is handled.
+                                // If we don't do this, many clicks could get buffered up, and if the
+                                // first click changes the cursor position, all subsequent clicks
+                                // will occur at the wrong location.  JC
+                                LLCoordWindow cursor_coord_window;
+                                if (window_imp->mMousePositionModified)
+                                {
+                                        window_imp->getCursorPosition(&cursor_coord_window);
+                                        window_imp->convertCoords(cursor_coord_window, &gl_coord);
+                                }
+                                else
+                                {
+                                        window_imp->convertCoords(window_coord, &gl_coord);
+                                }
+                                MASK mask = gKeyboard->currentMask(TRUE);
+                                if (window_imp->mCallbacks->handleMiddleMouseDown(window_imp, gl_coord, mask))
+                                {
+                                        return 0;
+                                }
+                        }
+                        break;
+
+                case WM_MBUTTONUP:
+                        {
+                                // Because we move the cursor position in tllviewerhe app, we need to query
+                                // to find out where the cursor at the time the event is handled.
+                                // If we don't do this, many clicks could get buffered up, and if the
+                                // first click changes the cursor position, all subsequent clicks
+                                // will occur at the wrong location.  JC
+                                LLCoordWindow cursor_coord_window;
+                                if (window_imp->mMousePositionModified)
+                                {
+                                        window_imp->getCursorPosition(&cursor_coord_window);
+                                        window_imp->convertCoords(cursor_coord_window, &gl_coord);
+                                }
+                                else
+                                {
+                                        window_imp->convertCoords(window_coord, &gl_coord);
+                                }
+                                MASK mask = gKeyboard->currentMask(TRUE);
+                                if (window_imp->mCallbacks->handleMiddleMouseUp(window_imp, gl_coord, mask))
+                                {
+                                        return 0;
+                                }
+                        }
                         break;
 
                 case WM_MOUSEWHEEL: