1 files changed, 47 insertions, 16 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 41c2269..d35dd57 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -65,7 +66,9 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
         mMouseUpCallback( NULL ),
         mHeldDownCallback( NULL ),
         mGLFont( NULL ),
+        mMouseDownFrame( 0 ),
         mHeldDownDelay( 0.5f ),                 // seconds until held-down callback is called
+        mHeldDownFrameDelay( 0 ),
         mImageUnselected( NULL ),
         mImageSelected( NULL ),
         mImageHoverSelected( NULL ),
@@ -118,7 +121,9 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
         mMouseUpCallback( NULL ),
         mHeldDownCallback( NULL ),
         mGLFont( NULL ),
+        mMouseDownFrame( 0 ),
         mHeldDownDelay( 0.5f ),                 // seconds until held-down callback is called
+        mHeldDownFrameDelay( 0 ),
         mImageUnselected( NULL ),
         mImageSelected( NULL ),
         mImageHoverSelected( NULL ),
@@ -215,9 +220,9 @@ void LLButton::init(void (*click_callback)(void*), void *callback_data, const LL
 
 LLButton::~LLButton()
 {
-        if( this == gFocusMgr.getMouseCapture() )
+        if( hasMouseCapture() )
         {
-                gFocusMgr.setMouseCapture( NULL, NULL );
+                gFocusMgr.setMouseCapture( NULL );
         }
 }
 
@@ -303,7 +308,7 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
 BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         // Route future Mouse messages here preemptively.  (Release on mouse up.)
-        gFocusMgr.setMouseCapture( this, &LLButton::onMouseCaptureLost );
+        gFocusMgr.setMouseCapture( this );
 
         if (hasTabStop() && !getIsChrome())
         {
@@ -316,6 +321,7 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
         }
 
         mMouseDownTimer.start();
+        mMouseDownFrame = LLFrameTimer::getFrameCount();
         
         if (mSoundFlags & MOUSE_DOWN)
         {
@@ -329,19 +335,17 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
 {
         // We only handle the click if the click both started and ended within us
-        if( this == gFocusMgr.getMouseCapture() )
+        if( hasMouseCapture() )
         {
+                // Always release the mouse
+                gFocusMgr.setMouseCapture( NULL );
+
                 // Regardless of where mouseup occurs, handle callback
                 if (mMouseUpCallback)
                 {
                         (*mMouseUpCallback)(mCallbackUserData);
                 }
 
-                mMouseDownTimer.stop();
-
-                // Always release the mouse
-                gFocusMgr.setMouseCapture( NULL, NULL );
-
                 // DO THIS AT THE VERY END to allow the button to be destroyed as a result of being clicked.
                 // If mouseup in the widget, it's been clicked
                 if (pointInView(x, y))
@@ -356,6 +360,9 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
                                 (*mClickedCallback)( mCallbackUserData );
                         }
                 }
+
+                mMouseDownTimer.stop();
+                mMouseDownTimer.reset();
         }
 
         return TRUE;
@@ -375,14 +382,14 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
         if (mMouseDownTimer.getStarted() && NULL != mHeldDownCallback)
         {
                 F32 elapsed = mMouseDownTimer.getElapsedTimeF32();
-                if( mHeldDownDelay < elapsed )
+                if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= LLFrameTimer::getFrameCount() - mMouseDownFrame)
                 {
                         mHeldDownCallback( mCallbackUserData );         
                 }
         }
 
         // We only handle the click if the click both started and ended within us
-        if( this == gFocusMgr.getMouseCapture() )
+        if( hasMouseCapture() )
         {
                 handled = TRUE;
         }
@@ -431,7 +438,7 @@ void LLButton::draw()
                 cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
                 screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
 
-                BOOL pressed = pressed_by_keyboard || (this == gFocusMgr.getMouseCapture() && pointInView(local_mouse_x, local_mouse_y));
+                BOOL pressed = pressed_by_keyboard || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y));
 
                 BOOL display_state = FALSE;
                 if( pressed )
@@ -819,11 +826,10 @@ void LLButton::setHoverImages( const LLString& image_name, const LLString& selec
         setImageHoverSelected(selected_name);
 }
 
-// static
-void LLButton::onMouseCaptureLost( LLMouseHandler* old_captor )
+void LLButton::onMouseCaptureLost()
 {
-        LLButton* self = (LLButton*) old_captor;
-        self->mMouseDownTimer.stop();
+        mMouseDownTimer.stop();
+        mMouseDownTimer.reset();
 }
 
 //-------------------------------------------------------------------------
@@ -947,6 +953,19 @@ LLXMLNodePtr LLButton::getXML(bool save_children) const
         return node;
 }
 
+void clicked_help(void* data)
+{
+        LLButton* self = (LLButton*)data;
+        if (!self) return;
+        
+        if (!LLUI::sHtmlHelp)
+        {
+                return;
+        }
+        
+        LLUI::sHtmlHelp->show(self->getHelpURL());
+}
+
 // static
 LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
@@ -1023,9 +1042,21 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
         {
                 button->setLabelSelected(node->getTextContents());
         }
+                
+        if (node->hasAttribute("help_url")) 
+        {
+                LLString        help_url;
+                node->getAttributeString("help_url",help_url);
+                button->setHelpURLCallback(help_url);
+        }
 
         button->initFromXML(node, parent);
         
         return button;
 }
 
+void LLButton::setHelpURLCallback(std::string help_url)
+{
+        mHelpURL = help_url;
+        setClickedCallback(clicked_help,this);
+}