Bug # 118212: window mediator RDF changes to support keyboard. r=tingley sr=waterson

xpfe/appshell/src/nsWindowMediator.cpp

@@ -81,6 +81,7 @@ static const char kURINC_WindowMediatorRoot[] = "NC:WindowMediatorRoot";
 
 DEFINE_RDF_VOCAB(NC_NAMESPACE_URI, NC, Name);
 DEFINE_RDF_VOCAB(NC_NAMESPACE_URI, NC, URL);
+DEFINE_RDF_VOCAB(NC_NAMESPACE_URI, NC, KeyIndex);
 static	nsIRDFService* gRDFService = nsnull;
 
 static nsresult GetDOMWindow( nsIXULWindow* inWindow,
@@ -183,6 +184,7 @@ PRUint32 GetWindowZ(nsIXULWindow *inWindow)
 nsIRDFResource	*nsWindowMediator::kNC_WindowMediatorRoot = NULL;
 nsIRDFResource	*nsWindowMediator::kNC_Name = NULL;
 nsIRDFResource	*nsWindowMediator::kNC_URL = NULL;
+nsIRDFResource	*nsWindowMediator::kNC_KeyIndex = NULL;
 
 PRInt32		nsWindowMediator::gRefCnt;
 nsIRDFDataSource *nsWindowMediator::mInner = NULL;
@@ -217,6 +219,7 @@ nsWindowMediator::~nsWindowMediator()
     NS_IF_RELEASE(kNC_WindowMediatorRoot);
     NS_IF_RELEASE(kNC_Name);
     NS_IF_RELEASE(kNC_URL);
+    NS_IF_RELEASE(kNC_KeyIndex);
     NS_IF_RELEASE(mInner);
     if (mListLock)
       PR_DestroyLock(mListLock);
@@ -815,8 +818,9 @@ nsWindowMediator::Init()
     if (NS_FAILED(rv)) return rv;
 
       gRDFService->GetResource( kURINC_WindowMediatorRoot,   &kNC_WindowMediatorRoot );
-      gRDFService->GetResource (kURINC_Name, &kNC_Name );
+      gRDFService->GetResource( kURINC_Name, &kNC_Name );
       gRDFService->GetResource( kURINC_URL, &kNC_URL );
+      gRDFService->GetResource( kURINC_KeyIndex, &kNC_KeyIndex );
     }
 
     if (NS_FAILED(rv = nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID,
@@ -845,6 +849,36 @@ nsWindowMediator::Init()
     return gRDFService->RegisterDataSource(this, PR_FALSE);
 }
 
+NS_IMETHODIMP nsWindowMediator::GetTarget(nsIRDFResource* source,
+                                          nsIRDFResource* property,
+                                          PRBool tv,
+                                          nsIRDFNode** target)
+{
+    if (property == kNC_KeyIndex)
+    {
+        nsCOMPtr<nsIRDFContainer> container;
+        nsresult rv = NS_NewMediatorListRDFContainer(mInner,
+            kNC_WindowMediatorRoot, getter_AddRefs(container));
+        if (NS_FAILED(rv)) return(rv);
+        if (!container) return(NS_ERROR_FAILURE);
+
+        PRInt32   theIndex = 0;
+        rv = container->IndexOf(source, &theIndex);
+        if (NS_FAILED(rv)) return(rv);
+
+        // only allow the range of 1 to 9 for single key access        
+        if (theIndex < 1 || theIndex > 9) return(NS_RDF_NO_VALUE);
+
+        nsCOMPtr<nsIRDFInt> indexInt;
+        rv = gRDFService->GetIntLiteral(theIndex, getter_AddRefs(indexInt));
+        if (NS_FAILED(rv)) return(rv);
+        if (!indexInt) return(NS_ERROR_FAILURE);
+
+        return(CallQueryInterface(indexInt, target));
+    }
+    return mInner->GetTarget(source, property, tv, target);
+}
+
 NS_IMETHODIMP nsWindowMediator::Assert(nsIRDFResource* aSource,
                                nsIRDFResource* aProperty,
                                nsIRDFNode* aTarget,

xpfe/appshell/src/nsWindowMediator.h

@@ -109,14 +109,6 @@ public:
       return mInner->GetSources(property, target, tv, sources);
   }
 
-  NS_IMETHOD GetTarget(nsIRDFResource* source,
-                       nsIRDFResource* property,
-                       PRBool tv,
-                       nsIRDFNode** target)
- {
-   return mInner->GetTarget(source, property, tv, target);
- }
-
  	NS_IMETHOD GetTargets(nsIRDFResource* source,
                         nsIRDFResource* property,
                         PRBool tv,
@@ -125,6 +117,11 @@ public:
       return mInner->GetTargets(source, property, tv, targets);
   }
 
+  NS_IMETHOD GetTarget(nsIRDFResource* aSource, 
+                    nsIRDFResource* aProperty, 
+                    PRBool aTruthValue,
+                    nsIRDFNode** target);
+
   NS_IMETHOD Assert(nsIRDFResource* aSource, 
                     nsIRDFResource* aProperty, 
                     nsIRDFNode* aTarget,
@@ -220,6 +217,7 @@ private:
   static nsIRDFResource* kNC_WindowMediatorRoot;
   static nsIRDFResource* kNC_Name;
   static nsIRDFResource* kNC_URL;
+  static nsIRDFResource* kNC_KeyIndex;
   static PRInt32 gRefCnt;
   static nsIRDFDataSource* mInner;
 };