1 files changed, 164 insertions, 44 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 2b63a24..b121b1a 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -36,11 +36,11 @@
 
 #include "indra_constants.h"
 #include "llclickaction.h"
-#include "llmediabase.h"        // for status codes
 #include "llparcel.h"
 
 #include "llagent.h"
 #include "llviewercontrol.h"
+#include "llfocusmgr.h"
 #include "llfirstuse.h"
 #include "llfloateravatarinfo.h"
 #include "llfloaterland.h"
@@ -63,6 +63,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerwindow.h"
 #include "llviewermedia.h"
+#include "llviewermediafocus.h"
 #include "llvoavatar.h"
 #include "llworld.h"
 #include "llui.h"
@@ -72,13 +73,15 @@ extern void handle_buy(void*);
 
 extern BOOL gDebugClicks;
 
+static bool handle_media_click(const LLPickInfo& info);
+static bool handle_media_hover(const LLPickInfo& info);
 static void handle_click_action_play();
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp);
 static ECursorType cursor_from_parcel_media(U8 click_action);
 
 
 LLToolPie::LLToolPie()
-:       LLTool(std::string("Select")),
+:       LLTool(std::string("Pie")),
         mPieMouseButtonDown( FALSE ),
         mGrabMouseButtonDown( FALSE ),
         mMouseOutsideSlop( FALSE ),
@@ -110,6 +113,10 @@ BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return FALSE;
 }
 
+BOOL LLToolPie::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+        return LLViewerMediaFocus::getInstance()->handleScrollWheel(x, y, clicks);
+}
 // static
 void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
 {
@@ -143,6 +150,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         }
                 }
 
+                gFocusMgr.setKeyboardFocus(NULL);
                 return LLTool::handleMouseDown(x, y, mask);
         }
 
@@ -161,9 +169,11 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                 parent = object->getRootEdit();
         }
 
+
         BOOL touchable = (object && object->flagHandleTouch()) 
                                          || (parent && parent->flagHandleTouch());
 
+
         // If it's a left-click, and we have a special action, do it.
         if (useClickAction(always_show, mask, object, parent))
         {
@@ -195,6 +205,8 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting
                         {
                                 handle_sit_or_stand();
+                                // put focus in world when sitting on an object
+                                gFocusMgr.setKeyboardFocus(NULL);
                                 return TRUE;
                         } // else nothing (fall through to touch)
                         
@@ -247,6 +259,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                 }
         }
 
+        if (!always_show && handle_media_click(mPick))
+        {
+                return FALSE;
+        }
+
+        // put focus back "in world"
+        gFocusMgr.setKeyboardFocus(NULL);
+
         // Switch to grab tool if physical or triggerable
         if (object && 
                 !object->isAvatar() && 
@@ -614,41 +634,46 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
                 mMouseOutsideSlop = TRUE;
         }
         */
+
         
+        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+
         LLViewerObject *object = NULL;
         LLViewerObject *parent = NULL;
-        if (gHoverView)
-        {
-                object = gViewerWindow->getHoverPick().getObject();
-        }
+        object = gViewerWindow->getHoverPick().getObject();
 
         if (object)
         {
                 parent = object->getRootEdit();
-        }
 
-        if (object && useClickAction(FALSE, mask, object, parent))
-        {
-                ECursorType cursor = cursor_from_object(object);
-                gViewerWindow->getWindow()->setCursor(cursor);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
-        }
-        else if ((object && !object->isAvatar() && object->usePhysics()) 
-                         || (parent && !parent->isAvatar() && parent->usePhysics()))
-        {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
-        }
-        else if ( (object && object->flagHandleTouch()) 
-                          || (parent && parent->flagHandleTouch()))
-        {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
+                if (object && useClickAction(FALSE, mask, object, parent))
+                {
+                        ECursorType cursor = cursor_from_object(object);
+                        gViewerWindow->getWindow()->setCursor(cursor);
+                }
+                else if (handle_media_hover(gViewerWindow->getHoverPick()))
+                {
+                        // cursor set by media object
+                }
+                else if ((object && !object->isAvatar() && object->usePhysics()) 
+                                 || (parent && !parent->isAvatar() && parent->usePhysics()))
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
+                }
+                else if ( (object && object->flagHandleTouch()) 
+                                  || (parent && parent->flagHandleTouch()))
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
+                }
         }
         else
         {
-                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-                lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
+                // We need to clear media hover flag
+                if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
+                {
+                        LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+                }
+
         }
 
         return TRUE;
@@ -830,14 +855,14 @@ static void handle_click_action_play()
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if (!parcel) return;
 
-        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
+        LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
         switch(status)
         {
-                case LLMediaBase::STATUS_STARTED:
+                case LLViewerMediaImpl::MEDIA_PLAYING:
                         LLViewerParcelMedia::pause();
                         break;
 
-                case LLMediaBase::STATUS_PAUSED:
+                case LLViewerMediaImpl::MEDIA_PAUSED:
                         LLViewerParcelMedia::start();
                         break;
 
@@ -847,6 +872,111 @@ static void handle_click_action_play()
         }
 }
 
