This commit was manufactured by cvs2svn to create branch 'CVS'.

git-svn-id: svn://10.0.0.236/branches/CVS@50735 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/parser/htmlparser/src/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/parser/htmlparser/src/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/string/obsolete/nsStr.cpp

@@ -0,0 +1,717 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL. 
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+  
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the nsStr data structure.
+  This general purpose buffer management class is used as the basis for our strings.
+  It's benefits include:
+    1. An efficient set of library style functions for manipulating nsStrs
+    2. Support for 1 and 2 byte character strings (which can easily be increased to n)
+    3. Unicode awareness and interoperability.
+
+*******************************************************************************************/
+
+#include "nsStr.h"
+#include "bufferRoutines.h"
+#include "stdio.h"  //only used for printf
+#include "nsCRT.h"
+#include "nsDeque.h"
+
+ 
+//static const char* kCallFindChar =  "For better performance, call FindChar() for targets whose length==1.";
+//static const char* kCallRFindChar = "For better performance, call RFindChar() for targets whose length==1.";
+
+static const PRUnichar gCommonEmptyBuffer[1] = {0};
+
+/**
+ * This method initializes all the members of the nsStr structure 
+ *
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,eCharSize aCharSize) {
+  aDest.mStr=(char*)gCommonEmptyBuffer;
+  aDest.mLength=0;
+  aDest.mCapacity=0;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=0;
+}
+
+/**
+ * This method initializes all the members of the nsStr structure
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer){
+  aDest.mStr=(aCString) ? aCString : (char*)gCommonEmptyBuffer;
+  aDest.mLength=aLength;
+  aDest.mCapacity=aCapacity;
+  aDest.mCharSize=aCharSize;
+  aDest.mOwnsBuffer=aOwnsBuffer;
+}
+
+
+/**
+ * This member destroys the memory buffer owned by an nsStr object (if it actually owns it)
+ * @update	gess10/30/98
+ * @param 
+ * @return
+ */
+void nsStr::Destroy(nsStr& aDest) {
+  if((aDest.mStr) && (aDest.mStr!=(char*)gCommonEmptyBuffer)) {
+    Free(aDest);
+  }
+}
+
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents are not preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::EnsureCapacity(nsStr& aString,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aString.mCapacity) {
+    result=Realloc(aString,aNewLength);
+    if(aString.mStr)
+      AddNullTerminator(aString);
+  }
+  return result;
+}
+
+/**
+ * This method gets called when the internal buffer needs
+ * to grow to a given size. The original contents ARE preserved.
+ * @update  gess 3/30/98
+ * @param   aNewLength -- new capacity of string in charSize units
+ * @return  void
+ */
+PRBool nsStr::GrowCapacity(nsStr& aDest,PRUint32 aNewLength) {
+  PRBool result=PR_TRUE;
+  if(aNewLength>aDest.mCapacity) {
+    nsStr theTempStr;
+    nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+    result=EnsureCapacity(theTempStr,aNewLength);
+    if(result) {
+      if(aDest.mLength) {
+        Append(theTempStr,aDest,0,aDest.mLength);        
+      } 
+      Free(aDest);
+      aDest.mStr = theTempStr.mStr;
+      theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+      aDest.mLength=theTempStr.mLength;
+      aDest.mCapacity=theTempStr.mCapacity;
+      aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+    }
+  }
+  return result;
+}
+
+/**
+ * Replaces the contents of aDest with aSource, up to aCount of chars.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed.
+ * @param   aSource is where chars are copied from
+ * @param   aCount is the number of chars copied from aSource
+ */
+void nsStr::Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(&aDest!=&aSource){
+    Truncate(aDest,0);
+    Append(aDest,aSource,anOffset,aCount);
+  }
+}
+
+/**
+ * This method appends the given nsStr to this one. Note that we have to 
+ * pay attention to the underlying char-size of both structs.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aSource is where char are copied from
+ * @aCount  is the number of bytes to be copied 
+ */
+void nsStr::Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount){
+  if(anOffset<aSource.mLength){
+    PRUint32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+    PRUint32 theLength=(anOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-anOffset);
+    if(0<theLength){
+      
+      PRBool isBigEnough=PR_TRUE;
+      if(aDest.mLength+theLength > aDest.mCapacity) {
+        isBigEnough=GrowCapacity(aDest,aDest.mLength+theLength);
+      }
+
+      if(isBigEnough) {
+        //now append new chars, starting at offset
+        (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDest.mLength,aSource.mStr,anOffset,theLength);
+
+        aDest.mLength+=theLength;
+        AddNullTerminator(aDest);
+      }
+    }
+  }
+}
+
+
+/**
+ * This method inserts up to "aCount" chars from a source nsStr into a dest nsStr.
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr that gets changed
+ * @param   aDestOffset is where in aDest the insertion is to occur
+ * @param   aSource is where chars are copied from
+ * @param   aSrcOffset is where in aSource chars are copied from
+ * @param   aCount is the number of chars from aSource to be inserted into aDest
+ */
+void nsStr::Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount){
+  //there are a few cases for insert:
+  //  1. You're inserting chars into an empty string (assign)
+  //  2. You're inserting onto the end of a string (append)
+  //  3. You're inserting onto the 1..n-1 pos of a string (the hard case).
+  if(0<aSource.mLength){
+    if(aDest.mLength){
+      if(aDestOffset<aDest.mLength){
+        PRInt32 theRealLen=(aCount<0) ? aSource.mLength : MinInt(aCount,aSource.mLength);
+        PRInt32 theLength=(aSrcOffset+theRealLen<aSource.mLength) ? theRealLen : (aSource.mLength-aSrcOffset);
+
+        if(aSrcOffset<aSource.mLength) {
+            //here's the only new case we have to handle. 
+            //chars are really being inserted into our buffer...
+
+          if(aDest.mLength+theLength > aDest.mCapacity) {
+            nsStr theTempStr;
+            nsStr::Initialize(theTempStr,aDest.mCharSize);
+
+            PRBool isBigEnough=EnsureCapacity(theTempStr,aDest.mLength+theLength);  //grow the temp buffer to the right size
+
+            if(isBigEnough) {
+              if(aDestOffset) {
+                Append(theTempStr,aDest,0,aDestOffset); //first copy leftmost data...
+              } 
+              
+              Append(theTempStr,aSource,0,aSource.mLength); //next copy inserted (new) data
+            
+              PRUint32 theRemains=aDest.mLength-aDestOffset;
+              if(theRemains) {
+                Append(theTempStr,aDest,aDestOffset,theRemains); //next copy rightmost data
+              }
+
+              Free(aDest);
+              aDest.mStr = theTempStr.mStr;
+              theTempStr.mStr=0; //make sure to null this out so that you don't lose the buffer you just stole...
+              aDest.mCapacity=theTempStr.mCapacity;
+              aDest.mOwnsBuffer=theTempStr.mOwnsBuffer;
+            }
+
+          }
+
+          else {
+              //shift the chars right by theDelta...
+            (*gShiftChars[aDest.mCharSize][KSHIFTRIGHT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      
+            //now insert new chars, starting at offset
+            (*gCopyChars[aSource.mCharSize][aDest.mCharSize])(aDest.mStr,aDestOffset,aSource.mStr,aSrcOffset,theLength);
+          }
+
+            //finally, make sure to update the string length...
+          aDest.mLength+=theLength;
+          AddNullTerminator(aDest);
+
+        }//if
+        //else nothing to do!
+      }
+      else Append(aDest,aSource,0,aCount);
+    }
+    else Append(aDest,aSource,0,aCount);
+  }
+}
+
+
+/**
+ * This method deletes up to aCount chars from aDest
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be manipulated
+ * @param   aDestOffset is where in aDest deletion is to occur
+ * @param   aCount is the number of chars to be deleted in aDest
+ */
+void nsStr::Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount){
+  if(aDestOffset<aDest.mLength){
+
+    PRUint32 theDelta=aDest.mLength-aDestOffset;
+    PRUint32 theLength=(theDelta<aCount) ? theDelta : aCount;
+
+    if(aDestOffset+theLength<aDest.mLength) {
+
+      //if you're here, it means we're cutting chars out of the middle of the string...
+      //so shift the chars left by theLength...
+      (*gShiftChars[aDest.mCharSize][KSHIFTLEFT])(aDest.mStr,aDest.mLength,aDestOffset,theLength);
+      aDest.mLength-=theLength;
+      AddNullTerminator(aDest);
+    }
+    else Truncate(aDest,aDestOffset);
+  }//if
+}
+
+/**
+ * This method truncates the given nsStr at given offset
+ * @update	gess10/30/98
+ * @param   aDest is the nsStr to be truncated
+ * @param   aDestOffset is where in aDest truncation is to occur
+ */
+void nsStr::Truncate(nsStr& aDest,PRUint32 aDestOffset){
+  if(aDestOffset<aDest.mLength){
+    aDest.mLength=aDestOffset;
+    AddNullTerminator(aDest);
+  }
+}
+
+
+/**
+ * This method forces the given string to upper or lowercase
+ * @update	gess1/7/99
+ * @param   aDest is the string you're going to change
+ * @param   aToUpper: if TRUE, then we go uppercase, otherwise we go lowercase
+ * @return
+ */
+void nsStr::ChangeCase(nsStr& aDest,PRBool aToUpper) {
+  // somehow UnicharUtil return failed, fallback to the old ascii only code
+  gCaseConverters[aDest.mCharSize](aDest.mStr,aDest.mLength,aToUpper);
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+
+  if((aDest.mLength>0) && aSet){
+    PRInt32 theIndex=-1;
+    PRInt32 theMax=aDest.mLength;
+    PRInt32 theSetLen=nsCRT::strlen(aSet);
+
+    if(aEliminateLeading) {
+      while(++theIndex<=theMax) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound==thePos)
+          break;
+      }
+      if(0<theIndex) {
+        if(theIndex<theMax) {
+          Delete(aDest,0,theIndex);
+        }
+        else Truncate(aDest,0);
+      }
+    }
+
+    if(aEliminateTrailing) {
+      theIndex=aDest.mLength;
+      PRInt32 theNewLen=theIndex;
+      while(--theIndex>0) {
+        PRUnichar theChar=GetCharAt(aDest,theIndex);  //read at end now...
+        PRInt32 thePos=gFindChars[eOneByte](aSet,theSetLen,0,theChar,PR_FALSE);
+        if(kNotFound<thePos) 
+          theNewLen=theIndex;
+        else break;
+      }
+      if(theNewLen<theMax) {
+        Truncate(aDest,theNewLen);
+      }
+    }
+
+  }
+}
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing){
+  Trim(aDest,aSet,aEliminateLeading,aEliminateTrailing);
+  PRUint32 aNewLen=gCompressChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+  aDest.mLength=aNewLen;
+}
+
+
+/**
+ * 
+ * @update	gess1/7/99
+ * @param 
+ * @return
+ */
+void nsStr::StripChars(nsStr& aDest,const char* aSet){
+  if((0<aDest.mLength) && (aSet)) {
+    PRUint32 aNewLen=gStripChars[aDest.mCharSize](aDest.mStr,aDest.mLength,aSet);
+    aDest.mLength=aNewLen;
+  }
+}
+
+
+  /**************************************************************
+    Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  // NS_PRECONDITION(aTarget.mLength!=1,kCallFindChar);
+
+  PRInt32 result=kNotFound;
+  
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 theMax=aDest.mLength-aTarget.mLength;
+    PRInt32 index=(0<=anOffset) ? anOffset : 0;
+    
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+      PRInt32 theTargetMax=aTarget.mLength;
+      while(index<=theMax) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_TRUE;
+        while((++theSubIndex<theTargetMax) && (matches)){
+          PRUnichar theChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+          PRUnichar theTargetChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aTarget,theSubIndex)) : GetCharAt(aTarget,theSubIndex);
+          matches=PRBool(theChar==theTargetChar);
+        }
+        if(matches) { 
+          result=index;
+          break;
+        }
+        index++;
+      } //while
+    }//if
+  }//if
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? (PRUint32)anOffset : 0;
+    result=gFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+
+/**
+ *  This searches aDest for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset-1 : -1;
+  PRInt32 thePos;
+
+    //Note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if((0<aDest.mLength) && (0<aSet.mLength)){
+    while(++index<(PRInt32)aDest.mLength) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+  /**************************************************************
+    Reverse Searching methods...
+   **************************************************************/
+
+
+/**
+ *  This searches aDest (in reverse) for a given substring
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aTarget is the substring you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search (counting from left)
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindSubstr(const nsStr& aDest,const nsStr& aTarget, PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aTarget.mLength!=1,kCallRFindChar);
+
+  PRInt32 result=kNotFound;
+
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+
+    if((aDest.mLength>=aTarget.mLength) && (aTarget.mLength>0) && (index>=0)){
+
+      nsStr theCopy;
+      nsStr::Initialize(theCopy,eOneByte);
+      nsStr::Assign(theCopy,aTarget,0,aTarget.mLength);
+      if(aIgnoreCase){
+        nsStr::ChangeCase(theCopy,PR_FALSE); //force to lowercase
+      }
+    
+      PRInt32   theTargetMax=theCopy.mLength;
+      while(index>=0) {
+        PRInt32 theSubIndex=-1;
+        PRBool  matches=PR_FALSE;
+        if(index+theCopy.mLength<=aDest.mLength) {
+          matches=PR_TRUE;
+          while((++theSubIndex<theTargetMax) && (matches)){
+            PRUnichar theDestChar=(aIgnoreCase) ? nsCRT::ToLower(GetCharAt(aDest,index+theSubIndex)) : GetCharAt(aDest,index+theSubIndex);
+            PRUnichar theTargetChar=GetCharAt(theCopy,theSubIndex);
+            matches=PRBool(theDestChar==theTargetChar);
+          } //while
+        } //if
+        if(matches) {
+          result=index;
+          break;
+        }
+        index--;
+      } //while
+      nsStr::Destroy(theCopy);
+    }//if
+  }//if
+  return result;
+}
+ 
+
+/**
+ *  This searches aDest (in reverse) for a given character 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   char is the character you're trying to find.
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset) {
+  PRInt32 result=kNotFound;
+  if((0<aDest.mLength) && (anOffset<(PRInt32)aDest.mLength)) {
+    PRUint32 index=(0<=anOffset) ? anOffset : aDest.mLength-1;
+    result=gRFindChars[aDest.mCharSize](aDest.mStr,aDest.mLength,index,aChar,aIgnoreCase);
+  }
+  return result;
+}
+
+/**
+ *  This searches aDest (in reverese) for a character found in aSet. 
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest string to search
+ *  @param   aSet contains a list of chars to be searched for
+ *  @param   aIgnorecase indicates case sensitivity of search
+ *  @param   anOffset tells us where to start the search
+ *  @return  index in aDest where member of aSet occurs, or -1 if not found
+ */
+PRInt32 nsStr::RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset) {
+  //NS_PRECONDITION(aSet.mLength!=1,kCallRFindChar);
+
+  PRInt32 index=(0<=anOffset) ? anOffset : aDest.mLength;
+  PRInt32 thePos;
+
+    //note that the search is inverted here. We're scanning aDest, one char at a time
+    //but doing the search against the given set. That's why we use 0 as the offset below.
+  if(0<aDest.mLength) {
+    while(--index>=0) {
+      PRUnichar theChar=GetCharAt(aDest,index);
+      thePos=gFindChars[aSet.mCharSize](aSet.mStr,aSet.mLength,0,theChar,aIgnoreCase);
+      if(kNotFound!=thePos)
+        return index;
+    } //while
+  }
+  return kNotFound;
+}
+
+
+/**
+ * Compare source and dest strings, up to an (optional max) number of chars
+ * @param   aDest is the first str to compare
+ * @param   aSource is the second str to compare
+ * @param   aCount -- if (-1), then we use length of longer string; if (0<aCount) then it gives the max # of chars to compare
+ * @param   aIgnorecase tells us whether to search with case sensitivity
+ * @return  aDest<aSource=-1;aDest==aSource==0;aDest>aSource=1
+ */
+PRInt32 nsStr::Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase) {
+  PRInt32 result=0;
+
+  if(aCount) {
+    PRInt32 minlen=(aSource.mLength<aDest.mLength) ? aSource.mLength : aDest.mLength;
+
+    if(0==minlen) {
+      if ((aDest.mLength == 0) && (aSource.mLength == 0))
+        return 0;
+      if (aDest.mLength == 0)
+        return -1;
+      return 1;
+    }
+
+    PRInt32 maxlen=(aSource.mLength<aDest.mLength) ? aDest.mLength : aSource.mLength;
+    aCount = (aCount<0) ? maxlen : MinInt(aCount,maxlen);
+    result=(*gCompare[aDest.mCharSize][aSource.mCharSize])(aDest.mStr,aSource.mStr,aCount,aIgnoreCase);
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+PRBool nsStr::Alloc(nsStr& aDest,PRUint32 aCount) {
+
+  static int mAllocCount=0;
+  mAllocCount++;
+
+  //we're given the acount value in charunits; now scale up to next multiple.
+  PRUint32	theNewCapacity=kDefaultStringSize;
+  while(theNewCapacity<aCount){ 
+		theNewCapacity<<=1;
+  }
+
+  aDest.mCapacity=theNewCapacity++;
+  PRUint32 theSize=(theNewCapacity<<aDest.mCharSize);
+  aDest.mStr = (char*)nsAllocator::Alloc(theSize);
+
+  PRBool result=PR_FALSE;
+  if(aDest.mStr) {
+    aDest.mOwnsBuffer=1;
+    result=PR_TRUE;
+  }
+  return result;
+}
+
+PRBool nsStr::Free(nsStr& aDest){
+  if(aDest.mStr){
+    if(aDest.mOwnsBuffer){
+      nsAllocator::Free(aDest.mStr);
+    }
+    aDest.mStr=0;
+    aDest.mOwnsBuffer=0;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRBool nsStr::Realloc(nsStr& aDest,PRUint32 aCount){
+
+  nsStr temp;
+  memcpy(&temp,&aDest,sizeof(aDest));
+
+  PRBool result=Alloc(temp,aCount);
+  if(result) {
+    Free(aDest);
+    aDest.mStr=temp.mStr;
+    aDest.mCapacity=temp.mCapacity;
+    aDest.mOwnsBuffer=temp.mOwnsBuffer;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+CBufDescriptor::CBufDescriptor(char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_FALSE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const char* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eOneByte;
+  mStackBased=aStackBased;
+  mIsConst=PR_TRUE;
+  mLength=mCapacity=0;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+
+CBufDescriptor::CBufDescriptor(PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_FALSE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+CBufDescriptor::CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength) { 
+  mBuffer=(char*)aString;
+  mCharSize=eTwoByte;
+  mStackBased=aStackBased;
+  mLength=mCapacity=0;
+  mIsConst=PR_TRUE;
+  if(aString && aCapacity>1) {
+    mCapacity=aCapacity-1;
+    mLength=(-1==aLength) ? nsCRT::strlen(aString) : aLength;
+    if(mLength>PRInt32(mCapacity))
+      mLength=mCapacity;
+  }
+}
+
+//----------------------------------------------------------------------------------------
+
+

mozilla/string/obsolete/nsStr.h

@@ -0,0 +1,450 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+    1. There are two philosophies to building string classes:
+        A. Hide the underlying buffer & offer API's allow indirect iteration
+        B. Reveal underlying buffer, risk corruption, but gain performance
+        
+       We chose the option B for performance reasons. 
+
+    2  Our internal buffer always holds capacity+1 bytes.
+
+    The nsStr struct is a simple structure (no methods) that contains
+    the necessary info to be described as a string. This simple struct
+    is manipulated by the static methods provided in this class. 
+    (Which effectively makes this a library that works on structs).
+
+    There are also object-based versions called nsString and nsAutoString
+    which use nsStr but makes it look at feel like an object. 
+
+ ***********************************************************************/
+
+/***********************************************************************
+  ASSUMPTIONS:
+
+    1. nsStrings and nsAutoString are always null terminated. 
+    2. If you try to set a null char (via SetChar()) a new length is set
+    3. nsCStrings can be upsampled into nsString without data loss
+    4. Char searching is faster than string searching. Use char interfaces
+       if your needs will allow it.
+    5. It's easy to use the stack for nsAutostring buffer storage (fast too!).
+       See the CBufDescriptor class in this file.
+    6. It's ONLY ok to provide non-null-terminated buffers to Append() and Insert()
+       provided you specify a 0<n value for the optional count argument.
+    7. Downsampling from nsString to nsCString is lossy -- avoid it if possible!
+    8. Calls to ToNewCString() and ToNewUnicode() should be matched with calls to Recycle().
+
+ ***********************************************************************/
+
+
+/**********************************************************************************
+  
+ AND NOW FOR SOME GENERAL DOCUMENTATION ON STRING USAGE...
+
+    The fundamental datatype in the string library is nsStr. It's a structure that
+    provides the buffer storage and meta-info. It also provides a C-style library
+    of functions for direct manipulation (for those of you who prefer K&R to Bjarne). 
+
+    Here's a diagram of the class hierarchy: 
+
+      nsStr
+        |___nsString
+        |      |
+        |      ------nsAutoString
+        |
+        |___nsCString
+               |
+               ------nsCAutoString
+
+    Why so many string classes? The 4 variants give you the control you need to 
+    determine the best class for your purpose. There are 2 dimensions to this 
+    flexibility: 1) stack vs. heap; and 2) 1-byte chars vs. 2-byte chars.
+
+    Note: While nsAutoString and nsCAutoString begin life using stack-based storage,
+          they may not stay that way. Like all nsString classes, autostrings will
+          automatically grow to contain the data you provide. When autostrings
+          grow beyond their intrinsic buffer, they switch to heap based allocations.
+          (We avoid alloca to avoid considerable platform difficulties; see the 
+           GNU documentation for more details).
+
+    I should also briefly mention that all the string classes use a "memory agent" 
+    object to perform memory operations. This class proxies the standard nsAllocator
+    for actual memory calls, but knows the structure of nsStr making heap operations
+    more localized.
+    
+
+  CHOOSING A STRING CLASS:
+
+    In order to choose a string class for you purpose, use this handy table:
+
+                        heap-based    stack-based
+                    -----------------------------------
+        ascii data  |   nsCString     nsCAutoString   |
+                    |----------------------------------
+      unicode data  |    nsString      nsAutoString   |
+                    ----------------------------------- 
+    
+  
+    Note: The i18n folks will stenuously object if we get too carried away with the
+          use of nsCString's that pass interface boundaries. Try to limit your
+          use of these to external interfaces that demand them, or for your own
+          private purposes in cases where they'll never be seen by humans. 
+
+    
+  PERFORMANCE CONSIDERATIONS:
+
+    Here are a few tricks to know in order to get better string performance: 
+    
+      1) Try to limit conversions between ascii and unicode; By sticking with nsString
+         wherever possible your code will be i18n-compliant.
+
+
+      2) Preallocating your string buffer cuts down trips to the allocator. So if you
+         have need for an arbitrarily large buffer, pre-size it like this:
+
+         {
+           nsString mBuffer;
+           mBuffer.SetCapacity(aReasonableSize);
+         }
+
+      3) Allocating nsAutoString or nsCAutoString on the heap is memory inefficient
+         (after all, the whole point is to avoid a heap allocation of the buffer).
+
+
+      4) Consider using an autoString to write into your arbitrarily-sized stack buffers, rather
+         than it's own buffers.
+
+         For example, let's say you're going to call printf() to emit pretty-printed debug output 
+         of your object. You know from experience that the pretty-printed version of your object 
+         exceeds the capacity of an autostring. Ignoring memory considerations, you could simply 
+         use nsCString, appending the stringized version of each of your class's data members. 
+         This will probably result in calls to the heap manager. 
+
+         But there's a way to do this without necessarily having to call the heap manager.
+         All you do is declare a stack based buffer and instruct nsCString to use that instead 
+         of it's own internal buffer by using the CBufDescriptor class:
+         
+         {
+           char theBuffer[256];
+           CBufDescritor theBufDecriptor( theBuffer, PR_TRUE, sizeof(theBuffer), 0);
+           nsCAutoString s3( theBufDescriptor );
+           s3="HELLO, my name is inigo montoya, you killed my father, prepare to die!.";
+         }
+
+         The assignment statment to s3 will cause the given string to be written to your
+         stack-based buffer via the normal nsString/nsCString interfaces. Cool, huh?  
+         Note however that just like any other nsStringXXX use, if you write more data 
+         than will fit in the buffer, a visit to the heap manager will be in order. 
+     
+
+ **********************************************************************************/
+
+
+#ifndef _nsStr
+#define _nsStr
+
+#include "nscore.h"
+#include "nsIAllocator.h"
+#include <string.h>
+
+//----------------------------------------------------------------------------------------
+
+enum  eCharSize {eOneByte=0,eTwoByte=1};
+#define kDefaultCharSize eTwoByte
+#define kRadix10        (10)
+#define kRadix16        (16)
+#define kAutoDetect     (100)
+#define kRadixUnknown   (kAutoDetect+1)
+const   PRInt32 kDefaultStringSize = 64;
+const   PRInt32 kNotFound = -1;
+
+
+//----------------------------------------------------------------------------------------
+
+class NS_COM CBufDescriptor {
+public:
+  CBufDescriptor(char* aString,           PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const char* aString,     PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(PRUnichar* aString,      PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+  CBufDescriptor(const PRUnichar* aString,PRBool aStackBased,PRUint32 aCapacity,PRInt32 aLength=-1);
+
+  char*     mBuffer;
+  eCharSize mCharSize;
+  PRUint32  mCapacity;
+  PRInt32   mLength;
+  PRBool    mStackBased;
+  PRBool    mIsConst;
+};
+
+//----------------------------------------------------------------------------------------
+
+
+struct NS_COM nsStr {  
+
+//----------------------------------------------------------------------------------------
+
+  nsStr() {
+    MOZ_COUNT_CTOR(nsStr);
+  }
+
+  ~nsStr() {
+    MOZ_COUNT_DTOR(nsStr);
+  }
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,eCharSize aCharSize);
+
+ /**
+  * This method initializes an nsStr for use
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be initialized
+  * @param  aCharSize tells us the requested char size (1 or 2 bytes)
+  */
+  static void Initialize(nsStr& aDest,char* aCString,PRUint32 aCapacity,PRUint32 aLength,eCharSize aCharSize,PRBool aOwnsBuffer);
+
+ /**
+  * This method destroys the given nsStr, and *MAY* 
+  * deallocate it's memory depending on the setting
+  * of the internal mOwnsBUffer flag.
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used to the nsStr
+  */
+  static void Destroy(nsStr& aDest); 
+
+ /**
+  * These methods are where memory allocation/reallocation occur. 
+  *
+  * @update	gess 01/04/99
+  * @param  aString is the nsStr to be manipulated
+  * @param  anAgent is the allocator to be used on the nsStr
+  * @return  
+  */
+  static PRBool EnsureCapacity(nsStr& aString,PRUint32 aNewLength);
+  static PRBool GrowCapacity(nsStr& aString,PRUint32 aNewLength);
+
+ /**
+  * These methods are used to append content to the given nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Append(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to assign contents of a source string to dest string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aSource is the buffer to be copied from
+  * @param  anOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to copy
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Assign(nsStr& aDest,const nsStr& aSource,PRUint32 anOffset,PRInt32 aCount);
+
+ /**
+  * These methods are used to insert content from source string to the dest nsStr
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  aCount tells us the (max) # of chars to insert
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Insert( nsStr& aDest,PRUint32 aDestOffset,const nsStr& aSource,PRUint32 aSrcOffset,PRInt32 aCount);
+
+ /**
+  * This method deletes chars from the given str. 
+  * The given allocator may choose to resize the str as well.
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be deleted from
+  * @param  aDestOffset tells us where in dest to start deleting
+  * @param  aCount tells us the (max) # of chars to delete
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Delete(nsStr& aDest,PRUint32 aDestOffset,PRUint32 aCount);
+
+ /**
+  * This method is used to truncate the given string.
+  * The given allocator may choose to resize the str as well (but it's not likely).
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be appended to
+  * @param  aDestOffset tells us where in dest to start insertion
+  * @param  aSource is the buffer to be copied from
+  * @param  aSrcOffset tells us where in source to start copying
+  * @param  anAgent is the allocator to be used for alloc/free operations
+  */
+  static void Truncate(nsStr& aDest,PRUint32 aDestOffset);
+
+ /**
+  * This method is used to perform a case conversion on the given string
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be case shifted
+  * @param  toUpper tells us to go upper vs. lower
+  */
+  static void ChangeCase(nsStr& aDest,PRBool aToUpper);
+
+
+  /**
+   * This method trims chars (given in aSet) from the edges of given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to remove from given buffer
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void Trim(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+  
+  /**
+   * This method compresses duplicate runs of a given char from the given buffer 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void CompressSet(nsStr& aDest,const char* aSet,PRBool aEliminateLeading,PRBool aEliminateTrailing);
+
+  /**
+   * This method removes all occurances of chars in given set from aDest 
+   *
+   * @update	gess 01/04/99
+   * @param   aDest is the buffer to be manipulated
+   * @param   aSet tells us which chars to compress from given buffer
+   * @param   aChar is the replacement char
+   * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+   * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+   */
+  static void StripChars(nsStr& aDest,const char* aSet);
+
+  /**
+   * This method compares the data bewteen two nsStr's 
+   *
+   * @update	gess 01/04/99
+   * @param   aStr1 is the first buffer to be compared
+   * @param   aStr2 is the 2nd buffer to be compared
+   * @param   aCount is the number of chars to compare
+   * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+   * @return  -1,0,1 depending on <,==,>
+   */
+  static PRInt32  Compare(const nsStr& aDest,const nsStr& aSource,PRInt32 aCount,PRBool aIgnoreCase);
+
+ /**
+  * These methods scan the given string for 1 or more chars in a given direction
+  *
+  * @update	gess 01/04/99
+  * @param  aDest is the nsStr to be searched to
+  * @param  aSource (or aChar) is the substr we're looking to find
+  * @param  aIgnoreCase tells us whether to search in a case-sensitive manner
+  * @param  anOffset tells us where in the dest string to start searching
+  * @return the index of the source (substr) in dest, or -1 (kNotFound) if not found.
+  */
+  static PRInt32 FindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 FindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+  static PRInt32 RFindSubstr(const nsStr& aDest,const nsStr& aSource, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindChar(const nsStr& aDest,PRUnichar aChar, PRBool aIgnoreCase,PRInt32 anOffset);
+  static PRInt32 RFindCharInSet(const nsStr& aDest,const nsStr& aSet,PRBool aIgnoreCase,PRInt32 anOffset);
+
+
+  PRUint32        mLength;
+  PRUint32        mCapacity;
+  eCharSize       mCharSize;
+  PRBool          mOwnsBuffer;
+
+  union { 
+    char*         mStr;
+    PRUnichar*    mUStr;
+  };
+
+private:
+  static PRBool Alloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Realloc(nsStr& aString,PRUint32 aCount);
+  static PRBool Free(nsStr& aString);
+
+};
+
+/**************************************************************
+  A couple of tiny helper methods used in the string classes.
+ **************************************************************/
+
+inline PRInt32 MinInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt1 : anInt2;
+}
+
+inline PRInt32 MaxInt(PRInt32 anInt1,PRInt32 anInt2){
+  return (anInt1<anInt2) ? anInt2 : anInt1;
+}
+
+inline void AddNullTerminator(nsStr& aDest) {
+  if(eTwoByte==aDest.mCharSize) 
+    aDest.mUStr[aDest.mLength]=0;
+  else aDest.mStr[aDest.mLength]=0;
+}
+
+/**
+ * Return the given buffer to the heap manager. Calls allocator::Free()
+ * @return string length
+ */
+inline void Recycle( char* aBuffer) { nsAllocator::Free(aBuffer); }
+inline void Recycle( PRUnichar* aBuffer) { nsAllocator::Free(aBuffer); }
+
+/**
+* This method is used to access a given char in the given string
+*
+* @update	gess 01/04/99
+* @param  aDest is the nsStr to be appended to
+* @param  anIndex tells us where in dest to get the char from
+* @return the given char, or 0 if anIndex is out of range
+*/
+inline PRUnichar GetCharAt(const nsStr& aDest,PRUint32 anIndex){
+  if(anIndex<aDest.mLength)  {
+    return (eTwoByte==aDest.mCharSize) ? aDest.mUStr[anIndex] : aDest.mStr[anIndex];
+  }//if
+  return 0;
+}
+
+
+#endif
+

mozilla/string/obsolete/nsString.h

@@ -0,0 +1,747 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsCString_
+#define _nsCString_
+
+#include "nsString2.h"
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsStr.h"
+#include "nsIAtom.h"
+
+
+class NS_COM nsSubsumeCStr;
+
+class NS_COM nsCString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsCString();
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsCString(const char* aCString,PRInt32 aLength=-1);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsCString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsCString
+   */
+  nsCString(const nsCString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsCString(nsSubsumeCStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsCString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string capacity
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Accessor methods...
+   *********************************************************************/
+
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String creation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new string
+   */
+  nsSubsumeCStr operator+(const nsCString& aString);
+
+  /**
+   * create a new string by adding this to the given char*.
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(const char* aCString);
+
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeCStr operator+(PRUnichar aChar);
+  nsSubsumeCStr operator+(char aChar);
+
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsCString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsCString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsCString& StripChars(const char* aSet);
+  nsCString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsCString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsCString& ReplaceChar(PRUnichar aOldChar,PRUnichar aNewChar);
+  nsCString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsCString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsCString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+      operator char*() {return mStr;}
+      operator const char*() const {return (const char*)mStr;}
+
+  /**
+   * This method constructs a new nsCString that is a clone
+   * of this string.
+   * 
+   */
+  nsCString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsCString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsCString& SetString(const nsStr& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsCString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsCString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsCString& Assign(PRUnichar aChar);
+  nsCString& Assign(char aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsCString& operator=(const nsCString& aString) {return Assign(aString);}
+  nsCString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsCString& operator=(char aChar) {return Assign(aChar);}
+  nsCString& operator=(const char* aCString) {return Assign(aCString);}
+  nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsCString& operator=(const nsSubsumeCStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsCString& operator=(nsSubsumeCStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsCString& operator+=(const nsCString& aString){return Append(aString,aString.mLength);}
+  nsCString& operator+=(const char* aCString) {return Append(aCString);}
+  nsCString& operator+=(PRUnichar aChar){return Append(aChar);}
+  nsCString& operator+=(char aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsCString& Append(const nsCString& aString,PRInt32 aCount);
+  nsCString& Append(const nsStr& aString,PRInt32 aCount=-1);
+  nsCString& Append(const char* aString,PRInt32 aCount=-1);
+  nsCString& Append(PRUnichar aChar);
+  nsCString& Append(char aChar);
+  nsCString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsCString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsCString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsCString& Insert(const nsCString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsCString& Insert(PRUnichar aChar,PRUint32 anOffset);
+  nsCString& Insert(char aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsCString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   * @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char* aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars in given string you want to compare
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  PRBool  EqualsIgnoreCase(const nsStr& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* aString,PRInt32 aCount=-1) const;
+
+
+  static  void        Recycle(nsCString* aString);
+  static  nsCString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsCString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsCString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsCAutoString : public nsCString {
+public: 
+
+    nsCAutoString();
+    nsCAutoString(const char* aString,PRInt32 aLength=-1);
+    nsCAutoString(const CBufDescriptor& aBuffer);
+    nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+    nsCAutoString(const nsStr& aString);
+    nsCAutoString(const nsCAutoString& aString);
+
+#ifdef AIX
+    nsCAutoString(const nsSubsumeCStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsCAutoString(nsSubsumeCStr& aSubsumeStr);
+#endif // AIX
+    nsCAutoString(PRUnichar aChar);
+    virtual ~nsCAutoString();
+
+    nsCAutoString& operator=(const nsCString& aString) {nsCString::Assign(aString); return *this;}
+    nsCAutoString& operator=(const char* aCString) {nsCString::Assign(aCString); return *this;}
+    nsCAutoString& operator=(PRUnichar aChar) {nsCString::Assign(aChar); return *this;}
+    nsCAutoString& operator=(char aChar) {nsCString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize];
+};
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeCStr : public nsCString {
+public:
+  nsSubsumeCStr(nsStr& aString);
+  nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+
+};
+
+
+#endif
+
+

mozilla/string/obsolete/nsString2.h

@@ -0,0 +1,840 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+
+/***********************************************************************
+  MODULE NOTES:
+
+  See nsStr.h for a more general description of string classes.
+
+  This version of the nsString class offers many improvements over the
+  original version:
+    1. Wide and narrow chars
+    2. Allocators
+    3. Much smarter autostrings
+    4. Subsumable strings
+ ***********************************************************************/
+
+
+#ifndef _nsString_
+#define _nsString_
+
+#include "prtypes.h"
+#include "nscore.h"
+#include <stdio.h>
+#include "nsString.h"
+#include "nsIAtom.h"
+#include "nsStr.h"
+#include "nsCRT.h"
+
+class nsISizeOfHandler;
+
+
+#define nsString2     nsString
+#define nsAutoString2 nsAutoString
+
+
+class NS_COM nsSubsumeStr;
+class NS_COM nsString : public nsStr {
+
+public: 
+
+  /**
+   * Default constructor. 
+   */
+  nsString();
+
+
+  /**
+   * This constructor accepts an isolatin string
+   * @param   aCString is a ptr to a 1-byte cstr
+   */
+  nsString(const char* aCString);
+
+  /**
+   * This constructor accepts a unichar string
+   * @param   aCString is a ptr to a 2-byte cstr
+   */
+  nsString(const PRUnichar* aString);
+
+  /**
+   * This is a copy constructor that accepts an nsStr
+   * @param   reference to another nsString
+   */
+  nsString(const nsStr&);
+
+  /**
+   * This is our copy constructor 
+   * @param   reference to another nsString
+   */
+  nsString(const nsString& aString);   
+
+  /**
+   * This constructor takes a subsumestr
+   * @param   reference to subsumestr
+   */
+  nsString(nsSubsumeStr& aSubsumeStr);   
+
+  /**
+   * Destructor
+   * 
+   */
+  virtual ~nsString();    
+
+  /**
+   * Retrieve the length of this string
+   * @return string length
+   */
+  inline PRInt32 Length() const { return (PRInt32)mLength; }
+
+  /**
+   * Retrieve the size of this string
+   * @return string length
+   */
+  virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+
+
+  /**
+   * Call this method if you want to force a different string length
+   * @update  gess7/30/98
+   * @param   aLength -- contains new length for mStr
+   * @return
+   */
+  void SetLength(PRUint32 aLength) { 
+    Truncate(aLength);
+  }
+
+  /**
+   * Sets the new length of the string.
+   * @param   aLength is new string length.
+   * @return  nada
+   */
+  void SetCapacity(PRUint32 aLength);
+
+  /**
+   * This method truncates this string to given length.
+   *
+   * @param   anIndex -- new length of string
+   * @return  nada
+   */
+  void Truncate(PRInt32 anIndex=0);
+
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in sorted order.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsOrdered(void) const;
+
+  /**
+   *  Determine whether or not the characters in this
+   *  string are in store as 1 or 2 byte (unicode) strings.
+   *  
+   *  @return  TRUE if ordered.
+   */
+  PRBool IsUnicode(void) const {
+    PRBool result=PRBool(mCharSize==eTwoByte);
+    return result;
+  }
+
+  /**
+   *  Determine whether or not this string has a length of 0
+   *  
+   *  @return  TRUE if empty.
+   */
+  PRBool IsEmpty(void) const {
+    return PRBool(0==mLength);
+  }
+
+  /**********************************************************************
+    Getters/Setters...
+   *********************************************************************/
+
+   /**
+     * Retrieve const ptr to internal buffer; DO NOT TRY TO FREE IT!
+     */
+  const char* GetBuffer(void) const;
+  const PRUnichar* GetUnicode(void) const;
+
+
+   /**
+     * Get nth character.
+     */
+  PRUnichar operator[](PRUint32 anIndex) const;
+  PRUnichar CharAt(PRUint32 anIndex) const;
+  PRUnichar First(void) const;
+  PRUnichar Last(void) const;
+
+   /**
+     * Set nth character.
+     */
+  PRBool SetCharAt(PRUnichar aChar,PRUint32 anIndex);
+
+
+  /**********************************************************************
+    String concatenation methods...
+   *********************************************************************/
+
+  /**
+   * Create a new string by appending given string to this
+   * @param   aString -- 2nd string to be appended
+   * @return  new subsumable string
+   */
+  nsSubsumeStr operator+(const nsStr& aString);
+  nsSubsumeStr operator+(const nsString& aString);
+
+  /**
+   * create a new string by adding this to the given cstring
+   * @param   aCString is a ptr to cstring to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const char* aCString);
+
+  /**
+   * create a new string by adding this to the given prunichar*.
+   * @param   aString is a ptr to UC-string to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(const PRUnichar* aString);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a char to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(char aChar);
+
+  /**
+   * create a new string by adding this to the given char.
+   * @param   aChar is a unichar to be added to this
+   * @return  newly created string
+   */
+  nsSubsumeStr operator+(PRUnichar aChar);
+
+  /**********************************************************************
+    Lexomorphic transforms...
+   *********************************************************************/
+
+
+  /**
+   * Converts chars in this to lowercase
+   * @update  gess 7/27/98
+   */
+  void ToLowerCase();
+
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in aOut
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToLowerCase(nsString& aString) const;
+
+  /**
+   * Converts chars in this to uppercase
+   * @update  gess 7/27/98
+   */
+  void ToUpperCase();
+
+  /**
+   * Converts chars in this to lowercase, and
+   * stores them in a given output string
+   * @update  gess 7/27/98
+   * @param   aOut is a string to contain result
+   */
+  void ToUpperCase(nsString& aString) const;
+
+
+  /**
+   *  This method is used to remove all occurances of the
+   *  characters found in aSet from this string.
+   *  
+   *  @param  aSet -- characters to be cut from this
+   *  @return *this 
+   */
+  nsString& StripChars(const char* aSet);
+  nsString& StripChar(char aChar);
+
+  /**
+   *  This method strips whitespace throughout the string
+   *  
+   *  @return  this
+   */
+  nsString& StripWhitespace();
+
+  /**
+   *  swaps occurence of 1 string for another
+   *  
+   *  @return  this
+   */
+  nsString& ReplaceChar(PRUnichar anOldChar,PRUnichar aNewChar);
+  nsString& ReplaceChar(const char* aSet,PRUnichar aNewChar);
+
+  PRInt32 CountChar(PRUnichar aChar);
+
+  /**
+   *  This method trims characters found in aTrimSet from
+   *  either end of the underlying string.
+   *  
+   *  @param   aTrimSet -- contains chars to be trimmed from
+   *           both ends
+   *  @return  this
+   */
+  nsString& Trim(const char* aSet,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressSet(const char* aSet, PRUnichar aChar,PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**
+   *  This method strips whitespace from string.
+   *  You can control whether whitespace is yanked from
+   *  start and end of string as well.
+   *  
+   *  @param   aEliminateLeading controls stripping of leading ws
+   *  @param   aEliminateTrailing controls stripping of trailing ws
+   *  @return  this
+   */
+  nsString& CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,PRBool aEliminateTrailing=PR_TRUE);
+
+  /**********************************************************************
+    string conversion methods...
+   *********************************************************************/
+
+  /**
+   * This method constructs a new nsString is a clone of this string.
+   * 
+   */
+  nsString* ToNewString() const;
+
+  /**
+   * Creates an ISOLatin1 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewCString() const;
+
+  /**
+   * Creates an UTF8 clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new isolatin1 string
+   */
+  char* ToNewUTF8String() const;
+
+  /**
+   * Creates a unicode clone of this string
+   * Note that calls to this method should be matched with calls to Recycle().
+   * @return  ptr to new unicode string
+   */
+  PRUnichar* ToNewUnicode() const;
+
+  /**
+   * Copies data from internal buffer onto given char* buffer
+   * NOTE: This only copies as many chars as will fit in given buffer (clips)
+   * @param aBuf is the buffer where data is stored
+   * @param aBuflength is the max # of chars to move to buffer
+   * @return ptr to given buffer
+   */
+  char* ToCString(char* aBuf,PRUint32 aBufLength,PRUint32 anOffset=0) const;
+
+  /**
+   * Perform string to float conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  float rep of string value
+   */
+  float ToFloat(PRInt32* aErrorCode) const;
+
+  /**
+   * Try to derive the radix from the value contained in this string
+   * @return  kRadix10, kRadix16 or kAutoDetect (meaning unknown)
+   */
+  PRUint32  DetermineRadix(void);
+
+  /**
+   * Perform string to int conversion.
+   * @param   aErrorCode will contain error if one occurs
+   * @return  int rep of string value
+   */
+  PRInt32   ToInteger(PRInt32* aErrorCode,PRUint32 aRadix=kRadix10) const;
+
+
+  /**********************************************************************
+    String manipulation methods...                
+   *********************************************************************/
+
+  /**
+   * Functionally equivalent to assign or operator=
+   * 
+   */
+  nsString& SetString(const char* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const PRUnichar* aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+  nsString& SetString(const nsString& aString,PRInt32 aLength=-1) {return Assign(aString,aLength);}
+
+  /**
+   * assign given string to this string
+   * @param   aStr: buffer to be assigned to this 
+   * @param   alength is the length of the given str (or -1)
+              if you want me to determine its length
+   * @return  this
+   */
+  nsString& Assign(const nsStr& aString,PRInt32 aCount=-1);
+  nsString& Assign(const char* aString,PRInt32 aCount=-1);
+  nsString& Assign(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Assign(char aChar);
+  nsString& Assign(PRUnichar aChar);
+
+  /**
+   * here come a bunch of assignment operators...
+   * @param   aString: string to be added to this
+   * @return  this
+   */
+  nsString& operator=(const nsString& aString) {return Assign(aString);}
+  nsString& operator=(const nsStr& aString) {return Assign(aString);}
+  nsString& operator=(char aChar) {return Assign(aChar);}
+  nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
+  nsString& operator=(const char* aCString) {return Assign(aCString);}
+  nsString& operator=(const PRUnichar* aString) {return Assign(aString);}
+  #ifdef AIX
+  nsString& operator=(const nsSubsumeStr& aSubsumeString);  // AIX requires a const here
+  #else
+  nsString& operator=(nsSubsumeStr& aSubsumeString);
+  #endif
+
+  /**
+   * Here's a bunch of methods that append varying types...
+   * @param   various...
+   * @return  this
+   */
+  nsString& operator+=(const nsStr& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const nsString& aString){return Append(aString,aString.mLength);}
+  nsString& operator+=(const char* aCString) {return Append(aCString);}
+  //nsString& operator+=(char aChar){return Append(aChar);}
+  nsString& operator+=(const PRUnichar* aUCString) {return Append(aUCString);}
+  nsString& operator+=(PRUnichar aChar){return Append(aChar);}
+
+  /*
+   *  Appends n characters from given string to this,
+   *  This version computes the length of your given string
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString) {return Append(aString,aString.mLength);}
+  nsString& Append(const nsString& aString) {return Append(aString,aString.mLength);}
+ 
+
+  /*
+   *  Appends n characters from given string to this,
+   *  
+   *  @param   aString is the source to be appended to this
+   *  @param   aCount -- number of chars to copy; -1 tells us to compute the strlen for you
+   *  @return  number of chars copied
+   */
+  nsString& Append(const nsStr& aString,PRInt32 aCount);
+  nsString& Append(const nsString& aString,PRInt32 aCount);
+  nsString& Append(const char* aString,PRInt32 aCount=-1);
+  nsString& Append(const PRUnichar* aString,PRInt32 aCount=-1);
+  nsString& Append(char aChar);
+  nsString& Append(PRUnichar aChar);
+  nsString& Append(PRInt32 aInteger,PRInt32 aRadix=10); //radix=8,10 or 16
+  nsString& Append(float aFloat);
+             
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the leftmost offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @return  number of chars copied
+   */
+  PRUint32 Left(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at the given offset.
+   *  
+   *  
+   *  @param   aCopy -- Receiving string
+   *  @param   aCount -- number of chars to copy
+   *  @param   anOffset -- position where copying begins
+   *  @return  number of chars copied
+   */
+  PRUint32 Mid(nsString& aCopy,PRUint32 anOffset,PRInt32 aCount) const;
+
+  /*
+   *  Copies n characters from this string to given string,
+   *  starting at rightmost char.
+   *  
+   *  
+   *  @param  aCopy -- Receiving string
+   *  @param  aCount -- number of chars to copy
+   *  @return number of chars copied
+   */
+  PRUint32 Right(nsString& aCopy,PRInt32 aCount) const;
+
+  /*
+   *  This method inserts n chars from given string into this
+   *  string at str[anOffset].
+   *  
+   *  @param  aCopy -- String to be inserted into this
+   *  @param  anOffset -- insertion position within this str
+   *  @param  aCount -- number of chars to be copied from aCopy
+   *  @return number of chars inserted into this.
+   */
+  nsString& Insert(const nsString& aCopy,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a given string into this string at
+   * a specified offset.
+   *
+   * @param   aString* to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  nsString& Insert(const char* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+  nsString& Insert(const PRUnichar* aChar,PRUint32 anOffset,PRInt32 aCount=-1);
+
+  /**
+   * Insert a single char into this string at
+   * a specified offset.
+   *
+   * @param   character to be inserted into this string
+   * @param   anOffset is insert pos in str 
+   * @return  the number of chars inserted into this string
+   */
+  //nsString& Insert(char aChar,PRUint32 anOffset);
+  nsString& Insert(PRUnichar aChar,PRUint32 anOffset);
+
+  /*
+   *  This method is used to cut characters in this string
+   *  starting at anOffset, continuing for aCount chars.
+   *  
+   *  @param  anOffset -- start pos for cut operation
+   *  @param  aCount -- number of chars to be cut
+   *  @return *this
+   */
+  nsString& Cut(PRUint32 anOffset,PRInt32 aCount);
+
+
+  /**********************************************************************
+    Searching methods...                
+   *********************************************************************/
+ 
+  /**
+   *  Search for given character within this string.
+   *  This method does so by using a binary search,
+   *  so your string HAD BETTER BE ORDERED!
+   *  
+   *  @param   aChar is the unicode char to be found
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 BinarySearch(PRUnichar aChar) const;
+
+  /**
+   *  Search for given substring within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @return  offset in string, or -1 (kNotFound)
+   */
+  PRInt32 Find(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 Find(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 Find(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 FindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the first character
+   * found in the given charset
+   * @param aString contains set of chars to be found
+   * @param anOffset tells us where to start searching in this
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 FindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 FindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**
+   * This methods scans the string backwards, looking for the given string
+   * @param   aString is substring to be sought in this
+   * @param   aIgnoreCase tells us whether or not to do caseless compare
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   */
+  PRInt32 RFind(const char* aCString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+  PRInt32 RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+
+  /**
+   *  Search for given char within this string
+   *  
+   *  @param   aString is substring to be sought in this
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   *  @param   aIgnoreCase selects case sensitivity
+   *  @return  find pos in string, or -1 (kNotFound)
+   */
+  //PRInt32 RFind(PRUnichar aChar,PRInt32 offset=-1,PRBool aIgnoreCase=PR_FALSE) const;
+  PRInt32 RFindChar(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE,PRInt32 anOffset=-1) const;
+
+  /**
+   * This method searches this string for the last character
+   * found in the given string
+   * @param aString contains set of chars to be found
+   *  @param   anOffset tells us where in this strig to start searching (counting from left)
+   * @return -1 if not found, else the offset in this
+   */
+  PRInt32 RFindCharInSet(const char* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const PRUnichar* aString,PRInt32 anOffset=-1) const;
+  PRInt32 RFindCharInSet(const nsStr& aString,PRInt32 anOffset=-1) const;
+
+
+  /**********************************************************************
+    Comparison methods...                
+   *********************************************************************/
+
+  /**
+   * Compares a given string type to this string. 
+   * @update  gess 7/27/98
+   * @param   S is the string to be compared
+   * @param   aIgnoreCase tells us how to treat case
+   * @param   aCount tells us how many chars to compare
+   * @return  -1,0,1
+   */
+  virtual PRInt32 Compare(const nsString& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const nsStr &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  virtual PRInt32 Compare(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+
+  /**
+   * These methods compare a given string type to this one
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator==(const nsString &aString) const;
+  PRBool  operator==(const nsStr &aString) const;
+  PRBool  operator==(const char *aString) const;
+  PRBool  operator==(const PRUnichar* aString) const;
+
+  /**
+   * These methods perform a !compare of a given string type to this 
+   * @param aString is the string to be compared to this
+   * @return  TRUE 
+   */
+  PRBool  operator!=(const nsString &aString) const;
+  PRBool  operator!=(const nsStr &aString) const;
+  PRBool  operator!=(const char* aString) const;
+  PRBool  operator!=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is < than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<(const nsString &aString) const;
+  PRBool  operator<(const nsStr &aString) const;
+  PRBool  operator<(const char* aString) const;
+  PRBool  operator<(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is > than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>(const nsString &aString) const;
+  PRBool  operator>(const nsStr &S) const;
+  PRBool  operator>(const char* aString) const;
+  PRBool  operator>(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is <= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator<=(const nsString &aString) const;
+  PRBool  operator<=(const nsStr &S) const;
+  PRBool  operator<=(const char* aString) const;
+  PRBool  operator<=(const PRUnichar* aString) const;
+
+  /**
+   * These methods test if a given string is >= than this
+   * @param aString is the string to be compared to this
+   * @return  TRUE or FALSE
+   */
+  PRBool  operator>=(const nsString &aString) const;
+  PRBool  operator>=(const nsStr &S) const;
+  PRBool  operator>=(const char* aString) const;
+  PRBool  operator>=(const PRUnichar* aString) const;
+
+  /**
+   * Compare this to given string; note that we compare full strings here.
+   * The optional length argument just lets us know how long the given string is.
+   * If you provide a length, it is compared to length of this string as an
+   * optimization.
+   * 
+   * @param  aString -- the string to compare to this
+   * @param  aCount  -- number of chars to be compared.
+   * @return TRUE if equal
+   */
+  PRBool  Equals(const nsString &aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const nsStr& aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
+  PRBool  Equals(/*FIX: const */nsIAtom* anAtom,PRBool aIgnoreCase) const;   
+  PRBool  Equals(const PRUnichar* s1, const PRUnichar* s2,PRBool aIgnoreCase=PR_FALSE) const;
+
+  PRBool  EqualsIgnoreCase(const nsString& aString) const;
+  PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
+  PRBool  EqualsIgnoreCase(/*FIX: const */nsIAtom *aAtom) const;
+  PRBool  EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+
+  /**
+   *  Determine if given buffer is plain ascii
+   *  
+   *  @param   aBuffer -- if null, then we test *this, otherwise we test given buffer
+   *  @return  TRUE if is all ascii chars or if strlen==0
+   */
+  PRBool IsASCII(const PRUnichar* aBuffer=0);
+
+
+  /**
+   *  Determine if given char is a valid space character
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if is valid space char
+   */
+  static  PRBool IsSpace(PRUnichar ch);
+
+  /**
+   *  Determine if given char in valid alpha range
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if in alpha range
+   */
+  static  PRBool IsAlpha(PRUnichar ch);
+
+  /**
+   *  Determine if given char is valid digit
+   *  
+   *  @param   aChar is character to be tested
+   *  @return  TRUE if char is a valid digit
+   */
+  static  PRBool IsDigit(PRUnichar ch);
+
+  static  void        Recycle(nsString* aString);
+  static  nsString*  CreateString(void);
+
+};
+
+extern NS_COM int fputs(const nsString& aString, FILE* out);
+//ostream& operator<<(ostream& aStream,const nsString& aString);
+//virtual void  DebugDump(ostream& aStream) const;
+
+
+/**************************************************************
+  Here comes the AutoString class which uses internal memory
+  (typically found on the stack) for its default buffer.
+  If the buffer needs to grow, it gets reallocated on the heap.
+ **************************************************************/
+
+class NS_COM nsAutoString : public nsString {
+public: 
+
+    nsAutoString();
+    nsAutoString(const char* aCString,PRInt32 aLength=-1);
+    nsAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
+
+    nsAutoString(const CBufDescriptor& aBuffer);    
+    nsAutoString(const nsStr& aString);
+    nsAutoString(const nsAutoString& aString);
+#ifdef AIX
+    nsAutoString(const nsSubsumeStr& aSubsumeStr);  // AIX requires a const
+#else
+    nsAutoString(nsSubsumeStr& aSubsumeStr);
+#endif // AIX
+    nsAutoString(PRUnichar aChar);
+    virtual ~nsAutoString();
+
+    nsAutoString& operator=(const nsStr& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const nsAutoString& aString) {nsString::Assign(aString); return *this;}
+    nsAutoString& operator=(const char* aCString) {nsString::Assign(aCString); return *this;}
+    nsAutoString& operator=(char aChar) {nsString::Assign(aChar); return *this;}
+    nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::Assign(aBuffer); return *this;}
+    nsAutoString& operator=(PRUnichar aChar) {nsString::Assign(aChar); return *this;}
+
+    /**
+     * Retrieve the size of this string
+     * @return string length
+     */
+    virtual void SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
+    
+    char mBuffer[kDefaultStringSize<<eTwoByte];
+};
+
+
+
+/***************************************************************
+  The subsumestr class is very unusual. 
+  It differs from a normal string in that it doesn't use normal
+  copy semantics when another string is assign to this. 
+  Instead, it "steals" the contents of the source string.
+
+  This is very handy for returning nsString classes as part of
+  an operator+(...) for example, in that it cuts down the number
+  of copy operations that must occur. 
+
+  You should probably not use this class unless you really know
+  what you're doing.
+ ***************************************************************/
+class NS_COM nsSubsumeStr : public nsString {
+public:
+  nsSubsumeStr(nsStr& aString);
+  nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+  nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
+};
+
+
+
+#endif
+
+

mozilla/string/obsolete/nsXPIDLString.cpp

@@ -0,0 +1,179 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDebug.h"
+#include "nsIAllocator.h"
+#include "nsXPIDLString.h"
+#include "plstr.h"
+
+// If the allocator changes, fix it here.
+#define XPIDL_STRING_ALLOC(__len)  ((PRUnichar*) nsAllocator::Alloc((__len) * sizeof(PRUnichar)))
+#define XPIDL_CSTRING_ALLOC(__len) ((char*) nsAllocator::Alloc((__len) * sizeof(char)))
+#define XPIDL_FREE(__ptr)          (nsAllocator::Free(__ptr))
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+
+nsXPIDLString::nsXPIDLString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLString::~nsXPIDLString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLString::operator const PRUnichar*()
+{
+    return mBuf;
+}
+
+
+PRUnichar*
+nsXPIDLString::Copy(const PRUnichar* aString)
+{
+    NS_ASSERTION(aString, "null ptr");
+    if (! aString)
+        return 0;
+
+    PRInt32 len = 0;
+
+    {
+        const PRUnichar* p = aString;
+        while (*p++)
+            len++;
+    }
+
+    PRUnichar* result = XPIDL_STRING_ALLOC(len + 1);
+    if (result) {
+        PRUnichar* q = result;
+        while (*aString) {
+            *q = *aString;
+            q++;
+            aString++;
+        }
+        *q = '\0';
+    }
+    return result;
+}
+
+
+PRUnichar**
+nsXPIDLString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const PRUnichar**
+nsXPIDLString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const PRUnichar**) &mBuf;
+}
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+
+nsXPIDLCString::nsXPIDLCString()
+    : mBuf(0),
+      mBufOwner(PR_FALSE)
+{
+}
+
+
+nsXPIDLCString::~nsXPIDLCString()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+}
+
+
+nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+	
+    mBuf = Copy(aCString);
+    mBufOwner = PR_TRUE;
+    
+    return *this;
+}
+
+
+nsXPIDLCString::operator const char*()
+{
+    return mBuf;
+}
+
+
+char*
+nsXPIDLCString::Copy(const char* aCString)
+{
+    NS_ASSERTION(aCString, "null ptr");
+    if (! aCString)
+        return 0;
+
+    PRInt32 len = PL_strlen(aCString);
+    char* result = XPIDL_CSTRING_ALLOC(len + 1);
+    if (result)
+        PL_strcpy(result, aCString);
+
+    return result;
+}
+
+
+char**
+nsXPIDLCString::StartAssignmentByValue()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_TRUE;
+    return &mBuf;
+}
+
+
+const char**
+nsXPIDLCString::StartAssignmentByReference()
+{
+    if (mBufOwner && mBuf)
+        XPIDL_FREE(mBuf);
+
+    mBuf = 0;
+    mBufOwner = PR_FALSE;
+    return (const char**) &mBuf;
+}
+
+

mozilla/string/obsolete/nsXPIDLString.h

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  A set of string wrapper classes that ease transition to use of XPIDL
+  interfaces. nsXPIDLString and nsXPIDLCString are to XPIDL `wstring'
+  and `string' out params as nsCOMPtr is to generic XPCOM interface
+  pointers. They help you deal with object ownership.
+
+  Consider the following interface:
+
+    interface nsIFoo {
+      attribute string Bar;
+    };
+
+  This will generate the following C++ header file:
+
+    class nsIFoo {
+      NS_IMETHOD SetBar(const PRUnichar* aValue);
+      NS_IMETHOD GetBar(PRUnichar* *aValue);
+    };
+
+  The GetBar() method will allocate a copy of the nsIFoo object's
+  "bar" attribute, and leave you to deal with freeing it:
+
+    nsIFoo* aFoo; // assume we get this somehow
+    PRUnichar* bar;
+    aFoo->GetFoo(&bar);
+    // Use bar here...
+    printf("bar is %s!\n", bar);
+    nsAllocator::Free(bar);
+
+  This makes your life harder, because you need to convolute your code
+  to ensure that you don't leak `bar'.
+
+  Enter nsXPIDLString, which manages the ownership of the allocated
+  string, and automatically destroys it when the nsXPIDLString goes
+  out of scope:
+
+    nsIFoo* aFoo;
+    nsXPIDLString bar;
+    aFoo->GetFoo( getter_Copies(bar) );
+    // Use bar here...
+    printf("bar is %s!\n", (const char*) bar);
+    // no need to remember to nsAllocator::Free().
+
+  Like nsCOMPtr, nsXPIDLString uses some syntactic sugar to make it
+  painfully clear exactly what the code expects. You need to wrap an
+  nsXPIDLString object with either `getter_Copies()' or
+  `getter_Shares()' before passing it to a getter: these tell the
+  nsXPIDLString how ownership is being handled.
+
+  In the case of `getter_Copies()', the callee is allocating a copy
+  (which is usually the case). In the case of `getter_Shares()', the
+  callee is returning a const reference to `the real deal' (this can
+  be done using the [shared] attribute in XPIDL).
+
+ */
+
+#ifndef nsXPIDLString_h__
+#define nsXPIDLString_h__
+
+#include "nsCom.h"
+#include "prtypes.h"
+
+#ifndef __PRUNICHAR__
+#define __PRUNICHAR__
+typedef PRUint16 PRUnichar;
+#endif /* __PRUNICHAR__ */
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |PRUnichar*| interface for |wstring| parameters in
+//   XPIDL interfaces.
+//
+
+class NS_COM nsXPIDLString {
+private:
+    PRUnichar* mBuf;
+    PRBool     mBufOwner;
+
+    PRUnichar** StartAssignmentByValue();
+    const PRUnichar** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a Unicode string.
+     */
+    nsXPIDLString();
+
+    virtual ~nsXPIDLString();
+
+    /**
+     * Return a reference to the immutable Unicode string.
+     */
+    operator const PRUnichar*();
+
+    /**
+     * Make a copy of the Unicode string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static PRUnichar* Copy(const PRUnichar* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator PRUnichar**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const PRUnichar**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLString(nsXPIDLString& /* aXPIDLString */) {}
+    nsXPIDLString& operator =(nsXPIDLString& /* aXPIDLString */) { return *this; }
+};
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLString::GetterCopies
+getter_Copies(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterCopies(aXPIDLString);
+}
+
+/**
+ * Use this function to "wrap" the nsXPIDLString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLString::GetterShares
+getter_Shares(nsXPIDLString& aXPIDLString)
+{
+    return nsXPIDLString::GetterShares(aXPIDLString);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+// nsXPIDLCString
+//
+//   A wrapper for Unicode strings. With the |getter_Copies()| and
+//   |getter_Shares()| helper functions, this can be used instead of
+//   the "naked" |char*| interface for |string| parameters in XPIDL
+//   interfaces.
+//
+
+class NS_COM nsXPIDLCString {
+private:
+    char*  mBuf;
+    PRBool mBufOwner;
+
+    char** StartAssignmentByValue();
+    const char** StartAssignmentByReference();
+
+public:
+    /**
+     * Construct a new, uninitialized wrapper for a single-byte string.
+     */
+    nsXPIDLCString();
+
+    virtual ~nsXPIDLCString();
+
+	/**
+	 * Assign a single-byte string to this wrapper. Copies and owns the result.
+	 */
+	nsXPIDLCString& operator =(const char* aString);
+
+    /**
+     * Return a reference to the immutable single-byte string.
+     */
+    operator const char*();
+
+    /**
+     * Make a copy of the single-byte string. Use this function in the
+     * callee to ensure that the correct memory allocator is used.
+     */
+    static char* Copy(const char* aString);
+
+    // A helper class for assignment-by-value. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterCopies {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterCopies(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator char**() {
+            return mXPIDLString.StartAssignmentByValue();
+        }
+
+        friend GetterCopies getter_Copies(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterCopies;
+
+    // A helper class for assignment-by-reference. This class is an
+    // implementation detail and should not be considered part of the
+    // public interface.
+    class NS_COM GetterShares {
+    private:
+        nsXPIDLCString& mXPIDLString;
+
+    public:
+        GetterShares(nsXPIDLCString& aXPIDLString)
+            : mXPIDLString(aXPIDLString) {}
+
+        operator const char**() {
+            return mXPIDLString.StartAssignmentByReference();
+        }
+
+        friend GetterShares getter_Shares(nsXPIDLCString& aXPIDLString);
+    };
+
+    friend class GetterShares;
+
+private:
+    // not to be implemented
+    nsXPIDLCString(nsXPIDLCString& /* aXPIDLString */) {}
+    nsXPIDLCString& operator =(nsXPIDLCString& /* aXPIDLCString */) { return *this; }
+};
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive an |out| value.
+ */
+inline nsXPIDLCString::GetterCopies
+getter_Copies(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterCopies(aXPIDLString);
+}
+
+
+/**
+ * Use this function to "wrap" the nsXPIDLCString object that is to
+ * receive a |[shared] out| value.
+ */
+inline nsXPIDLCString::GetterShares
+getter_Shares(nsXPIDLCString& aXPIDLString)
+{
+    return nsXPIDLCString::GetterShares(aXPIDLString);
+}
+
+
+
+#endif // nsXPIDLString_h__

mozilla/webshell/tests/viewer/Makefile.in

@@ -1,197 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH			= ../../..
-topsrcdir		= @top_srcdir@
-srcdir			= @srcdir@
-VPATH			= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS			= public
-
-PROGRAM			= viewer
-
-CPPSRCS			= \
-			$(TOOLKIT_CPPSRCS) \
-			nsBaseDialog.cpp \
-			nsFindDialog.cpp \
-			nsXPBaseWindow.cpp \
-			nsTableInspectorDialog.cpp \
-			nsImageInspectorDialog.cpp \
-			nsPrintSetupDialog.cpp \
-			nsBrowserWindow.cpp \
-			nsEditorMode.cpp \
-			nsSetupRegistry.cpp \
-			nsThrobber.cpp \
-			nsViewerApp.cpp \
-			nsWebCrawler.cpp \
-			$(NULL)
-
-EXPORT_RESOURCE_SAMPLES	:= \
-			$(wildcard $(srcdir)/samples/test*.html) \
-			$(wildcard $(srcdir)/samples/toolbarTest*.xul) \
-			$(wildcard $(srcdir)/samples/treeTest*.xul) \
-			$(wildcard $(srcdir)/samples/treeTest*.css) \
-			$(wildcard $(srcdir)/samples/slider*.xul) \
-			$(wildcard $(srcdir)/samples/scrollbar*.xul) \
-			$(srcdir)/resources/find.html \
-			$(srcdir)/resources/printsetup.html \
-			$(srcdir)/resources/image_props.html \
-			$(srcdir)/samples/aform.css \
-			$(srcdir)/samples/bform.css \
-			$(srcdir)/samples/cform.css \
-			$(srcdir)/samples/demoform.css \
-			$(srcdir)/samples/mozform.css \
-			$(srcdir)/samples/xulTest.css \
-			$(srcdir)/samples/Anieyes.gif \
-			$(srcdir)/samples/gear1.gif \
-			$(srcdir)/samples/rock_gra.gif \
-			$(srcdir)/samples/beeptest.html \
-			$(srcdir)/samples/soundtest.html \
-			$(srcdir)/samples/bg.jpg \
-			$(srcdir)/samples/raptor.jpg \
-			$(srcdir)/samples/test.wav \
-			$(srcdir)/samples/checkboxTest.xul \
-			$(NULL)
-
-EXPORT_RESOURCE_THROBBER := $(wildcard $(srcdir)/throbber/anim*.gif)
-
-ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS			+= unix
-UNIX_VIEWER_TK_LIBS	= $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-BEOS_PROGRAM_RESOURCE	= $(srcdir)/viewer-beos.rsrc
-TOOLKIT_CPPSRCS		= nsBeOSMain.cpp
-endif
-ifeq ($(MOZ_WIDGET_TOOLKIT),photon)
-TOOLKIT_CPPSRCS		= nsPhMain.cpp nsPhMenu.cpp
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
-GTK_GLUE		= -lgtksuperwin
-endif
-
-ifdef MOZ_OJI
-JSJ_LIB			= -ljsj
-endif
-
-XP_DIST_LIBS		= \
-			-lraptorgfx \
-			-lmozjs \
-			-lxpcom \
-			$(JSJ_LIB) \
-			$(NULL)
-
-XP_NS_UNDERBAR_CRAP	= \
-			$(MOZ_NECKO_UTIL_LIBS) \
-			$(MOZ_TIMER_LIBS) \
-			$(MOZ_WIDGET_SUPPORT_LIBS) \
-			$(NULL)
-
-XP_LIBS			= \
-			$(XP_NS_UNDERBAR_CRAP) \
-			$(XP_DIST_LIBS) \
-			$(NSPR_LIBS) \
-			$(NULL)
-
-ifdef MOZ_FULLCIRCLE
-XP_LIBS			+= $(FULLCIRCLE_LIBS)
-endif
-
-LIBS			= \
-			$(UNIX_VIEWER_TK_LIBS) \
-			$(GTK_GLUE) \
-			$(XP_LIBS) \
-			$(TK_LIBS) \
-			$(NULL)
-
-MOTIF_LIBS		= -lviewer_motif_s $(XP_LIBS) $(MOZ_MOTIF_LDFLAGS)
-QT_LIBS			= -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
-XLIB_LIBS		= -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
-GTK_LIBS		= -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
-
-EXTRA_DEPS		= \
-			$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
-			$(UNIX_VIEWER_TK_LIBS) \
-			$(XP_NS_UNDERBAR_CRAP) \
-			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS		+= $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
-
-install:: $(PROGRAM) $(srcdir)/mozilla-viewer.sh
-	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
-	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
-	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
-	$(INSTALL) $(srcdir)/mozilla-viewer.sh $(DIST)/bin
-
-$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_gtk_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_motif: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_motif_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(MOTIF_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_qt_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in $(DIST)/lib/libviewer_xlib_s.a
-	$(CCC) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS)
-	$(MOZ_POST_PROGRAM_COMMAND) $@
-
-ifdef MOZ_ENABLE_GTK
-install:: $(PROGRAM)_gtk
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_gtk
-endif
-
-ifdef MOZ_ENABLE_MOTIF
-install:: $(PROGRAM)_motif
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_motif
-endif
-
-ifdef MOZ_ENABLE_QT
-install:: $(PROGRAM)_qt
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_qt
-endif
-
-ifdef MOZ_ENABLE_XLIB
-install:: $(PROGRAM)_xlib
-	$(INSTALL) -m 555 $< $(DIST)/bin
-
-clobber::
-	rm -f $(PROGRAM)_xlib
-endif
-

mozilla/webshell/tests/viewer/unix/gtk/nsGtkMenu.cpp

@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "gdksuperwin.h"
-#include "gtkmozbox.h"
-
-#include "nsBrowserWindow.h"
-#include "resources.h"
-#include "nscore.h"
-
-#include "stdio.h"
-
-typedef GtkItemFactoryCallback GIFC;
-
-void gtk_ifactory_cb (nsBrowserWindow *nbw,
-                      guint callback_action, 
-                      GtkWidget *widget)
-{
-  nbw->DispatchMenuItem(callback_action);
-}
-
-GtkItemFactoryEntry menu_items[] =
-{
-  { "/_File",				nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/_New Window",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_WINDOW_OPEN,	nsnull },
-  { "/File/_Open...",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_FILE_OPEN,	nsnull },
-  { "/File/_View Source",		nsnull, (GIFC)gtk_ifactory_cb,	VIEW_SOURCE,		nsnull },
-  { "/File/_Samples",			nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/Samples/demo #0",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO0,		nsnull },
-  { "/File/Samples/demo #1",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO1,		nsnull },
-  { "/File/Samples/demo #2",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO2,		nsnull },
-  { "/File/Samples/demo #3",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO3,		nsnull },
-  { "/File/Samples/demo #4",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO4,		nsnull },
-  { "/File/Samples/demo #5",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO5,		nsnull },
-  { "/File/Samples/demo #6",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO6,		nsnull },
-  { "/File/Samples/demo #7",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO7,		nsnull },
-  { "/File/Samples/demo #8",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO8,		nsnull },
-  { "/File/Samples/demo #9",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO9,		nsnull },
-  { "/File/Samples/demo #10",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO10,		nsnull },
-  { "/File/Samples/demo #11",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO11,		nsnull },
-  { "/File/Samples/demo #12",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO12,		nsnull },
-  { "/File/Samples/demo #13",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO13,		nsnull },
-  { "/File/Samples/demo #14",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO14,		nsnull },
-  { "/File/Samples/demo #15",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO15,		nsnull },
-  { "/File/Samples/demo #16",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO16,		nsnull },
-  { "/File/Samples/demo #17",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEMO17,		nsnull },
-  { "/File/_Test Sites",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOP100,		nsnull },
-  { "/File/XPToolkit Tests",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/File/XPToolkit Tests/Toolbar Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTOOLBAR1,     nsnull },
-  { "/File/XPToolkit Tests/Tree Test 1",       nsnull, (GIFC)gtk_ifactory_cb,  VIEWER_XPTOOLKITTREE1,     nsnull },
-  { "/File/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/File/Print Preview",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_ONE_COLUMN,	nsnull },
-  { "/File/Print",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT,		nsnull },
-  { "/File/Print Setup",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_PRINT_SETUP,	nsnull },
-  { "/File/sep2",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/File/_Exit",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EXIT,		nsnull },
-
-  { "/_Edit",				nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Edit/Cu_t",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_CUT,	nsnull },
-  { "/Edit/_Copy",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_COPY,	nsnull },
-  { "/Edit/_Paste",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_PASTE,	nsnull },
-  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Edit/Select All",			nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_SELECTALL,	nsnull },
-  { "/Edit/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Edit/Find in Page",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_EDIT_FINDINPAGE,	nsnull },
-
-//#ifdef DEBUG // turning off for now
-  { "/_Debug",				nsnull,	nsnull,			0,			"<Branch>"	},
-  { "/Debug/_Visual Debugging",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_VISUAL_DEBUGGING,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Event Debugging/Toggle Paint Flashing",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_FLASHING,nsnull },
-  { "/Debug/Event Debugging/Toggle Paint Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_PAINT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Invalidate Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_INVALIDATE_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_EVENT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/sep1", nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Event Debugging/Toggle Motion Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_MOTION_EVENT_DUMPING,nsnull },
-  { "/Debug/Event Debugging/Toggle Crossing Event Dumping",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_CROSSING_EVENT_DUMPING,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/_Reflow Test",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_REFLOW_TEST,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Dump _Content",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_CONTENT,	nsnull },
-  { "/Debug/Dump _Frames",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_FRAMES,	nsnull },
-  { "/Debug/Dump _Views",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_VIEWS,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Dump _Style Sheets",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_SHEETS,	nsnull },
-  { "/Debug/Dump _Style Contexts",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DUMP_STYLE_CONTEXTS,	nsnull},
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Show Content Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_SIZE,nsnull },
-  { "/Debug/Show Frame Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_FRAME_SIZE,	nsnull },
-  { "/Debug/Show Style Size",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_STYLE_SIZE,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Debug Save",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGSAVE,	nsnull },
-  { "/Debug/Debug Output Text",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYTEXT,	nsnull },
-  { "/Debug/Debug Output HTML",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DISPLAYHTML,	nsnull },
-  { "/Debug/Debug Toggle Selection",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_TOGGLE_SELECTION,nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Debug Robot",		nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_DEBUGROBOT,	nsnull },
-  { "/Debug/sep1",			nsnull,	nsnull,			0,			"<Separator>" },
-  { "/Debug/Show Content Quality",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_SHOW_CONTENT_QUALITY,	nsnull },
-  { "/_Style",				nsnull,	nsnull,			0,			"<Branch>"	},
-  { "/Style/Select _Style Sheet",	       nsnull, nsnull,        0,        "<Branch>" },
-  { "/Style/Select Style Sheet/List Available Sheets", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_LIST, nsnull },
-  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
-  { "/Style/Select Style Sheet/Select Default", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_DEFAULT, nsnull },
-  { "/Style/Select Style Sheet/sep1", nsnull, nsnull,        0,        "<Separator>" },
-  { "/Style/Select Style Sheet/Select Alternative 1", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_ONE, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 2", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_TWO, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 3", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_THREE, nsnull },
-  { "/Style/Select Style Sheet/Select Alternative 4", nsnull, (GIFC)gtk_ifactory_cb, VIEWER_SELECT_STYLE_FOUR, nsnull },
-  { "/Style/_Compatibility Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Compatibility Mode/Nav Quirks",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NAV_QUIRKS_MODE,	nsnull },
-  { "/Style/Compatibility Mode/Standard",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_STANDARD_MODE,	nsnull },
-
-  { "/Style/_Widget Render Mode",		nsnull,	nsnull,			0,			"<Branch>" },
-  { "/Style/Widget Render Mode/Native",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_NATIVE_WIDGET_MODE,	nsnull },
-  { "/Style/Widget Render Mode/Gfx",	nsnull,	(GIFC)gtk_ifactory_cb,	VIEWER_GFX_WIDGET_MODE,	nsnull },
-//#endif
-
-  { "/_Tools",                                nsnull, nsnull,                 0,              "<Branch>" },
-  { "/Tools/_JavaScript Console",	nsnull,	(GIFC)gtk_ifactory_cb,	JS_CONSOLE,	nsnull },
-  { "/Tools/_Editor Mode",		nsnull,	(GIFC)gtk_ifactory_cb,	EDITOR_MODE,	nsnull }
-};
-
-void CreateViewerMenus(nsIWidget *   aParent, 
-                       gpointer      data,
-                       GtkWidget **  aMenuBarOut) 
-{
-  NS_ASSERTION(nsnull != aParent,"null parent.");
-  NS_ASSERTION(nsnull != aMenuBarOut,"null out param.");
-
-  GtkItemFactory *item_factory;
-  GtkWidget *menubar;
-
-  GdkSuperWin *gdkSuperWin;
-  GtkWidget   *mozBox;
-
-  gdkSuperWin = (GdkSuperWin*)aParent->GetNativeData(NS_NATIVE_WIDGET);
-  
-  int nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-  item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", nsnull);
-
-  gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, data);
-
-  menubar = gtk_item_factory_get_widget (item_factory, "<main>");
-
-  gtk_menu_bar_set_shadow_type (GTK_MENU_BAR(menubar), GTK_SHADOW_NONE);
-
-  NS_ASSERTION(GDK_IS_SUPERWIN(gdkSuperWin), "code assumes a gdksuperwin.");
-  mozBox = gtk_mozbox_new(gdkSuperWin->bin_window);
-  NS_ASSERTION((mozBox != NULL), "failed to create mozBox.");
-
-  gtk_container_add(GTK_CONTAINER(mozBox), menubar);
-  gtk_mozbox_set_position(GTK_MOZBOX(mozBox), 0, 0 );
-  gtk_widget_show(mozBox);
-  gtk_widget_show(menubar);
-
-  *aMenuBarOut = menubar;
-}

mozilla/widget/src/Makefile.in

@@ -1,67 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= xpwidgets support
-
-#
-# Dont build the DSO under the 'build' directory as windows does.
-#
-# The DSOs get built in the toolkit dir itself.  Do this so that 
-# multiple implementations of widget can be built on the same
-# source tree.
-#
-ifndef MOZ_MONOLITHIC_TOOLKIT
-
-ifdef MOZ_ENABLE_GTK
-DIRS		+= gtksuperwin
-DIRS		+= gtk
-endif
-
-ifdef MOZ_ENABLE_MOTIF
-DIRS		+= motif
-endif
-
-ifdef MOZ_ENABLE_XLIB
-DIRS		+= xlib
-endif
-
-ifdef MOZ_ENABLE_QT
-DIRS		+= qt
-endif
-
-else
-DIRS		+= $(MOZ_WIDGET_TOOLKIT)
-endif
-
-# unix_services are only useful in unix, duh...
-ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
-DIRS		+= unix_services
-endif
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/widget/src/gtk/Makefile.in

@@ -1,100 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= widget_gtk
-
-REQUIRES	= util img xpcom raptor netlib
-
-CPPSRCS		= \
-		nsAppShell.cpp \
-		nsButton.cpp \
-		nsCheckButton.cpp \
-		nsClipboard.cpp \
-		nsComboBox.cpp \
-		nsContextMenu.cpp \
-		nsDragService.cpp \
-		nsFilePicker.cpp \
-		nsFileWidget.cpp \
-		nsFontRetrieverService.cpp \
-		nsFontSizeIterator.cpp \
-		nsGtkEventHandler.cpp \
-		nsGtkUtils.cpp \
-		nsLabel.cpp \
-		nsListBox.cpp \
-		nsLookAndFeel.cpp \
-		nsMenu.cpp \
-		nsMenuBar.cpp \
-		nsMenuItem.cpp \
-		nsPopUpMenu.cpp \
-		nsRadioButton.cpp \
-		nsScrollbar.cpp \
-		nsSound.cpp \
-		nsTextAreaWidget.cpp \
-		nsTextHelper.cpp \
-		nsTextWidget.cpp \
-		nsToolkit.cpp \
-		nsWidget.cpp \
-		nsWidgetFactory.cpp \
-		nsWindow.cpp \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
-
-EXTRA_DSO_LDOPTS = \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(MOZ_COMPONENT_LIBS) \
-		-lraptorgfx \
-		$(NULL)
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-EXTRA_DSO_LDOPTS +=  -L$(DIST)/lib -lgtksuperwin $(MOZ_GTK_LDFLAGS)
-else
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifndef MOZ_MONOLITHIC_TOOLKIT
-CXXFLAGS	+= $(MOZ_GTK_CFLAGS)
-CFLAGS		+= $(MOZ_GTK_CFLAGS)
-else
-CXXFLAGS	+= $(TK_CFLAGS)
-CFLAGS		+= $(TK_CFLAGS)
-endif
-
-DEFINES		+= -D_IMPL_NS_WIDGET -DUSE_XIM
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES		+= -D_BSD_SOURCE
-endif
-
-INCLUDES	+= \
-		-I$(srcdir)/../xpwidgets \
-		-I$(srcdir) \
-		$(NULL)
-
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mozilla/widget/src/gtk/mozicon.xpm

@@ -1,292 +0,0 @@
-/* XPM */
-static char * mozilla_icon_xpm[] = {
-"32 32 257 2",
-"  	c None",
-". 	c #AA7303",
-"+ 	c #A67003",
-"@ 	c #B77C03",
-"# 	c #8D6003",
-"$ 	c #8D6004",
-"% 	c #6C4A04",
-"& 	c #3A2804",
-"* 	c #6B4802",
-"= 	c #9B6903",
-"- 	c #5A2C04",
-"; 	c #411B04",
-"> 	c #9D6A03",
-", 	c #7A5203",
-"' 	c #510D04",
-") 	c #6B1104",
-"! 	c #7D5503",
-"~ 	c #674604",
-"{ 	c #C21E04",
-"] 	c #C21D04",
-"^ 	c #523804",
-"/ 	c #513702",
-"( 	c #552904",
-"_ 	c #DD2204",
-": 	c #DF2204",
-"< 	c #582904",
-"[ 	c #5F3F02",
-"} 	c #6B2504",
-"| 	c #FE2604",
-"1 	c #AB7303",
-"2 	c #9B6904",
-"3 	c #C31F04",
-"4 	c #FE2704",
-"5 	c #A81904",
-"6 	c #926304",
-"7 	c #4D3302",
-"8 	c #483104",
-"9 	c #C61E04",
-"0 	c #B11B04",
-"a 	c #891604",
-"b 	c #761204",
-"c 	c #614304",
-"d 	c #775102",
-"e 	c #795102",
-"f 	c #785102",
-"g 	c #C58603",
-"h 	c #642404",
-"i 	c #B21A04",
-"j 	c #1F0604",
-"k 	c #550E04",
-"l 	c #631004",
-"m 	c #402404",
-"n 	c #AF7703",
-"o 	c #3D2902",
-"p 	c #7F5602",
-"q 	c #805604",
-"r 	c #0C0904",
-"s 	c #080604",
-"t 	c #080706",
-"u 	c #090604",
-"v 	c #060404",
-"w 	c #620F04",
-"x 	c #7A1304",
-"y 	c #030204",
-"z 	c #570E04",
-"A 	c #721204",
-"B 	c #270704",
-"C 	c #080504",
-"D 	c #0A0604",
-"E 	c #533804",
-"F 	c #A56F02",
-"G 	c #B87C03",
-"H 	c #3B2804",
-"I 	c #A51904",
-"J 	c #FC2704",
-"K 	c #D62004",
-"L 	c #691004",
-"M 	c #C01E04",
-"N 	c #6D1004",
-"O 	c #9C1804",
-"P 	c #B31C04",
-"Q 	c #150404",
-"R 	c #801404",
-"S 	c #DD2304",
-"T 	c #120404",
-"U 	c #130404",
-"V 	c #500C04",
-"W 	c #CC1E04",
-"X 	c #AA1A04",
-"Y 	c #100904",
-"Z 	c #B47A03",
-"` 	c #A77103",
-" .	c #513704",
-"..	c #891704",
-"+.	c #F62604",
-"@.	c #BA1D04",
-"#.	c #3C0A04",
-"$.	c #EB2304",
-"%.	c #DE2304",
-"&.	c #560E04",
-"*.	c #E82304",
-"=.	c #FE2804",
-"-.	c #BE1D04",
-";.	c #F12404",
-">.	c #661004",
-",.	c #020204",
-"'.	c #5E0F04",
-").	c #A61A04",
-"!.	c #4A3204",
-"~.	c #BC7E03",
-"{.	c #8E6002",
-"].	c #684604",
-"^.	c #390D04",
-"/.	c #EE2404",
-"(.	c #FE2904",
-"_.	c #7D1304",
-":.	c #8C1504",
-"<.	c #200604",
-"[.	c #A81A04",
-"}.	c #E72204",
-"|.	c #DA2004",
-"1.	c #070204",
-"2.	c #280704",
-"3.	c #543904",
-"4.	c #9F6C02",
-"5.	c #674602",
-"6.	c #B47B04",
-"7.	c #311004",
-"8.	c #B11C04",
-"9.	c #AA1B04",
-"0.	c #6A1104",
-"a.	c #801504",
-"b.	c #2B0704",
-"c.	c #09090A",
-"d.	c #450B04",
-"e.	c #360904",
-"f.	c #DC2204",
-"g.	c #EE2504",
-"h.	c #C11D04",
-"i.	c #6F1104",
-"j.	c #704B04",
-"k.	c #9C6902",
-"l.	c #A56F03",
-"m.	c #5F4004",
-"n.	c #8D1604",
-"o.	c #440A04",
-"p.	c #1A0504",
-"q.	c #931604",
-"r.	c #621004",
-"s.	c #7F1404",
-"t.	c #921704",
-"u.	c #F82504",
-"v.	c #F52504",
-"w.	c #981804",
-"x.	c #241804",
-"y.	c #5B3E04",
-"z.	c #D82204",
-"A.	c #D02004",
-"B.	c #DA2104",
-"C.	c #D52104",
-"D.	c #2A1A04",
-"E.	c #AC7403",
-"F.	c #2B1C04",
-"G.	c #D04004",
-"H.	c #FC3C04",
-"I.	c #F94E04",
-"J.	c #881504",
-"K.	c #FC2604",
-"L.	c #792804",
-"M.	c #AC7503",
-"N.	c #9A6803",
-"O.	c #782804",
-"P.	c #F66504",
-"Q.	c #F94B04",
-"R.	c #F46804",
-"S.	c #F46604",
-"T.	c #F76504",
-"U.	c #FB4204",
-"V.	c #C13D04",
-"W.	c #5D0E04",
-"X.	c #DA2204",
-"Y.	c #741604",
-"Z.	c #8C5E03",
-"`.	c #885B03",
-" +	c #8B1904",
-".+	c #DE2204",
-"++	c #D22D04",
-"@+	c #C42D04",
-"#+	c #580E04",
-"$+	c #9F1804",
-"%+	c #895D04",
-"&+	c #D62204",
-"*+	c #371904",
-"=+	c #2C1A04",
-"-+	c #4A0C04",
-";+	c #140404",
-">+	c #AB1A04",
-",+	c #DA2304",
-"'+	c #6A4702",
-")+	c #754F02",
-"!+	c #821404",
-"~+	c #462B04",
-"{+	c #B37A03",
-"]+	c #B17803",
-"^+	c #714C04",
-"/+	c #580F04",
-"(+	c #E32204",
-"_+	c #DD2104",
-":+	c #611D04",
-"<+	c #BA7F03",
-"[+	c #B27803",
-"}+	c #6F1D04",
-"|+	c #FD2704",
-"1+	c #F22504",
-"2+	c #634304",
-"3+	c #875B03",
-"4+	c #734F02",
-"5+	c #805704",
-"6+	c #1D0504",
-"7+	c #DB2204",
-"8+	c #EA2404",
-"9+	c #2E0804",
-"0+	c #815803",
-"a+	c #941704",
-"b+	c #C11E04",
-"c+	c #391B04",
-"d+	c #A77104",
-"e+	c #B67C04",
-"f+	c #371D04",
-"g+	c #360A04",
-"h+	c #573A04",
-"i+	c #372604",
-"j+	c #3E2104",
-"k+	c #B57A03",
-"l+	c #B57B03",
-"m+	c #603F04",
-"n+	c #430A04",
-"o+	c #351904",
-"p+	c #A36E03",
-"q+	c #BE8103",
-"r+	c #1D1404",
-"s+	c #483004",
-"t+	c #A26E03",
-"u+	c #6D4B02",
-"v+	c #825804",
-"w+	c #0B0804",
-"x+	c #976603",
-"y+	c #815703",
-"z+	c #926404",
-"A+	c #895D03",
-"B+	c #614202",
-"C+	c #9A6804",
-"D+	c #C88704",
-"E+	c #C18303",
-"F+	c #654302",
-"G+	c #744F02",
-"H+	c #704B02",
-"                                                                ",
-"                                .                               ",
-"                              + @                               ",
-"                              # $                               ",
-"                              % & *                             ",
-"                            = - ; >                             ",
-"                            , ' ) !                             ",
-"                            ~ { ] ^                             ",
-"                          / ( _ : < [                           ",
-"                          . } | | } 1                           ",
-"                          2 3 | 4 5 6                           ",
-"                        7 8 9 0 a b c                           ",
-"  d e f f f d d d d d d g h i j k l m n d d d d d d d d d d d o ",
-"  p q r s s s s t s s u v w x y z A B C D D D D D s s s s E F   ",
-"      G H I J 4 | 4 | K L L M N O P Q R | S T U V W X Y Z       ",
-"        `  ...+.| 4 @.#.$.4 | %.&.*.4 =.-.;.>.,.'.).!.~.        ",
-"          {.].^./.(.X _.;.| :.T <.[.| }.z | |.1.2.3.4.          ",
-"            5.6.7.8.9.0.a.b.c.d.e.f.g.h.&.| i.u j.k.            ",
-"                l.m.n.o.p.q._.r.a.s.t.u.v.w.x.Z                 ",
-"                  {.y.P z.R A.v.x j B.| C.D.E.                  ",
-"                    F.G.H.I.4 | 4 t.J.f.K.L.M.                  ",
-"                  N.O.P.Q.R.S.T.U.V.W.X.4 Y.Z.                  ",
-"                  `. +4 =.| | .+++@+#+$+| K %+                  ",
-"                  %+&+| | | I *+=+-+;+>+,+&+x.'+                ",
-"                )+=+X.=.| !+~+{+]+^+,./+(+_+:+<+                ",
-"                [+}+|+1+) 2+3+    4+5+6+7+8+9+0+                ",
-"                $ a+b+c+d+            e+f+0.g+h+                ",
-"                i+A j+k+                l+m+n+o+p+              ",
-"              q+r+s+t+                    u+v+w+x+              ",
-"              y+z+A+                        B+C+2               ",
-"              D+                                E+F+            ",
-"            G+                                    H+            "};

mozilla/widget/src/gtk/mozicon50.xpm

@@ -1,63 +0,0 @@
-/* XPM */
-static char * mozicon50_xpm[] = {
-"50 51 9 1",
-" 	c None",
-".	c #000000",
-"+	c #FF0000",
-"@	c #808000",
-"#	c #800000",
-"$	c #FF6633",
-"%	c #990066",
-"&	c #FF00FF",
-"*	c #222222",
-"                                                  ",
-"                         @                        ",
-"                        $@                        ",
-"                        @@                        ",
-"                        @@$                       ",
-"                       $@*@                       ",
-"                       @@.@                       ",
-"                       @..@                       ",
-"                      $@..@@                      ",
-"                      $@##*@                      ",
-"                      @*#+.@                      ",
-"                      @.++.@$                     ",
-"                     $@.++.@$                     ",
-"                     @*#++#*@                     ",
-"                     @.++++.@                     ",
-"                    $@.++++.@$                    ",
-"                    @*#++++**@                    ",
-"                    @.#++++#.@                    ",
-"                   $@.++####.@                    ",
-"                   @@*+#*##*.@@                   ",
-"*@@@@@@@@@@@@@@@@@@@.#+..*##*#@@@@@@@@@@@@@@@@@@@*",
-" *@@*................+#..*###.................@@* ",
-"  %@@@.#++++++++++++#**#*#++.###++*...#+++#.*@@*  ",
-"    *@@.#+++++++++#.##++#+#+*.#+++#..##++#.@@@%   ",
-"      $@..+++++++.#++++++##++++#++#...++*.@@$     ",
-"       @@*.#+++++.#+++++*.#++++##++#.*...@@       ",
-"        $@@.#+++#*++++#....#+++*#+++...*@$        ",
-"         *@@..++#*++#**.*.*+++#.#++*..@@$         ",
-"           $@*.++******#+++++#+#+++..@@           ",
-"            $@@.##..*$#**#+#*#++++..@@            ",
-"             $@@.#+#***##...#++++.*@@             ",
-"              %@@*++++++++#.#++++.@@              ",
-"               @.#+++++++++.##+++.@$              ",
-"               @.+$$$$$+$$$#*#+++*@@              ",
-"              $@*+$$$$$$$+$#.#+++#.@              ",
-"              @*#+++++++++++.#++++.@              ",
-"              @.#+++++++#*++.##+++.@$             ",
-"             $@.+++++++....#..+#++*@@             ",
-"             @@*+++++#.*@@@...*+++#.@             ",
-"             @.#++++#.@@@ @@..#++++.@             ",
-"             @.++++*.@@$  %@@..+++#.@@            ",
-"            $@.+++..@@*     $@*.#+#**@            ",
-"            @@#+#.*@$%       $@@.##..@            ",
-"            @.##.@@            @@..#.@$           ",
-"           $@.*.@@$             @@**.@$           ",
-"           $@.*@@               %$@@.*@           ",
-"           @.@@$                  *@@.@           ",
-"           @@@$                    %@@@$          ",
-"          $@@%                      %@@@          ",
-"          @@                          $@          ",
-"          $                            *          "};

mozilla/widget/src/gtk/nsAppShell.cpp

@@ -1,459 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "prmon.h"
-#include "nsCOMPtr.h"
-#include "nsAppShell.h"
-#include "nsIAppShell.h"
-#include "nsIServiceManager.h"
-#include "nsIEventQueueService.h"
-#include "nsICmdLineService.h"
-#include "nsGtkEventHandler.h"
-#include <stdlib.h>
-
-#ifdef MOZ_GLE
-#include <gle/gle.h>
-#endif
-
-#include "nsIWidget.h"
-#include "nsIPref.h"
-
-
-#include "glib.h"
-
-struct OurGdkIOClosure {
-  GdkInputFunction  function;
-  gpointer          data;
-};
-
-static gboolean
-our_gdk_io_invoke(GIOChannel* source, GIOCondition condition, gpointer data)
-{
-  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
-  if (ioc) {
-    (*ioc->function)(ioc->data, g_io_channel_unix_get_fd(source),
-                     GDK_INPUT_READ);
-  }
-  return TRUE;
-}
-
-static void
-our_gdk_io_destroy(gpointer data)
-{
-  OurGdkIOClosure* ioc = (OurGdkIOClosure*) data;
-  if (ioc) {
-    g_free(ioc);
-  }
-}
-
-static gint
-our_gdk_input_add (gint              source,
-                   GdkInputFunction  function,
-                   gpointer          data,
-                   gint              priority)
-{
-  guint result;
-  OurGdkIOClosure *closure = g_new (OurGdkIOClosure, 1);
-  GIOChannel *channel;
-
-  closure->function = function;
-  closure->data = data;
-
-  channel = g_io_channel_unix_new (source);
-  result = g_io_add_watch_full (channel, priority, G_IO_IN,
-                                our_gdk_io_invoke,
-                                closure, our_gdk_io_destroy);
-  g_io_channel_unref (channel);
-
-  return result;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// XPCOM CIDs
-//
-//-------------------------------------------------------------------------
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
-static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
-
-// a linked, ordered list of event queues and their tokens
-class EventQueueToken {
-public:
-  EventQueueToken(nsIEventQueue *aQueue, const gint aToken);
-  virtual ~EventQueueToken();  
-  nsIEventQueue   *mQueue;
-  gint mToken;
-  EventQueueToken *mNext;
-};
-
-EventQueueToken::EventQueueToken(nsIEventQueue *aQueue, const gint aToken) {
-  mQueue = aQueue;
-  NS_IF_ADDREF(mQueue);
-  mToken = aToken;
-  mNext = 0;
-}
-
-EventQueueToken::~EventQueueToken(){
- NS_IF_RELEASE(mQueue);
-}
-
-class EventQueueTokenQueue {
-public:
-  EventQueueTokenQueue();
-  virtual ~EventQueueTokenQueue();
-  nsresult PushToken(nsIEventQueue *aQueue, gint aToken);
-  PRBool PopToken(nsIEventQueue *aQueue, gint *aToken);
-
-private:
-  EventQueueToken *mHead;
-};
-
-EventQueueTokenQueue::EventQueueTokenQueue() {
-  mHead = 0;
-}
-
-EventQueueTokenQueue::~EventQueueTokenQueue() {
-
-  // if we reach this point with an empty token queue, well, fab. however,
-  // we expect the first event queue to still be active. so we take
-  // special care to unhook that queue (not that failing to do so seems
-  // to hurt anything). more queues than that would be an error.
-//NS_ASSERTION(!mHead || !mHead->mNext, "event queue token list deleted when not empty");
-  // (and skip the assertion for now. we're leaking event queues because they
-  // are referenced by things that leak, so this assertion goes off a lot.)
-  if (mHead) {
-    gdk_input_remove(mHead->mToken);
-    delete mHead;
-    // and leak the rest. it's an error, anyway
-  }
-}
-
-nsresult EventQueueTokenQueue::PushToken(nsIEventQueue *aQueue, gint aToken) {
-  EventQueueToken *newToken = new EventQueueToken(aQueue, aToken);
-  NS_ASSERTION(newToken, "couldn't allocate token queue element");
-  if (!newToken)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  newToken->mNext = mHead;
-  mHead = newToken;
-  return NS_OK;
-}
-
-PRBool EventQueueTokenQueue::PopToken(nsIEventQueue *aQueue, gint *aToken) {
-  EventQueueToken *token, *lastToken;
-  PRBool          found = PR_FALSE;
-  NS_ASSERTION(mHead, "attempt to retrieve event queue token from empty queue");
-  if (mHead)
-    NS_ASSERTION(mHead->mQueue == aQueue, "retrieving event queue from past head of queue queue");
-
-  token = mHead;
-  lastToken = 0;
-  while (token && token->mQueue != aQueue) {
-    lastToken = token;
-    token = token->mNext;
-  }
-  if (token) {
-    if (lastToken)
-      lastToken->mNext = token->mNext;
-    else
-      mHead = token->mNext;
-    found = PR_TRUE;
-    *aToken = token->mToken;
-    delete token;
-  }
-  return found;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell constructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::nsAppShell()
-{
-  NS_INIT_REFCNT();
-  mDispatchListener = 0;
-  mEventQueueTokens = new EventQueueTokenQueue();
-  // throw on error would really be civilized here
-  NS_ASSERTION(mEventQueueTokens, "couldn't allocate event queue token queue");
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell destructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::~nsAppShell()
-{
-  delete mEventQueueTokens;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsISupports implementation macro
-//
-//-------------------------------------------------------------------------
-
-NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell)
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener)
-{
-  mDispatchListener = aDispatchListener;
-  return NS_OK;
-}
-
-static void event_processor_callback(gpointer data,
-                                     gint source,
-                                     GdkInputCondition condition)
-{
-  nsIEventQueue *eventQueue = (nsIEventQueue*)data;
-  if (eventQueue)
-    eventQueue->ProcessPendingEvents();
-}
-
-#define PREF_NCOLS "browser.ncols"
-#define PREF_INSTALLCMAP "browser.installcmap"
-
-static void
-HandleColormapPrefs( void )
-{
-	PRInt32 ivalue = 0;
-        PRBool bvalue;
-	nsresult rv;
-
-	/* The default is to do nothing. INSTALLCMAP has precedence over
-	   NCOLS. Ignore the fact we can't do this if it fails, as it is
-	   not critical */
- 
-	NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
-	if (NS_FAILED(rv) || (!prefs)) 
-		return;
-       
-	/* first check ncols */
- 
-	rv = prefs->GetIntPref(PREF_NCOLS, &ivalue);
-	if (NS_SUCCEEDED(rv) && ivalue >= 0 && ivalue <= 255 ) {
-		gdk_rgb_set_min_colors( ivalue );
-		return;
-	}
-
-	/* next check installcmap */
-
-	rv = prefs->GetBoolPref(PREF_INSTALLCMAP, &bvalue);
-	if (NS_SUCCEEDED(rv)) {
-		if ( PR_TRUE == bvalue )
-			gdk_rgb_set_min_colors( 255 );	// force it
-		else
-			gdk_rgb_set_min_colors( 0 );
-	}
-}
-	
-//-------------------------------------------------------------------------
-//
-// Create the application shell
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsAppShell::Create(int *bac, char **bav)
-{
-  gchar *home=nsnull;
-  gchar *path=nsnull;
-
-  int argc = bac ? *bac : 0;
-  char **argv = bav;
-#if 1
-  nsresult rv;
-
-  NS_WITH_SERVICE(nsICmdLineService, cmdLineArgs, kCmdLineServiceCID, &rv);
-  if (NS_SUCCEEDED(rv))
-  {
-    rv = cmdLineArgs->GetArgc(&argc);
-    if(NS_FAILED(rv))
-      argc = bac ? *bac : 0;
-
-    rv = cmdLineArgs->GetArgv(&argv);
-    if(NS_FAILED(rv))
-      argv = bav;
-  }
-#endif
-
-  gtk_set_locale ();
-
-  gtk_init (&argc, &argv);
-
-  // It is most convenient for us to intercept our events after
-  // they have been converted to GDK, but before GTK+ gets them
-  gdk_event_handler_set (handle_gdk_event, NULL, NULL);
-
-#ifdef MOZ_GLE
-  gle_init (&argc, &argv);
-#endif
-
-  // delete the cmdLineArgs thing?
-
-  HandleColormapPrefs();
-  gdk_rgb_init();
-
-  home = g_get_home_dir();
-  if ((char*)nsnull != home) {
-    path = g_strdup_printf("%s%c%s", home, G_DIR_SEPARATOR, ".gtkrc");
-    if ((char *)nsnull != path) {
-      gtk_rc_parse(path);
-      g_free(path);
-    }
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spinup - do any preparation necessary for running a message loop
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Spinup()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spindown - do any cleanup necessary for finishing a message loop
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Spindown()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Run
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsAppShell::Run()
-{
-  NS_ADDREF_THIS();
-  nsresult   rv = NS_OK;
-  nsIEventQueue * EQueue = nsnull;
-
-  // Get the event queue service 
-  NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-  if (NS_FAILED(rv)) {
-    NS_ASSERTION("Could not obtain event queue service", PR_FALSE);
-    return rv;
-  }
-
-#ifdef DEBUG
-  printf("Got the event queue from the service\n");
-#endif /* DEBUG */
-
-  //Get the event queue for the thread.
-  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
-
-  // If a queue already present use it.
-  if (EQueue)
-    goto done;
-
-  // Create the event queue for the thread
-  rv = eventQService->CreateThreadEventQueue();
-  if (NS_OK != rv) {
-    NS_ASSERTION("Could not create the thread event queue", PR_FALSE);
-    return rv;
-  }
-  //Get the event queue for the thread
-  rv = eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &EQueue);
-  if (NS_OK != rv) {
-    NS_ASSERTION("Could not obtain the thread event queue", PR_FALSE);
-    return rv;
-  }    
-
-
-done:
-
-#ifdef DEBUG
-  printf("Calling gdk_input_add with event queue\n");
-#endif /* DEBUG */
-
-  // (has to be called explicitly for this, the primordial appshell, because
-  // of startup ordering problems.)
-  ListenToEventQueue(EQueue, PR_TRUE);
-
-  gtk_main();
-
-  NS_IF_RELEASE(EQueue);
-  Release();
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Exit a message handler loop
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsAppShell::Exit()
-{
-  gtk_main_quit ();
-
-  return NS_OK;
-}
-
-// does nothing. used by xp code with non-gtk expectations.
-// this method will be removed once xp eventloops are working.
-NS_IMETHODIMP nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *& aEvent)
-{
-  aRealEvent = PR_FALSE;
-  aEvent = 0;
-  return NS_OK;
-}
-
-// simply executes one iteration of the event loop. used by xp code with
-// non-gtk expectations.
-// this method will be removed once xp eventloops are working.
-NS_IMETHODIMP nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
-{
-  g_main_iteration(PR_TRUE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsAppShell::ListenToEventQueue(nsIEventQueue *aQueue,
-                                             PRBool aListen)
-{
-  // tell gdk to listen to the event queue or not
-
-  gint queueToken;
-  if (aListen) {
-    queueToken = our_gdk_input_add(aQueue->GetEventQueueSelectFD(),
-                                   event_processor_callback,
-                                   aQueue, G_PRIORITY_DEFAULT_IDLE);
-    mEventQueueTokens->PushToken(aQueue, queueToken);
-  } else {
-    if (mEventQueueTokens->PopToken(aQueue, &queueToken))
-      gdk_input_remove(queueToken);
-  }
-  return NS_OK;
-}
-

mozilla/widget/src/gtk/nsAppShell.h

@@ -1,50 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsAppShell_h__
-#define nsAppShell_h__
-
-#include "nsIAppShell.h"
-#include <gtk/gtk.h>
-
-/**
- * Native GTK+ Application shell wrapper
- */
-
-class  EventQueueTokenQueue;
-
-class nsAppShell : public nsIAppShell
-{
-public:
-  nsAppShell();
-  virtual ~nsAppShell();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIAPPSHELL
-
-private:
-  nsDispatchListener   *mDispatchListener;
-  EventQueueTokenQueue *mEventQueueTokens;
-};
-
-#endif // nsAppShell_h__
-

mozilla/widget/src/gtk/nsButton.cpp

@@ -1,156 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsGtkEventHandler.h"
-
-#include "nsButton.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsButton, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsButton, nsIButton, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsButton constructor
-//
-//-------------------------------------------------------------------------
-nsButton::nsButton() : nsWidget() , nsIButton()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Button widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::CreateNative(GtkObject *parentWindow)
-{
-#ifdef USE_SUPERWIN
-    if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif
-
-  mWidget = gtk_button_new_with_label("");
-  gtk_widget_set_name(mWidget, "nsButton");
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsButton destructor
-//
-//-------------------------------------------------------------------------
-nsButton::~nsButton()
-{
-}
-
-void nsButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mWidget);
-  InstallButtonReleaseSignal(mWidget);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::SetLabel(const nsString& aText)
-{
-  NS_ALLOC_STR_BUF(label, aText, 256);
-
-  gtk_label_set(GTK_LABEL(GTK_BIN (mWidget)->child), label);
-
-  NS_FREE_STR_BUF(label);
-  return (NS_OK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsButton::GetLabel(nsString& aBuffer)
-{
-  char * text;
-
-  gtk_label_get(GTK_LABEL(GTK_BIN (mWidget)->child), &text);
-  aBuffer.SetLength(0);
-  aBuffer.Append(text);
-
-  return (NS_OK);
-
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for button
-//
-//-------------------------------------------------------------------------
-/* virtual */
-void nsButton::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_BIN (mWidget)->child->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsButton.h

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsButton_h__
-#define nsButton_h__
-
-#include "nsWidget.h"
-#include "nsIButton.h"
-
-/**
- * Native GTK+ button wrapper
- */
-class nsButton : public nsWidget,
-                 public nsIButton
-{
-
-public:
-  nsButton();
-  virtual ~nsButton();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIButton part
-  NS_IMETHOD     SetLabel(const nsString& aText);
-  NS_IMETHOD     GetLabel(nsString& aBuffer);
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-};
-
-#endif // nsButton_h__

mozilla/widget/src/gtk/nsCheckButton.cpp

@@ -1,250 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsCheckButton.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsCheckButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsCheckButton, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsCheckButton constructor
-//
-//-------------------------------------------------------------------------
-nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton()
-{
-  NS_INIT_REFCNT();
-  mLabel = nsnull;
-  mCheckButton = nsnull;
-  mState = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsCheckButton destructor
-//
-//-------------------------------------------------------------------------
-nsCheckButton::~nsCheckButton()
-{
-}
-
-void
-nsCheckButton::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCheckButton) {
-    mCheckButton = nsnull;
-  }
-  else if (aGtkWidget == mLabel) {
-    mLabel = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native CheckButton widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsCheckButton::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = gtk_event_box_new();
-  mCheckButton = gtk_check_button_new();
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mCheckButton);
-
-  gtk_widget_show(mCheckButton);
-
-  gtk_widget_set_name(mWidget, "nsCheckButton");
-
-  return NS_OK;
-}
-
-void nsCheckButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mCheckButton);
-  InstallButtonReleaseSignal(mCheckButton);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-
-  // Add in destroy callback
-  gtk_signal_connect(GTK_OBJECT(mCheckButton),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  InstallSignal((GtkWidget *)mCheckButton,
-                (gchar *)"toggled",
-                GTK_SIGNAL_FUNC(nsCheckButton::ToggledSignal));
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::SetState(const PRBool aState)
-{
-  mState = aState;
-
-  if (mWidget && mCheckButton) 
-  {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
-
-    item->active = (gboolean) mState;
-
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::GetState(PRBool& aState)
-{
-  aState = mState;
-    
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this Checkbox label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::SetLabel(const nsString& aText)
-{
-  if (mWidget) {
-    NS_ALLOC_STR_BUF(label, aText, 256);
-    if (mLabel) {
-      gtk_label_set(GTK_LABEL(mLabel), label);
-    } else {
-      mLabel = gtk_label_new(label);
-      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
-      gtk_container_add(GTK_CONTAINER(mCheckButton), mLabel);
-      gtk_widget_show(mLabel);
-      gtk_signal_connect(GTK_OBJECT(mLabel),
-                         "destroy",
-                         GTK_SIGNAL_FUNC(DestroySignal),
-                         this);
-    }
-    NS_FREE_STR_BUF(label);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsCheckButton::GetLabel(nsString& aBuffer)
-{
-  aBuffer.SetLength(0);
-  if (mWidget) {
-    char * text;
-    if (mLabel) {
-      gtk_label_get(GTK_LABEL(mLabel), &text);
-      aBuffer.Append(text);
-    }
-  }
-  return NS_OK;
-}
-
-/* virtual */ void
-nsCheckButton::OnToggledSignal(const gboolean aState)
-{
-  // Untoggle the sonofabitch
-  if (mWidget && mCheckButton) 
-  {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mCheckButton);
-
-    item->active = !item->active;
-
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-}
-//////////////////////////////////////////////////////////////////////
-
-/* static */ gint 
-nsCheckButton::ToggledSignal(GtkWidget *      aWidget, 
-                             gpointer         aData)
-{
-  NS_ASSERTION( nsnull != aWidget, "widget is null");
-
-  nsCheckButton * button = (nsCheckButton *) aData;
-
-  NS_ASSERTION( nsnull != button, "instance pointer is null");
-
-  button->OnToggledSignal(GTK_TOGGLE_BUTTON(aWidget)->active);
-
-  return PR_TRUE;
-}
-
-//////////////////////////////////////////////////////////////////////
-// SetBackgroundColor for CheckButton
-/*virtual*/
-void nsCheckButton::SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark)
-{
-  // use same style copy as SetFont
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  
-  style->bg[GTK_STATE_NORMAL]=*aColorNor;
-  
-  // Mouse over button
-  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
-
-  // Button is down
-  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
-
-  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
-  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  // set style for eventbox too
-  gtk_widget_set_style(mWidget, style);
-
-  gtk_style_unref(style);
-}
-

mozilla/widget/src/gtk/nsCheckButton.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsCheckButton_h__
-#define nsCheckButton_h__
-
-#include "nsWidget.h"
-#include "nsICheckButton.h"
-
-/**
- * Native GTK+ Checkbox wrapper
- */
-
-
-class nsCheckButton : public nsWidget,
-                      public nsICheckButton
-{
-
-public:
-  nsCheckButton();
-  virtual                 ~nsCheckButton();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsICheckButton part
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetLabel(nsString &aBuffer);
-  NS_IMETHOD SetState(const PRBool aState);
-  NS_IMETHOD GetState(PRBool& aState);
-
-  virtual void OnToggledSignal(const gboolean aState);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Sets background for checkbutton
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  GtkWidget *mLabel;
-  GtkWidget *mCheckButton;
-
-  // We need to maintain our own state to be in sync with the
-  // gecko check controlling frame.
-  PRBool     mState;
-
-private:
-
-  static gint ToggledSignal(GtkWidget *      aWidget, 
-                            gpointer         aData);
-};
-
-#endif // nsCheckButton_h__

mozilla/widget/src/gtk/nsClipboard.cpp

@@ -1,872 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsClipboard.h"
-
-#include "nsCOMPtr.h"
-
-#include "nsISupportsArray.h"
-#include "nsIClipboardOwner.h"
-#include "nsITransferable.h"   // kTextMime
-#include "nsISupportsPrimitives.h"
-
-#include "nsIWidget.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsWidgetsCID.h"
-#include "nsXPIDLString.h"
-#include "nsPrimitiveHelpers.h"
-
-#include "nsVoidArray.h"
-
-
-// The class statics:
-GtkWidget* nsClipboard::sWidget = 0;
-
-
-#if defined(DEBUG_mcafee) || defined(DEBUG_pavlov)
-#define DEBUG_CLIPBOARD
-#endif
- 
-enum {
-  TARGET_NONE,
-  TARGET_TEXT_PLAIN,
-  TARGET_TEXT_XIF,
-  TARGET_TEXT_UNICODE,
-  TARGET_TEXT_HTML,
-  TARGET_AOLMAIL,
-  TARGET_IMAGE_PNG,
-  TARGET_IMAGE_JPEG,
-  TARGET_IMAGE_GIF,
-  // compatibility types
-  TARGET_UTF8,
-  TARGET_UNKNOWN,
-  TARGET_LAST
-};
-
-static GdkAtom sSelTypes[TARGET_LAST];
-
-
-//-------------------------------------------------------------------------
-//
-// nsClipboard constructor
-//
-//-------------------------------------------------------------------------
-nsClipboard::nsClipboard() : nsBaseClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("nsClipboard::nsClipboard()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  //NS_INIT_REFCNT();
-  mIgnoreEmptyNotification = PR_FALSE;
-  mClipboardOwner = nsnull;
-  mTransferable   = nsnull;
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  // initialize the widget, etc we're binding to
-  Init();
-}
-
-// XXX if GTK's internal code changes this isn't going to work
-// copied from gtk code because it is a static function we can't get to it.
-// need to bug owen taylor about getting this code public.
-
-typedef struct _GtkSelectionTargetList GtkSelectionTargetList;
-
-struct _GtkSelectionTargetList {
-  GdkAtom selection;
-  GtkTargetList *list;
-};
-
-static const char *gtk_selection_handler_key = "gtk-selection-handlers";
-
-void __gtk_selection_target_list_remove (GtkWidget *widget)
-{
-  GtkSelectionTargetList *sellist;
-  GList *tmp_list;
-  GList *lists;
-  lists = (GList*)gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
-  tmp_list = lists;
-  while (tmp_list)
-    {
-      sellist = (GtkSelectionTargetList*)tmp_list->data;
-      gtk_target_list_unref (sellist->list);
-      g_free (sellist);
-      tmp_list = tmp_list->next;
-    }
-  g_list_free (lists);
-  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsClipboard destructor
-//
-//-------------------------------------------------------------------------
-nsClipboard::~nsClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::~nsClipboard()\n");  
-#endif /* DEBUG_CLIPBOARD */
-
-  // Remove all our event handlers:
-  if (sWidget &&
-      (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window))
-    gtk_selection_remove_all(sWidget);
-
-  // free the selection data, if any
-  if (mSelectionData.data != nsnull)
-    g_free(mSelectionData.data);
-
-  nsClipboard *cb = (nsClipboard*)gtk_object_get_data(GTK_OBJECT(sWidget), "cb");
-  if (cb != nsnull)
-  {
-    NS_RELEASE(cb);
-    gtk_object_remove_data(GTK_OBJECT(sWidget), "cb");
-  }
-
-  if (sWidget)
-  {
-    gtk_widget_destroy(sWidget);
-    sWidget = nsnull;
-  }
-}
-
-
-// 
-// GTK Weirdness!
-// This is here in the hope of being able to call
-//  gtk_selection_add_targets(w, GDK_SELECTION_PRIMARY,
-//                            targets,
-//                            1);
-// instead of
-//   gtk_selection_add_target(sWidget, 
-//                            GDK_SELECTION_PRIMARY,
-//                            GDK_SELECTION_TYPE_STRING,
-//                            GDK_SELECTION_TYPE_STRING);
-// but it turns out that this changes the whole gtk selection model;
-// when calling add_targets copy uses selection_clear_event and the
-// data structure needs to be filled in in a way that we haven't
-// figured out; when using add_target copy uses selection_get and
-// the data structure is already filled in as much as it needs to be.
-// Some gtk internals wizard will need to solve this mystery before
-// we can use add_targets().
-//static GtkTargetEntry targets[] = {
-//  { "strings n stuff", GDK_SELECTION_TYPE_STRING, GDK_SELECTION_TYPE_STRING }
-//};
-//
-
-//-------------------------------------------------------------------------
-void nsClipboard::Init(void)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("nsClipboard::Init\n");
-#endif
-
-  sSelTypes[TARGET_NONE]          = GDK_NONE;
-  sSelTypes[TARGET_TEXT_PLAIN]    = gdk_atom_intern(kTextMime, FALSE);
-  sSelTypes[TARGET_TEXT_XIF]      = gdk_atom_intern(kXIFMime, FALSE);
-  sSelTypes[TARGET_TEXT_UNICODE]  = gdk_atom_intern(kUnicodeMime, FALSE);
-  sSelTypes[TARGET_UTF8]          = gdk_atom_intern("UTF8", FALSE);
-  sSelTypes[TARGET_TEXT_HTML]     = gdk_atom_intern(kHTMLMime, FALSE);
-  sSelTypes[TARGET_AOLMAIL]       = gdk_atom_intern(kAOLMailMime, FALSE);
-  sSelTypes[TARGET_IMAGE_PNG]     = gdk_atom_intern(kPNGImageMime, FALSE);
-  sSelTypes[TARGET_IMAGE_JPEG]    = gdk_atom_intern(kJPEGImageMime, FALSE);
-  sSelTypes[TARGET_IMAGE_GIF]     = gdk_atom_intern(kGIFImageMime, FALSE);
-  // compatibility with other apps
-
-
-  // create invisible widget to use for the clipboard
-  sWidget = gtk_invisible_new();
-
-  // add the clipboard pointer to the widget so we can get it.
-  gtk_object_set_data(GTK_OBJECT(sWidget), "cb", this);
-
-  NS_ADDREF_THIS();
-
-  // Handle selection requests if we called gtk_selection_add_target:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_get",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionGetCB),
-                     nsnull);
-
-  // When someone else takes the selection away:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_clear_event",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionClearCB),
-                     nsnull);
-
-  // Set up the paste handler:
-  gtk_signal_connect(GTK_OBJECT(sWidget), "selection_received",
-                     GTK_SIGNAL_FUNC(nsClipboard::SelectionReceivedCB),
-                     nsnull);
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
-{
-  mIgnoreEmptyNotification = PR_TRUE;
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == mTransferable) {
-    printf("nsClipboard::SetNativeClipboardData(): no transferable!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // are we already the owner?
-  if (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == sWidget->window)
-  {
-    // if so, clear all the targets
-    __gtk_selection_target_list_remove(sWidget);
-    //    gtk_selection_remove_all(sWidget);
-  }
-
-  // we arn't already the owner, so we will become it
-  gint have_selection = gtk_selection_owner_set(sWidget,
-                                                GDK_SELECTION_PRIMARY,
-                                                GDK_CURRENT_TIME);
-  if (have_selection == 0)
-    return NS_ERROR_FAILURE;
-
-  // get flavor list that includes all flavors that can be written (including ones 
-  // obtained through conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = mTransferable->FlavorsTransferableCanExport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  for ( PRUint32 i=0; i<cnt; ++i )
-  {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString(getter_Copies(flavorStr));
-      gint format = GetFormat(flavorStr);
-
-      // add these types as selection targets
-      RegisterFormat(format);
-    }
-  }
-
-  mIgnoreEmptyNotification = PR_FALSE;
-
-  return NS_OK;
-}
-
-void nsClipboard::AddTarget(GdkAtom aAtom)
-{
-  gtk_selection_add_target(sWidget,
-                           GDK_SELECTION_PRIMARY,
-                           aAtom, aAtom);
-}
-
-gint nsClipboard::GetFormat(const char* aMimeStr)
-{
-  gint type = TARGET_NONE;
-  nsCAutoString mimeStr ( CBufDescriptor(NS_CONST_CAST(char*,aMimeStr), PR_TRUE, PL_strlen(aMimeStr)+1) );
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::GetFormat(%s)\n", aMimeStr);
-#endif
-  if (mimeStr.Equals(kTextMime)) {
-    type = TARGET_TEXT_PLAIN;
-  } else if (mimeStr.Equals("STRING")) {
-    type = TARGET_TEXT_PLAIN;
-  } else if (mimeStr.Equals(kXIFMime)) {
-    type = TARGET_TEXT_XIF;
-  } else if (mimeStr.Equals(kUnicodeMime)) {
-    type = TARGET_TEXT_UNICODE;
-  } else if (mimeStr.Equals(kHTMLMime)) {
-    type = TARGET_TEXT_HTML;
-  } else if (mimeStr.Equals(kAOLMailMime)) {
-    type = TARGET_AOLMAIL;
-  } else if (mimeStr.Equals(kPNGImageMime)) {
-    type = TARGET_IMAGE_PNG;
-  } else if (mimeStr.Equals(kJPEGImageMime)) {
-    type = TARGET_IMAGE_JPEG;
-  } else if (mimeStr.Equals(kGIFImageMime)) {
-    type = TARGET_IMAGE_GIF;
-  }
-
-#ifdef WE_DO_DND
-  else if (mimeStr.Equals(kDropFilesMime)) {
-    format = CF_HDROP;
-  } else {
-    format = ::RegisterClipboardFormat(aMimeStr);
-  }
-#endif
-  return type;
-}
-
-void nsClipboard::RegisterFormat(gint format)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::RegisterFormat(%s)\n", gdk_atom_name(sSelTypes[format]));
-#endif
-
-  /* when doing the selection_add_target, each case should have the same last parameter
-     which matches the case match */
-  switch(format)
-  {
-  case TARGET_TEXT_PLAIN:
-    // text/plain (default)
-    AddTarget(sSelTypes[format]);
-
-    // STRING (what X uses)
-    AddTarget(GDK_SELECTION_TYPE_STRING);
-    break;
-
-
-  case TARGET_TEXT_XIF:
-    // text/xif (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_TEXT_UNICODE:
-    // text/unicode (default)
-    AddTarget(sSelTypes[format]);
-
-    // UTF8 (what X uses)
-    AddTarget(sSelTypes[TARGET_UTF8]);
-    break;
-
-
-  case TARGET_TEXT_HTML:
-    // text/html (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_AOLMAIL:
-    // text/aolmail (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_PNG:
-    // image/png (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_JPEG:
-    // image/jpeg (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  case TARGET_IMAGE_GIF:
-    // image/gif (default)
-    AddTarget(sSelTypes[format]);
-    break;
-
-
-  default:
-    // if we don't match something above, then just add it like its something we know about...
-    AddTarget(sSelTypes[format]);
-  }
-}
-
-PRBool nsClipboard::DoRealConvert(GdkAtom type)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("    nsClipboard::DoRealConvert(%li)\n    {\n", type);
-#endif
-  int e = 0;
-  // Set a flag saying that we're blocking waiting for the callback:
-  mBlocking = PR_TRUE;
-
-  //
-  // ask X what kind of data we can get
-  //
-#ifdef DEBUG_CLIPBOARD
-  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
-#endif
-  gtk_selection_convert(sWidget,
-                        GDK_SELECTION_PRIMARY,
-                        type,
-                        GDK_CURRENT_TIME);
-
-  // Now we need to wait until the callback comes in ...
-  // i is in case we get a runaway (yuck).
-#ifdef DEBUG_CLIPBOARD
-  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
-#endif /* DEBUG_CLIPBOARD */
-  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
-  {
-    gtk_main_iteration_do(PR_TRUE);
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  g_print("    }\n");
-#endif
-
-  if (mSelectionData.length > 0)
-    return PR_TRUE;
-
-  return PR_FALSE;
-}
-
-/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
-PRBool nsClipboard::DoConvert(gint format)
-{
-#ifdef DEBUG_CLIPBOARD
-  g_print("  nsClipboard::DoConvert(%s)\n", gdk_atom_name(sSelTypes[format]));
-#endif
-
-  /* when doing the selection_add_target, each case should have the same last parameter
-     which matches the case match */
-  PRBool r = PR_FALSE;
-
-  switch(format)
-  {
-  case TARGET_TEXT_PLAIN:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    r = DoRealConvert(GDK_SELECTION_TYPE_STRING);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_XIF:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_UNICODE:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    r = DoRealConvert(sSelTypes[TARGET_UTF8]);
-    if (r) return r;
-    break;
-
-  case TARGET_TEXT_HTML:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_AOLMAIL:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_PNG:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_JPEG:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  case TARGET_IMAGE_GIF:
-    r = DoRealConvert(sSelTypes[format]);
-    if (r) return r;
-    break;
-
-  default:
-    g_print("DoConvert called with bogus format\n");
-  }
-  return r;
-}
-
-//-------------------------------------------------------------------------
-//
-// The blocking Paste routine
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP
-nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
-{
-
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::GetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == aTransferable) {
-    printf("  GetNativeClipboardData: Transferable is null!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through
-  // conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  // Walk through flavors and see which flavor matches the one being pasted:
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  nsCAutoString foundFlavor;
-  for ( PRUint32 i = 0; i < cnt; ++i ) {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString ( getter_Copies(flavorStr) );
-      gint format = GetFormat(flavorStr);
-      if (DoConvert(format)) {
-        foundFlavor = flavorStr;
-        break;
-      }
-    }
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  Got the callback: '%s', %d\n",
-         mSelectionData.data, mSelectionData.length);
-#endif /* DEBUG_CLIPBOARD */
-
-  // We're back from the callback, no longer blocking:
-  mBlocking = PR_FALSE;
-
-  // 
-  // Now we have data in mSelectionData.data.
-  // We just have to copy it to the transferable.
-  // 
-
-#if 0  
-// pinkerton - we have the flavor already from above, so we don't need
-// to re-derrive it.
-  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
-  int format = GetFormat(*name);
-  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
-#endif
-
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
-  aTransferable->SetTransferData(foundFlavor,
-                                 genericDataWrapper,
-                                 mSelectionData.length);
-
-//delete name;
-  
-  // transferable is now copying the data, so we can free it.
-  //  g_free(mSelectionData.data);
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  return NS_OK;
-}
-
-/**
- * Called when the data from a paste comes in (recieved from gdk_selection_convert)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aTime time the selection was requested
- */
-void
-nsClipboard::SelectionReceivedCB (GtkWidget        *aWidget,
-                                  GtkSelectionData *aSelectionData,
-                                  guint             aTime)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("      nsClipboard::SelectionReceivedCB\n      {\n");
-#endif /* DEBUG_CLIPBOARD */
-  nsClipboard *cb =(nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                      "cb");
-  if (!cb)
-  {
-    g_print("no clipboard found.. this is bad.\n");
-    return;
-  }
-  cb->SelectionReceiver(aWidget, aSelectionData);
-#ifdef DEBUG_CLIPBOARD
-  g_print("      }\n");
-#endif
-}
-
-
-/**
- * local method (called from nsClipboard::SelectionReceivedCB)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- */
-void
-nsClipboard::SelectionReceiver (GtkWidget *aWidget,
-                                GtkSelectionData *aSD)
-{
-  gint type;
-
-  mBlocking = PR_FALSE;
-
-  if (aSD->length < 0)
-  {
-    printf("        Error retrieving selection: length was %d\n",
-           aSD->length);
-    return;
-  }
-
-  type = TARGET_NONE;
-  for (int i=0; i < TARGET_LAST; i++)
-  {
-    if (sSelTypes[i] == aSD->type)
-    {
-      type = i;
-      break;
-    }
-  }
-
-  switch (type)
-  {
-  case GDK_TARGET_STRING:
-  case TARGET_UTF8:
-  case TARGET_TEXT_PLAIN:
-  case TARGET_TEXT_XIF:
-  case TARGET_TEXT_UNICODE:
-  case TARGET_TEXT_HTML:
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Copying mSelectionData pointer -- ");
-#endif
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
-#endif
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    // Null terminate in case anyone cares,
-    // and so we can print the string for debugging:
-    mSelectionData.data[aSD->length] = '\0';
-    mSelectionData.length = aSD->length;
-    return;
-
-  default:
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    mSelectionData.length = aSD->length;
-    return;
-  }
-}
-
-
-
-/**
- * Some platforms support deferred notification for putting data on the clipboard
- * This method forces the data onto the clipboard in its various formats
- * This may be used if the application going away.
- *
- * @result NS_OK if successful.
- */
-NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::ForceDataToClipboard()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (nsnull == mTransferable) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsClipboard::HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult)
-{
-  *outResult = PR_TRUE;  // say we always do.
-  return NS_OK;
-}
-
-
-/**
- * This is the callback which is called when another app
- * requests the selection.
- *
- * @param  widget The widget
- * @param  aSelectionData Selection data
- * @param  info Value passed in from the callback init
- * @param  time Time when the selection request came in
- */
-void nsClipboard::SelectionGetCB(GtkWidget        *widget,
-                                 GtkSelectionData *aSelectionData,
-                                 guint            aInfo,
-                                 guint            aTime)
-{ 
-#ifdef DEBUG_CLIPBOARD
-  printf("nsClipboard::SelectionGetCB\n"); 
-#endif /* DEBUG_CLIPBOARD */
-
-  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(widget),
-                                                       "cb");
-
-  void     *clipboardData;
-  PRUint32 dataLength;
-  nsresult rv;
-
-  // Make sure we have a transferable:
-  if (!cb->mTransferable) {
-    printf("Clipboard has no transferable!\n");
-    return;
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  g_print("  aInfo == %d -", aInfo);
-#endif
-
-  char* dataFlavor = nsnull;
-
-  // switch aInfo (atom) to our enum
-  int type = (int)aInfo;
-  for (int i=0; i < TARGET_LAST; i++)
-  {
-    if (sSelTypes[i] == aInfo)
-    {
-      type = i;
-      break;
-    }
-  }
-
-  switch(type)
-    {
-    case GDK_TARGET_STRING:
-    case TARGET_TEXT_PLAIN:
-      dataFlavor = kTextMime;
-      break;
-    case TARGET_TEXT_XIF:
-      dataFlavor = kXIFMime;
-      break;
-    case TARGET_TEXT_UNICODE:
-    case TARGET_UTF8:
-      dataFlavor = kUnicodeMime;
-      break;
-    case TARGET_TEXT_HTML:
-      dataFlavor = kHTMLMime;
-      break;
-    case TARGET_AOLMAIL:
-      dataFlavor = kAOLMailMime;
-      break;
-    case TARGET_IMAGE_PNG:
-      dataFlavor = kPNGImageMime;
-      break;
-    case TARGET_IMAGE_JPEG:
-      dataFlavor = kJPEGImageMime;
-      break;
-    case TARGET_IMAGE_GIF:
-      dataFlavor = kGIFImageMime;
-      break;
-    default:
-      {
-        /* handle outside things */
-      }
-    }
-#ifdef DEBUG_CLIPBOARD
-  g_print("- aInfo is for %s\n", gdk_atom_name(aInfo));
-#endif
-
-  // Get data out of transferable.
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  rv = cb->mTransferable->GetTransferData(dataFlavor, 
-                                          getter_AddRefs(genericDataWrapper),
-                                          &dataLength);
-  nsPrimitiveHelpers::CreateDataFromPrimitive ( dataFlavor, genericDataWrapper, &clipboardData, dataLength );
-  if (NS_SUCCEEDED(rv) && clipboardData && dataLength > 0) {
-    size_t size = 1;
-    // find the number of bytes in the data for the below thing
-    //    size_t size = sizeof((void*)((unsigned char)clipboardData[0]));
-    //    g_print("************  *****************      ******************* %i\n", size);
-
-    gtk_selection_data_set(aSelectionData,
-                           aInfo, size*8,
-                           (unsigned char *)clipboardData,
-                           dataLength);
-    nsCRT::free ( NS_REINTERPRET_CAST(char*, clipboardData) );
-  }
-  else
-    printf("Transferable didn't support the data flavor\n");
-}
-
-
-/**
- * Called when another app requests selection ownership
- *
- * @param  aWidget the widget
- * @param  aEvent the GdkEvent for the selection
- * @param  aData value passed in from the callback init
- */
-void nsClipboard::SelectionClearCB(GtkWidget *aWidget,
-                                   GdkEventSelection *aEvent,
-                                   gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionClearCB\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  nsClipboard *cb = (nsClipboard *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                       "cb");
-
-  cb->EmptyClipboard();
-}
-
-
-/**
- * The routine called when another app asks for the content of the selection
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aData value passed in from the callback init
- */
-void
-nsClipboard::SelectionRequestCB (GtkWidget *aWidget,
-                                 GtkSelectionData *aSelectionData,
-                                 gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionRequestCB\n");
-#endif /* DEBUG_CLIPBOARD */
-}
-
-/**
- * ...
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aData value passed in from the callback init
- */
-void
-nsClipboard::SelectionNotifyCB (GtkWidget *aWidget,
-                                GtkSelectionData *aSelectionData,
-                                gpointer aData)
-{
-#ifdef DEBUG_CLIPBOARD
-  printf("  nsClipboard::SelectionNotifyCB\n");
-#endif /* DEBUG_CLIPBOARD */
-}

mozilla/widget/src/gtk/nsClipboard.h

@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsClipboard_h__
-#define nsClipboard_h__
-
-#include "nsBaseClipboard.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkinvisible.h>
-
-class nsITransferable;
-class nsIClipboardOwner;
-class nsIWidget;
-
-/**
- * Native Gtk Clipboard wrapper
- */
-
-class nsClipboard : public nsBaseClipboard
-{
-
-public:
-  nsClipboard();
-  virtual ~nsClipboard();
-
-  // nsIClipboard  
-  NS_IMETHOD ForceDataToClipboard();
-  NS_IMETHOD HasDataMatchingFlavors(nsISupportsArray* aFlavorList, PRBool * outResult);
-
-  // invisible widget.  also used by dragndrop
-  static GtkWidget *sWidget;
-
-protected:
-  NS_IMETHOD SetNativeClipboardData();
-  NS_IMETHOD GetNativeClipboardData(nsITransferable * aTransferable);
-
-  PRBool  mIgnoreEmptyNotification;
-
-  void AddTarget(GdkAtom aAtom);
-
-  gint GetFormat(const char* aMimeStr);
-  void RegisterFormat(gint format);
-
-
-  PRBool DoRealConvert(GdkAtom type);
-  PRBool DoConvert(gint format);
-
-  void Init(void);
-
-  // Used for communicating pasted data
-  // from the asynchronous X routines back to a blocking paste:
-  GtkSelectionData mSelectionData;
-  PRBool mBlocking;
-
-  void SelectionReceiver(GtkWidget *aWidget,
-                         GtkSelectionData *aSD);
-
-  /**
-   * This is the callback which is called when another app
-   * requests the selection.
-   *
-   * @param  widget The widget
-   * @param  aSelectionData Selection data
-   * @param  info Value passed in from the callback init
-   * @param  time Time when the selection request came in
-   */
-  static void SelectionGetCB(GtkWidget *aWidget, 
-                             GtkSelectionData *aSelectionData,
-                             guint      /*info*/,
-                             guint      /*time*/);
-
-  /**
-   * Called when another app requests selection ownership
-   *
-   * @param  aWidget the widget
-   * @param  aEvent the GdkEvent for the selection
-   * @param  aData value passed in from the callback init
-   */
-  static void SelectionClearCB(GtkWidget *aWidget, 
-                               GdkEventSelection *aEvent,
-                               gpointer aData);
-
-  /**
-   * The routine called when another app asks for the content of the selection
-   *
-   * @param  aWidget the widget
-   * @param  aSelectionData gtk selection stuff
-   * @param  aData value passed in from the callback init
-   */
-  static void SelectionRequestCB(GtkWidget *aWidget,
-                                 GtkSelectionData *aSelectionData,
-                                 gpointer data);
-  
-  /**
-   * Called when the data from a paste comes in
-   *
-   * @param  aWidget the widget
-   * @param  aSelectionData gtk selection stuff
-   * @param  aTime time the selection was requested
-   */
-  static void SelectionReceivedCB(GtkWidget *aWidget,
-                                  GtkSelectionData *aSelectionData,
-                                  guint aTime);
-
-
-  static void SelectionNotifyCB(GtkWidget *aWidget,
-                                GtkSelectionData *aSelectionData,
-                                gpointer aData);
-  
-
-};
-
-#endif // nsClipboard_h__

mozilla/widget/src/gtk/nsComboBox.cpp

@@ -1,357 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsComboBox.h"
-#include "nsGUIEvent.h"
-#include "nsString.h"
-
-#define DBG 0
-
-#define INITIAL_MAX_ITEMS 128
-#define ITEMS_GROWSIZE    128
-
-NS_IMPL_ADDREF_INHERITED(nsComboBox, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsComboBox, nsWidget)
-NS_IMPL_QUERY_INTERFACE3(nsComboBox, nsIComboBox, nsIListWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsComboBox constructor
-//
-//-------------------------------------------------------------------------
-nsComboBox::nsComboBox() : nsWidget(), nsIListWidget(), nsIComboBox()
-{
-  NS_INIT_REFCNT();
-  mMultiSelect = PR_FALSE;
-  mItems = nsnull;
-  mNumItems = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsComboBox:: destructor
-//
-//-------------------------------------------------------------------------
-nsComboBox::~nsComboBox()
-{
-  if (mItems) {
-    for (GList *items = mItems; items; items = (GList*) g_list_next(items)){
-      g_free(items->data);
-    }
-    g_list_free(mItems);
-  }
-  gtk_widget_destroy(mCombo);
-}
-
-void nsComboBox::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mWidget);
-  InstallButtonReleaseSignal(mWidget);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-   
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |  
-                 GDK_POINTER_MOTION_MASK);
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  initializer
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsComboBox::SetMultipleSelection(PRBool aMultipleSelections)
-{
-  mMultiSelect = aMultipleSelections;
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  AddItemAt
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsComboBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
-{
-  NS_ALLOC_STR_BUF(val, aItem, 256);
-  mItems = g_list_insert( mItems, g_strdup(val), aPosition );
-  mNumItems++;
-  if (mCombo) {
-    gtk_combo_set_popdown_strings( GTK_COMBO( mCombo ), mItems );
-  }
-  NS_FREE_STR_BUF(val);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Finds an item at a postion
-//
-//-------------------------------------------------------------------------
-PRInt32  nsComboBox::FindItem(nsString &aItem, PRInt32 aStartPos)
-{
-  NS_ALLOC_STR_BUF(val, aItem, 256);
-  int i;
-  PRInt32 inx = -1;
-  GList *items = g_list_nth(mItems, aStartPos);
-  for(i=0; items != NULL; items = (GList *) g_list_next(items), i++ )
-    {
-      if(!strcmp(val, (gchar *) items->data))
-        {
-          inx = i;
-          break;
-        }
-    }
-  NS_FREE_STR_BUF(val);
-  return inx;
-}
-
-//-------------------------------------------------------------------------
-//
-//  CountItems - Get Item Count
-//
-//-------------------------------------------------------------------------
-PRInt32  nsComboBox::GetItemCount()
-{
-  return (PRInt32)mNumItems;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool  nsComboBox::RemoveItemAt(PRInt32 aPosition)
-{ 
-  if (aPosition >= 0 && aPosition < mNumItems) {
-
-    g_free(g_list_nth(mItems, aPosition)->data);
-    mItems = g_list_remove_link(mItems, g_list_nth(mItems, aPosition));
-    mNumItems--;
-    if (mCombo) {
-      gtk_combo_set_popdown_strings(GTK_COMBO( mCombo ), mItems);
-    }
-    return PR_TRUE;
-  }
-  else
-    return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool nsComboBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
-{
-  if (aPosition >= 0 && aPosition < mNumItems) {
-    anItem = (gchar *) g_list_nth(mItems, aPosition)->data;
-    return PR_TRUE;
-  }
-  return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the selected of selected item
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::GetSelectedItem(nsString& aItem)
-{
-  aItem.Truncate();
-  if (mCombo) {
-    aItem = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(mCombo)->entry));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the list of selected otems
-//
-//-------------------------------------------------------------------------
-PRInt32 nsComboBox::GetSelectedIndex()
-{
-  nsString nsstring;
-  GetSelectedItem(nsstring);
-  return FindItem(nsstring, 0);
-}
-
-//-------------------------------------------------------------------------
-//
-//  SelectItem
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::SelectItem(PRInt32 aPosition)
-{
-  GList *pos;
-  if (!mItems)
-    return NS_ERROR_FAILURE;
-
-  pos = g_list_nth(mItems, aPosition);
-  if (!pos)
-    return NS_ERROR_FAILURE;
-
-  if (mCombo) {
-    gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(mCombo)->entry),
-                       (gchar *) pos->data);
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedCount
-//
-//-------------------------------------------------------------------------
-PRInt32 nsComboBox::GetSelectedCount()
-{
-  if (!mMultiSelect) {
-    PRInt32 inx = GetSelectedIndex();
-    return (inx == -1? 0 : 1);
-  } else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  // this is an error
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Deselect
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsComboBox::Deselect()
-{
-  if (mMultiSelect) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native GtkCombo widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsComboBox::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = ::gtk_event_box_new();
-
-  ::gtk_widget_set_name(mWidget, "nsComboBox");
-  mCombo = ::gtk_combo_new();
-  gtk_widget_show(mCombo);
-
-  /* make the stuff uneditable */
-  gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(mCombo)->entry), PR_FALSE);
-
-  gtk_signal_connect(GTK_OBJECT(mCombo),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-  gtk_signal_connect(GTK_OBJECT(GTK_COMBO(mCombo)->popwin),
-                     "unmap",
-                     GTK_SIGNAL_FUNC(UnmapSignal),
-                     this);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mCombo);
-
-  return NS_OK;
-}
-
-void
-nsComboBox::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCombo) {
-    mCombo = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-gint
-nsComboBox::UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo)
-{
-  if (!aCombo) return PR_FALSE;
-  aCombo->OnUnmapSignal(aGtkWidget);
-  return PR_TRUE;
-}
-
-void
-nsComboBox::OnUnmapSignal(GtkWidget * aWidget)
-{
-  if (!aWidget) return;
-
-  // Generate a NS_CONTROL_CHANGE event and send it to the frame
-  nsGUIEvent event;
-  event.eventStructType = NS_GUI_EVENT;
-  nsPoint point(0,0);
-  InitEvent(event, NS_CONTROL_CHANGE, &point);
-  DispatchWindowEvent(&event);
-}
-
-//-------------------------------------------------------------------------
-//
-// Get handle for style
-//
-//-------------------------------------------------------------------------
-/*virtual*/
-void nsComboBox::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_BIN (mWidget)->child, style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsComboBox.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsComboBox_h__
-#define nsComboBox_h__
-
-#include "nsWidget.h"
-#include "nsIComboBox.h"
-
-/**
- * Native GTK+ Listbox wrapper
- */
-
-class nsComboBox : public nsWidget,
-                   public nsIListWidget,
-                   public nsIComboBox
-{
-
-public:
-  nsComboBox();
-  virtual ~nsComboBox();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIComboBox interface
-  NS_IMETHOD      AddItemAt(nsString &aItem, PRInt32 aPosition);
-  virtual PRInt32 FindItem(nsString &aItem, PRInt32 aStartPos);
-  virtual PRInt32 GetItemCount();
-  virtual PRBool  RemoveItemAt(PRInt32 aPosition);
-  virtual PRBool  GetItemAt(nsString& anItem, PRInt32 aPosition);
-  NS_IMETHOD      GetSelectedItem(nsString& aItem);
-  virtual PRInt32 GetSelectedIndex();
-  NS_IMETHOD      SelectItem(PRInt32 aPosition);
-  NS_IMETHOD      Deselect() ;
-
-  // nsIComboBox interface
-  NS_IMETHOD      SetMultipleSelection(PRBool aMultipleSelections);
-  PRInt32         GetSelectedCount();
-  NS_IMETHOD      GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-  virtual void OnUnmapSignal(GtkWidget* aWidget);
-  static gint UnmapSignal(GtkWidget* aGtkWidget, nsComboBox* aCombo);
-
-  GtkWidget  *mCombo;  /* workaround for gtkcombo bug */
-  GList *mItems;
-  PRBool  mMultiSelect;
-  int     mNumItems;
-};
-
-#endif // nsComboBox_h__

mozilla/widget/src/gtk/nsContextMenu.cpp

@@ -1,744 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsContextMenu.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNode.h"
-#include "nsIMenuBar.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
-static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-//-------------------------------------------------------------------------
-nsresult nsContextMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenu::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenu*) this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-//-------------------------------------------------------------------------
-NS_IMPL_ADDREF(nsContextMenu)
-NS_IMPL_RELEASE(nsContextMenu)
-
-//-------------------------------------------------------------------------
-//
-// nsContextMenu constructor
-//
-//-------------------------------------------------------------------------
-nsContextMenu::nsContextMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems  = 0;
-  mMenu          = nsnull;
-  mParent        = nsnull;
-  mListener      = nsnull;
-  mConstructCalled = PR_FALSE;
-  
-  mDOMNode       = nsnull;
-  mWebShell      = nsnull;
-  mDOMElement    = nsnull;
-
-  mAlignment      = "topleft";
-  mAnchorAlignment = "none";
-}
-
-//-------------------------------------------------------------------------
-//
-// nsContextMenu destructor
-//
-//-------------------------------------------------------------------------
-nsContextMenu::~nsContextMenu()
-{
-
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::Create(nsISupports *aParent,
-                                const nsString& anAlignment,
-                                const nsString& anAnchorAlignment)
-{
-  if(aParent)
-  {
-    nsIWidget *parent = nsnull;
-    aParent->QueryInterface(nsIWidget::GetIID(), (void**) &parent);
-    if(parent)
-    {
-      mParent = parent;
-      NS_RELEASE(parent);
-    }
-  }
-
-  mAlignment       = anAlignment;
-  mAnchorAlignment = anAnchorAlignment;
-
-  mMenu = gtk_menu_new();
-
-  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
-                      GTK_SIGNAL_FUNC(menu_map_handler),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
-                      GTK_SIGNAL_FUNC(menu_unmap_handler),
-                      this);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetParent(nsISupports*& aParent)
-{
-  aParent = nsnull;
-  if (nsnull != mParent) {
-    return mParent->QueryInterface(kISupportsIID,
-                                   (void**)&aParent);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddItem(nsISupports * aItem)
-{
-  if(aItem)
-  {
-    nsIMenuItem * menuitem = nsnull;
-    aItem->QueryInterface(nsIMenuItem::GetIID(),
-                          (void**)&menuitem);
-    if(menuitem)
-    {
-      AddMenuItem(menuitem); // nsMenu now owns this
-      NS_RELEASE(menuitem);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aItem->QueryInterface(nsIMenu::GetIID(),
-                            (void**)&menu);
-      if(menu)
-      {
-        AddMenu(menu); // nsMenu now owns this
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void      *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  // Need to be adding an nsISupports *, not nsIMenuItem *
-  nsISupports * supports = nsnull;
-  aMenuItem->QueryInterface(kISupportsIID,
-                            (void**)&supports);
-  {
-    mMenuItemVoidArray.AppendElement(supports);
-    mNumMenuItems++;
-  }
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *newmenu=nsnull;
-  char *labelStr;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-  labelStr = Label.ToNewCString();
-
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull,
-                                                   nsIMenuItem::GetIID(),
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, labelStr, PR_FALSE); //PR_TRUE); 
-    NS_RELEASE(supports);               
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-          
-    void * menuitem = nsnull;
-    pnsMenuItem->GetNativeData(menuitem);
-  
-    voidData = NULL;
-    aMenu->GetNativeData(&voidData);
-    newmenu = GTK_WIDGET(voidData);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
-  
-    NS_RELEASE(pnsMenuItem);
-  } 
-
-  nsCRT::free(labelStr);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddSeparator() 
-{
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(
-    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsString tmp = "separator";
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
-    NS_RELEASE(supports);
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports); 
-          
-    NS_RELEASE(pnsMenuItem);
-  } 
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetItemCount(PRUint32 &aCount)
-{
-  // this should be right.. does it need to be +1 ?
-  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
-  //g_print("nsMenu::GetItemCount = %i\n", aCount);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetItemAt(const PRUint32 aCount, nsISupports *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::InsertItemAt(const PRUint32 aCount, nsISupports * aMenuItem)
-{
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::InsertSeparator(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveItem(const PRUint32 aCount)
-{
-#if 0
-  // this may work here better than Removeall(), but i'm not sure how to test this one
-  nsISupports *item = mMenuItemVoidArray[aPos];
-  delete item;
-  mMenuItemVoidArray.RemoveElementAt(aPos);
-#endif
-  /*
-  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
-
-  nsCRT::free(labelStr);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-  */
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveAll()
-{
-  //g_print("nsMenu::RemoveAll()\n");
-#undef DEBUG_pavlov
-#ifdef DEBUG_pavlov
-  // this doesn't work quite right, but this is about all that should really be needed
-  int i=0;
-  nsIMenu *menu = nsnull;
-  nsIMenuItem *menuitem = nsnull;
-  nsISupports *item = nsnull;
-
-  for (i=mMenuItemVoidArray.Count(); i>0; i--)
-  {
-    item = (nsISupports*)mMenuItemVoidArray[i-1];
-
-    if(nsnull != item)
-    {
-      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem))
-      {
-        // we do this twice because we have to do it once for QueryInterface,
-        // then we want to get rid of it.
-        // g_print("remove nsMenuItem\n");
-        NS_RELEASE(menuitem);
-        NS_RELEASE(item);
-        menuitem = nsnull;
-      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
-#ifdef NOISY_MENUS
-        g_print("remove nsMenu\n");
-#endif
-        NS_RELEASE(menu);
-        NS_RELEASE(item);
-        menu = nsnull;
-      }
-      // mMenuItemVoidArray.RemoveElementAt(i-1);
-    }
-  }
-  mMenuItemVoidArray.Clear();
-
-  return NS_OK;
-#else
-  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenuItemVoidArray[i-1]) {
-      nsIMenuItem * menuitem = nsnull;
-      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
-                                                              (void**)&menuitem);
-      if(menuitem) {
-        void *gtkmenuitem = nsnull;
-        menuitem->GetNativeData(gtkmenuitem);
-        if (gtkmenuitem) {
-          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
-          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
-          g_print("%p, %p\n",
-                  GTK_WIDGET(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu)))),
-                  GTK_WIDGET(GTK_WIDGET(gtkmenuitem)->parent));
-          gtk_container_remove(GTK_CONTAINER(GTK_MENU_SHELL(GTK_MENU(mMenu))),
-                               GTK_WIDGET(gtkmenuitem));
-        }
- 
-      } else {
- 
-        nsIMenu * menu= nsnull;
-        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
-                                                                (void**)&menu);
-        if(menu)
-          {
-            void * gtkmenu = nsnull;
-            menu->GetNativeData(&gtkmenu);
- 
-            if(gtkmenu){
-              g_print("nsMenu::RemoveAll() trying to remove nsMenu");
- 
-              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-            }
-          }
- 
-      }
-    }
-  }
-//g_print("end RemoveAll\n");
-  return NS_OK;
-#endif
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::GetNativeData(void ** aData)
-{
-  *aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::AddMenuListener(nsIMenuListener * aMenuListener)
-{
-  mListener = aMenuListener;
-  NS_ADDREF(mListener);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  if (aMenuListener == mListener) {
-    NS_IF_RELEASE(mListener);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-void menu_popup_position(GtkMenu *menu,
-                         gint *x,
-                         gint *y,
-                         gpointer data)
-{
-  nsContextMenu *cm = (nsContextMenu*)data;
-  *x = cm->GetX();
-  *y = cm->GetY();
-}
-
-nsEventStatus nsContextMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  MenuConstruct(aMenuEvent,
-                mParent,
-                mDOMNode,
-                mWebShell);
-
-  //GtkWidget *parent = GTK_WIDGET(mParent->GetNativeData(NS_NATIVE_WIDGET));
-  gtk_menu_popup (GTK_MENU(mMenu),
-                  (GtkWidget*)nsnull, (GtkWidget*)nsnull,
-                  menu_popup_position,
-                  this, 1, GDK_CURRENT_TIME);
-  /*
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  */
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsIMenuItem * nsContextMenu::FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId)
-{
-  return nsnull;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuDeselected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuConstruct(const nsMenuEvent &aMenuEvent,
-                                           nsIWidget         *aParentWindow, 
-                                           void              *menuNode,
-                                           void              *aWebShell)
-{
-  //g_print("nsMenu::MenuConstruct called \n");
-  if(menuNode){
-    SetDOMNode((nsIDOMNode*)menuNode);
-  }
-  
-  if(!aWebShell){
-    aWebShell = mWebShell;
-  }
-
-  // First open the menu.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->SetAttribute("open", "true");
-
-   // Begin menuitem inner loop
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    ((nsIDOMNode*)mDOMNode)->GetFirstChild(getter_AddRefs(menuitemNode));
- 
-    unsigned short menuIndex = 0;
-
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        nsString menuitemName;
-        menuitemElement->GetNodeName(menuitemNodeType);
-        if (menuitemNodeType.Equals("menuitem")) {
-          // LoadMenuItem
-          LoadMenuItem(this,
-                       menuitemElement,
-                       menuitemNode,
-                       menuIndex,
-                       (nsIWebShell*)aWebShell);
-        } else if (menuitemNodeType.Equals("separator")) {
-          AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Load a submenu
-          LoadSubMenu(this, menuitemElement, menuitemNode);
-        }
-      }
-      
-      ++menuIndex;
-      
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsContextMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  // Close the node.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->RemoveAttribute("open");
-
-  //g_print("nsMenu::MenuDestruct called \n");
-  mConstructCalled = PR_FALSE;
-  RemoveAll();
-  return nsEventStatus_eIgnore;
-}
-
-//----------------------------------------
-void nsContextMenu::LoadMenuItem(nsIMenu        *pParentMenu,
-                                 nsIDOMElement  *menuitemElement,
-                                 nsIDOMNode     *menuitemNode,
-                                 unsigned short  menuitemIndex,
-                                 nsIWebShell    *aWebShell)
-{
-  static const char* NS_STRING_TRUE = "true";
-  nsString disabled;
-  nsString menuitemName;
-  nsString menuitemCmd;
-
-  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
-  menuitemElement->GetAttribute(nsAutoString("name"), menuitemName);
-  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
-      
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull, 
-                                                   nsIMenuItem::GetIID(), 
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
-                     
-    nsISupports * supports = nsnull;
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-            
-    if(disabled == NS_STRING_TRUE) {
-      pnsMenuItem->SetEnabled(PR_FALSE);
-    }
-  
-    // Create MenuDelegate - this is the intermediator inbetween 
-    // the DOM node and the nsIMenuItem
-    // The nsWebShellWindow wacthes for Document changes and then notifies the 
-    // the appropriate nsMenuDelegate object
-    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
-    if (!domElement) {
-      //return NS_ERROR_FAILURE;
-		return;
-    }
-    
-    nsAutoString cmdAtom("onclick");
-    nsString cmdName;
-
-    domElement->GetAttribute(cmdAtom, cmdName);
-
-    pnsMenuItem->SetCommand(cmdName);
-   // DO NOT use passed in webshell because of messed up windows dynamic loading
-      // code. 
-    pnsMenuItem->SetWebShell(mWebShell);
-    pnsMenuItem->SetDOMElement(domElement);
-
-    NS_RELEASE(pnsMenuItem);
-    
-  } 
-  return;
-}
-
-//----------------------------------------
-void nsContextMenu::LoadSubMenu(nsIMenu         *pParentMenu,
-                                nsIDOMElement   *menuElement,
-                                nsIDOMNode      *menuNode)
-{
-  nsString menuName;
-  menuElement->GetAttribute(nsAutoString("name"), menuName);
-  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
-
-  // Create nsMenu
-  nsIMenu * pnsMenu = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
-                                                   nsnull,
-                                                   nsIMenu::GetIID(),
-                                                   (void**)&pnsMenu);
-  if (NS_OK == rv) {
-    // Call Create
-    nsISupports * supports = nsnull;
-    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenu->Create(supports, menuName);
-    NS_RELEASE(supports); // Balance QI
-
-    // Set nsMenu Name
-    pnsMenu->SetLabel(menuName); 
-
-    supports = nsnull;
-    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // parent takes ownership
-    NS_RELEASE(supports);
-
-    pnsMenu->SetWebShell(mWebShell);
-    pnsMenu->SetDOMNode(menuNode);
-
-    /*
-    // Begin menuitem inner loop
-    unsigned short menuIndex = 0;
-
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        menuitemElement->GetNodeName(menuitemNodeType);
-
-#ifdef DEBUG_saari
-        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("separator"));
-#endif
-
-        if (menuitemNodeType.Equals("menuitem")) {
-          // Load a menuitem
-          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
-        } else if (menuitemNodeType.Equals("separator")) {
-          pnsMenu->AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Add a submenu
-          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
-        }
-      }
-	  ++menuIndex;
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-    */
-  }     
-}
-
-//----------------------------------------
-void nsContextMenu::LoadMenuItem(nsIContextMenu *pParentMenu,
-                                 nsIDOMElement  *menuitemElement,
-                                 nsIDOMNode     *menuitemNode,
-                                 unsigned short  menuitemIndex,
-                                 nsIWebShell    *aWebShell)
-{
-
-}
-
-//----------------------------------------
-void nsContextMenu::LoadSubMenu(nsIContextMenu  *pParentMenu,
-                                nsIDOMElement   *menuElement,
-                                nsIDOMNode      *menuNode)
-{
-
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetLocation(PRInt32 aX, PRInt32 aY)
-{
-  mX = aX;
-  mY = aY;
-  return NS_OK;
-}
-
-
-// local methods
-gint nsContextMenu::GetX(void)
-{
-  return mX;
-}
-
-gint nsContextMenu::GetY(void)
-{
-  return mY;
-}
-// end silly local methods
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetDOMNode(nsIDOMNode *aMenuNode)
-{
-  mDOMNode = aMenuNode;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetDOMElement(nsIDOMElement *aMenuElement)
-{
-  mDOMElement = aMenuElement;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsContextMenu::SetWebShell(nsIWebShell *aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsContextMenu.h

@@ -1,139 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsContextMenu_h__
-#define nsContextMenu_h__
-
-#include "nsIContextMenu.h"
-#include "nsISupportsArray.h"
-#include "nsVoidArray.h"
-
-#include "nsIDOMElement.h"
-#include "nsIWebShell.h"
-
-class nsIMenuListener;
-
-/**
- * Native Win32 button wrapper
- */
-
-class nsContextMenu : public nsIContextMenu, public nsIMenuListener
-{
-
-public:
-  nsContextMenu();
-  virtual ~nsContextMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  //nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
-                              nsIWidget         * aParentWindow, 
-                              void              * menubarNode,
-                              void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-
-  // nsIMenu Methods
-  NS_IMETHOD Create(nsISupports * aParent,
-                    const nsString& anAlignment,
-                    const nsString& aAnchorAlign);
-  NS_IMETHOD GetParent(nsISupports *&aParent);
-
-  NS_IMETHOD AddItem(nsISupports * aItem);
-
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
-  NS_IMETHOD RemoveItem(const PRUint32 aPos);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void** aData);
-
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-
-  //
-  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
-
-  NS_IMETHOD SetDOMNode(nsIDOMNode * menuNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * menuElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY);
-
-  gint GetX(void);
-  gint GetY(void);
-
-
-protected:
-  nsIMenuBar * GetMenuBar(nsIMenu * aMenu);
-  nsIWidget *  GetParentWidget();
-  char* GetACPString(nsString& aStr);
-
-  void LoadMenuItem(nsIMenu       * pParentMenu,
-                    nsIDOMElement * menuitemElement,
-                    nsIDOMNode    * menuitemNode,
-                    unsigned short  menuitemIndex,
-                    nsIWebShell   * aWebShell);
-  
-  void LoadSubMenu(nsIMenu       * pParentMenu,
-                   nsIDOMElement * menuElement,
-                   nsIDOMNode    * menuNode);
-
-  void LoadMenuItem(nsIContextMenu * pParentMenu,
-                    nsIDOMElement  * menuitemElement,
-                    nsIDOMNode     * menuitemNode,
-                    unsigned short   menuitemIndex,
-                    nsIWebShell    * aWebShell);
-  
-  void LoadSubMenu(nsIContextMenu * pParentMenu,
-                   nsIDOMElement  * menuElement,
-                   nsIDOMNode     * menuNode);
-
-  nsIMenuItem * FindMenuItem(nsIContextMenu * aMenu, PRUint32 aId);
-
-  nsString   mLabel;
-  PRUint32   mNumMenuItems;
-  GtkWidget  *mMenu;
-  
-  nsVoidArray mMenuItemVoidArray;
-
-  nsIWidget  *mParent;
-  nsIMenuListener * mListener;
-  
-  PRBool mConstructCalled;
-  nsIDOMNode    * mDOMNode;
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-
-  nsString        mAlignment;
-  nsString        mAnchorAlignment;
-
-  PRInt32         mX;
-  PRInt32         mY;
-};
-
-#endif // nsContextMenu_h__

mozilla/widget/src/gtk/nsDragService.cpp

@@ -1,592 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsDragService.h"
-
-#include "nsITransferable.h"
-#include "nsString.h"
-#include "nsClipboard.h"
-#include "nsIRegion.h"
-#include "nsVoidArray.h"
-#include "nsISupportsPrimitives.h"
-#include "nsPrimitiveHelpers.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-
-#include "nsWidgetsCID.h"
-
-NS_IMPL_ADDREF_INHERITED(nsDragService, nsBaseDragService)
-NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService)
-NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession)
-
-#define DEBUG_DRAG 1
-
-//-------------------------------------------------------------------------
-//
-// DragService constructor
-//
-//-------------------------------------------------------------------------
-nsDragService::nsDragService()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mNumFlavors = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// DragService destructor
-//
-//-------------------------------------------------------------------------
-nsDragService::~nsDragService()
-{
-}
-
-enum {
-  TARGET_STRING,
-  TARGET_ROOTWIN
-};
-
-static GtkTargetEntry target_table[] = {
-  { "STRING",     0, TARGET_STRING },
-  { "text/plain", 0, TARGET_STRING },
-  { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
-};
-
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-
-NS_IMETHODIMP nsDragService::StartDragSession()
-{
-  printf("nsDragService::StartDragSession()\n");
-  nsBaseDragService::StartDragSession();
-  
-  /*
-  gtk_drag_source_set(mWidget,
-                      GDK_MODIFIER_MASK,
-                      targetlist,
-                      mNumFlavors,
-                      action);
-  */
-  gtk_drag_source_set(mWidget,
-                      GDK_MODIFIER_MASK,
-                      target_table,
-                      n_targets,
-                      mActionType);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsDragService::EndDragSession()
-{
-  printf("nsDragService::EndDragSession()\n");
-  nsBaseDragService::EndDragSession();
-  
-  gtk_drag_source_unset(mWidget);
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::InvokeDragSession (nsISupportsArray *aTransferableArray,
-                                                nsIScriptableRegion *aRegion,
-                                                PRUint32 aActionType)
-{
-  mWidget = gtk_get_event_widget(gtk_get_current_event());
-
-  // add the flavors from the transferables. Cache this array for the send data proc
-  GtkTargetList *targetlist = RegisterDragItemsAndFlavors(aTransferableArray);
-
-  switch (aActionType)
-  {
-    case DRAGDROP_ACTION_NONE:
-      mActionType = GDK_ACTION_DEFAULT;
-      break;
-    case DRAGDROP_ACTION_COPY:
-      mActionType = GDK_ACTION_COPY;
-      break;
-    case DRAGDROP_ACTION_MOVE:
-      mActionType = GDK_ACTION_MOVE;
-      break;
-    case DRAGDROP_ACTION_LINK:
-      mActionType = GDK_ACTION_LINK;
-      break;
-  }
-
-  StartDragSession();
-
-  // XXX 3rd param ???    &                last param should be a real event...
-  gtk_drag_begin(mWidget, targetlist, mActionType, 1, gtk_get_current_event());
-
-
-
-
-#if 0  
-  // we have to synthesize the native event because we may be called from JavaScript
-  // through XPConnect. In that case, we only have a DOM event and no way to
-  // get to the native event. As a consequence, we just always fake it.
-  Point globalMouseLoc;
-  ::GetMouse(&globalMouseLoc);
-  ::LocalToGlobal(&globalMouseLoc);
-  WindowPtr theWindow = nsnull;
-  if ( ::FindWindow(globalMouseLoc, &theWindow) != inContent ) {
-    // debugging sanity check
-    #ifdef NS_DEBUG
-    DebugStr("\pAbout to start drag, but FindWindow() != inContent; g");
-    #endif
-  }  
-  EventRecord theEvent;
-  theEvent.what = mouseDown;
-  theEvent.message = reinterpret_cast<UInt32>(theWindow);
-  theEvent.when = 0;
-  theEvent.where = globalMouseLoc;
-  theEvent.modifiers = 0;
-  
-  RgnHandle theDragRgn = ::NewRgn();
-  BuildDragRegion ( aDragRgn, globalMouseLoc, theDragRgn );
-
-  // register drag send proc which will call us back when asked for the actual
-  // flavor data (instead of placing it all into the drag manager)
-  ::SetDragSendProc ( theDragRef, sDragSendDataUPP, this );
-
-  // start the drag. Be careful, mDragRef will be invalid AFTER this call (it is
-  // reset by the dragTrackingHandler).
-  ::TrackDrag ( theDragRef, &theEvent, theDragRgn );
-
-  // clean up after ourselves 
-  ::DisposeRgn ( theDragRgn );
-  result = ::DisposeDrag ( theDragRef );
-  NS_ASSERTION ( result == noErr, "Error disposing drag" );
-  mDragRef = 0L;
-  mDataItems = nsnull;
-
-  return NS_OK; 
-
-#endif
-
-
-
-
-  return NS_OK;
-}
-
-
-
-
-GtkTargetList *
-nsDragService::RegisterDragItemsAndFlavors(nsISupportsArray *inArray)
-{
-  unsigned int numDragItems = 0;
-  inArray->Count(&numDragItems);
-
-  GtkTargetList *targetlist;
-  targetlist = gtk_target_list_new(nsnull, numDragItems);
-
-  for (unsigned int i = 0; i < numDragItems; ++i)
-  {
-    nsCOMPtr<nsISupports> genericItem;
-    inArray->GetElementAt (i, getter_AddRefs(genericItem));
-    nsCOMPtr<nsITransferable> currItem (do_QueryInterface(genericItem));
-    if (currItem)
-    {
-      nsCOMPtr<nsISupportsArray> flavorList;
-      if (NS_SUCCEEDED(currItem->FlavorsTransferableCanExport(getter_AddRefs(flavorList))))
-      {
-        flavorList->Count (&mNumFlavors);
-        for (PRUint32 flavorIndex = 0; flavorIndex < mNumFlavors; ++flavorIndex)
-        {
-          nsCOMPtr<nsISupports> genericWrapper;
-          flavorList->GetElementAt ( flavorIndex, getter_AddRefs(genericWrapper) );
-          nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
-          if ( currentFlavor )
-          {
-            nsXPIDLCString flavorStr;
-            currentFlavor->ToString ( getter_Copies(flavorStr) );
-
-            // register native flavors
-            GdkAtom atom = gdk_atom_intern(flavorStr, PR_TRUE);
-            gtk_target_list_add(targetlist, atom, 1, atom);
-          }
-
-        } // foreach flavor in item              
-      } // if valid flavor list
-    } // if item is a transferable
-  } // foreach drag item
-
-  return targetlist;
-}
-
-
-/* return PR_TRUE if we have converted or PR_FALSE if we havn't and need to keep being called */
-PRBool nsDragService::DoConvert(GdkAtom type)
-{
-#ifdef DEBUG_DRAG
-  g_print("    nsDragService::DoRealConvert(%li)\n    {\n", type);
-#endif
-  int e = 0;
-  // Set a flag saying that we're blocking waiting for the callback:
-  mBlocking = PR_TRUE;
-
-  //
-  // ask X what kind of data we can get
-  //
-#ifdef DEBUG_DRAG
-  g_print("     Doing real conversion of atom type '%s'\n", gdk_atom_name(type));
-#endif
-  gtk_selection_convert(mWidget,
-                        GDK_SELECTION_PRIMARY,
-                        type,
-                        GDK_CURRENT_TIME);
-
-  // Now we need to wait until the callback comes in ...
-  // i is in case we get a runaway (yuck).
-#ifdef DEBUG_DRAG
-  printf("      Waiting for the callback... mBlocking = %d\n", mBlocking);
-#endif /* DEBUG_CLIPBOARD */
-  for (e=0; mBlocking == PR_TRUE && e < 1000; ++e)
-  {
-    gtk_main_iteration_do(PR_TRUE);
-  }
-
-#ifdef DEBUG_DRAG
-  g_print("    }\n");
-#endif
-
-  if (mSelectionData.length > 0)
-    return PR_TRUE;
-
-  return PR_FALSE;
-}
-
-#if 0
-
-/**
- * Called when the data from a drag comes in (recieved from gdk_selection_convert)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- * @param  aTime time the selection was requested
- */
-void
-nsDragService::SelectionReceivedCB (GtkWidget        *aWidget,
-                                    GdkDragContext   *aContext,
-                                    gint              aX,
-                                    gint              aY,
-                                    GtkSelectionData *aSelectionData,
-                                    guint             aInfo,
-                                    guint             aTime)
-{
-#ifdef DEBUG_DRAG
-  printf("      nsDragService::SelectionReceivedCB\n      {\n");
-#endif
-  nsDragService *ds =(nsDragSession *)gtk_object_get_data(GTK_OBJECT(aWidget),
-                                                        "ds");
-  if (!cb)
-  {
-    g_print("no dragservice found.. this is bad.\n");
-    return;
-  }
-
-
-  ds->SelectionReceiver(aWidget, aSelectionData);
-#ifdef DEBUG_DRAG
-  g_print("      }\n");
-#endif
-}
-
-
-/**
- * local method (called from nsClipboard::SelectionReceivedCB)
- *
- * @param  aWidget the widget
- * @param  aSelectionData gtk selection stuff
- */
-void
-nsDragService::SelectionReceiver (GtkWidget *aWidget,
-                                GtkSelectionData *aSD)
-{
-  gint type;
-
-  mBlocking = PR_FALSE;
-
-  if (aSD->length < 0)
-  {
-    printf("        Error retrieving selection: length was %d\n",
-           aSD->length);
-    return;
-  }
-
-
-  switch (type)
-  {
-  case GDK_TARGET_STRING:
-  case TARGET_COMPOUND_TEXT:
-  case TARGET_TEXT_PLAIN:
-  case TARGET_TEXT_XIF:
-  case TARGET_TEXT_UNICODE:
-  case TARGET_TEXT_HTML:
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Copying mSelectionData pointer -- ");
-#endif
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-#ifdef DEBUG_CLIPBOARD
-    g_print("        Data = %s\n    Length = %i\n", aSD->data, aSD->length);
-#endif
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    // Null terminate in case anyone cares,
-    // and so we can print the string for debugging:
-    mSelectionData.data[aSD->length] = '\0';
-    mSelectionData.length = aSD->length;
-    return;
-
-  default:
-    mSelectionData = *aSD;
-    mSelectionData.data = g_new(guchar, aSD->length + 1);
-    memcpy(mSelectionData.data,
-           aSD->data,
-           aSD->length);
-    mSelectionData.length = aSD->length;
-    return;
-  }
-}
-
-#endif
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetNumDropItems (PRUint32 * aNumItems)
-{
-  *aNumItems = 0;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetData (nsITransferable * aTransferable, PRUint32 anItem)
-{
-
-#ifdef DEBUG_DRAG
-  printf("nsClipboard::GetNativeClipboardData()\n");
-#endif /* DEBUG_CLIPBOARD */
-
-  // make sure we have a good transferable
-  if (!aTransferable) {
-    printf("  GetData: Transferable is null!\n");
-    return NS_ERROR_FAILURE;
-  }
-
-  // get flavor list that includes all acceptable flavors (including ones obtained through
-  // conversion)
-  nsCOMPtr<nsISupportsArray> flavorList;
-  nsresult errCode = aTransferable->FlavorsTransferableCanImport ( getter_AddRefs(flavorList) );
-  if ( NS_FAILED(errCode) )
-    return NS_ERROR_FAILURE;
-
-  // Walk through flavors and see which flavor matches the one being pasted:
-  PRUint32 cnt;
-  flavorList->Count(&cnt);
-  nsCAutoString foundFlavor;
-  for ( PRUint32 i = 0; i < cnt; ++i ) {
-    nsCOMPtr<nsISupports> genericFlavor;
-    flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
-    nsCOMPtr<nsISupportsString> currentFlavor (do_QueryInterface(genericFlavor));
-    if ( currentFlavor ) {
-      nsXPIDLCString flavorStr;
-      currentFlavor->ToString(getter_Copies(flavorStr));
-      if (DoConvert(gdk_atom_intern(flavorStr, 1))) {
-        foundFlavor = flavorStr;
-        break;
-      }
-    }
-  }
-
-#ifdef DEBUG_CLIPBOARD
-  printf("  Got the callback: '%s', %d\n",
-         mSelectionData.data, mSelectionData.length);
-#endif /* DEBUG_CLIPBOARD */
-
-  // We're back from the callback, no longer blocking:
-  mBlocking = PR_FALSE;
-
-  // 
-  // Now we have data in mSelectionData.data.
-  // We just have to copy it to the transferable.
-  // 
-
-#if 0  
-// pinkerton - we have the flavor already from above, so we don't need
-// to re-derrive it.
-  nsString *name = new nsString((const char*)gdk_atom_name(mSelectionData.type));
-  int format = GetFormat(*name);
-  df->SetString((const char*)gdk_atom_name(sSelTypes[format]));
-#endif
-
-  nsCOMPtr<nsISupports> genericDataWrapper;
-  nsPrimitiveHelpers::CreatePrimitiveForData ( foundFlavor, mSelectionData.data, mSelectionData.length, getter_AddRefs(genericDataWrapper) );
-  aTransferable->SetTransferData(foundFlavor,
-                                 genericDataWrapper,
-                                 mSelectionData.length);
-
-  //delete name;
-  
-  // transferable is now copying the data, so we can free it.
-  //  g_free(mSelectionData.data);
-  mSelectionData.data = nsnull;
-  mSelectionData.length = 0;
-
-  gtk_drag_source_unset(mWidget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval)
-{
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsDragService::GetCurrentSession (nsIDragSession **aSession)
-{
-  return NS_ERROR_FAILURE;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragLeave (GtkWidget	       *widget,
-			                    GdkDragContext   *context,
-			                    guint             time)
-{
-  g_print("leave\n");
-  //gHaveDrag = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-PRBool
-nsDragService::DragMotion(GtkWidget	       *widget,
-			                    GdkDragContext   *context,
-			                    gint              x,
-			                    gint              y,
-			                    guint             time)
-{
-  g_print("drag motion\n");
-  GtkWidget *source_widget;
-
-#if 0
-  if (!gHaveDrag) {
-      gHaveDrag = PR_TRUE;
-  }
-#endif
-
-  source_widget = gtk_drag_get_source_widget (context);
-  g_print("motion, source %s\n", source_widget ?
-	          gtk_type_name (GTK_OBJECT (source_widget)->klass->type) :
-	          "unknown");
-
-  gdk_drag_status (context, context->suggested_action, time);
-  
-  return PR_TRUE;
-}
-
-//-------------------------------------------------------------------------
-PRBool
-nsDragService::DragDrop(GtkWidget	       *widget,
-			                  GdkDragContext   *context,
-			                  gint              x,
-			                  gint              y,
-			                  guint             time)
-{
-  g_print("drop\n");
-  //gHaveDrag = PR_FALSE;
-
-  if (context->targets){
-    gtk_drag_get_data (widget, context, 
-			                 GPOINTER_TO_INT (context->targets->data), 
-			                 time);
-    return PR_TRUE;
-  }
-  
-  return PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataReceived  (GtkWidget          *widget,
-			                            GdkDragContext     *context,
-			                            gint                x,
-			                            gint                y,
-			                            GtkSelectionData   *data,
-			                            guint               info,
-			                            guint               time)
-{
-  if ((data->length >= 0) && (data->format == 8)) {
-    g_print ("Received \"%s\"\n", (gchar *)data->data);
-    gtk_drag_finish (context, PR_TRUE, PR_FALSE, time);
-    return;
-  }
-  
-  gtk_drag_finish (context, PR_FALSE, PR_FALSE, time);
-}
-  
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataGet(GtkWidget          *widget,
-		                       GdkDragContext     *context,
-		                       GtkSelectionData   *selection_data,
-		                       guint               info,
-		                       guint               time,
-		                       gpointer            data)
-{
-  gtk_selection_data_set (selection_data,
-                          selection_data->target,
-                          8, (guchar *)"I'm Data!", 9);
-}
-
-//-------------------------------------------------------------------------
-void  
-nsDragService::DragDataDelete(GtkWidget          *widget,
-			                        GdkDragContext     *context,
-			                        gpointer            data)
-{
-  g_print ("Delete the data!\n");
-}

mozilla/widget/src/gtk/nsDragService.h

@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsDragService_h__
-#define nsDragService_h__
-
-#include "nsBaseDragService.h"
-#include <gtk/gtk.h>
-
-
-/**
- * Native GTK DragService wrapper
- */
-
-class nsDragService : public nsBaseDragService
-{
-
-public:
-  nsDragService();
-  virtual ~nsDragService();
-  
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIDragService
-  NS_IMETHOD InvokeDragSession (nsISupportsArray * anArrayTransferables,
-                                nsIScriptableRegion * aRegion, PRUint32 aActionType);
-  NS_IMETHOD GetCurrentSession (nsIDragSession ** aSession);
-
-  // nsIDragSession
-  NS_IMETHOD GetData (nsITransferable * aTransferable, PRUint32 anItem);
-  NS_IMETHOD GetNumDropItems (PRUint32 * aNumItems);
-  NS_IMETHOD IsDataFlavorSupported(const char *aDataFlavor, PRBool *_retval);
-
-  NS_IMETHOD StartDragSession();
-  NS_IMETHOD EndDragSession();
-    
-
-  GtkTargetList *RegisterDragItemsAndFlavors(nsISupportsArray *inArray);
-
-protected:
-
-  PRBool DoConvert(GdkAtom type);
-
-  static PRBool gHaveDrag;
-
-  static void DragLeave(GtkWidget      *widget,
-                        GdkDragContext *context,
-                        guint           time);
-
-  static PRBool DragMotion(GtkWidget      *widget,
-                           GdkDragContext *context,
-                           gint            x,
-                           gint            y,
-                           guint           time);
-
-  static PRBool DragDrop(GtkWidget   *widget,
-                         GdkDragContext *context,
-                         gint            x,
-                         gint            y,
-                         guint            time);
-
-  static void DragDataReceived(GtkWidget        *widget,
-			                         GdkDragContext   *context,
-			                         gint              x,
-			                         gint              y,
-			                         GtkSelectionData *data,
-			                         guint             info,
-			                         guint             time);
-
-  static void DragDataGet(GtkWidget          *widget,
-		                      GdkDragContext     *context,
-		                      GtkSelectionData   *selection_data,
-		                      guint               info,
-		                      guint               time,
-		                      gpointer            data);
-
-  static void  DragDataDelete(GtkWidget          *widget,
-			                        GdkDragContext     *context,
-			                        gpointer            data);
-
-private:
-  GdkDragAction mActionType;
-  PRUint32 mNumFlavors;
-  GtkWidget *mWidget;
-  GdkDragContext *mDragContext;
-  GtkSelectionData mSelectionData;
-  PRBool mBlocking;
-};
-
-#endif // nsDragService_h__

mozilla/widget/src/gtk/nsFilePicker.cpp

@@ -1,304 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsFilePicker.h"
-
-NS_IMPL_ISUPPORTS1(nsFilePicker, nsIFilePicker)
-
-//-------------------------------------------------------------------------
-//
-// nsFilePicker constructor
-//
-//-------------------------------------------------------------------------
-nsFilePicker::nsFilePicker()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mDisplayDirectory = nsnull;
-  mFilterMenu = nsnull;
-  mOptionMenu = nsnull;
-  mNumberOfFilters = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsFilePicker destructor
-//
-//-------------------------------------------------------------------------
-nsFilePicker::~nsFilePicker()
-{
-  if (mFilterMenu)
-  {
-    GtkWidget *menu_item;
-    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
-
-    for (;list; list = list->next)
-    {
-      menu_item = GTK_WIDGET(list->data);
-      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
-      
-      if (data)
-        nsCRT::free(data);
-    }
-  }
-
-  gtk_widget_destroy(mWidget);
-}
-
-
-static void file_ok_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit ok\n");
-  *ret = PR_TRUE;
-  gtk_main_quit();
-}
-
-static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit cancel\n");
-  *ret = PR_FALSE;
-  gtk_main_quit();
-}
-
-static void filter_item_activated(GtkWidget *w, gpointer data)
-{
-  //  nsFilePicker *f = (nsFilePicker*)data;
-  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
-  g_print("filter_item_activated(): %s\n", foo);
-}
-
-//-------------------------------------------------------------------------
-//
-// Show - Display the file dialog
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
-{
-  NS_ENSURE_ARG_POINTER(retval);
-
-  PRBool ret;
-  if (mWidget) {
-    // make things shorter
-    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
-
-    if (mNumberOfFilters != 0)
-    {
-      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
-    }
-    else
-      gtk_widget_hide(mOptionMenu);
-
-#if 0
-    if (mDisplayDirectory)
-      gtk_file_selection_complete(fs, "/");
-#endif
-
-    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
-    gtk_widget_show(mWidget);
-
-    // handle close, destroy, etc on the dialog
-    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_ok_clicked),
-                       &ret);
-    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_cancel_clicked),
-                       &ret);
-    // start new loop.   ret is set in the above callbacks.
-    gtk_main();
-  }
-  else {
-    ret = PR_FALSE;
-  }
-
-  if (ret)
-    *retval = returnOK;
-  else
-    *retval = returnCancel;
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the list of filters
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsFilePicker::SetFilterList(PRInt32 aNumberOfFilters,
-                                          const PRUnichar **aTitles,
-                                          const PRUnichar **filters)
-{
-#if 0
-  GtkWidget *menu_item;
-
-  mNumberOfFilters  = aNumberOfFilters;
-  mTitles           = aTitles;
-  mFilters          = aFilters;
-
-  mFilterMenu = gtk_menu_new();
-
-  for(unsigned int i=0; i < aNumberOfFilters; i++)
-  {
-    // we need *.{htm, html, xul, etc}
-    char *foo = aTitles[i].ToNewCString();
-    char *filters = aFilters[i].ToNewCString();
-    printf("%20s %s\n", foo, filters);
-
-    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
-
-    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
-
-    gtk_signal_connect(GTK_OBJECT(menu_item),
-                       "activate",
-                       GTK_SIGNAL_FUNC(filter_item_activated),
-                       this);
-
-    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
-    gtk_widget_show(menu_item);
-
-    nsCRT::free(foo);
-  }
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetFile(nsIFileSpec **aFile)
-{
-  NS_ENSURE_ARG_POINTER(*aFile);
-  if (mWidget) {
-    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
-
-    nsCOMPtr<nsIFileSpec> fileSpec(do_CreateInstance("component://netscape/filespec"));
-    
-    NS_ENSURE_TRUE(fileSpec, NS_ERROR_FAILURE);
-
-    fileSpec->SetNativePath(fn);
-
-    *aFile = fileSpec;
-    NS_ADDREF(*aFile);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::GetSelectedFilter(PRInt32 *aType)
-{
-  NS_ENSURE_ARG_POINTER(aType);
-  *aType = mSelectedType;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the file + path
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::SetDefaultString(const PRUnichar *aString)
-{
-  if (mWidget) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
-                                    (const gchar*)nsAutoCString(aString));
-  }
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::GetDefaultString(PRUnichar **aString)
-{
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::SetDisplayDirectory(nsIFileSpec *aDirectory)
-{
-  mDisplayDirectory = aDirectory;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsIFileSpec **aDirectory)
-{
-  *aDirectory = mDisplayDirectory;
-  NS_IF_ADDREF(*aDirectory);
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
-                                   const PRUnichar *aTitle,
-                                   PRInt16 aMode)
-{
-  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
-                                         const PRUnichar *aTitle,
-                                         PRInt16 aMode)
-{
-  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
-
-  mOptionMenu = gtk_option_menu_new();
-
-  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
-  gtk_widget_show(mOptionMenu);
-
-  // Hide the file column for the folder case.
-  if (aMode == nsIFilePicker::modeGetFolder) {
-    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
-  }
-
-  return NS_OK;
-}
-
-gint
-nsFilePicker::DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFilePicker* aWidget)
-{
-  aWidget->OnDestroySignal(aGtkWidget);
-  return TRUE;
-}
-
-void
-nsFilePicker::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mWidget) {
-    mWidget = nsnull;
-  }
-}

mozilla/widget/src/gtk/nsFilePicker.h

@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#ifndef nsFilePicker_h__
-#define nsFilePicker_h__
-
-#include "nsBaseFilePicker.h"
-
-#include <gtk/gtk.h>
-
-/**
- * Native GTK FileSelector wrapper
- */
-
-class nsFilePicker : public nsBaseFilePicker
-{
-public:
-  nsFilePicker(); 
-  virtual ~nsFilePicker();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIFILEPICKER
-
-protected:
-  /* method from nsBaseFilePicker */
-  NS_IMETHOD CreateNative(nsIWidget *aParent,
-                          const PRUnichar *aTitle,
-                          PRInt16 aMode);
-
-  static gint DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFilePicker* aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget		*mWidget;
-  GtkWidget   *mOptionMenu;
-  GtkWidget   *mFilterMenu;
-
-
-  PRUint32		    mNumberOfFilters;  
-  const nsString*	mTitles;
-  const nsString*	mFilters;
-  nsString		  mDefault;
-  nsIFileSpec  *mDisplayDirectory;
-  PRInt16       mSelectedType;
-};
-
-#endif // nsFilePicker_h__

mozilla/widget/src/gtk/nsFileWidget.cpp

@@ -1,322 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFileWidget.h"
-#include "nsIToolkit.h"
-
-NS_IMPL_ISUPPORTS1(nsFileWidget, nsIFileWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsFileWidget constructor
-//
-//-------------------------------------------------------------------------
-nsFileWidget::nsFileWidget() : nsIFileWidget()
-{
-  NS_INIT_REFCNT();
-  mWidget = nsnull;
-  mDisplayDirectory = nsnull;
-  mFilterMenu = nsnull;
-  mOptionMenu = nsnull;
-  mNumberOfFilters = 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsFileWidget destructor
-//
-//-------------------------------------------------------------------------
-nsFileWidget::~nsFileWidget()
-{
-  if (mFilterMenu)
-  {
-    GtkWidget *menu_item;
-    GList *list = g_list_first(GTK_MENU_SHELL(mFilterMenu)->children);
-
-    for (;list; list = list->next)
-    {
-      menu_item = GTK_WIDGET(list->data);
-      gchar *data = (gchar*)gtk_object_get_data(GTK_OBJECT(menu_item), "filters");
-      
-      if (data)
-        nsCRT::free(data);
-    }
-  }
-
-  gtk_widget_destroy(mWidget);
-}
-
-
-static void file_ok_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit ok\n");
-  *ret = PR_TRUE;
-  gtk_main_quit();
-}
-
-static void file_cancel_clicked(GtkWidget *w, PRBool *ret)
-{
-  g_print("user hit cancel\n");
-  *ret = PR_FALSE;
-  gtk_main_quit();
-}
-
-static void filter_item_activated(GtkWidget *w, gpointer data)
-{
-  //  nsFileWidget *f = (nsFileWidget*)data;
-  gchar *foo = (gchar*)gtk_object_get_data(GTK_OBJECT(w), "filters");
-  g_print("filter_item_activated(): %s\n", foo);
-}
-
-//-------------------------------------------------------------------------
-//
-// Show - Display the file dialog
-//
-//-------------------------------------------------------------------------
-PRBool nsFileWidget::Show()
-{
-  PRBool ret;
-  if (mWidget) {
-    // make things shorter
-    GtkFileSelection *fs = GTK_FILE_SELECTION(mWidget);
-
-    if (mNumberOfFilters != 0)
-    {
-      gtk_option_menu_set_menu(GTK_OPTION_MENU(mOptionMenu), mFilterMenu);
-    }
-    else
-      gtk_widget_hide(mOptionMenu);
-
-#if 0
-    if (mDisplayDirectory)
-      gtk_file_selection_complete(fs, "/");
-#endif
-
-    //    gtk_window_set_modal(GTK_WINDOW(mWidget), PR_TRUE);
-    gtk_widget_show(mWidget);
-
-    // handle close, destroy, etc on the dialog
-    gtk_signal_connect(GTK_OBJECT(fs->ok_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_ok_clicked),
-                       &ret);
-    gtk_signal_connect(GTK_OBJECT(fs->cancel_button), "clicked",
-                       GTK_SIGNAL_FUNC(file_cancel_clicked),
-                       &ret);
-    // start new loop.   ret is set in the above callbacks.
-    gtk_main();
-  }
-  else {
-    ret = PR_FALSE;
-  }
-  return ret;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set the list of filters
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsFileWidget::SetFilterList(PRUint32 aNumberOfFilters,
-                                          const nsString aTitles[],
-                                          const nsString aFilters[])
-{
-  GtkWidget *menu_item;
-
-  mNumberOfFilters  = aNumberOfFilters;
-  mTitles           = aTitles;
-  mFilters          = aFilters;
-
-  mFilterMenu = gtk_menu_new();
-
-  for(unsigned int i=0; i < aNumberOfFilters; i++)
-  {
-    // we need *.{htm, html, xul, etc}
-    char *foo = aTitles[i].ToNewCString();
-    char *filters = aFilters[i].ToNewCString();
-    printf("%20s %s\n", foo, filters);
-
-    menu_item = gtk_menu_item_new_with_label(nsAutoCString(aTitles[i]));
-
-    gtk_object_set_data(GTK_OBJECT(menu_item), "filters", filters);
-
-    gtk_signal_connect(GTK_OBJECT(menu_item),
-                       "activate",
-                       GTK_SIGNAL_FUNC(filter_item_activated),
-                       this);
-
-    gtk_menu_append(GTK_MENU(mFilterMenu), menu_item);
-    gtk_widget_show(menu_item);
-
-    nsCRT::free(foo);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP  nsFileWidget::GetFile(nsFileSpec& aFile)
-{
-  if (mWidget) {
-    gchar *fn = gtk_file_selection_get_filename(GTK_FILE_SELECTION(mWidget));
-    aFile = fn; // Put the filename into the nsFileSpec instance.
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::GetSelectedType(PRInt16& theType)
-{
-  theType = mSelectedType;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the file + path
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::SetDefaultString(const nsString& aString)
-{
-  if (mWidget) {
-    gtk_file_selection_set_filename(GTK_FILE_SELECTION(mWidget),
-                                    (const gchar*)nsAutoCString(aString));
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::SetDisplayDirectory(const nsFileSpec& aDirectory)
-{
-  mDisplayDirectory = aDirectory;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Get the display directory
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsFileWidget::GetDisplayDirectory(nsFileSpec& aDirectory)
-{
-  aDirectory = mDisplayDirectory;
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent,
-                                   const nsString& aTitle,
-                                   nsFileDlgMode aMode,
-                                   nsIDeviceContext *aContext,
-                                   nsIAppShell *aAppShell,
-                                   nsIToolkit *aToolkit,
-                                   void *aInitData)
-{
-  mMode = aMode;
-  mTitle.SetLength(0);
-  mTitle.Append(aTitle);
-
-  mWidget = gtk_file_selection_new((const gchar *)nsAutoCString(aTitle));
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(GTK_FILE_SELECTION(mWidget)->button_area), GTK_BUTTONBOX_SPREAD);
-
-  mOptionMenu = gtk_option_menu_new();
-
-  gtk_box_pack_start(GTK_BOX(GTK_FILE_SELECTION(mWidget)->main_vbox), mOptionMenu, PR_FALSE, PR_FALSE, 0);
-  gtk_widget_show(mOptionMenu);
-
-
-  // Hide the file column for the folder case.
-  if (aMode == eMode_getfolder) {
-    gtk_widget_hide((GTK_FILE_SELECTION(mWidget)->file_list)->parent);
-  }
-
-  return NS_OK;
-}
-
-gint
-nsFileWidget::DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFileWidget* aWidget)
-{
-  aWidget->OnDestroySignal(aGtkWidget);
-  return TRUE;
-}
-
-void
-nsFileWidget::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mWidget) {
-    mWidget = nsnull;
-  }
-}
-
-nsFileDlgResults nsFileWidget::GetFile(nsIWidget *aParent,
-                                       const nsString &promptString,
-                                       nsFileSpec &theFileSpec)
-{
-	Create(aParent, promptString, eMode_load, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-
-  return nsFileDlgResults_Cancel;
-}
-
-nsFileDlgResults nsFileWidget::GetFolder(nsIWidget *aParent,
-                                         const nsString &promptString,
-                                         nsFileSpec &theFileSpec)
-{
-	Create(aParent, promptString, eMode_getfolder, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-
-  return nsFileDlgResults_Cancel;
-}
-
-nsFileDlgResults nsFileWidget::PutFile(nsIWidget *aParent,
-                                       const nsString &promptString,
-                                       nsFileSpec &theFileSpec)
-{ 
-	Create(aParent, promptString, eMode_save, nsnull, nsnull);
-	if (Show() == PR_TRUE)
-	{
-		GetFile(theFileSpec);
-		return nsFileDlgResults_OK;
-	}
-  return nsFileDlgResults_Cancel; 
-}

mozilla/widget/src/gtk/nsFileWidget.h

@@ -1,102 +0,0 @@
-/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFileWidget_h__
-#define nsFileWidget_h__
-
-#include "nsIWidget.h"
-#include "nsIFileWidget.h"
-
-#include <gtk/gtk.h>
-
-class nsIToolkit;
-
-/**
- * Native GTK FileSelector wrapper
- */
-
-class nsFileWidget : public nsIFileWidget 
-{
-public:
-  nsFileWidget(); 
-  virtual ~nsFileWidget();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIWidget interface
-  
-  NS_IMETHOD		Create(nsIWidget *aParent,
-                       const nsString& aTitle,
-                       nsFileDlgMode aMode,
-                       nsIDeviceContext *aContext = nsnull,
-                       nsIAppShell *aAppShell = nsnull,
-                       nsIToolkit *aToolkit = nsnull,
-                       void *aInitData = nsnull);
-
-  // nsIFileWidget part
-  virtual PRBool	Show();
-  NS_IMETHOD GetFile(nsFileSpec& aFile);
-  NS_IMETHOD SetDefaultString(const nsString& aFile);
-  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,
-                           const nsString aTitles[],
-                           const nsString aFilters[]);
-
-  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory);
-  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory);
-  
-  virtual nsFileDlgResults GetFile(nsIWidget *aParent,
-                                   const nsString &promptString,
-                                   nsFileSpec &theFileSpec);
-  
-  virtual nsFileDlgResults GetFolder(nsIWidget *aParent,
-                                     const nsString &promptString,
-                                     nsFileSpec &theFileSpec);
-
-  virtual nsFileDlgResults PutFile(nsIWidget *aParent,
-                                   const nsString &promptString,
-                                   nsFileSpec &theFileSpec);
-
-
-  NS_IMETHOD            GetSelectedType(PRInt16& theType);
-
-protected:
-  static gint DestroySignal(GtkWidget *  aGtkWidget,
-                            nsFileWidget* aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget		*mWidget;
-  nsString		mTitle;
-  GtkWidget   *mOptionMenu;
-  GtkWidget   *mFilterMenu;
-
-
-  nsFileDlgMode   mMode;
-  PRUint32		    mNumberOfFilters;  
-  const nsString*	mTitles;
-  const nsString*	mFilters;
-  nsString		mDefault;
-  nsFileSpec    mDisplayDirectory;
-  PRInt16       mSelectedType;
-};
-
-#endif // nsFileWidget_h__

mozilla/widget/src/gtk/nsFontRetrieverService.cpp

@@ -1,395 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFontRetrieverService.h"
-#include "nsIWidget.h"
-#include <ctype.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include "X11/Xlib.h"
-#include "X11/Xutil.h"
- 
-#include "nsFont.h"
-#include "nsVoidArray.h"
-#include "nsFontSizeIterator.h"
- 
-NS_IMPL_ISUPPORTS2(nsFontRetrieverService, nsIFontRetrieverService, nsIFontNameIterator)
-
-//----------------------------------------------------------
-nsFontRetrieverService::nsFontRetrieverService()
-{
-  NS_INIT_REFCNT();
-
-  mFontList     = nsnull;
-  mSizeIter     = nsnull;
-  mNameIterInx  = 0;
-
-}
-
-//----------------------------------------------------------
-nsFontRetrieverService::~nsFontRetrieverService()
-{
-  if (nsnull != mFontList) {
-    for (PRInt32 i=0;i<mFontList->Count();i++) {
-      FontInfo * font = (FontInfo *)mFontList->ElementAt(i);
-      if (font->mSizes) {
-        delete font->mSizes;
-      }
-      delete font;
-    }
-    delete mFontList;
-  }
-  NS_IF_RELEASE(mSizeIter);
-}
-
-
-
-//----------------------------------------------------------
-//-- nsIFontRetrieverService
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::CreateFontNameIterator( nsIFontNameIterator** aIterator )
-{
-  if (nsnull == aIterator) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if (nsnull == mFontList) {
-    LoadFontList();
-  }
-  *aIterator = this;
-  NS_ADDREF_THIS();
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::CreateFontSizeIterator( const nsString & aFontName, 
-                                                              nsIFontSizeIterator** aIterator )
-{
-  // save value in case someone externally is using it
-  PRInt32 saveIterInx = mNameIterInx;
-
-  PRBool found = PR_FALSE;
-  Reset();
-  do {
-    nsAutoString name;
-    Get(&name);
-    if (name.Equals(aFontName)) {
-      found = PR_TRUE;
-      break;
-    }
-  } while (Advance() == NS_OK);
-
-  if (found) {
-    if (nsnull == mSizeIter) {
-      mSizeIter = new nsFontSizeIterator();
-    }
-    NS_ASSERTION( nsnull != mSizeIter, "nsFontSizeIterator instance pointer is null");
-
-    *aIterator = (nsIFontSizeIterator *)mSizeIter;
-    NS_ADDREF(mSizeIter);
-
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
-    mSizeIter->SetFontInfo(fontInfo);
-    mNameIterInx = saveIterInx;
-    return NS_OK;
-  }
-  mNameIterInx = saveIterInx;
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-//-- nsIFontNameIterator
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Reset()
-{
-  mNameIterInx = 0;
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Get( nsString* aFontName )
-{
-  if (mNameIterInx < mFontList->Count()) {
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx);
-    *aFontName = fontInfo->mName;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::Advance()
-{
-  if (mNameIterInx < mFontList->Count()-1) {
-    mNameIterInx++;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-//------------------------------
-static FontInfo * GetFontInfo(nsVoidArray * aFontList, char * aName)
-{
-  nsAutoString name(aName);
-  PRInt32 i;
-  PRInt32 cnt = aFontList->Count();
-  for (i=0;i<cnt;i++) {
-    FontInfo * fontInfo = (FontInfo *)aFontList->ElementAt(i);
-    if (fontInfo->mName.Equals(name)) {
-      return fontInfo;
-    }
-  }
-
-  FontInfo * fontInfo   = new FontInfo();
-  fontInfo->mName       = aName;
-  //printf("Adding [%s]\n", aName);fflush(stdout); 
-  fontInfo->mIsScalable = PR_FALSE; // X fonts aren't scalable right??
-  fontInfo->mSizes      = nsnull;
-  aFontList->AppendElement(fontInfo);
-  return fontInfo;
-}
-
-//------------------------------
-static void AddSizeToFontInfo(FontInfo * aFontInfo, PRInt32 aSize)
-{
-  nsVoidArray * sizes;
-  if (nsnull == aFontInfo->mSizes) {
-    sizes = new nsVoidArray();
-    aFontInfo->mSizes = sizes;
-  } else {
-    sizes = aFontInfo->mSizes;
-  }
-  PRInt32 i;
-  PRInt32 cnt = sizes->Count();
-  for (i=0;i<cnt;i++) {
-    PRInt32 size = (int)sizes->ElementAt(i);
-    if (size == aSize) {
-      return;
-    }
-  }
-  sizes->AppendElement((void *)aSize);
-}
-
-//---------------------------------------------------
-// XXX - Hack - Parts of this will need to be reworked
-//
-// This method does brute force parcing for 4 different formats:
-//
-// 1) The format -*-*-*-*-*-* etc.
-//    -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-8
-//
-// 2) Name-size format 
-//    lucidasans-10
-//
-// 3) Name-style-size
-//    lucidasans-bold-10
-//
-// 4) Name only (implicit size)
-//    6x13
-//
-//--------------------------------------------------
-NS_IMETHODIMP nsFontRetrieverService::LoadFontList()
-{
-  char    * pattern = "*";
-  int nnames = 1024;
-
-  int available = nnames+1;
-  int i;
-  char **fonts;
-  XFontStruct *info;
-
-  if (nsnull == mFontList) { 
-    mFontList = new nsVoidArray(); 
-    if (nsnull == mFontList) { 
-      return NS_ERROR_FAILURE; 
-    } 
-  } 
-
-  /* Get list of fonts matching pattern */
-  for (;;) {
-    // the following line is VERY slow to return
-    fonts = XListFontsWithInfo(GDK_DISPLAY(), pattern, nnames, 
-                               &available, &info);
-    if (fonts == NULL || available < nnames)
-      break;
-
-    XFreeFontInfo(fonts, info, available);
-    nnames = available * 2;
-  }
-
-  if (fonts == NULL) {
-    fprintf(stderr, "pattern \"%s\" unmatched\n", pattern);
-    return NS_ERROR_FAILURE;
-  }
-
-#if 0 // debug
-  // print out all the retrieved fonts
-  printf("-----------------------------\n");
-  for (i=0; i<available; i++) {
-    printf("[%s]i\n", fonts[i]);
-  }
-  printf("-----------------------------\n");
-#endif
-
-  // this code assumes all like fonts are grouped together
-  // currentName is the current name of the font we are gathering
-  // sizes for, when the name changes we create a new FontInfo object
-  // but it also takes into account fonts of similar names when it 
-  // goes to add then and disregards duplicates
-  char buffer[1024];
-  char currentName[1024];
-  FontInfo * font = nsnull;
-
-  currentName[0]  = 0;
-  for (i=0; i<available; i++) {
-
-    // This is kind of lame, but it will have to do for now
-    strcpy(buffer, fonts[i]);
-
-    // Start by checking to see if the name begins with a dash
-    char * ptr  = buffer;
-    if (buffer[0] == '-') { //Format #1
-      
-      PRInt32 cnt = 0;
-      // skip first two '-'
-      do {
-        if (*ptr == '-') cnt++;
-        ptr++;
-      } while (cnt < 2);
-      
-      // find the dash at the end of the name
-      char * end = strchr(ptr, '-');
-      if (end) {
-        *end = 0;
-        
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, ptr) || NULL == font) {
-          font = GetFontInfo(mFontList, ptr);
-          strcpy(currentName, ptr);
-        }
-        if (nsnull == font->mSizes) {
-          font->mSizes = new nsVoidArray();
-        }
-        ptr = end+1; // skip past the dash that was set to zero
-        
-        cnt = 0;
-        // now skip ahead 4 dashes
-        do {
-          if (*ptr == '-') cnt++;
-          ptr++;
-        } while (cnt < 4);
-        
-        // find the dash after the size
-        end = strchr(ptr, '-');
-        
-        if (end) {
-	  *end = 0;
-          PRInt32 size;
-          sscanf(ptr, "%d", &size);
-	  AddSizeToFontInfo(font, size);
-        }
-      }
-    } else { // formats 2,3,4
-      
-      // no leading dash means the start of the 
-      // buffer is the start of the name
-      // this checks for a dash at the end of the font name
-      // which means there is a size at the end
-      char * end = strchr(buffer, '-');
-      if (end) { // Format 2,3
-        *end = 0;
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, buffer) || NULL == font) { 
-          font = GetFontInfo(mFontList, buffer);
-          strcpy(currentName, buffer);
-        }
-        end++; // advance past the dash
-	// check to see if we have a number
-	ptr = end;
-	if (isalpha(*ptr)) {  // Format 3
-	  // skip until next dash
-	  end = strchr(ptr, '-');
-	  if (end) {
-            *end = 0;
-	    ptr = end+1;
-	  }
-	}
-        PRInt32 size;
-        // yes, it has a dash at the end so it must have the size
-        // check to see if the size is terminated by a dash
-        // it shouldn't be
-        char * end2 = strchr(ptr, '-');
-        if (end2) *end2 = 0; // put terminator at the dash
-        sscanf(end, "%d", &size);
-	AddSizeToFontInfo(font, size);
-
-      } else { // Format #4
-        // The font has an implicit size, 
-        // so there is nothing to parse for size
-        // so we can't really do much here
-        // Check to see if we need to create a new FontInfo obj
-        // and set the currentName var to this guys font name
-        if (strcmp(currentName, buffer) || NULL == font) {
-          font = GetFontInfo(mFontList, buffer);
-          strcpy(currentName, buffer);
-        }
-      } 
-    }
-
-  }
-
-  XFreeFontInfo(fonts, info, available);
-
-  return NS_OK;
-}
-
-
-//---------------------------------------------------------- 
-NS_IMETHODIMP nsFontRetrieverService::IsFontScalable(const nsString & aFontName,
-                                                     PRBool* aResult ) 
-{ 
-  // save value in case someone externally is using it
-  PRInt32 saveIterInx = mNameIterInx;
-   
-  PRBool found = PR_FALSE; 
-  Reset(); 
-  do { 
-    nsAutoString name; 
-    Get(&name); 
-    if (name.Equals(aFontName)) { 
-      found = PR_TRUE; 
-      break; 
-    } 
-  } while (Advance() == NS_OK); 
-
-  if (found) { 
-    FontInfo * fontInfo = (FontInfo *)mFontList->ElementAt(mNameIterInx); 
-    *aResult = fontInfo->mIsScalable; 
-    mNameIterInx = saveIterInx;
-    return NS_OK; 
-  } 
-
-  mNameIterInx = saveIterInx;
-  return NS_ERROR_FAILURE; 
-} 

mozilla/widget/src/gtk/nsFontRetrieverService.h

@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsFontRetrieverService
-#define __nsFontRetrieverService
-
-#include "nsIFontRetrieverService.h"
-#include "nsIFontNameIterator.h"
-
-class nsVoidArray;
-class nsFontSizeIterator;
-
-class nsFontRetrieverService: public nsIFontRetrieverService, 
-                              public nsIFontNameIterator
-{
-public:
-  nsFontRetrieverService();
-  virtual ~nsFontRetrieverService();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIFontRetrieverService
-  NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator );
-
-  NS_IMETHOD CreateFontSizeIterator( const nsString & aFontName, nsIFontSizeIterator** aIterator );
-  NS_IMETHOD IsFontScalable( const nsString & aFontName, PRBool* aResult );
-
-  // nsIFontNameIterator
-
-  NS_IMETHOD Reset();
-  NS_IMETHOD Get( nsString* aFontName );
-  NS_IMETHOD Advance();
-
-
-
-protected:
-  NS_IMETHOD LoadFontList();
-
-  nsVoidArray * mFontList;
-
-  PRInt32 mNameIterInx;
-
-  nsFontSizeIterator * mSizeIter;
-};
-
-#endif

mozilla/widget/src/gtk/nsFontSizeIterator.cpp

@@ -1,88 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsFontSizeIterator.h"
-
-#include "nsFont.h"
-#include "nsVoidArray.h"
- 
-
-NS_IMPL_ADDREF(nsFontSizeIterator)
-NS_IMPL_RELEASE(nsFontSizeIterator)
-NS_IMPL_QUERY_INTERFACE(nsFontSizeIterator, nsIFontSizeIterator::GetIID())
-
-//----------------------------------------------------------
-nsFontSizeIterator::nsFontSizeIterator() 
-{
-  NS_INIT_REFCNT();
-  mFontInfo     = nsnull;
-  mSizeIterInx  = 0;
-
-}
-
-//----------------------------------------------------------
-nsFontSizeIterator::~nsFontSizeIterator()
-{
-}
-
-///----------------------------------------------------------
-//-- nsIFontNameIterator
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Reset()
-{
-  mSizeIterInx = 0;
-  return NS_OK;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Get( double* aFontSize  )
-{
-  if (nsnull != mFontInfo->mSizes && 
-      mFontInfo->mSizes->Count() > 0 && 
-      mSizeIterInx < mFontInfo->mSizes->Count()) {
-    PRUint32 size = (PRUint32)mFontInfo->mSizes->ElementAt(mSizeIterInx);
-    *aFontSize = (double)size;
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::Advance()
-{
-  if (nsnull != mFontInfo->mSizes && 
-      mFontInfo->mSizes->Count() > 0 &&
-      mSizeIterInx < mFontInfo->mSizes->Count()-2) {
-    mSizeIterInx++;
-    return NS_OK;
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//----------------------------------------------------------
-NS_IMETHODIMP nsFontSizeIterator::SetFontInfo( FontInfo * aFontInfo )
-{
-  mFontInfo = aFontInfo;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsFontSizeIterator.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsFontSizeIterator
-#define __nsFontSizeIterator
-
-#include "nsIFontSizeIterator.h"
-#include "nsString.h"
-
-class nsVoidArray;
-
-typedef struct {
-  nsString      mName;
-  PRBool        mIsScalable;
-  nsVoidArray * mSizes;
-} FontInfo;
-
-
-class nsFontSizeIterator: public nsIFontSizeIterator {
-public:
-  nsFontSizeIterator();
-  virtual ~nsFontSizeIterator();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIFontSizeIterator
-	NS_IMETHOD Reset();
-	NS_IMETHOD Get( double* aFontSize );
-	NS_IMETHOD Advance();
-
-  // Native impl
-	NS_IMETHOD SetFontInfo( FontInfo * aFontInfo );
-
-protected:
-
-  FontInfo * mFontInfo;      
-  PRInt32  mSizeIterInx;   // current index of iter
-};
-
-#endif

mozilla/widget/src/gtk/nsGtkEventHandler.cpp

@@ -1,967 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsWidget.h"
-#include "nsWindow.h"
-
-#include "nsScrollbar.h"
-#include "nsIFileWidget.h"
-#include "nsGUIEvent.h"
-#include "nsIMenu.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-
-#include "nsTextWidget.h"
-
-#include "nsICharsetConverterManager.h"
-#include "nsIPlatformCharset.h"
-#include "nsIServiceManager.h"
-static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
-
-#include "stdio.h"
-#include "ctype.h"
-
-#include "gtk/gtk.h"
-#include "nsGtkEventHandler.h"
-
-#include <gdk/gdkkeysyms.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-#ifdef DEBUG_pavlov
-//#define DEBUG_EVENTS 1
-#endif
-
-struct EventInfo {
-  nsWidget *widget;  // the widget
-  nsRect   *rect;    // the rect
-};
-
-//==============================================================
-void InitAllocationEvent(GtkAllocation *aAlloc,
-                         gpointer   p,
-                         nsSizeEvent &anEvent,
-                         PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_SIZE_EVENT;
-
-  if (aAlloc != nsnull) {
-    // HACK
-    //    nsRect *foo = new nsRect(aAlloc->x, aAlloc->y, aAlloc->width, aAlloc->height);
-    nsRect *foo = new nsRect(0, 0, aAlloc->width, aAlloc->height);
-    anEvent.windowSize = foo;
-    //    anEvent.point.x = aAlloc->x;
-    //    anEvent.point.y = aAlloc->y;
-    // HACK
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-    anEvent.mWinWidth = aAlloc->width;
-    anEvent.mWinHeight = aAlloc->height;
-  }
-
-  anEvent.time = PR_IntervalNow();
-}
-
-//==============================================================
-void InitConfigureEvent(GdkEventConfigure *aConf,
-                            gpointer   p,
-                            nsSizeEvent &anEvent,
-                            PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_SIZE_EVENT;
-
-  if (aConf != nsnull) {
-  /* do we accually need to alloc a new rect, or can we just set the
-     current one */
-    nsRect *foo = new nsRect(aConf->x, aConf->y, aConf->width, aConf->height);
-    anEvent.windowSize = foo;
-    anEvent.point.x = aConf->x;
-    anEvent.point.y = aConf->y;
-    anEvent.mWinWidth = aConf->width;
-    anEvent.mWinHeight = aConf->height;
-  }
-// this usually returns 0
-  anEvent.time = 0;
-}
-
-//==============================================================
-void InitExposeEvent(GdkEventExpose *aGEE,
-                     gpointer   p,
-                     nsPaintEvent &anEvent,
-                     PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_PAINT_EVENT;
-
-  if (aGEE != nsnull)
-  {
-#ifdef DEBUG_EVENTS
-    g_print("expose event: x = %i , y = %i , w = %i , h = %i\n",
-            aGEE->area.x, aGEE->area.y,
-            aGEE->area.width, aGEE->area.height);
-#endif
-    anEvent.point.x = aGEE->area.x;
-    anEvent.point.y = aGEE->area.y;
-
-    nsRect *rect = new nsRect(aGEE->area.x, aGEE->area.y,
-                              aGEE->area.width, aGEE->area.height);
-    anEvent.rect = rect;
-    anEvent.time = gdk_event_get_time((GdkEvent*)aGEE);
-  }
-}
-
-//=============================================================
-void UninitExposeEvent(GdkEventExpose *aGEE,
-                       gpointer   p,
-                       nsPaintEvent &anEvent,
-                       PRUint32   aEventType)
-{
-  if (aGEE != nsnull) {
-    delete anEvent.rect;
-  }
-}
-
-struct nsKeyConverter {
-  int vkCode; // Platform independent key code
-  int keysym; // GDK keysym key code
-};
-
-//
-// Netscape keycodes are defined in widget/public/nsGUIEvent.h
-// GTK keycodes are defined in <gdk/gdkkeysyms.h>
-//
-struct nsKeyConverter nsKeycodes[] = {
-  { NS_VK_CANCEL,     GDK_Cancel },
-  { NS_VK_BACK,       GDK_BackSpace },
-  { NS_VK_TAB,        GDK_Tab },
-  { NS_VK_TAB,        GDK_ISO_Left_Tab },
-  { NS_VK_CLEAR,      GDK_Clear },
-  { NS_VK_RETURN,     GDK_Return },
-  { NS_VK_SHIFT,      GDK_Shift_L },
-  { NS_VK_SHIFT,      GDK_Shift_R },
-  { NS_VK_CONTROL,    GDK_Control_L },
-  { NS_VK_CONTROL,    GDK_Control_R },
-  { NS_VK_ALT,        GDK_Alt_L },
-  { NS_VK_ALT,        GDK_Alt_R },
-  { NS_VK_PAUSE,      GDK_Pause },
-  { NS_VK_CAPS_LOCK,  GDK_Caps_Lock },
-  { NS_VK_ESCAPE,     GDK_Escape },
-  { NS_VK_SPACE,      GDK_space },
-  { NS_VK_PAGE_UP,    GDK_Page_Up },
-  { NS_VK_PAGE_DOWN,  GDK_Page_Down },
-  { NS_VK_END,        GDK_End },
-  { NS_VK_HOME,       GDK_Home },
-  { NS_VK_LEFT,       GDK_Left },
-  { NS_VK_UP,         GDK_Up },
-  { NS_VK_RIGHT,      GDK_Right },
-  { NS_VK_DOWN,       GDK_Down },
-  { NS_VK_PRINTSCREEN, GDK_Print },
-  { NS_VK_INSERT,     GDK_Insert },
-  { NS_VK_DELETE,     GDK_Delete },
-
-  { NS_VK_MULTIPLY,   GDK_KP_Multiply },
-  { NS_VK_ADD,        GDK_KP_Add },
-  { NS_VK_SEPARATOR,  GDK_KP_Separator },
-  { NS_VK_SUBTRACT,   GDK_KP_Subtract },
-  { NS_VK_DECIMAL,    GDK_KP_Decimal },
-  { NS_VK_DIVIDE,     GDK_KP_Divide },
-  { NS_VK_RETURN,     GDK_KP_Enter },
-
-  // NS doesn't have dash or equals distinct from the numeric keypad ones,
-  // so we'll use those for now.  See bug 17008:
-  { NS_VK_SUBTRACT, GDK_minus },
-  { NS_VK_EQUALS, GDK_equal },
-  // and we don't have a single-quote symbol either:
-  { NS_VK_QUOTE, GDK_apostrophe },
-
-  { NS_VK_COMMA,      GDK_comma },
-  { NS_VK_PERIOD,     GDK_period },
-  { NS_VK_SLASH,      GDK_slash },
-  { NS_VK_BACK_SLASH, GDK_backslash },
-  { NS_VK_BACK_QUOTE, GDK_grave },
-  { NS_VK_OPEN_BRACKET, GDK_bracketleft },
-  { NS_VK_CLOSE_BRACKET, GDK_bracketright },
-  { NS_VK_QUOTE, GDK_quotedbl },
-
-  // Some shifted keys, see bug 15463.
-  // These should be subject to different keyboard mappings;
-  // how do we do that in gtk?
-  { NS_VK_SEMICOLON, GDK_colon },
-  { NS_VK_BACK_QUOTE, GDK_asciitilde },
-  { NS_VK_COMMA, GDK_less },
-  { NS_VK_PERIOD, GDK_greater },
-  { NS_VK_SLASH,      GDK_question },
-  { NS_VK_1, GDK_exclam },
-  { NS_VK_2, GDK_at },
-  { NS_VK_3, GDK_numbersign },
-  { NS_VK_4, GDK_dollar },
-  { NS_VK_5, GDK_percent },
-  { NS_VK_6, GDK_asciicircum },
-  { NS_VK_7, GDK_ampersand },
-  { NS_VK_8, GDK_asterisk },
-  { NS_VK_9, GDK_parenleft },
-  { NS_VK_0, GDK_parenright },
-  { NS_VK_SUBTRACT, GDK_underscore },
-  { NS_VK_EQUALS, GDK_plus }
-};
-
-void nsGtkWidget_InitNSKeyEvent(int aEventType, nsKeyEvent& aKeyEvent,
-                                GtkWidget *w, gpointer p, GdkEventKey * event);
-
-//==============================================================
-
-// Input keysym is in gtk format; output is in NS_VK format
-int nsPlatformToDOMKeyCode(GdkEventKey *aGEK)
-{
-  int i;
-  int length = sizeof(nsKeycodes) / sizeof(struct nsKeyConverter);
-
-  int keysym = aGEK->keyval;
-
-  // First, try to handle alphanumeric input, not listed in nsKeycodes:
-  // most likely, more letters will be getting typed in than things in
-  // the key list, so we will look through these first.
-
-  // since X has different key symbols for upper and lowercase letters and
-  // mozilla does not, convert gdk's to mozilla's
-  if (keysym >= GDK_a && keysym <= GDK_z)
-    return keysym - GDK_a + NS_VK_A;
-  if (keysym >= GDK_A && keysym <= GDK_Z)
-    return keysym - GDK_A + NS_VK_A;
-
-  // numbers
-  if (keysym >= GDK_0 && keysym <= GDK_9)
-    return keysym - GDK_0 + NS_VK_0;
-
-  // keypad numbers
-  if (keysym >= GDK_KP_0 && keysym <= GDK_KP_9)
-    return keysym - GDK_KP_0 + NS_VK_NUMPAD0;
-
-  // misc other things
-  for (i = 0; i < length; i++) {
-    if (nsKeycodes[i].keysym == keysym)
-      return(nsKeycodes[i].vkCode);
-  }
-
-  // function keys
-  if (keysym >= GDK_F1 && keysym <= GDK_F24)
-    return keysym - GDK_F1 + NS_VK_F1;
-
-#if defined(DEBUG_akkana) || defined(DEBUG_ftang)
-  printf("No match in nsPlatformToDOMKeyCode: keysym is 0x%x, string is %s\n", keysym, aGEK->string);
-#endif
-
-  return((int)0);
-}
-
-//==============================================================
-
-PRUint32 nsConvertCharCodeToUnicode(GdkEventKey* aGEK)
-{
-  // For control chars, GDK sets string to be the actual ascii value.
-  // Map that to what nsKeyEvent wants, which currently --
-  // TEMPORARILY (the spec has changed and will be switched over
-  // when the tree opens for M11) --
-  // is the ascii for the actual event (e.g. 1 for control-a).
-  // This is only true for control chars; for alt chars, send the
-  // ascii for the key, i.e. a for alt-a.
-  if (aGEK->state & GDK_CONTROL_MASK)
-  {
-    if (aGEK->state & GDK_SHIFT_MASK)
-      return aGEK->string[0] + 'A' - 1;
-    else
-      return aGEK->string[0] + 'a' - 1;
-  }
-
-  // For now (obviously this will need to change for IME),
-  // only set a char code if the result is printable:
-  if (!isprint(aGEK->string[0]))
-    return 0;
-
-  // ALT keys in gdk give the upper case character in string,
-  // but we want the lower case char in char code
-  // unless shift was also pressed.
-  if (((aGEK->state & GDK_MOD1_MASK))
-      && !(aGEK->state & GDK_SHIFT_MASK)
-      && isupper(aGEK->string[0]))
-    return tolower(aGEK->string[0]);
-
-  //
-  // placeholder for something a little more interesting and correct
-  //
-  return aGEK->string[0];
-}
-
-//==============================================================
-void InitKeyEvent(GdkEventKey *aGEK,
-                            gpointer   p,
-                            nsKeyEvent &anEvent,
-                            PRUint32   aEventType)
-{
-  anEvent.message = aEventType;
-  anEvent.widget  = (nsWidget *) p;
-
-  anEvent.eventStructType = NS_KEY_EVENT;
-
-  if (aGEK != nsnull) {
-    anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
-    anEvent.charCode = 0;
-    anEvent.time = aGEK->time;
-    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-    // XXX
-    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-  }
-}
-
-void InitKeyPressEvent(GdkEventKey *aGEK,
-                       gpointer p,
-                       nsKeyEvent &anEvent)
-{
-  //
-  // init the basic event fields
-  //
-  anEvent.eventStructType = NS_KEY_EVENT;
-  anEvent.message = NS_KEY_PRESS;
-  anEvent.widget = (nsWidget*)p;
-
-  if (aGEK!=nsnull)
-  {
-    anEvent.isShift = (aGEK->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isControl = (aGEK->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-    anEvent.isAlt = (aGEK->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-    // XXX
-    anEvent.isMeta = PR_FALSE; //(aGEK->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-
-    if(aGEK->length)
-       anEvent.charCode = nsConvertCharCodeToUnicode(aGEK);
-    else 
-       anEvent.charCode = 0;
-
-    if (anEvent.charCode) {
-      anEvent.keyCode = 0;
-      anEvent.isShift = PR_FALSE;
-    } else
-      anEvent.keyCode = nsPlatformToDOMKeyCode(aGEK);
-
-#if defined(DEBUG_akkana) || defined(DEBUG_pavlov) || defined (DEBUG_ftang)
-    printf("Key Press event: keyCode = 0x%x, char code = '%c'",
-           anEvent.keyCode, anEvent.charCode);
-    if (anEvent.isShift)
-      printf(" [shift]");
-    if (anEvent.isControl)
-      printf(" [ctrl]");
-    if (anEvent.isAlt)
-      printf(" [alt]");
-    if (anEvent.isMeta)
-      printf(" [meta]");
-    printf("\n");
-#endif
-
-    anEvent.time = aGEK->time;
-    anEvent.point.x = 0;
-    anEvent.point.y = 0;
-  }
-}
-
-//=============================================================
-void UninitKeyEvent(GdkEventKey *aGEK,
-                              gpointer   p,
-                              nsKeyEvent &anEvent,
-                              PRUint32   aEventType)
-{
-}
-
-/*==============================================================
-  ==============================================================
-  =============================================================
-  ==============================================================*/
-
-void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p)
-{
-  nsWindow *widget = (nsWindow *)p;
-  nsSizeEvent event;
-
-  InitAllocationEvent(alloc, p, event, NS_SIZE);
-  NS_ADDREF(widget);
-  widget->OnResize(event);
-  NS_RELEASE(widget);
-
-  delete event.windowSize;
-}
-
-gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p)
-{
-  if (event->type == GDK_NO_EXPOSE)
-    return PR_FALSE;
-
-  nsPaintEvent pevent;
-  InitExposeEvent(event, p, pevent, NS_PAINT);
-
-  nsWindow *win = (nsWindow *)p;
-  win->AddRef();
-  win->OnExpose(pevent);
-  win->Release();
-
-  UninitExposeEvent(event, p, pevent, NS_PAINT);
-
-  return PR_TRUE;
-}
-
-//==============================================================
-void menu_item_activate_handler(GtkWidget *w, gpointer p)
-{
-  // g_print("menu_item_activate_handler\n");
-
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenuItem *menuItem = (nsIMenuItem *)p;
-  if (menuItem != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    // mevent.widget = menuItem;
-    mevent.widget = nsnull;
-    menuItem->GetCommand(mevent.mCommand);
-
-    mevent.mMenuItem = menuItem;
-    mevent.time = PR_IntervalNow();
-
-    // FIXME - THIS SHOULD WORK.  FIX EVENTS FOR XP CODE!!!!! (pav)
-    //    nsEventStatus status;
-    //    mevent.widget->DispatchEvent((nsGUIEvent *)&mevent, status);
-
-    menuItem->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuItemSelected(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_map_handler(GtkWidget *w, gpointer p)
-{ 
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-
-    if(menuListener) {
-      menuListener->MenuConstruct(
-        mevent,
-      	nsnull,   //parent window
-        nsnull,   //menuNode
-        nsnull ); // webshell
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-//==============================================================
-void menu_unmap_handler(GtkWidget *w, gpointer p)
-{
-  nsIMenuListener *menuListener = nsnull;
-  nsIMenu *menu = (nsIMenu *)p;
-  if (menu != nsnull) {
-    nsMenuEvent mevent;
-    mevent.message = NS_MENU_SELECTED;
-    mevent.eventStructType = NS_MENU_EVENT;
-    mevent.point.x = 0;
-    mevent.point.y = 0;
-    mevent.widget = nsnull;
-
-    mevent.time = PR_IntervalNow();
-
-    menu->QueryInterface(nsIMenuListener::GetIID(), (void**)&menuListener);
-    if(menuListener) {
-      menuListener->MenuDestruct(mevent);
-      NS_IF_RELEASE(menuListener);
-    }
-  }
-}
-
-
-//==============================================================
-void handle_scrollbar_value_changed(GtkAdjustment *adj, gpointer p)
-{
-  nsScrollbar *widget = (nsScrollbar*) p;
-  nsScrollbarEvent sevent;
-
-  sevent.message = NS_SCROLLBAR_POS;
-  sevent.widget  = (nsWidget *) p;
-  sevent.eventStructType = NS_SCROLLBAR_EVENT;
-
-  GdkWindow *win = (GdkWindow *)widget->GetNativeData(NS_NATIVE_WINDOW);
-  gdk_window_get_pointer(win, &sevent.point.x, &sevent.point.y, nsnull);
-
-  widget->AddRef();
-  widget->OnScroll(sevent, adj->value);
-  widget->Release();
-
-/* FIXME we need to set point.* from the event stuff. */
-#if 0
-  nsWindow * widgetWindow = (nsWindow *) p ;
-  XmScrollBarCallbackStruct * cbs = (XmScrollBarCallbackStruct*) call_data;
-  sevent.widget  = (nsWindow *) p;
-  if (cbs->event != nsnull) {
-    sevent.point.x = cbs->event->xbutton.x;
-    sevent.point.y = cbs->event->xbutton.y;
-  } else {
-    sevent.point.x = 0;
-    sevent.point.y = 0;
-  }
-  sevent.time    = 0; //XXX Implement this
-
-  switch (cbs->reason) {
-
-    case XmCR_INCREMENT:
-      sevent.message = NS_SCROLLBAR_LINE_NEXT;
-      break;
-
-    case XmCR_DECREMENT:
-      sevent.message = NS_SCROLLBAR_LINE_PREV;
-      break;
-
-    case XmCR_PAGE_INCREMENT:
-      sevent.message = NS_SCROLLBAR_PAGE_NEXT;
-      break;
-
-    case XmCR_PAGE_DECREMENT:
-      sevent.message = NS_SCROLLBAR_PAGE_PREV;
-      break;
-
-    case XmCR_DRAG:
-      sevent.message = NS_SCROLLBAR_POS;
-      break;
-
-    case XmCR_VALUE_CHANGED:
-      sevent.message = NS_SCROLLBAR_POS;
-      break;
-
-    default:
-      break;
-  }
-#endif
-}
-
-static gint composition_start(GdkEventKey *aEvent, nsWindow *aWin,
-                              nsEventStatus *aStatus) {
-  nsCompositionEvent compEvent;
-
-  compEvent.widget = (nsWidget*)aWin;
-  compEvent.point.x = 0;
-  compEvent.point.y = 0;
-  compEvent.time = aEvent->time;
-  compEvent.message = NS_COMPOSITION_START;
-  compEvent.eventStructType = NS_COMPOSITION_START;
-  compEvent.compositionMessage = NS_COMPOSITION_START;
-  aWin->DispatchEvent(&compEvent, *aStatus);
-
-  // set SpotLocation
-  aWin->SetXICSpotLocation(compEvent.theReply.mCursorPosition);
-
-  return PR_TRUE;
-}
-
-static gint composition_draw(GdkEventKey *aEvent, nsWindow *aWin,
-                             nsIUnicodeDecoder *aDecoder,
-                             nsEventStatus *aStatus) {
-  if (!aWin->mIMECompositionUniString) {
-    aWin->mIMECompositionUniStringSize = 128;
-    aWin->mIMECompositionUniString =
-      new PRUnichar[aWin->mIMECompositionUniStringSize];
-  }
-  PRUnichar *uniChar;
-  PRInt32 uniCharSize;
-  PRInt32 srcLen = aEvent->length;
-  for (;;) {
-    uniChar = aWin->mIMECompositionUniString;
-    uniCharSize = aWin->mIMECompositionUniStringSize - 1;
-    aDecoder->Convert((char*)aEvent->string, &srcLen, uniChar, &uniCharSize);
-    if (srcLen == aEvent->length &&
-        uniCharSize < aWin->mIMECompositionUniStringSize - 1) {
-      break;
-    }
-    aWin->mIMECompositionUniStringSize += 32;
-    aWin->mIMECompositionUniString =
-      new PRUnichar[aWin->mIMECompositionUniStringSize];
-  }
-  aWin->mIMECompositionUniString[uniCharSize] = 0;
-
-  nsTextEvent textEvent;
-  textEvent.message = NS_TEXT_EVENT;
-  textEvent.widget = (nsWidget*)aWin;
-  textEvent.time = aEvent->time;
-  textEvent.point.x = 0;
-  textEvent.point.y = 0;
-  textEvent.theText = aWin->mIMECompositionUniString;
-  textEvent.rangeCount = 0;
-  textEvent.rangeArray = nsnull;
-  textEvent.isShift = (aEvent->state & GDK_SHIFT_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.isControl = (aEvent->state & GDK_CONTROL_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.isAlt = (aEvent->state & GDK_MOD1_MASK) ? PR_TRUE : PR_FALSE;
-  // XXX
-  textEvent.isMeta = PR_FALSE; //(aEvent->state & GDK_MOD2_MASK) ? PR_TRUE : PR_FALSE;
-  textEvent.eventStructType = NS_TEXT_EVENT;
-  aWin->DispatchEvent(&textEvent, *aStatus);
-
-  aWin->SetXICSpotLocation(textEvent.theReply.mCursorPosition);
-  return True;
-}
-
-static gint composition_end(GdkEventKey *aEvent, nsWindow *aWin,
-                            nsEventStatus *aStatus) {
-  nsCompositionEvent compEvent;
-
-  compEvent.widget = (nsWidget*)aWin;
-  compEvent.point.x = 0;
-  compEvent.point.y = 0;
-  compEvent.time = aEvent->time;
-  compEvent.message = NS_COMPOSITION_END;
-  compEvent.eventStructType = NS_COMPOSITION_END;
-  compEvent.compositionMessage = NS_COMPOSITION_END;
-  aWin->DispatchEvent(&compEvent, *aStatus);
-
-  return PR_TRUE;
-}
-
-static nsIUnicodeDecoder*
-open_unicode_decoder(void) {
-  nsresult result = NS_ERROR_FAILURE;
-  nsIUnicodeDecoder *decoder = nsnull;
-  NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_PROGID,
-                  &result);
-  if (platform && NS_SUCCEEDED(result)) {
-    nsAutoString charset("");
-    result = platform->GetCharset(kPlatformCharsetSel_Menu, charset);
-    if (NS_FAILED(result) || (charset.Length() == 0)) {
-      charset = "ISO-8859-1";   // default
-    }
-    nsICharsetConverterManager* manager = nsnull;
-    nsresult res = nsServiceManager::
-      GetService(kCharsetConverterManagerCID,
-                 nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
-                 (nsISupports**)&manager);
-    if (manager && NS_SUCCEEDED(res)) {
-      manager->GetUnicodeDecoder(&charset, &decoder);
-      nsServiceManager::ReleaseService(kCharsetConverterManagerCID, manager);
-    }
-  }
-  return decoder;
-}
-
-// GTK's text widget already does XIM, so we don't want to do this again
-gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event,
-                                     gpointer p)
-{
-  nsKeyEvent kevent;
-  nsTextWidget* win = (nsTextWidget*)p;
-
-  // work around for annoying things.
-  if (event->keyval == GDK_Tab)
-    if (event->state & GDK_CONTROL_MASK)
-      if (event->state & GDK_MOD1_MASK)
-        return PR_FALSE;
-
-  // Don't pass shift, control and alt as key press events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  win->AddRef();
-  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
-  win->OnKey(kevent);
-
-  //
-  // Second, dispatch the Key event as a key press event w/ a Unicode
-  //  character code.  Note we have to check for modifier keys, since
-  // gtk returns a character value for them
-  //
-  InitKeyPressEvent(event,p, kevent);
-  win->OnKey(kevent);
-
-  win->Release();
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
-  }
-
-  return PR_TRUE;
-}
-
-// GTK's text widget already does XIM, so we don't want to do this again
-gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event,
-                                       gpointer p)
-{
-  nsKeyEvent kevent;
-  nsTextWidget* win = (nsTextWidget*)p;
-
-  // Don't pass shift, control and alt as key release events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  InitKeyEvent(event, p, kevent, NS_KEY_UP);
-  win->AddRef();
-  win->OnKey(kevent);
-  win->Release();
-  
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
-  }
-
-  return PR_TRUE;
-}
-
-
-//==============================================================
-gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p)
-{
-  nsKeyEvent kevent;
-  nsWindow* win = (nsWindow*)p;
-
-  // work around for annoying things.
-  if (event->keyval == GDK_Tab)
-    if (event->state & GDK_CONTROL_MASK)
-      if (event->state & GDK_MOD1_MASK)
-        return PR_FALSE;
-
-  // Don't pass shift, control and alt as key press events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  win->AddRef();
-  //
-  // First, dispatch the Key event as a virtual key down event
-  //
-  InitKeyEvent(event, p, kevent, NS_KEY_DOWN);
-  win->OnKey(kevent);
- 
-
-
-  //
-  // Second, dispatch the Key event as a key press event w/ a Unicode
-  //  character code.  Note we have to check for modifier keys, since
-  // gtk returns a character value for them
-  //
-  if (event->length) {
-    static nsIUnicodeDecoder *decoder = nsnull;
-    if (!decoder) {
-      decoder = open_unicode_decoder();
-    }
-    if (decoder && (!kevent.keyCode)) {
-      nsEventStatus status;
-      composition_start(event, win, &status);
-      composition_draw(event, win, decoder, &status);
-      composition_end(event, win, &status);
-    } else {
-      InitKeyPressEvent(event,p, kevent);
-      win->OnKey(kevent);
-      nsEventStatus status;
-      composition_start(event, win, &status);
-      composition_end(event, win, &status);
-    }
-  } else { // for Home/End/Up/Down/Left/Right/PageUp/PageDown key
-    InitKeyPressEvent(event,p, kevent);
-    win->OnKey(kevent);
-  }
-
-  win->Release();
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_press_event");
-  }
-
-  return PR_TRUE;
-}
-
-//==============================================================
-gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p)
-{
-  // Don't pass shift, control and alt as key release events
-  if (event->keyval == GDK_Shift_L
-      || event->keyval == GDK_Shift_R
-      || event->keyval == GDK_Control_L
-      || event->keyval == GDK_Control_R)
-    return PR_TRUE;
-
-  nsKeyEvent kevent;
-  InitKeyEvent(event, p, kevent, NS_KEY_UP);
-
-  nsWindow * win = (nsWindow *) p;
-  win->AddRef();
-  win->OnKey(kevent);
-  win->Release();
-
-  if (w)
-  {
-    gtk_signal_emit_stop_by_name (GTK_OBJECT(w), "key_release_event");
-  }
-
-  return PR_TRUE;
-}
-
-//==============================================================
-void 
-handle_gdk_event (GdkEvent *event, gpointer data)
-{
-  GtkObject *object = nsnull;
-
-  if (event->any.window)
-    gdk_window_get_user_data (event->any.window, (void **)&object);
-
-  if (object != nsnull &&
-      GDK_IS_SUPERWIN (object))
-    {
-      // It was an event on one of our superwindows
-
-      nsWindow *window = (nsWindow *)gtk_object_get_data (object, "nsWindow");
-      
-      if (gtk_grab_get_current () != nsnull)
-        {
-          // A GTK+ grab is in effect. Rewrite the event to point to
-          // our toplevel, and pass it through.
-          // XXX: We should actually translate the coordinates
-
-          gdk_window_unref (event->any.window);
-          event->any.window = GTK_WIDGET (window->GetMozArea())->window;
-          gdk_window_ref (event->any.window);
-        }
-      else
-        {
-          // Handle it ourselves.
-
-          switch (event->type)
-            {
-            case GDK_KEY_PRESS:
-              handle_key_press_event (NULL, &event->key, window);
-              break;
-            case GDK_KEY_RELEASE:
-              handle_key_release_event (NULL, &event->key, window);
-              break;
-            default:
-              window->HandleEvent (event);
-            }
-          return;
-        }
-    }
-
-  gtk_main_do_event (event);
-}
-
-//==============================================================
-void
-handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
-{
-  nsWindow *window = (nsWindow *)p;
-  switch(event->xany.type) {
-  case ConfigureNotify:
-    window->HandleXlibConfigureNotifyEvent(event);
-    break;
-  default:
-    break;
-  }
-}
-
-//==============================================================
-void
-handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p)
-{
-  nsWindow *window = (nsWindow *)p;
-
-  switch(event->xany.type) {
-  case Expose:
-    window->HandleXlibExposeEvent(event);
-    break;
-  case ButtonPress:
-  case ButtonRelease:
-    window->HandleXlibButtonEvent((XButtonEvent *)event);
-    break;
-  case MotionNotify:
-    window->HandleXlibMotionNotifyEvent((XMotionEvent *) event);
-    break;
-  case EnterNotify:
-  case LeaveNotify:
-    window->HandleXlibCrossingEvent((XCrossingEvent *) event);
-    break;
-  default:
-    break;
-  }
-}
-
-//==============================================================
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p ;
-  if (p != nsnull) {
-    widgetWindow->OnCancel();
-  }
-#endif
-
-  return PR_FALSE;
-}
-
-//==============================================================
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p)
-{
-#if 0
-  nsWindow *widgetWindow = (nsWindow*)gtk_object_get_user_data(GTK_OBJECT(w));
-  nsFileWidget * widgetWindow = (nsFileWidget *) p;
-  if (p != nsnull) {
-    widgetWindow->OnOk();
-  }
-#endif
-
-  return PR_FALSE;
-}

mozilla/widget/src/gtk/nsGtkEventHandler.h

@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsGtkEventHandler_h
-#define __nsGtkEventHandler_h
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include "gdksuperwin.h"
-
-class nsIWidget;
-class nsIMenuItem;
-class nsIMenu;
-
-gint handle_configure_event(GtkWidget *w, GdkEventConfigure *conf, gpointer p);
-void handle_size_allocate(GtkWidget *w, GtkAllocation *alloc, gpointer p);
-gint handle_expose_event(GtkWidget *w, GdkEventExpose *event, gpointer p);
-
-
-gint handle_key_release_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
-gint handle_key_press_event_for_text(GtkObject *w, GdkEventKey* event, gpointer p);
-
-gint handle_key_release_event(GtkObject *w, GdkEventKey* event, gpointer p);
-gint handle_key_press_event(GtkObject *w, GdkEventKey* event, gpointer p);
-
-void handle_scrollbar_value_changed(GtkAdjustment *adjustment, gpointer p);
-
-void menu_item_activate_handler(GtkWidget *w, gpointer p);
-
-void menu_map_handler(GtkWidget *w, gpointer p);
-void menu_unmap_handler(GtkWidget *w, gpointer p);
-
-//----------------------------------------------------
-
-gint nsGtkWidget_FSBCancel_Callback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_FSBOk_Callback(GtkWidget *w, gpointer p);
-
-//----------------------------------------------------
-gint CheckButton_Toggle_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_RadioButton_ArmCallback(GtkWidget *w, gpointer p);
-gint nsGtkWidget_RadioButton_DisArmCallback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Text_Callback(GtkWidget *w, GdkEventKey* event, gpointer p);
-gint nsGtkWidget_Expose_Callback(GtkWidget *w, gpointer p);
-
-gint nsGtkWidget_Refresh_Callback(gpointer call_data);
-
-void handle_xlib_shell_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
-void handle_xlib_bin_event(GdkSuperWin *superwin, XEvent *event, gpointer p);
-void handle_gdk_event (GdkEvent *event, gpointer data);
-
-#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsGtkUtils.cpp

@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <unistd.h>
-#include <string.h>
-
-#include "nsGtkUtils.h"
-
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-
-#if defined(__osf__) && !defined(_XOPEN_SOURCE_EXTENDED)
-/*
-** DEC's compiler requires _XOPEN_SOURCE_EXTENDED to be defined in
-** order for it to see the prototype for usleep in unistd.h, but if
-** we define that the build breaks long before getting here.  So
-** put the prototype here explicitly.
-*/
-int usleep(useconds_t);
-#endif
-#if defined(__QNX__)
-#define usleep(s)	sleep(s)
-#endif
-
-//////////////////////////////////////////////////////////////////
-#if 0
-/* staitc */ gint
-nsGtkUtils::gdk_query_pointer(GdkWindow * window,
-							  gint *      x_out,
-							  gint *      y_out)
-{
-  g_return_val_if_fail(NULL != window, FALSE);
-  g_return_val_if_fail(NULL != x_out, FALSE);
-  g_return_val_if_fail(NULL != y_out, FALSE);
-
-  Window root;
-  Window child;
-  int rootx, rooty;
-  int winx = 0;
-  int winy = 0;
-  unsigned int xmask = 0;
-  gint result = FALSE;
-  
-  *x_out = -1;
-  *y_out = -1;
-  
-  result = XQueryPointer(GDK_WINDOW_XDISPLAY(window),
-                         GDK_WINDOW_XWINDOW(window),
-                         &root, 
-                         &child,
-                         &rootx,
-                         &rooty,
-                         &winx,
-                         &winy,
-                         &xmask);
-  
-  if (result)
-  {
-    *x_out = rootx;
-    *y_out = rooty;
-  }
-
-  return result;
-}
-#endif
-//////////////////////////////////////////////////////////////////
-/* static */ void 
-nsGtkUtils::gtk_widget_set_color(GtkWidget *  widget,
-								 GtkRcFlags   flags,
-								 GtkStateType state,
-								 GdkColor *   color)
-{
-  GtkRcStyle * rc_style;
-
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (color != NULL);
-  g_return_if_fail (flags == 0);
-
-  rc_style = (GtkRcStyle *) gtk_object_get_data (GTK_OBJECT (widget), 
-												 "modify-style");
-
-  if (!rc_style)
-  {
-	rc_style = gtk_rc_style_new ();
-
-	gtk_widget_modify_style (widget, rc_style);
-
-	gtk_object_set_data (GTK_OBJECT (widget), "modify-style", rc_style);
-  }
-
-  if (flags & GTK_RC_FG)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_FG);
-    rc_style->fg[state] = *color;
-  }
-
-  if (flags & GTK_RC_BG)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BG);
-    rc_style->bg[state] = *color;
-  }
-
-  if (flags & GTK_RC_TEXT)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_TEXT);
-    rc_style->text[state] = *color;
-  }
-
-  if (flags & GTK_RC_BASE)
-  {
-    rc_style->color_flags[state] = GtkRcFlags(rc_style->color_flags[state] | GTK_RC_BASE);
-    rc_style->base[state] = *color;
-  }
-}
-//////////////////////////////////////////////////////////////////
-/* static */ GdkModifierType
-nsGtkUtils::gdk_keyboard_get_modifiers()
-{
-  GdkModifierType m = (GdkModifierType) 0;
-
-  gdk_window_get_pointer(NULL,NULL,NULL,&m);
-
-  return m;
-}
-//////////////////////////////////////////////////////////////////
-/* static */ void
-nsGtkUtils::gdk_window_flash(GdkWindow *    aGdkWindow,
-                             unsigned int   aTimes,
-                             unsigned long  aInterval,
-                             GdkRectangle * aArea)
-{
-  gint         x;
-  gint         y;
-  gint         width;
-  gint         height;
-  guint        i;
-  GdkGC *      gc = 0;
-  GdkColor     white;
-
-  gdk_window_get_geometry(aGdkWindow,
-                          NULL,
-                          NULL,
-                          &width,
-                          &height,
-                          NULL);
-
-  gdk_window_get_origin (aGdkWindow,
-                         &x,
-                         &y);
-
-  gc = gdk_gc_new(GDK_ROOT_PARENT());
-
-  white.pixel = WhitePixel(gdk_display,DefaultScreen(gdk_display));
-
-  gdk_gc_set_foreground(gc,&white);
-  gdk_gc_set_function(gc,GDK_XOR);
-  gdk_gc_set_subwindow(gc,GDK_INCLUDE_INFERIORS);
-  
-  /* 
-   * If an area is given, use that.  Notice how out of whack coordinates
-   * and dimentsions are not checked!!!
-   */
-  if (aArea)
-  {
-    x += aArea->x;
-    y += aArea->y;
-    
-    width = aArea->width;
-    height = aArea->height;
-  }
-
-  /*
-   * Need to do this twice so that the XOR effect can replace 
-   * the original window contents.
-   */
-  for (i = 0; i < aTimes * 2; i++)
-  {
-    gdk_draw_rectangle(GDK_ROOT_PARENT(),
-                       gc,
-                       TRUE,
-                       x,
-                       y,
-                       width,
-                       height);
-
-    gdk_flush();
-    
-    usleep(aInterval);
-  }
-
-  gdk_gc_destroy(gc);
-}
-//////////////////////////////////////////////////////////////////

mozilla/widget/src/gtk/nsGtkUtils.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsGtkUtils_h
-#define __nsGtkUtils_h
-
-#include <gtk/gtk.h>
-
-struct nsGtkUtils
-{
-  //
-  // Wrapper for XQueryPointer
-  //
-#if 0
-  static gint gdk_query_pointer(GdkWindow * window,
-                                gint *      x_out,
-                                gint *      y_out);
-#endif
-
-  //
-  // Change a widget's background
-  //
-  // flags isa bit mask of the following bits:
-  //
-  //   GTK_RC_FG
-  //   GTK_RC_BG
-  //   GTK_RC_TEXT
-  //   GTK_RC_BASE
-  //
-  // state is an enum:
-  //
-  //   GTK_STATE_NORMAL,
-  //   GTK_STATE_ACTIVE,
-  //   GTK_STATE_PRELIGHT,
-  //   GTK_STATE_SELECTED,
-  //   GTK_STATE_INSENSITIVE
-  //
-  static void gtk_widget_set_color(GtkWidget *  widget,
-                                   GtkRcFlags   flags,
-                                   GtkStateType state,
-                                   GdkColor *   color);
-
-  /**
-   * Return the current keyboard modifier state.
-   *
-   * @return the current keyboard modifier state.
-   *
-   */
-  static GdkModifierType gdk_keyboard_get_modifiers();
-
-  /**
-   * Flash an area within a GDK window (or the whole window)
-   *
-   * @param aGdkWindow   The GDK window to flash.
-   * @param aTimes       Number of times to flash the area.
-   * @param aInterval    Interval between flashes in milliseconds.
-   * @param aArea        The area to flash.  The whole window if NULL.
-   *
-   */
-  static void gdk_window_flash(GdkWindow *     aGdkWindow,
-                               unsigned int    aTimes,
-                               unsigned long   aInterval,
-                               GdkRectangle *  aArea);
-};
-
-#endif  // __nsGtkEventHandler.h

mozilla/widget/src/gtk/nsLabel.cpp

@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsLabel.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsLabel, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsLabel, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsLabel, nsILabel, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsLabel constructor
-//
-//-------------------------------------------------------------------------
-nsLabel::nsLabel() : nsWidget(), nsILabel()
-{
-  NS_INIT_REFCNT();
-  mAlignment = eAlign_Left;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsLabel destructor
-//
-//-------------------------------------------------------------------------
-nsLabel::~nsLabel()
-{
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the nativeLabel widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsLabel::CreateNative(GtkObject *parentWindow)
-{
-  unsigned char alignment = GetNativeAlignment();
-
-  mWidget = gtk_label_new("");
-  gtk_widget_set_name(mWidget, "nsLabel");
-  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, alignment);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsLabel::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsLabelInitData* data = (nsLabelInitData *) aInitData;
-    mAlignment = data->mAlignment;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set alignment
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsLabel::SetAlignment(nsLabelAlignment aAlignment)
-{
-  GtkJustification align;
-
-  mAlignment = aAlignment;
-
-  align = GetNativeAlignment();
-  gtk_misc_set_alignment(GTK_MISC(mWidget), 0.0, align);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//
-//-------------------------------------------------------------------------
-GtkJustification nsLabel::GetNativeAlignment()
-{
-  switch (mAlignment) {
-    case eAlign_Right : return GTK_JUSTIFY_RIGHT;
-    case eAlign_Left  : return GTK_JUSTIFY_LEFT;
-    case eAlign_Center: return GTK_JUSTIFY_CENTER;
-    default :
-      return GTK_JUSTIFY_LEFT;
-  }
-  return GTK_JUSTIFY_LEFT;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsLabel::SetLabel(const nsString& aText)
-{
-  NS_ALLOC_STR_BUF(label, aText, 256);
-  gtk_label_set(GTK_LABEL(mWidget), label);
-  NS_FREE_STR_BUF(label);
-  return NS_OK;
-
-}
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsLabel::GetLabel(nsString& aBuffer)
-{
-  char * text;
-  gtk_label_get(GTK_LABEL(mWidget), &text);
-  aBuffer.SetLength(0);
-  aBuffer.Append(text);
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsLabel.h

@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsLabel_h__
-#define nsLabel_h__
-
-#include "nsWidget.h"
-#include "nsILabel.h"
-
-/**
- * Native GTK+ Label wrapper
- */
-class nsLabel :  public nsWidget,
-                 public nsILabel
-{
-
-public:
-
-  nsLabel();
-  virtual ~nsLabel();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsILabel part
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetLabel(nsString &aBuffer);
-  NS_IMETHOD SetAlignment(nsLabelAlignment aAlignment);
-
-  NS_IMETHOD PreCreateWidget(nsWidgetInitData *aInitData);
-
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY) { return PR_FALSE; }
-  virtual PRBool OnResize(nsRect &aRect) { return PR_FALSE; }
-
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-  GtkJustification GetNativeAlignment();
-
-  nsLabelAlignment mAlignment;
-
-};
-
-#endif // nsLabel_h__

mozilla/widget/src/gtk/nsListBox.cpp

@@ -1,394 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsListBox.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsListBox, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsListBox, nsWidget)
-NS_IMPL_QUERY_INTERFACE3(nsListBox, nsIListBox, nsIListWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsListBox constructor
-//
-//-------------------------------------------------------------------------
-nsListBox::nsListBox() : nsWidget(), nsIListWidget(), nsIListBox()
-{
-  NS_INIT_REFCNT();
-  mMultiSelect = PR_FALSE;
-  mCList = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsListBox:: destructor
-//
-//-------------------------------------------------------------------------
-nsListBox::~nsListBox()
-{
-}
-
-void nsListBox::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mCList);
-  InstallButtonReleaseSignal(mCList);
-
-  InstallEnterNotifySignal(mCList);
-  InstallLeaveNotifySignal(mCList);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mCList,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-//  initializer
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsListBox::SetMultipleSelection(PRBool aMultipleSelections)
-{
-  mMultiSelect = aMultipleSelections;
-  if (mCList) {
-    if (mMultiSelect)
-      gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_MULTIPLE);
-    else
-      gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_BROWSE);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-//  AddItemAt
-//
-//-------------------------------------------------------------------------
-
-NS_IMETHODIMP nsListBox::AddItemAt(nsString &aItem, PRInt32 aPosition)
-{
-  if (mCList) {
-    gchar *text[2];
-    const nsAutoCString tempStr(aItem);
-    text[0] = (gchar*)(const char *)tempStr;
-    text[1] = (gchar*)NULL;
-    gtk_clist_insert(GTK_CLIST(mCList), (int)aPosition, text);
-
-    // XXX Im not sure using the string address is the right thing to 
-    // store in the row data.
-    gtk_clist_set_row_data(GTK_CLIST(mCList), aPosition, (gpointer)&aItem);
-  }
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Finds an item at a postion
-//
-//-------------------------------------------------------------------------
-PRInt32  nsListBox::FindItem(nsString &aItem, PRInt32 aStartPos)
-{
-  int i = -1;
-  if (mCList) {
-    i = gtk_clist_find_row_from_data(GTK_CLIST(mCList), (gpointer)&aItem);
-    if (i < aStartPos) {
-      i = -1;
-    }
-  }
-  return i;
-}
-
-//-------------------------------------------------------------------------
-//
-//  CountItems - Get Item Count
-//
-//-------------------------------------------------------------------------
-PRInt32  nsListBox::GetItemCount()
-{
-  if (mCList) {
-    return GTK_CLIST(mCList)->rows;
-  }
-  else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  Removes an Item at a specified location
-//
-//-------------------------------------------------------------------------
-PRBool  nsListBox::RemoveItemAt(PRInt32 aPosition)
-{
-  if (mCList) {
-    gtk_clist_remove(GTK_CLIST(mCList), aPosition);
-  }
-  return PR_TRUE;
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//
-//-------------------------------------------------------------------------
-PRBool nsListBox::GetItemAt(nsString& anItem, PRInt32 aPosition)
-{
-  PRBool result = PR_FALSE;
-  anItem.Truncate();
-  if (mCList) {
-    char *text = nsnull;
-    gtk_clist_get_text(GTK_CLIST(mCList),aPosition,0,&text);
-    if (text) {
-      anItem.Append(text);
-      result = PR_TRUE;
-    }
-  }
-  return result;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the selected of selected item
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::GetSelectedItem(nsString& aItem)
-{
-  aItem.Truncate();
-  if (mCList) {
-    PRInt32 i=0, idx=-1;
-    GtkCList *clist = GTK_CLIST(mCList);
-    GList *list = clist->row_list;
-
-    for (i=0; i < clist->rows && idx == -1; i++, list = list->next) {
-      if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-        char *text = nsnull;
-        gtk_clist_get_text(GTK_CLIST(mCList),i,0,&text);
-        if (text) {
-          aItem.Append(text);
-        }
-        return NS_OK;
-      }
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Gets the list of selected otems
-//
-//-------------------------------------------------------------------------
-PRInt32 nsListBox::GetSelectedIndex()
-{
-  PRInt32 i=0, idx=-1;
-  if (mCList) {
-    if (!mMultiSelect) {
-      GtkCList *clist = GTK_CLIST(mCList);
-      GList *list = clist->row_list;
-
-      for (i=0; i < clist->rows && idx == -1; i++, list = list->next) {
-        if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-          idx = i;
-        }
-      }
-    } else {
-      NS_ASSERTION(PR_FALSE, "Multi selection list box does not support GetSelectedIndex()");
-    }
-  }
-  return idx;
-}
-
-//-------------------------------------------------------------------------
-//
-//  SelectItem
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::SelectItem(PRInt32 aPosition)
-{
-  if (mCList) {
-    gtk_clist_select_row(GTK_CLIST(mCList), aPosition, 0);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedCount
-//
-//-------------------------------------------------------------------------
-PRInt32 nsListBox::GetSelectedCount()
-{
-  if (mCList) {
-    if (!GTK_CLIST(mCList)->selection)
-      return 0;
-    else
-      return (PRInt32)g_list_length(GTK_CLIST(mCList)->selection);
-  }
-  else {
-    return 0;
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-//  GetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  if (mCList) {
-    PRInt32 i=0, num = 0;
-    GtkCList *clist = GTK_CLIST(mCList);
-    GList *list = clist->row_list;
-
-    for (i=0; i < clist->rows && num < aSize; i++, list = list->next) {
-      if (GTK_CLIST_ROW (list)->state == GTK_STATE_SELECTED) {
-        aIndices[num] = i;
-        num++;
-      }
-    }
-  }
-  else {
-    PRInt32 i = 0;
-    for (i = 0; i < aSize; i++) aIndices[i] = 0;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  SetSelectedIndices
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize)
-{
-  if (mCList) {
-    gtk_clist_unselect_all(GTK_CLIST(mCList));
-    int i;
-    for (i=0;i<aSize;i++) {
-      SelectItem(aIndices[i]);
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-//  Deselect
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::Deselect()
-{
-  if (mCList) {
-    gtk_clist_unselect_all(GTK_CLIST(mCList));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set initial parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsListBoxInitData* data = (nsListBoxInitData *) aInitData;
-    mMultiSelect = data->mMultiSelect;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsListBox::CreateNative(GtkObject *parentWindow)
-{
-  // to handle scrolling
-  mWidget = gtk_scrolled_window_new (nsnull, nsnull);
-  gtk_widget_set_name(mWidget, "nsListBox");
-  gtk_container_set_border_width(GTK_CONTAINER(mWidget), 0);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mWidget),
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-
-  mCList = ::gtk_clist_new(1);
-  gtk_clist_column_titles_hide(GTK_CLIST(mCList));
-  // Default (it may be changed)
-  gtk_clist_set_selection_mode(GTK_CLIST(mCList), GTK_SELECTION_BROWSE);
-  SetMultipleSelection(mMultiSelect);
-  gtk_widget_show(mCList);
-  gtk_signal_connect(GTK_OBJECT(mCList),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  gtk_container_add (GTK_CONTAINER (mWidget), mCList);
-
-  return NS_OK;
-}
-
-void
-nsListBox::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mCList) {
-    mCList = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for listbox
-//
-//-------------------------------------------------------------------------
-/*virtual*/
-void nsListBox::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsListBox.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsListBox_h__
-#define nsListBox_h__
-
-#include "nsWidget.h"
-#include "nsIListBox.h"
-
-/**
- * Native GTK+ Listbox wrapper
- */
-class nsListBox :   public nsWidget,
-                    public nsIListWidget,
-                    public nsIListBox
-{
-
-public:
-  nsListBox();
-  virtual ~nsListBox();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIListBox interface
-  NS_IMETHOD PreCreateWidget(nsWidgetInitData *aInitData);
-  NS_IMETHOD SetMultipleSelection(PRBool aMultipleSelections);
-  NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition);
-  PRInt32    FindItem(nsString &aItem, PRInt32 aStartPos);
-  PRInt32    GetItemCount();
-  PRBool     RemoveItemAt(PRInt32 aPosition);
-  PRBool     GetItemAt(nsString& anItem, PRInt32 aPosition);
-  NS_IMETHOD GetSelectedItem(nsString& aItem);
-  PRInt32    GetSelectedIndex();
-  PRInt32    GetSelectedCount();
-  NS_IMETHOD GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-  NS_IMETHOD SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
-  NS_IMETHOD SelectItem(PRInt32 aPosition);
-  NS_IMETHOD Deselect() ;
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  GtkWidget *mCList;
-  PRBool  mMultiSelect;
-};
-
-#endif // nsListBox_h__

mozilla/widget/src/gtk/nsLookAndFeel.cpp

@@ -1,316 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsLookAndFeel.h"
-#include <gtk/gtkinvisible.h>
-
-#define GDK_COLOR_TO_NS_RGB(c) \
-    ((nscolor) NS_RGB(c.red, c.green, c.blue))
-
-
-NS_IMPL_ISUPPORTS1(nsLookAndFeel, nsILookAndFeel)
-
-//-------------------------------------------------------------------------
-//
-// Query interface implementation
-//
-//-------------------------------------------------------------------------
-nsLookAndFeel::nsLookAndFeel()
-{
-  NS_INIT_REFCNT();
-  mWidget = gtk_invisible_new();
-  gtk_widget_ensure_style(mWidget);
-  mStyle = gtk_widget_get_style(mWidget);
-}
-
-nsLookAndFeel::~nsLookAndFeel()
-{
-  gtk_widget_destroy(mWidget);
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetColor(const nsColorID aID, nscolor &aColor)
-{
-  nsresult res = NS_OK;
-  aColor = 0; // default color black
-
-  switch (aID) {
-  case eColor_WindowBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WindowForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_WidgetSelectBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_WidgetSelectForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_Widget3DHighlight:
-    aColor = NS_RGB(0xa0,0xa0,0xa0);
-    break;
-  case eColor_Widget3DShadow:
-    aColor = NS_RGB(0x40,0x40,0x40);
-    break;
-  case eColor_TextBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_TextForeground: 
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_TextSelectBackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_TextSelectForeground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);
-    break;
-
-    // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
-  case eColor_activeborder:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_activecaption:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_appworkspace:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_background:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_captiontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_graytext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_highlight:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_highlighttext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);
-    break;
-  case eColor_inactiveborder:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_inactivecaption:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_inactivecaptiontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_INSENSITIVE]);
-    break;
-  case eColor_infobackground:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_infotext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_menu:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_menutext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-  case eColor_scrollbar:
-    break;
-
-  case eColor_threedface:
-  case eColor_buttonface:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_buttonhighlight:  // ?
-  case eColor_threedhighlight:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_ACTIVE]);
-    break;
-
-  case eColor_buttontext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_buttonshadow:
-  case eColor_threeddarkshadow:
-  case eColor_threedshadow: // i think these should be the same
-    aColor = NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(NS_DarkenColor(GDK_COLOR_TO_NS_RGB(mStyle->light[GTK_STATE_NORMAL]))))));
-    //    aColor = GDK_COLOR_TO_NS_RGB(mStyle->dark[GTK_STATE_NORMAL]);   // dark style gives me bright green?!
-    break;
-
-  case eColor_threedlightshadow:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->light[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_window:
-  case eColor_windowframe:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_NORMAL]);
-    break;
-
-  case eColor_windowtext:
-    aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_NORMAL]);
-    break;
-
-  default:
-    /* default color is BLACK */
-    aColor = 0;
-    res    = NS_ERROR_FAILURE;
-    break;
-  }
-
-  //  printf("%i, %i, %i\n", NS_GET_R(aColor), NS_GET_B(aColor), NS_GET_G(aColor));
-
-  return res;
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
-{
-  nsresult res = NS_OK;
-  switch (aID) {
-  case eMetric_WindowTitleHeight:
-    aMetric = 0;
-    break;
-  case eMetric_WindowBorderWidth:
-    //    aMetric = mStyle->klass->xthickness;
-    break;
-  case eMetric_WindowBorderHeight:
-    //    aMetric = mStyle->klass->ythickness;
-    break;
-  case eMetric_Widget3DBorder:
-    //    aMetric = 4;
-    break;
-  case eMetric_TextFieldHeight:
-    {
-      GtkRequisition req;
-      GtkWidget *text = gtk_entry_new();
-      // needed to avoid memory leak
-      gtk_widget_ref(text);
-      gtk_object_sink(GTK_OBJECT(text));
-      gtk_widget_size_request(text,&req);
-      aMetric = req.height;
-      gtk_widget_destroy(text);
-      gtk_widget_unref(text);
-    }
-    break;
-  case eMetric_TextFieldBorder:
-    aMetric = 2;
-    break;
-  case eMetric_TextVerticalInsidePadding:
-    aMetric = 0;
-    break;
-  case eMetric_TextShouldUseVerticalInsidePadding:
-    aMetric = 0;
-    break;
-  case eMetric_TextHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_TextShouldUseHorizontalInsideMinimumPadding:
-    aMetric = 1;
-    break;
-  case eMetric_ButtonHorizontalInsidePaddingNavQuirks:
-    aMetric = 10;
-    break;
-  case eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks:
-    aMetric = 8;
-    break;
-  case eMetric_CheckboxSize:
-    aMetric = 15;
-    break;
-  case eMetric_RadioboxSize:
-    aMetric = 15;
-    break;
-  case eMetric_ListShouldUseHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_ListHorizontalInsideMinimumPadding:
-    aMetric = 15;
-    break;
-  case eMetric_ListShouldUseVerticalInsidePadding:
-    aMetric = 1;
-    break;
-  case eMetric_ListVerticalInsidePadding:
-    aMetric = 1;
-    break;
-  case eMetric_CaretBlinkTime:
-    aMetric = 500;
-    break;
-  case eMetric_CaretWidthTwips:
-    aMetric = 20;
-    break;
-  default:
-    aMetric = 0;
-    res     = NS_ERROR_FAILURE;
-  }
-
-  return res;
-}
-
-NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetric)
-{
-  nsresult res = NS_OK;
-  switch (aID) {
-  case eMetricFloat_TextFieldVerticalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  case eMetricFloat_TextFieldHorizontalInsidePadding:
-    aMetric = 0.95f; // large number on purpose so minimum padding is used
-    break;
-  case eMetricFloat_TextAreaVerticalInsidePadding:
-    aMetric = 0.40f;    
-    break;
-  case eMetricFloat_TextAreaHorizontalInsidePadding:
-    aMetric = 0.40f; // large number on purpose so minimum padding is used
-    break;
-  case eMetricFloat_ListVerticalInsidePadding:
-    aMetric = 0.10f;
-    break;
-  case eMetricFloat_ListHorizontalInsidePadding:
-    aMetric = 0.40f;
-    break;
-  case eMetricFloat_ButtonVerticalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  case eMetricFloat_ButtonHorizontalInsidePadding:
-    aMetric = 0.25f;
-    break;
-  default:
-    aMetric = -1.0;
-    res = NS_ERROR_FAILURE;
-  }
-  return res;
-}
-
-#ifdef NS_DEBUG
-NS_IMETHODIMP nsLookAndFeel::GetNavSize(const nsMetricNavWidgetID aWidgetID,
-                                        const nsMetricNavFontID   aFontID, 
-                                        const PRInt32             aFontSize, 
-                                        nsSize &aSize)
-{
-  aSize.width  = 0;
-  aSize.height = 0;
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-#endif

mozilla/widget/src/gtk/nsLookAndFeel.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
-#include <gtk/gtk.h>
-
-class nsLookAndFeel: public nsILookAndFeel {
-  NS_DECL_ISUPPORTS
-
-public:
-  nsLookAndFeel();
-  virtual ~nsLookAndFeel();
-
-  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor);
-  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric);
-  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric);
-
-#ifdef NS_DEBUG
-  // This method returns the actual (or nearest estimate) 
-  // of the Navigator size for a given form control for a given font
-  // and font size. This is used in NavQuirks mode to see how closely
-  // we match its size
-  NS_IMETHOD GetNavSize(const nsMetricNavWidgetID aWidgetID,
-                        const nsMetricNavFontID   aFontID, 
-                        const PRInt32             aFontSize, 
-                        nsSize &aSize);
-#endif
-
-protected:
-  GtkStyle *mStyle;
-  GtkWidget *mWidget;
-};
-
-#endif

mozilla/widget/src/gtk/nsMenu.cpp

@@ -1,792 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenu.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMNode.h"
-#include "nsIMenuBar.h"
-#include "nsIMenuItem.h"
-#include "nsIMenuListener.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuCID,             NS_MENU_CID);
-static NS_DEFINE_CID(kMenuItemCID,         NS_MENUITEM_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenu::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenu::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenu*) this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenu*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenu)
-NS_IMPL_RELEASE(nsMenu)
-
-//-------------------------------------------------------------------------
-//
-// nsMenu constructor
-//
-//-------------------------------------------------------------------------
-nsMenu::nsMenu() : nsIMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems  = 0;
-  mMenu          = nsnull;
-  mMenuParent    = nsnull;
-  mMenuBarParent = nsnull;
-  mListener      = nsnull;
-  mConstructCalled = PR_FALSE;
-  
-  mDOMNode       = nsnull;
-  mWebShell      = nsnull;
-  mDOMElement    = nsnull;
-  mAccessKey     = "_";
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenu destructor
-//
-//-------------------------------------------------------------------------
-nsMenu::~nsMenu()
-{
-  //g_print("nsMenu::~nsMenu() called\n");
-  NS_IF_RELEASE(mListener);
-  // Free our menu items
-  RemoveAll();
-  gtk_widget_destroy(mMenu);
-  mMenu = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::Create(nsISupports *aParent, const nsString &aLabel)
-{
-  if(aParent)
-  {
-    nsIMenuBar * menubar = nsnull;
-    aParent->QueryInterface(nsIMenuBar::GetIID(), (void**) &menubar);
-    if(menubar)
-    {
-      mMenuBarParent = menubar;
-      NS_RELEASE(menubar);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
-      if(menu)
-      {
-        mMenuParent = menu;
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  mLabel = aLabel;
-  mMenu = gtk_menu_new();
-
-  gtk_signal_connect (GTK_OBJECT (mMenu), "map",
-                      GTK_SIGNAL_FUNC(menu_map_handler),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mMenu), "unmap",
-                      GTK_SIGNAL_FUNC(menu_unmap_handler),
-                      this);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetParent(nsISupports*& aParent)
-{
-  aParent = nsnull;
-  if (nsnull != mMenuParent) {
-    return mMenuParent->QueryInterface(kISupportsIID,
-                                       (void**)&aParent);
-  } else if (nsnull != mMenuBarParent) {
-    return mMenuBarParent->QueryInterface(kISupportsIID,
-                                          (void**)&aParent);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetLabel(nsString &aText)
-{
-  aText = mLabel;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetLabel(const nsString &aText)
-{
-  /* we Do GetLabel() when we are adding the menu...
-   *  but we might want to redo this.
-   */
-  mLabel = aText;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetAccessKey(nsString &aText)
-{
-  aText = mAccessKey;
-  char *foo = mAccessKey.ToNewCString();
-
-#ifdef DEBUG_pavlov
-  g_print("GetAccessKey returns \"%s\"\n", foo);
-#endif
-
-  nsCRT::free(foo);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetAccessKey(const nsString &aText)
-{
-  mAccessKey = aText;
-  char *foo = mAccessKey.ToNewCString();
-
-#ifdef DEBUG_pavlov
-  g_print("SetAccessKey setting to \"%s\"\n", foo);
-#endif
-
-  nsCRT::free(foo);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set enabled state
-*
-*/
-NS_METHOD nsMenu::SetEnabled(PRBool aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Get enabled state
-*
-*/
-NS_METHOD nsMenu::GetEnabled(PRBool* aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Query if this is the help menu
-*
-*/
-NS_METHOD nsMenu::IsHelpMenu(PRBool* aIsHelpMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddItem(nsISupports * aItem)
-{
-  if(aItem)
-  {
-    nsIMenuItem * menuitem = nsnull;
-    aItem->QueryInterface(nsIMenuItem::GetIID(),
-                          (void**)&menuitem);
-    if(menuitem)
-    {
-      AddMenuItem(menuitem); // nsMenu now owns this
-      NS_RELEASE(menuitem);
-    }
-    else
-    {
-      nsIMenu * menu = nsnull;
-      aItem->QueryInterface(nsIMenu::GetIID(),
-                            (void**)&menu);
-      if(menu)
-      {
-        AddMenu(menu); // nsMenu now owns this
-        NS_RELEASE(menu);
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-// local method used by nsMenu::AddItem
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenuItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void      *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  // Need to be adding an nsISupports *, not nsIMenuItem *
-  nsISupports * supports = nsnull;
-  aMenuItem->QueryInterface(kISupportsIID,
-                            (void**)&supports);
-  {
-    mMenuItemVoidArray.AppendElement(supports);
-    mNumMenuItems++;
-  }
-  
-  return NS_OK;
-}
-
-// local method used by nsMenu::AddItem
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *newmenu=nsnull;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull,
-                                                   nsIMenuItem::GetIID(),
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, Label, PR_FALSE); //PR_TRUE); 
-    NS_RELEASE(supports);               
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-          
-    void * menuitem = nsnull;
-    pnsMenuItem->GetNativeData(menuitem);
-  
-    voidData = NULL;
-    aMenu->GetNativeData(&voidData);
-    newmenu = GTK_WIDGET(voidData);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), newmenu);
-  
-    NS_RELEASE(pnsMenuItem);
-  } 
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddSeparator() 
-{
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(
-    kMenuItemCID, nsnull, nsIMenuItem::GetIID(), (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    nsString tmp = "menuseparator";
-    nsISupports * supports = nsnull;
-    QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenuItem->Create(supports, tmp, PR_TRUE);  
-    NS_RELEASE(supports);
-    
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports); 
-          
-    NS_RELEASE(pnsMenuItem);
-  } 
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetItemCount(PRUint32 &aCount)
-{
-  // this should be right.. does it need to be +1 ?
-  aCount = g_list_length(GTK_MENU_SHELL(mMenu)->children);
-  //g_print("nsMenu::GetItemCount = %i\n", aCount);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetItemAt(const PRUint32 aPos,
-                            nsISupports *&aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::InsertItemAt(const PRUint32 aPos,
-                               nsISupports *aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveItem(const PRUint32 aPos)
-{
-#if 0
-  // this may work here better than Removeall(), but i'm not sure how to test this one
-  nsISupports *item = mMenuItemVoidArray[aPos];
-  delete item;
-  mMenuItemVoidArray.RemoveElementAt(aPos);
-#endif
-  /*
-  gtk_menu_shell_remove (GTK_MENU_SHELL (mMenu), item);
-
-  nsCRT::free(labelStr);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-  */
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveAll()
-{
-  //g_print("nsMenu::RemoveAll()\n");
-#if 0
-  // this doesn't work quite right, but this is about all that should really be needed
-  int i=0;
-  nsIMenu *menu = nsnull;
-  nsIMenuItem *menuitem = nsnull;
-  nsISupports *item = nsnull;
-
-  for (i=mMenuItemVoidArray.Count(); i>0; i--)
-  {
-    item = (nsISupports*)mMenuItemVoidArray[i-1];
-
-    if(nsnull != item)
-    {
-      if (NS_OK == item->QueryInterface(nsIMenuItem::GetIID(), (void**)&menuitem)) {
-        // we do this twice because we have to do it once for QueryInterface,
-        // then we want to get rid of it.
-        // g_print("remove nsMenuItem\n");
-        NS_RELEASE(menuitem);
-        NS_RELEASE(item);
-        menuitem = nsnull;
-      } else if (NS_OK == item->QueryInterface(nsIMenu::GetIID(), (void**)&menu)) {
-        // g_print("remove nsMenu\n");
-        NS_RELEASE(menu);
-        NS_RELEASE(item);
-        menu = nsnull;
-      }
-      // mMenuItemVoidArray.RemoveElementAt(i-1);
-    }
-  }
-  mMenuItemVoidArray.Clear();
-#else
-  for (int i = mMenuItemVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenuItemVoidArray[i-1]) {
-      nsIMenuItem * menuitem = nsnull;
-      ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenuItem::GetIID(),
-                                                              (void**)&menuitem);
-      if(menuitem) {
-        void *gtkmenuitem = nsnull;
-        menuitem->GetNativeData(gtkmenuitem);
-        if (gtkmenuitem) {
-          //          gtk_widget_ref(GTK_WIDGET(gtkmenuitem));
-          //gtk_widget_destroy(GTK_WIDGET(gtkmenuitem));
-           gtk_container_remove (GTK_CONTAINER (mMenu), GTK_WIDGET(gtkmenuitem));
-        }
- 
-      } else {
- 
-        nsIMenu * menu= nsnull;
-        ((nsISupports*)mMenuItemVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(),
-                                                                (void**)&menu);
-        if(menu)
-          {
-            void * gtkmenu = nsnull;
-            menu->GetNativeData(&gtkmenu);
- 
-            if(gtkmenu){
-              //g_print("gtkmenu removed");
- 
-              //gtk_menu_item_remove_submenu (GTK_MENU_ITEM (item));
-            }
-          }
- 
-      }
-    }
-  }
-#endif
-//g_print("end RemoveAll\n");
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::GetNativeData(void ** aData)
-{
-  *aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::SetNativeData(void * aData)
-{
-  return NS_OK;
-}
-
-GtkWidget *nsMenu::GetNativeParent()
-{
-  void * voidData; 
-  if (nsnull != mMenuParent) {
-    mMenuParent->GetNativeData(&voidData);
-  } else if (nsnull != mMenuBarParent) {
-    mMenuBarParent->GetNativeData(voidData);
-  } else {
-    return nsnull;
-  }
-  return GTK_WIDGET(voidData);
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::AddMenuListener(nsIMenuListener * aMenuListener)
-{
-  mListener = aMenuListener;
-  NS_ADDREF(mListener);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenu::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  if (aMenuListener == mListener) {
-    NS_IF_RELEASE(mListener);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenu::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuSelected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  if (nsnull != mListener) {
-    mListener->MenuDeselected(aMenuEvent);
-  }
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuConstruct(const nsMenuEvent & aMenuEvent,
-                                    nsIWidget         * aParentWindow, 
-                                    void              * menuNode,
-                                    void              * aWebShell)
-{
-  //g_print("nsMenu::MenuConstruct called \n");
-  if(menuNode){
-    SetDOMNode((nsIDOMNode*)menuNode);
-  }
-  
-  if(!aWebShell){
-    aWebShell = mWebShell;
-  }
-
-  // First open the menu.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->SetAttribute("open", "true");
-
-   /// Now get the kids. Retrieve our menupopup child.
-  nsCOMPtr<nsIDOMNode> menuPopupNode;
-  mDOMNode->GetFirstChild(getter_AddRefs(menuPopupNode));
-  while (menuPopupNode) {
-    nsCOMPtr<nsIDOMElement> menuPopupElement(do_QueryInterface(menuPopupNode));
-    if (menuPopupElement) {
-      nsString menuPopupNodeType;
-      menuPopupElement->GetNodeName(menuPopupNodeType);
-      if (menuPopupNodeType.Equals("menupopup"))
-        break;
-    }
-    nsCOMPtr<nsIDOMNode> oldMenuPopupNode(menuPopupNode);
-    oldMenuPopupNode->GetNextSibling(getter_AddRefs(menuPopupNode));
-  }
-
-  if (!menuPopupNode)
-    return nsEventStatus_eIgnore;
-
-  nsCOMPtr<nsIDOMNode> menuitemNode;
-  menuPopupNode->GetFirstChild(getter_AddRefs(menuitemNode));
-
-    unsigned short menuIndex = 0;
-
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        nsString menuitemName;
-        menuitemElement->GetNodeName(menuitemNodeType);
-        if (menuitemNodeType.Equals("menuitem")) {
-          // LoadMenuItem
-          LoadMenuItem(this,
-                       menuitemElement,
-                       menuitemNode,
-                       menuIndex,
-                       (nsIWebShell*)aWebShell);
-        } else if (menuitemNodeType.Equals("menuseparator")) {
-          AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Load a submenu
-          LoadSubMenu(this, menuitemElement, menuitemNode);
-        }
-      }
-      
-      ++menuIndex;
-      
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  // Close the node.
-  nsCOMPtr<nsIDOMElement> domElement = do_QueryInterface(mDOMNode);
-  if (domElement)
-    domElement->RemoveAttribute("open");
-
-  //g_print("nsMenu::MenuDestruct called \n");
-  mConstructCalled = PR_FALSE;
-  RemoveAll();
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set DOMNode
-*
-*/
-NS_METHOD nsMenu::SetDOMNode(nsIDOMNode * aMenuNode)
-{
-  mDOMNode = aMenuNode;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
-* Set DOMElement
-*
-*/
-NS_METHOD nsMenu::SetDOMElement(nsIDOMElement * aMenuElement)
-{
-  mDOMElement = aMenuElement;
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-/**
-* Set WebShell
-*
-*/
-NS_METHOD nsMenu::SetWebShell(nsIWebShell * aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}
-
-//----------------------------------------
-void nsMenu::LoadMenuItem(nsIMenu *       pParentMenu,
-                          nsIDOMElement * menuitemElement,
-                          nsIDOMNode *    menuitemNode,
-                          unsigned short  menuitemIndex,
-                          nsIWebShell *   aWebShell)
-{
-  static const char* NS_STRING_TRUE = "true";
-  nsString disabled;
-  nsString menuitemName;
-  nsString menuitemCmd;
-
-  menuitemElement->GetAttribute(nsAutoString("disabled"), disabled);
-  menuitemElement->GetAttribute(nsAutoString("value"), menuitemName);
-  menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd);
-      
-  // Create nsMenuItem
-  nsIMenuItem * pnsMenuItem = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID,
-                                                   nsnull, 
-                                                   nsIMenuItem::GetIID(), 
-                                                   (void**)&pnsMenuItem);
-  if (NS_OK == rv) {
-    pnsMenuItem->Create(pParentMenu, menuitemName, PR_FALSE);
-                     
-    nsISupports * supports = nsnull;
-    pnsMenuItem->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // Parent should now own menu item
-    NS_RELEASE(supports);
-            
-    if(disabled == NS_STRING_TRUE ) {
-      pnsMenuItem->SetEnabled(PR_FALSE);
-    }
-  
-    // Create MenuDelegate - this is the intermediator inbetween 
-    // the DOM node and the nsIMenuItem
-    // The nsWebShellWindow wacthes for Document changes and then notifies the 
-    // the appropriate nsMenuDelegate object
-    nsCOMPtr<nsIDOMElement> domElement(do_QueryInterface(menuitemNode));
-    if (!domElement) {
-      //return NS_ERROR_FAILURE;
-		return;
-    }
-    
-    nsAutoString cmdAtom("oncommand");
-    nsString cmdName;
-
-    domElement->GetAttribute(cmdAtom, cmdName);
-
-    pnsMenuItem->SetCommand(cmdName);
-   // DO NOT use passed in webshell because of messed up windows dynamic loading
-   // code. 
-    pnsMenuItem->SetWebShell(mWebShell);
-    pnsMenuItem->SetDOMElement(domElement);
-
-    NS_RELEASE(pnsMenuItem);
-    
-  } 
-  return;
-}
-
-//----------------------------------------
-void nsMenu::LoadSubMenu(nsIMenu *       pParentMenu,
-                         nsIDOMElement * menuElement,
-                         nsIDOMNode *    menuNode)
-{
-  nsString menuName;
-  menuElement->GetAttribute(nsAutoString("value"), menuName);
-  //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks
-
-  // Create nsMenu
-  nsIMenu * pnsMenu = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuCID,
-                                                   nsnull,
-                                                   nsIMenu::GetIID(),
-                                                   (void**)&pnsMenu);
-  if (NS_OK == rv) {
-    // Call Create
-    nsISupports * supports = nsnull;
-    pParentMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pnsMenu->Create(supports, menuName);
-    NS_RELEASE(supports); // Balance QI
-
-    // Set nsMenu Name
-    pnsMenu->SetLabel(menuName); 
-
-    supports = nsnull;
-    pnsMenu->QueryInterface(kISupportsIID, (void**) &supports);
-    pParentMenu->AddItem(supports); // parent takes ownership
-    NS_RELEASE(supports);
-
-    pnsMenu->SetWebShell(mWebShell);
-    pnsMenu->SetDOMNode(menuNode);
-
-    /*
-    // Begin menuitem inner loop
-    unsigned short menuIndex = 0;
-
-    nsCOMPtr<nsIDOMNode> menuitemNode;
-    menuNode->GetFirstChild(getter_AddRefs(menuitemNode));
-    while (menuitemNode) {
-      nsCOMPtr<nsIDOMElement> menuitemElement(do_QueryInterface(menuitemNode));
-      if (menuitemElement) {
-        nsString menuitemNodeType;
-        menuitemElement->GetNodeName(menuitemNodeType);
-
-#ifdef DEBUG_saari
-        printf("Type [%s] %d\n", menuitemNodeType.ToNewCString(), menuitemNodeType.Equals("menuseparator"));
-#endif
-
-        if (menuitemNodeType.Equals("menuitem")) {
-          // Load a menuitem
-          LoadMenuItem(pnsMenu, menuitemElement, menuitemNode, menuIndex, mWebShell);
-        } else if (menuitemNodeType.Equals("menuseparator")) {
-          pnsMenu->AddSeparator();
-        } else if (menuitemNodeType.Equals("menu")) {
-          // Add a submenu
-          LoadSubMenu(pnsMenu, menuitemElement, menuitemNode);
-        }
-      }
-	  ++menuIndex;
-      nsCOMPtr<nsIDOMNode> oldmenuitemNode(menuitemNode);
-      oldmenuitemNode->GetNextSibling(getter_AddRefs(menuitemNode));
-    } // end menu item innner loop
-    */
-  }     
-}

mozilla/widget/src/gtk/nsMenu.h

@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenu_h__
-#define nsMenu_h__
-
-#include "nsIMenu.h"
-#include "nsIMenuListener.h"
-#include "nsVoidArray.h"
-
-class nsIDOMElement;
-class nsIDOMNode;
-class nsIMenuBar;
-class nsIWebShell;
-
-/**
- * Native GTK+ Menu wrapper
- */
-
-class nsMenu : public nsIMenu, public nsIMenuListener
-{
-
-public:
-  nsMenu();
-  virtual ~nsMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  // nsIMenuListener methods
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent); 
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent); 
-  nsEventStatus MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menuNode,
-	void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent); 
-  
-  NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel);
-
-  // nsIMenu Methods
-  NS_IMETHOD GetParent(nsISupports *&aParent);
-  NS_IMETHOD GetLabel(nsString &aText);
-  NS_IMETHOD SetLabel(const nsString &aText);
-  NS_IMETHOD GetAccessKey(nsString &aText);
-  NS_IMETHOD SetAccessKey(const nsString &aText);
-  NS_IMETHOD AddItem(nsISupports * aItem);
-  NS_IMETHOD AddMenuItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem);
-  NS_IMETHOD RemoveItem(const PRUint32 aPos);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void** aData);
-  NS_IMETHOD SetNativeData(void* aData);
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD SetEnabled(PRBool aIsEnabled);
-  NS_IMETHOD GetEnabled(PRBool* aIsEnabled);
-  NS_IMETHOD IsHelpMenu(PRBool* aIsHelp);
-  
-  NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  
-protected:
-  void LoadMenuItem(
-    nsIMenu       * pParentMenu,
-    nsIDOMElement * menuitemElement,
-    nsIDOMNode    * menuitemNode,
-    unsigned short  menuitemIndex,
-    nsIWebShell   * aWebShell);
-  
-  void LoadSubMenu(
-    nsIMenu       * pParentMenu,
-    nsIDOMElement * menuElement,
-    nsIDOMNode    * menuNode);
-    
-  GtkWidget  *GetNativeParent();
-
-  nsString   mLabel;
-  nsString   mAccessKey;
-  PRUint32   mNumMenuItems;
-  GtkWidget  *mMenu;
-  
-  nsVoidArray mMenuItemVoidArray;
-
-  nsIMenu    *mMenuParent;
-  nsIMenuBar *mMenuBarParent;
-  nsIMenuListener * mListener;
-  
-  PRBool mConstructCalled;
-  nsIDOMNode    * mDOMNode;
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-};
-
-#endif // nsMenu_h__

mozilla/widget/src/gtk/nsMenuBar.cpp

@@ -1,354 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenuBar.h"
-#include "nsMenuItem.h"
-#include "nsIComponentManager.h"
-#include "nsIDOMNode.h"
-#include "nsIMenu.h"
-#include "nsIWebShell.h"
-#include "nsIWidget.h"
-
-#include "nsString.h"
-
-#include "nsGtkEventHandler.h"
-
-#include "nsCOMPtr.h"
-#include "nsWidgetsCID.h"
-
-static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID);
-static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenuBar::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenuBar::GetIID())) {
-    *aInstancePtr = (void*) ((nsIMenuBar*) this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) ((nsISupports*)(nsIMenuBar*) this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*) ((nsIMenuListener*)this);
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenuBar)
-NS_IMPL_RELEASE(nsMenuBar)
-
-//-------------------------------------------------------------------------
-//
-// nsMenuBar constructor
-//
-//-------------------------------------------------------------------------
-nsMenuBar::nsMenuBar() : nsIMenuBar(), nsIMenuListener()
-{
-  NS_INIT_REFCNT();
-  mNumMenus = 0;
-  mMenuBar  = nsnull;
-  mParent   = nsnull;
-  mIsMenuBarAdded = PR_FALSE;
-  mWebShell = nsnull;
-  mDOMNode  = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuBar destructor
-//
-//-------------------------------------------------------------------------
-nsMenuBar::~nsMenuBar()
-{
-  // Release the menus
-  RemoveAll();
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::Create(nsIWidget *aParent)
-{
-  SetParent(aParent);
-  mMenuBar = gtk_menu_bar_new();
-  
-  gtk_widget_show(mMenuBar);
-  mParent->SetMenuBar(this);
-  
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetParent(nsIWidget *&aParent)
-{
-  aParent = mParent;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::SetParent(nsIWidget *aParent)
-{
-  mParent = aParent;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *widget, *nmenu;
-  void *voidData;
-
-  nsISupports * supports = nsnull;
-  aMenu->QueryInterface(kISupportsIID, (void**)&supports);
-  if (supports) {
-    mMenusVoidArray.AppendElement(aMenu);
-    mNumMenus++;
-  }
-  
-  aMenu->GetLabel(Label);
-
-  // get access key
-  nsString accessKey = " ";
-  aMenu->GetAccessKey(accessKey);
-  if(accessKey != " ")
-  {
-    // munge acess key into name
-    PRInt32 offset = Label.Find(accessKey);
-    if(offset != -1)
-      Label.Insert("_", offset);
-  }
-
-  char *foo = Label.ToNewCString();
-  g_print("%s\n", foo);
-  nsCRT::free(foo);
-
-  widget = nsMenuItem::CreateLocalized(Label);
-  gtk_widget_show(widget);
-  gtk_menu_bar_append (GTK_MENU_BAR (mMenuBar), widget);
-
-  aMenu->GetNativeData(&voidData);
-  nmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (widget), nmenu);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetMenuCount(PRUint32 &aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::RemoveMenu(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::RemoveAll()
-{
-  for (int i = mMenusVoidArray.Count(); i > 0; i--) {
-    if(nsnull != mMenusVoidArray[i-1]) {
-      nsIMenu * menu = nsnull;
-      ((nsISupports*)mMenusVoidArray[i-1])->QueryInterface(nsIMenu::GetIID(), (void**)&menu);
-      if(menu) {
-        //void * gtkmenu= nsnull;
-        //menu->GetNativeData(&gtkmenu);
-        //if(gtkmenu){
-        //  gtk_container_remove (GTK_CONTAINER (mMenuBar), GTK_WIDGET(gtkmenu) );
-        //}
-        NS_RELEASE(menu);
-	
-        g_print("menu release \n");
-        int num =((nsISupports*)mMenusVoidArray[i-1])->Release();
-        while(num) {
-          g_print("menu release again!\n");
-          num = ((nsISupports*)mMenusVoidArray[i-1])->Release();
-        }
-      }
-    }
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenuBar;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::SetNativeData(void * aData)
-{
-  // Temporary hack for MacOS. Will go away when nsMenuBar handles it's own
-  // construction
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuBar::Paint()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuListener interface
-//
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuBar::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuDeselected(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menubarNode,
-    void              * aWebShell)
-{
-  mWebShell = (nsIWebShell*) aWebShell;
-  mDOMNode  = (nsIDOMNode*)menubarNode;
-  
-  nsIMenuBar * pnsMenuBar = nsnull;
-  nsresult rv = nsComponentManager::CreateInstance(kMenuBarCID,
-                                                   nsnull,
-                                                   nsIMenuBar::GetIID(),
-                                                   (void**)&pnsMenuBar);
-  if (NS_OK == rv) {
-    if (nsnull != pnsMenuBar) {
-      pnsMenuBar->Create(aParentWindow);
-
-      // set pnsMenuBar as a nsMenuListener on aParentWindow
-      nsCOMPtr<nsIMenuListener> menuListener;
-      pnsMenuBar->QueryInterface(nsIMenuListener::GetIID(), getter_AddRefs(menuListener));
-      aParentWindow->AddMenuListener(menuListener);
-
-      nsCOMPtr<nsIDOMNode> menuNode;
-      ((nsIDOMNode*)menubarNode)->GetFirstChild(getter_AddRefs(menuNode));
-      while (menuNode) {
-        nsCOMPtr<nsIDOMElement> menuElement(do_QueryInterface(menuNode));
-        if (menuElement) {
-          nsString menuNodeType;
-          nsString menuName;
-          nsString menuAccessKey = " ";
-          menuElement->GetNodeName(menuNodeType);
-          if (menuNodeType.Equals("menu")) {
-            menuElement->GetAttribute(nsAutoString("value"), menuName);
-            menuElement->GetAttribute(nsAutoString("accesskey"), menuAccessKey);
-            // Don't create the menu yet, just add in the top level names
-
-            // Create nsMenu
-            nsIMenu * pnsMenu = nsnull;
-            rv = nsComponentManager::CreateInstance(kMenuCID, nsnull, nsIMenu::GetIID(), (void**)&pnsMenu);
-            if (NS_OK == rv) {
-              // Call Create
-              nsISupports * supports = nsnull;
-              pnsMenuBar->QueryInterface(kISupportsIID, (void**) &supports);
-              pnsMenu->Create(supports, menuName);
-              NS_RELEASE(supports);
-
-              pnsMenu->SetLabel(menuName);
-              pnsMenu->SetAccessKey(menuAccessKey);
-              pnsMenu->SetDOMNode(menuNode);
-              pnsMenu->SetDOMElement(menuElement);
-              pnsMenu->SetWebShell(mWebShell);
-
-              // Make nsMenu a child of nsMenuBar
-              // nsMenuBar takes ownership of the nsMenu
-              pnsMenuBar->AddMenu(pnsMenu); 
-
-              // Release the menu now that the menubar owns it
-              NS_RELEASE(pnsMenu);
-            }
-          } 
-
-        }
-        nsCOMPtr<nsIDOMNode> oldmenuNode(menuNode);  
-        oldmenuNode->GetNextSibling(getter_AddRefs(menuNode));
-      } // end while (nsnull != menuNode)
-
-      // Give the aParentWindow this nsMenuBar to hold onto.
-      // The parent window should take ownership at this point
-      aParentWindow->SetMenuBar(pnsMenuBar);
-
-      // HACK: force a paint for now
-      pnsMenuBar->Paint();
-
-      NS_RELEASE(pnsMenuBar);
-    } // end if ( nsnull != pnsMenuBar )
-  }
-
-  return nsEventStatus_eIgnore;
-  return nsEventStatus_eIgnore;
-}
-
-nsEventStatus nsMenuBar::MenuDestruct(const nsMenuEvent & aMenuEvent)
-{
-  return nsEventStatus_eIgnore;
-}

mozilla/widget/src/gtk/nsMenuBar.h

@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenuBar_h__
-#define nsMenuBar_h__
-
-#include "nsIMenuBar.h"
-#include "nsIMenuListener.h"
-#include "nsVoidArray.h"
-
-class nsIDOMNode;
-class nsIWebShell;
-class nsIWidget;
-
-/**
- * Native GTK+ MenuBar wrapper
- */
-
-class nsMenuBar : public nsIMenuBar, public nsIMenuListener
-{
-
-public:
-  nsMenuBar();
-  virtual ~nsMenuBar();
-
-  // nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(
-    const nsMenuEvent & aMenuEvent,
-    nsIWidget         * aParentWindow, 
-    void              * menuNode,
-	void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-  
-  NS_DECL_ISUPPORTS
-
-  
-  NS_IMETHOD Create(nsIWidget * aParent);
-
-  // nsIMenuBar Methods
-  NS_IMETHOD GetParent(nsIWidget *&aParent);
-  NS_IMETHOD SetParent(nsIWidget * aParent);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD GetMenuCount(PRUint32 &aCount);
-  NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
-  NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu);
-  NS_IMETHOD RemoveMenu(const PRUint32 aCount);
-  NS_IMETHOD RemoveAll();
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD Paint();
-  NS_IMETHOD SetNativeData(void* aData);
-protected:
-  GtkWidget * mMenuBar;
-  nsIWidget * mParent;
-  PRBool      mIsMenuBarAdded;
-  
-  nsIWebShell * mWebShell;
-  nsIDOMNode  * mDOMNode;
-  
-  nsVoidArray mMenusVoidArray;
-  PRUint32    mNumMenus;
-};
-
-#endif // nsMenuBar_h__

mozilla/widget/src/gtk/nsMenuItem.cpp

@@ -1,539 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsMenuItem.h"
-#include "nsIMenu.h"
-#include "nsIMenuBar.h"
-#include "nsIWidget.h"
-
-#include "nsGtkEventHandler.h"
-
-#include "nsIPopUpMenu.h"
-
-#include "nsCOMPtr.h"
-#include "nsIContent.h"
-#include "nsIContentViewer.h"
-#include "nsIDOMElement.h"
-#include "nsIDocumentViewer.h"
-#include "nsIPresContext.h"
-#include "nsIWebShell.h"
-#include "nsICharsetConverterManager.h"
-#include "nsIPlatformCharset.h"
-#include "nsIServiceManager.h"
-
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsresult nsMenuItem::QueryInterface(REFNSIID aIID, void** aInstancePtr)
-{
-  if (NULL == aInstancePtr) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aInstancePtr = NULL;
-
-  if (aIID.Equals(nsIMenuItem::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuItem*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*)(nsISupports*)(nsIMenuItem*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  if (aIID.Equals(nsIMenuListener::GetIID())) {
-    *aInstancePtr = (void*)(nsIMenuListener*)this;
-    NS_ADDREF_THIS();
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
-
-NS_IMPL_ADDREF(nsMenuItem)
-NS_IMPL_RELEASE(nsMenuItem)
-
-
-//-------------------------------------------------------------------------
-//
-// nsMenuItem constructor
-//
-//-------------------------------------------------------------------------
-nsMenuItem::nsMenuItem() : nsIMenuItem()
-{
-  NS_INIT_REFCNT();
-  mMenuItem    = nsnull;
-  mMenuParent  = nsnull;
-  mPopUpParent = nsnull;
-  mTarget      = nsnull;
-  mXULCommandListener = nsnull;
-  mIsSeparator = PR_FALSE;
-  mWebShell    = nsnull;
-  mDOMElement  = nsnull;
-  mIsSubMenu   = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsMenuItem destructor
-//
-//-------------------------------------------------------------------------
-nsMenuItem::~nsMenuItem()
-{
-  //g_print("nsMenuItem::~nsMenuItem called\n");
-  //NS_IF_RELEASE(mTarget);
-  gtk_widget_destroy(mMenuItem);
-  mMenuItem = nsnull;
-  //g_print("end nsMenuItem::~nsMenuItem\n");
-}
-
-//-------------------------------------------------------------------------
-GtkWidget *nsMenuItem::GetNativeParent()
-{
-  void * voidData;
-  if (nsnull != mMenuParent) {
-    mMenuParent->GetNativeData(&voidData);
-  } else if (nsnull != mPopUpParent) {
-    mPopUpParent->GetNativeData(voidData);
-  } else {
-    return nsnull;
-  }
-  return GTK_WIDGET(voidData);
-}
-
-
-//-------------------------------------------------------------------------
-nsIWidget * nsMenuItem::GetMenuBarParent(nsISupports * aParent)
-{
-  nsIWidget    * widget  = nsnull; // MenuBar's Parent
-  nsIMenu      * menu    = nsnull;
-  nsIMenuBar   * menuBar = nsnull;
-  nsIPopUpMenu * popup   = nsnull;
-  nsISupports  * parent  = aParent;
-  
-  while(1) {
-    if (NS_OK == parent->QueryInterface(nsIMenu::GetIID(),(void**)&menu)) {
-      NS_RELEASE(parent);
-      if (NS_OK != menu->GetParent(parent)) {
-        NS_RELEASE(menu);
-        return nsnull;
-      }
-      NS_RELEASE(menu);
-
-    } else if (NS_OK == parent->QueryInterface(nsIPopUpMenu::GetIID(),(void**)&popup)) {
-      if (NS_OK != popup->GetParent(widget)) {
-        widget =  nsnull;
-      } 
-      NS_RELEASE(popup);
-      NS_RELEASE(parent);
-      return widget;
-
-    } else if (NS_OK == parent->QueryInterface(nsIMenuBar::GetIID(),(void**)&menuBar)) {
-      if (NS_OK != menuBar->GetParent(widget)) {
-        widget =  nsnull;
-      } 
-      NS_RELEASE(menuBar);
-      NS_RELEASE(parent);
-      return widget;
-    } else {
-      NS_RELEASE(parent);
-      return nsnull;
-    }
-  }
-  return nsnull;
-}
-
-GtkWidget*
-nsMenuItem::CreateLocalized(const nsString& aLabel)
-{
-  nsresult result;
-  static nsIUnicodeEncoder* converter = nsnull;
-  static int isLatin1 = 0;
-  static int initialized = 0;
-  if (!initialized) {
-    initialized = 1;
-    result = NS_ERROR_FAILURE;
-    NS_WITH_SERVICE(nsIPlatformCharset, platform, NS_PLATFORMCHARSET_PROGID,
-      &result);
-    if (platform && NS_SUCCEEDED(result)) {
-      nsAutoString charset("");
-      result = platform->GetCharset(kPlatformCharsetSel_Menu, charset);
-      if (NS_SUCCEEDED(result) && (charset.Length() > 0)) {
-        if (!charset.Compare("iso-8859-1", PR_TRUE)) {
-	  isLatin1 = 1;
-	}
-	NS_WITH_SERVICE(nsICharsetConverterManager, manager,
-	  NS_CHARSETCONVERTERMANAGER_PROGID, &result);
-	if (manager && NS_SUCCEEDED(result)) {
-	  result = manager->GetUnicodeEncoder(&charset, &converter);
-	  if (NS_FAILED(result) && converter) {
-	    NS_RELEASE(converter);
-	    converter = nsnull;
-	  }
-	  else if (converter) {
-	    result = converter->SetOutputErrorBehavior(
-	      nsIUnicodeEncoder::kOnError_Replace, nsnull, '?');
-	  }
-	}
-      }
-    }
-  }
-
-  GtkWidget* menuItem = nsnull;
-
-  if (converter) {
-    char labelStr[128];
-    labelStr[0] = 0;
-    PRInt32 srcLen = aLabel.Length() + 1;
-    PRInt32 destLen = sizeof(labelStr);
-    result = converter->Convert(aLabel.GetUnicode(), &srcLen, labelStr,
-      &destLen);
-    if (labelStr[0] && NS_SUCCEEDED(result)) {
-      menuItem = gtk_menu_item_new_with_label(labelStr);
-      if (menuItem && (!isLatin1)) {
-        GtkWidget* label = GTK_BIN(menuItem)->child;
-        gtk_widget_ensure_style(label);
-        GtkStyle* style = gtk_style_copy(label->style);
-        gdk_font_unref(style->font);
-        style->font = gdk_fontset_load("*");
-        gtk_widget_set_style(label, style);
-        gtk_style_unref(style);
-      }
-    }
-  }
-  else {
-    char labelStr[128];
-    aLabel.ToCString(labelStr, sizeof(labelStr));
-    menuItem = gtk_menu_item_new_with_label(labelStr);
-  }
-
-  return menuItem;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::Create(nsISupports *aParent, 
-                             const nsString &aLabel, 
-                             PRBool aIsSeparator)
-                            
-{
-  if (nsnull == aParent) {
-    return NS_ERROR_FAILURE;
-  }
-
-  if(aParent) {
-    nsIMenu * menu;
-    aParent->QueryInterface(nsIMenu::GetIID(), (void**) &menu);
-    mMenuParent = menu;
-    NS_RELEASE(menu);
-  }
-
-  nsIWidget   *widget = nsnull; // MenuBar's Parent
-  nsISupports *sups;
-  if (NS_OK == aParent->QueryInterface(kISupportsIID,(void**)&sups)) {
-    widget = GetMenuBarParent(sups);
-    // GetMenuBarParent will call release for us
-    // NS_RELEASE(sups);
-    mTarget = widget;
-  }
-
-  mIsSeparator = aIsSeparator;
-  mLabel = aLabel;
-
-  // create the native menu item
-
-  if(mIsSeparator) {
-    mMenuItem = gtk_menu_item_new();
-  } else {
-    mMenuItem = CreateLocalized(aLabel);
-  }
-  
-  gtk_widget_show(mMenuItem);
- 
-  gtk_signal_connect(GTK_OBJECT(mMenuItem), "activate",
-                     GTK_SIGNAL_FUNC(menu_item_activate_handler),
-                     this);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetLabel(nsString &aText)
-{
-  aText = mLabel;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetLabel(nsString &aText)
-{
-  mLabel = aText;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetEnabled(PRBool aIsEnabled)
-{
-  gtk_widget_set_sensitive(GTK_WIDGET(mMenuItem), aIsEnabled);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetEnabled(PRBool *aIsEnabled)
-{
-  *aIsEnabled = GTK_WIDGET_IS_SENSITIVE(mMenuItem);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetChecked(PRBool aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetChecked(PRBool *aIsEnabled)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetCheckboxType(PRBool aIsCheckbox)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetCheckboxType(PRBool *aIsCheckbox)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetCommand(PRUint32 & aCommand)
-{
-  aCommand = mCommand;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetTarget(nsIWidget *& aTarget)
-{
-  aTarget = mTarget;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenuItem;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::AddMenuListener(nsIMenuListener * aMenuListener)
-{
- 
-  NS_IF_RELEASE(mXULCommandListener);
-  NS_IF_ADDREF(aMenuListener);
-  mXULCommandListener = aMenuListener;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::RemoveMenuListener(nsIMenuListener * aMenuListener)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::IsSeparator(PRBool & aIsSep)
-{
-  aIsSep = mIsSeparator;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-// nsIMenuListener interface
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuItemSelected(const nsMenuEvent & aMenuEvent)
-{
-  if(!mIsSeparator) {
-    //g_print("nsMenuItem::MenuItemSelected\n");
-    DoCommand();
-  }else{
-    //g_print("nsMenuItem::MenuItemSelected is separator\n");
-  }
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuSelected(const nsMenuEvent & aMenuEvent)
-{
-  if(mXULCommandListener)
-    return mXULCommandListener->MenuSelected(aMenuEvent);
-
-  //g_print("nsMenuItem::MenuSelected\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuDeselected(const nsMenuEvent &aMenuEvent)
-{
-  //g_print("nsMenuItem::MenuDeselected\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuConstruct(const nsMenuEvent &aMenuEvent,
-                                        nsIWidget *aParentWindow, 
-                                        void *menuNode,
-                                        void *aWebShell)
-{
-  //g_print("nsMenuItem::MenuConstruct\n");
-  return nsEventStatus_eIgnore;
-}
-//-------------------------------------------------------------------------
-nsEventStatus nsMenuItem::MenuDestruct(const nsMenuEvent &aMenuEvent)
-{
-  //g_print("nsMenuItem::MenuDestruct\n");
-  return nsEventStatus_eIgnore;
-}
-
-//-------------------------------------------------------------------------
-/**
- * Sets the JavaScript Command to be invoked when a "gui" event
- * occurs on a source widget
- * @param aStrCmd the JS command to be cached for later execution
- * @return NS_OK 
- */
-NS_METHOD nsMenuItem::SetCommand(const nsString &aStrCmd)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-/**
- * Executes the "cached" JavaScript Command 
- * @return NS_OK if the command was executed properly, otherwise an error code
- */
-NS_METHOD nsMenuItem::DoCommand()
-{
-  nsresult rv = NS_ERROR_FAILURE;
- 
-  if(!mWebShell || !mDOMElement)
-    return rv;
-    
-  nsCOMPtr<nsIContentViewer> contentViewer;
-  NS_ENSURE_SUCCESS(mWebShell->GetContentViewer(getter_AddRefs(contentViewer)),
-   NS_ERROR_FAILURE);
-
-  nsCOMPtr<nsIDocumentViewer> docViewer;
-  docViewer = do_QueryInterface(contentViewer);
-  if (!docViewer) {
-    NS_ERROR("Document viewer interface not supported by the content viewer.");
-    //g_print("Document viewer interface not supported by the content viewer.");
-    return rv;
-  }
-
-  nsCOMPtr<nsIPresContext> presContext;
-  if (NS_FAILED(rv = docViewer->GetPresContext(*getter_AddRefs(presContext)))) {
-    NS_ERROR("Unable to retrieve the doc viewer's presentation context.");
-    //g_print("Unable to retrieve the doc viewer's presentation context.");
-    return rv;
-  }
-
-  nsEventStatus status = nsEventStatus_eIgnore;
-  nsMouseEvent event;
-  event.eventStructType = NS_MOUSE_EVENT;
-  event.message = NS_MENU_ACTION;
-
-  nsCOMPtr<nsIContent> contentNode;
-  contentNode = do_QueryInterface(mDOMElement);
-  if (!contentNode) {
-    NS_ERROR("DOM Node doesn't support the nsIContent interface required to handle DOM events.");
-    //g_print("DOM Node doesn't support the nsIContent interface required to handle DOM events.");
-    return rv;
-  }
-
-  rv = contentNode->HandleDOMEvent(*presContext, &event, nsnull, NS_EVENT_FLAG_INIT, status);
-  //g_print("HandleDOMEvent called");
-  return rv;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetDOMNode(nsIDOMNode * aDOMNode)
-{
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetDOMNode(nsIDOMNode ** aDOMNode)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetDOMElement(nsIDOMElement * aDOMElement)
-{
-  mDOMElement = aDOMElement;
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::GetDOMElement(nsIDOMElement ** aDOMElement)
-{
-  return NS_OK;
-}
-    
-//-------------------------------------------------------------------------
-NS_METHOD nsMenuItem::SetWebShell(nsIWebShell * aWebShell)
-{
-  mWebShell = aWebShell;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::SetShortcutChar(const nsString &aText)
-{
-  mKeyEquivalent = aText;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::GetShortcutChar(nsString &aText)
-{
-  aText = mKeyEquivalent;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::SetModifiers(PRUint8 aModifiers)
-{
-  mModifiers = aModifiers;
-  return NS_OK;
-}
-
-//----------------------------------------------------------------------
-NS_IMETHODIMP nsMenuItem::GetModifiers(PRUint8 * aModifiers)
-{
-  *aModifiers = mModifiers; 
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsMenuItem.h

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsMenuItem_h__
-#define nsMenuItem_h__
-
-#include "nsIMenuItem.h"
-#include "nsString.h"
-#include "nsIMenuListener.h"
-
-class nsIDOMNode;
-class nsIDOMElement;
-class nsIMenu;
-class nsIPopUpMenu;
-class nsIWebShell;
-class nsIWidget;
-
-/**
- * Native GTK+ MenuItem wrapper
- */
-
-class nsMenuItem : public nsIMenuItem, public nsIMenuListener
-{
-
-public:
-  nsMenuItem();
-  virtual ~nsMenuItem();
-
-  // nsISupports
-  NS_DECL_ISUPPORTS
-
-  // nsIMenuItem Methods
-  NS_IMETHOD Create(nsISupports    *aParent, 
-                    const nsString &aLabel,  
-                    PRBool          aIsSeparator);
-  NS_IMETHOD GetLabel(nsString &aText);
-  NS_IMETHOD SetLabel(nsString &aText);
-  NS_IMETHOD SetEnabled(PRBool aIsEnabled);
-  NS_IMETHOD GetEnabled(PRBool *aIsEnabled);
-  NS_IMETHOD SetChecked(PRBool aIsEnabled);
-  NS_IMETHOD GetChecked(PRBool *aIsEnabled);
-  NS_IMETHOD SetCheckboxType(PRBool aIsCheckbox);
-  NS_IMETHOD GetCheckboxType(PRBool *aIsCheckbox);
-  NS_IMETHOD GetCommand(PRUint32 & aCommand);
-  NS_IMETHOD GetTarget(nsIWidget *& aTarget);
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener);
-  NS_IMETHOD IsSeparator(PRBool & aIsSep);
-
-  NS_IMETHOD SetCommand(const nsString & aStrCmd);
-  NS_IMETHOD DoCommand();
-  NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode);
-  NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode);
-  NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement);
-  NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement);
-  NS_IMETHOD SetWebShell(nsIWebShell * aWebShell);
-  
-  NS_IMETHOD SetShortcutChar(const nsString &aText);
-  NS_IMETHOD GetShortcutChar(nsString &aText);
-  NS_IMETHOD SetModifiers(PRUint8 aModifiers);
-  NS_IMETHOD GetModifiers(PRUint8 * aModifiers);
-  
-  // nsIMenuListener interface
-  nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent);
-  nsEventStatus MenuConstruct(const nsMenuEvent & aMenuEvent,
-                              nsIWidget         * aParentWindow, 
-                              void              * menuNode,
-                              void              * aWebShell);
-  nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent);
-
-  static GtkWidget* CreateLocalized(const nsString& aLabel);
- 
-protected:
-  nsIWidget    *GetMenuBarParent(nsISupports * aParentSupports);
-  GtkWidget    *GetNativeParent();
-
-  nsIMenuListener	*mXULCommandListener;
-  nsString     mLabel;
-  nsString     mKeyEquivalent;
-  PRUint8      mModifiers;
-  PRUint32     mCommand;
-  nsIMenu      *mMenuParent;
-  nsIPopUpMenu *mPopUpParent;
-  nsIWidget    *mTarget;
-
-  GtkWidget    *mMenuItem; // native cascade widget
-  PRBool        mIsSeparator;
-  PRBool        mIsSubMenu;
-
-  nsIWebShell   * mWebShell;
-  nsIDOMElement * mDOMElement;
-};
-
-#endif // nsMenuItem_h__

mozilla/widget/src/gtk/nsPopUpMenu.cpp

@@ -1,214 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#include "nsPopUpMenu.h"
-#include "nsIMenu.h"
-#include "nsIWidget.h"
-
-#include "nsString.h"
-#include "nsFileSpec.h" // XXX: For nsAutoCString
-
-NS_IMPL_ISUPPORTS(nsPopUpMenu, nsIPopUpMenu::GetIID())
-
-//-------------------------------------------------------------------------
-//
-// nsPopUpMenu constructor
-//
-//-------------------------------------------------------------------------
-nsPopUpMenu::nsPopUpMenu() : nsIPopUpMenu()
-{
-  NS_INIT_REFCNT();
-  mNumMenuItems = 0;
-  mParent       = nsnull;
-  mMenu         = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsPopUpMenu destructor
-//
-//-------------------------------------------------------------------------
-nsPopUpMenu::~nsPopUpMenu()
-{
-  NS_IF_RELEASE(mParent);
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the proper widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::Create(nsIWidget *aParent)
-{
-
-  mParent = aParent;
-  NS_ADDREF(mParent);
-
-  mMenu = gtk_menu_new();
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddItem(const nsString &aText)
-{
-  GtkWidget *widget;
-
-  widget = gtk_menu_item_new_with_label ((const char*)nsAutoCString(mLabel));
-  gtk_widget_show(widget);
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddItem(nsIMenuItem * aMenuItem)
-{
-  GtkWidget *widget;
-  void *voidData;
-  
-  aMenuItem->GetNativeData(voidData);
-  widget = GTK_WIDGET(voidData);
-
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-
-  // XXX add aMenuItem to internal data structor list
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddMenu(nsIMenu * aMenu)
-{
-  nsString Label;
-  GtkWidget *item=NULL, *parentmenu=NULL, *newmenu=NULL;
-  void *voidData=NULL;
-  
-  aMenu->GetLabel(Label);
-
-  GetNativeData(voidData);
-  parentmenu = GTK_WIDGET(voidData);
-
-  item = gtk_menu_item_new_with_label ((const char*)nsAutoCString(Label));
-  gtk_widget_show(item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (parentmenu), item);
-
-  voidData = NULL;
-
-  aMenu->GetNativeData(&voidData);
-  newmenu = GTK_WIDGET(voidData);
-
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), newmenu);
-
-  // XXX add aMenu to internal data structor list
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::AddSeparator() 
-{
-  GtkWidget *widget;
-  widget = gtk_menu_item_new ();
-  gtk_widget_show(widget);
-  gtk_menu_shell_append (GTK_MENU_SHELL (mMenu), widget);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetItemCount(PRUint32 &aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::InsertSeparator(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::RemoveItem(const PRUint32 aCount)
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::RemoveAll()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-void nsPopUpMenu::GetXY(GtkMenu *menu, gint *x, gint *y, gpointer user_data)
-{
-  *x = ((nsPopUpMenu *)(user_data))->mX;
-  *y = ((nsPopUpMenu *)(user_data))->mY;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::ShowMenu(PRInt32 aX, PRInt32 aY)
-{
-  mX = aX;
-  mY = aY;
-
-  gtk_menu_popup (GTK_MENU(mMenu),
-		  NULL,
-		  NULL,
-                  GetXY,
-		  this,
-		  0,
-		  GDK_CURRENT_TIME);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetNativeData(void *& aData)
-{
-  aData = (void *)mMenu;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsPopUpMenu::GetParent(nsIWidget *& aParent)
-{
-  aParent = mParent;
-  return NS_OK;
-}
-
-

mozilla/widget/src/gtk/nsPopUpMenu.h

@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsPopUpMenu_h__
-#define nsPopUpMenu_h__
-
-#include "nsIPopUpMenu.h"
-
-#include <gtk/gtk.h>
-
-class nsIWidget;
-
-/**
- * Native GTK+ PopUp wrapper
- */
-
-class nsPopUpMenu : public nsIPopUpMenu
-{
-
-public:
-  nsPopUpMenu();
-  virtual ~nsPopUpMenu();
-
-  NS_DECL_ISUPPORTS
-  
-  NS_IMETHOD Create(nsIWidget * aParent);
-
-  // nsIPopUpMenu Methods
-  NS_IMETHOD AddItem(const nsString &aText);
-  NS_IMETHOD AddItem(nsIMenuItem * aMenuItem);
-  NS_IMETHOD AddMenu(nsIMenu * aMenu);
-  NS_IMETHOD AddSeparator();
-  NS_IMETHOD GetItemCount(PRUint32 &aCount);
-  NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem);
-  NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName);
-  NS_IMETHOD InsertSeparator(const PRUint32 aCount);
-  NS_IMETHOD RemoveItem(const PRUint32 aCount);
-  NS_IMETHOD RemoveAll();
-  static void GetXY(GtkMenu *menu, gint *x, gint *y, gpointer user_data);
-  NS_IMETHOD ShowMenu(PRInt32 aX, PRInt32 aY);
-  NS_IMETHOD GetNativeData(void*& aData);
-  NS_IMETHOD GetParent(nsIWidget*& aParent);
-
-protected:
-
-  nsString   mLabel;
-
-  PRUint32   mNumMenuItems;
-  nsIWidget  *mParent;
-  GtkWidget  *mMenu;
-
-  gint       mX;
-  gint       mY;
-};
-
-#endif // nsPopUpMenu_h__
-

mozilla/widget/src/gtk/nsRadioButton.cpp

@@ -1,240 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsRadioButton.h"
-#include "nsString.h"
-
-#include "nsGtkEventHandler.h"
-
-NS_IMPL_ADDREF_INHERITED(nsRadioButton, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsRadioButton, nsWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsRadioButton constructor
-//
-//-------------------------------------------------------------------------
-nsRadioButton::nsRadioButton() : nsWidget(), nsIRadioButton()
-{
-  NS_INIT_REFCNT();
-  mLabel = nsnull;
-  mRadioButton = nsnull;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// nsRadioButton destructor
-//
-//-------------------------------------------------------------------------
-nsRadioButton::~nsRadioButton()
-{
-#if 0
-  if (mLabel)
-    gtk_widget_destroy(mLabel);
-#endif
-}
-
-//-------------------------------------------------------------------------
-//
-// Query interface implementation
-//
-//-------------------------------------------------------------------------
-nsresult nsRadioButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
-{
-  nsresult result = nsWidget::QueryInterface(aIID, aInstancePtr);
-
-  if (result == NS_NOINTERFACE && aIID.Equals(nsIRadioButton::GetIID())) {
-      *aInstancePtr = (void*) ((nsIRadioButton*)this);
-      AddRef();
-      result = NS_OK;
-  }
-  return result;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the native RadioButton widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD  nsRadioButton::CreateNative(GtkObject *parentWindow)
-{
-  mWidget = gtk_event_box_new();
-  mRadioButton = gtk_radio_button_new(nsnull);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mRadioButton);
-
-  gtk_widget_show(mRadioButton);
-
-  gtk_widget_set_name(mWidget, "nsRadioButton");
-
-  gtk_radio_button_set_group(GTK_RADIO_BUTTON(mRadioButton), nsnull);
-
-  gtk_signal_connect(GTK_OBJECT(mRadioButton),
-                     "destroy",
-                     GTK_SIGNAL_FUNC(DestroySignal),
-                     this);
-
-  return NS_OK;
-}
-
-void
-nsRadioButton::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if (aGtkWidget == mLabel) {
-    mLabel = nsnull;
-  }
-  else if (aGtkWidget == mRadioButton) {
-    mRadioButton = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-void nsRadioButton::InitCallbacks(char * aName)
-{
-  InstallButtonPressSignal(mRadioButton);
-  InstallButtonReleaseSignal(mRadioButton);
-
-  InstallEnterNotifySignal(mWidget);
-  InstallLeaveNotifySignal(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::SetState(const PRBool aState)
-{
-  if (mWidget) {
-    GtkToggleButton * item = GTK_TOGGLE_BUTTON(mRadioButton);
-    item->active = (gboolean) aState;
-    gtk_widget_queue_draw(GTK_WIDGET(item));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button state
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::GetState(PRBool& aState)
-{
-  if (mWidget) {
-    aState = (PRBool) GTK_TOGGLE_BUTTON(mRadioButton)->active;
-  }
-  else {
-    aState = PR_TRUE;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Set this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::SetLabel(const nsString& aText)
-{
-  if (mWidget) {
-    NS_ALLOC_STR_BUF(label, aText, 256);
-    g_print("nsRadioButton::SetLabel(%s)\n",label);
-    if (mLabel) {
-      gtk_label_set(GTK_LABEL(mLabel), label);
-    } else {
-      mLabel = gtk_label_new(label);
-      gtk_misc_set_alignment (GTK_MISC (mLabel), 0.0, 0.5);
-      gtk_container_add(GTK_CONTAINER(mRadioButton), mLabel);
-      gtk_widget_show(mLabel); /* XXX */
-      gtk_signal_connect(GTK_OBJECT(mLabel),
-                         "destroy",
-                         GTK_SIGNAL_FUNC(DestroySignal),
-                         this);
-    }
-    NS_FREE_STR_BUF(label);
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get this button label
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsRadioButton::GetLabel(nsString& aBuffer)
-{
-  aBuffer.Truncate();
-  if (mWidget) {
-    if (mLabel) {
-      char* text;
-      gtk_label_get(GTK_LABEL(mLabel), &text);
-      aBuffer.Append(text);
-    }
-  }
-  return NS_OK;
-}
-
-//////////////////////////////////////////////////////////////////////
-// SetBackgroundColor for RadioButton
-/*virtual*/
-void nsRadioButton::SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark)
-{
-  // use same style copy as SetFont
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  
-  style->bg[GTK_STATE_NORMAL]=*aColorNor;
-  
-  // Mouse over button
-  style->bg[GTK_STATE_PRELIGHT]=*aColorBri;
-
-  // Button is down
-  style->bg[GTK_STATE_ACTIVE]=*aColorDark;
-
-  // other states too? (GTK_STATE_ACTIVE, GTK_STATE_PRELIGHT,
-  //               GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE)
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  // set style for eventbox too
-  gtk_widget_set_style(mWidget, style);
-
-  gtk_style_unref(style);
-}
-

mozilla/widget/src/gtk/nsRadioButton.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsRadioButton_h__
-#define nsRadioButton_h__
-
-#include "nsWidget.h"
-#include "nsIRadioButton.h"
-
-/**
- * Native GTK+ Radiobutton wrapper
- */
-class nsRadioButton : public nsWidget,
-                      public nsIRadioButton
-{
-
-public:
-  nsRadioButton();
-  virtual                 ~nsRadioButton();
-
-  // nsISupports
-  NS_IMETHOD_(nsrefcnt) AddRef();
-  NS_IMETHOD_(nsrefcnt) Release();
-  NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
-  // nsIRadioButton part
-  NS_IMETHOD              SetLabel(const nsString& aText);
-  NS_IMETHOD              GetLabel(nsString& aBuffer);
-  NS_IMETHOD              SetState(const PRBool aState);
-  NS_IMETHOD              GetState(PRBool& aState);
-
-
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY) { return PR_FALSE; }
-  virtual PRBool OnPaint(nsPaintEvent & aEvent) { return PR_FALSE; }
-  virtual PRBool OnResize(nsRect &aRect) { return PR_FALSE; }
-
-  // These are needed to Override the auto check behavior
-  void Armed();
-  void DisArmed();
-
-protected:
-  NS_IMETHOD  CreateNative(GtkObject *parentWindow);
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Sets background for checkbutton
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  GtkWidget *mLabel;
-  GtkWidget *mRadioButton;
-
-};
-
-#endif // nsRadioButton_h__

mozilla/widget/src/gtk/nsScrollbar.cpp

@@ -1,455 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsScrollbar.h"
-#include "nsGUIEvent.h"
-
-#include "nsGtkEventHandler.h"
-
-NS_IMPL_ADDREF_INHERITED(nsScrollbar, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsScrollbar, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsScrollbar constructor
-//
-//-------------------------------------------------------------------------
-nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar ()
-{
-  NS_INIT_REFCNT ();
-
-  mOrientation = (aIsVertical) ?
-    GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsScrollbar destructor
-//
-//-------------------------------------------------------------------------
-nsScrollbar::~nsScrollbar ()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native scrollbar widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::CreateNative (GtkObject * parentWindow)
-{
-  // Create scrollbar, random default values
-  mAdjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 25, 25));
-  
-#ifdef USE_SUPERWIN
-
-  if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif /* USE_SUPERWIN */
-
-  switch (mOrientation)
-  {
-    case GTK_ORIENTATION_HORIZONTAL:
-      mWidget = gtk_hscrollbar_new (mAdjustment);
-      break;
-    case GTK_ORIENTATION_VERTICAL:
-      mWidget = gtk_vscrollbar_new (mAdjustment);
-      break;
-  }
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  gtk_widget_set_name (mWidget, "nsScrollbar");
-
-  gtk_signal_connect (GTK_OBJECT (mAdjustment),
-                      "value_changed",
-                      GTK_SIGNAL_FUNC (handle_scrollbar_value_changed),
-                      this);
-  gtk_signal_connect (GTK_OBJECT (mAdjustment),
-                      "destroy",
-                      GTK_SIGNAL_FUNC (DestroySignal),
-                      this);
-
-  return NS_OK;
-}
-
-void
-nsScrollbar::OnDestroySignal(GtkWidget* aGtkWidget)
-{
-  if ((void*)aGtkWidget == (void*)mAdjustment) {
-    mAdjustment = nsnull;
-  }
-  else {
-    nsWidget::OnDestroySignal(aGtkWidget);
-  }
-}
-
-//-------------------------------------------------------------------------
-//
-// Define the range settings
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetMaxRange (PRUint32 aEndRange)
-{
-  if (mAdjustment) {
-    GTK_ADJUSTMENT (mAdjustment)->upper = (float) aEndRange;
-    gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-  }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Return the range settings
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetMaxRange (PRUint32 & aMaxRange)
-{
-  if (mAdjustment)
-    aMaxRange = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->upper;
-  else
-    aMaxRange = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the thumb position
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetPosition (PRUint32 aPos)
-{
-//   if (mAdjustment)
-//     gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), (float) aPos);
-
-  if (mAdjustment && mWidget)
-  {
-    //
-    // The following bit of code borrowed from gtkrange.c,
-    // gtk_range_adjustment_value_changed():
-    //
-    // Ok, so, like, the problem is that the view manager expects
-    // SetPosition() to simply do that - set the position of the 
-    // scroll bar.  Nothing else!
-    //
-    // Unfortunately, calling gtk_adjustment_set_value() causes
-    // the adjustment object (mAdjustment) to emit a 
-    // "value_changed" signal which in turn causes the
-    // scrollbar widget (mWidget) to scroll to the given position.
-    //
-    // The net result of this is that the content is scrolled
-    // twice, once by the view manager and once by the 
-    // scrollbar - and things get messed up from then onwards.
-    //
-    // The following bit of code does the equivalent of 
-    // gtk_adjustment_set_value(), except no signal is emitted.
-    //
-    GtkRange * range = GTK_RANGE(mWidget);
-    GtkAdjustment * adjustment = GTK_ADJUSTMENT(mAdjustment);
-      
-    adjustment->value = (float) aPos;
-      
-    if (range->old_value != adjustment->value)
-    {
-      gtk_range_slider_update (range);
-      gtk_range_clear_background (range);
-      
-      range->old_value = adjustment->value;
-    }
-  }
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the current thumb position.
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetPosition (PRUint32 & aPos)
-{
-  if (mAdjustment)
-    aPos = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->value;
-  else
-    aPos = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the thumb size
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetThumbSize (PRUint32 aSize)
-{
-  if (aSize > 0)
-    {
-      if (mAdjustment) {
-        GTK_ADJUSTMENT (mAdjustment)->page_increment = (float) aSize;
-        GTK_ADJUSTMENT (mAdjustment)->page_size = (float) aSize;
-        gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-      }
-    }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the thumb size
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetThumbSize (PRUint32 & aThumbSize)
-{
-  if (mAdjustment)
-    aThumbSize = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->page_size;
-  else
-    aThumbSize = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set the line increment for this scrollbar
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetLineIncrement (PRUint32 aLineIncrement)
-{
-  if (aLineIncrement > 0)
-    {
-      if (mAdjustment) {
-        GTK_ADJUSTMENT (mAdjustment)->step_increment = (float) aLineIncrement;
-        gtk_signal_emit_by_name (GTK_OBJECT (mAdjustment), "changed");
-      }
-    }
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Get the line increment for this scrollbar
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::GetLineIncrement (PRUint32 & aLineInc)
-{
-  if (mAdjustment) {
-    aLineInc = (PRUint32) GTK_ADJUSTMENT (mAdjustment)->step_increment;
-  }
-  else
-    aLineInc = 0;
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Set all scrolling parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsScrollbar::SetParameters (PRUint32 aMaxRange, PRUint32 aThumbSize,
-	       PRUint32 aPosition, PRUint32 aLineIncrement)
-{
-  if (mAdjustment) {
-    int thumbSize = (((int) aThumbSize) > 0 ? aThumbSize : 1);
-    int maxRange = (((int) aMaxRange) > 0 ? aMaxRange : 10);
-    int mLineIncrement = (((int) aLineIncrement) > 0 ? aLineIncrement : 1);
-
-    int maxPos = maxRange - thumbSize;
-    int pos = ((int) aPosition) > maxPos ? maxPos - 1 : ((int) aPosition);
-
-    GTK_ADJUSTMENT (mAdjustment)->lower = 0;
-    GTK_ADJUSTMENT (mAdjustment)->upper = maxRange;
-    GTK_ADJUSTMENT (mAdjustment)->page_size = thumbSize;
-    GTK_ADJUSTMENT (mAdjustment)->page_increment = thumbSize;
-    GTK_ADJUSTMENT (mAdjustment)->step_increment = mLineIncrement;
-    // this will emit the changed signal for us
-    gtk_adjustment_set_value (GTK_ADJUSTMENT (mAdjustment), pos);
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-int nsScrollbar::AdjustScrollBarPosition (int aPosition)
-{
-  return 0;			/* XXX */
-}
-
-//-------------------------------------------------------------------------
-//
-// Deal with scrollbar messages (actually implemented only in nsScrollbar)
-//
-//-------------------------------------------------------------------------
-PRBool nsScrollbar::OnScroll (nsScrollbarEvent & aEvent, PRUint32 cPos)
-{
-  PRBool result = PR_TRUE;
-  float newPosition;
-
-  switch (aEvent.message)
-    {
-
-      // scroll one line right or down
-    case NS_SCROLLBAR_LINE_NEXT:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        // newPosition += mLineIncrement;
-        newPosition += 10;
-        PRUint32 thumbSize;
-        PRUint32 maxRange;
-        GetThumbSize (thumbSize);
-        GetMaxRange (maxRange);
-        PRUint32 max = maxRange - thumbSize;
-        if (newPosition > (int) max)
-          newPosition = (int) max;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-
-      // scroll one line left or up
-    case NS_SCROLLBAR_LINE_PREV:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-
-        // newPosition -= mLineIncrement;
-        newPosition -= 10;
-        if (newPosition < 0)
-          newPosition = 0;
-
-        // if an event callback is registered, give it the chance
-        // to change the decrement
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            aEvent.widget = (nsWidget *) this;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-      // Scrolls one page right or down
-    case NS_SCROLLBAR_PAGE_NEXT:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        PRUint32 thumbSize;
-        GetThumbSize (thumbSize);
-        PRUint32 maxRange;
-        GetThumbSize (thumbSize);
-        GetMaxRange (maxRange);
-        PRUint32 max = maxRange - thumbSize;
-        if (newPosition > (int) max)
-          newPosition = (int) max;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-      // Scrolls one page left or up.
-    case NS_SCROLLBAR_PAGE_PREV:
-      {
-        newPosition = GTK_ADJUSTMENT (mAdjustment)->value;
-        if (newPosition < 0)
-          newPosition = 0;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-
-
-      // Scrolls to the absolute position. The current position is specified by
-      // the cPos parameter.
-    case NS_SCROLLBAR_POS:
-      {
-        newPosition = cPos;
-
-        // if an event callback is registered, give it the chance
-        // to change the increment
-        if (mEventCallback)
-          {
-            aEvent.position = (PRUint32) newPosition;
-            result = ConvertStatus ((*mEventCallback) (&aEvent));
-            newPosition = aEvent.position;
-          }
-        break;
-      }
-    }
-  /*
-     GTK_ADJUSTMENT(mAdjustment)->value = newPosition;
-     gtk_signal_emit_by_name(GTK_OBJECT(mAdjustment), "value_changed");
-   */
-  /*
-     if (mEventCallback) {
-     aEvent.position = cPos;
-     result = ConvertStatus((*mEventCallback)(&aEvent));
-     newPosition = aEvent.position;
-     }
-   */
-  return result;
-}

mozilla/widget/src/gtk/nsScrollbar.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsScrollbar_h__
-#define nsScrollbar_h__
-
-#include "nsWidget.h"
-#include "nsIScrollbar.h"
-
-/**
- * Native GTK+ scrollbar wrapper.
- */
-class nsScrollbar : public nsWidget,
-                    public nsIScrollbar
-{
-
-public:
-  nsScrollbar(PRBool aIsVertical);
-  virtual                 ~nsScrollbar();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  // nsIScrollBar implementation
-  NS_IMETHOD SetMaxRange(PRUint32 aEndRange);
-  NS_IMETHOD GetMaxRange(PRUint32& aMaxRange);
-  NS_IMETHOD SetPosition(PRUint32 aPos);
-  NS_IMETHOD GetPosition(PRUint32& aPos);
-  NS_IMETHOD SetThumbSize(PRUint32 aSize);
-  NS_IMETHOD GetThumbSize(PRUint32& aSize);
-  NS_IMETHOD SetLineIncrement(PRUint32 aSize);
-  NS_IMETHOD GetLineIncrement(PRUint32& aSize);
-  NS_IMETHOD SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
-                           PRUint32 aPosition, PRUint32 aLineIncrement);
-  virtual PRBool OnScroll (nsScrollbarEvent & aEvent, PRUint32 cPos);
-
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-private:
-  int             mOrientation;
-  GtkAdjustment   *mAdjustment;
-
-  int AdjustScrollBarPosition(int aPosition);
-};
-
-#endif /* nsScrollbar_h__ */

mozilla/widget/src/gtk/nsSound.cpp

@@ -1,125 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-#include "nscore.h"
-#include "nsIAllocator.h"
-#include "plstr.h"
-#include "stdio.h"
-
-#include "prlink.h"
-
-#include "nsSound.h"
-
-#include <unistd.h>
-
-#include <gtk/gtk.h>
-/* used with esd_open_sound */
-//static int esdref = -1;
-static PRLibrary *lib = nsnull;
-
-//typedef int (PR_CALLBACK *EsdOpenSoundType)(const char *host);
-//typedef int (PR_CALLBACK *EsdCloseType)(int);
-
-/* used to play the sounds from the find symbol call */
-typedef int (PR_CALLBACK *EsdPlayFileType)(const char *, const char *, int);
-
-NS_IMPL_ISUPPORTS1(nsSound, nsISound);
-
-////////////////////////////////////////////////////////////////////////
-nsSound::nsSound()
-{
-  NS_INIT_REFCNT();
-
-  /* we don't need to do esd_open_sound if we are only going to play files
-     but we will if we want to do things like streams, etc
-  */
-  //  EsdOpenSoundType EsdOpenSound;
-
-  lib = PR_LoadLibrary("libesd.so");
-
-  /*
-    if (!lib)
-    return;
-    EsdOpenSound = (EsdOpenSoundType) PR_FindSymbol(lib, "esd_open_sound");
-    esdref = (*EsdOpenSound)("localhost");
-  */
-}
-
-nsSound::~nsSound()
-{
-  /* see above comment */
-  /*
-    if (esdref != -1)
-    {
-    EsdCloseType EsdClose = (EsdCloseType) PR_FindSymbol(lib, "esd_close");
-    (*EsdClose)(esdref);
-    esdref = -1;
-    }
-  */
-}
-
-nsresult NS_NewSound(nsISound** aSound)
-{
-  NS_PRECONDITION(aSound != nsnull, "null ptr");
-  if (! aSound)
-    return NS_ERROR_NULL_POINTER;
-  
-  *aSound = new nsSound();
-  if (! *aSound)
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  NS_ADDREF(*aSound);
-  return NS_OK;
-}
-
-
-NS_METHOD nsSound::Init(void)
-{
-  return NS_OK;
-}
-
-
-NS_METHOD nsSound::Beep()
-{
-	::gdk_beep();
-
-  return NS_OK;
-}
-
-NS_METHOD nsSound::Play(nsIFileSpec *filespec)
-{
-  if (lib)
-  {
-    char *filename;
-    filespec->GetNativePath(&filename);
-
-    g_print("there are some issues with playing sound right now, but this should work\n");
-    EsdPlayFileType EsdPlayFile = (EsdPlayFileType) PR_FindSymbol(lib, "esd_play_file");
-    (*EsdPlayFile)("mozilla", filename, 1);
-
-    nsCRT::free(filename);
-
-    return NS_OK;
-  }
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsSound.h

@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __nsSound_h__
-#define __nsSound_h__
-
-#include "nsISound.h"
-
-#include <gtk/gtk.h>
-
-class nsSound : public nsISound {
- public: 
-
-  nsSound();
-  virtual ~nsSound();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISOUND
-
-};
-
-#endif /* __nsSound_h__ */

mozilla/widget/src/gtk/nsTextAreaWidget.cpp

@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextAreaWidget.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsTextAreaWidget, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextAreaWidget, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsTextAreaWidget, nsITextAreaWidget, nsIWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsTextAreaWidget constructor
-//
-//-------------------------------------------------------------------------
-nsTextAreaWidget::nsTextAreaWidget()
-{
-  mBackground = NS_RGB(124, 124, 124);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextAreaWidget destructor
-//
-//-------------------------------------------------------------------------
-nsTextAreaWidget::~nsTextAreaWidget()
-{
-  gtk_widget_destroy(mTextWidget);
-  mTextWidget = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Text widget
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsTextAreaWidget::CreateNative(GtkObject *parentWindow)
-{
-  PRBool oldIsReadOnly;
-  mWidget = gtk_scrolled_window_new(nsnull, nsnull);
-  gtk_container_set_border_width(GTK_CONTAINER(mWidget), 0);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(mWidget),
-                                 GTK_POLICY_NEVER,
-                                 GTK_POLICY_ALWAYS);
-  
-  mTextWidget = gtk_text_new(nsnull, nsnull);
-  gtk_text_set_word_wrap(GTK_TEXT(mTextWidget), PR_TRUE);
-  gtk_widget_set_name(mTextWidget, "nsTextAreaWidget");
-  gtk_widget_show(mTextWidget);
-  SetPassword(mIsPassword);
-  SetReadOnly(mIsReadOnly, oldIsReadOnly);
-
-  gtk_container_add(GTK_CONTAINER(mWidget), mTextWidget);
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// set font for textarea
-//
-//-------------------------------------------------------------------------
-/* virtual */
-void nsTextAreaWidget::SetFontNative(GdkFont *aFont)
-{
-  GtkStyle *style = gtk_style_copy(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0))->style);
-  // gtk_style_copy ups the ref count of the font
-  gdk_font_unref (style->font);
-  
-  style->font = aFont;
-  gdk_font_ref(style->font);
-  
-  gtk_widget_set_style(GTK_WIDGET (g_list_nth_data(gtk_container_children(GTK_CONTAINER (mWidget)),0)), style);
-  
-  gtk_style_unref(style);
-}

mozilla/widget/src/gtk/nsTextAreaWidget.h

@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsTextAreaWidget_h__
-#define nsTextAreaWidget_h__
-
-#include "nsTextHelper.h"
-#include "nsITextAreaWidget.h"
-
-/**
- * Native GTK+ multi-line edit control wrapper.
- */
-
-class nsTextAreaWidget : public nsTextHelper
-{
-
-public:
-  nsTextAreaWidget();
-  virtual ~nsTextAreaWidget();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  virtual void SetFontNative(GdkFont *aFont);
-
-protected:
-  NS_METHOD CreateNative(GtkObject *parentWindow);
-};
-
-
-#endif // nsTextAreaWidget_h__

mozilla/widget/src/gtk/nsTextHelper.cpp

@@ -1,216 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextHelper.h"
-#include "nsTextWidget.h"
-#include "nsString.h"
-
-NS_IMPL_ADDREF_INHERITED(nsTextHelper, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextHelper, nsWidget)
-
-//-------------------------------------------------------------------------
-//
-// nsTextHelper constructor
-//
-//-------------------------------------------------------------------------
-
-nsTextHelper::nsTextHelper() : nsWidget(), nsITextAreaWidget(), nsITextWidget()
-{
-  mIsReadOnly = PR_FALSE;
-  mIsPassword = PR_FALSE;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextHelper destructor
-//
-//-------------------------------------------------------------------------
-nsTextHelper::~nsTextHelper()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// Set initial parameters
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::PreCreateWidget(nsWidgetInitData *aInitData)
-{
-  if (nsnull != aInitData) {
-    nsTextWidgetInitData* data = (nsTextWidgetInitData *) aInitData;
-    mIsPassword = data->mIsPassword;
-    mIsReadOnly = data->mIsReadOnly;
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SetMaxTextLength(PRUint32 aChars)
-{
-  // This is a normal entry only thing, not a text box
-  gtk_entry_set_max_length(GTK_ENTRY(mTextWidget), (int)aChars);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::GetText(nsString& aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize)
-{
-  char *str = nsnull;
-  if (GTK_IS_ENTRY(mTextWidget))
-    {
-      str = gtk_entry_get_text(GTK_ENTRY(mTextWidget));
-    }
-  else if (GTK_IS_TEXT(mTextWidget))
-    {
-      str = gtk_editable_get_chars (GTK_EDITABLE (mTextWidget), 0,
-                                    gtk_text_get_length (GTK_TEXT (mTextWidget)));
-    }
-  aTextBuffer.SetLength(0);
-  aTextBuffer.Append(str);
-  PRUint32 len = (PRUint32)strlen(str);
-  aActualSize = len;
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetText(const nsString& aText, PRUint32& aActualSize)
-{
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_text(GTK_ENTRY(mTextWidget),
-                       (const gchar *)nsAutoCString(aText));
-  } else if (GTK_IS_TEXT(mTextWidget)) {
-    gtk_editable_delete_text(GTK_EDITABLE(mTextWidget), 0,
-                             gtk_text_get_length(GTK_TEXT (mTextWidget)));
-    gtk_text_insert(GTK_TEXT(mTextWidget),
-                    nsnull, nsnull, nsnull,
-                    (const char *)nsAutoCString(aText),
-                    aText.Length());
-  }
-
-  aActualSize = aText.Length();
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::InsertText(const nsString &aText,
-                                    PRUint32 aStartPos,
-                                    PRUint32 aEndPos,
-                                    PRUint32& aActualSize)
-{
-  gtk_editable_insert_text(GTK_EDITABLE(mTextWidget),
-                           (const gchar *)nsAutoCString(aText),
-                           (gint)aText.Length(), (gint*)&aStartPos);
-
-  aActualSize = aText.Length();
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::RemoveText()
-{
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_text(GTK_ENTRY(mTextWidget), "");
-  } else if (GTK_IS_TEXT(mTextWidget)) {
-    gtk_editable_delete_text(GTK_EDITABLE(mTextWidget), 0,
-                             gtk_text_get_length(GTK_TEXT (mTextWidget)));
-  }
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetPassword(PRBool aIsPassword)
-{
-  mIsPassword = aIsPassword?PR_FALSE:PR_TRUE;
-  if (GTK_IS_ENTRY(mTextWidget)) {
-    gtk_entry_set_visibility(GTK_ENTRY(mTextWidget), mIsPassword);
-  }
-  // this won't work for gtk_texts
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetReadOnly(PRBool aReadOnlyFlag, PRBool& aOldReadOnlyFlag)
-{
-  NS_ASSERTION(nsnull != mTextWidget,
-               "SetReadOnly - Widget is NULL, Create may not have been called!");
-  aOldReadOnlyFlag = mIsReadOnly;
-  mIsReadOnly = aReadOnlyFlag?PR_FALSE:PR_TRUE;
-  gtk_editable_set_editable(GTK_EDITABLE(mTextWidget), mIsReadOnly);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SelectAll()
-{
-  nsString text;
-  PRUint32 actualSize = 0;
-  PRUint32 numChars = GetText(text, 0, actualSize);
-  SetSelection(0, numChars);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::SetSelection(PRUint32 aStartSel, PRUint32 aEndSel)
-{
-  gtk_editable_select_region(GTK_EDITABLE(mTextWidget), aStartSel, aEndSel);
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextHelper::GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel)
-{
-#if 0
-  XmTextPosition left;
-  XmTextPosition right;
-
-  if (XmTextGetSelectionPosition(mTextWidget, &left, &right)) {
-    *aStartSel = (PRUint32)left;
-    *aEndSel   = (PRUint32)right;
-  } else {
-    printf("nsTextHelper::GetSelection Error getting positions\n");
-    return NS_ERROR_FAILURE;
-  }
-#endif
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::SetCaretPosition(PRUint32 aPosition)
-{
-  gtk_editable_set_position(GTK_EDITABLE(mTextWidget), aPosition);
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_IMETHODIMP  nsTextHelper::GetCaretPosition(PRUint32& aPosition)
-{
-  aPosition = (PRUint32)GTK_EDITABLE(mTextWidget)->current_pos;
-  return NS_OK;
-}

mozilla/widget/src/gtk/nsTextHelper.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsTextHelper_h__
-#define nsTextHelper_h__
-
-#include "nsITextWidget.h"
-#include "nsITextAreaWidget.h"
-#include "nsWidget.h"
-
-/**
- * Base class for nsTextAreaWidget and nsTextWidget
- */
-class nsTextHelper : public nsWidget,
-                     public nsITextAreaWidget,
-                     public nsITextWidget
-{
-
-public:
-    nsTextHelper();
-    virtual ~nsTextHelper();
-
-    // nsISupports
-    NS_IMETHOD_(nsrefcnt) AddRef();
-    NS_IMETHOD_(nsrefcnt) Release();
-
-    NS_IMETHOD        SelectAll();
-    NS_IMETHOD        PreCreateWidget(nsWidgetInitData *aInitData);
-    NS_IMETHOD        SetMaxTextLength(PRUint32 aChars);
-    NS_IMETHOD        GetText(nsString& aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize);
-    NS_IMETHOD        SetText(const nsString &aText, PRUint32& aActualSize);
-    NS_IMETHOD        InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize);
-    NS_IMETHOD        RemoveText();
-    NS_IMETHOD        SetPassword(PRBool aIsPassword);
-    NS_IMETHOD        SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag);
-    NS_IMETHOD        SetSelection(PRUint32 aStartSel, PRUint32 aEndSel);
-    NS_IMETHOD        GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel);
-    NS_IMETHOD        SetCaretPosition(PRUint32 aPosition);
-    NS_IMETHOD        GetCaretPosition(PRUint32& aPosition);
-
-protected:
-    GtkWidget *mTextWidget;
-    PRBool  mIsPassword;
-    PRBool  mIsReadOnly;
-
-};
-
-#endif // nsTextHelper_h__

mozilla/widget/src/gtk/nsTextWidget.cpp

@@ -1,130 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include <gtk/gtk.h>
-
-#include "nsTextWidget.h"
-#include "nsString.h"
-#include "nsGtkEventHandler.h"
-
-extern int mIsPasswordCallBacksInstalled;
-
-
-NS_IMPL_ADDREF_INHERITED(nsTextWidget, nsWidget)
-NS_IMPL_RELEASE_INHERITED(nsTextWidget, nsWidget)
-NS_IMPL_QUERY_INTERFACE2(nsTextWidget, nsITextWidget, nsIWidget)
-
-
-//-------------------------------------------------------------------------
-//
-// nsTextWidget constructor
-//
-//-------------------------------------------------------------------------
-nsTextWidget::nsTextWidget() : nsTextHelper()
-{
-}
-
-//-------------------------------------------------------------------------
-//
-// nsTextWidget destructor
-//
-//-------------------------------------------------------------------------
-nsTextWidget::~nsTextWidget()
-{
-  // avoid freeing this twice in other destructors
-  mTextWidget = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Create the native Entry widget
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsTextWidget::CreateNative(GtkObject *parentWindow)
-{
-  PRBool oldIsReadOnly;
-  mWidget = gtk_entry_new();
-
-#ifdef USE_SUPERWIN
-
-  if (!GDK_IS_SUPERWIN(parentWindow)) {
-    g_print("Damn, brother.  That's not a superwin.\n");
-    return NS_ERROR_FAILURE;
-  }
-  
-  GdkSuperWin *superwin = GDK_SUPERWIN(parentWindow);
-
-  mMozBox = gtk_mozbox_new(superwin->bin_window);
-
-#endif /* USE_SUPERWIN */
-
-  // used by nsTextHelper because nsTextArea needs a scrolled_window
-  mTextWidget = mWidget;
-
-  gtk_widget_set_name(mWidget, "nsTextWidget");
-
-  /*
-   * GTK's text widget does XIM for us, so we don't want to use the default key handler
-   * which does XIM, so we connect to a non-XIM key event for the text widget
-   */
-  gtk_signal_connect_after(GTK_OBJECT(mWidget),
-                     "key_press_event",
-                     GTK_SIGNAL_FUNC(handle_key_press_event_for_text),
-                     this);
-  gtk_signal_connect(GTK_OBJECT(mWidget),
-                     "key_release_event",
-                     GTK_SIGNAL_FUNC(handle_key_release_event_for_text),
-                     this);
-  SetPassword(mIsPassword);
-  SetReadOnly(mIsReadOnly, oldIsReadOnly);
-  gtk_widget_show(mWidget);
-
-  // These are needed so that the events will go to us and not our parent.
-  AddToEventMask(mWidget,
-                 GDK_BUTTON_PRESS_MASK |
-                 GDK_BUTTON_RELEASE_MASK |
-                 GDK_ENTER_NOTIFY_MASK |
-                 GDK_EXPOSURE_MASK |
-                 GDK_FOCUS_CHANGE_MASK |
-                 GDK_KEY_PRESS_MASK |
-                 GDK_KEY_RELEASE_MASK |
-                 GDK_LEAVE_NOTIFY_MASK |
-                 GDK_POINTER_MOTION_MASK);
-
-#ifdef USE_SUPERWIN
-
-  // make sure that we put the scrollbar into the mozbox
-
-  gtk_container_add(GTK_CONTAINER(mMozBox), mWidget);
-
-#endif /* USE_SUPERWIN */
-
-  return NS_OK;
-}
-
-PRBool nsTextWidget::OnKey(nsKeyEvent &aEvent)
-{
-  if (mEventCallback) {
-    return DispatchWindowEvent(&aEvent);
-  }
-  return PR_FALSE;
-}

mozilla/widget/src/gtk/nsTextWidget.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsTextWidget_h__
-#define nsTextWidget_h__
-
-#include "nsTextHelper.h"
-
-#include "nsITextWidget.h"
-
-/**
- * Native GTK+ single line edit control wrapper.
- */
-
-class nsTextWidget : public nsTextHelper
-{
-
-public:
-  nsTextWidget();
-  virtual ~nsTextWidget();
-
-  NS_DECL_ISUPPORTS_INHERITED
-
-  PRBool   OnKey(nsKeyEvent &aEvent);
-protected:
-  NS_IMETHOD CreateNative(GtkObject *parentWindow);
-};
-
-#endif // nsTextWidget_h__

mozilla/widget/src/gtk/nsToolkit.cpp

@@ -1,144 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nscore.h"  // needed for 'nsnull'
-#include "nsToolkit.h"
-
-//
-// Static thread local storage index of the Toolkit 
-// object associated with a given thread...
-//
-static PRUintn gToolkitTLSIndex = 0;
-
-//-------------------------------------------------------------------------
-//
-// constructor
-//
-//-------------------------------------------------------------------------
-nsToolkit::nsToolkit()
-{
-  NS_INIT_REFCNT();
-  mSharedGC = nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// destructor
-//
-//-------------------------------------------------------------------------
-nsToolkit::~nsToolkit()
-{
-  if (mSharedGC)
-    gdk_gc_unref(mSharedGC);
-
-    // Remove the TLS reference to the toolkit...
-    PR_SetThreadPrivate(gToolkitTLSIndex, nsnull);
-}
-
-//-------------------------------------------------------------------------
-//
-// nsISupports implementation macro
-//
-//-------------------------------------------------------------------------
-
-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
-
-void nsToolkit::CreateSharedGC(void)
-{
-  GdkPixmap *pixmap;
-
-  if (mSharedGC)
-    return;
-
-  pixmap = ::gdk_pixmap_new (NULL, 1, 1, gdk_rgb_get_visual()->depth);
-  mSharedGC = ::gdk_gc_new (pixmap);
-  gdk_pixmap_unref (pixmap);
-  mSharedGC = gdk_gc_ref(mSharedGC);
-}
-
-GdkGC *nsToolkit::GetSharedGC(void)
-{
-  return gdk_gc_ref(mSharedGC);
-}
-
-//-------------------------------------------------------------------------
-//
-//
-//-------------------------------------------------------------------------
-NS_IMETHODIMP nsToolkit::Init(PRThread *aThread)
-{
-  CreateSharedGC();
-
-  return NS_OK;
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Return the nsIToolkit for the current thread.  If a toolkit does not
-// yet exist, then one will be created...
-//
-//-------------------------------------------------------------------------
-NS_METHOD NS_GetCurrentToolkit(nsIToolkit* *aResult)
-{
-  nsIToolkit* toolkit = nsnull;
-  nsresult rv = NS_OK;
-  PRStatus status;
-
-  // Create the TLS index the first time through...
-  if (0 == gToolkitTLSIndex) {
-    status = PR_NewThreadPrivateIndex(&gToolkitTLSIndex, NULL);
-    if (PR_FAILURE == status) {
-      rv = NS_ERROR_FAILURE;
-    }
-  }
-
-  if (NS_SUCCEEDED(rv)) {
-    toolkit = (nsIToolkit*)PR_GetThreadPrivate(gToolkitTLSIndex);
-
-    //
-    // Create a new toolkit for this thread...
-    //
-    if (!toolkit) {
-      toolkit = new nsToolkit();
-
-      if (!toolkit) {
-        rv = NS_ERROR_OUT_OF_MEMORY;
-      } else {
-        NS_ADDREF(toolkit);
-        toolkit->Init(PR_GetCurrentThread());
-        //
-        // The reference stored in the TLS is weak.  It is removed in the
-        // nsToolkit destructor...
-        //
-        PR_SetThreadPrivate(gToolkitTLSIndex, (void*)toolkit);
-      }
-    } else {
-      NS_ADDREF(toolkit);
-    }
-    *aResult = toolkit;
-  }
-
-  return rv;
-}
-
-

mozilla/widget/src/gtk/nsToolkit.h

@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef TOOLKIT_H      
-#define TOOLKIT_H
-
-#include "nsIToolkit.h"
-#include <gtk/gtk.h>
-
-/**
- * Wrapper around the thread running the message pump.
- * The toolkit abstraction is necessary because the message pump must
- * execute within the same thread that created the widget under Win32.
- */ 
-
-class nsToolkit : public nsIToolkit
-{
-
-public:
-  nsToolkit();
-  virtual ~nsToolkit();
-  
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD    Init(PRThread *aThread);
-
-  void          CreateSharedGC(void);
-  GdkGC         *GetSharedGC(void);
-  
-private:
-  GdkGC         *mSharedGC;
-};
-
-
-
-#endif  // TOOLKIT_H

mozilla/widget/src/gtk/nsWidget.h

@@ -1,410 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsWidget_h__
-#define nsWidget_h__
-
-#include "nsBaseWidget.h"
-#include "nsIRegion.h"
-
-
-// XXX: This must go away when nsAutoCString moves out of nsFileSpec.h
-#include "nsFileSpec.h" // for nsAutoCString()
-
-class nsILookAndFeel;
-class nsIAppShell;
-class nsIToolkit;
-
-#include <gtk/gtk.h>
-
-#include <gdk/gdkprivate.h>
-
-#include "gtkmozbox.h"
-
-#define USE_SUPERWIN
-
-#define NSRECT_TO_GDKRECT(ns,gdk) \
-  PR_BEGIN_MACRO \
-  gdk.x = ns.x; \
-  gdk.y = ns.y; \
-  gdk.width = ns.width; \
-  gdk.height = ns.height; \
-  PR_END_MACRO
-
-#define NSCOLOR_TO_GDKCOLOR(n,g) \
-  PR_BEGIN_MACRO \
-  g.red = 256 * NS_GET_R(n); \
-  g.green = 256 * NS_GET_G(n); \
-  g.blue = 256 * NS_GET_B(n); \
-  PR_END_MACRO
-
-#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
-
-
-/**
- * Base of all GTK+ native widgets.
- */
-
-class nsWidget : public nsBaseWidget
-{
-public:
-  nsWidget();
-  virtual ~nsWidget();
-
-  NS_IMETHOD            Create(nsIWidget *aParent,
-                               const nsRect &aRect,
-                               EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext *aContext,
-                               nsIAppShell *aAppShell = nsnull,
-                               nsIToolkit *aToolkit = nsnull,
-                               nsWidgetInitData *aInitData = nsnull);
-  NS_IMETHOD            Create(nsNativeWidget aParent,
-                               const nsRect &aRect,
-                               EVENT_CALLBACK aHandleEventFunction,
-                               nsIDeviceContext *aContext,
-                               nsIAppShell *aAppShell = nsnull,
-                               nsIToolkit *aToolkit = nsnull,
-                               nsWidgetInitData *aInitData = nsnull);
-
-  NS_IMETHOD Destroy(void);
-  nsIWidget* GetParent(void);
-
-  NS_IMETHOD SetModal(PRBool aModal);
-  NS_IMETHOD Show(PRBool state);
-  NS_IMETHOD CaptureRollupEvents(nsIRollupListener *aListener, PRBool aDoCapture, PRBool aConsumeRollupEvent);
-  NS_IMETHOD IsVisible(PRBool &aState);
-
-  NS_IMETHOD Move(PRInt32 aX, PRInt32 aY);
-  NS_IMETHOD Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
-  NS_IMETHOD Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth,
-                    PRInt32 aHeight, PRBool aRepaint);
-
-  NS_IMETHOD Enable(PRBool aState);
-  NS_IMETHOD SetFocus(void);
-
-  PRBool OnResize(nsSizeEvent event);
-  virtual PRBool OnResize(nsRect &aRect);
-  virtual PRBool OnMove(PRInt32 aX, PRInt32 aY);
-
-  nsIFontMetrics *GetFont(void);
-  NS_IMETHOD SetFont(const nsFont &aFont);
-
-  NS_IMETHOD SetBackgroundColor(const nscolor &aColor);
-
-  NS_IMETHOD SetCursor(nsCursor aCursor);
-
-  NS_IMETHOD SetColorMap(nsColorMap *aColorMap);
-
-  void* GetNativeData(PRUint32 aDataType);
-
-  NS_IMETHOD GetAbsoluteBounds(nsRect &aRect);
-  NS_IMETHOD WidgetToScreen(const nsRect &aOldRect, nsRect &aNewRect);
-  NS_IMETHOD ScreenToWidget(const nsRect &aOldRect, nsRect &aNewRect);
-
-  NS_IMETHOD BeginResizingChildren(void);
-  NS_IMETHOD EndResizingChildren(void);
-
-  NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight);
-  NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight);
-
-  // Use this to set the name of a widget for normal widgets.. not the same as the nsWindow version
-  NS_IMETHOD SetTitle(const nsString& aTitle);
-
-
-  virtual void ConvertToDeviceCoordinates(nscoord &aX, nscoord &aY);
-
-  // the following are nsWindow specific, and just stubbed here
-  NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect) { return NS_ERROR_FAILURE; }
-  NS_IMETHOD SetMenuBar(nsIMenuBar *aMenuBar) { return NS_ERROR_FAILURE; }
-  NS_IMETHOD ShowMenuBar(PRBool aShow) { return NS_ERROR_FAILURE; }
-  // *could* be done on a widget, but that would be silly wouldn't it?
-  NS_IMETHOD CaptureMouse(PRBool aCapture) { return NS_ERROR_FAILURE; }
-
-
-  NS_IMETHOD Invalidate(PRBool aIsSynchronous);
-  NS_IMETHOD Invalidate(const nsRect &aRect, PRBool aIsSynchronous);
-  NS_IMETHOD InvalidateRegion(const nsIRegion *aRegion, PRBool aIsSynchronous);
-  NS_IMETHOD Update(void);
-  NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus);
-
-  void InitEvent(nsGUIEvent& event, PRUint32 aEventType, nsPoint* aPoint = nsnull);
-    
-  // Utility functions
-
-  void       HandleEvent(GdkEvent *event);
-  PRBool     ConvertStatus(nsEventStatus aStatus);
-  PRBool     DispatchMouseEvent(nsMouseEvent& aEvent);
-  PRBool     DispatchStandardEvent(PRUint32 aMsg);
-  PRBool     DispatchFocus(nsGUIEvent &aEvent);
-
-  // are we a "top level" widget?
-  PRBool     mIsToplevel;
-
-#ifdef DEBUG
-  void IndentByDepth(FILE* out);
-#endif
-
-  // Return the Gdk window used for rendering
-  virtual GdkWindow * GetRenderWindow(GtkObject * aGtkWidget);
-
-protected:
-
-  virtual void InitCallbacks(char * aName = nsnull);
-  virtual void OnDestroy();
-
-  NS_IMETHOD CreateNative(GtkObject *parentWindow) { return NS_OK; }
-
-  nsresult CreateWidget(nsIWidget *aParent,
-                        const nsRect &aRect,
-                        EVENT_CALLBACK aHandleEventFunction,
-                        nsIDeviceContext *aContext,
-                        nsIAppShell *aAppShell,
-                        nsIToolkit *aToolkit,
-                        nsWidgetInitData *aInitData,
-                        nsNativeWidget aNativeParent = nsnull);
-
-
-  PRBool DispatchWindowEvent(nsGUIEvent* event);
-
-  // Return the Gdk window whose background should change
-  virtual GdkWindow *GetWindowForSetBackground();
-
-  // Sets font for widgets
-  virtual void SetFontNative(GdkFont *aFont);
-  // Sets backround for widgets
-  virtual void SetBackgroundColorNative(GdkColor *aColorNor,
-                                        GdkColor *aColorBri,
-                                        GdkColor *aColorDark);
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK signal installers
-  //
-  //////////////////////////////////////////////////////////////////
-  void InstallMotionNotifySignal(GtkWidget * aWidget);
-
-  void InstallDragMotionSignal(GtkWidget * aWidget);
-  void InstallDragLeaveSignal(GtkWidget * aWidget);
-  void InstallDragBeginSignal(GtkWidget * aWidget);
-  void InstallDragDropSignal(GtkWidget * aWidget);
-
-  void InstallEnterNotifySignal(GtkWidget * aWidget);
-
-  void InstallLeaveNotifySignal(GtkWidget * aWidget);
-
-  void InstallButtonPressSignal(GtkWidget * aWidget);
-
-  void InstallButtonReleaseSignal(GtkWidget * aWidget);
-
-  virtual
-  void InstallFocusInSignal(GtkWidget * aWidget);
-
-  virtual
-  void InstallFocusOutSignal(GtkWidget * aWidget);
-
-  void InstallRealizeSignal(GtkWidget * aWidget);
-
-  void AddToEventMask(GtkWidget * aWidget,
-                      gint        aEventMask);
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // OnSomething handlers
-  //
-  //////////////////////////////////////////////////////////////////
-  virtual void OnMotionNotifySignal(GdkEventMotion * aGdkMotionEvent);
-  virtual void OnDragMotionSignal(GdkDragContext *aGdkDragContext,
-                                  gint            x,
-                                  gint            y,
-                                  guint           time);
-/* OnDragEnterSignal is not a real signal.. it is only called from OnDragMotionSignal */
-  virtual void OnDragEnterSignal(GdkDragContext *aGdkDragContext,
-                                 gint            x,
-                                 gint            y,
-                                 guint           time);
-  virtual void OnDragLeaveSignal(GdkDragContext   *context,
-                                 guint             time);
-  virtual void OnDragBeginSignal(GdkDragContext *aGdkDragContext);
-  virtual void OnDragDropSignal(GdkDragContext *aGdkDragContext,
-                                gint            x,
-                                gint            y,
-                                guint           time);
-  virtual void OnEnterNotifySignal(GdkEventCrossing * aGdkCrossingEvent);
-  virtual void OnLeaveNotifySignal(GdkEventCrossing * aGdkCrossingEvent);
-  virtual void OnButtonPressSignal(GdkEventButton * aGdkButtonEvent);
-  virtual void OnButtonReleaseSignal(GdkEventButton * aGdkButtonEvent);
-  virtual void OnFocusInSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void OnFocusOutSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void OnRealize(GtkWidget *aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  // Static method used to trampoline to OnDestroySignal
-  static gint  DestroySignal(GtkWidget *      aGtkWidget,
-                             nsWidget*        aWidget);
-
-  static void  SuppressModality(PRBool aSuppress);
-
-
-public:
-  PRBool          mIMEEnable;
-  PRUnichar*      mIMECompositionUniString;
-  PRInt32         mIMECompositionUniStringSize;
-  void            SetXICSpotLocation(nsPoint aPoint);
-
-
-
-protected:
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK widget signals
-  //
-  //////////////////////////////////////////////////////////////////
-
-  static gint MotionNotifySignal(GtkWidget *       aWidget,
-                                 GdkEventMotion *  aGdkMotionEvent,
-                                 gpointer          aData);
-
-  static gint DragMotionSignal(GtkWidget *       aWidget,
-                               GdkDragContext   *context,
-                               gint             x,
-                               gint             y,
-                               guint            time,
-                               void             *data);
-
-  static void DragLeaveSignal(GtkWidget *      aWidget,
-                              GdkDragContext   *aDragContext,
-                              guint            time,
-                              void             *aData);
-
-  static gint DragBeginSignal(GtkWidget *       aWidget,
-                              GdkDragContext   *context,
-                              gint             x,
-                              gint             y,
-                              guint            time,
-                              void             *data);
-
-  static gint DragDropSignal(GtkWidget *      aWidget,
-                             GdkDragContext   *context,
-                             gint             x,
-                             gint             y,
-                             guint            time,
-                             void             *data);
-
-
-
-  static gint EnterNotifySignal(GtkWidget *        aWidget, 
-                                GdkEventCrossing * aGdkCrossingEvent, 
-                                gpointer           aData);
-  
-  static gint LeaveNotifySignal(GtkWidget *        aWidget, 
-                                GdkEventCrossing * aGdkCrossingEvent, 
-                                gpointer           aData);
-
-  static gint ButtonPressSignal(GtkWidget *      aWidget, 
-                                GdkEventButton * aGdkButtonEvent, 
-                                gpointer         aData);
-
-  static gint ButtonReleaseSignal(GtkWidget *      aWidget, 
-                                  GdkEventButton * aGdkButtonEvent, 
-                                  gpointer         aData);
-
-  static gint RealizeSignal(GtkWidget *      aWidget, 
-                            gpointer         aData);
-
-
-  static gint FocusInSignal(GtkWidget *      aWidget, 
-                            GdkEventFocus *  aGdkFocusEvent, 
-                            gpointer         aData);
-
-  static gint FocusOutSignal(GtkWidget *      aWidget, 
-                             GdkEventFocus *  aGdkFocusEvent, 
-                             gpointer         aData);
-
-protected:
-
-  //////////////////////////////////////////////////////////////////
-  //
-  // GTK event support methods
-  //
-  //////////////////////////////////////////////////////////////////
-  void InstallSignal(GtkWidget *   aWidget,
-                     gchar *       aSignalName,
-                     GtkSignalFunc aSignalFunction);
-  
-  PRBool DropEvent(GtkWidget * aWidget, 
-                   GdkWindow * aEventWindow);
-  
-  void InitMouseEvent(GdkEventButton * aGdkButtonEvent,
-                      nsMouseEvent &   anEvent,
-                      PRUint32         aEventType);
-
-#ifdef DEBUG
-  nsCAutoString  debug_GetName(GtkObject * aGtkWidget);
-  nsCAutoString  debug_GetName(GtkWidget * aGtkWidget);
-  PRInt32       debug_GetRenderXID(GtkObject * aGtkWidget);
-  PRInt32       debug_GetRenderXID(GtkWidget * aGtkWidget);
-#endif
-
-  guint32 mGrabTime;
-  GtkWidget *mWidget;
-  // our mozbox for those native widgets
-  GtkWidget *mMozBox;
-
-  nsIWidget *mParent;
-
-  // This is the composite update area (union of all the calls to
-  // Invalidate)
-  nsIRegion *mUpdateArea;
-
-  PRBool mShown;
-
-  PRUint32 mPreferredWidth, mPreferredHeight;
-  PRBool       mListenForResizes;
-
-  GdkICPrivate *mIC;
-  GdkICPrivate *GetXIC();
-  void SetXIC(GdkICPrivate *aIC);
-  void GetXYFromPosition(unsigned long *aX, unsigned long *aY);
-
-  // this is the rollup listener variables
-  static nsIRollupListener *gRollupListener;
-  static nsIWidget         *gRollupWidget;
-  static PRBool             gRollupConsumeRollupEvent;
-
-private:
-  PRBool mIsDragDest;
-  static nsILookAndFeel *sLookAndFeel;
-  static PRUint32 sWidgetCount;
-
-  //
-  // Keep track of the last widget being "dragged"
-  //
-  static nsWidget *sButtonMotionTarget;
-  static gint sButtonMotionRootX;
-  static gint sButtonMotionRootY;
-  static gint sButtonMotionWidgetX;
-  static gint sButtonMotionWidgetY;
-};
-
-#endif /* nsWidget_h__ */

mozilla/widget/src/gtk/nsWidgetFactory.cpp

@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIFactory.h"
-#include "nsISupports.h"
-#include "nsIButton.h"
-#include "nsITextWidget.h"
-#include "nsWidgetsCID.h"
-
-#include "nsToolkit.h"
-#include "nsWindow.h"
-#include "nsAppShell.h"
-#include "nsButton.h"
-#include "nsScrollbar.h"
-#include "nsCheckButton.h"
-#include "nsRadioButton.h"
-#include "nsTextWidget.h"
-#include "nsTextAreaWidget.h"
-#include "nsFileWidget.h"
-#include "nsFileSpecWithUIImpl.h"
-#include "nsListBox.h"
-#include "nsComboBox.h"
-#include "nsLookAndFeel.h"
-#include "nsLabel.h"
-#ifdef LOSER
-#include "nsMenuBar.h"
-#include "nsMenu.h"
-#include "nsMenuItem.h"
-#include "nsPopUpMenu.h"
-#include "nsContextMenu.h"
-#endif
-#include "nsFontRetrieverService.h"
-
-// Drag & Drop, Clipboard
-#include "nsClipboard.h"
-#include "nsTransferable.h"
-#include "nsXIFFormatConverter.h"
-#include "nsDragService.h"
-
-#include "nsSound.h"
-
-static NS_DEFINE_IID(kCWindow,        NS_WINDOW_CID);
-static NS_DEFINE_IID(kCChild,         NS_CHILD_CID);
-static NS_DEFINE_IID(kCButton,        NS_BUTTON_CID);
-static NS_DEFINE_IID(kCCheckButton,   NS_CHECKBUTTON_CID);
-static NS_DEFINE_IID(kCCombobox,      NS_COMBOBOX_CID);
-static NS_DEFINE_IID(kCFileOpen,      NS_FILEWIDGET_CID);
-static NS_DEFINE_IID(kCListbox,       NS_LISTBOX_CID);
-static NS_DEFINE_IID(kCRadioButton,   NS_RADIOBUTTON_CID);
-static NS_DEFINE_IID(kCHorzScrollbar, NS_HORZSCROLLBAR_CID);
-static NS_DEFINE_IID(kCVertScrollbar, NS_VERTSCROLLBAR_CID);
-static NS_DEFINE_IID(kCTextArea,      NS_TEXTAREA_CID);
-static NS_DEFINE_IID(kCTextField,     NS_TEXTFIELD_CID);
-static NS_DEFINE_IID(kCAppShell,      NS_APPSHELL_CID);
-static NS_DEFINE_IID(kCToolkit,       NS_TOOLKIT_CID);
-static NS_DEFINE_IID(kCLookAndFeel,   NS_LOOKANDFEEL_CID);
-static NS_DEFINE_IID(kCLabel,         NS_LABEL_CID);
-#if 0
-static NS_DEFINE_IID(kCMenuBar,       NS_MENUBAR_CID);
-static NS_DEFINE_IID(kCMenu,          NS_MENU_CID);
-static NS_DEFINE_IID(kCMenuItem,      NS_MENUITEM_CID);
-static NS_DEFINE_IID(kCPopUpMenu,     NS_POPUPMENU_CID);
-static NS_DEFINE_IID(kCContextMenu,   NS_CONTEXTMENU_CID);
-#endif
-static NS_DEFINE_IID(kCFontRetrieverService,    NS_FONTRETRIEVERSERVICE_CID);
-
-// Drag & Drop, Clipboard
-static NS_DEFINE_IID(kCDataObj,       NS_DATAOBJ_CID);
-static NS_DEFINE_IID(kCClipboard,     NS_CLIPBOARD_CID);
-static NS_DEFINE_IID(kCTransferable,  NS_TRANSFERABLE_CID);
-static NS_DEFINE_IID(kCDataFlavor,    NS_DATAFLAVOR_CID);
-static NS_DEFINE_IID(kCXIFFormatConverter,  NS_XIFFORMATCONVERTER_CID);
-static NS_DEFINE_IID(kCDragService,   NS_DRAGSERVICE_CID);
-
-static NS_DEFINE_IID(kISupportsIID,   NS_ISUPPORTS_IID);
-static NS_DEFINE_IID(kIFactoryIID,    NS_IFACTORY_IID);
-
-// Sound services (just Beep for now)
-static NS_DEFINE_CID(kCSound,   NS_SOUND_CID);
-static NS_DEFINE_CID(kCFileSpecWithUI,   NS_FILESPECWITHUI_CID);
-
-
-class nsWidgetFactory : public nsIFactory
-{   
-public:   
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_NSIFACTORY
-
-    nsWidgetFactory(const nsCID &aClass);   
-    virtual ~nsWidgetFactory();   
-private:
-  nsCID mClassID;
-
-};   
-
-
-
-nsWidgetFactory::nsWidgetFactory(const nsCID &aClass)   
-{   
-    NS_INIT_ISUPPORTS();
-    mClassID = aClass;
-}   
-
-nsWidgetFactory::~nsWidgetFactory()   
-{   
-}   
-
-NS_IMPL_ISUPPORTS(nsWidgetFactory, NS_GET_IID(nsIFactory))
-
-nsresult nsWidgetFactory::CreateInstance(nsISupports *aOuter,  
-                                          const nsIID &aIID,  
-                                          void **aResult)  
-{  
-    if (aResult == NULL) {  
-        return NS_ERROR_NULL_POINTER;  
-    }  
-
-    *aResult = NULL;  
-
-    if (nsnull != aOuter)
-      return NS_ERROR_NO_AGGREGATION;
-  
-    nsISupports *inst = nsnull;
-    if (mClassID.Equals(kCWindow)) {
-      inst = (nsISupports *)new nsWindow();
-    }
-    else if (mClassID.Equals(kCChild)) {
-      inst = (nsISupports *)new ChildWindow();
-    }
-    else if (mClassID.Equals(kCButton)) {
-      inst = (nsISupports*)(nsWidget *)new nsButton();
-    }
-    else if (mClassID.Equals(kCCheckButton)) {
-        inst = (nsISupports*)(nsWidget *)new nsCheckButton();
-    }
-    else if (mClassID.Equals(kCCombobox)) {
-        inst = (nsISupports*)(nsWidget *)new nsComboBox();
-    }
-    else if (mClassID.Equals(kCRadioButton)) {
-        inst = (nsISupports*)(nsWidget *)new nsRadioButton();
-    }
-    else if (mClassID.Equals(kCFileOpen)) {
-        inst = (nsISupports*)new nsFileWidget();
-    }
-    else if (mClassID.Equals(kCListbox)) {
-        inst = (nsISupports*)(nsWidget *)new nsListBox();
-    }
-    else if (mClassID.Equals(kCHorzScrollbar)) {
-        inst = (nsISupports*)(nsWidget *)new nsScrollbar(PR_FALSE);
-    }
-    else if (mClassID.Equals(kCVertScrollbar)) {
-        inst = (nsISupports*)(nsWidget *)new nsScrollbar(PR_TRUE);
-    }
-    else if (mClassID.Equals(kCTextArea)) {
-        inst = (nsISupports*)(nsWidget *)new nsTextAreaWidget();
-    }
-    else if (mClassID.Equals(kCTextField)) {
-        inst = (nsISupports*)(nsWidget *)new nsTextWidget();
-    }
-    else if (mClassID.Equals(kCAppShell)) {
-        inst = (nsISupports*)new nsAppShell();
-    }
-    else if (mClassID.Equals(kCToolkit)) {
-        inst = (nsISupports*)(nsWidget *)new nsToolkit();
-    }
-    else if (mClassID.Equals(kCLookAndFeel)) {
-        inst = (nsISupports*)(nsWidget *)new nsLookAndFeel();
-    }
-    else if (mClassID.Equals(kCLabel)) {
-        inst = (nsISupports*)(nsWidget *)new nsLabel();
-    }
-#if 0
-    else if (mClassID.Equals(kCMenuBar)) {
-        inst = (nsISupports*)(nsIMenuBar *)new nsMenuBar();
-    }
-    else if (mClassID.Equals(kCMenu)) {
-        inst = (nsISupports*)(nsIMenu *)new nsMenu();
-    }
-    else if (mClassID.Equals(kCMenuItem)) {
-        inst = (nsISupports*)(nsIMenuItem *)new nsMenuItem();
-    }
-    else if (mClassID.Equals(kCPopUpMenu)) {
-        inst = (nsISupports*)new nsPopUpMenu();
-    }
-    /*
-    else if (mClassID.Equals(kCContextMenu)) {
-        inst = (nsISupports*)(nsIContextMenu*)new nsContextMenu();
-    }
-    */
-#endif
-    else if (mClassID.Equals(kCSound)) {
-    	nsISound* aSound = nsnull;
-    	NS_NewSound(&aSound);
-        inst = (nsISupports*) aSound;
-    }
-    else if (mClassID.Equals(kCTransferable)) {
-        inst = (nsISupports*)new nsTransferable();
-    }
-    else if (mClassID.Equals(kCClipboard)) {
-        inst = (nsISupports*)new nsClipboard();
-    }
-    else if (mClassID.Equals(kCXIFFormatConverter))
-        inst = (nsISupports*)new nsXIFFormatConverter();
-    else if (mClassID.Equals(kCFontRetrieverService))
-        inst = (nsISupports*)(nsIFontRetrieverService *) new nsFontRetrieverService();
-    else if (mClassID.Equals(kCDragService))
-        inst = (nsISupports*) (nsIDragService *) new nsDragService();
-    else if (mClassID.Equals(kCFileSpecWithUI))
-    	inst = (nsISupports*) (nsIFileSpecWithUI *) new nsFileSpecWithUIImpl;
-    else {
-        printf("nsWidgetFactory::CreateInstance(), unhandled class.\n");
-    }
-  
-    if (inst == NULL) {  
-        return NS_ERROR_OUT_OF_MEMORY;  
-    }  
-
-    NS_ADDREF(inst);
-    nsresult res = inst->QueryInterface(aIID, aResult);
-    NS_RELEASE(inst);
-
-    return res;
-
-}  
-
-nsresult nsWidgetFactory::LockFactory(PRBool aLock)  
-{  
-    // Not implemented in simplest case.  
-    return NS_OK;
-}  
-
-// return the proper factory to the caller
-extern "C" NS_WIDGET nsresult 
-NSGetFactory(nsISupports* serviceMgr,
-             const nsCID &aClass,
-             const char *aClassName,
-             const char *aProgID,
-             nsIFactory **aFactory)
-{
-    if (nsnull == aFactory) {
-        return NS_ERROR_NULL_POINTER;
-    }
-
-    *aFactory = new nsWidgetFactory(aClass);
-
-    if (nsnull == aFactory) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
-}
-
-

mozilla/widget/src/gtk/nsWindow.h

@@ -1,211 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsWindow_h__
-#define nsWindow_h__
-
-
-
-#include "nsISupports.h"
-
-#include "nsWidget.h"
-
-#include "nsString.h"
-
-#include "gtkmozarea.h"
-#include "gdksuperwin.h"
-
-class nsFont;
-class nsIAppShell;
-
-/**
- * Native GTK++ window wrapper.
- */
-
-class nsWindow : public nsWidget
-{
-
-public:
-      // nsIWidget interface
-
-  nsWindow();
-  virtual ~nsWindow();
-
-  NS_IMETHOD           WidgetToScreen(const nsRect &aOldRect, nsRect &aNewRect);
-
-  NS_IMETHOD           PreCreateWidget(nsWidgetInitData *aWidgetInitData);
-
-  virtual void*        GetNativeData(PRUint32 aDataType);
-
-  NS_IMETHOD           Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect);
-  NS_IMETHOD           ScrollRect(nsRect &aSrcRect, PRInt32 aDx, PRInt32 aDy);
-
-  NS_IMETHOD           SetTitle(const nsString& aTitle);
-  NS_IMETHOD           Show(PRBool aShow);
-  NS_IMETHOD           CaptureMouse(PRBool aCapture);
-
-  NS_IMETHOD           Move(PRInt32 aX, PRInt32 aY);
-
-  NS_IMETHOD           Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint);
-  NS_IMETHOD           Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth,
-                              PRInt32 aHeight, PRBool aRepaint);
-
-  NS_IMETHOD           BeginResizingChildren(void);
-  NS_IMETHOD           EndResizingChildren(void);
-  NS_IMETHOD           Destroy(void);
-
-#ifdef USE_SUPERWIN
-  NS_IMETHOD           GetAbsoluteBounds(nsRect &aRect);
-  NS_IMETHOD           CaptureRollupEvents(nsIRollupListener * aListener,
-                                           PRBool aDoCapture,
-                                           PRBool aConsumeRollupEvent);
-  NS_IMETHOD           Invalidate(PRBool aIsSynchronous);
-  NS_IMETHOD           Invalidate(const nsRect &aRect, PRBool aIsSynchronous);
-  NS_IMETHOD           SetBackgroundColor(const nscolor &aColor);
-  NS_IMETHOD           SetCursor(nsCursor aCursor);
-  NS_IMETHOD           SetFocus(void);
-  void                 QueueDraw();
-  void                 UnqueueDraw();
-  void                 DoPaint(PRInt32 x, PRInt32 y, PRInt32 width, PRInt32 height,
-                               nsIRegion *aClipRegion);
-  static gboolean      UpdateIdle (gpointer data);
-  NS_IMETHOD           Update(void);
-  virtual void         OnFocusInSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void         OnFocusOutSignal(GdkEventFocus * aGdkFocusEvent);
-  virtual void         InstallFocusInSignal(GtkWidget * aWidget);
-  virtual void         InstallFocusOutSignal(GtkWidget * aWidget);
-#endif /* USE_SUPERWIN */
-
-  gint                 ConvertBorderStyles(nsBorderStyle bs);
-
-  // Add an XATOM property to this window.
-  void                 StoreProperty(char *property, unsigned char *data);
-
-  virtual PRBool IsChild() const;
-
-  void SetIsDestroying(PRBool val) {
-    mIsDestroyingWindow = val;
-  }
-
-  PRBool IsDestroying() const {
-    return mIsDestroyingWindow;
-  }
-
-  // Utility methods
-  virtual  PRBool OnExpose(nsPaintEvent &event);
-  virtual  PRBool OnDraw(nsPaintEvent &event);
-
-  PRBool   OnKey(nsKeyEvent &aEvent);
-  virtual  PRBool OnScroll(nsScrollbarEvent & aEvent, PRUint32 cPos);
-  // in nsWidget now
-  //    virtual  PRBool OnResize(nsSizeEvent &aEvent);
-  
-  static void SuperWinFilter(GdkSuperWin *superwin, XEvent *event, gpointer p);
-  
-  void HandleXlibExposeEvent(XEvent *event);
-  void HandleXlibConfigureNotifyEvent(XEvent *event);
-  void HandleXlibButtonEvent(XButtonEvent *aButtonEvent);
-  void HandleXlibMotionNotifyEvent(XMotionEvent *aMotionEvent);
-  void HandleXlibCrossingEvent(XCrossingEvent * aCrossingEvent);
- 
-  // Return the GtkMozArea that is the nearest parent of this widget
-  GtkWidget *GetMozArea();
-
-  // Return the Gdk window used for rendering
-  virtual GdkWindow * GetRenderWindow(GtkObject * aGtkWidget);
-  //  XXX Chris - fix these
-  //  virtual void OnButtonPressSignal(GdkEventButton * aGdkButtonEvent);
-
-protected:
-
-  //////////////////////////////////////////////////////////////////////
-  //
-  // Draw signal
-  // 
-  //////////////////////////////////////////////////////////////////////
-  void InitDrawEvent(GdkRectangle * aArea,
-                     nsPaintEvent & aPaintEvent,
-                     PRUint32       aEventType);
-
-  void UninitDrawEvent(GdkRectangle * area,
-                       nsPaintEvent & aPaintEvent,
-                       PRUint32       aEventType);
-  
-  static gint DrawSignal(GtkWidget *    aWidget,
-                         GdkRectangle * aArea,
-                         gpointer       aData);
-
-  virtual gint OnDrawSignal(GdkRectangle * aArea);
-  virtual void OnRealize(GtkWidget *aWidget);
-
-  virtual void OnDestroySignal(GtkWidget* aGtkWidget);
-
-  //////////////////////////////////////////////////////////////////////
-
-  virtual void InitCallbacks(char * aName = nsnull);
-  NS_IMETHOD CreateNative(GtkObject *parentWidget);
-
-  nsIFontMetrics *mFontMetrics;
-  PRBool      mVisible;
-  PRBool      mDisplayed;
-  PRBool      mIsDestroyingWindow;
-  PRBool      mIsTooSmall;
-
-  // XXX Temporary, should not be caching the font
-  nsFont *    mFont;
-
-  // Resize event management
-  nsRect mResizeRect;
-  int    mResized;
-  PRBool mLowerLeft;
-
-  GtkWidget *mShell;  /* used for toplevel windows */
-  GdkSuperWin *mSuperWin;
-  GtkWidget   *mMozArea;
-  GtkWidget   *mMozAreaClosestParent;
-
-  nsIMenuBar *mMenuBar;
-private:
-  nsresult     SetIcon(GdkPixmap *window_pixmap, 
-                       GdkBitmap *window_mask);
-  nsresult     SetIcon();
-  PRBool       mIsUpdating;
-  // this is the current GdkSuperWin with the focus
-  static nsWindow  *focusWindow;
-  // when this is PR_TRUE we will block focus
-  // events to prevent recursion
-  PRBool       mBlockFocusEvents;
-};
-
-//
-// A child window is a window with different style
-//
-class ChildWindow : public nsWindow {
-public:
-  ChildWindow();
-  ~ChildWindow();
-  virtual PRBool IsChild() const;
-#ifndef USE_SUPERWIN
-  NS_IMETHOD Destroy(void);
-#endif
-};
-
-#endif // Window_h__

mozilla/xpcom/ds/MANIFEST

@@ -0,0 +1,30 @@
+nsAVLTree.h
+nsCppSharedAllocator.h
+nsCRT.h
+nsDeque.h
+nsEnumeratorUtils.h
+nsHashtable.h
+nsHashtableEnumerator.h
+nsIArena.h
+nsIBuffer.h
+nsIByteBuffer.h
+nsIObserverList.h
+nsIPageManager.h
+nsIProperties.h
+nsISimpleEnumerator.h
+nsISizeOfHandler.h
+nsIUnicharBuffer.h
+nsIVariant.h
+nsInt64.h
+nsQuickSort.h
+nsStr.h
+nsString.h
+nsString2.h
+nsSupportsPrimitives.h
+nsTime.h
+nsUnitConversion.h
+nsVector.h
+nsVoidArray.h
+nsXPIDLString.h
+plvector.h
+nsTextFormater.h

mozilla/xpcom/ds/MANIFEST_IDL

@@ -0,0 +1,6 @@
+nsIAtom.idl
+nsICollection.idl
+nsIEnumerator.idl
+nsIObserver.idl
+nsIObserverService.idl
+nsISupportsArray.idl

mozilla/xpcom/ds/Makefile.in

@@ -0,0 +1,113 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xpcom
+XPIDL_MODULE	= xpcom_ds
+LIBRARY_NAME	= xpcomds_s
+
+REQUIRES	= xpcom uconv unicharutil
+
+CPPSRCS		= \
+		nsArena.cpp \
+		nsAtomTable.cpp \
+		nsAVLTree.cpp \
+		nsByteBuffer.cpp \
+		nsCRT.cpp \
+		nsConjoiningEnumerator.cpp \
+		nsDeque.cpp \
+		nsEmptyEnumerator.cpp \
+		nsEnumeratorUtils.cpp \
+		nsHashtable.cpp \
+		nsHashtableEnumerator.cpp \
+		nsObserver.cpp \
+		nsObserverList.cpp \
+		nsObserverService.cpp \
+		nsProperties.cpp \
+		nsQuickSort.cpp \
+		nsSizeOfHandler.cpp \
+		nsStr.cpp \
+		nsString.cpp \
+		nsString2.cpp \
+		nsSupportsArray.cpp \
+		nsSupportsArrayEnumerator.cpp \
+		nsSupportsPrimitives.cpp \
+		nsUnicharBuffer.cpp \
+		nsVariant.cpp \
+		nsVoidArray.cpp \
+		nsXPIDLString.cpp \
+		plvector.cpp \
+		nsTextFormater.cpp \
+		$(NULL)
+
+EXPORTS		= \
+		nsAVLTree.h \
+		nsCppSharedAllocator.h \
+		nsCRT.h \
+		nsDeque.h \
+		nsEnumeratorUtils.h \
+		nsHashtable.h \
+		nsHashtableEnumerator.h \
+		nsIArena.h \
+		nsIByteBuffer.h \
+		nsIObserverList.h \
+		nsIProperties.h \
+		nsISimpleEnumerator.h \
+		nsISizeOfHandler.h \
+		nsIUnicharBuffer.h \
+		nsIVariant.h \
+		nsInt64.h \
+		nsQuickSort.h \
+		nsStr.h \
+		nsString.h \
+		nsString2.h \
+		nsSupportsPrimitives.h \
+		nsTime.h \
+		nsUnitConversion.h \
+		nsVector.h \
+		nsVoidArray.h \
+		nsXPIDLString.h \
+		plvector.h \
+		nsTextFormater.h \
+		$(NULL)			
+
+XPIDLSRCS	= \
+		nsIAtom.idl \
+		nsICollection.idl \
+		nsIEnumerator.idl \
+		nsIObserver.idl \
+		nsIObserverService.idl \
+		nsISupportsArray.idl \
+		nsISupportsPrimitives.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_COM -D_IMPL_NS_BASE
+

mozilla/xpcom/ds/bufferRoutines.h

@@ -0,0 +1,758 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/******************************************************************************************
+  MODULE NOTES:
+
+  This file contains the workhorse copy and shift functions used in nsStrStruct.
+  Ultimately, I plan to make the function pointers in this system available for 
+  use by external modules. They'll be able to install their own "handlers".
+  Not so, today though.
+
+*******************************************************************************************/
+
+#ifndef _BUFFERROUTINES_H
+#define _BUFFERROUTINES_H
+
+#include "nsCRT.h"
+
+#ifndef RICKG_TESTBED
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+#endif
+
+#define KSHIFTLEFT  (0)
+#define KSHIFTRIGHT (1)
+
+
+inline PRUnichar GetUnicharAt(const char* aString,PRUint32 anIndex) {
+  return ((PRUnichar*)aString)[anIndex];
+}
+
+inline PRUnichar GetCharAt(const char* aString,PRUint32 anIndex) {
+  return (PRUnichar)aString[anIndex];
+}
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to shift the contents of a char buffer.
+//  The functions are differentiated by shift direction and the underlying charsize.
+//
+
+/**
+ * This method shifts single byte characters left by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where left-shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char*   dst = aDest+anOffset;
+  char*   src = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-(aCount+anOffset));
+}
+
+/**
+ * This method shifts single byte characters right by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  char* src = aDest+anOffset;
+  char* dst = aDest+anOffset+aCount;
+
+  memmove(dst,src,aLength-anOffset);
+}
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "cut"
+ */
+void ShiftDoubleCharsLeft(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* dst = root+anOffset;
+  PRUnichar* src = root+anOffset+aCount;
+
+  memmove(dst,src,(aLength-(aCount+anOffset))*sizeof(PRUnichar));
+}
+
+
+/**
+ * This method shifts unicode characters by a given amount from an given offset.
+ * @update	gess 01/04/99
+ * @param   aDest is a ptr to a cstring where the shift is to be performed
+ * @param   aLength is the known length of aDest
+ * @param   anOffset is the index into aDest where shifting shall begin
+ * @param   aCount is the number of chars to be "inserted"
+ */
+void ShiftDoubleCharsRight(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* root=(PRUnichar*)aDest;
+  PRUnichar* src = root+anOffset;
+  PRUnichar* dst = root+anOffset+aCount;
+
+  memmove(dst,src,sizeof(PRUnichar)*(aLength-anOffset));
+}
+
+
+typedef void (*ShiftChars)(char* aDest,PRUint32 aLength,PRUint32 anOffset,PRUint32 aCount);
+ShiftChars gShiftChars[2][2]= {
+  {&ShiftCharsLeft,&ShiftCharsRight},
+  {&ShiftDoubleCharsLeft,&ShiftDoubleCharsRight}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to copy one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * Going 1 to 1 is easy, since we assume ascii. No conversions are necessary.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  char* dst = aDest+anDestOffset;
+  char* src = (char*)aSource+anOffset;
+
+  memcpy(dst,src,aCount);
+} 
+
+/**
+ * Going 1 to 2 requires a conversion from ascii to unicode. This can be expensive.
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars1To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  const unsigned char* first= (const unsigned char*)aSource+anOffset;
+  const unsigned char* last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    *to=(PRUnichar)(*first);  
+    to++;
+    first++;
+  }
+}
+ 
+
+/**
+ * Going 2 to 1 requires a conversion from unicode down to ascii. This can be lossy.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To1(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  char*             to   = aDest+anDestOffset;
+  PRUnichar*        theSource=(PRUnichar*)aSource;
+  const PRUnichar*  first= theSource+anOffset;
+  const PRUnichar*  last = first+aCount;
+
+  //now loop over characters, shifting them left...
+  while(first<last) {
+    if(*first<256)
+      *to=(char)*first;  
+    else *to='.';
+    to++;
+    first++;
+  }
+}
+
+/**
+ * Going 2 to 2 is fast and efficient.
+ * @update	gess 01/04/99
+ * @param aDest is the destination buffer
+ * @param aDestOffset is the pos to start copy to in the dest buffer
+ * @param aSource is the source buffer
+ * @param anOffset is the offset to start copying from in the source buffer
+ * @param aCount is the (max) number of chars to copy
+ */
+void CopyChars2To2(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount) { 
+  PRUnichar* theDest=(PRUnichar*)aDest;
+  PRUnichar* to   = theDest+anDestOffset;
+  PRUnichar* theSource=(PRUnichar*)aSource;
+  PRUnichar* from= theSource+anOffset;
+
+  memcpy((void*)to,(void*)from,aCount*sizeof(PRUnichar));
+}
+
+
+//--------------------------------------------------------------------------------------
+
+
+typedef void (*CopyChars)(char* aDest,PRInt32 anDestOffset,const char* aSource,PRUint32 anOffset,PRUint32 aCount);
+
+CopyChars gCopyChars[2][2]={
+  {&CopyChars1To1,&CopyChars1To2},
+  {&CopyChars2To1,&CopyChars2To2}
+};
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to search a buffer looking for a char.
+//
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar1(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  if(aIgnoreCase) {
+    char theChar=(char)nsCRT::ToUpper(aChar);
+    const char* ptr=aDest+(anOffset-1);
+    const char* last=aDest+aLength;
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-aDest;
+    }
+  }
+  else {
+
+    const char* ptr = aDest+anOffset;
+    char theChar=(char)aChar;
+    const char* result=(const char*)memchr(ptr, theChar,aLength-anOffset);
+    if(result) {
+      return result-aDest;
+    }
+  }
+  return kNotFound;
+}
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 FindChar2(const char* aDest,PRUint32 aLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  const PRUnichar*  root=(PRUnichar*)aDest;
+  const PRUnichar*  ptr=root+(anOffset-1);
+  const PRUnichar*  last=root+aLength;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    while(++ptr<last){
+      if(nsCRT::ToUpper(*ptr)==theChar)
+        return ptr-root;
+    }
+  }
+  else {
+    while(++ptr<last){
+      if(*ptr==aChar)
+        return (ptr-root);
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer (in reverse) for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar1(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+  PRInt32 theIndex=0;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(aDest[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(aDest[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+
+/**
+ *  This methods cans the given buffer for the given char
+ *  
+ *  @update  gess 3/25/98
+ *  @param   aDest is the buffer to be searched
+ *  @param   aLength is the size (in char-units, not bytes) of the buffer
+ *  @param   anOffset is the start pos to begin searching
+ *  @param   aChar is the target character we're looking for
+ *  @param   aIgnorecase tells us whether to use a case sensitive search
+ *  @return  index of pos if found, else -1 (kNotFound)
+ */
+inline PRInt32 RFindChar2(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase) {
+
+  PRInt32 theIndex=0;
+  PRUnichar*  theBuf=(PRUnichar*)aDest;
+
+  if(aIgnoreCase) {
+    PRUnichar theChar=nsCRT::ToUpper(aChar);
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(nsCRT::ToUpper(theBuf[theIndex])==theChar)
+        return theIndex;
+    }
+  }
+  else {
+    for(theIndex=(PRInt32)anOffset;theIndex>=0;theIndex--){
+      if(theBuf[theIndex]==aChar)
+        return theIndex;
+    }
+  }
+
+  return kNotFound;
+}
+
+typedef PRInt32 (*FindChars)(const char* aDest,PRUint32 aDestLength,PRUint32 anOffset,const PRUnichar aChar,PRBool aIgnoreCase);
+FindChars gFindChars[]={&FindChar1,&FindChar2};
+FindChars gRFindChars[]={&RFindChar1,&RFindChar2};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to compare one buffer onto another.
+//  The functions are differentiated by the size of source and dest character sizes.
+//  WARNING: Your destination buffer MUST be big enough to hold all the source bytes.
+//           We don't validate these ranges here (this should be done in higher level routines).
+//
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp(aStr1,aStr2,aCount);
+  else result=strncmp(aStr1,aStr2,aCount);
+  return result;
+}
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result=0;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,(PRUnichar*)aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare2To1(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr1,aStr2,aCount);
+  else result=nsCRT::strncmp((PRUnichar*)aStr1,aStr2,aCount);
+  return result;
+}
+
+
+/**
+ * This method compares the data in one buffer with another
+ * @update	gess 01/04/99
+ * @param   aStr1 is the first buffer to be compared
+ * @param   aStr2 is the 2nd buffer to be compared
+ * @param   aCount is the number of chars to compare
+ * @param   aIgnorecase tells us whether to use a case-sensitive comparison
+ * @return  -1,0,1 depending on <,==,>
+ */
+PRInt32 Compare1To2(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase){ 
+  PRInt32 result;
+  if(aIgnoreCase)
+    result=nsCRT::strncasecmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  else result=nsCRT::strncmp((PRUnichar*)aStr2,aStr1,aCount)*-1;
+  return result;
+}
+
+
+typedef PRInt32 (*CompareChars)(const char* aStr1,const char* aStr2,PRUint32 aCount,PRBool aIgnoreCase);
+CompareChars gCompare[2][2]={
+  {&Compare1To1,&Compare1To2},
+  {&Compare2To1,&Compare2To2},
+};
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used to convert the case of strings...
+//
+
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase1(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRInt32 result=0;
+
+  typedef char  chartype;
+  chartype* cp = (chartype*)aString;
+  chartype* end = cp + aCount-1;
+  while (cp <= end) {
+    chartype ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+  return result;
+}
+
+//----------------------------------------------------------------------------------------
+
+#ifndef RICKG_TESTBED
+class HandleCaseConversionShutdown3 : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown3(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown3(void) {}
+   NS_DECL_ISUPPORTS
+};
+
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+static NS_DEFINE_IID(kICaseConversionIID, NS_ICASECONVERSION_IID);
+static NS_DEFINE_IID(kIShutdownListenerIID, NS_ISHUTDOWNLISTENER_IID);
+static nsICaseConversion * gCaseConv = 0; 
+
+NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, kIShutdownListenerIID);
+
+nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) {
+    if (cid.Equals(kUnicharUtilCID)) {
+        NS_ASSERTION(service == gCaseConv, "wrong service!");
+        if(gCaseConv){
+          gCaseConv->Release();
+          gCaseConv = 0;
+        }
+    }
+    return NS_OK;
+}
+
+
+class CCaseConversionServiceInitializer {
+public:
+  CCaseConversionServiceInitializer(){
+    mListener = new HandleCaseConversionShutdown3();
+    if(mListener){
+      mListener->AddRef();
+      nsServiceManager::GetService(kUnicharUtilCID, kICaseConversionIID,(nsISupports**) &gCaseConv, mListener);
+    }
+  }
+protected:
+  HandleCaseConversionShutdown3* mListener;
+};
+
+#endif
+
+//----------------------------------------------------------------------------------------
+
+/**
+ * This method performs a case conversion the data in the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be case shifted
+ * @param   aCount is the number of chars to compare
+ * @param   aToUpper tells us whether to convert to upper or lower
+ * @return  0
+ */
+PRInt32 ConvertCase2(char* aString,PRUint32 aCount,PRBool aToUpper){ 
+  PRUnichar* cp = (PRUnichar*)aString;
+  PRUnichar* end = cp + aCount-1;
+  PRInt32 result=0;
+
+#ifndef RICKG_TESTBED
+  static CCaseConversionServiceInitializer  gCaseConversionServiceInitializer;
+
+  // I18N code begin
+  if(gCaseConv) {
+    nsresult err=(aToUpper) ? gCaseConv->ToUpper(cp, cp, aCount) : gCaseConv->ToLower(cp, cp, aCount);
+    if(NS_SUCCEEDED(err))
+      return 0;
+  }
+  // I18N code end
+#endif
+
+
+  while (cp <= end) {
+    PRUnichar ch = *cp;
+    if(aToUpper) {
+      if ((ch >= 'a') && (ch <= 'z')) {
+        *cp = 'A' + (ch - 'a');
+      }
+    }
+    else {
+      if ((ch >= 'A') && (ch <= 'Z')) {
+        *cp = 'a' + (ch - 'A');
+      }
+    }
+    cp++;
+  }
+
+  return result;
+}
+
+typedef PRInt32 (*CaseConverters)(char*,PRUint32,PRBool);
+CaseConverters gCaseConverters[]={&ConvertCase1,&ConvertCase2};
+
+
+
+//----------------------------------------------------------------------------------------
+//
+//  This set of methods is used compress char sequences in a buffer...
+//
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  from = aString;
+  chartype*  end =  aString + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method compresses duplicate runs of a given char from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 CompressChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  from = (chartype*)aString;
+  chartype*  end =  from + aLength-1;
+  chartype*  to = from;
+
+    //this code converts /n, /t, /r into normal space ' ';
+    //it also compresses runs of whitespace down to a single char...
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (from <= end) {
+      chartype theChar = *from++;
+      if(kNotFound!=FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++=theChar;
+        while (from <= end) {
+          theChar = *from++;
+          if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+            *to++ = theChar;
+            break;
+          }
+        }
+      } else {
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*CompressChars)(char* aString,PRUint32 aCount,const char* aSet);
+CompressChars gCompressChars[]={&CompressChars1,&CompressChars2};
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars1(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef char  chartype;
+  chartype*  to   = aString;
+  chartype*  from = aString-1;
+  chartype*  end  = aString + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+
+/**
+ * This method strips chars in a given set from the given buffer 
+ *
+ * @update	gess 01/04/99
+ * @param   aString is the buffer to be manipulated
+ * @param   aLength is the length of the buffer
+ * @param   aSet tells us which chars to compress from given buffer
+ * @param   aEliminateLeading tells us whether to strip chars from the start of the buffer
+ * @param   aEliminateTrailing tells us whether to strip chars from the start of the buffer
+ * @return  the new length of the given buffer
+ */
+PRInt32 StripChars2(char* aString,PRUint32 aLength,const char* aSet){ 
+
+  typedef PRUnichar  chartype;
+  chartype*  to   = (chartype*)aString;
+  chartype*  from = (chartype*)aString-1;
+  chartype*  end  = to + aLength;
+
+  if(aSet && aString && (0 < aLength)){
+    PRUint32 aSetLen=strlen(aSet);
+    while (++from < end) {
+      chartype theChar = *from;
+      if(kNotFound==FindChar1(aSet,aSetLen,0,theChar,PR_FALSE)){
+        *to++ = theChar;
+      }
+    }
+    *to = 0;
+  }
+  return to - (chartype*)aString;
+}
+
+typedef PRInt32 (*StripChars)(char* aString,PRUint32 aCount,const char* aSet);
+StripChars gStripChars[]={&StripChars1,&StripChars2};
+
+#endif

mozilla/xpcom/ds/makefile.win

@@ -0,0 +1,120 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+
+DEPTH=..\..
+MODULE = xpcom 
+
+################################################################################
+## exports
+
+EXPORTS =                          \
+        nsTextFormater.h           \
+        nsAVLTree.h                \
+        nsCppSharedAllocator.h     \
+        nsCRT.h                    \
+        nsDeque.h                  \
+        nsEnumeratorUtils.h        \
+        nsHashtable.h              \
+        nsHashtableEnumerator.h    \
+        nsIArena.h                 \
+        nsIByteBuffer.h            \
+        nsIObserverList.h          \
+        nsIProperties.h            \
+        nsISimpleEnumerator.h      \
+        nsISizeOfHandler.h         \
+        nsIUnicharBuffer.h         \
+        nsIVariant.h               \
+        nsInt64.h                  \
+        nsQuickSort.h              \
+        nsStr.h                    \
+        nsString.h                 \
+        nsString2.h                \
+        nsSupportsPrimitives.h     \
+        nsTime.h                   \
+        nsUnitConversion.h         \
+        nsVector.h                 \
+        nsVoidArray.h              \
+        nsXPIDLString.h            \
+        plvector.h                 \
+        $(NULL)			
+
+XPIDL_MODULE = xpcom_ds
+
+XPIDLSRCS =                         \
+        .\nsIAtom.idl               \
+        .\nsICollection.idl         \
+        .\nsIEnumerator.idl         \
+	.\nsIObserver.idl           \
+	.\nsIObserverService.idl    \
+	.\nsISupportsArray.idl	    \
+	.\nsISupportsPrimitives.idl \
+        $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=xpcomds_s
+
+LINCS =                         \
+	-I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\uconv       \
+        -I$(PUBLIC)\unicharutil \
+	$(NULL)
+
+LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+
+CPP_OBJS =                                        \
+        .\$(OBJDIR)\nsTextFormater.obj            \
+        .\$(OBJDIR)\nsArena.obj                   \
+        .\$(OBJDIR)\nsAtomTable.obj               \
+        .\$(OBJDIR)\nsAVLTree.obj                 \
+        .\$(OBJDIR)\nsByteBuffer.obj              \
+        .\$(OBJDIR)\nsCRT.obj                     \
+        .\$(OBJDIR)\nsConjoiningEnumerator.obj    \
+        .\$(OBJDIR)\nsDeque.obj                   \
+        .\$(OBJDIR)\nsEmptyEnumerator.obj         \
+        .\$(OBJDIR)\nsEnumeratorUtils.obj         \
+        .\$(OBJDIR)\nsHashtable.obj               \
+        .\$(OBJDIR)\nsHashtableEnumerator.obj     \
+        .\$(OBJDIR)\nsObserver.obj                \
+        .\$(OBJDIR)\nsObserverList.obj            \
+        .\$(OBJDIR)\nsObserverService.obj         \
+        .\$(OBJDIR)\nsProperties.obj              \
+        .\$(OBJDIR)\nsQuickSort.obj               \
+        .\$(OBJDIR)\nsSizeOfHandler.obj           \
+        .\$(OBJDIR)\nsStr.obj                     \
+        .\$(OBJDIR)\nsString.obj                  \
+        .\$(OBJDIR)\nsString2.obj                 \
+        .\$(OBJDIR)\nsSupportsArray.obj           \
+        .\$(OBJDIR)\nsSupportsArrayEnumerator.obj \
+        .\$(OBJDIR)\nsSupportsPrimitives.obj      \
+        .\$(OBJDIR)\nsUnicharBuffer.obj           \
+        .\$(OBJDIR)\nsVariant.obj                 \
+        .\$(OBJDIR)\nsVoidArray.obj               \
+        .\$(OBJDIR)\nsXPIDLString.obj             \
+        .\$(OBJDIR)\plvector.obj                  \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpcom/ds/nsAVLTree.cpp

@@ -0,0 +1,617 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAVLTree.h"
+ 
+
+enum eLean      {eLeft,eNeutral,eRight};
+
+struct NS_COM nsAVLNode {
+public:
+
+  nsAVLNode(void* aValue) {
+    mLeft=0;
+    mRight=0;
+    mSkew=eNeutral;
+    mValue=aValue;
+  }
+
+  nsAVLNode*  mLeft;
+  nsAVLNode*  mRight;
+  eLean       mSkew;
+  void*       mValue;
+};
+
+
+/************************************************************
+  Now begin the tree class. Don't forget that the comparison
+  between nodes must occur via the comparitor function, 
+  otherwise all you're testing is pointer addresses.
+ ************************************************************/
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+nsAVLTree::nsAVLTree(nsAVLNodeComparitor& aComparitor, 
+                     nsAVLNodeFunctor* aDeallocator) :
+  mComparitor(aComparitor), mDeallocator(aDeallocator) {
+  mRoot=0;
+  mCount=0;
+}
+
+
+static void 
+avlDeleteTree(nsAVLNode* aNode){
+  if (aNode) {
+    avlDeleteTree(aNode->mLeft);
+    avlDeleteTree(aNode->mRight);
+    delete aNode;
+  }
+}
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+nsAVLTree::~nsAVLTree(){
+  if (mDeallocator) {
+    ForEachDepthFirst(*mDeallocator);
+  }
+  avlDeleteTree(mRoot);
+}
+
+
+class CDoesntExist: public nsAVLNodeFunctor {
+public:
+  CDoesntExist(const nsAVLTree& anotherTree) : mOtherTree(anotherTree) {
+  }
+  virtual void* operator()(void* anItem) {
+    void* result=mOtherTree.FindItem(anItem);
+    if(result)
+      return nsnull;
+    return anItem;
+  }
+protected:
+  const nsAVLTree& mOtherTree;
+};
+
+/**
+ * This method compares two trees (members by identity).
+ * @update	gess12/27/98
+ * @param   tree to compare against
+ * @return  true if they are identical (contain same stuff).
+ */
+PRBool nsAVLTree::operator==(const nsAVLTree& aCopy) const{
+  CDoesntExist functor(aCopy);
+  void* theItem=FirstThat(functor);
+  PRBool result=PRBool(!theItem);
+  return result;
+}
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateRight(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mRight;
+  if(ptr2->mSkew==eRight) {
+    aRootNode->mRight=ptr2->mLeft;
+    ptr2->mLeft=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mLeft;
+    ptr2->mLeft=ptr3->mRight;
+    ptr3->mRight=ptr2;
+    aRootNode->mRight=ptr3->mLeft;
+    ptr3->mLeft=aRootNode;
+    if(ptr3->mSkew==eLeft)
+      ptr2->mSkew=eRight;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eRight)
+      aRootNode->mSkew=eLeft;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+
+/**
+ * 
+ * @update	gess12/27/98
+ * @param 
+ * @return
+ */
+static void 
+avlRotateLeft(nsAVLNode*& aRootNode){
+  nsAVLNode* ptr2;
+  nsAVLNode* ptr3;
+
+  ptr2=aRootNode->mLeft;
+  if(ptr2->mSkew==eLeft) {
+    aRootNode->mLeft=ptr2->mRight;
+    ptr2->mRight=aRootNode;
+    aRootNode->mSkew=eNeutral;
+    aRootNode=ptr2;
+  }
+  else {
+    ptr3=ptr2->mRight;
+    ptr2->mRight=ptr3->mLeft;
+    ptr3->mLeft=ptr2;
+    aRootNode->mLeft=ptr3->mRight;
+    ptr3->mRight=aRootNode;
+    if(ptr3->mSkew==eRight)
+      ptr2->mSkew=eLeft;
+    else ptr2->mSkew=eNeutral;
+    if(ptr3->mSkew==eLeft)
+      aRootNode->mSkew=eRight;
+    else aRootNode->mSkew=eNeutral;
+    aRootNode=ptr3;
+  }
+  aRootNode->mSkew=eNeutral;
+  return;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlInsert(nsAVLNode*& aRootNode, nsAVLNode* aNewNode, 
+          nsAVLNodeComparitor& aComparitor) {
+  eAVLStatus result=eAVL_unknown;
+  
+  if(!aRootNode) {
+    aRootNode = aNewNode;
+    return eAVL_ok;
+  }
+  
+  if(aNewNode==aRootNode->mValue) {
+    return eAVL_duplicate;
+  }
+
+  PRInt32 theCompareResult=aComparitor(aRootNode->mValue,aNewNode->mValue);
+  if(0 < theCompareResult) { //if(anItem<aRootNode->mValue)
+    result=avlInsert(aRootNode->mLeft,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          avlRotateLeft(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eRight:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eLeft;
+          break;
+      } //switch
+    }//if
+  } //if
+  else { 
+    result=avlInsert(aRootNode->mRight,aNewNode,aComparitor);
+    if(eAVL_ok==result) {
+      switch(aRootNode->mSkew){
+        case eLeft:
+          aRootNode->mSkew=eNeutral;
+          result=eAVL_fail;
+          break;
+        case eRight:
+          avlRotateRight(aRootNode);
+          result=eAVL_fail;
+          break;
+        case eNeutral:
+          aRootNode->mSkew=eRight;
+          break;
+      } //switch
+    }
+  } //if
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceLeft(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      ptr2=aRootNode->mLeft;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eRight) {
+        aRootNode->mLeft=ptr2->mRight;
+        ptr2->mRight=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eLeft;
+          ptr2->mSkew=eRight;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mRight;
+        balnc3=ptr3->mSkew;
+        ptr2->mRight=ptr3->mLeft;
+        ptr3->mLeft=ptr2;
+        aRootNode->mLeft=ptr3->mRight;
+        ptr3->mRight=aRootNode;
+        if(balnc3==eRight) {
+          ptr2->mSkew=eLeft;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eLeft) {
+          aRootNode->mSkew=eRight;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eRight:
+      aRootNode->mSkew=eNeutral;
+      break;
+    
+    case eNeutral:
+      aRootNode->mSkew=eLeft;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static void 
+avlBalanceRight(nsAVLNode*& aRootNode, PRBool& delOk){
+  nsAVLNode*  ptr2;
+  nsAVLNode*  ptr3;
+  eLean       balnc2;
+  eLean       balnc3;
+
+  switch(aRootNode->mSkew){
+    case eLeft:
+      aRootNode->mSkew=eNeutral;
+      break;
+
+    case eRight:
+      ptr2=aRootNode->mRight;
+      balnc2=ptr2->mSkew;
+      if(balnc2!=eLeft) {
+        aRootNode->mRight=ptr2->mLeft;
+        ptr2->mLeft=aRootNode;
+        if(balnc2==eNeutral){
+          aRootNode->mSkew=eRight;
+          ptr2->mSkew=eLeft;
+          delOk=PR_FALSE;
+        }
+        else{
+          aRootNode->mSkew=eNeutral;
+          ptr2->mSkew=eNeutral;
+        }
+        aRootNode=ptr2;
+      }
+      else{
+        ptr3=ptr2->mLeft;
+        balnc3=ptr3->mSkew;
+        ptr2->mLeft=ptr3->mRight;
+        ptr3->mRight=ptr2;
+        aRootNode->mRight=ptr3->mLeft;
+        ptr3->mLeft=aRootNode;
+        if(balnc3==eLeft) {
+          ptr2->mSkew=eRight;
+        }
+        else {
+          ptr2->mSkew=eNeutral;
+        }
+        if(balnc3==eRight) {
+          aRootNode->mSkew=eLeft;
+        }
+        else {
+          aRootNode->mSkew=eNeutral;
+        }
+        aRootNode=ptr3;
+        ptr3->mSkew=eNeutral;
+      }
+      break;
+
+    case eNeutral:
+      aRootNode->mSkew=eRight;
+      delOk=PR_FALSE;
+      break;
+  }//switch
+  return;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemoveChildren(nsAVLNode*& aRootNode,nsAVLNode*& anotherNode, PRBool& delOk){
+  eAVLStatus result=eAVL_ok;
+  
+  if(!anotherNode->mRight){
+    aRootNode->mValue=anotherNode->mValue; //swap
+    anotherNode=anotherNode->mLeft;
+    delOk=PR_TRUE;
+  }
+  else{
+    avlRemoveChildren(aRootNode,anotherNode->mRight,delOk);
+    if(delOk)
+      avlBalanceLeft(anotherNode,delOk);
+  }
+
+  return result;
+}
+
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+static eAVLStatus 
+avlRemove(nsAVLNode*& aRootNode, void* anItem, PRBool& delOk,
+          nsAVLNodeComparitor& aComparitor){
+  eAVLStatus result=eAVL_ok;
+
+  if(!aRootNode)
+    delOk=PR_FALSE;
+  else {
+    PRInt32 cmp=aComparitor(anItem,aRootNode->mValue);
+    if(cmp<0){
+      avlRemove(aRootNode->mLeft,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceRight(aRootNode,delOk);
+    }
+    else if(cmp>0){
+      avlRemove(aRootNode->mRight,anItem,delOk,aComparitor);
+      if(delOk)
+        avlBalanceLeft(aRootNode,delOk);
+    }
+    else{ //they match...
+      nsAVLNode* temp=aRootNode;
+      if(!aRootNode->mRight) {
+        aRootNode=aRootNode->mLeft;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else if(!aRootNode->mLeft) {
+        aRootNode=aRootNode->mRight;
+        delOk=PR_TRUE;
+        delete temp;
+      }
+      else {
+        avlRemoveChildren(aRootNode,aRootNode->mLeft,delOk);
+        if(delOk)
+          avlBalanceRight(aRootNode,delOk);
+      }
+    }
+  }
+
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+eAVLStatus 
+nsAVLTree::AddItem(void* anItem){
+  eAVLStatus result=eAVL_ok;
+
+  nsAVLNode* theNewNode=new nsAVLNode(anItem);
+  result=avlInsert(mRoot,theNewNode,mComparitor);
+  if(eAVL_duplicate!=result)
+    mCount++;
+  else {
+    delete theNewNode;
+  }
+  return result;
+}
+
+/** ------------------------------------------------
+ * 
+ * 
+ * @update gess 4/22/98
+ * @param  
+ * @return 
+ */ //----------------------------------------------
+void* nsAVLTree::FindItem(void* aValue) const{
+  nsAVLNode* result=mRoot;
+  PRInt32 count=0;
+  while(result) {
+    count++;
+    PRInt32 cmp=mComparitor(aValue,result->mValue);
+    if(0==cmp) {
+      //we matched...
+      break;
+    }
+    else if(0>cmp){
+      //theNode was greater...
+      result=result->mLeft;
+    }
+    else {
+      //aValue is greater...
+      result=result->mRight;
+    }
+  }
+  if(result) {
+    return result->mValue;
+  }
+  return nsnull;
+}
+
+
+/**
+ * 
+ * @update	gess12/30/98
+ * @param 
+ * @return
+ */
+eAVLStatus 
+nsAVLTree::RemoveItem(void* aValue){
+  PRBool delOk=PR_TRUE;
+  eAVLStatus result=avlRemove(mRoot,aValue,delOk,mComparitor);
+  if(eAVL_ok==result)
+    mCount--;
+  return result;
+} 
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEachDepthFirst(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor){
+  if(aNode) {
+    avlForEachDepthFirst(aNode->mLeft,aFunctor);
+    avlForEachDepthFirst(aNode->mRight,aFunctor);
+    aFunctor(aNode->mValue);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEachDepthFirst(mRoot,aFunctor);
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void 
+avlForEach(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  if(aNode) {
+    avlForEach(aNode->mLeft,aFunctor);
+    aFunctor(aNode->mValue);
+    avlForEach(aNode->mRight,aFunctor);
+  }
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void 
+nsAVLTree::ForEach(nsAVLNodeFunctor& aFunctor) const{
+  ::avlForEach(mRoot,aFunctor);
+}
+
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+static void* 
+avlFirstThat(nsAVLNode* aNode, nsAVLNodeFunctor& aFunctor) {
+  void* result=nsnull;
+  if(aNode) {
+    result = avlFirstThat(aNode->mLeft,aFunctor);
+    if (result) {
+      return result;
+    }
+    result = aFunctor(aNode->mValue);
+    if (result) {
+      return result;
+    }
+    result = avlFirstThat(aNode->mRight,aFunctor);
+  }
+  return result;
+}
+
+/**
+ * 
+ * @update	gess9/11/98
+ * @param 
+ * @return
+ */
+void* 
+nsAVLTree::FirstThat(nsAVLNodeFunctor& aFunctor) const{
+  return ::avlFirstThat(mRoot,aFunctor);
+}
+

mozilla/xpcom/ds/nsAVLTree.h

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAVLTree_h___
+#define nsAVLTree_h___
+
+
+#include "nscore.h"
+
+
+enum eAVLStatus {eAVL_unknown,eAVL_ok,eAVL_fail,eAVL_duplicate};
+
+
+struct nsAVLNode;
+
+/**
+ * 
+ * @update	gess12/26/98
+ * @param anObject1 is the first object to be compared
+ * @param anObject2 is the second object to be compared
+ * @return -1,0,1 if object1 is less, equal, greater than object2
+ */
+class NS_COM nsAVLNodeComparitor {
+public:
+  virtual PRInt32 operator()(void* anItem1,void* anItem2)=0;
+}; 
+
+class NS_COM nsAVLNodeFunctor {
+public:
+  virtual void* operator()(void* anItem)=0;
+};
+
+class NS_COM nsAVLTree {
+public:
+              nsAVLTree(nsAVLNodeComparitor& aComparitor, nsAVLNodeFunctor* aDeallocator);
+              ~nsAVLTree(void);
+
+  PRBool      operator==(const nsAVLTree& aOther) const;
+  PRInt32     GetCount(void) const {return mCount;}
+
+              //main functions...
+  eAVLStatus  AddItem(void* anItem);
+  eAVLStatus  RemoveItem(void* anItem);
+  void*       FindItem(void* anItem) const;
+  void        ForEach(nsAVLNodeFunctor& aFunctor) const;
+  void        ForEachDepthFirst(nsAVLNodeFunctor& aFunctor) const;
+  void*       FirstThat(nsAVLNodeFunctor& aFunctor) const;
+
+protected: 
+
+  nsAVLNode*  mRoot;
+  PRInt32     mCount;
+  nsAVLNodeComparitor&  mComparitor;
+  nsAVLNodeFunctor*     mDeallocator;
+};
+
+
+#endif /* nsAVLTree_h___ */
+

mozilla/xpcom/ds/nsArena.cpp

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsArena.h"
+#include "nsCRT.h"
+
+ArenaImpl::ArenaImpl(void)
+  : mInitialized(PR_FALSE)
+{
+  NS_INIT_REFCNT();
+  nsCRT::memset(&mPool, 0, sizeof(PLArenaPool));
+}
+
+NS_IMETHODIMP
+ArenaImpl::Init(PRUint32 aBlockSize)
+{
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+  mInitialized = PR_TRUE;
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS1(ArenaImpl, nsIArena)
+
+ArenaImpl::~ArenaImpl()
+{
+  if (mInitialized)
+    PL_FinishArenaPool(&mPool);
+
+  mInitialized = PR_FALSE;
+}
+
+NS_IMETHODIMP_(void*)
+ArenaImpl::Alloc(PRUint32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRUint32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_METHOD
+ArenaImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+  
+  ArenaImpl* it = new ArenaImpl();
+  if (nsnull == it)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_COM nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRUint32 aArenaBlockSize)
+{
+  nsresult rv;
+  nsIArena* arena;
+  rv = ArenaImpl::Create(NULL, nsIArena::GetIID(), (void**)&arena);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = arena->Init(aArenaBlockSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(arena);
+    return rv;
+  }    
+  
+  *aInstancePtrResult = arena;
+  return rv;
+}

mozilla/xpcom/ds/nsArena.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsArena_h__
+#define nsArena_h__
+
+#include "nsIArena.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(void);
+  virtual ~ArenaImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 arenaBlockSize);
+
+  NS_IMETHOD_(void*) Alloc(PRUint32 size);
+
+protected:
+  PLArenaPool mPool;
+  PRUint32 mBlockSize;
+
+private:
+  PRBool mInitialized;
+};
+
+#endif // nsArena_h__

mozilla/xpcom/ds/nsAtomTable.cpp

@@ -0,0 +1,172 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsAtomTable.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+static PRIntn
+DumpAtomLeaks(PLHashEntry *he, PRIntn index, void *arg)
+{
+  AtomImpl* atom = (AtomImpl*) he->value;
+  if (atom) {
+    nsAutoString tmp;
+    atom->ToString(tmp);
+    fputs(tmp, stdout);
+    fputs("\n", stdout);
+  }
+  return HT_ENUMERATE_NEXT;
+}
+#endif
+
+NS_COM void NS_PurgeAtomTable(void)
+{
+  if (gAtomHashTable) {
+#if defined(DEBUG) && (defined(XP_UNIX) || defined(XP_PC))
+    if (gAtoms) {
+      if (getenv("MOZ_DUMP_ATOM_LEAKS")) {
+        printf("*** leaking %d atoms\n", gAtoms);
+        PL_HashTableEnumerateEntries(gAtomHashTable, DumpAtomLeaks, 0);
+      }
+    }
+#endif
+    PL_HashTableDestroy(gAtomHashTable);
+    gAtomHashTable = nsnull;
+  }
+}
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+NS_IMPL_ISUPPORTS1(AtomImpl, nsIAtom)
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) ::operator new(size);
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+NS_IMETHODIMP 
+AtomImpl::ToString(nsString& aBuf) /*FIX: const */
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+  return NS_OK;
+}
+
+NS_IMETHODIMP 
+AtomImpl::GetUnicode(const PRUnichar **aResult) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mString;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler, PRUint32* _retval) /*FIX: const */
+{
+  NS_ENSURE_ARG_POINTER(_retval);
+  PRUint32 sum = sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar);
+  *_retval = sum;
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashValue(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_COM nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_COM nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRUint32 uslen;
+  PRUint32 hashCode = nsCRT::HashValue(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_COM nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/xpcom/ds/nsAtomTable.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsAtomTable_h__
+#define nsAtomTable_h__
+
+#include "nsIAtom.h"
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  virtual ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIATOM
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  void operator delete(void* ptr) {
+    ::operator delete(ptr);
+  }
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+#endif // nsAtomTable_h__

mozilla/xpcom/ds/nsBuffer.cpp

@@ -0,0 +1,723 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsBuffer.h"
+#include "nsAutoLock.h"
+#include "nsCRT.h"
+#include "nsIInputStream.h"
+#include "nsIServiceManager.h"
+#include "nsIPageManager.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsBuffer::nsBuffer()
+    : mGrowBySize(0),
+      mMaxSize(0),
+      mAllocator(nsnull),
+      mObserver(nsnull),
+      mBufferSize(0),
+      mReadSegment(nsnull),
+      mReadCursor(0),
+      mWriteSegment(nsnull),
+      mWriteCursor(0),
+      mReaderClosed(PR_FALSE),
+      mCondition(NS_OK)
+{
+    NS_INIT_REFCNT();
+    PR_INIT_CLIST(&mSegments);
+}
+
+NS_IMETHODIMP
+nsBuffer::Init(PRUint32 growBySize, PRUint32 maxSize,
+               nsIBufferObserver* observer, nsIAllocator* allocator)
+{
+    NS_ASSERTION(sizeof(PRCList) <= SEGMENT_OVERHEAD,
+                 "need to change SEGMENT_OVERHEAD size");
+    NS_ASSERTION(growBySize > SEGMENT_OVERHEAD, "bad growBySize");
+    mGrowBySize = growBySize;
+    mMaxSize = maxSize;
+    mObserver = observer;
+    NS_IF_ADDREF(mObserver);
+    mAllocator = allocator;
+    NS_ADDREF(mAllocator);
+    return NS_OK;
+}
+
+nsBuffer::~nsBuffer()
+{
+    // Free any allocated pages...
+    while (!PR_CLIST_IS_EMPTY(&mSegments)) {
+        PRCList* header = (PRCList*)mSegments.next;
+        char* segment = (char*)header;
+
+        PR_REMOVE_LINK(header);     // unlink from mSegments
+        (void) mAllocator->Free(segment);
+    }
+
+    NS_IF_RELEASE(mObserver);
+    NS_IF_RELEASE(mAllocator);
+}
+
+NS_IMPL_ISUPPORTS1(nsBuffer, nsIBuffer)
+
+NS_METHOD
+nsBuffer::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aOuter)
+        return NS_ERROR_NO_AGGREGATION;
+
+    nsBuffer* buf = new nsBuffer();
+    if (buf == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    NS_ADDREF(buf);
+    nsresult rv = buf->QueryInterface(aIID, aResult);
+    NS_RELEASE(buf);
+    return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsresult
+nsBuffer::PushWriteSegment()
+{
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    if (mBufferSize >= mMaxSize) {
+        if (mObserver) {
+            nsresult rv = mObserver->OnFull(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+
+    // allocate a new segment to write into
+    PRCList* header;
+
+    header = (PRCList*)mAllocator->Alloc(mGrowBySize);
+    if (header == nsnull) 
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    mBufferSize += mGrowBySize;
+
+    PR_INSERT_BEFORE(header, &mSegments);       // insert at end
+
+    // initialize the write segment
+    mWriteSegment = header;
+    mWriteSegmentEnd = (char*)mWriteSegment + mGrowBySize;
+    mWriteCursor = (char*)mWriteSegment + sizeof(PRCList);
+
+    return NS_OK;
+}
+
+nsresult
+nsBuffer::PopReadSegment()
+{
+    nsresult rv;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    PRCList* header = (PRCList*)mSegments.next;
+    char* segment = (char*)header;
+
+    NS_ASSERTION(mReadSegment == header, "wrong segment");
+
+    // make sure that the writer isn't still in this segment (that the
+    // reader is removing)
+    NS_ASSERTION(!(segment <= mWriteCursor && mWriteCursor < segment + mGrowBySize),
+                 "removing writer's segment");
+
+    PR_REMOVE_LINK(header);     // unlink from mSegments
+
+    mBufferSize -= mGrowBySize;
+
+    rv = mAllocator->Free(segment);
+    if (NS_FAILED(rv)) return rv;
+
+    // initialize the read segment
+    if (PR_CLIST_IS_EMPTY(&mSegments)) {
+        mReadSegment = nsnull;
+        mReadSegmentEnd = nsnull;
+        mReadCursor = nsnull;
+        if (mObserver) {
+            rv = mObserver->OnEmpty(this);
+            if (NS_FAILED(rv)) return rv;
+        }
+        return NS_BASE_STREAM_WOULD_BLOCK;
+    }
+    else {
+        mReadSegment = mSegments.next;
+        mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+        mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+    }
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIBuffer methods:
+
+NS_IMETHODIMP
+nsBuffer::ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                       PRUint32 *readCount)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    nsresult rv = NS_OK;
+    PRUint32 readBufferLen;
+    const char* readBuffer;
+
+    *readCount = 0;
+    while (count > 0) {
+        rv = GetReadSegment(0, &readBuffer, &readBufferLen);
+        if (NS_FAILED(rv) || readBufferLen == 0) {
+            return *readCount == 0 ? rv : NS_OK;
+        }
+
+        readBufferLen = PR_MIN(readBufferLen, count);
+        while (readBufferLen > 0) {
+            PRUint32 writeCount;
+            rv = writer(closure, readBuffer, *readCount, readBufferLen, &writeCount);
+			NS_ASSERTION(rv != NS_BASE_STREAM_EOF, "Write should not return EOF");
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || NS_FAILED(rv) || writeCount == 0) {
+                // if we failed to write just report what we were
+                // able to read so far
+                return *readCount == 0 ? rv : NS_OK;
+            }
+            NS_ASSERTION(writeCount <= readBufferLen, "writer returned bad writeCount");
+            readBuffer += writeCount;
+            readBufferLen -= writeCount;
+            *readCount += writeCount;
+            count -= writeCount;
+
+            if (mReadCursor + writeCount == mReadSegmentEnd) {
+                rv = PopReadSegment();
+                if (NS_FAILED(rv)) {
+                    return *readCount == 0 ? rv : NS_OK;
+                }
+            }
+            else {
+                mReadCursor += writeCount;
+            }
+        }
+    }
+    return NS_OK;
+}
+
+static NS_METHOD
+nsWriteToRawBuffer(void* closure,
+                   const char* fromRawSegment,
+                   PRUint32 offset,
+                   PRUint32 count,
+                   PRUint32 *writeCount)
+{
+    char* toBuf = (char*)closure;
+    nsCRT::memcpy(&toBuf[offset], fromRawSegment, count);
+    *writeCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount)
+{
+    return ReadSegments(nsWriteToRawBuffer, toBuf, bufLen, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadSegment(PRUint32 segmentLogicalOffset, 
+                         const char* *resultSegment,
+                         PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+
+    // set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            *resultSegmentLen = 0;
+            *resultSegment = nsnull;
+            return mCondition;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    PRInt32 offset = (PRInt32)segmentLogicalOffset;
+    while (offset >= 0) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                // don't continue past the write segment
+                *resultSegmentLen = 0;
+                *resultSegment = nsnull;
+                return mCondition;
+            }
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            if (offset < amt) {
+                // segmentLogicalOffset is in this segment, so read up to its end
+                *resultSegmentLen = amt - offset;
+                *resultSegment = curSegStart + offset;
+                return NS_OK;
+            }
+            else {
+                curSeg = PR_NEXT_LINK(curSeg);
+                if (curSeg == mReadSegment) {
+                    // been all the way around
+                    *resultSegmentLen = 0;
+                    *resultSegment = nsnull;
+                    return mCondition;
+                }
+                curSegEnd = (char*)curSeg + mGrowBySize;
+                curSegStart = (char*)curSeg + sizeof(PRCList);
+                offset -= amt;
+            }
+        }
+    }
+    NS_NOTREACHED("nsBuffer::GetReadSegment failed");
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReadableAmount(PRUint32 *result)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsAutoCMonitor mon(this);
+    *result = 0; 
+
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (PR_CLIST_IS_EMPTY(&mSegments)) {
+            return NS_OK;
+        }
+        else {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    // now search for the segment starting from segmentLogicalOffset and return it
+    PRCList* curSeg = mReadSegment;
+    char* curSegStart = mReadCursor;
+    char* curSegEnd = mReadSegmentEnd;
+    PRInt32 amt;
+    while (PR_TRUE) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (curSegStart <= snapshotWriteCursor &&
+            snapshotWriteCursor < curSegEnd) {
+            // same segment -- read up to the snapshotWriteCursor
+            curSegEnd = snapshotWriteCursor;
+
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            return NS_OK;
+        }
+        else {
+            amt = curSegEnd - curSegStart;
+            *result += amt;
+            curSeg = PR_NEXT_LINK(curSeg);
+            if (curSeg == mReadSegment) {
+                // been all the way around
+                return NS_OK;
+            }
+            curSegEnd = (char*)curSeg + mGrowBySize;
+            curSegStart = (char*)curSeg + sizeof(PRCList);
+        }
+    }
+    return NS_ERROR_FAILURE;
+}
+
+#define COMPARE(s1, s2, i)	ignoreCase ? nsCRT::strncasecmp((const char *)s1, (const char *)s2, (PRUint32)i) : nsCRT::strncmp((const char *)s1, (const char *)s2, (PRUint32)i)
+
+NS_IMETHODIMP
+nsBuffer::Search(const char* string, PRBool ignoreCase, 
+                 PRBool *found, PRUint32 *offsetSearchedTo)
+{
+    NS_ASSERTION(!mReaderClosed, "state change error");
+
+    nsresult rv;
+    const char* bufSeg1;
+    PRUint32 bufSegLen1;
+    PRUint32 segmentPos = 0;
+    PRUint32 strLen = nsCRT::strlen(string);
+
+    rv = GetReadSegment(segmentPos, &bufSeg1, &bufSegLen1);
+    if (NS_FAILED(rv) || bufSegLen1 == 0) {
+        *found = PR_FALSE;
+        *offsetSearchedTo = segmentPos;
+        return NS_OK;
+    }
+
+    while (PR_TRUE) {
+        PRUint32 i;
+        // check if the string is in the buffer segment
+        for (i = 0; i < bufSegLen1 - strLen + 1; i++) {
+            if (COMPARE(&bufSeg1[i], string, strLen) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos + i;
+                return NS_OK;
+            }
+        }
+
+        // get the next segment
+        const char* bufSeg2;
+        PRUint32 bufSegLen2;
+        segmentPos += bufSegLen1;
+        rv = GetReadSegment(segmentPos, &bufSeg2, &bufSegLen2);
+        if (NS_FAILED(rv) || bufSegLen2 == 0) {
+            *found = PR_FALSE;
+            if (mCondition != NS_OK)    // XXX NS_FAILED?
+                *offsetSearchedTo = segmentPos - bufSegLen1;
+            else
+                *offsetSearchedTo = segmentPos - bufSegLen1 - strLen + 1;
+            return NS_OK;
+        }
+
+        // check if the string is straddling the next buffer segment
+        PRUint32 limit = PR_MIN(strLen, bufSegLen2 + 1);
+        for (i = 0; i < limit; i++) {
+            PRUint32 strPart1Len = strLen - i - 1;
+            PRUint32 strPart2Len = strLen - strPart1Len;
+            const char* strPart2 = &string[strLen - strPart2Len];
+            PRUint32 bufSeg1Offset = bufSegLen1 - strPart1Len;
+            if (COMPARE(&bufSeg1[bufSeg1Offset], string, strPart1Len) == 0 &&
+                COMPARE(bufSeg2, strPart2, strPart2Len) == 0) {
+                *found = PR_TRUE;
+                *offsetSearchedTo = segmentPos - strPart1Len;
+                return NS_OK;
+            }
+        }
+
+        // finally continue with the next buffer
+        bufSeg1 = bufSeg2;
+        bufSegLen1 = bufSegLen2;
+    }
+    NS_NOTREACHED("can't get here");
+    return NS_ERROR_FAILURE;    // keep compiler happy
+}
+
+NS_IMETHODIMP
+nsBuffer::ReaderClosed()
+{
+    nsresult rv = NS_OK;
+    nsAutoCMonitor mon(this);        // protect mSegments
+
+    // first prevent any more writing
+    mReaderClosed = PR_TRUE;
+
+    // then free any unread segments...
+    
+    // first set the read segment and cursor if not already set
+    if (mReadSegment == nsnull) {
+        if (!PR_CLIST_IS_EMPTY(&mSegments)) {
+            mReadSegment = mSegments.next;
+            mReadSegmentEnd = (char*)mReadSegment + mGrowBySize;
+            mReadCursor = (char*)mReadSegment + sizeof(PRCList);
+        }
+    }
+
+    while (mReadSegment) {
+        // snapshot the write cursor into a local variable -- this allows
+        // a writer to freely change it while we're reading while avoiding
+        // using a lock
+        char* snapshotWriteCursor = mWriteCursor;   // atomic
+
+        // next check if the write cursor is in our segment
+        if (mReadCursor <= snapshotWriteCursor &&
+            snapshotWriteCursor < mReadSegmentEnd) {
+            // same segment -- we've discarded all the unread segments we
+            // can, so just updatethe read cursor
+            mReadCursor = mWriteCursor;
+            break;
+        }
+        // else advance to the next segment, freeing this one
+        rv = PopReadSegment();
+        if (NS_FAILED(rv)) break;
+    }
+
+#ifdef DEBUG
+    PRUint32 amt;
+    const char* buf;
+    rv = GetReadSegment(0, &buf, &amt);
+    NS_ASSERTION(rv == NS_BASE_STREAM_EOF ||
+                 (NS_SUCCEEDED(rv) && amt == 0), "ReaderClosed failed");
+#endif
+
+    return rv;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetCondition(nsresult *result)
+{
+    *result = mCondition;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP
+nsBuffer::WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                        PRUint32 *writeCount)
+{
+    nsresult rv = NS_OK;
+
+    nsAutoCMonitor mon(this);
+    *writeCount = 0;
+
+    if (mReaderClosed) {
+        rv = NS_BASE_STREAM_CLOSED;
+        goto done;
+    }
+
+    if (NS_FAILED(mCondition)) {
+        rv = mCondition;
+        goto done;
+    }
+
+    while (count > 0) {
+        PRUint32 writeBufLen;
+        char* writeBuf;
+        rv = GetWriteSegment(&writeBuf, &writeBufLen);
+        if (NS_FAILED(rv) || writeBufLen == 0) {
+            // if we failed to allocate a new segment, we're probably out
+            // of memory, but we don't care -- just report what we were
+            // able to write so far
+            rv = (*writeCount == 0) ? rv : NS_OK;
+            goto done;
+        }
+
+        writeBufLen = PR_MIN(writeBufLen, count);
+        while (writeBufLen > 0) {
+            PRUint32 readCount = 0;
+            rv = reader(closure, writeBuf, *writeCount, writeBufLen, &readCount);
+            if (rv == NS_BASE_STREAM_WOULD_BLOCK || readCount == 0) {
+                // if the place we're putting the data would block (probably ran
+                // out of room) just return what we were able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            if (NS_FAILED(rv)) {
+                // save the failure condition so that we can get it again later
+                nsresult rv2 = SetCondition(rv);
+                NS_ASSERTION(NS_SUCCEEDED(rv2), "SetCondition failed");
+                // if we failed to read just report what we were
+                // able to write so far
+                rv = (*writeCount == 0) ? rv : NS_OK;
+                goto done;
+            }
+            NS_ASSERTION(readCount <= writeBufLen, "reader returned bad readCount");
+            writeBuf += readCount;
+            writeBufLen -= readCount;
+            *writeCount += readCount;
+            count -= readCount;
+
+            // set the write cursor after the data is valid
+            if (mWriteCursor + readCount == mWriteSegmentEnd) {
+                mWriteSegment = nsnull;      // allocate a new segment next time around
+                mWriteSegmentEnd = nsnull;
+                mWriteCursor = nsnull;
+            }
+            else
+                mWriteCursor += readCount;
+        }
+    }
+done:
+    if (mObserver && *writeCount) {
+        mObserver->OnWrite(this, *writeCount);
+    }
+    return rv;
+}
+
+static NS_METHOD
+nsReadFromRawBuffer(void* closure,
+                    char* toRawSegment,
+                    PRUint32 offset,
+                    PRUint32 count,
+                    PRUint32 *readCount)
+{
+    const char* fromBuf = (const char*)closure;
+    nsCRT::memcpy(toRawSegment, &fromBuf[offset], count);
+    *readCount = count;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromRawBuffer, (void*)fromBuf, bufLen, writeCount);
+}
+
+static NS_METHOD
+nsReadFromInputStream(void* closure,
+                      char* toRawSegment, 
+                      PRUint32 offset,
+                      PRUint32 count,
+                      PRUint32 *readCount)
+{
+    nsIInputStream* fromStream = (nsIInputStream*)closure;
+    return fromStream->Read(toRawSegment, count, readCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount)
+{
+    return WriteSegments(nsReadFromInputStream, fromStream, count, writeCount);
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWriteSegment(char* *resultSegment,
+                          PRUint32 *resultSegmentLen)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    *resultSegmentLen = 0;
+    *resultSegment = nsnull;
+    if (mWriteSegment == nsnull) {
+        rv = PushWriteSegment();
+        if (NS_FAILED(rv) || rv == NS_BASE_STREAM_WOULD_BLOCK) return rv;
+
+        NS_ASSERTION(mWriteSegment != nsnull, "failed to allocate segment");
+    }
+
+    *resultSegmentLen = mWriteSegmentEnd - mWriteCursor;
+    *resultSegment = mWriteCursor;
+    NS_ASSERTION(*resultSegmentLen > 0, "Failed to get write segment.");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetWritableAmount(PRUint32 *amount)
+{
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    nsresult rv;
+    PRUint32 readableAmount;
+    rv = GetReadableAmount(&readableAmount);
+    if (NS_FAILED(rv)) return rv;
+    *amount = mMaxSize - readableAmount;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::GetReaderClosed(PRBool *result)
+{
+    *result = mReaderClosed;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsBuffer::SetCondition(nsresult condition)
+{
+    nsAutoCMonitor mon(this);
+    if (mReaderClosed)
+        return NS_BASE_STREAM_CLOSED;
+
+    mCondition = condition;
+    mWriteSegment = nsnull;     // allows reader to free last segment w/o asserting
+    mWriteSegmentEnd = nsnull;
+    // don't reset mWriteCursor here -- we need it for the EOF point in the buffer
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static NS_DEFINE_CID(kAllocatorCID, NS_ALLOCATOR_CID);
+
+NS_COM nsresult
+NS_NewBuffer(nsIBuffer* *result,
+             PRUint32 growBySize, PRUint32 maxSize,
+             nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kAllocatorCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+static NS_DEFINE_CID(kPageManagerCID, NS_PAGEMANAGER_CID);
+
+NS_COM nsresult
+NS_NewPageBuffer(nsIBuffer* *result,
+                 PRUint32 growBySize, PRUint32 maxSize,
+                 nsIBufferObserver* observer)
+{
+    nsresult rv;
+    NS_WITH_SERVICE(nsIAllocator, alloc, kPageManagerCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsBuffer* buf;
+    rv = nsBuffer::Create(NULL, nsIBuffer::GetIID(), (void**)&buf);
+    if (NS_FAILED(rv)) return rv;
+
+    rv = buf->Init(growBySize, maxSize, observer, alloc);
+    if (NS_FAILED(rv)) {
+        NS_RELEASE(buf);
+        return rv;
+    }
+
+    *result = buf;
+    return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsBuffer.h

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBuffer_h___
+#define nsBuffer_h___
+
+#include "nsIBuffer.h"
+#include "nscore.h"
+#include "prclist.h"
+#include "nsIAllocator.h"
+
+class nsBuffer : public nsIBuffer {
+public:
+    NS_DECL_ISUPPORTS
+
+    static NS_METHOD
+    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+    // nsIBuffer methods:
+    NS_IMETHOD Init(PRUint32 growBySize, PRUint32 maxSize,
+                    nsIBufferObserver* observer, nsIAllocator* allocator);
+    NS_IMETHOD Read(char* toBuf, PRUint32 bufLen, PRUint32 *readCount);
+    NS_IMETHOD ReadSegments(nsWriteSegmentFun writer, void* closure, PRUint32 count,
+                            PRUint32 *readCount);
+    NS_IMETHOD GetReadSegment(PRUint32 segmentLogicalOffset, 
+                              const char* *resultSegment,
+                              PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetReadableAmount(PRUint32 *amount);
+    NS_IMETHOD Search(const char* forString, PRBool ignoreCase,
+                      PRBool *found, PRUint32 *offsetSearchedTo);
+    NS_IMETHOD ReaderClosed(void);
+    NS_IMETHOD GetCondition(nsresult *result);
+
+    NS_IMETHOD Write(const char* fromBuf, PRUint32 bufLen, PRUint32 *writeCount);
+    NS_IMETHOD WriteFrom(nsIInputStream* fromStream, PRUint32 count, PRUint32 *writeCount);
+    NS_IMETHOD WriteSegments(nsReadSegmentFun reader, void* closure, PRUint32 count,
+                             PRUint32 *writeCount);
+    NS_IMETHOD GetWriteSegment(char* *resultSegment,
+                               PRUint32 *resultSegmentLen);
+    NS_IMETHOD GetWritableAmount(PRUint32 *amount);
+    NS_IMETHOD GetReaderClosed(PRBool *result);
+    NS_IMETHOD SetCondition(nsresult condition);
+
+    // nsBuffer methods:
+    nsBuffer();
+    virtual ~nsBuffer();
+
+    nsresult PushWriteSegment();
+    nsresult PopReadSegment();
+
+protected:
+    PRUint32            mGrowBySize;
+    PRUint32            mMaxSize;
+    nsIAllocator*       mAllocator;
+    nsIBufferObserver*  mObserver;
+
+    PRCList             mSegments;
+    PRUint32            mBufferSize;
+    
+    PRCList*            mReadSegment;
+    char*               mReadSegmentEnd;
+    char*               mReadCursor;
+
+    PRCList*            mWriteSegment;
+    char*               mWriteSegmentEnd;
+    char*               mWriteCursor;
+
+    PRBool              mReaderClosed;
+    nsresult            mCondition;
+};
+
+#endif // nsBuffer_h___

mozilla/xpcom/ds/nsBufferPoolService.h

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsBufferPoolService_h___
+#define nsBufferPoolService_h___
+
+#include "nsIBufferPoolService.h"
+
+class nsBufferPoolService : public nsIBufferPoolService {
+public:
+    NS_DECL_ISUPPORTS
+
+    // nsIBufferPoolService methods:
+    NS_IMETHOD NewBuffer(PRUint32 minSize, PRUint32 maxSize,
+                         nsIByteBuffer* *result);
+
+    // nsBufferPoolService methods:
+    nsBufferPoolService();
+    virtual ~nsBufferPoolService();
+
+protected:
+    
+};
+
+#endif // nsBufferPoolService_h___

mozilla/xpcom/ds/nsByteBuffer.cpp

@@ -0,0 +1,151 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsByteBuffer.h"
+#include "nsIInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+ByteBufferImpl::ByteBufferImpl(void)
+  : mBuffer(NULL), mSpace(0), mLength(0)
+{
+  NS_INIT_REFCNT();
+}
+
+NS_IMETHODIMP
+ByteBufferImpl::Init(PRUint32 aBufferSize)
+{
+  if (aBufferSize < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mLength = 0;
+  mBuffer = new char[aBufferSize];
+  return mBuffer ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMPL_ISUPPORTS1(ByteBufferImpl,nsIByteBuffer)
+
+ByteBufferImpl::~ByteBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete[] mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+NS_METHOD
+ByteBufferImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+  if (aOuter)
+    return NS_ERROR_NO_AGGREGATION;
+
+  ByteBufferImpl* it = new ByteBufferImpl();
+  if (nsnull == it) 
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(it);
+  nsresult rv = it->QueryInterface(aIID, (void**)aResult);
+  NS_RELEASE(it);
+  return rv;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetLength(void) const
+{
+  return mLength;
+}
+
+NS_IMETHODIMP_(PRUint32)
+ByteBufferImpl::GetBufferSize(void) const
+{
+  return mSpace;
+}
+
+NS_IMETHODIMP_(char*)
+ByteBufferImpl::GetBuffer(void) const
+{
+  return mBuffer;
+}
+
+NS_IMETHODIMP_(PRBool)
+ByteBufferImpl::Grow(PRUint32 aNewSize)
+{
+  if (aNewSize < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  char* newbuf = new char[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength);
+    }
+    delete[] mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+NS_IMETHODIMP_(PRInt32)
+ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                     PRUint32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(aKeep <= mLength, "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRUint32 nb;
+  *aErrorCode = aStream->Read(mBuffer + aKeep, mSpace - aKeep, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_COM nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                  nsISupports* aOuter,
+                                  PRUint32 aBufferSize)
+{
+  nsresult rv;
+  nsIByteBuffer* buf;
+  rv = ByteBufferImpl::Create(aOuter, nsIByteBuffer::GetIID(), (void**)&buf);
+  if (NS_FAILED(rv)) return rv;
+    
+  rv = buf->Init(aBufferSize);
+  if (NS_FAILED(rv)) {
+    NS_RELEASE(buf);
+    return rv;
+  }
+  *aInstancePtrResult = buf;
+  return rv;
+}

mozilla/xpcom/ds/nsByteBuffer.h

@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsByteBuffer_h__
+#define nsByteBuffer_h__
+
+#include "nsIByteBuffer.h"
+
+class ByteBufferImpl : public nsIByteBuffer {
+public:
+  ByteBufferImpl(void);
+  virtual ~ByteBufferImpl();
+
+  NS_DECL_ISUPPORTS
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  NS_IMETHOD Init(PRUint32 aBufferSize);
+  NS_IMETHOD_(PRUint32) GetLength(void) const;
+  NS_IMETHOD_(PRUint32) GetBufferSize(void) const;
+  NS_IMETHOD_(char*) GetBuffer() const;
+  NS_IMETHOD_(PRBool) Grow(PRUint32 aNewSize);
+  NS_IMETHOD_(PRInt32) Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                            PRUint32 aKeep);
+
+  char* mBuffer;
+  PRUint32 mSpace;
+  PRUint32 mLength;
+};
+
+#endif // nsByteBuffer_h__

mozilla/xpcom/ds/nsCRT.cpp

@@ -0,0 +1,555 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */ 
+
+ 
+/**
+ * MODULE NOTES:
+ * @update  gess7/30/98
+ *
+ * Much as I hate to do it, we were using string compares wrong.
+ * Often, programmers call functions like strcmp(s1,s2), and pass
+ * one or more null strings. Rather than blow up on these, I've 
+ * added quick checks to ensure that cases like this don't cause
+ * us to fail.
+ *
+ * In general, if you pass a null into any of these string compare
+ * routines, we simply return 0.
+ */
+
+
+#include "nsCRT.h"
+#include "nsUnicharUtilCIID.h"
+#include "nsIServiceManager.h"
+#include "nsICaseConversion.h"
+
+
+// XXX Bug: These tables don't lowercase the upper 128 characters properly
+
+// This table maps uppercase characters to lower case characters;
+// characters that are neither upper nor lower case are unaffected.
+static const unsigned char kUpper2Lower[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64,
+
+    // upper band mapped to lower [A-Z] => [a-z]
+       97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,
+
+                                               91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static const unsigned char kLower2Upper[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96,
+
+    // lower band mapped to upper [a-z] => [A-Z]
+       65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+
+                                              123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+// XXX bug: this doesn't map 0x80 to 0x9f properly
+ const PRUnichar kIsoLatin1ToUCS2[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+//----------------------------------------------------------------------
+
+#define TOLOWER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+
+#define TOUPPER(_ucs2) \
+  (((_ucs2) < 128) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+
+class HandleCaseConversionShutdown : public nsIShutdownListener {
+public :
+   NS_IMETHOD OnShutdown(const nsCID& cid, nsISupports* service);
+   HandleCaseConversionShutdown(void) { NS_INIT_REFCNT(); }
+   virtual ~HandleCaseConversionShutdown(void) {}
+   NS_DECL_ISUPPORTS
+};
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+
+static nsICaseConversion * gCaseConv = NULL; 
+
+NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown, nsIShutdownListener)
+
+nsresult
+HandleCaseConversionShutdown::OnShutdown(const nsCID& cid,
+                                         nsISupports* aService)
+{
+  if (cid.Equals(kUnicharUtilCID)) {
+    NS_ASSERTION(aService == gCaseConv, "wrong service!");
+    gCaseConv->Release();
+    gCaseConv = NULL;
+  }
+  return NS_OK;
+}
+
+static HandleCaseConversionShutdown* gListener = NULL;
+
+static void StartUpCaseConversion()
+{
+    nsresult err;
+
+    if ( NULL == gListener )
+    {
+      gListener = new HandleCaseConversionShutdown();
+      gListener->AddRef();
+    }
+    err = nsServiceManager::GetService(kUnicharUtilCID, NS_GET_IID(nsICaseConversion),
+                                        (nsISupports**) &gCaseConv, gListener);
+}
+static void CheckCaseConversion()
+{
+    if(NULL == gCaseConv )
+      StartUpCaseConversion();
+
+    NS_ASSERTION( gCaseConv != NULL , "cannot obtain UnicharUtil");
+   
+}
+
+static PRUnichar _ToLower(PRUnichar aChar)
+{
+  PRUnichar oLower;
+  CheckCaseConversion();
+  nsresult err = gCaseConv->ToLower(aChar, &oLower);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oLower : aChar ;
+}
+
+static PRUnichar _ToUpper(PRUnichar aChar)
+{
+  nsresult err;
+  PRUnichar oUpper;
+  CheckCaseConversion();
+  err = gCaseConv->ToUpper(aChar, &oUpper);
+  NS_ASSERTION( NS_SUCCEEDED(err),  "failed to communicate to UnicharUtil");
+  return ( NS_SUCCEEDED(err) ) ? oUpper : aChar ;
+}
+
+//----------------------------------------------------------------------
+
+PRUnichar nsCRT::ToUpper(PRUnichar aChar)
+{
+  return TOUPPER(aChar);
+}
+
+PRUnichar nsCRT::ToLower(PRUnichar aChar)
+{
+  return TOLOWER(aChar);
+}
+
+PRBool nsCRT::IsUpper(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToLower(aChar);
+}
+
+PRBool nsCRT::IsLower(PRUnichar aChar)
+{
+  return aChar != nsCRT::ToUpper(aChar);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// My lovely strtok routine
+
+#define IS_DELIM(m, c)          ((m)[(c) >> 3] & (1 << ((c) & 7)))
+#define SET_DELIM(m, c)         ((m)[(c) >> 3] |= (1 << ((c) & 7)))
+#define DELIM_TABLE_SIZE        32
+
+char* nsCRT::strtok(char* string, const char* delims, char* *newStr)
+{
+  NS_ASSERTION(string, "Unlike regular strtok, the first argument cannot be null.");
+
+  char delimTable[DELIM_TABLE_SIZE];
+  PRUint32 i;
+  char* result;
+  char* str = string;
+
+  for (i = 0; i < DELIM_TABLE_SIZE; i++)
+    delimTable[i] = '\0';
+
+  for (i = 0; i < DELIM_TABLE_SIZE && delims[i]; i++) {
+    SET_DELIM(delimTable, delims[i]);
+  }
+  NS_ASSERTION(delims[i] == '\0', "too many delimiters");
+
+  // skip to beginning
+  while (*str && IS_DELIM(delimTable, *str)) {
+    str++;
+  }
+  result = str;
+
+  // fix up the end of the token
+  while (*str) {
+    if (IS_DELIM(delimTable, *str)) {
+      *str++ = '\0';
+      break;
+    }
+    str++;
+  }
+  *newStr = str;
+
+  return str == result ? NULL : result;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+PRUint32 nsCRT::strlen(const PRUnichar* s)
+{
+  PRUint32 len = 0;
+  if(s) {
+    while (*s++ != 0) {
+      len++;
+    }
+  }
+  return len;
+}
+
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null 
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char.
+ * NOTE: If either is null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) { 
+    if(n != 0) {
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare unichar string ptrs without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char;
+ * also ignoring the case of characters.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring, up to N chars.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2) {
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare a unichar string ptr to cstring without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Caseless compare up to N chars between unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRUint32 n)
+{
+  if(s1 && s2){
+    if(n != 0){
+      do {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if (c1 == 0) break;
+      } while (--n != 0);
+    }
+  }
+  return 0;
+}
+
+PRUnichar* nsCRT::strdup(const PRUnichar* str)
+{
+  PRUint32 len = nsCRT::strlen(str) + 1; // add one for null
+
+
+	nsCppSharedAllocator<PRUnichar> shared_allocator;
+	PRUnichar* rslt = shared_allocator.allocate(len);
+  // PRUnichar* rslt = new PRUnichar[len];
+
+  if (rslt == NULL) return NULL;
+  nsCRT::memcpy(rslt, str, len * sizeof(PRUnichar));
+  return rslt;
+}
+
+PRUint32 nsCRT::HashValue(const char* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    char ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const char* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  char ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us)
+{
+  PRUint32 rv = 0;
+  if(us) {
+    PRUnichar ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRUint32 nsCRT::HashValue(const PRUnichar* us, PRUint32* uslenp)
+{
+  PRUint32 rv = 0;
+  PRUint32 len = 0;
+  PRUnichar ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRInt32 nsCRT::atoi( const PRUnichar *string )
+{
+  return atoi(string);
+}
+

mozilla/xpcom/ds/nsCRT.h

@@ -0,0 +1,239 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsCRT_h___
+#define nsCRT_h___
+
+#include <stdlib.h>
+#include <string.h>
+#include "plstr.h"
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsCppSharedAllocator.h"
+
+#define CR '\015'
+#define LF '\012'
+#define VTAB '\013'
+#define FF '\014'
+#define TAB '\011'
+#define CRLF "\015\012"     /* A CR LF equivalent string */
+
+#ifdef XP_MAC
+#  define NS_LINEBREAK             "\015"
+#  define NS_LINEBREAK_LEN 1
+#else
+#  ifdef XP_PC
+#    define NS_LINEBREAK           "\015\012"
+#    define NS_LINEBREAK_LEN       2
+#  else
+#    if defined(XP_UNIX) || defined(XP_BEOS)
+#      define NS_LINEBREAK         "\012"
+#      define NS_LINEBREAK_LEN     1
+#    endif /* XP_UNIX */
+#  endif /* XP_PC */
+#endif /* XP_MAC */
+
+
+extern const PRUnichar kIsoLatin1ToUCS2[256];
+
+
+// This macro can be used in a class declaration for classes that want
+// to ensure that their instance memory is zeroed.
+#define NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz) {             \
+    void* rv = ::operator new(sz);            \
+    if (rv) {                                 \
+      nsCRT::zero(rv, sz);                    \
+    }                                         \
+    return rv;                                \
+  }                                           \
+  void operator delete(void* ptr) {           \
+    ::operator delete(ptr);                   \
+  }
+
+// This macro works with the next macro to declare a non-inlined
+// version of the above.
+#define NS_DECL_ZEROING_OPERATOR_NEW \
+  void* operator new(size_t sz);     \
+  void operator delete(void* ptr);
+
+#define NS_IMPL_ZEROING_OPERATOR_NEW(_class) \
+  void* _class::operator new(size_t sz) {    \
+    void* rv = ::operator new(sz);           \
+    if (rv) {                                \
+      nsCRT::zero(rv, sz);                   \
+    }                                        \
+    return rv;                               \
+  }                                          \
+  void _class::operator delete(void* ptr) {  \
+    ::operator delete(ptr);                  \
+  }
+
+// Freeing helper
+#define CRTFREEIF(x) if (x) { nsCRT::free(x); x = 0; }
+
+/// This is a wrapper class around all the C runtime functions. 
+
+class NS_COM nsCRT {
+public:
+
+  /** Copy bytes from aSrc to aDest.
+    @param aDest the destination address
+    @param aSrc the source address
+    @param aCount the number of bytes to copy
+    */
+  static void memcpy(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memcpy(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memmove(void* aDest, const void* aSrc, PRUint32 aCount) {
+    ::memmove(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memset(void* aDest, PRUint8 aByte, PRUint32 aCount) {
+    ::memset(aDest, aByte, aCount);
+  }
+
+  static void zero(void* aDest, PRUint32 aCount) {
+    ::memset(aDest, 0, (size_t)aCount);
+  }
+
+  /** Compute the string length of s
+   @param s the string in question
+   @return the length of s
+   */
+  static PRUint32 strlen(const char* s) {
+    return PRUint32(::strlen(s));
+  }
+
+  /// Compare s1 and s2.
+  static PRInt32 strcmp(const char* s1, const char* s2) {
+    return PRUint32(PL_strcmp(s1, s2));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2,
+                         PRUint32 aMaxLen) {
+    return PRInt32(PL_strncmp(s1, s2, aMaxLen));
+  }
+
+  /// Case-insensitive string comparison.
+  static PRInt32 strcasecmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcasecmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison with length
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRUint32 aMaxLen) {
+    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
+  }
+
+  static PRInt32 strncmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    // inline the first test (assumes strings are not null):
+    PRInt32 diff = ((const unsigned char*)s1)[0] - ((const unsigned char*)s2)[0];
+    if (diff != 0) return diff;
+    return PRInt32(PL_strncmp(s1,s2,aMaxLen));
+  }
+  
+  static char* strdup(const char* str) {
+    return PL_strdup(str);
+  }
+
+  static void free(char* str) {
+    PL_strfree(str);
+  }
+
+  /**
+
+    How to use this fancy (thread-safe) version of strtok: 
+
+    void main( void ) {
+      printf( "%s\n\nTokens:\n", string );
+      // Establish string and get the first token:
+      char* newStr;
+      token = nsCRT::strtok( string, seps, &newStr );   
+      while( token != NULL ) {
+        // While there are tokens in "string"
+        printf( " %s\n", token );
+        // Get next token:
+        token = nsCRT::strtok( newStr, seps, &newStr );
+      }
+    }
+    * WARNING - STRTOK WHACKS str THE FIRST TIME IT IS CALLED *
+    * MAKE A COPY OF str IF YOU NEED TO USE IT AFTER strtok() *
+  */
+  static char* strtok(char* str, const char* delims, char* *newStr); 
+
+  /// Like strlen except for ucs2 strings
+  static PRUint32 strlen(const PRUnichar* s);
+
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp except for ucs2 strings
+  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strncasecmp except for ucs2 strings
+  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
+                             PRUint32 aMaxLen);
+
+  /// Like strcmp with a char* and a ucs2 string
+  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
+  /// Like strncmp with a char* and a ucs2 string
+  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
+                         PRUint32 aMaxLen);
+
+  /// Like strcasecmp with a char* and a ucs2 string
+  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
+  /// Like strncasecmp with a char* and a ucs2 string
+  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
+                             PRUint32 aMaxLen);
+
+  // Note: uses new[] to allocate memory, so you must use delete[] to
+  // free the memory
+  static PRUnichar* strdup(const PRUnichar* str);
+
+  static void free(PRUnichar* str) {
+  	nsCppSharedAllocator<PRUnichar> shared_allocator;
+  	shared_allocator.deallocate(str, 0 /*we never new or kept the size*/);
+  }
+
+  /// Compute a hashcode for a C string
+  static PRUint32 HashValue(const char* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const char* s1, PRUint32* s1len);
+
+  /// Compute a hashcode for a ucs2 string
+  static PRUint32 HashValue(const PRUnichar* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRUint32 HashValue(const PRUnichar* s1, PRUint32* s1len);
+
+  /// String to integer.
+  static PRInt32 atoi( const PRUnichar *string );
+  
+  static PRUnichar ToUpper(PRUnichar aChar);
+
+  static PRUnichar ToLower(PRUnichar aChar);
+  
+  static PRBool IsUpper(PRUnichar aChar);
+
+  static PRBool IsLower(PRUnichar aChar);
+};
+
+#endif /* nsCRT_h___ */

mozilla/xpcom/ds/nsConjoiningEnumerator.cpp

@@ -0,0 +1,365 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsConjoiningEnumerator : public nsIBidirectionalEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIBidirectionalEnumerator methods:
+  NS_DECL_NSIBIDIRECTIONALENUMERATOR
+
+  // nsConjoiningEnumerator methods:
+  nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsConjoiningEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+  nsIEnumerator* mCurrent;
+};
+
+nsConjoiningEnumerator::nsConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second), mCurrent(first)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsConjoiningEnumerator::~nsConjoiningEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS2(nsConjoiningEnumerator, nsIBidirectionalEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::First(void)
+{
+  mCurrent = mFirst;
+  return mCurrent->First();
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Next(void)
+{
+  nsresult rv = mCurrent->Next();
+  if (NS_FAILED(rv) && mCurrent == mFirst) {
+    mCurrent = mSecond;
+    rv = mCurrent->First();
+  }
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mCurrent->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::IsDone(void)
+{
+  return (mCurrent == mFirst && mCurrent->IsDone() == NS_OK)
+      || (mCurrent == mSecond && mCurrent->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Last(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  mCurrent = mSecond;
+  rv = be->Last();
+  NS_RELEASE(be);
+  return rv;
+}
+
+NS_IMETHODIMP 
+nsConjoiningEnumerator::Prev(void)
+{
+  nsresult rv;
+  nsIBidirectionalEnumerator* be;
+  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+  if (NS_FAILED(rv)) return rv;
+  rv = be->Prev();
+  NS_RELEASE(be);
+  if (NS_FAILED(rv) && mCurrent == mSecond) {
+    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
+    if (NS_FAILED(rv)) return rv;
+    mCurrent = mFirst;
+    rv = be->Last();
+    NS_RELEASE(be);
+  }  
+  return rv;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewConjoiningEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                           nsIBidirectionalEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsConjoiningEnumerator* e = new nsConjoiningEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+static nsresult
+nsEnumeratorContains(nsIEnumerator* e, nsISupports* item)
+{
+  nsresult rv;
+  for (e->First(); e->IsDone() != NS_OK; e->Next()) {
+    nsISupports* other;
+    rv = e->CurrentItem(&other);
+    if (NS_FAILED(rv)) return rv;
+    if (item == other) {
+      NS_RELEASE(other);
+      return NS_OK;     // true -- exists in enumerator
+    }
+    NS_RELEASE(other);
+  }
+  return NS_COMFALSE;   // false -- doesn't exist
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Intersection Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsIntersectionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsIntersectionEnumerator methods:
+  nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsIntersectionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsIntersectionEnumerator::nsIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsIntersectionEnumerator::~nsIntersectionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsIntersectionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv == NS_OK) {
+      // found in both, so return leaving it as the current item of mFirst
+      return NS_OK;
+    }
+  }
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  return mFirst->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsIntersectionEnumerator::IsDone(void)
+{
+  return mFirst->IsDone();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewIntersectionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsIntersectionEnumerator* e = new nsIntersectionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Union Enumerators
+////////////////////////////////////////////////////////////////////////////////
+
+class nsUnionEnumerator : public nsIEnumerator
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIEnumerator methods:
+  NS_DECL_NSIENUMERATOR
+
+  // nsUnionEnumerator methods:
+  nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second);
+  virtual ~nsUnionEnumerator(void);
+
+protected:
+  nsIEnumerator* mFirst;
+  nsIEnumerator* mSecond;
+};
+
+nsUnionEnumerator::nsUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second)
+  : mFirst(first), mSecond(second)
+{
+  NS_ADDREF(mFirst);
+  NS_ADDREF(mSecond);
+}
+
+nsUnionEnumerator::~nsUnionEnumerator(void)
+{
+  NS_RELEASE(mFirst);
+  NS_RELEASE(mSecond);
+}
+
+NS_IMPL_ISUPPORTS1(nsUnionEnumerator, nsIEnumerator)
+
+NS_IMETHODIMP 
+nsUnionEnumerator::First(void)
+{
+  nsresult rv = mFirst->First();
+  if (NS_FAILED(rv)) return rv;
+  return Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::Next(void)
+{
+  nsresult rv;
+
+  // find the first item that exists in both
+  for (; mFirst->IsDone() != NS_OK; mFirst->Next()) {
+    nsISupports* item;
+    rv = mFirst->CurrentItem(&item);
+    if (NS_FAILED(rv)) return rv;
+
+    // see if it also exists in mSecond
+    rv = nsEnumeratorContains(mSecond, item);
+    if (NS_FAILED(rv)) return rv;
+
+    NS_RELEASE(item);
+    if (rv != NS_OK) {
+      // if it didn't exist in mSecond, return, making it the current item
+      return NS_OK;
+    }
+    
+    // each time around, make sure that mSecond gets reset to the beginning
+    // so that when mFirst is done, we'll be ready to enumerate mSecond
+    rv = mSecond->First();
+    if (NS_FAILED(rv)) return rv;
+  }
+  
+  return mSecond->Next();
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::CurrentItem(nsISupports **aItem)
+{
+  if (mFirst->IsDone() != NS_OK)
+    return mFirst->CurrentItem(aItem);
+  else
+    return mSecond->CurrentItem(aItem);
+}
+
+NS_IMETHODIMP 
+nsUnionEnumerator::IsDone(void)
+{
+  return (mFirst->IsDone() == NS_OK && mSecond->IsDone() == NS_OK)
+    ? NS_OK : NS_COMFALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+extern "C" NS_COM nsresult
+NS_NewUnionEnumerator(nsIEnumerator* first, nsIEnumerator* second,
+                      nsIEnumerator* *aInstancePtrResult)
+{
+  if (aInstancePtrResult == 0)
+    return NS_ERROR_NULL_POINTER;
+  nsUnionEnumerator* e = new nsUnionEnumerator(first, second);
+  if (e == 0)
+    return NS_ERROR_OUT_OF_MEMORY;
+  NS_ADDREF(e);
+  *aInstancePtrResult = e;
+  return NS_OK;
+}
+
+////////////////////////////////////////////////////////////////////////////////

mozilla/xpcom/ds/nsCppSharedAllocator.h

@@ -0,0 +1,122 @@
+#ifndef nsCppSharedAllocator_h__
+#define nsCppSharedAllocator_h__
+
+#include "nsIAllocator.h" // for |nsAllocator|
+#include "nscore.h"       // for |NS_XXX_CAST|
+#include <new.h>					// to allow placement |new|
+
+
+  // under Metrowerks (Mac), we don't have autoconf yet
+#ifdef __MWERKS__
+  #define HAVE_CPP_MEMBER_TEMPLATES
+	#define HAVE_CPP_NUMERIC_LIMITS
+#endif
+
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+#include <limits>
+#else
+#include <limits.h>
+#endif
+
+
+template <class T>
+class nsCppSharedAllocator
+    /*
+      ...allows Standard Library containers, et al, to use our global shared
+      (XP)COM-aware allocator.
+    */
+  {
+    public:
+      typedef T          value_type;
+      typedef size_t     size_type;
+      typedef ptrdiff_t  difference_type;
+
+      typedef T*         pointer;
+      typedef const T*   const_pointer;
+
+      typedef T&         reference;
+      typedef const T&   const_reference;
+
+
+
+      nsCppSharedAllocator() { }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      nsCppSharedAllocator( const nsCppSharedAllocator<U>& ) { }
+#endif
+
+     ~nsCppSharedAllocator() { }
+
+
+      pointer
+      address( reference r ) const
+        {
+          return &r;
+        }
+
+      const_pointer
+      address( const_reference r ) const
+        {
+          return &r;
+        }
+
+      pointer
+      allocate( size_type n, const void* /*hint*/=0 )
+        {
+          return NS_REINTERPRET_CAST(pointer, nsAllocator::Alloc(NS_STATIC_CAST(PRUint32, n*sizeof(T))));
+        }
+
+      void
+      deallocate( pointer p, size_type /*n*/ )
+        {
+          nsAllocator::Free(p);
+        }
+
+      void
+      construct( pointer p, const T& val )
+        {
+          new (p) T(val);
+        }
+      
+      void
+      destroy( pointer p )
+        {
+          p->~T();
+        }
+
+      size_type
+      max_size() const
+        {
+#ifdef HAVE_CPP_NUMERIC_LIMITS
+          return numeric_limits<size_type>::max() / sizeof(T);
+#else
+          return ULONG_MAX / sizeof(T);
+#endif
+        }
+
+#ifdef HAVE_CPP_MEMBER_TEMPLATES
+      template <class U>
+      struct rebind
+        {
+          typedef nsCppSharedAllocator<U> other;
+        };
+#endif
+  };
+
+
+template <class T>
+PRBool
+operator==( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_TRUE;
+  }
+
+template <class T>
+PRBool
+operator!=( const nsCppSharedAllocator<T>&, const nsCppSharedAllocator<T>& )
+  {
+    return PR_FALSE;
+  }
+
+#endif /* !defined(nsCppSharedAllocator_h__) */

mozilla/xpcom/ds/nsDeque.cpp

@@ -0,0 +1,594 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+ 
+#include "nsDeque.h"
+#include "nsCRT.h"
+#include <stdio.h>
+
+//#define _SELFTEST_DEQUE 1
+#undef _SELFTEST_DEQUE 
+
+/**
+ * Standard constructor
+ * @update	gess4/18/98
+ * @return  new deque
+ */
+nsDeque::nsDeque(nsDequeFunctor* aDeallocator) {
+  mDeallocator=aDeallocator;
+  mOrigin=mSize=0;
+  mData=mBuffer; // don't allocate space until you must
+  mCapacity=sizeof(mBuffer)/sizeof(mBuffer[0]);
+  nsCRT::zero(mData,mCapacity*sizeof(mBuffer[0]));
+}
+
+
+/**
+ * Destructor
+ * @update	gess4/18/98
+ */
+nsDeque::~nsDeque() {
+
+#if 0
+  char buffer[30];
+  printf("Capacity: %i\n",mCapacity);
+
+  static int mCaps[15] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+  switch(mCapacity) {
+    case 4:     mCaps[0]++; break;
+    case 8:     mCaps[1]++; break;
+    case 16:    mCaps[2]++; break;
+    case 32:    mCaps[3]++; break;
+    case 64:    mCaps[4]++; break;
+    case 128:   mCaps[5]++; break;
+    case 256:   mCaps[6]++; break;
+    case 512:   mCaps[7]++; break;
+    case 1024:  mCaps[8]++; break;
+    case 2048:  mCaps[9]++; break;
+    case 4096:  mCaps[10]++; break;
+    default:
+      break;
+  }
+#endif
+
+  Erase();
+  if(mData && (mData!=mBuffer))
+    delete [] mData;
+  mData=0;
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=0;
+}
+
+
+/**
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return  
+ */ 
+void nsDeque::SetDeallocator(nsDequeFunctor* aDeallocator){
+  if(mDeallocator) {
+    delete mDeallocator;
+  }
+  mDeallocator=aDeallocator;
+}
+
+/**
+ * Remove all items from container without destroying them.
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+nsDeque& nsDeque::Empty() {
+  if((0<mCapacity) && (mData)) {
+    nsCRT::zero(mData,mCapacity*sizeof(mData));
+  }
+  mSize=0;
+  mOrigin=0;
+  return *this;
+}
+
+/**
+ * Remove and delete all items from container
+ * 
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDeque& nsDeque::Erase() { 
+  if(mDeallocator && mSize) {
+    ForEach(*mDeallocator);
+  }
+  return Empty();
+}
+
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::GrowCapacity(void) {
+
+  PRInt32 theNewSize = mCapacity<<2;
+  void** temp=new void*[theNewSize];
+
+  //Here's the interesting part: You can't just move the elements
+  //directy (in situ) from the old buffer to the new one.
+  //Since capacity has changed, the old origin doesn't make
+  //sense anymore. It's better to resequence the elements now.
+
+  if(mData) {
+    int tempi=0;
+    int i=0;
+    int j=0;
+    for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
+    for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j];         //copy the trailing elements...
+    if(mData!=mBuffer)
+      delete [] mData;
+  }
+  mCapacity=theNewSize;
+  mOrigin=0;       //now realign the origin...
+  mData=temp;
+  return *this;
+}
+
+/**
+ * This method adds an item to the end of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::Push(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  int offset=mOrigin+mSize;
+  if(offset<mCapacity)
+    mData[offset]=anItem;
+  else mData[offset-mCapacity]=anItem;
+  mSize++;
+  return *this;
+}
+
+/**
+ * This method adds an item to the front of the deque. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to deque
+ * @return  nada
+ */
+nsDeque& nsDeque::PushFront(void* anItem) {
+  if(mSize==mCapacity) {
+    GrowCapacity();
+  }
+  if(0==mOrigin){  //case1: [xxx..]
+    //mOrigin=mCapacity-1-mSize++;
+    mOrigin=mCapacity-1;
+    mData[mOrigin]=anItem;
+  }
+  else {// if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
+    mData[--mOrigin]=anItem;
+  }
+  mSize++;
+  return *this;
+}
+
+/**
+ * Remove and return the last item in the container.
+ * 
+ * @update	gess4/18/98
+ * @param   none
+ * @return  ptr to last item in container
+ */
+void* nsDeque::Pop(void) {
+  void* result=0;
+  if(mSize>0) {
+    int offset=mOrigin+mSize-1;
+    if(offset>=mCapacity) 
+      offset-=mCapacity;
+    result=mData[offset];
+    mData[offset]=0;
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to remove and return
+ * the first member in the container.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::PopFront() {
+  void* result=0;
+  if(mSize>0) {
+    NS_ASSERTION(mOrigin<mCapacity,"Error: Bad origin");
+    result=mData[mOrigin];
+    mData[mOrigin++]=0;     //zero it out for debugging purposes.
+    mSize--;
+    if(mCapacity==mOrigin)  //you popped off the end, so cycle back around...
+      mOrigin=0;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to peek at the topmost
+ * member without removing it.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Peek() {
+  void* result=0;
+  if(mSize>0) {
+    result=mData[mOrigin];
+  }
+  return result;
+}
+
+/**
+ * Call this to retrieve the ith element from this container.
+ * Keep in mind that accessing the underlying elements is 
+ * done in a relative fashion. Object 0 is not necessarily
+ * the first element (the first element is at mOrigin).
+ *
+ * @update	gess4/18/98
+ * @param   anIndex : 0 relative offset of item you want
+ * @return  void* or null
+ */
+void* nsDeque::ObjectAt(PRInt32 anIndex) const {
+  void* result=0;
+
+  if((anIndex>=0) && (anIndex<mSize))
+  {
+    if(anIndex<(mCapacity-mOrigin)) {
+      result=mData[mOrigin+anIndex];
+    }
+    else {
+      result=mData[anIndex-(mCapacity-mOrigin)];
+    }
+  }
+  return result;
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the beginning of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to 1st item
+ */
+nsDequeIterator nsDeque::Begin(void) const{
+  return nsDequeIterator(*this,0);
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the last of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to last item
+ */
+nsDequeIterator nsDeque::End(void) const{
+  return nsDequeIterator(*this,mSize);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDeque::ForEach(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+  }
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code. Iteration continues until your
+ * functor returns a non-null.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDeque::FirstThat(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+    if(obj)
+      return obj;
+  }
+  return 0;
+}
+
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+/**
+ * DequeIterator is an object that knows how to iterate (forward and backward)
+ * a Deque. Normally, you don't need to do this, but there are some special
+ * cases where it is pretty handy, so here you go.
+ *
+ * This is a standard dequeiterator constructor
+ *
+ * @update	gess4/18/98
+ * @param   aQueue is the deque object to be iterated
+ * @param   anIndex is the starting position for your iteration
+ */
+nsDequeIterator::nsDequeIterator(const nsDeque& aQueue,int anIndex):  mIndex(anIndex), mDeque(aQueue) {
+}
+
+/**
+ * Copy construct a new iterator beginning with given 
+ *
+ * @update	gess4/20/98
+ * @param   aCopy is another iterator to copy from
+ * @return
+ */
+nsDequeIterator::nsDequeIterator(const nsDequeIterator& aCopy) : mIndex(aCopy.mIndex), mDeque(aCopy.mDeque) {
+}
+
+/**
+ * Moves iterator to first element in deque
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDequeIterator& nsDequeIterator::First(void){
+  mIndex=0;
+  return *this;
+}
+
+/**
+ * Standard assignment operator for dequeiterator
+ *
+ * @update	gess4/18/98
+ * @param   aCopy is an iterator to be copied from
+ * @return  *this
+ */
+nsDequeIterator& nsDequeIterator::operator=(const nsDequeIterator& aCopy) {
+  //queue's are already equal.
+  mIndex=aCopy.mIndex;
+  return *this;
+}
+
+/**
+ * preform ! operation against to iterators to test for equivalence
+ * (or lack thereof)!
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the object to be compared to
+ * @return  TRUE if NOT equal.
+ */
+PRBool nsDequeIterator::operator!=(nsDequeIterator& anIter) {
+  return PRBool(!this->operator==(anIter));
+}
+
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator<(nsDequeIterator& anIter) {
+  return PRBool(((mIndex<anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator==(nsDequeIterator& anIter) {
+  return PRBool(((mIndex==anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator>=(nsDequeIterator& anIter) {
+  return PRBool(((mIndex>=anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Pre-increment operator 
+ *
+ * @update	gess4/18/98
+ * @return  object at preincremented index
+ */
+void* nsDequeIterator::operator++() {
+  return mDeque.ObjectAt(++mIndex);
+}
+
+/**
+ * Post-increment operator 
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-incremented index
+ */
+void* nsDequeIterator::operator++(int) {
+  return mDeque.ObjectAt(mIndex++);
+}
+
+/**
+ * Pre-decrement operator
+ *
+ * @update	gess4/18/98
+ * @return  object at pre-decremented index
+ */
+void* nsDequeIterator::operator--() {
+  return mDeque.ObjectAt(--mIndex);
+}
+
+/**
+ * Post-decrement operator
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-decremented index
+ */
+void* nsDequeIterator::operator--(int) {
+  return mDeque.ObjectAt(mIndex--);
+}
+
+/**
+ * Dereference operator
+ *
+ * @update	gess4/18/98
+ * @return  object at ith index
+ */
+void* nsDequeIterator::GetCurrent(void) {
+  return mDeque.ObjectAt(mIndex);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+void nsDequeIterator::ForEach(nsDequeFunctor& aFunctor) const{
+  mDeque.ForEach(aFunctor);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDequeIterator::FirstThat(nsDequeFunctor& aFunctor) const{
+  return mDeque.FirstThat(aFunctor);
+}
+
+#ifdef  _SELFTEST_DEQUE
+/**************************************************************
+  Now define the token deallocator class...
+ **************************************************************/
+class _SelfTestDeallocator: public nsDequeFunctor{
+public:
+  _SelfTestDeallocator::_SelfTestDeallocator() {
+    nsDeque::SelfTest();
+  }
+  virtual void* operator()(void* anObject) {
+    return 0;
+  }
+};
+static _SelfTestDeallocator gDeallocator;
+#endif
+
+/**
+ * conduct automated self test for this class
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+void nsDeque::SelfTest(void) {
+#ifdef  _SELFTEST_DEQUE
+
+  {
+    nsDeque theDeque(gDeallocator); //construct a simple one...
+    
+    int ints[200];
+    int count=sizeof(ints)/sizeof(int);
+    int i=0;
+
+    for(i=0;i<count;i++){ //initialize'em
+      ints[i]=10*(1+i);
+    }
+
+    for(i=0;i<70;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<56;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<55;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<35;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+    for(i=0;i<35;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    for(i=0;i<38;i++){
+      int* temp=(int*)theDeque.Pop();
+    }
+
+  }
+
+  int x;
+  x=10;
+#endif
+}
+

mozilla/xpcom/ds/nsDeque.h

@@ -0,0 +1,410 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+ * MODULE NOTES:
+ * @update  gess 4/15/98 (tax day)
+ * 
+ * The Deque is a very small, very efficient container object
+ * than can hold elements of type void*, offering the following features:
+ *    It's interface supports pushing and poping of children.
+ *    It can iterate (via an interator class) it's children.
+ *    When full, it can efficently resize dynamically.
+ *
+ *
+ * NOTE: The only bit of trickery here is that this deque is
+ * built upon a ring-buffer. Like all ring buffers, the first 
+ * element may not be at index[0]. The mOrigin member determines 
+ * where the first child is. This point is quietly hidden from 
+ * customers of this class.
+ *    
+ */
+
+
+#ifndef _NSDEQUE
+#define _NSDEQUE
+
+#include "nscore.h"
+
+/**
+ * The nsDequefunctor class is used when you want to create
+ * callbacks between the deque and your generic code.
+ * Use these objects in a call to ForEach();
+ *
+ * @update	gess4/20/98
+ */
+class NS_COM nsDequeFunctor{
+public:
+  virtual void* operator()(void* anObject)=0;
+};
+
+
+/******************************************************
+ * Here comes the nsDeque class itself...
+ ******************************************************/
+
+/**
+ * The deque (double-ended queue) class is a common container type, 
+ * whose behavior mimics a line in your favorite checkout stand.
+ * Classic CS describes the common behavior of a queue as FIFO. 
+ * A Deque allows items to be added and removed from either end of
+ * the queue.
+ *
+ * @update	gess4/20/98
+ */
+
+class NS_COM nsDeque {
+friend class nsDequeIterator;
+  public:
+                       nsDeque(nsDequeFunctor* aDeallocator);
+                      ~nsDeque();
+            
+  /**
+   * Returns the number of elements currently stored in
+   * this deque.
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return  int contains element count
+   */
+  inline PRInt32 GetSize() const { return mSize;}  
+
+  /**
+   * Pushes new member onto the end of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& Push(void* anItem);
+
+  /**
+   * Pushes new member onto the front of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& PushFront(void* anItem);
+  
+  /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Pop(void);
+
+ /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* PopFront(void);
+
+ 
+  /**
+   * Return topmost item without removing it.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Peek(void);
+  
+  /**
+   * method used to retrieve ptr to
+   * ith member in container. DOesn't remove
+   * that item.
+   *
+   * @update	gess4/18/98
+   * @param   index of desired item
+   * @return  ptr to ith element in list
+   */
+  void* ObjectAt(int anIndex) const;
+  
+  /**
+   * Remove all items from container without destroying them
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Empty();
+  
+  /**
+   * Remove and delete all items from container
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Erase();
+
+
+  /**
+   * Creates a new iterator, init'ed to start of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator Begin() const;
+  
+  /**
+   * Creates a new iterator, init'ed to end of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator End() const;
+
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code. This process will interupt if
+   * your function returns a null to this iterator.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
+  /**
+   * Perform automated selftest on the deque
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  static void SelfTest();
+
+protected:
+
+  PRInt32         mSize;
+  PRInt32         mCapacity;
+  PRInt32         mOrigin;
+  nsDequeFunctor* mDeallocator;
+  void*           mBuffer[8];
+  void**          mData;
+
+
+private: 
+  
+
+  /**
+   * Simple default constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque();
+
+  /**
+   * Copy constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque(const nsDeque& other);
+
+  /**
+   * Deque assignment operator (PRIVATE)
+   *
+   * @update	gess4/18/98
+   * @param   another deque
+   * @return  *this
+   */
+  nsDeque& operator=(const nsDeque& anOther);
+
+  nsDeque&  GrowCapacity(void);
+
+};
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+class NS_COM nsDequeIterator {
+public:
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDeque& aQueue,int anIndex=0);
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDequeIterator& aCopy);
+
+  /**
+   * Moves iterator to first element in deque
+   * @update	gess4/18/98
+   * @return  this
+   */
+  nsDequeIterator& First(void);
+
+  /**
+   * Standard assignment operator for deque
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDequeIterator& operator=(const nsDequeIterator& aCopy);
+
+  /**
+   * preform ! operation against to iterators to test for equivalence
+   * (or lack thereof)!
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the object to be compared to
+   * @return  TRUE if NOT equal.
+   */
+  PRBool operator!=(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator<(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator==(nsDequeIterator& anIter);
+  
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator>=(nsDequeIterator& anIter);
+
+  /**
+   * Pre-increment operator 
+   *
+   * @update	gess4/18/98
+   * @return  object at preincremented index
+   */
+  void* operator++();
+
+  /**
+   * Post-increment operator 
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-incremented index
+   */
+  void* operator++(int);
+
+  /**
+   * Pre-decrement operator
+   *
+   * @update	gess4/18/98
+   * @return  object at pre-decremented index
+   */
+  void* operator--();
+
+  /**
+   * Post-decrement operator
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-decremented index
+   */
+  void* operator--(int);
+  
+  /**
+   * Retrieve the ptr to the iterators notion of current node
+   *
+   * @update	gess4/18/98
+   * @return  object at ith index
+   */
+  void* GetCurrent(void);
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  void ForEach(nsDequeFunctor& aFunctor) const;
+  
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  protected:
+
+        PRInt32         mIndex;
+        const nsDeque&  mDeque;
+};
+
+
+#endif

mozilla/xpcom/ds/nsEmptyEnumerator.cpp

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+
+  An empty enumerator.
+
+ */
+
+#include "nsIEnumerator.h"
+
+////////////////////////////////////////////////////////////////////////
+
+class EmptyEnumeratorImpl : public nsISimpleEnumerator
+{
+public:
+    EmptyEnumeratorImpl(void) {};
+    virtual ~EmptyEnumeratorImpl(void) {};
+
+    // nsISupports interface
+    NS_IMETHOD_(nsrefcnt) AddRef(void) {
+        return 2;
+    }
+
+    NS_IMETHOD_(nsrefcnt) Release(void) {
+        return 1;
+    }
+
+    NS_IMETHOD QueryInterface(REFNSIID iid, void** result) {
+        if (! result)
+            return NS_ERROR_NULL_POINTER;
+
+        if (iid.Equals(nsISimpleEnumerator::GetIID()) ||
+            iid.Equals(NS_GET_IID(nsISupports))) {
+            *result = (nsISimpleEnumerator*) this;
+            NS_ADDREF(this);
+            return NS_OK;
+        }
+        return NS_NOINTERFACE;
+    }
+
+    // nsISimpleEnumerator
+    NS_IMETHOD HasMoreElements(PRBool* aResult) {
+        *aResult = PR_FALSE;
+        return NS_OK;
+    }
+
+    NS_IMETHOD GetNext(nsISupports** aResult) {
+        return NS_ERROR_UNEXPECTED;
+    }
+};
+
+extern "C" NS_COM nsresult
+NS_NewEmptyEnumerator(nsISimpleEnumerator** aResult)
+{
+    static EmptyEnumeratorImpl gEmptyEnumerator;
+    *aResult = &gEmptyEnumerator;
+    return NS_OK;
+}
+