1 files changed, 39 insertions, 10 deletions

diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index aaeb25a..88ede1a 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -37,10 +37,39 @@
 
 #include "llstring.h"
 #include "llframetimer.h"
-#include "llview.h"
+#include "llui.h"
 
 class LLUICtrl;
 class LLMouseHandler;
+class LLView;
+
+class LLFocusableElement
+{
+        friend class LLFocusMgr; // allow access to focus change handlers
+public:
+        LLFocusableElement();
+        virtual ~LLFocusableElement();
+
+        virtual void    setFocus( BOOL b );
+        virtual BOOL    hasFocus() const;
+
+        void                    setFocusLostCallback(void (*cb)(LLFocusableElement* caller, void*), void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusReceivedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL)       { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusChangedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL )               { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
+
+        // These were brought up the hierarchy from LLView so that we don't have to use dynamic_cast when dealing with keyboard focus.
+        virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
+        virtual BOOL    handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
+
+protected:      
+        virtual void    onFocusReceived();
+        virtual void    onFocusLost();
+        void                    (*mFocusLostCallback)( LLFocusableElement* caller, void* userdata );
+        void                    (*mFocusReceivedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void                    (*mFocusChangedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void*                   mFocusCallbackUserData;
+};
+
 
 class LLFocusMgr
 {
@@ -55,11 +84,11 @@ public:
         BOOL                    childHasMouseCapture( const LLView* parent ) const;
 
         // Keyboard Focus
-        void                    setKeyboardFocus(LLUICtrl* new_focus, BOOL lock = FALSE, BOOL keystrokes_only = FALSE);         // new_focus = NULL to release the focus.
-        LLUICtrl*               getKeyboardFocus() const { return mKeyboardFocus; }  
-        LLUICtrl*               getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
+        void                    setKeyboardFocus(LLFocusableElement* new_focus, BOOL lock = FALSE, BOOL keystrokes_only = FALSE);               // new_focus = NULL to release the focus.
+        LLFocusableElement*             getKeyboardFocus() const { return mKeyboardFocus; }  
+        LLFocusableElement*             getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
         BOOL                    childHasKeyboardFocus( const LLView* parent ) const;
-        void                    removeKeyboardFocusWithoutCallback( const LLView* focus );
+        void                    removeKeyboardFocusWithoutCallback( const LLFocusableElement* focus );
         BOOL                    getKeystrokesOnly() { return mKeystrokesOnly; }
         void                    setKeystrokesOnly(BOOL keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
 
@@ -75,8 +104,8 @@ public:
 
         // If setKeyboardFocus(NULL) is called, and there is a non-NULL default
         // keyboard focus view, focus goes there. JC
-        void                    setDefaultKeyboardFocus(LLUICtrl* default_focus) { mDefaultKeyboardFocus = default_focus; }
-        LLUICtrl*               getDefaultKeyboardFocus() const { return mDefaultKeyboardFocus; }
+        void                    setDefaultKeyboardFocus(LLFocusableElement* default_focus) { mDefaultKeyboardFocus = default_focus; }
+        LLFocusableElement*             getDefaultKeyboardFocus() const { return mDefaultKeyboardFocus; }
 
         
         // Top View
@@ -98,9 +127,9 @@ private:
         LLMouseHandler*         mMouseCaptor;                           // Mouse events are premptively routed to this object
 
         // Keyboard Focus
-        LLUICtrl*                       mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
-        LLUICtrl*                       mLastKeyboardFocus;                     // who last had focus
-        LLUICtrl*                       mDefaultKeyboardFocus;
+        LLFocusableElement*     mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
+        LLFocusableElement*     mLastKeyboardFocus;                     // who last had focus
+        LLFocusableElement*     mDefaultKeyboardFocus;
         BOOL                            mKeystrokesOnly;
 
         // Top View