+static bool handle_media_click(const LLPickInfo& pick)
+{
+        //FIXME: how do we handle object in different parcel than us?
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        LLPointer<LLViewerObject> objectp = pick.getObject();
+
+
+        if (!parcel ||
+                objectp.isNull() ||
+                pick.mObjectFace < 0 || 
+                pick.mObjectFace >= objectp->getNumTEs()) 
+        {
+                LLSelectMgr::getInstance()->deselect();
+                LLViewerMediaFocus::getInstance()->clearFocus();
+
+                return false;
+        }
+
+
+
+        // HACK: This is directly referencing an impl name.  BAD!
+        // This can be removed when we have a truly generic media browser that only 
+        // builds an impl based on the type of url it is passed.
+
+        // is media playing on this face?
+        const LLTextureEntry* tep = objectp->getTE(pick.mObjectFace);
+
+        viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
+        if (tep
+                && media_impl.notNull()
+                && media_impl->hasMedia()
+                && gSavedSettings.getBOOL("MediaOnAPrimUI"))
+        {
+                LLObjectSelectionHandle selection = LLViewerMediaFocus::getInstance()->getSelection(); 
+                if (! selection->contains(pick.getObject(), pick.mObjectFace))
+                {
+                        LLViewerMediaFocus::getInstance()->setFocusFace(TRUE, pick.getObject(), pick.mObjectFace, media_impl);
+                }
+                else
+                {
+                        media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY);
+                        media_impl->mouseCapture(); // the mouse-up will happen when capture is lost
+                }
+
+                return true;
+        }
+
+        LLSelectMgr::getInstance()->deselect();
+        LLViewerMediaFocus::getInstance()->clearFocus();
+
+        return false;
+}
+
+static bool handle_media_hover(const LLPickInfo& pick)
+{
+        //FIXME: how do we handle object in different parcel than us?
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if (!parcel) return false;
+
+        LLPointer<LLViewerObject> objectp = pick.getObject();
+
+        // Early out cases.  Must clear mouse over media focus flag
+        // did not hit an object or did not hit a valid face
+        if ( objectp.isNull() ||
+                pick.mObjectFace < 0 || 
+                pick.mObjectFace >= objectp->getNumTEs() )
+        {
+                LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+                return false;
+        }
+
+
+        // HACK: This is directly referencing an impl name.  BAD!
+        // This can be removed when we have a truly generic media browser that only 
+        // builds an impl based on the type of url it is passed.
+
+        // is media playing on this face?
+        const LLTextureEntry* tep = objectp->getTE(pick.mObjectFace);
+        viewer_media_t media_impl = LLViewerMedia::getMediaImplFromTextureID(tep->getID());
+        if (tep
+                && media_impl.notNull()
+                && media_impl->hasMedia()
+                && gSavedSettings.getBOOL("MediaOnAPrimUI"))
+        {
+                if(LLViewerMediaFocus::getInstance()->getFocus())
+                {
+                        media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY);
+                }
+
+                // Set mouse over flag if unset
+                if (! LLViewerMediaFocus::getInstance()->getMouseOverFlag())
+                {
+                        LLSelectMgr::getInstance()->setHoverObject(objectp, pick.mObjectFace);
+                        LLViewerMediaFocus::getInstance()->setMouseOverFlag(true, media_impl);
+                        LLViewerMediaFocus::getInstance()->setPickInfo(pick);
+                }
+
+                return true;
+        }
+        LLViewerMediaFocus::getInstance()->setMouseOverFlag(false);
+
+        return false;
+}
+
+
 static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 {
         //FIXME: how do we handle object in different parcel than us?
@@ -861,7 +991,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
         if( face < 0 || face >= objectp->getNumTEs() ) return;
                 
         // is media playing on this face?
-        if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(face)->getID()))
+        if (LLViewerMedia::getMediaImplFromTextureID(objectp->getTE(face)->getID()) != NULL)
         {
                 handle_click_action_play();
                 return;
@@ -879,10 +1009,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
         // This can be removed when we have a truly generic media browser that only 
         // builds an impl based on the type of url it is passed.
 
-        if(     LLMediaManager::getInstance()->supportsMediaType( "LLMediaImplLLMozLib", media_scheme, media_type ) )
-        {
-                LLWeb::loadURL(media_url);
-        }
+        LLWeb::loadURL(media_url);
 }
 
 static ECursorType cursor_from_parcel_media(U8 click_action)
@@ -900,19 +1027,12 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
         std::string media_type = std::string ( parcel->getMediaType() );
         LLStringUtil::trim(media_url);
 
-        // Get the scheme, see if that is handled as well.
-        LLURI uri(media_url);
-        std::string media_scheme = uri.scheme() != "" ? uri.scheme() : "http";
-
-        if(     LLMediaManager::getInstance()->supportsMediaType( "LLMediaImplLLMozLib", media_scheme, media_type ) )
-        {
-                open_cursor = UI_CURSOR_TOOLMEDIAOPEN;
-        }
+        open_cursor = UI_CURSOR_TOOLMEDIAOPEN;
 
-        LLMediaBase::EStatus status = LLViewerParcelMedia::getStatus();
+        LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
         switch(status)
         {
-                case LLMediaBase::STATUS_STARTED:
+                case LLViewerMediaImpl::MEDIA_PLAYING:
                         return click_action == CLICK_ACTION_PLAY ? UI_CURSOR_TOOLPAUSE : open_cursor;
                 default:
                         return UI_CURSOR_TOOLPLAY;