This is a copy of regalloc_code2_BRANCH from Netscape's private repository,

as it existed in January of 1998.


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

mozilla/ef/Compiler/RegisterAllocator/BitSet.cpp

@@ -0,0 +1,134 @@
+/* -*- 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 "Fundamentals.h"
+#include "BitSet.h"
+
+// Return the next bit after index set to true or -1 if none.
+//
+Int32 BitSet::nextOne(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(0)) {
+		while ((currentWord & Word(1)) == 0) {
+			++index;
+			currentWord >>= 1;
+		}
+		return (offset << nBitsInWordLog2) + index;
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(0)) {
+			index = 0;
+			while ((currentWord & Word(1)) == 0) {
+				++index;
+				currentWord >>= 1;
+			}
+			return (offset << nBitsInWordLog2) + index;
+		}
+	}
+	return -1;
+}
+
+// Return the next bit after index set to false or -1 if none.
+//
+Int32 BitSet::nextZero(Int32 pos) const
+{
+	++pos;
+
+	if (pos < 0 || Uint32(pos) >= universeSize)
+		return -1;
+
+	Uint32 offset = getWordOffset(pos);
+	Uint8 index = getBitOffset(pos);
+	Word* ptr = &word[offset];
+	Word currentWord = *ptr++ >> index;
+	
+	if (currentWord != Word(~0)) {
+		for (; index < nBitsInWord; ++index) {
+			if ((currentWord & Word(1)) == 0) {
+				Int32 ret = (offset << nBitsInWordLog2) + index;
+				return (Uint32(ret) < universeSize) ? ret : -1;
+			}
+			currentWord >>= 1;
+		}
+	}
+
+	Word* limit = &word[getSizeInWords(universeSize)];
+	while (ptr < limit) {
+		++offset;
+		currentWord = *ptr++;
+		if (currentWord != Word(~0)) {
+			for (index = 0; index < nBitsInWord; ++index) {
+				if ((currentWord & Word(1)) == 0) {
+					Int32 ret = (offset << nBitsInWordLog2) + index;
+					return (Uint32(ret) < universeSize) ? ret : -1;
+				}
+				currentWord >>= 1;
+			}
+		}
+	}
+	return -1;
+}
+
+#ifdef DEBUG_LOG
+
+// Print the set.
+//
+void BitSet::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("[ "));
+
+	for (Int32 i = firstOne(); i != -1; i = nextOne(i)) {
+		Int32 currentBit = i;
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", currentBit));
+
+		Int32 nextBit = nextOne(currentBit);
+		if (nextBit != currentBit + 1) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" "));
+			continue;
+		}
+		  
+		while ((nextBit != -1) && (nextBit == (currentBit + 1))) {
+			currentBit = nextBit;
+			nextBit = nextOne(nextBit);
+		}
+
+		if (currentBit > (i+1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("-%d ", currentBit));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" %d ", currentBit));
+
+		i = currentBit;
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("]\n"));
+}
+
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/BitSet.h

@@ -0,0 +1,195 @@
+/* -*- 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 _BITSET_H_
+#define _BITSET_H_
+
+#include "Fundamentals.h"
+#include "LogModule.h"
+#include "Pool.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// BitSet -
+
+class BitSet
+{
+private:
+
+#if (PR_BITS_PER_WORD == 64)
+	typedef Uint64 Word;
+#elif (PR_BITS_PER_WORD == 32)
+	typedef Uint32 Word;
+#endif
+
+	static const nBitsInWord = 		PR_BITS_PER_WORD;
+	static const nBytesInWord = 	PR_BYTES_PER_WORD;
+	static const nBitsInWordLog2 =	PR_BITS_PER_WORD_LOG2;
+	static const nBytesInWordLog2 = PR_BYTES_PER_WORD_LOG2;
+
+	// Return the number of Word need to store the universe.
+	static Uint32 getSizeInWords(Uint32 sizeOfUniverse) {return (sizeOfUniverse + (nBitsInWord - 1)) >> nBitsInWordLog2;}
+	// Return the given element offset in its containing Word.
+	static Uint32 getBitOffset(Uint32 element) {return element & (nBitsInWord - 1);}
+	// Return the Word offset for the given element int the universe.
+	static Uint32 getWordOffset(Uint32 element) {return element >> nBitsInWordLog2;}
+	// Return the mask for the given bit index.
+	static Word getMask(Uint8 index) {return Word(1) << index;}
+	
+private:
+
+	Uint32							universeSize;			// Size of the universe
+	Word*							word;					// universe memory.
+
+private:
+
+	// No copy constructor.
+	BitSet(const BitSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const BitSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	// Create a bitset of universeSize bits.
+	BitSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {word = new(pool) Word[getSizeInWords(universeSize)]; clear();}
+
+	// Return the size of this bitset.
+	Uint32 getSize() const {return universeSize;}
+
+	// Clear the bitset.
+	void clear() {memset(word, 0x00, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Clear the bit at index.
+	void clear(Uint32 index) {checkMember(index); word[getWordOffset(index)] &= ~getMask(index);}
+	// Set the bitset.
+	void set() {memset(word, 0xFF, getSizeInWords(universeSize) << nBytesInWordLog2);}
+	// Set the bit at index.
+	void set(Uint32 index) {checkMember(index); word[getWordOffset(index)] |= getMask(index);}
+	// Return true if the bit at index is set.
+	bool test(Uint32 index) const {checkMember(index); return (word[getWordOffset(index)] & getMask(index)) != 0;}
+	// Union with the given bitset.
+	inline void or(const BitSet& set);
+	// Intersection with the given bitset.
+	inline void and(const BitSet& set);
+	// Difference with the given bitset.
+	inline void difference(const BitSet& set);
+	// Copy set.
+	inline BitSet& operator = (const BitSet& set);
+	// Return true if the bitset are identical.
+	friend bool operator == (const BitSet& set1, const BitSet& set2);
+	// Return true if the bitset are different.
+	friend bool operator != (const BitSet& set1, const BitSet& set2);
+
+	// Logical operators.
+	BitSet& operator |= (const BitSet& set) {or(set); return *this;}
+	BitSet& operator &= (const BitSet& set) {and(set); return *this;}
+	BitSet& operator -= (const BitSet& set) {difference(set); return *this;}
+
+	// Return the first bit at set to true or -1 if none.
+	Int32 firstOne() const {return nextOne(-1);}
+	// Return the next bit after index set to true or -1 if none.
+	Int32 nextOne(Int32 pos) const;
+	// Return the first bit at set to false or -1 if none.
+	Int32 firstZero() const {return nextZero(-1);}
+	// Return the next bit after index set to false or -1 if none.
+	Int32 nextZero(Int32 pos) const;
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return true if the walk is ordered.
+	static bool isOrdered() {return true;}
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return firstOne();}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return nextOne(pos);}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == -1;}
+	// Return the element corresponding to the given iterator.
+	Uint32 get(iterator pos) const {return pos;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// Union with the given bitset.
+//
+inline void  BitSet::or(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ |= *src++;
+}
+
+// Intersection with the given bitset.
+//
+inline void  BitSet::and(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= *src++;
+}
+
+// Difference with the given bitset.
+//
+inline void BitSet::difference(const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	Word* src = set.word;
+	Word* dst = word;
+	Word* limit = &src[getSizeInWords(universeSize)];
+
+	while (src < limit)
+		*dst++ &= ~*src++;
+}
+
+// Copy the given set into this set.
+//
+inline BitSet& BitSet::operator = (const BitSet& set)
+{
+	checkUniverseCompatibility(set);
+	if (this != &set)
+		memcpy(word, set.word, getSizeInWords(universeSize) << nBytesInWordLog2);
+	return *this;
+}
+
+// Return true if the given set is identical to this set.
+inline bool operator == (const BitSet& set1, const BitSet& set2)
+{
+	set1.checkUniverseCompatibility(set2);
+
+	if (&set1 == &set2)
+		return true;
+
+	return memcmp(set1.word, set2.word, BitSet::getSizeInWords(set1.universeSize) << BitSet::nBytesInWordLog2) == 0;
+}
+
+inline bool operator != (const BitSet& set1, const BitSet& set2) {return !(set1 == set2);}
+
+#endif // _BITSET_H

mozilla/ef/Compiler/RegisterAllocator/Coalescing.h

@@ -0,0 +1,159 @@
+/* -*- 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 _COALESCING_H_
+#define _COALESCING_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "RegisterPressure.h"
+#include "InterferenceGraph.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+#if 1
+// Performing an ultra conservative coalescing meens that when we look at
+// candidates (source,destination) for coalescing we need to make sure
+// that the combined interference of the source and destination register
+// will not exceed the total number of register available for the register
+// class. 
+#define ULTRA_CONSERVATIVE_COALESCING
+#else
+// If we are not doing an ultra conservative coalescing we have to make sure 
+// that the total number of neighbor whose degree is greater than the total 
+// number of register is not greater than the total number of register.
+#undef ULTRA_CONSERVATIVE_COALESCING
+#endif
+
+template <class RegisterPressure>
+struct Coalescing
+{
+	static bool coalesce(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+bool Coalescing<RegisterPressure>::coalesce(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+
+   	// Initialize the lookup table
+	//
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* newRange = new RegisterName[2 * rangeCount];
+	RegisterName* coalescedRange = &newRange[rangeCount];
+	RegisterName* name2range = registerAllocator.name2range;
+
+	init(coalescedRange, rangeCount);
+
+	SparseSet interferences(pool, rangeCount);
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	bool removedInstructions = false;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.lndList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+
+	// Walk the nodes in the loop nesting depth list.
+	for (Int32 n = nNodes - 1; n >= 0; n--) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		InstructionList::iterator it = instructions.begin();
+		while (!instructions.done(it)) {
+			Instruction& instruction = instructions.get(it);
+			it = instructions.advance(it);
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+
+				RegisterName source = findRoot(name2range[instruction.getInstructionUseBegin()[0].getRegisterName()], coalescedRange);
+				RegisterName destination = findRoot(name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()], coalescedRange);
+
+				if (source == destination) {
+					instruction.remove();
+				} else if (!iGraph.interfere(source, destination)) {
+					InterferenceVector* sourceVector = iGraph.getInterferenceVector(source);
+					InterferenceVector* destinationVector = iGraph.getInterferenceVector(destination);
+
+#ifdef ULTRA_CONSERVATIVE_COALESCING
+					interferences.clear();
+
+					InterferenceVector* vector;
+					for (vector = sourceVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+					for (vector = destinationVector; vector != NULL; vector = vector->next) {
+						RegisterName* neighbors = vector->neighbors;
+						for (Uint32 i = 0; i < vector->count; i++)
+							interferences.set(findRoot(neighbors[i], coalescedRange));
+					}
+
+					Uint32 count = interferences.getSize();
+#else // ULTRA_CONSERVATIVE_COALESCING
+					trespass("not implemented");
+					Uint32 count = 0;
+#endif // ULTRA_CONSERVATIVE_COALESCING
+
+					if (count < 6 /* FIX: should get the number from the class */) {
+						// Update the interferences vector.
+						if (sourceVector == NULL) {
+							iGraph.setInterferenceVector(source, destinationVector);
+							sourceVector = destinationVector;
+						} else if (destinationVector == NULL)
+							iGraph.setInterferenceVector(destination, sourceVector);
+						else {
+							InterferenceVector* last = NULL;
+							for (InterferenceVector* v = sourceVector; v != NULL; v = v->next)
+								last = v;
+							assert(last);
+							last->next = destinationVector;
+							iGraph.setInterferenceVector(destination, sourceVector);
+						}
+						// Update the interference matrix.
+						for (InterferenceVector* v = sourceVector; v != NULL; v = v->next) {
+							RegisterName* neighbors = v->neighbors;
+							for (Uint32 i = 0; i < v->count; i++) {
+								RegisterName neighbor = findRoot(neighbors[i], coalescedRange);
+								iGraph.setInterference(neighbor, source);
+								iGraph.setInterference(neighbor, destination);
+							}
+						}
+
+						instruction.remove();
+						coalescedRange[source] = destination;
+						removedInstructions = true;
+					}
+				}
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, coalescedRange, registerAllocator.nameCount, rangeCount);
+	delete newRange;
+
+	return removedInstructions;
+}
+
+#endif // _COALESCING_H_

mozilla/ef/Compiler/RegisterAllocator/Coloring.cpp

@@ -0,0 +1,283 @@
+/* -*- 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 NEW_LAURENTM_CODE
+
+#include "Coloring.h"
+#include "VirtualRegister.h"
+#include "FastBitSet.h"
+#include "FastBitMatrix.h"
+#include "CpuInfo.h"
+
+bool Coloring::
+assignRegisters(FastBitMatrix& interferenceMatrix)
+{
+  PRUint32 *stackPtr = new(pool) PRUint32[vRegManager.count()];
+
+  return select(interferenceMatrix, stackPtr, simplify(interferenceMatrix, stackPtr));
+}
+
+PRInt32 Coloring::
+getLowestSpillCostRegister(FastBitSet& bitset)
+{
+  PRInt32 lowest = bitset.firstOne();
+  if (lowest != -1)
+	{
+	  Flt32 cost = vRegManager.getVirtualRegister(lowest).spillInfo.spillCost;
+	  for (PRInt32 r = bitset.nextOne(lowest); r != -1; r = bitset.nextOne(r))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+		  if (!vReg.spillInfo.infiniteSpillCost && (vReg.spillInfo.spillCost < cost))
+			{
+			  cost = vReg.spillInfo.spillCost;
+			  lowest = r;
+			}
+		}
+	}
+  return lowest;
+}
+
+PRUint32* Coloring::
+simplify(FastBitMatrix interferenceMatrix, PRUint32* stackPtr)
+{
+  // first we construct the sets low and high. low contains all nodes of degree
+  // inferior to the number of register available on the processor. All the
+  // nodes with an high degree and a finite spill cost are placed in high.
+  // Nodes of high degree and infinite spill cost are not included in either sets.
+
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet low(pool, nRegisters);
+  FastBitSet high(pool, nRegisters);
+  FastBitSet stack(pool, nRegisters);
+
+  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+	{
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+	  
+	  if (vReg.getClass() == vrcStackSlot)
+		{
+		  stack.set(i);
+		  vReg.colorRegister(nRegisters);
+		}
+	  else
+		{
+		  if (vReg.colorInfo.interferenceDegree < NUMBER_OF_REGISTERS)
+			low.set(i);
+		  else // if (!vReg.spillInfo.infiniteSpillCost)
+			high.set(i);
+
+		  // Set coloring info.
+		  vReg.spillInfo.willSpill = false;
+
+		  switch(vReg.getClass())
+			{
+			case vrcInteger:
+			  vReg.colorRegister(LAST_GREGISTER + 1);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  vReg.colorRegister(LAST_FPREGISTER + 1);
+			  break;
+			default:
+			  PR_ASSERT(false); // Cannot happen.
+			}
+		}
+	}
+
+  // push the stack registers
+  PRInt32 j;
+  for (j = stack.firstOne(); j != -1; j = stack.nextOne(j))
+	*stackPtr++ = j;
+
+  // simplify
+  while (true)
+	{
+	  PRInt32 r;
+	  while ((r = getLowestSpillCostRegister(low)) != -1)
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+		  /* update low and high */
+		  FastBitSet inter(interferenceMatrix.getRow(r), nRegisters);
+		  for (j = inter.firstOne(); j != -1; j = inter.nextOne(j))
+			{
+			  VirtualRegister& neighbor = vRegManager.getVirtualRegister(j);
+			  // if the new interference degree of one of his neighbor becomes
+			  // NUMBER_OF_REGISTERS - 1 then it is added to the set 'low'.
+			  
+			  PRUint32 maxInterference = 0;
+			  switch (neighbor.getClass())
+				{
+				case vrcInteger:
+				  maxInterference = NUMBER_OF_GREGISTERS;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  maxInterference = NUMBER_OF_FPREGISTERS;
+				  break;
+				default:
+				  PR_ASSERT(false);
+				}
+			  if ((vRegManager.getVirtualRegister(j).colorInfo.interferenceDegree-- == maxInterference))
+				{
+				  high.clear(j);
+				  low.set(j);
+				}
+			  vReg.colorInfo.interferenceDegree--;
+			  interferenceMatrix.clear(r, j);
+			  interferenceMatrix.clear(j, r);
+			}
+		  low.clear(r);
+
+		  // Push this register.
+		  *stackPtr++ = r;
+		}
+	  if ((r = getLowestSpillCostRegister(high)) != -1)
+		{
+		  high.clear(r);
+		  low.set(r);
+		}
+	  else
+		break;
+	}
+
+  return stackPtr;
+}
+
+bool Coloring::
+select(FastBitMatrix& interferenceMatrix, PRUint32* stackBase, PRUint32* stackPtr)
+{
+  PRUint32 nRegisters = vRegManager.count();
+  FastBitSet usedRegisters(NUMBER_OF_REGISTERS + 1); // usedRegisters if used for both GR & FPR.
+  FastBitSet preColoredRegisters(NUMBER_OF_REGISTERS + 1);
+  FastBitSet usedStack(nRegisters + 1);
+  bool success = true;
+  Int32 lastUsedSSR = -1;
+
+  // select
+  while (stackPtr != stackBase)
+	{
+	  // Pop one register.
+	  PRUint32 r = *--stackPtr;
+	  VirtualRegister& vReg = vRegManager.getVirtualRegister(r);
+
+	  FastBitSet neighbors(interferenceMatrix.getRow(r), nRegisters);
+		  
+	  if (vReg.getClass() == vrcStackSlot)
+		// Stack slots coloring.
+		{
+		  usedStack.clear();
+
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			usedStack.set(vRegManager.getVirtualRegister(i).getColor());
+
+		  Int32 color = usedStack.firstZero();
+		  vReg.colorRegister(color);
+		  if (color > lastUsedSSR)
+			  lastUsedSSR = color;
+		}
+	  else
+		// Integer & Floating point register coloring.
+		{
+		  usedRegisters.clear();
+		  preColoredRegisters.clear();
+		  
+		  for (PRInt32 i = neighbors.firstOne(); i != -1; i = neighbors.nextOne(i))
+			{
+			  VirtualRegister& nvReg = vRegManager.getVirtualRegister(i);
+			  usedRegisters.set(nvReg.getColor());
+			  if (nvReg.isPreColored())
+				preColoredRegisters.set(nvReg.getPreColor());
+			}
+		  if (vReg.hasSpecialInterference)
+			usedRegisters |= vReg.specialInterference;
+
+		  PRInt8 c = -1;
+		  PRInt8 maxColor = 0;
+		  PRInt8 firstColor = 0;
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  firstColor = FIRST_GREGISTER;
+			  maxColor = LAST_GREGISTER;
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+			  firstColor = FIRST_FPREGISTER;
+			  maxColor = LAST_FPREGISTER;
+			  break;
+			default:
+			  PR_ASSERT(false);
+			}
+
+		  if (vReg.isPreColored())
+			{
+			  c = vReg.getPreColor();
+			  if (usedRegisters.test(c))
+				c = -1;
+			}
+		  else
+			{
+			  for (c = usedRegisters.nextZero(firstColor - 1); (c >= 0) && (c <= maxColor) && (preColoredRegisters.test(c)); 
+				   c = usedRegisters.nextZero(c)) {}
+			}
+
+		  if ((c >= 0) && (c <= maxColor))
+			{
+			  vReg.colorRegister(c);
+			}
+		  else
+			{
+			  VirtualRegister& stackRegister = vRegManager.newVirtualRegister(vrcStackSlot);
+			  vReg.equivalentRegister[vrcStackSlot] = &stackRegister;	  
+			  vReg.spillInfo.willSpill = true;
+			  success = false;
+			}
+		}
+	}
+  
+#ifdef DEBUG
+  if (success)
+	{
+	  for (VirtualRegisterManager::iterator i = vRegManager.begin(); !vRegManager.done(i); i = vRegManager.advance(i))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(i);
+		  switch (vReg.getClass())
+			{
+			case vrcInteger:
+			  if (vReg.getColor() > LAST_GREGISTER)
+				PR_ASSERT(false);
+			  break;
+			case vrcFloatingPoint:
+			case vrcFixedPoint:
+#if NUMBER_OF_FPREGISTERS != 0
+			  if (vReg.getColor() > LAST_FPREGISTER)
+				PR_ASSERT(false);
+#endif
+			  break;
+			default:
+			  break;
+			}
+		}
+	}
+#endif
+
+  vRegManager.nUsedStackSlots = lastUsedSSR + 1;
+  return success;
+}
+#endif // NEW_LAURENTM_CODE

mozilla/ef/Compiler/RegisterAllocator/Coloring.h

@@ -0,0 +1,284 @@
+/* -*- 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 "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "VirtualRegister.h"
+#include "InterferenceGraph.h"
+#include "SparseSet.h"
+#include "Spilling.h"
+#include "Splits.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+class Coloring
+{
+private:
+	static RegisterName* simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack);
+	static bool select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr);
+
+public:
+	static bool color(RegisterAllocator& registerAllocator);
+	static void finalColoring(RegisterAllocator& registerAllocator);
+};
+
+
+template <class RegisterPressure>
+void Coloring<RegisterPressure>::finalColoring(RegisterAllocator& registerAllocator)
+{
+	RegisterName* color = registerAllocator.color;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					usePtr->setRegisterName(color[name2range[usePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = usePtr->getRegisterID();
+					setColoredRegister(rid);
+					usePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					definePtr->setRegisterName(color[name2range[definePtr->getRegisterName()]]);
+#ifdef DEBUG
+					RegisterID rid = definePtr->getRegisterID();
+					setColoredRegister(rid);
+					definePtr->setRegisterID(rid);
+#endif // DEBUG
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::select(RegisterAllocator& registerAllocator, RegisterName* coloringStack, RegisterName* coloringStackPtr)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* color = new RegisterName[rangeCount];
+	registerAllocator.color = color;
+
+	for (Uint32 r = 1; r < rangeCount; r++)
+		color[r] = RegisterName(6); // FIX;
+
+	// Color the preColored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID) {
+			color[name2range[getName(machinePtr->id)]] = machinePtr->color;
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill preColor range %d as %d\n", name2range[getName(machinePtr->id)], machinePtr->color));
+		}
+
+	SpillCost* cost = registerAllocator.spillCost;
+	Pool& pool = registerAllocator.pool;
+	SparseSet& spill = *new(pool) SparseSet(pool, rangeCount);
+	registerAllocator.willSpill = &spill;
+	SparseSet neighborColors(pool, 6); // FIX
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	bool coloringFailed = false;
+	while (coloringStackPtr > coloringStack) {
+		RegisterName range = *--coloringStackPtr;
+
+		if (!cost[range].infinite && cost[range].cost < 0) {
+			coloringFailed = true;
+			spill.set(range);
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, will spill.\n", range));
+		} else {
+			neighborColors.clear();
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = vector->count - 1; i >= 0; --i) {
+					RegisterName neighborColor = color[vector->neighbors[i]];
+					if (neighborColor < 6) // FIX
+						neighborColors.set(neighborColor);
+				}
+
+			if (neighborColors.getSize() == 6) { // FIX
+				coloringFailed = true;
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tfailed to color %d, ", range));
+
+				if (!Splits<RegisterPressure>::findSplit(registerAllocator, color, range)) {
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will spill.\n"));
+					spill.set(range);
+				} else
+					UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("will split.\n"));
+			} else {
+				for (Uint32 i = 0; i < 6; i++) // FIX
+					if (!neighborColors.test(i)) {
+						fprintf(stdout, "\twill color %d as %d\n", range, i);
+						color[range] = RegisterName(i);
+						break;
+					}
+			}
+		}
+	}
+
+#ifdef DEBUG_LOG
+	if (coloringFailed) {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring failed:\n"));
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\twill spill: "));
+		spill.printPretty(UT_LOG_MODULE(RegAlloc));
+	} else {
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring succeeded:\n"));
+		for (Uint32 i = 1; i < rangeCount; i++)
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\trange %d colored as %d\n", i, color[i]));
+	}
+#endif
+
+	return !coloringFailed;
+}
+
+template <class RegisterPressure>
+RegisterName* Coloring<RegisterPressure>::simplify(RegisterAllocator& registerAllocator, RegisterName* coloringStack)
+{
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+	SpillCost* spillCost = registerAllocator.spillCost;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+
+	Uint32* degree = new Uint32[rangeCount];
+	for (RegisterName i = RegisterName(1); i < rangeCount; i = RegisterName(i + 1)) {
+		InterferenceVector* vector = iGraph.getInterferenceVector(i);
+		degree[i] = (vector != NULL) ? vector->count : 0;
+	}
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet low(pool, rangeCount);
+	SparseSet high(pool, rangeCount);
+	SparseSet highInfinite(pool, rangeCount);
+	SparseSet preColored(pool, rangeCount);
+
+	// Get the precolored registers.
+	//
+	VirtualRegisterManager& vrManager = registerAllocator.vrManager;
+	RegisterName* name2range = registerAllocator.name2range;
+	PreColoredRegister* machineEnd = vrManager.getMachineRegistersEnd();
+	for (PreColoredRegister* machinePtr = vrManager.getMachineRegistersBegin(); machinePtr < machineEnd; machinePtr++)
+		if (machinePtr->id != invalidID)
+			preColored.set(name2range[getName(machinePtr->id)]);
+
+	// Insert the live ranges in the sets.
+	//
+	for (Uint32 range = 1; range < rangeCount; range++)
+		if (!preColored.test(range))
+			if (degree[range] < 6) // FIX
+				low.set(range);
+			else if (!spillCost[range].infinite)
+				high.set(range);
+			else
+				highInfinite.set(range);
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring sets:\n\tlow = "));
+	low.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thigh = "));
+	high.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\thighInfinite = "));
+	highInfinite.printPretty(UT_LOG_MODULE(RegAlloc));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tpreColored = "));
+	preColored.printPretty(UT_LOG_MODULE(RegAlloc));
+#endif // DEBUG_LOG
+
+	RegisterName* coloringStackPtr = coloringStack;
+
+	while (low.getSize() != 0 || high.getSize() != 0) {
+		while (low.getSize() != 0) {
+			RegisterName range = RegisterName(low.getOne());
+			low.clear(range);
+			*coloringStackPtr++ = range;
+
+			for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+				for (Int32 i = (vector->count - 1); i >= 0; --i) {
+					RegisterName neighbor = vector->neighbors[i];
+					degree[neighbor]--;
+
+					if (degree[neighbor] < 6) // FIX
+						if (high.test(neighbor)) {
+							high.clear(neighbor);
+							low.set(neighbor);
+						} else if (highInfinite.test(neighbor)) {
+							highInfinite.clear(neighbor);
+							low.set(neighbor);
+						}
+				}
+		}
+
+		if (high.getSize() != 0) {
+			RegisterName best = RegisterName(high.getOne());
+			double bestCost = spillCost[best].cost;
+			double bestDegree = degree[best];
+
+			// Choose the next best candidate.
+			//
+			for (SparseSet::iterator i = high.begin(); !high.done(i); i = high.advance(i)) {
+				RegisterName range = RegisterName(high.get(i));
+				double thisCost = spillCost[range].cost;
+				double thisDegree = degree[range];
+
+				if (thisCost * bestDegree < bestCost * thisDegree) {
+					best = range;
+					bestCost = thisCost;
+					bestDegree = thisDegree;
+				}
+			}
+			
+			high.clear(best);
+			low.set(best);
+		}
+ 	}
+	assert(highInfinite.getSize() == 0);
+
+	delete degree;
+
+#ifdef DEBUG_LOG
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("Coloring stack:\n\t"));
+	for (RegisterName* sp = coloringStack; sp < coloringStackPtr; ++sp)
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("%d ", *sp));
+	UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\n"));
+#endif // DEBUG_LOG
+
+	return coloringStackPtr;
+}
+
+
+template <class RegisterPressure>
+bool Coloring<RegisterPressure>::color(RegisterAllocator& registerAllocator)
+{
+	RegisterName* coloringStack = new RegisterName[registerAllocator.rangeCount];
+	return select(registerAllocator, coloringStack, simplify(registerAllocator, coloringStack));
+}

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.cpp

@@ -0,0 +1,212 @@
+/* -*- 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 "Fundamentals.h"
+#include <string.h>
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+
+#include "DominatorGraph.h"
+
+DominatorGraph::DominatorGraph(ControlGraph& controlGraph) : controlGraph(controlGraph)
+{
+	Uint32 nNodes = controlGraph.nNodes;
+
+	GtoV = new Uint32[nNodes + 1];
+	VtoG = new Uint32[nNodes + 1];
+
+	Uint32 v = 1;
+	for (Uint32 n = 0; n < nNodes; n++) {
+		VtoG[v] = n;
+		GtoV[n] = v++;
+	}
+
+	// Initialize all the 1-based arrays.
+	//
+	parent =	new Uint32[v];
+	semi =		new Uint32[v];
+	vertex =	new Uint32[v];
+	label =		new Uint32[v];
+	size =		new Uint32[v];
+	ancestor =	new Uint32[v];
+	child =		new Uint32[v];
+	dom =		new Uint32[v];
+	bucket =	new DGLinkedList*[v];
+
+	memset(semi, '\0', v * sizeof(Uint32));
+	memset(bucket, '\0', v * sizeof(DGLinkedList*));
+
+	vCount = v;
+
+	build();
+
+	delete parent;
+	delete semi;
+	delete vertex;
+	delete label;
+	delete size;
+	delete ancestor;
+	delete child;
+	delete dom;
+	delete bucket;
+}
+
+Uint32 DominatorGraph::DFS(Uint32 vx, Uint32 n)
+{
+	semi[vx] = ++n;
+	vertex[n] = label[vx] = vx;
+	ancestor[vx] = child[vx] = 0;
+	size[vx] = 1;
+
+
+	ControlNode& node = *controlGraph.dfsList[VtoG[vx]];
+	ControlEdge* successorEnd = node.getSuccessorsEnd();
+	for (ControlEdge* successorPtr = node.getSuccessorsBegin(); successorPtr < successorEnd; successorPtr++) {
+		Uint32 w = GtoV[successorPtr->getTarget().dfsNum];
+		if (semi[w] == 0) {
+			parent[w] = vx;
+			n = DFS(w, n);
+		}
+	}
+	return n;
+}
+
+void DominatorGraph::LINK(Uint32 vx, Uint32 w)
+{
+    Uint32 s = w;
+
+	while (semi[label[w]] < semi[label[child[s]]]) {
+		if (size[s] + size[child[child[s]]] >= (size[child[s]] << 1)) {
+			ancestor[child[s]] = s;
+			child[s] = child[child[s]];
+		} else {
+			size[child[s]] = size[s];
+			s = ancestor[s] = child[s];
+		}
+	}
+	label[s] = label[w];
+	size[vx] += size[w];
+	if(size[vx] < (size[w] << 1)) {
+		Uint32 t = s;
+		s = child[vx]; 
+		child[vx] = t;
+	}
+	while( s != 0 ) {
+		ancestor[s] = vx;
+		s = child[s];
+	}
+}
+
+
+void DominatorGraph::COMPRESS(Uint32 vx)
+{
+	if(ancestor[ancestor[vx]] != 0) {
+		COMPRESS(ancestor[vx]);
+		if(semi[label[ancestor[vx]]] < semi[label[vx]])
+			label[vx] = label[ancestor[vx]];
+		ancestor[vx] = ancestor[ancestor[vx]];
+	}
+}
+
+Uint32 DominatorGraph::EVAL(Uint32 vx)
+{
+	if(ancestor[vx] == 0) 
+		return label[vx];
+	COMPRESS(vx);
+	return (semi[label[ancestor[vx]]] >= semi[label[vx]]) ? label[vx] : label[ancestor[vx]];
+}
+
+void DominatorGraph::build()
+{
+	Uint32 n = DFS(GtoV[0], 0);
+	size[0] = label[0] = semi[0];
+
+	for (Uint32 i = n; i >= 2; i--) {
+		Uint32 w = vertex[i];
+
+		ControlNode& node = *controlGraph.dfsList[VtoG[w]];
+		const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+		for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p)) {
+			Uint32 vx = GtoV[predecessors.get(p).getSource().dfsNum];
+			Uint32 u = EVAL(vx);
+
+			if(semi[u] < semi[w])
+				semi[w] = semi[u];
+		}
+
+		DGLinkedList* elem = new DGLinkedList();
+		elem->next = bucket[vertex[semi[w]]];
+		elem->index = w;
+		bucket[vertex[semi[w]]] = elem;
+
+		LINK(parent[w], w);
+
+		elem = bucket[parent[w]];
+		while(elem != NULL) {
+			Uint32 vx = elem->index;
+			Uint32 u = EVAL(vx);
+			dom[vx] = (semi[u] < semi[vx]) ? u : parent[w];
+			elem = elem->next;
+		}
+	}
+
+	memset(size, '\0', n * sizeof(Uint32));
+	Pool& pool = controlGraph.pool;
+	nodes = new(pool) DGNode[n];
+
+	for(Uint32 j = 2; j <= n; j++) {
+		Uint32 w = vertex[j];
+		Uint32 d = dom[w];
+		if(d != vertex[semi[w]]) {
+			d = dom[d];
+			dom[w] = d;
+		}
+		size[d]++;
+	}
+	dom[GtoV[0]] = 0;
+
+	for (Uint32 k = 1; k <= n; k++) {
+		DGNode& node = nodes[VtoG[k]];
+		Uint32 count = size[k];
+		node.successorsEnd = node.successorsBegin = (count) ? new(pool) Uint32[count] : (Uint32*) 0;
+	}
+
+	for (Uint32 l = 2; l <= n; l++)
+		*(nodes[VtoG[dom[l]]].successorsEnd)++ = VtoG[l];
+}
+
+#ifdef DEBUG_LOG
+void DominatorGraph::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Dominator Graph:\n"));
+	Uint32 nNodes = controlGraph.nNodes;
+	for (Uint32 i = 0; i < nNodes; i++) {
+		DGNode& node = nodes[i];
+		if (node.successorsBegin !=  node.successorsEnd) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tN%d dominates ", i));
+			for (Uint32* successorsPtr = node.successorsBegin; successorsPtr < node.successorsEnd; successorsPtr++)
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d ", *successorsPtr));
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+
+#endif // DEBUG_LOG
+
+
+

mozilla/ef/Compiler/RegisterAllocator/DominatorGraph.h

@@ -0,0 +1,80 @@
+/* -*- 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 _DOMINATOR_GRAPH_H_
+#define _DOMINATOR_GRAPH_H_
+
+#include "LogModule.h"
+
+class ControlGraph;
+
+struct DGNode
+{
+	Uint32* successorsBegin;
+	Uint32* successorsEnd;
+};
+
+struct DGLinkedList
+{
+	DGLinkedList* next;
+	Uint32 index;
+};
+
+class DominatorGraph
+{
+private:
+
+	ControlGraph&	controlGraph;
+
+	Uint32			vCount;
+
+	Uint32*			VtoG;
+	Uint32*			GtoV;
+	Uint32*			parent;
+	Uint32*			semi;
+	Uint32*			vertex;
+	Uint32*			label;
+	Uint32*			size;
+	Uint32*			ancestor;
+	Uint32*			child;
+	Uint32*			dom;
+	DGLinkedList**	bucket;
+	DGNode*			nodes;
+	
+private:
+
+	void build();
+
+	Uint32 DFS(Uint32 vx, Uint32 n);
+	void LINK(Uint32 vx, Uint32 w);
+	void COMPRESS(Uint32 vx);
+	Uint32 EVAL(Uint32 vx);
+
+public:
+
+	DominatorGraph(ControlGraph& controlGraph);
+
+	Uint32* getSuccessorsBegin(Uint32 n) const {return nodes[n].successorsBegin;}
+	Uint32* getSuccessorsEnd(Uint32 n) const {return nodes[n].successorsEnd;}
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+#endif // _DOMINATOR_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/HashSet.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- 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
@@ -16,6 +16,5 @@
  * Reserved.
  */
 
-#define MAC_STATIC 1
-
-#include "Widget.prefix"
+#include "Fundamentals.h"
+#include "HashSet.h"

mozilla/ef/Compiler/RegisterAllocator/HashSet.h

@@ -0,0 +1,97 @@
+/* -*- 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 _HASH_SET_H_
+#define _HASH_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include <string.h>
+
+struct HashSetElement
+{
+	Uint32 index;
+	HashSetElement* next;
+};
+
+class HashSet
+{
+private:
+
+	static const hashSize = 64;
+
+	// Return the hash code for the given element index.
+	static Uint32 getHashCode(Uint32 index) {return index & (hashSize - 1);} // Could be better !
+
+private:
+
+	Pool&					allocationPool;
+	HashSetElement**		bucket;
+	HashSetElement*			free;
+
+private:
+
+	// No copy constructor.
+	HashSet(const HashSet&);
+	// No copy operator.
+	void operator = (const HashSet&);
+
+public:
+
+	// Create a new HashSet.
+	inline HashSet(Pool& pool, Uint32 universeSize);
+
+	// Clear the hashset.
+	void clear();
+	// Clear the element for the given index.
+	void clear(Uint32 index);
+	// Set the element for the given index.
+	void set(Uint32 index);
+	// Return true if the element at index is a member.
+	bool test(Uint32 index) const;
+	// Union with the given hashset.
+	inline void or(const HashSet& set);
+	// Intersection with the given hashset.
+	inline void and(const HashSet& set);
+	// Difference with the given hashset.
+	inline void difference(const HashSet& set);
+
+	// Logical operators.
+	HashSet& operator |= (const HashSet& set) {or(set); return *this;}
+	HashSet& operator &= (const HashSet& set) {and(set); return *this;}
+	HashSet& operator -= (const HashSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef HashSetElement* iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const;
+	// Return the next iterator.
+	iterator advance(iterator pos) const;
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos == NULL;}
+};
+
+
+inline HashSet::HashSet(Pool& pool, Uint32 /*universeSize*/)
+	: allocationPool(pool), free(NULL)
+{
+	bucket = new(pool) HashSetElement*[hashSize];
+	memset(bucket, '\0', sizeof(HashSetElement*));
+}
+
+#endif // _HASH_SET_H_

mozilla/ef/Compiler/RegisterAllocator/IndexedPool.h

@@ -0,0 +1,213 @@
+/* -*- 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 _INDEXED_POOL_H_
+#define _INDEXED_POOL_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include <stdlib.h>
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObjectSubclass> is an indexed pool of objects. The
+// template parameter 'IndexedObjectSubclass' must be a subclass of the struct
+// IndexedObject.
+// 
+// When the indexed pool is ask to allocate and initialize a new object (using
+// the operator new(anIndexedPool) it will zero the memory used to store the
+// object and initialize the field 'index' of this object to its position in
+// the pool.
+//
+// An object allocated by the indexed pool can be freed by calling the method
+// IndexedPool::release(IndexedElement& objectIndex).
+//
+// example:
+//
+//   IndexedPool<IndexedElement> elementPool;
+//
+//   IndexedElement& element1 = *new(elementPool) IndexedElement();
+//   IndexedElement& element2 = *new(elementPool) IndexedElement();
+//
+//   indexedPool.release(element1);
+//   IndexedElement& element3 = *new(elementPool) IndexedElement();
+//
+//  At this point element1 is no longer a valid object, element2 is at
+//  index 2 and element3 is at index 1.
+//
+
+//------------------------------------------------------------------------------
+// IndexedObject -
+//
+
+template<class Object>
+struct IndexedObject
+{
+	Uint32			index;				// Index in the pool.
+	Object*			next;				// Used to link IndexedObject together.
+
+	Uint32 getIndex() {return index;}
+};
+
+//------------------------------------------------------------------------------
+// IndexedPool<IndexedObject> -
+//
+
+template <class IndexedObject>
+class IndexedPool
+{
+private:
+
+	static const	blockSize = 4;		// Size of one block.
+
+	Uint32			nBlocks;			// Number of blocks in the pool.
+	IndexedObject**	block;				// Array of block pointers.
+	IndexedObject*  freeObjects;		// Chained list of free IndexedObjects.
+	Uint32			nextIndex;			// Index of the next free object in the last block. 
+
+private:
+
+	void allocateAnotherBlock();
+	IndexedObject& newObject();
+
+public:
+
+	IndexedPool() : nBlocks(0), block(NULL), freeObjects(NULL), nextIndex(1) {}
+	~IndexedPool();
+
+	IndexedObject& get(Uint32 index) const;
+	void release(IndexedObject& object);
+
+	void setSize(Uint32 size) {assert(size < nextIndex); nextIndex = size;}
+
+	// Return the universe size.
+	Uint32 getSize() {return nextIndex;}
+
+	friend void* operator new(size_t, IndexedPool<IndexedObject>& pool); // Needs to call newObject().
+};
+
+// Free all the memory allocated for this object.
+//
+template <class IndexedObject>
+IndexedPool<IndexedObject>::~IndexedPool()
+{
+	for (Uint32 n = 0; n < nBlocks; n++)
+		free(&((IndexedObject **) &block[n][n*blockSize])[-(n + 1)]);
+}
+
+// Release the given. This object will be iserted in the chained
+// list of free IndexedObjects. To minimize the fragmentation the chained list 
+// is ordered by ascending indexes.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::release(IndexedObject& object)
+{
+	Uint32 index = object.index;
+	IndexedObject* list = freeObjects;
+
+	assert(&object == &get(index)); // Make sure that object is owned by this pool.
+
+	if (list == NULL) { // The list is empty.
+		freeObjects = &object;
+		object.next = NULL;
+	} else { // The list contains at least 1 element.
+		if (index < list->index) { // insert as first element.
+			freeObjects = &object;
+			object.next = list;
+		} else { // Find this object's place.
+			while ((list->next) != NULL && (list->next->index < index))
+				list = list->next;
+
+			object.next = list->next;
+			list->next = &object;
+		}
+	}
+
+#ifdef DEBUG
+	// Sanity check to be sure that the list is correctly ordered.
+	for (IndexedObject* obj = freeObjects; obj != NULL; obj = obj->next)
+		if (obj->next != NULL)
+			assert(obj->index < obj->next->index);
+#endif
+}
+
+// Create a new block of IndexedObjects. We will allocate the memory to
+// store IndexedPool::blockSize IndexedObject and the new Array of block
+// pointers.
+// The newly created IndexedObjects will not be initialized.
+//
+template <class IndexedObject>
+void IndexedPool<IndexedObject>::allocateAnotherBlock()
+{
+	void* memory = (void *) malloc((nBlocks + 1) * sizeof(Uint32) + blockSize * sizeof(IndexedObject));
+
+	memcpy(memory, block, nBlocks * sizeof(Uint32));
+
+	block = (IndexedObject **) memory;
+	IndexedObject* objects = (IndexedObject *) &block[nBlocks + 1];
+
+	block[nBlocks] = &objects[-(nBlocks * blockSize)];
+	nBlocks++;
+}
+
+// Return the IndexedObject at the position 'index' in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::get(Uint32 index) const
+{
+	Uint32 blockIndex = index / blockSize;
+	assert(blockIndex < nBlocks);
+
+	return block[blockIndex][index];
+}
+
+// Return the reference of an unused object in the pool.
+//
+template <class IndexedObject>
+IndexedObject& IndexedPool<IndexedObject>::newObject()
+{
+	if (freeObjects != NULL) {
+		IndexedObject& newObject = *freeObjects;
+		freeObjects = newObject.next;
+		return newObject;
+	}
+	
+	Uint32 nextIndex = this->nextIndex++;
+	Uint32 blockIndex = nextIndex / blockSize;
+
+	while (blockIndex >= nBlocks)
+		allocateAnotherBlock();
+	
+	IndexedObject& newObject = block[blockIndex][nextIndex];
+	newObject.index = nextIndex;
+
+	return newObject;
+}
+
+// Return the address of the next unsused object in the given
+// indexed pool. The field index of the newly allocated object
+// will be initialized to the corresponding index of this object
+// in the pool.
+//
+template <class IndexedObject>
+void* operator new(size_t size, IndexedPool<IndexedObject>& pool)
+{
+	assert(size == sizeof(IndexedObject));
+	return (void *) &pool.newObject();
+}
+
+#endif // _INDEXED_POOL_H_

mozilla/ef/Compiler/RegisterAllocator/InterferenceGraph.h

@@ -0,0 +1,258 @@
+/* -*- 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 _INTERFERENCE_GRAPH_H_
+#define _INTERFERENCE_GRAPH_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "SparseSet.h"
+#include <string.h>
+
+struct InterferenceVector
+{
+	Uint32				count;
+	InterferenceVector*	next;
+	RegisterName*		neighbors;
+
+	InterferenceVector() : count(0), next(NULL) {}
+};
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class InterferenceGraph
+{
+private:
+
+	RegisterAllocator&			registerAllocator;
+
+	RegisterPressure::Set*		interferences;
+	InterferenceVector**		vector;
+	Uint32*						offset;
+	Uint32 						rangeCount;
+
+private:
+
+	// No copy constructor.
+	InterferenceGraph(const InterferenceGraph&);
+	// No copy operator.
+	void operator = (const InterferenceGraph&);
+
+	// Check if reg is a member of the universe.
+	void checkMember(RegisterName name) {assert(name < rangeCount);}
+	// Return the edge index for the interference between name1 and name2.
+	Uint32 getEdgeIndex(RegisterName name1, RegisterName name2);
+
+public:
+	InterferenceGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	// Calculate the interferences.
+	void build();
+	// Return true if reg1 and reg2 interfere.
+	bool interfere(RegisterName name1, RegisterName name2);
+	// Return the interference vector for the given register or NULL if there is none.
+	InterferenceVector* getInterferenceVector(RegisterName name) {return vector[name];}
+	// Set the interference between name1 and name2.
+	void setInterference(RegisterName name1, RegisterName name2);
+	// Set the interference vector for the given register.
+	void setInterferenceVector(RegisterName name, InterferenceVector* v) {vector[name] = v;}
+
+
+#ifdef DEBUG_LOG
+	// Print the interferences.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	// Initialize the structures.
+	//
+	offset = new(pool) Uint32[rangeCount + 1];
+	vector = new(pool) InterferenceVector*[rangeCount];
+	memset(vector, '\0', sizeof(InterferenceVector*) * rangeCount);
+
+	Uint32 o = 0;
+	offset[0] = 0;
+	for (Uint32 i = 1; i <= rangeCount; ++i) {
+		offset[i] = o;
+		o += i;
+	}
+	
+	interferences = new(pool) RegisterPressure::Set(pool, (rangeCount * rangeCount) / 2);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure> liveness = Liveness<RegisterPressure>::analysis(controlGraph, rangeCount, name2range);
+	registerAllocator.liveness = liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			// Handle the copy instruction to avoid unnecessary interference between the 2 registers.
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			// Create the interferences.
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator e = currentLive.begin(); !currentLive.done(e); e = currentLive.advance(e)) {
+						RegisterName live = RegisterName(currentLive.get(e));
+
+						if ((live != define) && !interfere(live, define) && registerAllocator.canInterfere(live, define)) {
+
+							if (vector[define] == NULL)
+								vector[define] = new(pool) InterferenceVector();
+							vector[define]->count++;
+
+							if (vector[live] == NULL)
+								vector[live] = new(pool) InterferenceVector();
+							vector[live]->count++;
+
+							setInterference(live, define);
+						}
+					}
+				}
+
+			// Now update the liveness.
+			//
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	// Allocate the memory to store the interferences.
+	//
+	for (Uint32 e = 0; e < rangeCount; e++)
+		if (vector[e] != NULL) {
+			InterferenceVector& v = *vector[e];
+			v.neighbors = new(pool) RegisterName[v.count];
+			v.count = 0;
+		}
+
+	// Initialize the edges.
+	//
+	if (RegisterPressure::Set::isOrdered()) {
+		RegisterName name1 = RegisterName(0);
+
+		for (RegisterPressure::Set::iterator i = interferences->begin(); !interferences->done(i); i = interferences->advance(i)) {
+			Uint32 interferenceIndex = interferences->get(i);
+
+			while(interferenceIndex >= offset[name1 + 1])
+				name1 = RegisterName(name1 + 1);
+
+			assert((interferenceIndex >= offset[name1]) && (interferenceIndex < offset[name1 + 1]));
+
+			RegisterName name2 = RegisterName(interferenceIndex - offset[name1]);
+
+			assert(interfere(name1, name2));
+
+			InterferenceVector& vector1 = *vector[name1];
+			vector1.neighbors[vector1.count++] = name2;
+		
+			InterferenceVector& vector2 = *vector[name2];
+			vector2.neighbors[vector2.count++] = name1;
+		}
+	} else {
+		trespass("not Implemented"); // FIX: need one more pass to initialize the vectors.
+	}
+}
+
+template <class RegisterPressure>
+Uint32 InterferenceGraph<RegisterPressure>::getEdgeIndex(RegisterName name1, RegisterName name2)
+{
+	checkMember(name1); checkMember(name2);
+	assert(name1 != name2); // This is not possible.
+	return (name1 < name2) ? offset[name2] + name1 : offset[name1] + name2;
+}
+
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::setInterference(RegisterName name1, RegisterName name2)
+{
+	interferences->set(getEdgeIndex(name1, name2));
+}
+
+template <class RegisterPressure>
+bool InterferenceGraph<RegisterPressure>::interfere(RegisterName name1, RegisterName name2)
+{
+	return interferences->test(getEdgeIndex(name1, name2));
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void InterferenceGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Vectors:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		if (vector[i] != NULL) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tvr%d: (", i));
+			for (InterferenceVector* v = vector[i]; v != NULL; v = v->next)
+				for (Uint32 j = 0; j < v->count; j++) {
+					UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%d", v->neighbors[j]));
+					if (v->next != NULL || j != (v->count - 1))
+						UT_OBJECTLOG(log, PR_LOG_ALWAYS, (","));
+				}
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (")\n"));
+		}
+	}
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Interference Matrix:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && interfere(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _INTERFERENCE_GRAPH_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRange.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 _LIVE_RANGE_H_
+#define _LIVE_RANGE_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+template <class RegisterPressure>
+struct LiveRange
+{
+	static void build(RegisterAllocator& registerAllocator);
+};
+
+template <class RegisterPressure>
+void LiveRange<RegisterPressure>::build(RegisterAllocator& registerAllocator)
+{
+	// Intialize the lookup table.
+	//
+	Uint32 nameCount = registerAllocator.nameCount;
+	RegisterName* nameTable = new(registerAllocator.pool) RegisterName[2*nameCount];
+	RegisterName* rangeName = &nameTable[nameCount];
+
+	init(rangeName, nameCount);
+
+	// Walk the graph.
+	//
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	SparseSet destination(registerAllocator.pool, nameCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+
+		destination.clear();
+		for (InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+			Instruction& phiNode = phiNodes.get(i);
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			destination.set(findRoot(phiNode.getInstructionDefineBegin()[0].getRegisterName(), rangeName));
+		}
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+			RegisterName destinationName = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+			RegisterName destinationRoot = findRoot(destinationName, rangeName);
+
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+				assert(usePtr->isRegister());
+				RegisterName sourceName = usePtr->getRegisterName();
+				RegisterName sourceRoot = findRoot(sourceName, rangeName);
+
+				if (sourceRoot != destinationRoot && !destination.test(sourceRoot))
+					rangeName[sourceRoot] = destinationRoot;
+			}
+		}
+	}
+
+	registerAllocator.rangeCount = compress(registerAllocator.name2range, rangeName, nameCount, nameCount);
+}
+
+#endif // _LIVE_RANGE_H_

mozilla/ef/Compiler/RegisterAllocator/LiveRangeGraph.h

@@ -0,0 +1,163 @@
+/* -*- 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 _LIVE_RANGE_GRAPH_
+#define _LIVE_RANGE_GRAPH_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+class RegisterAllocator;
+
+template <class RegisterPressure>
+class LiveRangeGraph
+{
+private:
+
+	RegisterAllocator&		registerAllocator;
+
+	RegisterPressure::Set*	edges;
+	Uint32					rangeCount;
+
+public:
+	//
+	//
+	LiveRangeGraph(RegisterAllocator& registerAllocator) : registerAllocator(registerAllocator) {}
+
+	//
+	//
+	void build();
+
+	//
+	//
+	void addEdge(RegisterName name1, RegisterName name2);
+
+	//
+	//
+	bool haveEdge(RegisterName name1, RegisterName name2);
+
+#ifdef DEBUG_LOG
+	//
+	//
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::build()
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	this->rangeCount = rangeCount;
+
+	edges = new(pool) RegisterPressure::Set(pool, rangeCount * rangeCount);
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	RegisterName* name2range = registerAllocator.name2range;
+	LivenessInfo<RegisterPressure>& liveness = registerAllocator.liveness;
+	SparseSet currentLive(pool, rangeCount);
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		currentLive = liveness.liveOut[n];
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			if ((instruction.getFlags() & ifCopy) != 0) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				currentLive.clear(name2range[useBegin[0].getRegisterName()]);
+			}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister()) {
+					RegisterName define = name2range[definePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (define != live && registerAllocator.canInterfere(define, live))
+							addEdge(define, live);
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					currentLive.set(name2range[usePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName use = name2range[usePtr->getRegisterName()];
+
+					for (SparseSet::iterator l = currentLive.begin(); !currentLive.done(l); l = currentLive.advance(l)) {
+						RegisterName live = RegisterName(currentLive.get(l));
+						if (use != live && registerAllocator.canInterfere(use, live))
+							addEdge(use, live);
+					}
+				}
+		}
+	}
+}
+
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::addEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	edges->set(name1 * rangeCount + name2);
+}
+
+template <class RegisterPressure>
+bool LiveRangeGraph<RegisterPressure>::haveEdge(RegisterName name1, RegisterName name2)
+{
+	assert(name1 != name2);
+	return edges->test(name1 * rangeCount + name2);
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LiveRangeGraph<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Live ranges graph:\n"));
+	for (RegisterName name1 = RegisterName(1); name1 < rangeCount; name1 = RegisterName(name1 + 1)) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\t%d:\t", name1));
+		for (RegisterName name2 = RegisterName(1); name2 < rangeCount; name2 = RegisterName(name2 + 1))
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%c", ((name1 != name2) && haveEdge(name1, name2)) ? '1' : '0'));
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVE_RANGE_GRAPH_

mozilla/ef/Compiler/RegisterAllocator/Liveness.cpp

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- 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
@@ -16,6 +16,6 @@
  * Reserved.
  */
 
-#define MAC_STATIC 1
+#include "Fundamentals.h"
+#include "Liveness.h"
 
-#include "WidgetDebug.prefix"

mozilla/ef/Compiler/RegisterAllocator/Liveness.h

@@ -0,0 +1,301 @@
+/* -*- 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 _LIVENESS_H_
+#define _LIVENESS_H_
+
+#include "Fundamentals.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterTypes.h"
+
+// ----------------------------------------------------------------------------
+// LivenessInfo -
+
+template <class RegisterPressure>
+struct LivenessInfo
+{
+	RegisterPressure::Set*	liveIn;
+	RegisterPressure::Set*	liveOut;
+	DEBUG_LOG_ONLY(Uint32	size);
+
+#ifdef DEBUG_LOG
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+// ----------------------------------------------------------------------------
+// Liveness
+//
+// The liveness is defined by the following data-flow equations:
+//
+//		LiveIn(n) = LocalLive(n) U (LiveOut(n) - Killed(n)).
+//		LiveOut(n) = U LiveIn(s) (s a successor of n).
+//
+//	where LocalLive(n) is the set of used registers in the block n, Killed(n)
+//  is the set of defined registers in the block n, LiveIn(n) is the set of
+//  live registers at the begining of the block n and LiveOut(n) is the set
+//  of live registers at the end of the block n.
+//
+//
+// We will compute the liveness analysis in two stages:
+//
+//	1- Build LocalLive(n) (wich is an approximation of LiveIn(n)) and Killed(n) 
+//     for each block n.
+//  2- Perform a backward data-flow analysis to propagate the liveness information
+//     through the entire control-flow graph.
+//
+
+template <class RegisterPressure>
+struct Liveness
+{
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range);
+	static LivenessInfo<RegisterPressure> analysis(ControlGraph& controlGraph, Uint32 nameCount);
+};
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 rangeCount, const RegisterName* name2range)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, rangeCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = name2range[usePtr->getRegisterName()];
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(name2range[definePtr->getRegisterName()]);
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, rangeCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+template <class RegisterPressure>
+LivenessInfo<RegisterPressure> Liveness<RegisterPressure>::analysis(ControlGraph& controlGraph, Uint32 nameCount)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Allocate the temporary sets.
+	RegisterPressure::Set* killed = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* usedByPhiNodes = NULL;
+	
+	// Allocate the globals sets.
+	RegisterPressure::Set* liveIn = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+	RegisterPressure::Set* liveOut = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+	// First stage of the liveness analysis: Compute the sets LocalLive(stored in LiveIn) and Killed.
+	//
+	for (Uint32 n = 0; n < (nNodes - 1); n++) {
+		ControlNode& node = *nodes[n];
+
+		RegisterPressure::Set& currentLocalLive = liveIn[n];
+		RegisterPressure::Set& currentKilled = killed[n];
+		
+		InstructionList& phiNodes = node.getPhiNodeInstructions();
+
+		if ((usedByPhiNodes == NULL) && !phiNodes.empty())
+			usedByPhiNodes = new(pool) RegisterPressure::Set[nNodes](pool, nameCount);
+
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& phiNode = phiNodes.get(p);
+
+			InstructionDefine& define = phiNode.getInstructionDefineBegin()[0];
+			currentKilled.set(define.getRegisterName());
+
+			typedef DoublyLinkedList<ControlEdge> ControlEdgeList;
+			const ControlEdgeList& predecessors = node.getPredecessors();
+			ControlEdgeList::iterator p = predecessors.begin();
+			InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+			for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++, p = predecessors.advance(p))
+				if (usePtr->isRegister())
+					usedByPhiNodes[predecessors.get(p).getSource().dfsNum].set(usePtr->getRegisterName());
+		}
+
+		// Find the instructions contributions to the sets LocalLive and Killed.
+		//
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			// If a VirtualRegister is 'used' before being 'defined' then we add it to set LocalLive.
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					Uint32 index = usePtr->getRegisterName();
+
+					if (!currentKilled.test(index))
+						currentLocalLive.set(index);
+				}
+
+			// If a Virtualregister is 'defined' then we add it to the set Killed.
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					currentKilled.set(definePtr->getRegisterName());
+		}
+	}
+
+	// Second stage of the liveness analysis: We propagate the LiveIn & LiveOut through the entire 
+	// control-flow graph.
+	//
+	RegisterPressure::Set temp(pool, nameCount);
+
+	bool changed;
+	do {
+		changed = false;
+
+		// For all nodes is this graph except the endNode.
+		for (Int32 n = (nNodes - 2); n >= 0; n--) {
+			ControlNode& node = *nodes[n];
+
+			RegisterPressure::Set& currentLiveIn = liveIn[n];
+			RegisterPressure::Set& currentLiveOut = liveOut[n];
+
+			// Compute temp = Union of LiveIn(s) (s a successor of this node) | usedByPhiNodes(n).
+			// temp will be the new LiveOut(n).
+			Uint32 nSuccessors = node.nSuccessors();
+			if (nSuccessors != 0) {
+				temp = liveIn[node.nthSuccessor(0).getTarget().dfsNum];
+				for (Uint32 s = 1; s < nSuccessors; s++)
+					temp |= liveIn[node.nthSuccessor(s).getTarget().dfsNum];
+			} else 
+				temp.clear();
+
+			// Insert the phiNodes contribution.
+			if (usedByPhiNodes != NULL)
+				temp |= usedByPhiNodes[n];
+
+			// If temp and LiveOut(n) differ then set LiveOut(n) = temp and recalculate the
+			// new LiveIn(n).
+			if (currentLiveOut != temp) {
+				currentLiveOut = temp;
+				temp -= killed[n]; // FIX: could be optimized with one call to unionDiff !
+				temp |= currentLiveIn;
+			
+				if (currentLiveIn != temp) {
+					currentLiveIn = temp;
+					changed = true;
+				}
+			}
+		}
+	} while(changed);
+
+	LivenessInfo<RegisterPressure> liveness;
+	liveness.liveIn = liveIn;
+	liveness.liveOut = liveOut;
+	DEBUG_LOG_ONLY(liveness.size = nNodes);
+	return liveness;
+}
+
+#ifdef DEBUG_LOG
+template <class RegisterPressure>
+void LivenessInfo<RegisterPressure>::printPretty(LogModuleObject log)
+{
+	for (Uint32 n = 0; n < size; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Node N%d:\n\tliveIn = ", n));
+		liveIn[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\tliveOut = "));
+		liveOut[n].printPretty(log);
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+	}
+}
+#endif // DEBUG_LOG
+
+#endif // _LIVENESS_H_

mozilla/ef/Compiler/RegisterAllocator/Makefile

@@ -0,0 +1,40 @@
+#! gmake
+
+DEPTH			= ../..
+
+MODULE_NAME		= RegisterAllocator
+
+include $(DEPTH)/config/config.mk
+
+INCLUDES		+=										\
+	-I$(DEPTH)/Utilities/General						\
+	-I$(DEPTH)/Utilities/zlib							\
+	-I$(DEPTH)/Runtime/ClassReader						\
+	-I$(DEPTH)/Runtime/NativeMethods					\
+	-I$(DEPTH)/Runtime/System							\
+	-I$(DEPTH)/Runtime/ClassInfo						\
+	-I$(DEPTH)/Runtime/FileReader						\
+	-I$(DEPTH)/Compiler/PrimitiveGraph					\
+	-I$(DEPTH)/Compiler/FrontEnd						\
+	-I$(DEPTH)/Compiler/Optimizer						\
+	-I$(DEPTH)/Compiler/CodeGenerator					\
+	-I$(DEPTH)/Compiler/CodeGenerator/md				\
+	-I$(DEPTH)/Compiler/CodeGenerator/md/$(CPU_ARCH)	\
+	-I$(DEPTH)/Compiler/RegisterAllocator				\
+	-I$(DEPTH)/Driver/StandAloneJava					\
+	-I$(DEPTH)/Debugger									\
+	$(NULL)
+
+CXXSRCS 		=										\
+	RegisterAllocator.cpp								\
+	RegisterAllocatorTools.cpp							\
+	DominatorGraph.cpp									\
+	VirtualRegister.cpp									\
+	BitSet.cpp											\
+	SparseSet.cpp										\
+	$(NULL)
+
+
+include $(DEPTH)/config/rules.mk
+
+libs:: $(MODULE)

mozilla/ef/Compiler/RegisterAllocator/PhiNodeRemover.h

@@ -0,0 +1,392 @@
+/* -*- 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 _PHI_NODE_REMOVER_H_
+#define _PHI_NODE_REMOVER_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "DominatorGraph.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h"
+#include "Liveness.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "SparseSet.h"
+#include <string.h>
+
+//------------------------------------------------------------------------------
+// RegisterNameNode -
+
+struct RegisterNameNode 
+{
+	RegisterNameNode*	next;
+	RegisterName		newName;
+	Uint32				nextPushed;
+};
+
+//------------------------------------------------------------------------------
+// CopyData -
+
+struct CopyData
+{
+	RegisterName		source;
+	RegisterClassKind	classKind;
+	Uint32				useCount;
+	bool				isLiveOut;
+	RegisterName		sourceNameToUse;
+	RegisterName		temporaryName;
+	RegisterNameNode*	newName;
+};
+
+//------------------------------------------------------------------------------
+// PhiNodeRemover<RegisterPressure> -
+
+template <class RegisterPressure>
+struct PhiNodeRemover
+{
+	// Replace the phi nodes by copy instructions.
+	static void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+// Split some of the critical edges and return true if there are still some
+// in the graph after that.
+//
+static bool splitCriticalEdges(ControlGraph& /*cg*/)
+{
+	// FIX: not implemented.
+	return true;
+}
+
+inline void pushName(Pool& pool, RegisterNameNode** stack, SparseSet& pushed, Uint32* nodeListPointer, RegisterName oldName, RegisterName newName)
+{
+	RegisterNameNode& newNode = *new(pool) RegisterNameNode();
+
+	if (pushed.test(oldName))
+		(*stack)->newName = newName;
+	else {
+		newNode.newName = newName;
+		newNode.nextPushed = *nodeListPointer;
+		*nodeListPointer = oldName;
+		newNode.next = *stack;
+		*stack = &newNode;
+		pushed.set(oldName);
+	}
+}
+
+template <class RegisterPressure>
+void PhiNodeRemover<RegisterPressure>::replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	// Initialize the local variables.
+	//
+
+	// When we insert the copies we will also need to create new VirtualRegisters for
+	// the insertion of temporaries. The maximum number of temporary register will not
+	// exceed the number of phiNodes in the primitive graph.
+	Uint32 nameCount = vrManager.getSize();
+	Uint32 maxNameCount = nameCount;
+	for (Uint32 n = 0; n < nNodes; n++)
+		maxNameCount += nodes[n]->getPhiNodes().length();
+
+	// If the CFG contains some critical edges (backward edge which source has more than one
+	// outgoing edge and destination has more than one incomimg edge) then we need the liveness
+	// information to be able to insert temporary copies.
+	RegisterPressure::Set* liveOut = NULL;
+	if (splitCriticalEdges(controlGraph))
+		liveOut = Liveness<LowRegisterPressure>::analysis(controlGraph, nameCount).liveOut;
+
+	DominatorGraph dGraph(controlGraph);
+
+	SparseSet pushed(pool, maxNameCount);
+	SparseSet destinationList(pool, maxNameCount);
+	SparseSet workList(pool, maxNameCount);
+
+	CopyData* copyStats = new(pool) CopyData[maxNameCount];
+	memset(copyStats, '\0', maxNameCount*sizeof(CopyData));
+
+	struct NodeStack {
+		Uint32* next;
+		Uint32* limit;
+		Uint32 pushedList;
+	};
+
+	// Allocate the node stack and initialize the node stack pointer.
+	NodeStack* nodeStack = new(pool) NodeStack[nNodes + 1];
+	NodeStack* nodeStackPtr = nodeStack;
+
+	// We start by the begin node. 
+	Uint32 startNode = 0;
+	Uint32* next = &startNode;
+	Uint32* limit = &startNode + 1;
+
+	while (true) {
+
+		if (next == limit) {
+			// If there are no more node in the sibling, we have to pop the current
+			// frame from the stack and update the copyStats of the pushed nodes.
+			//
+			if (nodeStackPtr == nodeStack)
+				// We are at the bottom of the stack and there are no more nodes
+				// to look at. We are done !
+				break;
+
+			--nodeStackPtr;
+			// We are done with all the children of this node in the dominator tree.
+			// We need to update the copy information of all the new names pushed
+			// during the walk over this node.
+			Uint32 pushedList = nodeStackPtr->pushedList;
+			while (pushedList != 0) {
+				Uint32 nextName = copyStats[pushedList].newName->nextPushed;
+				copyStats[pushedList].newName = copyStats[pushedList].newName->next;
+				pushedList = nextName;
+			}
+
+			// restore the previous frame.
+			next = nodeStackPtr->next;
+			limit = nodeStackPtr->limit;
+		} else {
+			Uint32 currentNode = *next++;
+			Uint32 pushedList = 0;
+
+
+			// Initialize the sets.
+			pushed.clear();
+			destinationList.clear();
+
+			// STEP1:
+			//  Walk the instruction list and to replace all the instruction uses with their new name. 
+			//  If the instruction is a phi node and its defined register is alive at the end of this 
+			//  block then we push the defined register into the stack.
+			//
+			ControlNode& node = *nodes[currentNode];
+			RegisterPressure::Set* currentLiveOut = (liveOut != NULL) ? &liveOut[currentNode] : (RegisterPressure::Set*) 0;
+
+			InstructionList& phiNodes = node.getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& phiNode = phiNodes.get(p);
+
+				InstructionUse* useEnd = phiNode.getInstructionUseEnd();
+				for (InstructionUse* usePtr = phiNode.getInstructionUseBegin(); usePtr < useEnd; usePtr++) {
+					assert(usePtr->isRegister());
+					RegisterName name = usePtr->getRegisterName();
+
+					if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+						usePtr->setRegisterName(copyStats[name].newName->newName);
+				}
+
+				if (currentLiveOut != NULL) {
+					// This is a phi node and we have to push its defined name if it is live
+					// at the end of the node. We only need to do this if the CFG has critical edges.
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd() && phiNode.getInstructionDefineBegin()[0].isRegister());
+					RegisterName name = phiNode.getInstructionDefineBegin()[0].getRegisterName();
+
+					if (currentLiveOut->test(name))
+						pushName(pool, &(copyStats[name].newName), pushed, &pushedList, name, name);
+				}
+				
+			}
+
+			InstructionList& instructions = node.getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+
+						if (copyStats[name].newName != NULL && copyStats[name].newName->newName != name)
+							usePtr->setRegisterName(copyStats[name].newName->newName);
+					}
+			}
+
+			// STEP2:
+			//  Look at this node's successors' phiNodes. We keep track of the number of time
+			//  a VR will be used by another copy instruction and insert each definition into the 
+			//  destinationList. This is the only pass over this node's successors as we will
+			//  get all the information we need in the CopyData structures.
+			//
+			ControlEdge* successorEdgeEnd = node.getSuccessorsEnd();
+			for (ControlEdge* successorEdgePtr = node.getSuccessorsBegin(); successorEdgePtr < successorEdgeEnd; successorEdgePtr++) {
+				Uint32 useIndex = successorEdgePtr->getIndex();
+				ControlNode& successor = successorEdgePtr->getTarget();
+
+				// Look at its phi nodes. The phi nodes are at the top of the instruction list. We exit
+				// as soon as we find an instruction which is not a phi node
+				InstructionList& phiNodes = successor.getPhiNodeInstructions();
+				for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+					Instruction& phiNode = phiNodes.get(p);
+					
+					assert((phiNode.getInstructionUseBegin() + useIndex) < phiNode.getInstructionUseEnd());
+					assert(phiNode.getInstructionDefineBegin() != phiNode.getInstructionDefineEnd());
+
+					InstructionUse& source = phiNode.getInstructionUseBegin()[useIndex];
+					InstructionDefine& destination = phiNode.getInstructionDefineBegin()[0];
+
+					assert(source.isRegister() && destination.isRegister());
+
+					RegisterName sourceName = source.getRegisterName();
+					RegisterName destinationName = destination.getRegisterName();
+
+					// Get the correct name for the source.
+					if (copyStats[sourceName].newName != NULL)
+						sourceName = copyStats[sourceName].newName->newName;
+
+					// Update the CopyData structures.
+					if ((sourceName != rnInvalid) && (sourceName != destinationName)) {
+						copyStats[destinationName].source = sourceName;
+						copyStats[destinationName].classKind = destination.getRegisterClass();
+						copyStats[destinationName].isLiveOut = (currentLiveOut != NULL) ? currentLiveOut->test(destinationName) : false;
+						copyStats[destinationName].sourceNameToUse = destinationName;
+						copyStats[sourceName].sourceNameToUse = sourceName;
+						copyStats[sourceName].useCount++;
+						destinationList.set(destinationName);
+					}
+				}
+			}
+
+			// STEP3:
+			//  Insert into the worklist only the destination registers that will be not used in 
+			//  another copy instruction in this block.
+			//
+			assert(workList.getSize() == 0);
+			for (SparseSet::iterator d = destinationList.begin(); !destinationList.done(d); d = destinationList.advance(d)) {
+				Uint32 dest = destinationList.get(d);
+				if (copyStats[dest].useCount == 0)
+					workList.set(dest);
+			}
+
+			// STEP4:
+			//  Insert the copy instructions.
+			//
+			Uint32 destinationListSize = destinationList.getSize();
+			InstructionList::iterator endOfTheNode = instructions.end();
+
+			// Find the right place to insert the copy instructions.
+			if (destinationListSize != 0)
+				while (instructions.get(endOfTheNode).getFlags() & ifControl)
+					endOfTheNode = instructions.retreat(endOfTheNode);
+
+			while (destinationListSize != 0) {
+				while(workList.getSize()) {
+					RegisterName destinationName = RegisterName(workList.getOne());
+					RegisterName sourceName = copyStats[destinationName].source;
+
+					workList.clear(destinationName);
+					if (copyStats[destinationName].isLiveOut && !copyStats[destinationName].temporaryName) {
+						// Lost copy problem.
+						copyStats[destinationName].isLiveOut = false;
+
+						RegisterName sourceName = destinationName;
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						RegisterName destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].useCount = 0;
+				
+						// We need to insert a copy to a temporary register to keep the
+						// source register valid at the end of the node defining it.
+						// This copy will be inserted right after the phi node defining it.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+						Instruction* definingPhiNode = vrManager.getVirtualRegister(from).getDefiningInstruction();
+						assert(definingPhiNode && (definingPhiNode->getFlags() & ifPhiNode) != 0);
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*definingPhiNode->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						definingPhiNode->getPrimitive()->getContainer()->getInstructions().addFirst(copy);
+
+						copyStats[sourceName].temporaryName = destinationName;
+						copyStats[sourceName].sourceNameToUse = destinationName;
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					}
+
+					// Insert the copy instruction at the end of the current node.
+					RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+					RegisterClassKind classKind = copyStats[destinationName].classKind;
+					RegisterID fromID = buildRegisterID(from, classKind);
+					RegisterID toID = buildRegisterID(destinationName, classKind);
+					Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+					instructions.insertAfter(copy, endOfTheNode);
+					endOfTheNode = instructions.advance(endOfTheNode);
+
+					copyStats[sourceName].useCount = 0;
+					if (destinationList.test(sourceName) && copyStats[sourceName].isLiveOut)
+						pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+
+					if (destinationList.test(sourceName))
+						workList.set(sourceName);
+					destinationList.clear(destinationName);
+				}
+
+				destinationListSize = destinationList.getSize();
+				if (destinationListSize != 0) {
+					RegisterName sourceName = RegisterName(destinationList.getOne());
+					RegisterName destinationName;
+
+					if (!copyStats[sourceName].temporaryName) {
+						// Cycle problem.
+						RegisterClassKind classKind = copyStats[sourceName].classKind;
+						destinationName = getName(vrManager.newVirtualRegister(classKind));
+						assert(destinationName < maxNameCount);
+				
+						copyStats[destinationName].classKind = classKind;
+						copyStats[sourceName].temporaryName = destinationName;
+
+						// Insert the copy instruction at the end of the current node.
+						RegisterName from = copyStats[sourceName].sourceNameToUse;
+
+						RegisterID fromID = buildRegisterID(from, classKind);
+						RegisterID toID = buildRegisterID(destinationName, classKind);
+						Instruction& copy = emitter.newCopy(*vrManager.getVirtualRegister(from).getDefiningInstruction()->getPrimitive(), fromID, toID);
+						vrManager.getVirtualRegister(destinationName).setDefiningInstruction(copy);
+						instructions.insertAfter(copy, endOfTheNode);
+						endOfTheNode = instructions.advance(endOfTheNode);
+					} else 
+						destinationName = copyStats[sourceName].temporaryName;
+
+					copyStats[sourceName].useCount = 0;
+					copyStats[sourceName].isLiveOut = false;
+					copyStats[sourceName].sourceNameToUse = destinationName;
+					pushName(pool, &(copyStats[sourceName].newName), pushed, &pushedList, sourceName, destinationName);
+
+					workList.set(sourceName);
+				}
+			}
+
+			nodeStackPtr->pushedList = pushedList;
+			nodeStackPtr->next = next;
+			nodeStackPtr->limit = limit;
+			++nodeStackPtr;
+			next = dGraph.getSuccessorsBegin(currentNode);
+			limit = dGraph.getSuccessorsEnd(currentNode);
+		}
+	}
+}
+
+#endif // _PHI_NODE_REMOVER_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.cpp

@@ -0,0 +1,155 @@
+/* -*- 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 "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocator.h"
+#include "RegisterPressure.h"
+#include "RegisterAllocatorTools.h"
+#include "PhiNodeRemover.h"
+#include "LiveRange.h"
+#include "Liveness.h"
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+#include "Coalescing.h"
+#include "Spilling.h"
+#include "Coloring.h"
+#include "Splits.h"
+
+class Pool;
+class ControlGraph;
+class VirtualRegisterManager;
+class InstructionEmitter;
+
+UT_DEFINE_LOG_MODULE(RegAlloc);
+
+void RegisterAllocator::allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+{
+	// Insert the phi node instructions. We want to do this to have a single defined register per instruction.
+	// If we keep the PhiNode (as a DataNode) and a PhiNode is of DoubleWordKind then we have to execute
+	// some special code for the high word annotation.
+	//
+	RegisterAllocatorTools::insertPhiNodeInstructions(controlGraph, emitter);
+
+	// Perform some tests on the instruction graph.
+	//
+	DEBUG_ONLY(RegisterAllocatorTools::testTheInstructionGraph(controlGraph, vrManager));
+
+	// Replace the phi node instructions by their equivalent copy instructions.
+	//
+	PhiNodeRemover<LowRegisterPressure>::replacePhiNodes(controlGraph, vrManager, emitter);
+
+	// Do the register allocation.
+	//
+	RegisterAllocator registerAllocator(pool, controlGraph, vrManager, emitter);
+	registerAllocator.doGraphColoring();
+}
+
+void RegisterAllocator::doGraphColoring()
+{
+	// Initialize the liverange map.
+	//
+	initLiveRanges();
+
+	// Build the live ranges. We do this to compress the number of RegisterNames 
+	// used in the insterference graph.
+	//
+	LiveRange<LowRegisterPressure>::build(*this);
+
+	// Remove unnecessary copies.
+	//
+	RegisterAllocatorTools::removeUnnecessaryCopies(*this);
+
+	for (Uint8 loop = 0; loop < 10; loop++) {
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********* RegisterAllocator loop %d *********\n", loop));
+
+		while(true) {
+			// Build the interference graph.
+			//
+			iGraph.build();
+
+			// Coalesce the copy instructions.
+			//
+			if (!Coalescing<LowRegisterPressure>::coalesce(*this))
+				break;
+		}
+
+		// Print the interference graph.
+		//
+		DEBUG_LOG_ONLY(iGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Calculate the spill costs.
+		//
+		Spilling<LowRegisterPressure>::calculateSpillCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSpillCosts(*this));
+
+		// Calculate the split costs.
+		//
+		Splits<LowRegisterPressure>::calculateSplitCosts(*this);
+		DEBUG_LOG_ONLY(RegisterAllocatorTools::printSplitCosts(*this));
+
+		// Build the live range graph.
+		//
+		lGraph.build();
+		DEBUG_LOG_ONLY(lGraph.printPretty(UT_LOG_MODULE(RegAlloc)));
+
+		// Color the graph. If it succeeds then we're done with the
+		// register allocation.
+		//
+		if (Coloring<LowRegisterPressure>::color(*this)) {
+			// Write the final colors in the instruction graph.
+			//
+			Coloring<LowRegisterPressure>::finalColoring(*this);
+
+			UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("********** RegisterAllocator  done **********\n"));
+			DEBUG_LOG_ONLY(RegisterAllocatorTools::printInstructions(*this));
+
+			return;
+		}
+
+		// We need to spill some registers.
+		//
+		Spilling<LowRegisterPressure>::insertSpillCode(*this);
+
+		// Insert the split instructions.
+		//
+		Splits<LowRegisterPressure>::insertSplitCode(*this);
+
+		// Update the live ranges.
+		// 
+		// FIX
+	}
+
+#ifdef DEBUG_LOG
+	RegisterAllocatorTools::updateInstructionGraph(*this);
+	RegisterAllocatorTools::printInstructions(*this);
+#endif
+	fprintf(stderr, "!!! Coloring failed after 10 loops !!!\n");
+	abort();
+}
+
+void RegisterAllocator::initLiveRanges()
+{
+	Uint32 count = this->nameCount;
+	RegisterName* name2range = new(pool) RegisterName[nameCount];
+	for (RegisterName r = RegisterName(1); r < count; r = RegisterName(r + 1))
+		name2range[r] = r;
+	this->name2range = name2range;
+	rangeCount = count;
+}

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocator.h

@@ -0,0 +1,88 @@
+/* -*- 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 _REGISTER_ALLOCATOR_H_
+#define _REGISTER_ALLOCATOR_H_
+
+class Pool;
+class ControlGraph;
+class InstructionEmitter;
+struct SpillCost;
+struct SplitCost;
+
+#include "Liveness.h"
+#include "VirtualRegister.h"
+#include "RegisterPressure.h" // This should included by Backend.cpp
+#include "InterferenceGraph.h"
+#include "LiveRangeGraph.h"
+
+//template <class RegisterPressure>
+class RegisterAllocator
+{
+public:
+
+	Pool&									pool;			//
+	ControlGraph&							controlGraph;	//
+	VirtualRegisterManager&					vrManager;		//
+	InstructionEmitter&						emitter;		//
+
+	RegisterName*							name2range;		//
+	RegisterName*							color;			//
+	SpillCost*								spillCost;		//
+	SparseSet*								willSpill;		//
+	SplitCost*								splitCost;		//
+	NameLinkedList**						splitAround;	//
+	InterferenceGraph<LowRegisterPressure>	iGraph;			//
+	LiveRangeGraph<LowRegisterPressure>		lGraph;			//
+	LivenessInfo<LowRegisterPressure>		liveness;		//
+	Uint32									nameCount;		//
+	Uint32									rangeCount;		//
+	bool									splitFound;		//
+
+private:
+
+	//
+	//
+	void doGraphColoring();
+
+public:
+
+	//
+	//
+	inline RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+
+	//
+	//
+	bool canInterfere(RegisterName /*name1*/, RegisterName /*name2*/) const {return true;}
+
+	//
+	//
+	void initLiveRanges();
+
+	//
+	//
+	static void allocateRegisters(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter);
+};
+
+//
+//
+inline RegisterAllocator::RegisterAllocator(Pool& pool, ControlGraph& controlGraph, VirtualRegisterManager& vrManager, InstructionEmitter& emitter)
+	: pool(pool), controlGraph(controlGraph), vrManager(vrManager), emitter(emitter), iGraph(*this), lGraph(*this), nameCount(vrManager.getSize()) {}
+
+#endif // _REGISTER_ALLOCATOR_H_
+

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.cpp

@@ -0,0 +1,355 @@
+/* -*- 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 "Fundamentals.h"
+#include "LogModule.h"
+#include "RegisterAllocatorTools.h"
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Primitives.h"
+#include "InstructionEmitter.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "Spilling.h"
+#include "Splits.h"
+#include "BitSet.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+#ifdef DEBUG
+void RegisterAllocatorTools::testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	// Test the declared VirtualRegisters. The register allocator tries to condense the register universe.
+	// Any gap in the VirtualRegister names will be a loss of efficiency !!!!
+
+	Uint32 nameCount = vrManager.getSize();
+	BitSet registerSeen(controlGraph.pool, nameCount);
+
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					registerSeen.set(usePtr->getRegisterName());
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					registerSeen.set(definePtr->getRegisterName());
+		}
+	}
+
+	bool renameRegisters = false;
+	for (BitSet::iterator i = registerSeen.nextZero(0); !registerSeen.done(i); i = registerSeen.nextZero(i)) {
+		renameRegisters = true;
+		fprintf(stderr, 
+				"WARNING: The VirtualRegister vr%d has been allocated during CodeGeneration but\n"
+				"         is never used nor defined by any instruction in the instruction graph\n"
+				"                                  PLEASE FIX                                  \n",
+				i);
+	}
+	if (renameRegisters) {
+		Instruction** definingInstruction = new Instruction*[nameCount];
+		memset(definingInstruction, '\0', nameCount * sizeof(Instruction*));
+		RegisterName* newName = new RegisterName[nameCount];
+		memset(newName, '\0', nameCount * sizeof(RegisterName));
+		RegisterName nextName = RegisterName(1);
+
+		for (Uint32 n = 0; n < nNodes; n++) {
+
+			InstructionList& instructions = nodes[n]->getInstructions();
+			for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+				Instruction& instruction = instructions.get(i);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+
+			InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+			for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+				Instruction& instruction = phiNodes.get(p);
+
+				InstructionUse* useEnd = instruction.getInstructionUseEnd();
+				for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName name = usePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						usePtr->setRegisterName(newName[name]);
+					}
+
+				InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+				for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+					if (definePtr->isRegister()) {
+						RegisterName name = definePtr->getRegisterName();
+						if (newName[name] == rnInvalid) {
+							newName[name] = nextName;
+							definingInstruction[nextName] = vrManager.getVirtualRegister(name).getDefiningInstruction();
+							nextName = RegisterName(nextName + 1);
+						}
+						definePtr->setRegisterName(newName[name]);
+					}
+			}
+		}
+		
+		vrManager.setSize(nextName);
+
+		for (RegisterName r = RegisterName(1); r < nextName; r = RegisterName(r + 1))
+			vrManager.getVirtualRegister(r).definingInstruction = definingInstruction[r];
+
+		UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("RegisterMap:\n"));
+		for (Uint32 i = 1; i < nameCount; i++)
+			if (newName[i] != 0)
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d becomes vr%d.\n", i, newName[i]));
+			else
+				UT_OBJECTLOG(UT_LOG_MODULE(RegAlloc), PR_LOG_ALWAYS, ("\tvr%d is dead.\n", i));
+
+
+		delete newName;
+		delete definingInstruction;
+	}
+
+}
+#endif // DEBUG
+
+void RegisterAllocatorTools::removeUnnecessaryCopies(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.advance(i);
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(instruction.getInstructionUseBegin() != instruction.getInstructionUseEnd() && instruction.getInstructionUseBegin()[0].isRegister());
+				assert(instruction.getInstructionDefineBegin() != instruction.getInstructionDefineEnd() && instruction.getInstructionDefineBegin()[0].isRegister());
+				
+				RegisterName source = name2range[instruction.getInstructionUseBegin()[0].getRegisterName()];
+				RegisterName destination = name2range[instruction.getInstructionDefineBegin()[0].getRegisterName()];
+
+				if (source == destination)
+					instruction.remove();
+			}
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::updateInstructionGraph(RegisterAllocator& registerAllocator)
+{
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		for (InstructionList::iterator p = phiNodes.begin(); !phiNodes.done(p); p = phiNodes.advance(p)) {
+			Instruction& instruction = phiNodes.get(p);
+
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			for (InstructionUse* usePtr = instruction.getInstructionUseBegin(); usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					usePtr->setRegisterName(name2range[usePtr->getRegisterName()]);
+
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			for (InstructionDefine* definePtr = instruction.getInstructionDefineBegin(); definePtr < defineEnd; definePtr++)
+				if (definePtr->isRegister())
+					definePtr->setRegisterName(name2range[definePtr->getRegisterName()]);
+		}
+	}
+}
+
+
+void RegisterAllocatorTools::insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter)
+{
+	Pool& pool = controlGraph.pool;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+	
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		DoublyLinkedList<PhiNode>& phiNodes = node.getPhiNodes();
+
+		if (!phiNodes.empty()) {
+
+			// Set the index of the incoming edges.
+			Uint32 index = 0;
+			const DoublyLinkedList<ControlEdge>& predecessors = node.getPredecessors();
+			for (DoublyLinkedList<ControlEdge>::iterator p = predecessors.begin(); !predecessors.done(p); p = predecessors.advance(p))
+				predecessors.get(p).setIndex(index++);
+
+			// Insert the phi node instruction in the instruction list.
+			for (DoublyLinkedList<PhiNode>::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				PhiNode& phiNode = phiNodes.get(i);
+				ValueKind kind = phiNode.getKind();
+
+				if (!isStorableKind(kind))
+					continue;
+
+				RegisterClassKind classKind = rckGeneral; // FIX: get class kind from phi node kind.
+				Uint32 nInputs = phiNode.nInputs();
+
+				PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+				emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drLow);
+				for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+					emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drLow);
+
+				node.addPhiNodeInstruction(phiNodeInstruction);
+
+				if (isDoublewordKind(kind)) {
+					PhiNodeInstruction& phiNodeInstruction = *new(pool) PhiNodeInstruction(&phiNode, pool, nInputs);
+
+					emitter.defineProducer(phiNode, phiNodeInstruction, 0, classKind, drHigh);
+					for (Uint32 whichInput = 0; whichInput < nInputs; whichInput++)
+						emitter.useProducer(phiNode.nthInputVariable(whichInput), phiNodeInstruction, whichInput, classKind, drHigh);
+
+					node.addPhiNodeInstruction(phiNodeInstruction);
+				}
+			}
+		}
+	}
+}
+
+#ifdef DEBUG_LOG
+
+void RegisterAllocatorTools::printSpillCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SpillCost* cost = registerAllocator.spillCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Spill costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : ", i));
+		if (cost[i].infinite)
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("infinite\n"));
+		else
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("%f\n", cost[i].cost));
+	}
+}
+
+void RegisterAllocatorTools::printSplitCosts(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	SplitCost* cost = registerAllocator.splitCost;
+
+	UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("Split costs:\n"));
+	for (Uint32 i = 1; i < rangeCount; i++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\trange %d : loads = %f stores = %f\n", i, cost[i].loads, cost[i].stores));
+	}
+}
+
+void RegisterAllocatorTools::printInstructions(RegisterAllocator& registerAllocator)
+{
+	LogModuleObject log = UT_LOG_MODULE(RegAlloc);
+	ControlNode** nodes = registerAllocator.controlGraph.dfsList;
+	Uint32 nNodes = registerAllocator.controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("N%d:\n", n));
+
+		InstructionList& phiNodes = nodes[n]->getPhiNodeInstructions();
+		InstructionList& instructions = nodes[n]->getInstructions();
+
+		if (!phiNodes.empty()) {
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" PhiNodes:\n", n));
+			for(InstructionList::iterator i = phiNodes.begin(); !phiNodes.done(i); i = phiNodes.advance(i)) {
+				phiNodes.get(i).printPretty(log);
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+			}
+			if (!instructions.empty())
+				UT_OBJECTLOG(log, PR_LOG_ALWAYS, (" Instructions:\n", n));
+		}
+
+		for(InstructionList::iterator i = instructions.begin(); !instructions.done(i); i = instructions.advance(i)) {
+			instructions.get(i).printPretty(log);
+			UT_OBJECTLOG(log, PR_LOG_ALWAYS, ("\n"));
+		}
+	}
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/RegisterAllocatorTools.h

@@ -0,0 +1,117 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: RegisterAllocatorTools.h,v 1.1.2.1 1999-03-02 16:12:05 fur%netscape.com Exp $
+//
+
+#ifndef _REGISTER_ALLOCATOR_TOOLS_H_
+#define _REGISTER_ALLOCATOR_TOOLS_H_
+
+#include "LogModule.h"
+#include "RegisterTypes.h"
+#include <string.h>
+
+class RegisterAllocator;
+class ControlGraph;
+class InstructionEmitter;
+class VirtualRegisterManager;
+
+struct RegisterAllocatorTools
+{
+	//
+	//
+	static void insertPhiNodeInstructions(ControlGraph& controlGraph, InstructionEmitter& emitter);
+
+	//
+	//
+	static void updateInstructionGraph(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void removeUnnecessaryCopies(RegisterAllocator& registerAllocator);
+
+#ifdef DEBUG
+	//
+	//
+	static void testTheInstructionGraph(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
+#endif // DEBUG
+
+#ifdef DEBUG_LOG
+	//
+	//
+	static void printInstructions(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSpillCosts(RegisterAllocator& registerAllocator);
+
+	//
+	//
+	static void printSplitCosts(RegisterAllocator& registerAllocator);
+#endif // DEBUG_LOG
+};
+
+//
+// FIX: this should go in a class (LookupTable ?)
+//
+
+inline RegisterName findRoot(RegisterName name, RegisterName* table)
+{
+	RegisterName* stack = table;
+	RegisterName* stackPtr = stack;
+
+	RegisterName newName;
+	while((newName = table[name]) != name) {
+		*--stackPtr = name;
+		name = newName;
+	}
+
+	while (stackPtr != stack)
+		table[*stackPtr++] = name;
+
+	return name;
+}
+
+inline void init(RegisterName* table, Uint32 nameCount)
+{
+	for (RegisterName r = RegisterName(0); r < nameCount; r = RegisterName(r + 1))
+		table[r] = r;
+}
+
+inline Uint32 compress(RegisterName* name2range, RegisterName* table, Uint32 nameCount, Uint32 tableSize)
+{
+	RegisterName* liveRange = new RegisterName[tableSize];
+	memset(liveRange, '\0', tableSize * sizeof(RegisterName));
+
+	// Update the lookup table.
+	for (RegisterName r = RegisterName(1); r < tableSize; r = RegisterName(r + 1))
+		findRoot(r, table);
+
+	// Count the liveranges.
+	Uint32 liveRangeCount = 1;
+	for (RegisterName s = RegisterName(1); s < tableSize; s = RegisterName(s + 1))
+		if (table[s] == s)
+			liveRange[s] = RegisterName(liveRangeCount++);
+
+	for (RegisterName t = RegisterName(1); t < nameCount; t = RegisterName(t + 1))
+		name2range[t] = liveRange[table[name2range[t]]];
+
+	return liveRangeCount;
+}
+
+inline double doLog10(Uint32 power)
+{
+	double log = 1.0;
+	while (power--)
+		log *= 10.0;
+	return log;
+}
+
+#endif // _REGISTER_ALLOCATOR_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterAssigner.h

@@ -16,20 +16,23 @@
  * Reserved.
  */
 
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
+#ifndef _REGISTER_ASSIGNER_H_
+#define _REGISTER_ASSIGNER_H_
 
-class nsLookAndFeel: public nsILookAndFeel {
-  NS_DECL_ISUPPORTS
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+
+class FastBitMatrix;
+
+class RegisterAssigner
+{
+protected:
+  VirtualRegisterManager& vRegManager;
   
 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);
+  RegisterAssigner(VirtualRegisterManager& vrMan) : vRegManager(vrMan) {}
+  
+  virtual bool assignRegisters(FastBitMatrix& interferenceMatrix) = 0;
 };
 
-#endif
+#endif /* _REGISTER_ASSIGNER_H_ */

mozilla/ef/Compiler/RegisterAllocator/RegisterClass.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- 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
@@ -15,12 +15,11 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
- 
-/*
- * Used for Logging in the widget/src/photon directory.
- */ 
 
-#include <prlog.h>
-#include <signal.h>
+#ifndef _REGISTER_CLASS_H_
+#define _REGISTER_CLASS_H_
 
-extern PRLogModuleInfo *PhWidLog;
+#include "Fundamentals.h"
+#include "RegisterTypes.h"
+
+#endif // _REGISTER_CLASS_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterPressure.h

@@ -16,20 +16,22 @@
  * Reserved.
  */
 
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
+#ifndef _REGISTER_PRESSURE_H_
+#define _REGISTER_PRESSURE_H_
 
-class nsLookAndFeel: public nsILookAndFeel {
-  NS_DECL_ISUPPORTS
+#include "BitSet.h"
+#include "HashSet.h"
 
-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);
+struct LowRegisterPressure
+{
+	typedef BitSet Set;
+	static const bool setIsOrdered = true;
 };
 
-#endif
+struct HighRegisterPressure
+{
+	typedef HashSet Set;
+	static const bool setIsOrdered = false;
+};
+
+#endif // _REGISTER_PRESSURE_H_

mozilla/ef/Compiler/RegisterAllocator/RegisterTypes.h

@@ -0,0 +1,104 @@
+/* -*- 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 _REGISTER_TYPES_H_
+#define _REGISTER_TYPES_H_
+
+#include "Fundamentals.h"
+
+//------------------------------------------------------------------------------
+// RegisterName -
+//
+
+enum RegisterName {
+	rnInvalid = 0,
+};
+
+//------------------------------------------------------------------------------
+// RegisterClassKind -
+//
+
+enum RegisterClassKind {
+	rckInvalid = 0,
+	rckGeneral,
+	rckStackSlot,
+
+	nRegisterClassKind
+};
+
+//------------------------------------------------------------------------------
+// RegisterID -
+//
+
+enum RegisterID {
+	invalidID = 0
+};
+
+//------------------------------------------------------------------------------
+// RegisterKind -
+//
+
+enum RegisterKind {
+	rkCallerSave = 0,
+	rkCalleeSave,
+};
+
+struct NameLinkedList {
+	RegisterName name;
+	NameLinkedList* next;
+};
+
+#ifdef DEBUG
+
+const registerNameMask = 		0x03ffffff;
+const coloredRegisterMask = 	0x04000000;
+const machineRegisterMask = 	0x08000000;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const coloredRegisterShift = 	26;
+const machineRegisterShift = 	27;
+const registerClassShift = 		28;
+
+#else // DEBUG
+
+const registerNameMask = 		0x0fffffff;
+const registerClassMask = 		0xf0000000;
+
+const registerNameShift = 		0;
+const registerClassShift = 		28;
+
+#endif // DEBUG
+
+
+inline RegisterClassKind getClass(RegisterID registerID) {return RegisterClassKind((registerID & registerClassMask) >> registerClassShift);}
+inline RegisterName getName(RegisterID registerID) {return RegisterName((registerID & registerNameMask) >> registerNameShift);}
+inline void setClass(RegisterID& registerID, RegisterClassKind classKind) {registerID = RegisterID((registerID & ~registerClassMask) | ((classKind << registerClassShift) & registerClassMask));}
+inline void setName(RegisterID& registerID, RegisterName name) {assert((name & ~registerNameMask) == 0); registerID = RegisterID((registerID & ~registerNameMask) | ((name << registerNameShift) & registerNameMask));}
+inline RegisterID buildRegisterID(RegisterName name, RegisterClassKind classKind) {return RegisterID(((classKind << registerClassShift) & registerClassMask) | ((name << registerNameShift) & registerNameMask));}
+
+#ifdef DEBUG
+
+inline bool isMachineRegister(RegisterID rid) {return (rid & machineRegisterMask) != 0;}
+inline void setMachineRegister(RegisterID& rid) {rid = RegisterID(rid | machineRegisterMask);}
+inline bool isColoredRegister(RegisterID rid) {return (rid & coloredRegisterMask) != 0;}
+inline void setColoredRegister(RegisterID& rid) {rid = RegisterID(rid | coloredRegisterMask);}
+
+#endif // DEBUG
+
+#endif // _REGISTER_TYPES_H_

mozilla/ef/Compiler/RegisterAllocator/SSATools.cpp

@@ -16,20 +16,17 @@
  * Reserved.
  */
 
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
+#include "Fundamentals.h"
+#include "SSATools.h"
+#include "ControlGraph.h"
+#include "VirtualRegister.h"
+#include "Liveness.h"
 
-class nsLookAndFeel: public nsILookAndFeel {
-public:
-  nsLookAndFeel();
-  virtual ~nsLookAndFeel();
+void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager)
+{
+	if (!controlGraph.hasBackEdges)
+		return;
 
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor);
-  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric);
-  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric);
-};
-
-#endif
+	Liveness liveness(controlGraph.pool);
+	liveness.buildLivenessAnalysis(controlGraph, vrManager);
+}

mozilla/ef/Compiler/RegisterAllocator/SSATools.h

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- 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
@@ -16,19 +16,14 @@
  * Reserved.
  */
 
-#ifndef __nsSound_h__
-#define __nsSound_h__
+#ifndef _SSA_TOOLS_H_
+#define _SSA_TOOLS_H_
 
-#include "nsISound.h"
+#include "Fundamentals.h"
 
-class nsSound : public nsISound {
- public: 
+class ControlGraph;
+class VirtualRegisterManager;
 
-  nsSound();
-  virtual ~nsSound();
+extern void replacePhiNodes(ControlGraph& controlGraph, VirtualRegisterManager& vrManager);
 
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISOUND
-};
-
-#endif /* __nsSound_h__ */
+#endif // _SSA_TOOLS_H_

mozilla/ef/Compiler/RegisterAllocator/SparseSet.cpp

@@ -16,20 +16,22 @@
  * Reserved.
  */
 
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
+#include "Fundamentals.h"
+#include "SparseSet.h"
+#include "BitSet.h"
+#include "Pool.h"
 
-class nsLookAndFeel: public nsILookAndFeel {
-  NS_DECL_ISUPPORTS
+#ifdef DEBUG_LOG
+// Print the set.
+//
+void SparseSet::printPretty(LogModuleObject log)
+{
+	Pool pool;
+	BitSet set(pool, universeSize);
 
-public:
-  nsLookAndFeel();
-  virtual ~nsLookAndFeel();
+	for (Uint32 i = 0; i < count; i++)
+	   set.set(node[i].element);
 
-  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor);
-  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric);
-  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric);
-};
-
-#endif
+	set.printPretty(log);
+}
+#endif // DEBUG_LOG

mozilla/ef/Compiler/RegisterAllocator/SparseSet.h

@@ -0,0 +1,168 @@
+//	-*- mode:C++; tab-width:4; truncate-lines:t -*-
+//
+//           CONFIDENTIAL AND PROPRIETARY SOURCE CODE OF
+//              NETSCAPE COMMUNICATIONS CORPORATION
+// Copyright © 1996, 1997 Netscape Communications Corporation.  All Rights
+// Reserved.  Use of this Source Code is subject to the terms of the
+// applicable license agreement from Netscape Communications Corporation.
+// The copyright notice(s) in this Source Code does not indicate actual or
+// intended publication of this Source Code.
+//
+// $Id: SparseSet.h,v 1.1.2.1 1999-03-02 16:12:07 fur%netscape.com Exp $
+//
+
+#ifndef _SPARSE_SET_H_
+#define _SPARSE_SET_H_
+
+#include "Fundamentals.h"
+#include "Pool.h"
+#include "LogModule.h"
+#include "BitSet.h"
+
+class SparseSet
+{
+private:
+
+	struct Node {
+		Uint32		element;
+		Uint32		stackIndex;
+	};
+
+	Node*			node;
+	Uint32			count;
+	Uint32			universeSize;
+
+private:
+
+	// No copy constructor.
+	SparseSet(const SparseSet&);
+
+	// Check if the given set's universe is of the same size than this universe.
+	void checkUniverseCompatibility(const SparseSet& set) const {assert(set.universeSize == universeSize);}
+	// Check if pos is valid for this set's universe.
+	void checkMember(Int32 pos) const {assert(pos >=0 && Uint32(pos) < universeSize);}
+
+public:
+
+	SparseSet(Pool& pool, Uint32 universeSize) : universeSize(universeSize) {node = new(pool) Node[universeSize]; clear();}
+
+	// Clear the sparse set.
+	void clear() {count = 0;}
+	// Clear the element at index.
+	inline void clear(Uint32 index);
+	// Set the element at index.
+	inline void set(Uint32 index);
+	// Return true if the element at index is set.
+	inline bool test(Uint32 index) const;
+	// Union with the given sparse set.
+	inline void or(const SparseSet& set);
+	// Intersection with the given sparse set.
+	inline void and(const SparseSet& set);
+	// Difference with the given sparse set.
+	inline void difference(const SparseSet& set);
+	// Copy set.
+	inline SparseSet& operator = (const SparseSet& set);
+	inline SparseSet& operator = (const BitSet& set);
+	// Return true if the sparse sets are identical.
+	friend bool operator == (const SparseSet& set1, const SparseSet& set2);
+	// Return true if the sparse sets are different.
+	friend bool operator != (const SparseSet& set1, const SparseSet& set2);
+
+	// Logical operators.
+	SparseSet& operator |= (const SparseSet& set) {or(set); return *this;}
+	SparseSet& operator &= (const SparseSet& set) {and(set); return *this;}
+	SparseSet& operator -= (const SparseSet& set) {difference(set); return *this;}
+
+	// Iterator to conform with the set API.
+	typedef Int32 iterator;
+	// Return the iterator for the first element of this set.
+	iterator begin() const {return count - 1;}
+	// Return the next iterator.
+	iterator advance(iterator pos) const {return --pos;}
+	// Return true if the iterator is at the end of the set.
+	bool done(iterator pos) const {return pos < 0;}
+	// Return the element for the given iterator;
+	Uint32 get(iterator pos) const {return node[pos].element;}
+	// Return one element of this set.
+	Uint32 getOne() const {assert(count > 0); return node[0].element;}
+	// Return the size of this set.
+	Uint32 getSize() const {return count;}
+
+#ifdef DEBUG_LOG
+	// Print the set.
+	void printPretty(LogModuleObject log);
+#endif // DEBUG_LOG
+};
+
+inline void SparseSet::clear(Uint32 element)
+{
+	checkMember(element);
+	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex < count) && (node[stackIndex].element == element)) {
+		Uint32 stackTop = node[count - 1].element;
+
+		node[stackIndex].element = stackTop;
+		node[stackTop].stackIndex = stackIndex;
+		this->count = count - 1;
+	}
+}
+
+inline void SparseSet::set(Uint32 element)
+{
+	checkMember(element);
+  	Uint32 count = this->count;
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+
+	if ((stackIndex >= count) || (node[stackIndex].element != element)) {
+		node[count].element = element;
+		node[element].stackIndex = count;
+		this->count = count + 1;
+	}
+}
+
+inline bool SparseSet::test(Uint32 element) const
+{
+	checkMember(element);
+	Node* node = this->node;
+
+	Uint32 stackIndex = node[element].stackIndex;
+	return ((stackIndex < count) && (node[stackIndex].element == element));
+}
+
+inline SparseSet& SparseSet::operator = (const SparseSet& set)
+{
+	checkUniverseCompatibility(set);
+	Uint32 sourceCount = set.getSize();
+	Node* node = this->node;
+
+	memcpy(node, set.node, sourceCount * sizeof(Node));
+
+	for (Uint32 i = 0; i < sourceCount; i++) {
+		Uint32 element = node[i].element;
+		node[element].stackIndex = i;
+	}
+
+	count = sourceCount;
+
+	return *this;
+}
+
+
+inline SparseSet& SparseSet::operator = (const BitSet& set)
+{
+	// FIX: there's room for optimization here.
+	assert(universeSize == set.getSize());
+
+	clear();
+	for (Int32 i = set.firstOne(); i != -1; i = set.nextOne(i))
+		this->set(i);
+	return *this;
+}
+
+#endif // _SPARSE_SET_H_

mozilla/ef/Compiler/RegisterAllocator/Spilling.cpp

@@ -0,0 +1,270 @@
+/* -*- 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 NEW_LAURENTM_CODE
+#define INCLUDE_EMITTER
+#include "CpuInfo.h"
+#include "Fundamentals.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "InstructionEmitter.h"
+#include "Spilling.h"
+
+
+void Spilling::
+insertSpillCode(ControlNode** dfsList, Uint32 nNodes)
+{
+  PRUint32 nVirtualRegisters = vRegManager.count();
+  FastBitSet currentLive(vRegManager.pool, nVirtualRegisters);
+  FastBitSet usedInThisInstruction(vRegManager.pool, nVirtualRegisters);
+  RegisterFifo grNeedLoad(nVirtualRegisters);
+  RegisterFifo fpNeedLoad(nVirtualRegisters);
+
+  for (PRInt32 n = nNodes - 1; n >= 0; n--)
+	{
+	  PR_ASSERT(grNeedLoad.empty() & fpNeedLoad.empty());
+	  ControlNode& node = *dfsList[n];
+
+	  currentLive = node.liveAtEnd;
+
+	  PRUint32 nGeneralAlive = 0;
+	  PRUint32 nFloatingPointAlive = 0;
+
+	  // Get the number of registers alive at the end of this node.
+	  for (PRInt32 j = currentLive.firstOne(); j != -1; j = currentLive.nextOne(j))
+		{
+		  VirtualRegister& vReg = vRegManager.getVirtualRegister(j);
+		  if (vReg.spillInfo.willSpill)
+			{
+			  currentLive.clear(j);
+			}
+		  else
+			{
+			  switch (vReg.getClass())
+				{
+				case vrcInteger:
+				  nGeneralAlive++;
+				  break;
+				case vrcFloatingPoint:
+				case vrcFixedPoint:
+				  nFloatingPointAlive++;
+				  break;
+				default:
+				  break;
+				}
+			}
+		}
+	  
+//		  if(node.dfsNum == 8) printf("\n________Begin Node %d________\n", node.dfsNum);
+
+		InstructionList& instructions = node.getInstructions();
+	  for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i))
+		{
+		  Instruction&       instruction = instructions.get(i);
+		  InstructionUse*    useBegin    = instruction.getInstructionUseBegin();
+		  InstructionUse*    useEnd      = instruction.getInstructionUseEnd();
+		  InstructionUse*    usePtr;
+		  InstructionDefine* defBegin    = instruction.getInstructionDefineBegin();
+		  InstructionDefine* defEnd      = instruction.getInstructionDefineEnd();
+		  InstructionDefine* defPtr;
+
+//		if(node.dfsNum == 8)  { printf("\n");
+//		instruction.printPretty(stdout);
+//		printf("\n"); }
+
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				currentLive.clear(vReg.getRegisterIndex());
+				switch (vReg.getClass())
+				  {
+				  case vrcInteger:
+					nGeneralAlive--;
+					break;
+				  case vrcFloatingPoint:
+				  case vrcFixedPoint:
+					nFloatingPointAlive--;
+					break;
+				  default:
+					break;
+				  }
+			  }
+
+		  // Check for deaths
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				if (!currentLive.test(vReg.getRegisterIndex()))
+				  // This is the last use of this register.
+				  {
+					currentLive.set(vReg.getRegisterIndex());
+					switch (vReg.getClass())
+					  {
+					  case vrcInteger:
+						nGeneralAlive++;
+						while (/*(nGeneralAlive > NUMBER_OF_GREGISTERS) &&*/ !grNeedLoad.empty())
+						  {
+							PRUint32 toLoad = grNeedLoad.get();
+							currentLive.clear(toLoad);
+							nGeneralAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  case vrcFloatingPoint:
+					  case vrcFixedPoint:
+						nFloatingPointAlive++;
+						while (/*(nFloatingPointAlive > NUMBER_OF_FPREGISTERS) &&*/ !fpNeedLoad.empty())
+						  {
+							PRUint32 toLoad = fpNeedLoad.get();
+							currentLive.clear(toLoad);
+							nFloatingPointAlive--;
+							
+							VirtualRegister& nReg = vRegManager.getVirtualRegister(toLoad);
+							Instruction& lastUsingInstruction = *nReg.spillInfo.lastUsingInstruction;
+							emitter.emitLoadAfter(*lastUsingInstruction.getPrimitive(), lastUsingInstruction.getLinks().prev,
+												  nReg.getAlias(), *nReg.equivalentRegister[vrcStackSlot]);
+							nReg.releaseSelf();
+						  }
+						break;
+					  default:
+						break;
+					  }
+				  }
+			  }
+
+		  // Handle uses
+		  for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+			if (usePtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = usePtr->getVirtualRegister();
+				PRUint32 registerIndex = vReg.getRegisterIndex();
+
+				if (vReg.spillInfo.willSpill) {
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchUseToSpill((usePtr - useBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  switch (vReg.getClass())
+						{
+						case vrcInteger:
+						  if (!grNeedLoad.test(registerIndex))
+							{
+							  grNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vrcInteger);
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /* if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						case vrcFloatingPoint:
+						case vrcFixedPoint:
+						  if (!fpNeedLoad.test(registerIndex))
+							{
+							  fpNeedLoad.put(registerIndex);
+							  VirtualRegister& alias = vRegManager.newVirtualRegister(vReg.getClass());
+							  if (vReg.isPreColored())
+								  alias.preColorRegister(vReg.getPreColor());
+							  /*if (vReg.hasSpecialInterference) {
+								  alias.specialInterference.sizeTo(NUMBER_OF_REGISTERS);
+								  alias.specialInterference = vReg.specialInterference;
+								  alias.hasSpecialInterference = true;
+							  } */
+							  vReg.setAlias(alias);
+							  vReg.retainSelf();
+							}
+						  break;
+						default:
+						  break;
+						}
+					  usePtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+					  usedInThisInstruction.set(registerIndex);
+					  vReg.spillInfo.lastUsingInstruction = &instruction;
+					}
+				  currentLive.clear(registerIndex);
+				} else { // will not spill
+				  currentLive.set(registerIndex);
+				}
+			  }
+		  
+		  // Handle definitions
+		  for (defPtr = defBegin; defPtr < defEnd; defPtr++)
+			if (defPtr->isVirtualRegister())
+			  {
+				VirtualRegister& vReg = defPtr->getVirtualRegister();
+				
+				if (vReg.spillInfo.willSpill)
+#if defined(GENERATE_FOR_X86)
+				  if (!instruction.switchDefineToSpill((defPtr - defBegin), *vReg.equivalentRegister[vrcStackSlot]))
+#endif
+					{
+					  if (usedInThisInstruction.test(vReg.getRegisterIndex()))
+						// this virtualRegister was used in this instruction and is also defined. We need to move 
+						// this virtual register to its alias first and then save it to memory.
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg.getAlias(), *vReg.equivalentRegister[vrcStackSlot]);
+						  defPtr->getVirtualRegisterPtr().initialize(vReg.getAlias());
+						}
+					  else
+						{
+						  emitter.emitStoreAfter(*instruction.getPrimitive(), &instruction.getLinks(), 
+												 vReg, *vReg.equivalentRegister[vrcStackSlot]);
+						}
+					}
+			  }
+		}
+	  while (!grNeedLoad.empty())
+		{
+		  PRUint32 nl = grNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+		  
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+	  while (!fpNeedLoad.empty())
+		{
+		  PRUint32 nl = fpNeedLoad.get();
+		  VirtualRegister& nlReg = vRegManager.getVirtualRegister(nl);
+		  Instruction& lastUse = *nlReg.spillInfo.lastUsingInstruction;
+
+		  emitter.emitLoadAfter(*lastUse.getPrimitive(), lastUse.getLinks().prev, 
+								nlReg.getAlias(), *nlReg.equivalentRegister[vrcStackSlot]);
+		  nlReg.releaseSelf();
+		}
+
+//	  if(node.dfsNum == 8) printf("\n________End Node %d________\n", node.dfsNum);
+
+	}
+}
+#endif

mozilla/ef/Compiler/RegisterAllocator/Spilling.h

@@ -0,0 +1,269 @@
+/* -*- 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 _SPILLING_H_
+#define _SPILLING_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "SparseSet.h"
+
+template <class RegisterPressure>
+class Spilling
+{
+private:
+	static void insertStoreAfter(Instruction& instruction, RegisterName name);
+	static void insertLoadBefore(Instruction& instruction, RegisterName name);
+
+public:
+	static void calculateSpillCosts(RegisterAllocator& registerAllocator);
+	static void insertSpillCode(RegisterAllocator& registerAllocator);
+};
+
+struct SpillCost
+{
+	double loads;
+	double stores;
+	double copies;
+	double cost;
+	bool infinite;
+};
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertSpillCode(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet currentLive(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+	SparseSet& willSpill = *registerAllocator.willSpill;
+	
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+
+		needLoad.clear();
+		currentLive = liveOut[n];
+		mustSpill = currentLive;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i);) {
+			Instruction& instruction = instructions.get(i);
+			i = instructions.retreat(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			bool foundLiveDefine = false;
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					if (currentLive.test(name2range[definePtr->getRegisterName()])) {
+						foundLiveDefine = true;
+						break;
+					}
+				} else {
+					foundLiveDefine = true;
+					break;
+				}
+			if (defineBegin != defineEnd && !foundLiveDefine) {
+				fprintf(stderr, "!!! Removed instruction because it was only defining unused registers !!!\n");
+				instruction.remove();
+			}
+
+ 			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+#ifdef DEBUG
+					if (needLoad.test(range))
+						if (!mustSpill.test(range) && registerAllocator.spillCost[range].infinite && willSpill.test(range)) {
+							fprintf(stderr, "Tried to spill a register with infinite spill cost\n");
+							abort();
+						}
+#endif // DEBUG
+					if (willSpill.test(range))
+						insertStoreAfter(instruction, range);
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister()) {
+						RegisterName range = name2range[usePtr->getRegisterName()];
+						if (!currentLive.test(range))
+							for (SparseSet::iterator r = needLoad.begin(); !needLoad.done(r); r = needLoad.advance(r)) {
+								RegisterName load = RegisterName(needLoad.get(r));
+								if (willSpill.test(load))
+									insertLoadBefore(instruction, load);
+								mustSpill.set(load);
+							}
+						needLoad.clear();
+					}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					currentLive.clear(name2range[definePtr->getRegisterName()]);
+
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					currentLive.set(range);
+					needLoad.set(range);
+				}
+		}
+
+		for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+			RegisterName load = RegisterName(needLoad.get(l));
+			if (willSpill.test(load))
+				insertLoadBefore(instructions.first(), load);
+		}		
+	}
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertLoadBefore(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert load for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::insertStoreAfter(Instruction& /*instruction*/, RegisterName name)
+{
+	fprintf(stdout, "will insert store for range %d\n", name);
+}
+
+template <class RegisterPressure>
+void Spilling<RegisterPressure>::calculateSpillCosts(RegisterAllocator& registerAllocator)
+{
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	Pool& pool = registerAllocator.pool;
+	SparseSet live(pool, rangeCount);
+	SparseSet needLoad(pool, rangeCount);
+	SparseSet mustSpill(pool, rangeCount);
+
+	SparseSet alreadyStored(pool, rangeCount); // FIX: should get this from previous spilling.
+
+	SpillCost* cost = new SpillCost[rangeCount];
+	memset(cost, '\0', rangeCount * sizeof(SpillCost));
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+
+		double weight = doLog10(node.loopDepth);
+
+		needLoad.clear();
+		live = liveOut[n];
+		mustSpill = live;
+
+		InstructionList& instructions = nodes[n]->getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister()) {
+					RegisterName range = name2range[definePtr->getRegisterName()];
+
+					if (needLoad.test(range))
+						if (!mustSpill.test(range))
+							cost[range].infinite = true;
+
+					if ((false /* !rematerializable(range) */ || !needLoad.test(range)) && !alreadyStored.test(range))
+						cost[range].stores += weight;
+
+					needLoad.clear(range);
+				}
+
+			if (instruction.getFlags() & ifCopy)
+				for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+					if (usePtr->isRegister())
+						if (!live.test(name2range[usePtr->getRegisterName()])) {
+							for (SparseSet::iterator l = needLoad.begin(); !needLoad.done(l); l = needLoad.advance(l)) {
+								Uint32 range = needLoad.get(l);
+								cost[range].loads += weight;
+								mustSpill.set(range);
+							}
+							needLoad.clear();
+						}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+
+					live.set(range);
+					needLoad.set(range);
+				}
+
+			if (instruction.getFlags() & ifCopy) {
+				assert(useBegin != useEnd && useBegin[0].isRegister());
+				assert(defineBegin != defineEnd && defineBegin[0].isRegister());
+
+				RegisterName source = name2range[useBegin[0].getRegisterName()];
+				RegisterName destination = name2range[defineBegin[0].getRegisterName()];
+
+				cost[source].copies += weight;
+				cost[destination].copies += weight;
+			}			
+		}
+
+		for (SparseSet::iterator s = needLoad.begin(); !needLoad.done(s); s = needLoad.advance(s))
+			cost[needLoad.get(s)].loads += weight;
+	}
+	
+	for (Uint32 r = 0; r < rangeCount; r++) {
+		SpillCost& c = cost[r];
+		c.cost = 2 * (c.loads + c.stores) - c.copies;
+	}
+
+	registerAllocator.spillCost = cost;
+}
+
+#endif // _SPILLING_H_

mozilla/ef/Compiler/RegisterAllocator/Splits.h

@@ -0,0 +1,239 @@
+/* -*- 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 _SPLITS_H_
+#define _SPLITS_H_
+
+#include "Fundamentals.h"
+#include <string.h>
+#include "Pool.h"
+#include "ControlGraph.h"
+#include "ControlNodes.h"
+#include "Instruction.h"
+#include "RegisterAllocator.h"
+#include "RegisterAllocatorTools.h"
+
+UT_EXTERN_LOG_MODULE(RegAlloc);
+
+template <class RegisterPressure>
+struct Splits
+{
+	static void calculateSplitCosts(RegisterAllocator& registerAllocator);
+	static bool findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range);
+	static void insertSplitCode(RegisterAllocator& registerAllocator);
+};
+
+struct SplitCost
+{
+	double loads;
+	double stores;
+};
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::insertSplitCode(RegisterAllocator& /*registerAllocator*/)
+{
+	// FIX
+}
+
+template <class RegisterPressure>
+bool Splits<RegisterPressure>::findSplit(RegisterAllocator& registerAllocator, RegisterName* color, RegisterName range)
+{
+	Pool& pool = registerAllocator.pool;
+	NameLinkedList** neighborsWithColor = new(pool) NameLinkedList*[6]; // FIX
+	memset(neighborsWithColor, '\0', 6 * sizeof(NameLinkedList*));
+
+	InterferenceGraph<RegisterPressure>& iGraph = registerAllocator.iGraph;
+
+	for (InterferenceVector* vector = iGraph.getInterferenceVector(range); vector != NULL; vector = vector->next)
+		for (Int32 i = vector->count - 1; i >=0; --i) {
+			RegisterName neighbor = vector->neighbors[i];
+			RegisterName c = color[neighbor];
+
+			if (c < 6) { // FIX
+				NameLinkedList* node = new(pool) NameLinkedList();
+				node->name = neighbor;
+				node->next = neighborsWithColor[c];
+				neighborsWithColor[c] = node;
+			}
+		}
+
+	bool splitAroundName = true;
+
+	LiveRangeGraph<RegisterPressure>& lGraph = registerAllocator.lGraph;
+	RegisterName bestColor = RegisterName(6); // FIX
+	double bestCost = registerAllocator.spillCost[range].cost;
+	SplitCost* splitCost = registerAllocator.splitCost;
+
+	for (RegisterName i = RegisterName(0); i < 6; i = RegisterName(i + 1)) { // FIX
+
+		double splitAroundNameCost = 0.0;
+		bool canSplitAroundName = true;
+
+		SplitCost& sCost = splitCost[range];
+		double addedCost = 2.0 * (sCost.stores + sCost.loads);
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(neighbor, range)) {
+				canSplitAroundName = false;
+				break;
+			} else
+				splitAroundNameCost += addedCost;
+		}
+		if (canSplitAroundName && splitAroundNameCost < bestCost) {
+			bestCost = splitAroundNameCost;
+			bestColor = i;
+			splitAroundName = true;
+		}
+
+		double splitAroundColorCost = 0.0;
+		bool canSplitAroundColor = true;
+
+		for (NameLinkedList* node = neighborsWithColor[i]; node != NULL; node = node->next) {
+			RegisterName neighbor = node->name;
+			if (lGraph.haveEdge(range, neighbor)) {
+				canSplitAroundColor = false;
+				break;
+			} else {
+				SplitCost& sCost = splitCost[neighbor];
+				double addedCost = 2.0 * (sCost.stores + sCost.loads);
+				splitAroundColorCost += addedCost;
+			}
+		}
+		if (canSplitAroundColor && splitAroundColorCost < bestCost) {
+			bestCost = splitAroundColorCost;
+			bestColor = i;
+			splitAroundName = false;
+		}
+ 	}
+	if (bestColor < RegisterName(6)) {
+		color[range] = bestColor;
+		registerAllocator.splitFound = true;
+
+		NameLinkedList** splitAround = registerAllocator.splitAround;
+
+		if (splitAroundName)
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				newNode->name = node->name;
+				newNode->next = splitAround[range];
+				splitAround[range] = newNode;
+			}
+		else
+			for (NameLinkedList* node = neighborsWithColor[bestColor]; node != NULL; node = node->next) {
+				NameLinkedList* newNode = new(pool) NameLinkedList();
+				RegisterName neighbor = node->name;
+				newNode->name = range;
+				newNode->next = splitAround[neighbor];
+				splitAround[neighbor] = newNode;
+			}
+
+		trespass("Found a split");
+		return true;
+	}
+
+	return false;
+}
+
+template <class RegisterPressure>
+void Splits<RegisterPressure>::calculateSplitCosts(RegisterAllocator& registerAllocator)
+{
+	Pool& pool = registerAllocator.pool;
+	Uint32 rangeCount = registerAllocator.rangeCount;
+	RegisterName* name2range = registerAllocator.name2range;
+
+	SplitCost* splitCost = new(pool) SplitCost[rangeCount];
+	memset(splitCost, '\0', rangeCount * sizeof(SplitCost));
+
+	SparseSet live(pool, rangeCount);
+	RegisterPressure::Set* liveIn = registerAllocator.liveness.liveIn;
+	RegisterPressure::Set* liveOut = registerAllocator.liveness.liveOut;
+
+	ControlGraph& controlGraph = registerAllocator.controlGraph;
+	ControlNode** nodes = controlGraph.dfsList;
+	Uint32 nNodes = controlGraph.nNodes;
+
+	for (Uint32 n = 0; n < nNodes; n++) {
+		ControlNode& node = *nodes[n];
+		double weight = doLog10(node.loopDepth);
+
+		live = liveOut[n];
+
+		ControlEdge* successorsEnd = node.getSuccessorsEnd();
+		for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++) {
+			ControlNode& successor = successorsPtr->getTarget();
+
+			if (successor.getControlKind() != ckEnd) {
+				RegisterPressure::Set& successorLiveIn = liveIn[successor.dfsNum];
+
+				for (SparseSet::iterator i = live.begin(); !live.done(i); i = live.advance(i)) {
+					RegisterName name = RegisterName(live.get(i));
+					if (!successorLiveIn.test(name))
+						splitCost[name].loads += doLog10(successor.loopDepth);
+				}
+			}
+		}
+
+		InstructionList& instructions = node.getInstructions();
+		for (InstructionList::iterator i = instructions.end(); !instructions.done(i); i = instructions.retreat(i)) {
+			Instruction& instruction = instructions.get(i);
+
+			InstructionUse* useBegin = instruction.getInstructionUseBegin();
+			InstructionUse* useEnd = instruction.getInstructionUseEnd();
+			InstructionUse* usePtr;
+			InstructionDefine* defineBegin = instruction.getInstructionDefineBegin();
+			InstructionDefine* defineEnd = instruction.getInstructionDefineEnd();
+			InstructionDefine* definePtr;
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					splitCost[name2range[definePtr->getRegisterName()]].stores += weight;
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister()) {
+					RegisterName range = name2range[usePtr->getRegisterName()];
+					if (!live.test(range)) {
+						if (&instruction != &instructions.last())
+							splitCost[range].loads += weight;
+						else {
+							ControlEdge* successorsEnd = node.getSuccessorsEnd();
+							for (ControlEdge* successorsPtr = node.getSuccessorsBegin(); successorsPtr < successorsEnd; successorsPtr++)
+								splitCost[range].loads += doLog10(successorsPtr->getTarget().loopDepth);
+						}
+					}
+				}
+
+			for (definePtr = defineBegin; definePtr < defineEnd; definePtr++) 
+				if (definePtr->isRegister())
+					live.clear(name2range[definePtr->getRegisterName()]);
+
+			for (usePtr = useBegin; usePtr < useEnd; usePtr++)
+				if (usePtr->isRegister())
+					live.set(name2range[usePtr->getRegisterName()]);
+		}
+	}
+
+	NameLinkedList** splitAround = new(pool) NameLinkedList*[rangeCount];
+	memset(splitAround, '\0', rangeCount * sizeof(NameLinkedList*));
+	registerAllocator.splitAround = splitAround;
+
+	registerAllocator.splitCost = splitCost;
+	registerAllocator.splitFound = false;
+}
+
+#endif // _SPLITS_H_

mozilla/ef/Compiler/RegisterAllocator/Timer.cpp

@@ -0,0 +1,186 @@
+/* -*- 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 "Fundamentals.h"
+#include "HashTable.h"
+#include "Timer.h"
+#include "Pool.h"
+
+static Pool pool;											// Pool for the Timer class.
+static HashTable<TimerEntry*> timerEntries(pool);			// Timers hashtable.
+
+const nTimersInABlock = 128;								// Number of timers in a block.
+static PRTime *timers = new(pool) PRTime[nTimersInABlock];	// A block of timers.
+static Uint8 nextTimer = 0;									// nextAvailableTimer.
+
+//
+// Calibrate the call to PR_Now().
+//
+static PRTime calibrate()
+{
+	PRTime t = PR_Now();
+	PRTime& a = *new(pool) PRTime();
+
+	// Call 10 times the PR_Now() function.
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); a = PR_Now(); 
+	t = (PR_Now() - t + 9) / 10;
+
+	return t;
+}
+
+static PRTime adjust = calibrate();
+
+//
+// Return the named timer..
+//
+TimerEntry& Timer::getTimerEntry(const char* name)
+{
+	if (!timerEntries.exists(name)) {
+		TimerEntry* newEntry = new(pool) TimerEntry();
+		newEntry->accumulator = 0;
+		newEntry->running = false;
+		timerEntries.add(name, newEntry);
+	}
+
+	return *timerEntries[name];
+}
+
+//
+// Return a reference to a new timer.
+//
+PRTime& Timer::getNewTimer()
+{
+	if (nextTimer >= nTimersInABlock) {
+		timers = new(pool) PRTime[nTimersInABlock];
+		nextTimer = 0;
+	}
+	return timers[nextTimer++];
+}
+
+static Uint32 timersAreFrozen = 0;
+
+//
+// Start the named timer.
+//
+void Timer::start(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(!timer.running);
+
+	timer.accumulator = 0;
+	timer.running = true;
+	timer.done = false;
+
+	unfreezeTimers();
+}
+
+//
+// Stop the named timer.
+//
+void Timer::stop(const char* name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+	PR_ASSERT(timer.running);
+	timer.running = false;
+	timer.done = true;
+
+	unfreezeTimers();
+}
+
+//
+// Freeze all the running timers.
+//
+void Timer::freezeTimers()
+{
+	PRTime when = PR_Now() - adjust;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry*> entries = timerEntries;
+		Uint32 count = entries.size();
+
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.accumulator += (when - *entry.startTime);
+			}
+		}
+	}
+	timersAreFrozen++;
+}
+ 
+//
+// Unfreeze all the running timers.
+//
+void Timer::unfreezeTimers()
+{
+	PR_ASSERT(timersAreFrozen != 0);
+	timersAreFrozen--;
+
+	if (timersAreFrozen == 0) {
+		Vector<TimerEntry *> entries = timerEntries;
+		Uint32 count = entries.size();
+		
+		PRTime& newStart = getNewTimer();
+		
+		for (Uint32 i = 0; i < count; i++) {
+			TimerEntry& entry = *entries[i];
+			if (entry.running) {
+				entry.startTime = &newStart;
+			}
+		}
+		
+		newStart = PR_Now();
+	}
+}
+
+//
+// Print the named timer in the file f.
+//
+void Timer::print(FILE* f, const char *name)
+{
+	if (timersAreFrozen)
+		return;
+
+	freezeTimers();
+
+	TimerEntry& timer = getTimerEntry(name);
+  
+	PR_ASSERT(timer.done);
+	PRTime elapsed = timer.accumulator;
+
+	if (elapsed >> 32) {
+		fprintf(f, "[timer %s out of range]\n", name);
+	} else {
+		fprintf(f, "[%dus in %s]\n", Uint32(elapsed), name);
+	}
+	fflush(f);
+
+	unfreezeTimers();
+}
+

mozilla/ef/Compiler/RegisterAllocator/Timer.h

@@ -0,0 +1,80 @@
+/* -*- 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 _TIMER_H_
+#define _TIMER_H_
+
+#include "Fundamentals.h"
+#include "HashTable.h"
+#include "prtime.h"
+
+//
+// Naming convention:
+//  As the class Timer contains only static methods, the timer's name should start with the 
+//  module name. Otherwise starting 2 timers with the same name will assert.
+//
+
+#ifndef NO_TIMER
+
+struct TimerEntry
+{
+	PRTime *startTime;					// Current time when we start the timer.
+	PRTime accumulator;					// Time spent in this timer.
+	bool running;						// True if the timer is running.
+	bool done;							// True if the timer was running and was stopped. 
+};
+
+class Timer
+{
+private:
+
+	// Return the named timer.
+	static TimerEntry& getTimerEntry(const char* name);
+	// Return a reference to a new Timer.
+	static PRTime& getNewTimer();
+
+public:
+
+	// Start the timer.
+	static void start(const char* name);
+	// Stop the timer.
+	static void stop(const char* name);
+	// Freeze all the running timers.
+	static void freezeTimers();
+	// Unfreeze all the running timers.
+	static void unfreezeTimers();
+	// Print the timer.
+	static void print(FILE* f, const char *name);
+};
+
+inline void startTimer(const char* name) 		{Timer::start(name);}
+inline void stopTimer(const char* name) 		{Timer::stop(name); Timer::print(stdout, name);}
+#define START_TIMER_SAFE						Timer::freezeTimers();
+#define END_TIMER_SAFE							Timer::unfreezeTimers();
+#define TIMER_SAFE(x)							START_TIMER_SAFE x; END_TIMER_SAFE
+
+#else /* NO_TIMER */
+
+inline void startTimer(const char* /*name*/) 	{} 
+inline void stopTimer(const char* /*name*/) 	{} 
+#define START_TIMER_SAFE
+#define END_TIMER_SAFE
+#define TIMER_SAFE(x)							x;
+
+#endif /* NO_TIMER */
+#endif /* _TIMER_H_ */

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.cpp

@@ -16,21 +16,25 @@
  * Reserved.
  */
 
-#ifndef __nsLookAndFeel
-#define __nsLookAndFeel
-#include "nsILookAndFeel.h"
+#include "Fundamentals.h"
+#include "VirtualRegister.h"
+#include "Instruction.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);
-};
+//------------------------------------------------------------------------------
+// VirtualRegister -
 
+#ifdef MANUAL_TEMPLATES
+template class IndexedPool<VirtualRegister>;
 #endif
+
+// Set the defining instruction.
+//
+void VirtualRegister::setDefiningInstruction(Instruction& instruction)
+{
+	if (definingInstruction != NULL) {
+		if ((instruction.getFlags() & ifCopy) && (definingInstruction->getFlags() & ifPhiNode))
+			return;
+	}
+	definingInstruction = &instruction;
+}
+

mozilla/ef/Compiler/RegisterAllocator/VirtualRegister.h

@@ -0,0 +1,116 @@
+/* -*- 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 _VIRTUAL_REGISTER_H_
+#define _VIRTUAL_REGISTER_H_
+
+#include "Fundamentals.h"
+#include "IndexedPool.h"
+#include <string.h>
+
+#include "RegisterTypes.h"
+#include "RegisterClass.h"
+
+
+//------------------------------------------------------------------------------
+// VirtualRegister - 24b
+
+class Instruction;
+
+class VirtualRegister : public IndexedObject<VirtualRegister>
+{
+public:
+
+	Instruction*					definingInstruction;	// Instruction defining this VR.
+
+	// Initialize a VR of the given classKind.
+	VirtualRegister(RegisterClassKind /*classKind*/) : definingInstruction(NULL) {}
+
+	// Return the defining instruction for this VR.
+	Instruction* getDefiningInstruction() const {return definingInstruction;}
+	// Set the defining instruction.
+	void setDefiningInstruction(Instruction& insn);
+};
+
+// Return true if the VirtualRegisters are equals. The only way 2 VRs can be equal is if
+// they have the same index. If they have the same index then they are at the same
+// address in the indexed pool.
+//
+inline bool operator == (const VirtualRegister& regA, const VirtualRegister& regB) {return &regA == &regB;}
+
+//------------------------------------------------------------------------------
+// VirtualRegisterManager -
+
+struct PreColoredRegister
+{
+	RegisterID id;
+	RegisterName color;
+};
+
+class VirtualRegisterManager
+{
+private:
+
+	IndexedPool<VirtualRegister> registerPool;
+	PreColoredRegister machineRegister[6];
+
+public:
+	VirtualRegisterManager()
+		{
+			for (Uint32 i = 0; i < 6; i++)
+				machineRegister[i].id = invalidID;
+		}
+
+	// Return the VirtualRegister at the given index.
+	VirtualRegister& getVirtualRegister(RegisterName name) const {return registerPool.get(name);}
+
+	// Return a new VirtualRegister.
+	RegisterID newVirtualRegister(RegisterClassKind classKind)
+		{
+			VirtualRegister& vReg = *new(registerPool) VirtualRegister(classKind);
+			RegisterID rid;
+
+			setName(rid, RegisterName(vReg.getIndex()));
+			setClass(rid, classKind);
+			return rid;
+		}
+
+	RegisterID newMachineRegister(RegisterName name, RegisterClassKind classKind)
+		{
+			RegisterID rid = machineRegister[name].id;
+
+			if (rid == invalidID) {
+				rid = newVirtualRegister(classKind);
+				DEBUG_ONLY(setMachineRegister(rid));
+				machineRegister[name].id = rid;
+				machineRegister[name].color = name;
+			}
+
+			return rid;
+		}
+
+	PreColoredRegister* getMachineRegistersBegin() const {return (PreColoredRegister*) machineRegister;} // FIX
+	PreColoredRegister* getMachineRegistersEnd() const {return (PreColoredRegister*) &machineRegister[6];} // FIX
+
+	// Return the VirtualRegister universe size.
+	Uint32 getSize() {return registerPool.getSize();}
+
+	void setSize(Uint32 size) {registerPool.setSize(size);}
+};
+
+#endif // _VIRTUAL_REGISTER_H_

mozilla/widget/Makefile.in

@@ -1,28 +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
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/widget/build.bat

@@ -1,21 +0,0 @@
-rem -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-rem 
-rem  The contents of this file are subject to the Netscape Public License
-rem  Version 1.0 (the "NPL"); you may not use this file except in
-rem  compliance with the NPL.  You may obtain a copy of the NPL at
-rem  http://www.mozilla.org/NPL/
-rem 
-rem  Software distributed under the NPL is distributed on an "AS IS" basis,
-rem  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-rem  for the specific language governing rights and limitations under the
-rem  NPL.
-rem 
-rem  The Initial Developer of this code under the NPL is Netscape
-rem  Communications Corporation.  Portions created by Netscape are
-rem  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-rem  Reserved.
-rem 
-
-del s:\ns\raptor\ui\src\windows\win32_d.obj\%1.obj
-del s:\ns\raptor\ui\tests\windows\win32_d.obj\winmain.obj
-nmake -f makefile.win

mozilla/widget/macbuild/Widget.prefix

@@ -1,11 +0,0 @@
-//
-// Widget.Prefix
-//
-// Global prefix file for the Widget project.
-//
-
-#include "MacPrefix.h"
-
-#include <Quickdraw.h>
-#include <Events.h>
-#include <MacWindows.h>

mozilla/widget/macbuild/WidgetDebug.prefix

@@ -1,11 +0,0 @@
-//
-// WidgetDebug.Prefix
-//
-// Global prefix file for the debug Widget project.
-//
-
-#include "MacPrefix_debug.h"
-
-#include <Quickdraw.h>
-#include <Events.h>
-#include <MacWindows.h>

mozilla/widget/macbuild/WidgetSharedDebugPrefix.h

@@ -1,22 +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.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.
- */
-
-#define MAC_SHARED 1
-#define _IMPL_NS_WIDGET 1
-
-#include "WidgetDebug.prefix"

mozilla/widget/macbuild/WidgetSharedPrefix.h

@@ -1,22 +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.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.
- */
-
-#define MAC_SHARED 1
-#define _IMPL_NS_WIDGET 1
-
-#include "Widget.prefix"

mozilla/widget/macbuild/widget.toc

@@ -1,35 +0,0 @@
-# target: widgetDebug.shlb
-mozilla/widget/src/mac/nsAppShell.cpp
-mozilla/widget/src/mac/nsButton.cpp
-mozilla/widget/src/mac/nsCheckButton.cpp
-mozilla/widget/src/mac/nsFileWidget.cpp
-mozilla/widget/src/mac/nsLookAndFeel.cpp
-mozilla/widget/src/mac/nsMacControl.cpp
-mozilla/widget/src/mac/nsMacEventHandler.cpp
-mozilla/widget/src/mac/nsMacMessagePump.cpp
-mozilla/widget/src/mac/nsMacMessageSink.cpp
-mozilla/widget/src/mac/nsMacWindow.cpp
-mozilla/widget/src/mac/nsMenu.cpp
-mozilla/widget/src/mac/nsMenuBar.cpp
-mozilla/widget/src/mac/nsMenuItem.cpp
-mozilla/widget/src/mac/nsRadioButton.cpp
-mozilla/widget/src/mac/nsScrollbar.cpp
-mozilla/widget/src/mac/nsTextAreaWidget.cpp
-mozilla/widget/src/mac/nsTextWidget.cpp
-mozilla/widget/src/mac/nsToolkit.cpp
-mozilla/widget/src/mac/nsWidgetFactory.cpp
-mozilla/widget/src/mac/nsWidgetSupport.cpp
-mozilla/widget/src/mac/nsWindow.cpp
-mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
-mozilla/widget/src/xpwidgets/nsHTColumn.cpp
-mozilla/widget/src/xpwidgets/nsHTControlStripItem.cpp
-mozilla/widget/src/xpwidgets/nsHTDataModel.cpp
-mozilla/widget/src/xpwidgets/nsHTItem.cpp
-mozilla/widget/src/xpwidgets/nsHTTreeDataModel.cpp
-mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp
-mozilla/widget/src/xpwidgets/nsImageButton.cpp
-mozilla/widget/src/xpwidgets/nsMenuButton.cpp
-mozilla/widget/src/xpwidgets/nsToolbar.cpp
-mozilla/widget/src/xpwidgets/nsToolbarItemHolder.cpp
-mozilla/widget/src/xpwidgets/nsToolbarManager.cpp
-mozilla/widget/src/xpwidgets/nsTreeView.cpp

mozilla/widget/makefile.win

@@ -1,23 +0,0 @@
-#!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=..
-
-
-DIRS=public timer src
-
-include <$(DEPTH)\config\rules.mak>

mozilla/widget/public/MANIFEST

@@ -1,33 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:widget directory
-#
-
-nsIDragSessionMac.h
-nsIWidget.h
-nsIKBStateControl.h
-nsIButton.h
-nsICheckButton.h
-nsIListWidget.h
-nsIComboBox.h
-nsITextWidget.h
-nsITextAreaWidget.h
-nsIComboBox.h
-nsIListBox.h
-nsIScrollbar.h
-nsGUIEvent.h
-nsIRadioButton.h
-nsIMouseListener.h
-nsIEventListener.h
-nsIFileWidget.h
-nsIMenuListener.h
-nsWidgetsCID.h
-nsILabel.h
-nsILookAndFeel.h
-nsWidgetSupport.h
-nsIMenu.h
-nsIMenuBar.h
-nsIMenuItem.h
-nsIPopUpMenu.h
-nsIKeyBindMgr.h
-nsStringUtil.h
-nsIContextMenu.h

mozilla/widget/public/MANIFEST_IDL

@@ -1,16 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist:idl directory
-#
-
-nsIAppShell.idl
-nsIFilePicker.idl
-nsIFileSpecWithUI.idl
-nsISound.idl
-nsIToolkit.idl
-nsITransferable.idl
-nsIDragSession.idl
-nsIDragService.idl
-nsIFormatConverter.idl
-nsIClipboard.idl
-nsIClipboardOwner.idl
-nsIRollupListener.idl

mozilla/widget/public/Makefile.in

@@ -1,92 +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
-
-MODULE		= raptor
-XPIDL_MODULE	= widget
-
-EXPORTS		= \
-		nsIFontSizeIterator.h \
-		nsIFontNameIterator.h \
-		nsIFontRetrieverService.h \
-		nsIMenuBar.h \
-		nsIMenu.h \
-		nsIMenuItem.h \
-		nsIPopUpMenu.h \
-		nsIFileWidget.h \
-		nsStringUtil.h \
-		nsIKBStateControl.h \
-		nsIButton.h \
-		nsICheckButton.h \
-		nsIListWidget.h \
-		nsIComboBox.h \
-		nsITextWidget.h \
-		nsITextAreaWidget.h \
-		nsIComboBox.h \
-		nsIListBox.h \
-		nsIScrollbar.h \
-		nsGUIEvent.h \
-		nsIRadioButton.h \
-		nsIMouseListener.h \
-		nsIEventListener.h \
-		nsIMenuListener.h \
-		nsWidgetsCID.h \
-		nsILookAndFeel.h \
-		nsILabel.h \
-		nsIMenuBar.h \
-		nsIMenu.h \
-		nsIMenuItem.h \
-		nsIPopUpMenu.h \
-		nsIFontNameIterator.h \
-		nsIFontSizeIterator.h \
-		nsIFontRetrieverService.h \
-		nsIContextMenu.h \
-		$(NULL)
-
-XPIDLSRCS	= \
-		nsIAppShell.idl \
-		nsIFilePicker.idl \
-		nsIFileSpecWithUI.idl \
-		nsIToolkit.idl \
-		nsISound.idl \
-		nsITransferable.idl \
-		nsIDragSession.idl \
-		nsIDragService.idl \
-		nsIFormatConverter.idl \
-		nsIClipboard.idl \
-		nsIClipboardOwner.idl \
-		nsIRollupListener.idl \
-		nsIWidget.idl \
-		nsIWindow.idl \
-		$(NULL)
-
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_UI
-

mozilla/widget/public/makefile.win

@@ -1,78 +0,0 @@
-#!nmake
-#
-# 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=..\..
-
-
-DEFINES=-D_IMPL_NS_UI 
-MODULE=raptor 
-XPIDL_MODULE=widget
-
-XPIDLSRCS =               \
-  .\nsIAppShell.idl \
-  .\nsIFilePicker.idl          \
-  .\nsIFileSpecWithUI.idl          \
-  .\nsISound.idl          \
-  .\nsIToolkit.idl        \
-  .\nsITransferable.idl          \
-  .\nsIDragSession.idl          \
-  .\nsIDragService.idl          \
-  .\nsIFormatConverter.idl          \
-  .\nsIClipboard.idl            \
-  .\nsIClipboardOwner.idl       \
-  .\nsIRollupListener.idl \
-  $(NULL)
-
-EXPORTS=\
-  nsIFontSizeIterator.h \
-  nsIFontNameIterator.h \
-  nsIFontRetrieverService.h \
-  nsIFileWidget.h            \
-  nsIWidget.h \
-  nsIKBStateControl.h \
-  nsIButton.h \
-  nsICheckButton.h \
-  nsIListWidget.h \
-  nsIComboBox.h \
-  nsITextWidget.h \
-  nsITextAreaWidget.h \
-  nsIComboBox.h \
-  nsIListBox.h \
-  nsIScrollbar.h \
-  nsGUIEvent.h \
-  nsIRadioButton.h \
-  nsIMouseListener.h \
-  nsIEventListener.h \
-  nsIMenuListener.h \
-  nsWidgetsCID.h \
-  nsStringUtil.h \
-  nsILookAndFeel.h \
-  nsILabel.h \
-  nsIMenuBar.h \
-  nsIMenu.h \
-  nsIMenuItem.h \
-  nsIContextMenu.h \
-  nsIPopUpMenu.h \
-  $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>
-

mozilla/widget/public/nsGUIEvent.h

@@ -1,509 +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 nsGUIEvent_h__
-#define nsGUIEvent_h__
-
-#include "nsPoint.h"
-#include "nsRect.h"
-
-class nsIRenderingContext;
-class nsIRegion;
-class nsIWidget;
-class nsIMenuItem;
-
-/**
- * Return status for event processors.
- */
-
-enum nsEventStatus {  
-    /// The event is ignored, do default processing
-  nsEventStatus_eIgnore,            
-    /// The event is consumed, don't do default processing
-  nsEventStatus_eConsumeNoDefault, 
-    /// The event is consumed, but do default processing
-  nsEventStatus_eConsumeDoDefault  
-};
-
-/**
- * General event
- */
-
-struct nsEvent {
-  /// See event struct types
-  PRUint8     eventStructType;
-  /// See GUI MESSAGES,
-  PRUint32    message;              
-  /// in widget relative coordinates, modified to be relative to current view in layout.
-  nsPoint     point;               
-  // in widget relative coordinates, not modified by layout code.
-  nsPoint     refPoint;               
-  /// elapsed time, in milliseconds, from the time the system was started to the time the message was created
-  PRUint32    time;      
-  // flags to hold event flow stage and capture/bubble cancellation status
-  PRUint32    flags;
-};
-
-/**
- * General graphic user interface event
- */
-
-struct nsGUIEvent : public nsEvent {
-                /// Originator of the event
-  nsIWidget*  widget;           
-                /// Internal platform specific message.
-  void*     nativeMsg;        
-};
-
-/**
- * Window resize event
- */
-
-struct nsSizeEvent : public nsGUIEvent {
-                /// x,y width, height in pixels (client area)
-    nsRect          *windowSize;    
-                /// width of entire window (in pixels)
-    PRInt32         mWinWidth;    
-                /// height of entire window (in pixels)
-    PRInt32         mWinHeight;    
-};
-
-/**
- * Window repaint event
- */
-
-struct nsPaintEvent : public nsGUIEvent {
-                /// Context to paint in.
-    nsIRenderingContext *renderingContext;
-                /// area to paint  (should be used instead of rect)
-    nsIRegion           *region;
-                /// x,y, width, height in pixels of area to paint
-    nsRect              *rect;      
-};
-
-/**
- * Scrollbar event
- */
-
-struct nsScrollbarEvent : public nsGUIEvent {
-                /// ranges between scrollbar 0 and (maxRange - thumbSize). See nsIScrollbar
-    PRUint32        position; 
-};
-
-
-struct nsInputEvent : public nsGUIEvent {
-                /// PR_TRUE indicates the shift key is down
-    PRBool          isShift;        
-                /// PR_TRUE indicates the control key is down
-    PRBool          isControl;      
-                /// PR_TRUE indicates the alt key is down
-    PRBool          isAlt;          
-                /// PR_TRUE indicates the meta key is down
-                /// (or, on Mac, the Command key)
-    PRBool          isMeta;
-};
-
-/**
- * Mouse event
- */
-
-struct nsMouseEvent : public nsInputEvent {
-                /// The number of mouse clicks
-    PRUint32        clickCount;          
-                /// Special return code for MOUSE_ACTIVATE to signal
-                /// if the target accepts activation (1), or denies it (0)
-    PRBool          acceptActivation;           
-};
-
-/**
- * Keyboard event
- */
-
-struct nsKeyEvent : public nsInputEvent {
-                /// see NS_VK codes
-    PRUint32        keyCode;   
-                /// OS translated Unicode char
-    PRUint32        charCode;
-                // indicates whether the event signifies a printable character
-    PRBool          isChar;
-};
-
-/**
- * IME Related Events
- */
-struct nsTextRange {
-	PRUint32	mStartOffset;
-	PRUint32	mEndOffset;
-	PRUint32	mRangeType;
-};
-
-typedef struct nsTextRange nsTextRange;
-typedef nsTextRange* nsTextRangeArray;
-
-struct nsTextEventReply {
-	nsPoint		mCursorPosition;
-	PRBool		mCursorIsCollapsed;
-};
-
-typedef struct nsTextEventReply nsTextEventReply;
-
-struct nsTextEvent : public nsInputEvent {
-	PRUnichar*			theText;
-	nsTextEventReply	theReply;
-	PRUint32			rangeCount;
-	nsTextRangeArray	rangeArray;
-  PRBool          isChar;
-};
-
-struct nsCompositionEvent : public nsInputEvent {
-	PRUint32			compositionMessage;
-	nsTextEventReply	theReply;
-};
-
-/**
- * Tooltip event
- */
-struct nsTooltipEvent : public nsGUIEvent {
-                /// Index of tooltip area which generated the event. @see SetTooltips in nsIWidget
-    PRUint32        tipIndex;           
-};
-
-/**
- * MenuItem event
- * 
- * When this event occurs the widget field in nsGUIEvent holds the "target"
- * for the event
- */
-
-struct nsMenuEvent : public nsGUIEvent {
-  nsIMenuItem * mMenuItem;
-  PRUint32      mCommand;           
-};
-
-
-/**
- * Event status for D&D Event
- */
-enum nsDragDropEventStatus {  
-    /// The event is a enter
-  nsDragDropEventStatus_eDragEntered,            
-    /// The event is exit
-  nsDragDropEventStatus_eDragExited, 
-    /// The event is drop
-  nsDragDropEventStatus_eDrop  
-};
-
-/**
- * Event Struct Types
- */
-#define NS_EVENT            1
-#define NS_GUI_EVENT        2
-#define NS_SIZE_EVENT       3
-#define NS_PAINT_EVENT      4
-#define NS_SCROLLBAR_EVENT  5
-#define NS_INPUT_EVENT      6
-#define NS_KEY_EVENT        7
-#define NS_MOUSE_EVENT      8
-
-#define NS_MENU_EVENT       10
-#define NS_DRAGDROP_EVENT   11
-#define NS_TEXT_EVENT		12
-#define NS_COMPOSITION_START	13
-#define NS_COMPOSITION_END		14
- 
- /**
- * GUI MESSAGES
- */
- //@{
-
-#define NS_WINDOW_START                 100
-
-// Widget is being created
-#define NS_CREATE                       (NS_WINDOW_START)
-// Widget is being destroyed
-#define NS_DESTROY                      (NS_WINDOW_START + 1)
-// Widget was resized
-#define NS_SIZE                         (NS_WINDOW_START + 2)
-// Widget gained focus
-#define NS_GOTFOCUS                     (NS_WINDOW_START + 3)
-// Widget lost focus
-#define NS_LOSTFOCUS                    (NS_WINDOW_START + 4)
-// Widget got activated
-#define NS_ACTIVATE                     (NS_WINDOW_START + 5)
-// Widget got deactivated
-#define NS_DEACTIVATE                   (NS_WINDOW_START + 6)
-// Widget needs to be repainted
-#define NS_PAINT                        (NS_WINDOW_START + 30)
-// Key is pressed within a window
-#define NS_KEY_PRESS                    (NS_WINDOW_START + 31)
-// Key is released within a window
-#define NS_KEY_UP                       (NS_WINDOW_START + 32)
-// Key is pressed within a window
-#define NS_KEY_DOWN                     (NS_WINDOW_START + 33)
-// Window has been moved to a new location.
-// The events point contains the x, y location in screen coordinates
-#define NS_MOVE                         (NS_WINDOW_START + 34) 
-
-// Tab control's selected tab has changed
-#define NS_TABCHANGE                    (NS_WINDOW_START + 35)
-
-
-
-// Menu item selected
-#define NS_MENU_SELECTED                (NS_WINDOW_START + 38)
-
-// Form control changed: currently == combo box selection changed
-// but could be expanded to mean textbox, checkbox changed, etc.
-// This is a GUI specific event that does not necessarily correspond
-// directly to a mouse click or a key press.
-#define NS_CONTROL_CHANGE                (NS_WINDOW_START + 39)
-
-// Indicates the display has changed depth
-#define NS_DISPLAYCHANGED                (NS_WINDOW_START + 40)
-
-
-#define NS_MOUSE_MESSAGE_START          300
-#define NS_MOUSE_MOVE                   (NS_MOUSE_MESSAGE_START)
-#define NS_MOUSE_LEFT_BUTTON_UP         (NS_MOUSE_MESSAGE_START + 1)
-#define NS_MOUSE_LEFT_BUTTON_DOWN       (NS_MOUSE_MESSAGE_START + 2)
-#define NS_MOUSE_MIDDLE_BUTTON_UP       (NS_MOUSE_MESSAGE_START + 10)
-#define NS_MOUSE_MIDDLE_BUTTON_DOWN     (NS_MOUSE_MESSAGE_START + 11)
-#define NS_MOUSE_RIGHT_BUTTON_UP        (NS_MOUSE_MESSAGE_START + 20)
-#define NS_MOUSE_RIGHT_BUTTON_DOWN      (NS_MOUSE_MESSAGE_START + 21)
-#define NS_MOUSE_ENTER                  (NS_MOUSE_MESSAGE_START + 22)
-#define NS_MOUSE_EXIT                   (NS_MOUSE_MESSAGE_START + 23)
-#define NS_MOUSE_LEFT_DOUBLECLICK       (NS_MOUSE_MESSAGE_START + 24)
-#define NS_MOUSE_MIDDLE_DOUBLECLICK     (NS_MOUSE_MESSAGE_START + 25)
-#define NS_MOUSE_RIGHT_DOUBLECLICK      (NS_MOUSE_MESSAGE_START + 26)
-#define NS_MOUSE_LEFT_CLICK             (NS_MOUSE_MESSAGE_START + 27)
-#define NS_MOUSE_MIDDLE_CLICK           (NS_MOUSE_MESSAGE_START + 28)
-#define NS_MOUSE_RIGHT_CLICK            (NS_MOUSE_MESSAGE_START + 29)
-#define NS_MOUSE_ACTIVATE               (NS_MOUSE_MESSAGE_START + 30)
-
-#define NS_SCROLLBAR_MESSAGE_START      1000
-#define NS_SCROLLBAR_POS                (NS_SCROLLBAR_MESSAGE_START)
-#define NS_SCROLLBAR_PAGE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 1)
-#define NS_SCROLLBAR_PAGE_PREV          (NS_SCROLLBAR_MESSAGE_START + 2)
-#define NS_SCROLLBAR_LINE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 3)
-#define NS_SCROLLBAR_LINE_PREV          (NS_SCROLLBAR_MESSAGE_START + 4)
-
-#define NS_STREAM_EVENT_START           1100
-#define NS_PAGE_LOAD                    (NS_STREAM_EVENT_START)
-#define NS_PAGE_UNLOAD                  (NS_STREAM_EVENT_START + 1)
-#define NS_IMAGE_LOAD                   (NS_STREAM_EVENT_START + 2)
-#define NS_IMAGE_ABORT                  (NS_STREAM_EVENT_START + 3)
-#define NS_IMAGE_ERROR                  (NS_STREAM_EVENT_START + 4)
-
-#define NS_FORM_EVENT_START             1200
-#define NS_FORM_SUBMIT                  (NS_FORM_EVENT_START)
-#define NS_FORM_RESET                   (NS_FORM_EVENT_START + 1)
-#define NS_FORM_CHANGE                  (NS_FORM_EVENT_START + 2)
-#define NS_FORM_SELECTED                (NS_FORM_EVENT_START + 3)
-#define NS_FORM_INPUT                   (NS_FORM_EVENT_START + 4)
-
-//Need separate focus/blur notifications for non-native widgets
-#define NS_FOCUS_EVENT_START            1300
-#define NS_FOCUS_CONTENT                (NS_FOCUS_EVENT_START)
-#define NS_BLUR_CONTENT                 (NS_FOCUS_EVENT_START + 1)
-
-
-#define NS_DRAGDROP_EVENT_START         1400
-#define NS_DRAGDROP_ENTER               (NS_DRAGDROP_EVENT_START)
-#define NS_DRAGDROP_OVER                (NS_DRAGDROP_EVENT_START + 1)
-#define NS_DRAGDROP_EXIT                (NS_DRAGDROP_EVENT_START + 2)
-#define NS_DRAGDROP_DROP                (NS_DRAGDROP_EVENT_START + 3)
-#define NS_DRAGDROP_GESTURE             (NS_DRAGDROP_EVENT_START + 4)
-
-// Events for popups
-#define NS_MENU_EVENT_START            1500
-#define NS_MENU_CREATE                (NS_MENU_EVENT_START)
-#define NS_MENU_DESTROY               (NS_MENU_EVENT_START+1)
-#define NS_MENU_ACTION                (NS_MENU_EVENT_START+2)
-#define NS_XUL_BROADCAST              (NS_MENU_EVENT_START+3)
-#define NS_XUL_COMMAND_UPDATE         (NS_MENU_EVENT_START+4)
-//@}
-
-
-#define NS_IS_MOUSE_EVENT(evnt) \
-       (((evnt)->message == NS_MOUSE_LEFT_BUTTON_DOWN) || \
-        ((evnt)->message == NS_MOUSE_LEFT_BUTTON_UP) || \
-        ((evnt)->message == NS_MOUSE_LEFT_CLICK) || \
-        ((evnt)->message == NS_MOUSE_LEFT_DOUBLECLICK) || \
-        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_DOWN) || \
-        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_UP) || \
-        ((evnt)->message == NS_MOUSE_MIDDLE_CLICK) || \
-        ((evnt)->message == NS_MOUSE_MIDDLE_DOUBLECLICK) || \
-        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_DOWN) || \
-        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_UP) || \
-        ((evnt)->message == NS_MOUSE_RIGHT_CLICK) || \
-        ((evnt)->message == NS_MOUSE_RIGHT_DOUBLECLICK) || \
-        ((evnt)->message == NS_MOUSE_ENTER) || \
-        ((evnt)->message == NS_MOUSE_EXIT) || \
-        ((evnt)->message == NS_MOUSE_MOVE))
-
-#define NS_IS_KEY_EVENT(evnt) \
-       (((evnt)->message == NS_KEY_DOWN) ||  \
-        ((evnt)->message == NS_KEY_PRESS) || \
-        ((evnt)->message == NS_KEY_UP))
-
-/*
- * Virtual key bindings for keyboard events
- * NOTE: These are repeated in nsIDOMEvent.h and must be kept in sync
- */
-
-#define NS_VK_CANCEL         0x03
-#define NS_VK_BACK           0x08
-#define NS_VK_TAB            0x09
-#define NS_VK_CLEAR          0x0C
-#define NS_VK_RETURN         0x0D
-#define NS_VK_ENTER          0x0E
-#define NS_VK_SHIFT          0x10
-#define NS_VK_CONTROL        0x11
-#define NS_VK_ALT            0x12
-#define NS_VK_PAUSE          0x13
-#define NS_VK_CAPS_LOCK      0x14
-#define NS_VK_ESCAPE         0x1B
-#define NS_VK_SPACE          0x20
-#define NS_VK_PAGE_UP        0x21
-#define NS_VK_PAGE_DOWN      0x22
-#define NS_VK_END            0x23
-#define NS_VK_HOME           0x24
-#define NS_VK_LEFT           0x25
-#define NS_VK_UP             0x26
-#define NS_VK_RIGHT          0x27
-#define NS_VK_DOWN           0x28
-#define NS_VK_PRINTSCREEN    0x2C
-#define NS_VK_INSERT         0x2D
-#define NS_VK_DELETE         0x2E
-
-// NS_VK_0 - NS_VK_9 match their ascii values
-#define NS_VK_0              0x30
-#define NS_VK_1              0x31
-#define NS_VK_2              0x32
-#define NS_VK_3              0x33
-#define NS_VK_4              0x34
-#define NS_VK_5              0x35
-#define NS_VK_6              0x36
-#define NS_VK_7              0x37
-#define NS_VK_8              0x38
-#define NS_VK_9              0x39
-
-#define NS_VK_SEMICOLON      0x3B
-#define NS_VK_EQUALS         0x3D
-
-// NS_VK_A - NS_VK_Z match their ascii values
-#define NS_VK_A              0x41
-#define NS_VK_B              0x42
-#define NS_VK_C              0x43
-#define NS_VK_D              0x44
-#define NS_VK_E              0x45
-#define NS_VK_F              0x46
-#define NS_VK_G              0x47
-#define NS_VK_H              0x48
-#define NS_VK_I              0x49
-#define NS_VK_J              0x4A
-#define NS_VK_K              0x4B
-#define NS_VK_L              0x4C
-#define NS_VK_M              0x4D
-#define NS_VK_N              0x4E
-#define NS_VK_O              0x4F
-#define NS_VK_P              0x50
-#define NS_VK_Q              0x51
-#define NS_VK_R              0x52
-#define NS_VK_S              0x53
-#define NS_VK_T              0x54
-#define NS_VK_U              0x55
-#define NS_VK_V              0x56
-#define NS_VK_W              0x57
-#define NS_VK_X              0x58
-#define NS_VK_Y              0x59
-#define NS_VK_Z              0x5A
-
-#define NS_VK_NUMPAD0        0x60
-#define NS_VK_NUMPAD1        0x61
-#define NS_VK_NUMPAD2        0x62
-#define NS_VK_NUMPAD3        0x63
-#define NS_VK_NUMPAD4        0x64
-#define NS_VK_NUMPAD5        0x65
-#define NS_VK_NUMPAD6        0x66
-#define NS_VK_NUMPAD7        0x67
-#define NS_VK_NUMPAD8        0x68
-#define NS_VK_NUMPAD9        0x69
-#define NS_VK_MULTIPLY       0x6A
-#define NS_VK_ADD            0x6B
-#define NS_VK_SEPARATOR      0x6C
-#define NS_VK_SUBTRACT       0x6D
-#define NS_VK_DECIMAL        0x6E
-#define NS_VK_DIVIDE         0x6F
-#define NS_VK_F1             0x70
-#define NS_VK_F2             0x71
-#define NS_VK_F3             0x72
-#define NS_VK_F4             0x73
-#define NS_VK_F5             0x74
-#define NS_VK_F6             0x75
-#define NS_VK_F7             0x76
-#define NS_VK_F8             0x77
-#define NS_VK_F9             0x78
-#define NS_VK_F10            0x79
-#define NS_VK_F11            0x7A
-#define NS_VK_F12            0x7B
-#define NS_VK_F13            0x7C
-#define NS_VK_F14            0x7D
-#define NS_VK_F15            0x7E
-#define NS_VK_F16            0x7F
-#define NS_VK_F17            0x80
-#define NS_VK_F18            0x81
-#define NS_VK_F19            0x82
-#define NS_VK_F20            0x83
-#define NS_VK_F21            0x84
-#define NS_VK_F22            0x85
-#define NS_VK_F23            0x86
-#define NS_VK_F24            0x87
-
-#define NS_VK_NUM_LOCK       0x90
-#define NS_VK_SCROLL_LOCK    0x91
-
-#define NS_VK_COMMA          0xBC
-#define NS_VK_PERIOD         0xBE
-#define NS_VK_SLASH          0xBF
-#define NS_VK_BACK_QUOTE     0xC0
-#define NS_VK_OPEN_BRACKET   0xDB
-#define NS_VK_BACK_SLASH     0xDC
-#define NS_VK_CLOSE_BRACKET  0xDD
-#define NS_VK_QUOTE          0xDE
-
-#define NS_EVENT_FLAG_NONE          0x0000
-#define NS_EVENT_FLAG_INIT          0x0001
-#define NS_EVENT_FLAG_BUBBLE        0x0002
-#define NS_EVENT_FLAG_CAPTURE       0x0004
-#define NS_EVENT_FLAG_STOP_DISPATCH 0x0008
-#define NS_EVENT_FLAG_NO_DEFAULT    0x0010
-
-// IME Constants  -- keep in synch with nsIDOMTextRange.h
-#define NS_TEXTRANGE_CARETPOSITION				0x01
-#define NS_TEXTRANGE_RAWINPUT					0X02
-#define NS_TEXTRANGE_SELECTEDRAWTEXT			0x03
-#define NS_TEXTRANGE_CONVERTEDTEXT				0x04
-#define NS_TEXTRANGE_SELECTEDCONVERTEDTEXT		0x05
-
-#endif // nsGUIEvent_h__
-

mozilla/widget/public/nsIAppShell.idl

@@ -1,122 +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 "nsISupports.idl"
-
-native int(int);
-[ptr] native nsDispatchListener(nsDispatchListener);
-[ptr] native nsIEventQueue(nsIEventQueue);
-[ptr] native UndefinednsIWidget(nsIWidget);
-[ref] native PRBoolRef(PRBool);
-[ref] native voidStarRef(void *);
-
-%{ C++
-#include "nsIEventQueue.h"
-
-/**
- * Flags for the getNativeData function.
- * See GetNativeData()
- */
-#define NS_NATIVE_SHELL   0
-
-/**
- * During the nsIAppShell Run method notify this listener 
- * after each message dispatch.
- * @see SetDispatchListener member function of nsIAppShell 
- */
-class nsDispatchListener {
-public:
-  virtual void AfterDispatch() = 0;
-};
-
-class nsIWidget;
-%}
-
-
-[uuid(a0757c31-eeac-11d1-9ec1-00aa002fb821)]
-interface nsIAppShell : nsISupports
-{
- /**
-  * Creates an application shell
-  */ 
-
-  void Create(inout int argc, inout string argv);
-
- /**
-  * Enter an event loop.
-  * Don't leave until application exits.
-  */
-  
-  void Run();
-
- /**
-  * Prepare to process events. 
-  */
-  
-  void Spinup();
-
- /**
-  * Prepare to stop processing events.  
-  */
-  
-  void Spindown();
-
- /**
-  * An event queue has been created or destroyed. Hook or unhook it from
-  * your system, as necessary.
-  * @param aQueue the queue in question
-  * @param aListen PR_TRUE for a new queue wanting hooking up. PR_FALSE
-  *                for a queue wanting to be unhooked.
-  */
-  void ListenToEventQueue(in nsIEventQueue aQueue, in PRBool aListen);
-
- /**
-  * After event dispatch execute app specific code
-  */
-  
-  void GetNativeEvent(in PRBoolRef aRealEvent, in voidStarRef aEvent);
-
- /**
-  * After event dispatch execute app specific code
-  */
-  
-  void DispatchNativeEvent(in PRBool aRealEvent, in voidStar aEvent);
-
- /**
-  * After event dispatch execute app specific code
-  */
-  
-  void SetDispatchListener(in nsDispatchListener aDispatchListener);
-
-  /**
-   * Exit the handle event loop
-   */
-
-  void Exit();
-
-};
-
-#endif // nsIAppShell_h__
-
-

mozilla/widget/public/nsIButton.h

@@ -1,63 +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 nsIButton_h__
-#define nsIButton_h__
-
-#include "nsIWidget.h"
-#include "nsString.h"
-
-// {18032AD0-B265-11d1-AA2A-000000000000}
-#define NS_IBUTTON_IID      \
-{ 0x18032ad0, 0xb265, 0x11d1, \
-    { 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-
-/**
- * Push button widget.
- * Automatically shows itself as depressed when clicked on.
- */
-class nsIButton : public nsISupports {
-
-public:
-   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUTTON_IID) 
- 
-   /**
-    * Set the label
-    *
-    * @param  Set the label to aText
-    * @result NS_Ok if no errors
-    */
-  
-    NS_IMETHOD SetLabel(const nsString &aText) = 0;
-    
-   /**
-    * Get the button label
-    *
-    * @param aBuffer contains label upon return
-    * @result NS_Ok if no errors
-    */
- 
-    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
-
-};
-
-#endif

mozilla/widget/public/nsICheckButton.h

@@ -1,81 +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 nsICheckButton_h__
-#define nsICheckButton_h__
-
-// {961085F5-BD28-11d1-97EF-00609703C14E}
-#define NS_ICHECKBUTTON_IID \
-{ 0x961085f5, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-#include "nsISupports.h"
-#include "nsIWidget.h"
-
-
-/**
- * Checkbox widget. 
- * Can show itself in a checked or unchecked state. 
- * The checkbox widget does not automatically show itself checked or unchecked when clicked on.
- */
-class nsICheckButton : public nsISupports {
-
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHECKBUTTON_IID)
-    
-   /**
-    * Set the button label
-    *
-    * @param aText  button label
-    * @result set to NS_OK if method successful
-    */
-  
-    NS_IMETHOD SetLabel(const nsString &aText) = 0;
-    
-   /**
-    * Get the button label
-    *
-    * @param aBuffer contains label upon return
-    * @result set to NS_OK if method successful
-    */
- 
-    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
-
-    /**
-     * Set the check state.
-     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
-     * @result set to NS_OK if method successful
-     */
-
-    NS_IMETHOD SetState(const PRBool aState) = 0;
-    
-    /**
-     * Get the check state.
-     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
-     * @result set to NS_OK if method successful
-     */
-
-    NS_IMETHOD GetState(PRBool& aState) = 0;
-
-};
-
-#endif  // nsICheckButton_h__
-

mozilla/widget/public/nsIClipboard.idl

@@ -1,88 +0,0 @@
-/* -*- Mode: IDL; 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 Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
- * Communications Corp.  All Rights Reserved.
- * 
- * Contributor(s): 
- *   Mike Pinkerton
- */
-
-
-#include "nsISupports.idl"
-#include "nsISupportsArray.idl"
-#include "nsITransferable.idl"
-#include "nsIClipboardOwner.idl"
-
-
-[scriptable, uuid(8B5314BA-DB01-11d2-96CE-0060B0FB9956)]
-interface nsIClipboard : nsISupports
-{
-   /**
-    * Given a transferable, set the data on the native clipboard
-    *
-    * @param  aTransferable The transferable
-    * @param  anOwner The owner of the transferable
-    * @result NS_Ok if no errors
-    */
-  
-    void setData ( in nsITransferable aTransferable, in nsIClipboardOwner anOwner) ;
-
-   /**
-    * Given a transferable, get the clipboard data.
-    *
-    * @param  aTransferable The transferable
-    * @result NS_Ok if no errors
-    */
-  
-    void getData ( in nsITransferable aTransferable ) ;
-
-   /**
-    * This empties the clipboard and notifies the clipboard owner.
-    * This empties the "logical" clipboard. It does not clear the native clipboard.
-    *
-    * @result NS_OK if successful.
-    */
-  
-    void emptyClipboard ( ) ;
-
-   /**
-    * 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.
-    */
-  
-    void forceDataToClipboard ( ) ;
-
-   /**
-    * This provides a way to give correct UI feedback about, for instance, a paste 
-    * should be allowed. It does _NOT_ actually retreive the data and should be a very
-    * inexpensive call. All it does is check if there is data on the clipboard matching
-    * any of the flavors in the given list.
-    *
-    * @aFlavorList - nsISupportsString's in a nsISupportsArray (for JavaScript).
-    * @outResult - if data is present matching one of 
-    * @result NS_OK if successful.
-    */
-    boolean hasDataMatchingFlavors ( in nsISupportsArray aFlavorList )  ;
-  
-};
-
-
-%{ C++
-
-%}

mozilla/widget/public/nsIClipboardOwner.idl

@@ -1,45 +0,0 @@
-/* -*- Mode: IDL; 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 Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
- * Communications Corp.  All Rights Reserved.
- * 
- * Contributor(s): 
- *   Mike Pinkerton
- */
-
-
-#include "nsISupports.idl"
-#include "nsITransferable.idl"
-
-
-[scriptable, uuid(5A31C7A1-E122-11d2-9A57-000064657374)]
-interface nsIClipboardOwner : nsISupports
-{
-   /**
-    * Notifies the owner of the clipboard transferable that the
-    * transferable is being removed from the clipboard
-    *
-    * @param  aTransferable The transferable
-    * @result NS_Ok if no errors
-    */
-  
-    void LosingOwnership ( in nsITransferable aTransferable ) ;
-};
-
-
-%{ C++
-
-%}

mozilla/widget/public/nsIComboBox.h

@@ -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): 
- */
-
-#ifndef nsIComboBox_h__
-#define nsIComboBox_h__
-
-#include "nsIListWidget.h"
-#include "nsString.h"
-
-// {961085F6-BD28-11d1-97EF-00609703C14E}
-#define NS_ICOMBOBOX_IID \
-{ 0x961085f6, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-
-/**
- * Initialize combobox data
- */
-
-struct nsComboBoxInitData : public nsWidgetInitData {
-  nsComboBoxInitData()
-    : mDropDownHeight(0)
-  {
-  }
-
-  PRUint32 mDropDownHeight; // in pixels
-};
-
-/**
- * Single selection drop down list. See nsIListWidget for capabilities 
- */
-
-class nsIComboBox : public nsISupports {
-public:
-     NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMBOBOX_IID);
-
-    /**
-     * Set an item at the specific position
-     *
-     * @param   aItem     the item name. The item has to be null terminated
-     * @param   aPosition the position the item should be inserted at
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     */
-    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Finds the first occurrence of the specified item
-     *
-     * @param   aItem     the string to be filled
-     * @param   aStartPos the starting position (index)
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
-
-    /**
-     * Returns the number of items in the list
-     *
-     * @return  the number of items
-     *
-     */
-    virtual PRInt32  GetItemCount() = 0;
-
-    /**
-     * Remove the first occurrence of the specified item
-     *
-     * @param   aPosition the item position
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     *
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
-
-    /**
-     * Gets an item at a specific location
-     *
-     * @param   anItem    on return contains the string of the item at that position
-     * @param   aPosition the Position of the item
-     *
-     */
-     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Gets the selected item for a single selection list
-     *
-     * @param   aItem  on return contains the string of the selected item
-     *
-     */
-     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
-
-    /**
-     * Returns with the index of the selected item
-     *
-     * @return  PRInt32, index of selected item
-     *
-     */
-    virtual PRInt32 GetSelectedIndex()  = 0;
-
-    /**
-     * Select the item at the specified position
-     *
-     * @param   PRInt32, the item position
-     *                   0 is at the top of the list
-     *                   -1 is at the end of the list
-     *
-     */
-    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
-
-    /**
-     * Deselects all the items in the list
-     *
-     */
-    NS_IMETHOD Deselect()  = 0;
-};
-
-
-#endif // nsIComboBox_h__
-
-
-

mozilla/widget/public/nsIContextMenu.h

@@ -1,148 +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 nsIContextMenu_h__
-#define nsIContextMenu_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMElement.h"
-#include "nsIWebShell.h"
-
-class nsIMenuBar;
-class nsIMenu;
-class nsIMenuItem;
-class nsIMenuListener;
-
-//Generate this!
-// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
-#define NS_ICONTEXTMENU_IID      \
-{ 0x35a3dec1, 0x4992, 0x11d2, \
-  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * Menu widget
- */
-class nsIContextMenu : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTEXTMENU_IID)
-
-  /**
-    * Creates the context menu
-    *
-    */
-    NS_IMETHOD Create(nsISupports * aParent, const nsString& anAlignment, const nsString& anAnchorAlignment) = 0;
-
-   /**
-    * Get the context menu's Parent
-    *
-    */
-    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
-
-   /**
-    * Adds a context menu Item
-    *
-    */
-    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
-
-   /**
-    * Adds a separator
-    *
-    */
-    NS_IMETHOD AddSeparator() = 0;
-
-   /**
-    * Returns the number of context menu items
-    * This does count separators as items
-    */
-    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
-
-   /**
-    * Returns a Menu or Menu Item at a specified Index
-    *
-    */
-    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
-
-   /**
-    * Inserts a Menu Item at a specified Index
-    *
-    */
-    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
-
-   /**
-    * Removes an Menu Item from a specified Index
-    *
-    */
-    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
-
-   /**
-    * Removes all the Menu Items
-    *
-    */
-    NS_IMETHOD RemoveAll() = 0;
-
-   /**
-    * Gets Native MenuHandle
-    *
-    */
-    NS_IMETHOD  GetNativeData(void** aData) = 0;
-
-   /**
-    * Adds menu listener for dynamic construction
-    *
-    */
-    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Removes menu listener for dynamic construction
-    *
-    */
-    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Set location
-    *
-    */
-    NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY) = 0;
-
-   /**
-    * Set DOMNode
-    *
-    */
-    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
-
-	/**
-    * Set DOMElement
-    *
-    */
-    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
-
-	/**
-    * Set WebShell
-    *
-    */
-    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
-};
-
-#endif

mozilla/widget/public/nsIDragService.idl

@@ -1,70 +0,0 @@
-/* -*- Mode: IDL; 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 Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
- * Communications Corp.  All Rights Reserved.
- * 
- * Contributor(s): 
- *   Mike Pinkerton
- */
-
-#include "nsISupports.idl"
-#include "nsISupportsArray.idl"
-#include "nsIDragSession.idl"
-#include "nsIScriptableRegion.idl"
-
-
-[scriptable, uuid(8B5314BB-DB01-11d2-96CE-0060B0FB9956)]
-interface nsIDragService : nsISupports
-{
-  const long DRAGDROP_ACTION_NONE = 0;
-  const long DRAGDROP_ACTION_COPY = 1;
-  const long DRAGDROP_ACTION_MOVE = 2;
-  const long DRAGDROP_ACTION_LINK = 4;
-  
-  /**
-    * Starts a modal drag session with an array of transaferables 
-    *
-    * @param  aTransferables - an array of transferables to be dragged
-    * @param  aRegion - a region containing rectangles for cursor feedback, 
-    *            in window coordinates.
-    * @param  aActionType - specified which of copy/move/link are allowed
-    */
-  void invokeDragSession ( in nsISupportsArray aTransferables, 
-                             in nsIScriptableRegion aRegion, in unsigned long aActionType );
-
-  /**
-    * Returns the current Drag Session  
-    */
-  nsIDragSession getCurrentSession ( ) ;
-
-  /**
-    * Tells the Drag Service to start a drag session. This is called when
-    * an external drag occurs
-    */
-  void startDragSession ( ) ;
-
-  /**
-    * Tells the Drag Service to end a drag session. This is called when
-    * an external drag occurs
-    */
-  void endDragSession ( ) ;
-  
-};
-
-
-%{ C++
-
-%}

mozilla/widget/public/nsIDragSession.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: IDL; 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 Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
- * Communications Corp.  All Rights Reserved.
- * 
- * Contributor(s): 
- *   Mike Pinkerton
- */
-
-#include "nsISupports.idl"
-#include "nsISupportsArray.idl"
-#include "nsITransferable.idl"
-
-%{ C++
-#include "nsSize.h"
-%}
-
-native nsSize (nsSize);
-
-
-[scriptable, uuid(CBA22C53-FCCE-11d2-96D4-0060B0FB9956)]
-interface nsIDragSession : nsISupports
-{
-  /**
-    * Set the current state of the drag whether it can be dropped or not.
-    * usually the target "frame" sets this so the native system can render the correct feedback
-    */
-  attribute boolean canDrop;
-  
-  /**
-    * Sets the action (copy, move, link, et.c) for the current drag 
-    */ 
-  attribute unsigned long dragAction;
-  
-  /**
-    * Sets the current width and height if the drag target area. 
-    * It will contain the current size of the Frame that the drag is currently in
-    */  
-  attribute nsSize targetSize;
- 
-  /**
-    * Get the number items that were dropped
-    */
-  readonly attribute unsigned long numDropItems;
-
-  /**
-    * Get data from a Drag&Drop. Can be called while the drag is in process
-    * or after the drop has completed.  
-    *
-    * @param  aTransferable the transferable for the data to be put into
-    * @param  aItemIndex which of multiple drag items, zero-based
-    */
-  void getData ( in nsITransferable aTransferable, in unsigned long aItemIndex ) ;
-
-   /**
-    * Check to set if ant of the native data on the clipboard matches this data flavor
-    *
-    * @result NS_OK if if the data flavor is supported and, NS_ERROR_FAILURE is it is not
-    */
-  boolean isDataFlavorSupported ( in string aDataFlavor ) ;
-  
-};
-
-
-%{ C++
-
-%}

mozilla/widget/public/nsIDragSessionMac.h

@@ -1,51 +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 nsIDragSessionMac_h__
-#define nsIDragSessionMac_h__
-
-#include "nsISupports.h"
-#include <Drag.h>
-
-
-#define NS_IDRAGSESSIONMAC_IID      \
-{ 0x36c4c380, 0x09e2, 0x11d3, { 0xb0, 0x33, 0xa4, 0x20, 0xf4, 0x2c, 0xfd, 0x7c } };
-
-
-class nsIDragSessionMac : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSIONMAC_IID)
-
-  /**
-    * Since the drag may originate in an external application, we need some way of
-    * communicating the DragManager's DragRef to the session so it can use it
-    * when filling in data requests.
-    *
-    * @param  aDragRef the MacOS DragManager's ref number for the current drag
-    */
-
-   NS_IMETHOD SetDragReference ( DragReference aDragRef ) = 0; 
-
-};
-
-#endif

mozilla/widget/public/nsIEventListener.h

@@ -1,52 +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 nsIEventListener_h__
-#define nsIEventListener_h__
-
-#include "nsISupports.h"
-#include "nsGUIEvent.h"
-
-/**
- * Event listener interface.
- * Alternative to a callback for recieving events.
- */
-
-// {c83f6b80-d7ce-11d2-8360-c4c894c4917c}
-#define NS_IEVENTLISTENER_IID \
-{ 0xc83f6b80, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
-
-class nsIEventListener : public nsISupports {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEVENTLISTENER_IID)
-  
- /**
-  * Processes all events. 
-  * If a mouse listener is registered this method will not process mouse events. 
-  * @param anEvent the event to process. See nsGUIEvent.h for event types.
-  */
-
-  virtual nsEventStatus ProcessEvent(const nsGUIEvent & anEvent) = 0;
-
-};
-
-#endif // nsIEventListener_h__

mozilla/widget/public/nsIFileDialogsMgr.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) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsIFileDialogsMgr_h__
-#define nsIFileDialogsMgr_h__
-
-#include "nsISupports.h"
-#include "nsFileSpec.h"
-
-// {0ef98781-e34b-11d2-b345-00a0cc3c1cde}
-#define NS_IFILEDIALOGSMGR_IID \
-{ 0xef98781, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
-
-#define NS_FILEDIALOGSMGR_CID      \
-{ 0xef98784, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
-
-enum nsFileDlgResults {
-  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
-  nsFileDlgResults_OK,        // User hit Ok, process selection 
-  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
-};
-
-/**
- * (native) File Dialogs utility.
- * Provides an XP wrapper to platform native file dialogs:
- *  GetFile   - Presents a file browser and returns an nsFileSpec for the selected file
- *  GetFolder - Presents a folder/path selection dialog and returns an nsFileSpec
- *  PutFile   - Presents a file save dialog to the user and returns an nsFileSpec with
- *              the name and path to save the file
- * 
- */
-
-class nsIFileDialogsMgr : public nsISupports
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEDIALOGSMGR_IID)
-    
-  NS_IMETHOD GetFile(
-    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog
-    nsFileDlgResults & theResult,       // Result from the file selection dialog prompt
-    const nsString   * promptString,    // Window title for file selection dialog
-    void             * filterList) = 0;
-    
-  NS_IMETHOD GetFolder(
-    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
-    nsFileDlgResults & theResult,       // Result from the folder selection dialog prompt
-    const nsString   * promptString) = 0;  // Window title for folder selection dialog
-    
-  NS_IMETHOD PutFile(
-    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
-    nsFileDlgResults & theResult,       // Result from the file save dialog prompt
-    const nsString   * promptString) = 0;  // Window title for file save dialog
-
-};
-
-#endif // nsIFileDialogsMgr_h__

mozilla/widget/public/nsIFilePicker.idl

@@ -1,96 +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 "nsISupports.idl"
-#include "nsIFileSpec.idl"
-
-interface nsIDOMWindow;
-
-[scriptable, uuid(c47de916-1dd1-11b2-8141-82507fa02b21)]
-interface nsIFilePicker : nsISupports
-{
-  const short modeLoad        = 0;              // Load a file or directory
-  const short modeSave        = 1;              // Save a file or directory
-  const short modeGetFolder   = 2;              // Select a fodler/directory
-
-  const short returnOK        = 0;              // User hit cancel, ignore selection
-  const short returnCancel    = 1;              // User hit Ok, process selection
-  const short returnReplace   = 2;              // User acknowledged file already exists so ok to replace, process selection
-
- /**
-  * Create the file widget.
-  *
-  * @param      parent   nsIDOMWindow parent.  This dialog should be dependant on this parent.
-  * @param      title    The title for the file widget
-  * @param      mode     load, save, or get folder
-  *
-  */
-  void create(in nsIDOMWindow parent, in wstring title, in short mode);
-
- /**
-  * Set the list of file filters 
-  *
-  * @param      titles           array of filter titles
-  * @param      filters          array of filters to associate with titles 
-  * @param      numberOfFilters  number of filters.  
-  *
-  */
-  void setFilterList(in long numberOfFilters,
-                     [array, size_is(numberOfFilters)] in wstring titles,
-                     [array, size_is(numberOfFilters)] in wstring filters);
-
- /**
-  * Get the index into the filter list for the type of file the user wants to save
-  *
-  * @param      selectedFilter    the index of the selected item in the filter list
-  *
-  */
-  readonly attribute long selectedFilter;
-
-  /* what is this? */
-  attribute wstring defaultString;
-
- /**
-  * Set the directory that the file open/save dialog initially displays
-  *
-  * @param      displayDirectory  the name of the directory
-  *
-  */
-  attribute nsIFileSpec displayDirectory;
-
-
- /**
-  * Get the nsFileSpec for the file or directory.
-  *
-  * @return Returns the file currently selected
-  */
-  readonly attribute nsIFileSpec file;
-
- /**
-  * Show File Dialog. The dialog is displayed modally.
-  *
-  * @return returnOK if the user selects OK, returnCancel if the user selects cancel
-  *
-  */
-  short show();
-};

mozilla/widget/public/nsIFileSpecWithUI.idl

@@ -1,112 +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): 
- */
-
-// This is the only correct cross-platform way to specify a file.
-// Strings are not such a way. If you grew up on windows or unix, you
-// may think they are. Welcome to reality.
-
-#include "nsIFileSpec.idl"
-
-%{C++
-#include "nscore.h" // for NS_WIDGET
-#include "nsIComponentManager.h"
-%}
-native StandardFilterMask(nsIFileSpecWithUI::StandardFilterMask);
-
-[scriptable, uuid(8ddf7681-139a-11d3-915f-dc1f8c138b7c)]
-interface nsIFileSpecWithUI : nsIFileSpec
-{
-%{C++
-	//
-	// The "choose" functions present the file picker UI in order to set the
-	// value of the file spec.
-%}
-
-%{C++
-	// The mask for standard filters is given as follows:
-	enum StandardFilterMask
-	{
-		eAllReadable		= (1<<0)
-	,	eHTMLFiles			= (1<<1)
-	,	eXMLFiles			= (1<<2)
-	,	eImageFiles			= (1<<3)
-    ,   eMailFiles          = (1<<4)
-    ,   eTextFiles          = (1<<5)
-	,	eAllFiles			= (1<<6)
-	
-	// Mask containing all the above default filters
-	,	eAllStandardFilters = (
-							  eAllReadable
-							| eHTMLFiles
-							| eXMLFiles
-							| eImageFiles
-                            | eMailFiles
-                            | eTextFiles
-							| eAllFiles)
-    ,   eAllMailOutputFilters = (
-                                 eHTMLFiles
-                               | eMailFiles
-                               | eTextFiles)
-	
-	// The "extra filter" bit should be set if the "extra filter"
-	// is passed in to chooseInputFile.
-	,   eExtraFilter        = (1<<31)
-	};
-	enum { kNumStandardFilters = 7, kNumMailFilters = 3 };
-%}
-	[noscript] void chooseInputFile(
-		in string title
-	,	in StandardFilterMask standardFilterMask
-	,	in string extraFilterTitle
-	,	in string extraFilter
-		);
-
-	[noscript] void chooseOutputFile(in string windowTitle, 
-                                     in string suggestedLeafName,
-                                     in StandardFilterMask standardFilterMask);
-
-  string chooseFile(in string title);
-	string chooseDirectory(in string title);
-};
-	
-%{C++
-// Define Progid and CID
-// {e3326a80-2816-11d3-a7e5-98cb48c74f3c}
-#define NS_FILESPECWITHUI_CID \
-{ 0xe3326a80, 0x2816, 0x11d3, { 0xa7, 0xe5, 0x98, 0xcb, 0x48, 0xc7, 0x4f, 0x3c } }
-
-#define NS_FILESPECWITHUI_PROGID "component://netscape/filespecwithui"
-#define NS_FILESPECWITHUI_CLASSNAME "nsIFileSpecWithUI"
-
-// Factory methods
-inline nsIFileSpecWithUI* NS_CreateFileSpecWithUI()
-{
-     nsIFileSpecWithUI* spec = nsnull;
-     nsresult rv = nsComponentManager::CreateInstance(
-     	(const char*)NS_FILESPECWITHUI_PROGID,
-     	(nsISupports*)nsnull,
-     	(const nsID&)nsIFileSpecWithUI::GetIID(),
-     	(void**)&spec);
-     NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a file spec.");
-     return spec;
-}
-%}

mozilla/widget/public/nsIFileWidget.h

@@ -1,178 +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 nsIFileWidget_h__
-#define nsIFileWidget_h__
-
-#include "nsString.h"
-#include "nsFileSpec.h"
-
-class nsIWidget;
-class nsIDeviceContext;
-class nsIAppShell;
-class nsIToolkit;
-
-// {F8030015-C342-11d1-97F0-00609703C14E}
-#define NS_IFILEWIDGET_IID \
-{ 0xf8030015, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-
-/**
- * File selector mode 
- */
-
-enum nsFileDlgMode {
-        /// Load a file or directory
-      eMode_load,
-        /// Save a file or directory
-      eMode_save,
-        /// Select a fodler/directory
-      eMode_getfolder
-      };
-
-
-enum nsFileDlgResults {
-  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
-  nsFileDlgResults_OK,        // User hit Ok, process selection 
-  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
-};
-
-/**
- * File selector widget.
- * Modally selects files for loading or saving from a list.
- */
-
-class nsIFileWidget : public nsISupports 
-{
-
-public:
-
-  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEWIDGET_IID)
-
- /**
-  * Create the file filter. This differs from the standard
-  * widget Create method because it passes in the mode
-  *
-  * @param      aParent  the parent to place this widget into
-  * @param      aTitle   The title for the file widget
-  * @param      aMode    load or save              
-  * @return     void
-  *
-  */
-  NS_IMETHOD Create(nsIWidget *aParent,
-                      const nsString& aTitle,
-                      nsFileDlgMode aMode,
-                      nsIDeviceContext *aContext = nsnull,
-                      nsIAppShell *aAppShell = nsnull,
-                      nsIToolkit *aToolkit = nsnull,
-                      void *aInitData = nsnull) = 0;
-
-
- /**
-  * Set the list of file filters 
-  *
-  * @param      aNumberOfFilter  number of filters.
-  * @param      aTitle           array of filter titles
-  * @param      aFilter          array of filters to associate with titles            
-  * @return     void
-  *
-  */
-
-  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,const nsString aTitles[],const nsString aFilters[]) = 0;
-
-  
- /**
-  * Get the index into the filter list for the type of file the user wants to save
-  *
-  * @param      theType          the index into the filter list
-  * @return     void
-  *
-  */
-
-  NS_IMETHOD GetSelectedType(PRInt16& theType) = 0;
-
- /**
-  * Show File Dialog. The dialog is displayed modally.
-  *
-  * @return PR_TRUE if user selects OK, PR_FALSE if user selects CANCEL
-  *
-  */
-
-  virtual PRBool Show() = 0;
-
- /**
-  * Get the nsFileSpec for the file or directory.
-  *
-  * @param aFile on exit it contains the file or directory selected
-  */
-  
-  NS_IMETHOD GetFile(nsFileSpec& aFile) = 0;
-
-
- /**
-  * Set the default string that appears in file open/save dialog 
-  *
-  * @param      aString          the name of the file
-  * @return     void
-  *
-  */
-  NS_IMETHOD SetDefaultString(const nsString& aString) = 0;
-
- /**
-  * Set the directory that the file open/save dialog initially displays
-  *
-  * @param      aDirectory          the name of the directory
-  * @return     void
-  *
-  */
-  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory) = 0;
-
- /**
-  * Get the directory that the file open/save dialog was last displaying
-  *
-  * @param      aDirectory          the name of the directory
-  * @return     void
-  *
-  */
-  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory) = 0;
-
-
-  virtual nsFileDlgResults GetFile(
-    nsIWidget        * aParent,
-    const nsString   & promptString,    // Window title for the dialog
-    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog
-    
-  virtual nsFileDlgResults GetFolder(
-    nsIWidget        * aParent,
-    const nsString   & promptString,    // Window title for the dialog
-    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
-    
-  virtual nsFileDlgResults PutFile(
-    nsIWidget        * aParent,
-    const nsString   & promptString,    // Window title for the dialog
-    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
-
-};
-
-#endif // nsIFileWidget_h__
-

mozilla/widget/public/nsIFontNameIterator.h

@@ -1,51 +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 nsIFontNameIterator_h__
-#define nsIFontNameIterator_h__
-
-#include "nsISupports.h"
-class nsString;
-
-// {CEEB39D1-0949-11d3-9A87-0050046CDA96}
-#define NS_IFONTNAMEITERATOR_IID \
-{ 0xceeb39d1, 0x949, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
-
-class nsIFontNameIterator : public nsISupports
-		// Fonts are identified by strings, |Get| and |Advance| are distinct to facility wrapping
-		//	with C++ objects as standard iterators.
-	{
-		public:
-      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTNAMEITERATOR_IID)
-
-			NS_IMETHOD Reset() = 0;
-				// does not need to be called initially, returns iterator to initial state
-
-		  NS_IMETHOD Get( nsString* aFontName ) = 0;
-				// returns an error when no more names are available
-
-			NS_IMETHOD Advance() = 0;
-				// returns an error when no more names are available
-	};
-
-
-#endif

mozilla/widget/public/nsIFontRetrieverService.h

@@ -1,50 +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 nsIFontRetrieverService_h__
-#define nsIFontRetrieverService_h__
-
-#include "nsISupports.h"
-
-class nsIFontNameIterator;
-class nsIFontSizeIterator;
-class nsString;
-
-// {285EF9B2-094A-11d3-9A87-0050046CDA96}
-#define NS_IFONTRETRIEVERSERVICE_IID \
-{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
-
-class nsIFontRetrieverService : public nsISupports
-		// This (singleton) service exists soley as a factory to manufacture iterators
-{
-		public:
-      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTRETRIEVERSERVICE_IID)
-
-			NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator ) = 0;
-
-			NS_IMETHOD CreateFontSizeIterator( const nsString &aFontName, nsIFontSizeIterator** aIterator ) = 0;
-
-			NS_IMETHOD IsFontScalable( const nsString &aFontName, PRBool* aResult ) = 0;	
-};
-
-
-#endif

mozilla/widget/public/nsIFontSizeIterator.h

@@ -1,51 +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 nsIFontSizeIterator_h__
-#define nsIFontSizeIterator_h__
-
-#include "nsISupports.h"
-class nsString;
-
-// {285EF9B1-094A-11d3-9A87-0050046CDA96}
-#define NS_IFONTSIZEITERATOR_IID \
-{ 0x285ef9b1, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
-
-class nsIFontSizeIterator : public nsISupports
-		// Font sizes are identified with doubles (e.g., for the possibility of fractional sizes from MM, etc.).
-		//	|Get| and |Advance| are distinct to facility wrapping with C++ objects as standard iterators.
-	{
-		public:
-      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTSIZEITERATOR_IID)
-
-			NS_IMETHOD Reset() = 0;
-				// does not need to be called initially, returns iterator to initial state
-
-			NS_IMETHOD Get( double* aFontSize ) = 0;
-				// returns an error when no more sizes are available
-
-			NS_IMETHOD Advance() = 0;
-				// returns an error when no more sizes are available
-	};
-
-
-#endif

mozilla/widget/public/nsIFormatConverter.idl

@@ -1,69 +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 "nsISupports.idl"
-#include "nsISupportsArray.idl"
-
-
-[scriptable, uuid(948A0023-E3A7-11d2-96CF-0060B0FB9956)]
-interface nsIFormatConverter : nsISupports
-{  
-  /**
-    * Get the list of the "input" data flavors (mime types as nsISupportsString),
-    * in otherwords, the flavors that this converter can convert "from" (the 
-    * incoming data to the converter).
-    */
-  nsISupportsArray getInputDataFlavors ( ) ;
-
-  /**
-    * Get the list of the "output" data flavors (mime types as nsISupportsString),
-    * in otherwords, the flavors that this converter can convert "to" (the 
-    * outgoing data to the converter).
-    *
-    * @param  aDataFlavorList fills list with supported flavors
-    */
-  nsISupportsArray getOutputDataFlavors ( ) ;
-
-  /**
-    * Determines whether a converion from one flavor to another is supported
-    *
-    * @param  aFromFormatConverter flavor to convert from
-    * @param  aFromFormatConverter flavor to convert to
-    */
-  boolean canConvert ( in string aFromDataFlavor, in string aToDataFlavor ) ;
-
-  /**
-    * Converts from one flavor to another.
-    *
-    * @param  aFromFormatConverter flavor to convert from
-    * @param  aFromFormatConverter flavor to convert to (destination own the memory)
-    * @returns returns NS_OK if it was converted
-    */
-  void convert ( in string aFromDataFlavor, in nsISupports aFromData, in unsigned long aDataLen,
-                   in string aToDataFlavor, out nsISupports aToData, out unsigned long aDataToLen ) ; 
-
-};
-
-
-%{ C++
-
-%}

mozilla/widget/public/nsIKeyBindMgr.h

@@ -1,60 +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) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsIKeyBindMgr_h__
-#define nsIKeyBindMgr_h__
-
-#include "nsISupports.h"
-#include "nsIDOMNode.h"
-#include "nsGUIEvent.h"
-#include "nsIWebShell.h"
-#include "nsIContent.h"
-
-// {a91c0821-de58-11d2-b345-00a0cc3c1cde}
-#define NS_IKEYBINDMGR_IID \
-{ 0xa91c0821, 0xde58, 0x11d2, \
-{ 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
-
-// {8B5314BD-DB01-11d2-96CE-0060B0FB9977}
-#define NS_KEYBINDMGR_CID      \
-{ 0x8b5314bd, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x77 } }
-
-/**
- * Keyboard Binding utility.
- * Given a key event and a DOM node to search executes any 'key' command
- * that matches the event
- */
-
-class nsIKeyBindMgr : public nsISupports
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IKEYBINDMGR_IID)
-    
-  NS_IMETHOD ProcessKeyEvent(
-    nsIDOMDocument   * domDoc, 
-    const nsKeyEvent & theEvent, 
-    nsIWebShell      * webShell,  
-    nsEventStatus    & theStatus) = 0;
-
-};
-
-#endif // nsIKeyBindMgr_h__

mozilla/widget/public/nsILabel.h

@@ -1,91 +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 nsILabel_h__
-#define nsILabel_h__
-
-#include "nsIWidget.h"
-#include "nsString.h"
-
-/* F3131891-3DC7-11d2-8DB8-00609703C14E */
-#define NS_ILABEL_IID \
-{ 0xf3131891, 0x3dc7, 0x11d2, \
-    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * Label Alignments 
- */
-
-enum nsLabelAlignment {   
-    eAlign_Right,
-    eAlign_Left,
-    eAlign_Center
-  }; 
-
-struct nsLabelInitData : public nsWidgetInitData {
-  nsLabelInitData()
-    : mAlignment(eAlign_Left)
-  {
-  }
-
-  nsLabelAlignment mAlignment;
-};
-
-/**
- * Label widget.
- * Automatically shows itself as depressed when clicked on.
- */
-class nsILabel : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILABEL_IID)
- 
-   /**
-    * Set the label
-    *
-    * @param  Set the label to aText
-    * @result NS_Ok if no errors
-    */
-  
-    NS_IMETHOD SetLabel(const nsString &aText) = 0;
-    
-   /**
-    * Get the button label
-    *
-    * @param aBuffer contains label upon return
-    * @result NS_Ok if no errors
-    */
- 
-    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
-
-
-   /**
-    * Set the Label Alignemnt for creation
-    *
-    * @param aAlignment the alignment
-    * @result NS_Ok if no errors
-    */
-    NS_IMETHOD SetAlignment(nsLabelAlignment aAlignment) = 0;
-
-};
-
-#endif

mozilla/widget/public/nsIListBox.h

@@ -1,183 +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 nsIListBox_h__
-#define nsIListBox_h__
-
-#include "nsIListWidget.h"
-#include "nsString.h"
-
-// {F8030014-C342-11d1-97F0-00609703C14E}
-#define NS_ILISTBOX_IID \
-{ 0xf8030014, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-
-/**
- * Initialize list box data
- */
-
-struct nsListBoxInitData : public nsWidgetInitData {
-  nsListBoxInitData()
-    : mMultiSelect(PR_FALSE)
-  {
-  }
-
-  PRBool mMultiSelect;
-};
-
-/**
- * Single or multi selection list of items.
- * Unlike a nsIWidget, The the list widget must automatically clear 
- * itself to the background color when paint messages are generated.
- * The listbox always has a vertical scrollbar. It never has a
- * horizontal scrollbar.
- */
-
-class nsIListBox : public nsISupports {
-
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTBOX_IID)
-
-    /**
-     * Set an item at the specific position
-     *
-     * @param   aItem     the item name. The item has to be null terminated
-     * @param   aPosition the position the item should be inserted at
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     */
-    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Finds the first occurrence of the specified item
-     *
-     * @param   aItem     the string to be filled
-     * @param   aStartPos the starting position (index)
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
-
-    /**
-     * Returns the number of items in the list
-     *
-     * @return  the number of items
-     *
-     */
-    virtual PRInt32  GetItemCount() = 0;
-
-    /**
-     * Remove the first occurrence of the specified item
-     *
-     * @param   aPosition the item position
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     *
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
-
-    /**
-     * Gets an item at a specific location
-     *
-     * @param   anItem    on return contains the string of the item at that position
-     * @param   aPosition the Position of the item
-     *
-     */
-     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Gets the selected item for a single selection list
-     *
-     * @param   aItem  on return contains the string of the selected item
-     *
-     */
-     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
-
-    /**
-     * Returns with the index of the selected item
-     *
-     * @return  PRInt32, index of selected item
-     *
-     */
-    virtual PRInt32 GetSelectedIndex()  = 0;
-
-    /**
-     * Select the item at the specified position
-     *
-     * @param   PRInt32, the item position
-     *                   0 is at the top of the list
-     *                   -1 is at the end of the list
-     *
-     */
-    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
-
-    /**
-     * Deselects all the items in the list
-     *
-     */
-    NS_IMETHOD Deselect()  = 0;
-
-
-    /**
-     * Set the listbox to be multi-select.
-     * @param   aMultiple PR_TRUE can have multiple selections. PR_FALSE single
-     *          selections only.
-     * @return  void
-     *
-     */
-
-    NS_IMETHOD  SetMultipleSelection(PRBool aMultipleSelections) = 0;
-
-    /**
-     * Return the number of selected items. For single selection list box this
-     * @return the number of selected items
-     * can be 1 or 0. 
-     *
-     */
-    virtual PRInt32  GetSelectedCount() = 0;
-
-    /**
-     * Retrieves the indices of the selected items.
-     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
-     *        determine how large the array needs to be.
-     * @param aSize Size of the aIndices array
-     *
-     */
-    NS_IMETHOD  GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
-
-    /**
-     * Sets the indices of the selected items.
-     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
-     *        determine how large the array needs to be.
-     * @param aSize Size of the aIndices array
-     *
-     */
-    NS_IMETHOD  SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
-
-};
-
-#endif // nsIListBox_h__
-
-
-

mozilla/widget/public/nsIListWidget.h

@@ -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): 
- */
-
-#ifndef nsIListWidget_h__
-#define nsIListWidget_h__
-
-#include "nsIWidget.h"
-#include "nsString.h"
-
-// {F8030013-C342-11d1-97F0-00609703C14E}
-#define NS_ILISTWIDGET_IID \
-{ 0xf8030013, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * 
- * Base class for nsIListBox and nsIComboBox
- *
- */
-
-class nsIListWidget : public nsISupports {
-
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTWIDGET_IID)
-
-    /**
-     * Set an item at the specific position
-     *
-     * @param   aItem     the item name. The item has to be null terminated
-     * @param   aPosition the position the item should be inserted at
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     */
-    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Finds the first occurrence of the specified item
-     *
-     * @param   aItem     the string to be filled
-     * @param   aStartPos the starting position (index)
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
-
-    /**
-     * Returns the number of items in the list
-     *
-     * @return  the number of items
-     *
-     */
-    virtual PRInt32  GetItemCount() = 0;
-
-    /**
-     * Remove the first occurrence of the specified item
-     *
-     * @param   aPosition the item position
-     *                    0 is at the top of the list
-     *                    -1 is at the end of the list
-     *
-     * @return  PR_TRUE if successful, PR_FALSE otherwise
-     *
-     */
-    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
-
-    /**
-     * Gets an item at a specific location
-     *
-     * @param   anItem    on return contains the string of the item at that position
-     * @param   aPosition the Position of the item
-     *
-     */
-     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
-
-    /**
-     * Gets the selected item for a single selection list
-     *
-     * @param   aItem  on return contains the string of the selected item
-     *
-     */
-     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
-
-    /**
-     * Returns with the index of the selected item
-     *
-     * @return  PRInt32, index of selected item
-     *
-     */
-    virtual PRInt32 GetSelectedIndex()  = 0;
-
-    /**
-     * Select the item at the specified position
-     *
-     * @param   PRInt32, the item position
-     *                   0 is at the top of the list
-     *                   -1 is at the end of the list
-     *
-     */
-    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
-
-    /**
-     * Deselects all the items in the list
-     *
-     */
-    NS_IMETHOD Deselect()  = 0;
-
-};
-
-#endif // nsIListWidget_h__
-
-
-

mozilla/widget/public/nsILookAndFeel.h

@@ -1,161 +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 __nsILookAndFeel
-#define __nsILookAndFeel
-#include "nsISupports.h"
-#include "nsColor.h"
-#include "nsFont.h"
-
-#ifdef NS_DEBUG
-#include "nsSize.h"
-#endif
-
-
-// {21B51DE1-21A3-11d2-B6E0-00805F8A2676}
-#define NS_ILOOKANDFEEL_IID \
-{ 0x21b51de1, 0x21a3, 0x11d2, \
-    { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } }
-
-class nsILookAndFeel: public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOOKANDFEEL_IID)
-
-  typedef enum {
-    eColor_WindowBackground,
-    eColor_WindowForeground,
-    eColor_WidgetBackground,
-    eColor_WidgetForeground,
-    eColor_WidgetSelectBackground,
-    eColor_WidgetSelectForeground,
-    eColor_Widget3DHighlight,
-    eColor_Widget3DShadow,
-    eColor_TextBackground,
-    eColor_TextForeground,
-    eColor_TextSelectBackground,
-    eColor_TextSelectForeground,
-
-    // New CSS 2 color definitions
-    eColor_activeborder,
-    eColor_activecaption,
-    eColor_appworkspace,
-    eColor_background,
-    eColor_buttonface,
-    eColor_buttonhighlight,
-    eColor_buttonshadow,
-    eColor_buttontext,
-    eColor_captiontext,
-    eColor_graytext,
-    eColor_highlight,
-    eColor_highlighttext,
-    eColor_inactiveborder,
-    eColor_inactivecaption,
-    eColor_inactivecaptiontext,
-    eColor_infobackground,
-    eColor_infotext,
-    eColor_menu,
-    eColor_menutext,
-    eColor_scrollbar,
-    eColor_threeddarkshadow,
-    eColor_threedface,
-    eColor_threedhighlight,
-    eColor_threedlightshadow,
-    eColor_threedshadow,
-    eColor_window,
-    eColor_windowframe,
-    eColor_windowtext
-
-  } nsColorID;
-
-  typedef enum {
-    eMetric_WindowTitleHeight,
-    eMetric_WindowBorderWidth,
-    eMetric_WindowBorderHeight,
-    eMetric_Widget3DBorder,
-    eMetric_TextFieldBorder,                              // Native border size
-    eMetric_TextFieldHeight,
-    eMetric_TextVerticalInsidePadding,                    // needed only because of GTK
-    eMetric_TextShouldUseVerticalInsidePadding,           // needed only because of GTK
-    eMetric_TextHorizontalInsideMinimumPadding,  
-    eMetric_TextShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
-    eMetric_ButtonHorizontalInsidePaddingNavQuirks,  
-    eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks, 
-    eMetric_CheckboxSize,
-    eMetric_RadioboxSize,
-    
-    eMetric_ListShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
-    eMetric_ListHorizontalInsideMinimumPadding,         
-
-    eMetric_ListShouldUseVerticalInsidePadding,           // needed only because of GTK
-    eMetric_ListVerticalInsidePadding,                    // needed only because of GTK
-
-    eMetric_CaretBlinkTime,                               // default, may be overriden by OS
-    eMetric_CaretWidthTwips
-  } nsMetricID;
-
-  typedef enum {
-    eMetricFloat_TextFieldVerticalInsidePadding,
-    eMetricFloat_TextFieldHorizontalInsidePadding,
-    eMetricFloat_TextAreaVerticalInsidePadding,
-    eMetricFloat_TextAreaHorizontalInsidePadding,
-    eMetricFloat_ListVerticalInsidePadding,
-    eMetricFloat_ListHorizontalInsidePadding,
-    eMetricFloat_ButtonVerticalInsidePadding,
-    eMetricFloat_ButtonHorizontalInsidePadding
-  } nsMetricFloatID;
-
-  
-  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor) = 0;
-  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric) = 0;
-  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric) = 0;
-
-
-#ifdef NS_DEBUG
-  typedef enum {
-    eMetricSize_TextField = 0,
-    eMetricSize_TextArea  = 1,
-    eMetricSize_ListBox   = 2,
-    eMetricSize_ComboBox  = 3,
-    eMetricSize_Radio     = 4,
-    eMetricSize_CheckBox  = 5,
-    eMetricSize_Button    = 6
-  } nsMetricNavWidgetID;
-
-  typedef enum {
-    eMetricSize_Courier   = 0,
-    eMetricSize_SansSerif = 1
-  } nsMetricNavFontID;
-
-  // 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) = 0;
-#endif
-};
-
-#define nsLAF nsILookAndFeel
-
-#endif /* __nsILookAndFeel */

mozilla/widget/public/nsIMenu.h

@@ -1,190 +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 nsIMenu_h__
-#define nsIMenu_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIDOMNode.h"
-#include "nsIDOMElement.h"
-#include "nsIWebShell.h"
-
-class nsIMenuBar;
-class nsIMenu;
-class nsIMenuItem;
-class nsIMenuListener;
-
-// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
-#define NS_IMENU_IID      \
-{ 0x35a3dec1, 0x4992, 0x11d2, \
-  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-
-/**
- * Menu widget
- */
-class nsIMenu : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENU_IID)
-
-  /**
-    * Creates the Menu
-    *
-    */
-    NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel) = 0;
-
-   /**
-    * Get the Menu's Parent
-    *
-    */
-    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
-
-   /**
-    * Get the Menu label
-    *
-    */
-    NS_IMETHOD GetLabel(nsString &aText) = 0;
-
-   /**
-    * Set the Menu label
-    *
-    */
-    NS_IMETHOD SetLabel(const nsString &aText) = 0;
-
-	/**
-    * Get the Menu Access Key
-    *
-    */
-	NS_IMETHOD GetAccessKey(nsString &aText) = 0;
-   
-	/**
-    * Set the Menu Access Key
-    *
-    */
-	NS_IMETHOD SetAccessKey(const nsString &aText) = 0;
-
-	/**
-    * Set the Menu enabled state
-    *
-    */
-	NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
-
-	/**
-    * Get the Menu enabled state
-    *
-    */
-	NS_IMETHOD GetEnabled(PRBool* aIsEnabled) = 0;
-	
-	/**
-    * Query if this is the help menu. Mostly for MacOS voodoo.
-    *
-    */
-	NS_IMETHOD IsHelpMenu(PRBool* aIsHelpMenu) = 0;
-	
-	/**
-    * Adds a Menu Item
-    *
-    */
-    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
-
-   /**
-    * Adds a separator
-    *
-    */
-    NS_IMETHOD AddSeparator() = 0;
-
-   /**
-    * Returns the number of menu items
-    * This does count separators as items
-    */
-    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
-
-   /**
-    * Returns a Menu or Menu Item at a specified Index
-    *
-    */
-    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
-
-   /**
-    * Inserts a Menu Item at a specified Index
-    *
-    */
-    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
-
-   /**
-    * Removes an Menu Item from a specified Index
-    *
-    */
-    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
-
-   /**
-    * Removes all the Menu Items
-    *
-    */
-    NS_IMETHOD RemoveAll() = 0;
-
-   /**
-    * Gets Native MenuHandle
-    *
-    */
-    NS_IMETHOD  GetNativeData(void** aData) = 0;
-
-   /**
-    * Sets Native MenuHandle
-    *
-    */
-    NS_IMETHOD  SetNativeData(void* aData) = 0;
-    
-   /**
-    * Adds menu listener for dynamic construction
-    *
-    */
-    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Removes menu listener for dynamic construction
-    *
-    */
-    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Set DOMNode
-    *
-    */
-    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
-
-	/**
-    * Set DOMElement
-    *
-    */
-    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
-
-	/**
-    * Set WebShell
-    *
-    */
-    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
-};
-
-#endif

mozilla/widget/public/nsIMenuBar.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 nsIMenuBar_h__
-#define nsIMenuBar_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIMenu.h"
-#include "nsIWebShell.h"
-
-class nsIWidget;
-
-// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
-#define NS_IMENUBAR_IID      \
-{ 0xbc658c81, 0x4beb, 0x11d2, \
-  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * MenuBar widget
- */
-class nsIMenuBar : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUBAR_IID)
-
-   /**
-    * Creates the MenuBar
-    *
-    */
-    NS_IMETHOD Create(nsIWidget * aParent) = 0;
-
-   /**
-    * Get the MenuBar's Parent
-    *
-    */
-    NS_IMETHOD GetParent(nsIWidget *&aParent) = 0;
-
-   /**
-    * Set the MenuBar's Parent
-    *
-    */
-    NS_IMETHOD SetParent(nsIWidget *aParent) = 0;
-
-   /**
-    * Adds the Menu 
-    *
-    */
-    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
-    
-   /**
-    * Returns the number of menus
-    *
-    */
-    NS_IMETHOD GetMenuCount(PRUint32 &aCount) = 0;
-
-   /**
-    * Returns a Menu Item at a specified Index
-    *
-    */
-    NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
-
-   /**
-    * Inserts a Menu at a specified Index
-    *
-    */
-    NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
-
-   /**
-    * Removes an Menu from a specified Index
-    *
-    */
-    NS_IMETHOD RemoveMenu(const PRUint32 aCount) = 0;
-
-   /**
-    * Removes all the Menus
-    *
-    */
-    NS_IMETHOD RemoveAll() = 0;
-
-   /**
-    * Gets Native MenuHandle
-    *
-    */
-    NS_IMETHOD  GetNativeData(void*& aData) = 0;
-
-   /**
-    * Sets Native MenuHandle. Temporary hack for mac until 
-    * nsMenuBar does it's own construction
-    */
-    NS_IMETHOD  SetNativeData(void* aData) = 0;
-    
-   /**
-    * Draw the menubar
-    *
-    */
-    NS_IMETHOD  Paint() = 0;
-   
-};
-
-#endif

mozilla/widget/public/nsIMenuItem.h

@@ -1,189 +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 nsIMenuItem_h__
-#define nsIMenuItem_h__
-
-#include "prtypes.h"
-#include "nsISupports.h"
-#include "nsString.h"
-
-#include "nsIWebShell.h"
-#include "nsIDOMElement.h"
-
-// {7F045771-4BEB-11d2-8DBB-00609703C14E}
-#define NS_IMENUITEM_IID      \
-{ 0x7f045771, 0x4beb, 0x11d2, \
-  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-class nsIMenu;
-class nsIPopUpMenu;
-class nsIWidget;
-class nsIMenuListener;
-
-enum {
-  knsMenuItemNoModifier      = 0,
-  knsMenuItemShiftModifier   = (1 << 0),
-  knsMenuItemAltModifier     = (1 << 1),
-  knsMenuItemControlModifier = (1 << 2),
-  knsMenuItemCommandModifier = (1 << 3)
-};
-
-/**
- * MenuItem widget
- */
-class nsIMenuItem : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUITEM_IID)
-
-   /**
-    * Creates the MenuItem
-    *
-    */
-    NS_IMETHOD Create(nsISupports    * aParent, 
-                      const nsString & aLabel, 
-                      PRBool           isSeparator) = 0;
-    
-   /**
-    * Get the MenuItem label
-    *
-    */
-    NS_IMETHOD GetLabel(nsString &aText) = 0;
-
-   /**
-    * Get the MenuItem label
-
-    *
-    */
-    NS_IMETHOD SetLabel(nsString &aText) = 0;
-
-   /**
-    * Set the Menu shortcut char
-    *
-    */
-    NS_IMETHOD SetShortcutChar(const nsString &aText) = 0;
-  
-    /**
-    * Get the Menu shortcut char
-    *
-    */
-    NS_IMETHOD GetShortcutChar(nsString &aText) = 0;
-   /**
-    * Sets whether the item is enabled or disabled
-    *
-    */
-    NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
-
-   /**
-    * Gets whether the item is enabled or disabled
-    *
-    */
-    NS_IMETHOD GetEnabled(PRBool *aIsEnabled) = 0;
-
-   /**
-    * Sets whether the item is checked or not
-    *
-    */
-    NS_IMETHOD SetChecked(PRBool aIsEnabled) = 0;
-
-   /**
-    * Gets whether the item is checked or not
-    *
-    */
-    NS_IMETHOD GetChecked(PRBool *aIsEnabled) = 0;
-
-   /**
-    * Sets whether the item is a checkbox type
-    *
-    */
-    NS_IMETHOD SetCheckboxType(PRBool aIsCheckbox) = 0;
-
-   /**
-    * Gets whether the item is a checkbox type
-    *
-    */
-    NS_IMETHOD GetCheckboxType(PRBool *aIsCheckbox) = 0;
-    
-   /**
-    * Gets the MenuItem Command identifier
-    *
-    */
-    NS_IMETHOD GetCommand(PRUint32 & aCommand) = 0;
-
-   /**
-    * Gets the target for MenuItem
-    *
-    */
-    NS_IMETHOD GetTarget(nsIWidget *& aTarget) = 0;
-    
-   /**
-    * Gets Native Menu Handle
-    *
-    */
-    NS_IMETHOD GetNativeData(void*& aData) = 0;
-
-   /**
-    * Adds menu listener
-    *
-    */
-    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Removes menu listener
-    *
-    */
-    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
-
-   /**
-    * Indicates whether it is a separator
-    *
-    */
-    NS_IMETHOD IsSeparator(PRBool & aIsSep) = 0;
-
-   /**
-    * 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_IMETHOD SetCommand(const nsString & aStrCmd) = 0;
-
-   /**
-    * Executes the "cached" JavaScript Command 
-    * @return NS_OK if the command was executed properly, otherwise an error code
-    */
-    NS_IMETHOD DoCommand() = 0;
-
-    NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode) = 0;
-    NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode) = 0;
-    NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement) = 0;
-    NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement) = 0;
-    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
-    
-    /**
-    *
-    */
-    NS_IMETHOD SetModifiers(PRUint8 aModifiers) = 0;
-    NS_IMETHOD GetModifiers(PRUint8 * aModifiers) = 0;
-};
-
-#endif

mozilla/widget/public/nsIMenuListener.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 nsIMenuListener_h__
-#define nsIMenuListener_h__
-
-#include "nsGUIEvent.h"
-#include "nsISupports.h"
-
-// TODO: This needs to be generated!
-// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
-#define NS_IMENULISTENER_IID      \
-{ 0xbc658c81, 0x4beb, 0x11d2, \
-  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x9e } }
-  
-static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID);
-
-/**
- *
- * Menu event listener
- * This interface should only be implemented by the menu manager
- * These are registered with nsWindows to recieve menu events
- */
-
-class nsIMenuListener : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENULISTENER_IID)
-
-	 /**
-     * Processes a menu item selected event
-     * @param aMenuEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent) = 0;
-
-    /**
-     * Processes a menu selected event
-     * @param aMenuEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent) = 0;
-
-    /**
-     * Processes a menu deselect event
-     * @param aMenuEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) = 0;
-
-    virtual nsEventStatus MenuConstruct(
-
-      const nsMenuEvent & aMenuEvent,
-
-      nsIWidget         * aParentWindow, 
-
-      void              * menubarNode,
-
-	  void              * aWebShell) = 0;
-
-      
-
-    virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent) = 0;
-};
-
-#endif // nsIMenuListener_h__

mozilla/widget/public/nsIMouseListener.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 nsIMouseListener_h__
-#define nsIMouseListener_h__
-
-#include "nsGUIEvent.h"
-#include "nsISupports.h"
-
-/**
- *
- * Mouse up/down/move event listener
- *
- */
-
-// {c83f6b81-d7ce-11d2-8360-c4c894c4917c}
-#define NS_IMOUSELISTENER_IID \
-{ 0xc83f6b81, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
-
-class nsIMouseListener : public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMOUSELISTENER_IID)
-
-    /**
-     * Processes a mouse pressed event
-     * @param aMouseEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MousePressed(const nsGUIEvent & aMouseEvent) = 0;
-
-    /**
-     * Processes a mouse release event
-     * @param aMouseEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MouseReleased(const nsGUIEvent & aMouseEvent) = 0;
-
-    /**
-     * Processes a mouse clicked event
-     * @param aMouseEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     *
-     */
-    virtual nsEventStatus MouseClicked(const nsGUIEvent & aMouseEvent) = 0;
-
-    /**
-     * Processes a mouse moved event
-     * @param aMouseEvent See nsGUIEvent.h 
-     * @return whether the event was consumed or ignored. See nsEventStatus
-     */
-    virtual nsEventStatus MouseMoved(const nsGUIEvent & aMouseEvent) = 0;
-
-};
-
-#endif // nsIMouseListener_h__

mozilla/widget/public/nsIPopUpMenu.h

@@ -1,138 +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 nsIPopUpMenu_h__
-#define nsIPopUpMenu_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIMenuItem.h"
-
-class nsIMenu;
-class nsIWidget;
-
-// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
-#define NS_IPOPUPMENU_IID      \
-{ 0xf6cd4f21, 0x53af, 0x11d2, \
-  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * PopUpMenu widget
- */
-class nsIPopUpMenu : public nsISupports {
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPOPUPMENU_IID)
-
-   /**
-    * Creates the PopUpMenu
-    *
-    */
-    NS_IMETHOD Create(nsIWidget * aParent) = 0;
-    
-   /**
-    * Adds a PopUpMenu Item
-    *
-    */
-    NS_IMETHOD AddItem(const nsString &aText) = 0;
-    
-   /**
-    * Adds a PopUpMenu Item
-    *
-    */
-    NS_IMETHOD AddItem(nsIMenuItem * aMenuItem) = 0;
-    
-   /**
-    * Adds a Cascading PopUpMenu 
-    *
-    */
-    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
-    
-   /**
-    * Adds Separator
-    *
-    */
-    NS_IMETHOD AddSeparator() = 0;
-
-   /**
-    * Returns the number of menu items
-    *
-    */
-    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
-
-   /**
-    * Returns a PopUpMenu Item at a specified Index
-    *
-    */
-    NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
-
-   /**
-    * Inserts a PopUpMenu Item at a specified Index
-    *
-    */
-    NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
-
-   /**
-    * Creates and inserts a PopUpMenu Item at a specified Index
-    *
-    */
-    NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName) = 0;
-
-   /**
-    * Creates and inserts a Separator at a specified Index
-    *
-    */
-    NS_IMETHOD InsertSeparator(const PRUint32 aCount) = 0;
-
-   /**
-    * Removes an PopUpMenu Item from a specified Index
-    *
-    */
-    NS_IMETHOD RemoveItem(const PRUint32 aCount) = 0;
-
-   /**
-    * Removes all the PopUpMenu Items
-    *
-    */
-    NS_IMETHOD RemoveAll() = 0;
-
-   /**
-    * Shows menu and waits for action
-    *
-    */
-    NS_IMETHOD ShowMenu(PRInt32 aX, PRInt32 aY) = 0;
-
-   /**
-    * Gets Native MenuHandle
-    *
-    */
-    NS_IMETHOD  GetNativeData(void*& aData) = 0;
-
-   /**
-    * Gets parent widget
-    *
-    */
-    NS_IMETHOD  GetParent(nsIWidget *& aParent) = 0;
-
-};
-
-#endif

mozilla/widget/public/nsIRadioButton.h

@@ -1,80 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; 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 nsIRadioButton_h__
-#define nsIRadioButton_h__
-
-#include "nsIButton.h"
-
-#define NS_IRADIOBUTTON_IID   \
-{ 0x18032ad4, 0xb265, 0x11d2, \
-{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }       
-
-/**
- * RadioButton widget. Can show itself in a checked or unchecked state. 
- * The RadioButton widget automatically shows itself checked or unchecked when clicked on.
- */
-
-class nsIRadioButton : public nsISupports {
-
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOBUTTON_IID)
-
-   /**
-    * Set the button label
-    *
-    * @param aText  button label
-    * @result set to NS_OK if method successful
-    */
-  
-    NS_IMETHOD SetLabel(const nsString &aText) = 0;
-    
-   /**
-    * Get the button label
-    *
-    * @param aBuffer contains label upon return
-    * @result set to NS_OK if method successful
-    */
- 
-    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
-
-    /**
-     * Set the check state.
-     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
-     * @result set to NS_OK if method successful
-     */
-
-    NS_IMETHOD SetState(const PRBool aState) = 0;
-    
-    /**
-     * Get the check state.
-     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
-     * @result set to NS_OK if method successful
-     */
-
-    NS_IMETHOD GetState(PRBool& aState) = 0;
-
-};
-
-#endif  // nsIRadioButton_h__
-
-

mozilla/widget/public/nsIRollupListener.idl

@@ -1,35 +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): 
- *   Rod Spears <rods@netscape.com>
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsISupports.idl"
-
-[uuid(23C2BA03-6C76-11d3-96ED-0060B0FB9956)]
-interface nsIRollupListener : nsISupports
-{
-  /**
-   * Notifies the object to rollup
-   * @result NS_Ok if no errors
-   */
-  void Rollup();
-};

mozilla/widget/public/nsIScrollbar.h

@@ -1,124 +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 nsIScrollbar_h__
-#define nsIScrollbar_h__
-
-#include "nsIWidget.h"
-
-// {18032AD2-B265-11d1-AA2A-000000000000}
-#define NS_ISCROLLBAR_IID     \
-{ 0x18032ad2, 0xb265, 0x11d1, \
-{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-
-
-/**
- *
- * Scrollbar, converts mouse input into values that can be used
- * to shift the contents of a window.
- *
- */
-
-
-class nsIScrollbar : public nsISupports
-{
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCROLLBAR_IID)
-    
-    /**
-     * Set the scrollbar range
-     * @param aEndRange set range for scrollbar from 0 to aEndRange
-     * @result NS_Ok if no errors
-     *
-     */
-    NS_IMETHOD SetMaxRange(PRUint32 aEndRange) = 0;
-    
-    /**
-     * Get the scrollbar range
-     * @return the upper end of the scrollbar range
-     * @result NS_Ok if no errors
-     */
-    NS_IMETHOD GetMaxRange(PRUint32& aMaxRange) = 0;
-
-    /**
-     * Set the thumb position. 
-     * @param aPos a value between (startRange) and (endRange - thumbSize)
-     * @result NS_Ok if no errors
-     *
-     */
-    NS_IMETHOD SetPosition(PRUint32 aPos) = 0;
-
-    /**
-     * Get the thumb position. 
-     * @return a value between (startRange) and (endRange - thumbSize)
-     * @result NS_Ok if no errors
-     *
-     */
-    NS_IMETHOD GetPosition(PRUint32& aPos) = 0;
-
-    /**
-     * Set the thumb size. 
-     * @param aSize size of the thumb. Must be a value between 
-     *        startRange and endRange
-     * @result NS_Ok if no errors
-     */
-    NS_IMETHOD SetThumbSize(PRUint32 aSize) = 0;
-    
-    /**
-     * Get the thumb size. 
-     * @return size of the thumb. The value is between 
-     *          startRange and endRange
-     * @result NS_Ok if no errors
-     */
-    NS_IMETHOD GetThumbSize(PRUint32& aSize) = 0;
-
-    /**
-     * Set the line increment.
-     * @param aSize size of the line increment. The value must
-     *        be between startRange and endRange
-     * @result NS_Ok if no errors
-      */
-    NS_IMETHOD SetLineIncrement(PRUint32 aSize) = 0;
-  
-    /**
-     * Get the line increment.
-     * @return size of the line increment. The value is
-     *          between startRange and endRange
-     * @result NS_Ok if no errors
-     */
-    NS_IMETHOD GetLineIncrement(PRUint32& aSize) = 0;
-
-    /**
-     * Set all scrollbar parameters at once
-     * @param aMaxRange set range for scrollbar from 0 to aMaxRange
-     * @param aThumbSize size of the thumb. Must be a value between 
-     *        startRange and endRange
-     * @param aPosition a value between (startRange) and (endRange - thumbSize)
-     * @param aLineIncrement size of the line increment. The value must
-     *        be between startRange and endRange
-     * @result NS_Ok if no errors
-     */
-    NS_IMETHOD SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
-                               PRUint32 aPosition, PRUint32 aLineIncrement) = 0;
-};
-
-#endif // nsIScrollbar_h__

mozilla/widget/public/nsISound.idl

@@ -1,43 +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 "nsISupports.idl"
-#include "nsIFileSpec.idl"
-
-[scriptable, uuid(B148EED1-236D-11d3-B35C-00A0CC3C1CDE)]
-interface nsISound : nsISupports
-{
-  void Init();
-
-  void Play(in nsIFileSpec filespec);
-  //  void Stop();
-
-  void Beep();
-};
-
-
-%{ C++
-
-extern nsresult
-NS_NewSound(nsISound** aSound);
-
-%}

mozilla/widget/public/nsITextAreaWidget.h

@@ -1,158 +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 nsITextAreaWidget_h__
-#define nsITextAreaWidget_h__
-
-#include "nsIWidget.h"
-#include "nsITextWidget.h"
-#include "nsString.h"
-
-// {F8030012-C342-11d1-97F0-00609703C14E}
-#define NS_ITEXTAREAWIDGET_IID \
-{ 0xf8030012, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/**
- * Multi-line text editor. 
- * See nsITextWidget for capabilities. 
- * Displays a scrollbar when the text content exceeds the number of lines 
- * displayed.
- * Unlike a nsIWidget, The textarea must automatically clear 
- * itself to the background color when paint messages are generated.
- */
-
-class nsITextAreaWidget : public nsISupports 
-{
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTAREAWIDGET_IID)
-
-    /**
-     * Get the text of this component.
-     *
-     * @param aTextBuffer  on return contains the text of this component
-     * @param aBufferSize  the size of the buffer passed in
-     * @param aActualSize  the number of char copied
-     * @result NS_Ok if no errors
-     *
-     */
-
-    NS_IMETHOD GetText(nsString &aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize) = 0;
-
-    /**
-     * Set the text of this component.
-     *
-     * @param   aText -- an object containing a copy of the text
-     * @return  the number of chars in the text string
-     * @result NS_Ok if no errors
-     *
-     */
-
-    NS_IMETHOD SetText(const nsString &aText, PRUint32& aActualSize) = 0;
-
-    /**
-     * Insert text into this component.
-     * When aStartPos and aEndPos are a valid range this function performs a replace.
-     * When aStartPos and aEndPos are equal this function performs an insert.
-     * When aStartPos and aEndPos are both -1 (0xFFFFFFFF) this function performs an append.
-     * If aStartPos and aEndPos are out of range they are rounded to the closest end.
-     *
-     * @param   aText     the text to set
-     * @param   aStartPos starting position for inserting text
-     * @param   aEndPos   ending position for inserting text
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize) = 0;
-
-    /**
-     * Remove any content from this text widget
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD RemoveText(void) = 0;
-
-    /**
-     * Sets the maximum number of characters the widget can hold 
-     *
-     * @param aChars maximum number of characters for this widget. if 0 then there isn't any limit
-     * @result NS_Ok if no errors
-     */
-    
-    NS_IMETHOD SetMaxTextLength(PRUint32 aChars) = 0;
-
-
-    /**
-     * Set the text widget to be read-only
-     *
-     * @param  aReadOnlyFlag PR_TRUE the widget is read-only,
-     *         PR_FALSE indicates the widget is writable. 
-     * @param  PR_TRUE if it was read only. PR_FALSE if it was writable           
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag) = 0;
-    
-    /**
-     * Select all of the contents
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SelectAll() = 0;
-
-    /**
-     * Set the selection in this text component
-     * @param aStartSel starting selection position in characters
-     * @param aEndSel ending selection position in characters 
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetSelection(PRUint32 aStartSel, PRUint32 aEndSel) = 0;
-
-    /**
-     * Get the selection in this text component
-     * @param aStartSel starting selection position in characters
-     * @param aEndSel ending selection position in characters 
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel) = 0;
-
-    /**
-     * Set the caret position
-     * @param aPosition caret position in characters
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetCaretPosition(PRUint32 aPosition) = 0;
-
-    /**
-     * Get the caret position
-     * @return caret position in characters
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD GetCaretPosition(PRUint32& aPosition) = 0;
-};
-
-#endif // nsITextAreaWidget_h__
-

mozilla/widget/public/nsITextWidget.h

@@ -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): 
- */
-#ifndef nsITextWidget_h__
-#define nsITextWidget_h__
-
-#include "nsIWidget.h"
-#include "nsString.h"
-
-// {F8030011-C342-11d1-97F0-00609703C14E}
-#define NS_ITEXTWIDGET_IID \
-{ 0xf8030011, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-
-struct nsTextWidgetInitData : public nsWidgetInitData {
-  nsTextWidgetInitData()
-    : mIsPassword(PR_FALSE),
-      mIsReadOnly(PR_FALSE)
-  {
-  }
-
-  PRBool mIsPassword;
-  PRBool mIsReadOnly;
-};
-
-
-/**
- *
- * Single line text editor. 
- * Unlike a nsIWidget, The text editor must automatically clear 
- * itself to the background color when paint messages are generated.
- *
- */
-
-class nsITextWidget : public nsISupports
-{
-
-  public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTWIDGET_IID)
-
-    /**
-     * Get the text of this component.
-     *
-     * @param aTextBuffer  on return contains the text of this component
-     * @param aBufferSize  the size of the buffer passed in
-     * @param aActualSize  the number of char copied
-     * @result NS_Ok if no errors
-     *
-     */
-
-    NS_IMETHOD GetText(nsString &aTextBuffer, PRUint32 aBufferSize, PRUint32& aActualSize) = 0;
-
-    /**
-     * Set the text of this component.
-     *
-     * @param   aText -- an object containing a copy of the text
-     * @return  the number of chars in the text string
-     * @result NS_Ok if no errors
-     *
-     */
-
-    NS_IMETHOD SetText(const nsString &aText, PRUint32& aActualSize) = 0;
-
-    /**
-     * Insert text into this component.
-     * When aStartPos and aEndPos are a valid range this function performs a replace.
-     * When aStartPos and aEndPos are equal this function performs an insert.
-     * When aStartPos and aEndPos are both -1 (0xFFFFFFFF) this function performs an append.
-     * If aStartPos and aEndPos are out of range they are rounded to the closest end.
-     *
-     * @param   aText     the text to set
-     * @param   aStartPos starting position for inserting text
-     * @param   aEndPos   ending position for inserting text
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD InsertText(const nsString &aText, PRUint32 aStartPos, PRUint32 aEndPos, PRUint32& aActualSize) = 0;
-
-    /**
-     * Remove any content from this text widget
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD RemoveText(void) = 0;
-
-    /**
-     * Indicates a password will be entered. 
-     *
-     * @param aIsPassword PR_TRUE shows contents as asterisks. PR_FALSE shows
-     * contents as normal text.
-     * @result NS_Ok if no errors
-     */
-    
-    NS_IMETHOD SetPassword(PRBool aIsPassword) = 0;
-
-    /**
-     * Sets the maximum number of characters the widget can hold 
-     *
-     * @param aChars maximum number of characters for this widget. if 0 then there isn't any limit
-     * @result NS_Ok if no errors
-     */
-    
-    NS_IMETHOD SetMaxTextLength(PRUint32 aChars) = 0;
-
-
-    /**
-     * Set the text widget to be read-only
-     *
-     * @param  aReadOnlyFlag PR_TRUE the widget is read-only,
-     *         PR_FALSE indicates the widget is writable. 
-     * @param  PR_TRUE if it was read only. PR_FALSE if it was writable           
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetReadOnly(PRBool aNewReadOnlyFlag, PRBool& aOldReadOnlyFlag) = 0;
-    
-    /**
-     * Select all of the contents
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SelectAll() = 0;
-
-    /**
-     * Set the selection in this text component
-     * @param aStartSel starting selection position in characters
-     * @param aEndSel ending selection position in characters 
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetSelection(PRUint32 aStartSel, PRUint32 aEndSel) = 0;
-
-    /**
-     * Get the selection in this text component
-     * @param aStartSel starting selection position in characters
-     * @param aEndSel ending selection position in characters 
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD GetSelection(PRUint32 *aStartSel, PRUint32 *aEndSel) = 0;
-
-    /**
-     * Set the caret position
-     * @param aPosition caret position in characters
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD SetCaretPosition(PRUint32 aPosition) = 0;
-
-    /**
-     * Get the caret position
-     * @return caret position in characters
-     * @result NS_Ok if no errors
-     */
-
-    NS_IMETHOD GetCaretPosition(PRUint32& aPosition) = 0;
-
-};
-
-#endif // nsITextWidget_h__
-

mozilla/widget/public/nsIToolkit.idl

@@ -1,50 +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 "nsISupports.idl"
-
-%{ C++
-#include "prthread.h"
-%}
-
-[ptr] native PRThread(PRThread);
-
-
-[uuid(18032BD0-B265-11d1-AA2A-000000000000)]
-interface nsIToolkit : nsISupports
-{
-  /**
-   * Initialize this toolkit with aThread. 
-   * @param aThread The thread passed in runs the message pump.
-   *  NULL can be passed in, in which case a new thread gets created
-   *  and a message pump will run in that thread
-   *
-   */
-  void Init(in PRThread aThread);
-
-};
-
-
-%{ C++
-extern NS_METHOD NS_GetCurrentToolkit(nsIToolkit* *aResult);
-%}

mozilla/widget/public/nsITransferable.idl

@@ -1,123 +0,0 @@
-/* -*- Mode: IDL; 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 Mozilla Communicator.
- * 
- * The Initial Developer of the Original Code is Netscape Communications
- * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
- * Communications Corp.  All Rights Reserved.
- * 
- * Contributor(s): 
- *   Mike Pinkerton
- */
-
-#include "nsISupports.idl"
-#include "nsISupportsArray.idl"
-#include "nsIFormatConverter.idl"
-
-
-%{ C++
-
-// these probably shouldn't live here, but in some central repository shared
-// by the entire app.
-#define kTextMime      "text/plain"
-#define kXIFMime       "text/xif"
-#define kUnicodeMime   "text/unicode"
-#define kHTMLMime      "text/html"
-#define kAOLMailMime   "AOLMAIL"
-#define kPNGImageMime  "image/png"
-#define kJPEGImageMime "image/jpg"
-#define kGIFImageMime  "image/gif"
-#define kDropFilesMime "text/dropfiles"
-
-%}
-
-
-[scriptable, uuid(8B5314BC-DB01-11d2-96CE-0060B0FB9956)]
-interface nsITransferable : nsISupports
-{
-  /**
-    * Computes a list of flavors (mime types as nsISupportsString) that the transferable 
-    * can export, either through intrinsic knowledge or output data converters.
-    *
-    * @param  aDataFlavorList fills list with supported flavors. This is a copy of
-    *          the internal list, so it may be edited w/out affecting the transferable.
-    */
-  nsISupportsArray flavorsTransferableCanExport ( ) ;
-
-  /**
-    * Given a flavor retrieve the data. 
-    *
-    * @param  aFlavor (in parameter) the flavor of data to retrieve
-    * @param  aData the data. Some variant of class in nsISupportsPrimitives.idl
-    * @param  aDataLen the length of the data
-    */
-  void getTransferData ( in string aFlavor, out nsISupports aData, out unsigned long aDataLen ) ;
-
-  /**
-    * Returns the best flavor in the transferable, given those that have
-    * been added to it with |AddFlavor()|
-    *
-    * @param  aFlavor (out parameter) the flavor of data that was retrieved
-    * @param  aData the data. Some variant of class in nsISupportsPrimitives.idl
-    * @param  aDataLen the length of the data
-    */
-  void getAnyTransferData ( out string aFlavor, out nsISupports aData, out unsigned long aDataLen ) ;
-
-  /**
-    * Returns true if the data is large.
-    */
-  boolean isLargeDataSet ( ) ;
-
-    ///////////////////////////////
-    // Setter part of interface 
-    ///////////////////////////////
-
-  /**
-    * Computes a list of flavors (mime types as nsISupportsString) that the transferable can
-    * accept into it, either through intrinsic knowledge or input data converters.
-    *
-    * @param  outFlavorList fills list with supported flavors. This is a copy of
-    *          the internal list, so it may be edited w/out affecting the transferable.
-    */
-  nsISupportsArray flavorsTransferableCanImport ( ) ;
-
-  /**
-    * Sets the data in the transferable with the specified flavor. The transferable
-    * will maintain its own copy the data, so it is not necessary to do that beforehand.
-    *
-    * @param  aFlavor the flavor of data that is being set
-    * @param  aData the data, some variant of class in nsISupportsPrimitives.idl
-    * @param  aDataLen the length of the data
-    */
-  void setTransferData ( in string aFlavor, in nsISupports aData, in unsigned long aDataLen ) ;
-
-  /**
-    * Add the data flavor, indicating that this transferable 
-    * can receive this type of flavor
-    *
-    * @param  aDataFlavor a new data flavor to handle
-    */
-  void addDataFlavor ( in string aDataFlavor ) ;
-
-  /**
-    * Removes the data flavor matching the given one (string compare) and the data
-    * that goes along with it.
-    *
-    * @param  aDataFlavor a data flavor to remove
-    */
-  void removeDataFlavor ( in string aDataFlavor ) ;
-
-  attribute nsIFormatConverter converter;
-
-};
-

mozilla/widget/public/nsIWidget.h

@@ -1,725 +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 nsIWidget_h__
-#define nsIWidget_h__
-
-#include "nsISupports.h"
-#include "nsColor.h"
-#include "nsIMouseListener.h"
-#include "nsIMenuListener.h"
-#include "nsIImage.h"
-
-#include "prthread.h"
-#include "nsGUIEvent.h"
-
-// forward declarations
-class   nsIAppShell;
-class   nsIToolkit;
-class   nsIFontMetrics;
-class   nsIToolkit;
-class   nsIRenderingContext;
-class   nsIEnumerator;
-class   nsIDeviceContext;
-struct  nsRect;
-struct  nsFont;
-class   nsIMenuBar;
-class   nsIEventListener;
-class   nsIRollupListener;
-
-/**
- * Callback function that processes events.
- * The argument is actually a subtype (subclass) of nsEvent which carries
- * platform specific information about the event. Platform specific code knows
- * how to deal with it.
- * The return value determines whether or not the default action should take place.
- */
-
-typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event);
-
-/**
- * Flags for the getNativeData function.
- * See getNativeData()
- */
-#define NS_NATIVE_WINDOW    0
-#define NS_NATIVE_GRAPHIC   1
-#define NS_NATIVE_COLORMAP  2
-#define NS_NATIVE_WIDGET    3
-#define NS_NATIVE_DISPLAY   4
-#define NS_NATIVE_REGION		5
-#define NS_NATIVE_OFFSETX		6
-#define NS_NATIVE_OFFSETY		7
-#define NS_NATIVE_PLUGIN_PORT	8
-#define NS_NATIVE_SCREEN      9
-
-// {18032AD5-B265-11d1-AA2A-000000000000}
-#define NS_IWIDGET_IID \
-{ 0x18032ad5, 0xb265, 0x11d1, \
-{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-
-
-// Hide the native window systems real window type so as to avoid
-// including native window system types and api's. This is necessary
-// to ensure cross-platform code.
-typedef void* nsNativeWidget;
-
-/**
- * Border styles
- */
-
-enum nsWindowType {
-  // default top level window
-  eWindowType_toplevel,
-  // top level window but usually handled differently by the OS
-  eWindowType_dialog,
-  // used for combo boxes, etc
-  eWindowType_popup,
-  // child windows (contained inside a window on the desktop (has no border))
-  eWindowType_child
-};
-
-
-enum nsBorderStyle
-{
-  // no border, titlebar, etc.. opposite of all
-  eBorderStyle_none     = 0,
-
-  // all window decorations
-  eBorderStyle_all      = 1 << 0,
-
-  // enables the border on the window.  these are only for decoration and are not resize hadles
-  eBorderStyle_border   = 1 << 1,
-
-  // enables the resize handles for the window.  if this is set, border is implied to also be set
-  eBorderStyle_resizeh  = 1 << 2,
-
-  // enables the titlebar for the window
-  eBorderStyle_title    = 1 << 3,
-
-  // enables the window menu button on the title bar.  this being on should force the title bar to display
-  eBorderStyle_menu     = 1 << 4,
-
-  // enables the minimize button so the user can minimize the window.
-  //   turned off for tranient windows since they can not be minimized seperate from their parent
-  eBorderStyle_minimize = 1 << 5,
-
-  // enables the maxmize button so the user can maximize the window
-  eBorderStyle_maximize = 1 << 6,
-
-  // show the close button
-  eBorderStyle_close    = 1 << 7,
-
-  // whatever the OS wants... i.e. don't do anything
-  eBorderStyle_default  = -1
-};
-
-/**
- * Cursor types.
- */
-
-enum nsCursor {   ///(normal cursor,       usually rendered as an arrow)
-                eCursor_standard, 
-                  ///(system is busy,      usually rendered as a hourglass or watch)
-                eCursor_wait, 
-                  ///(Selecting something, usually rendered as an IBeam)
-                eCursor_select, 
-                  ///(can hyper-link,      usually rendered as a human hand)
-                eCursor_hyperlink, 
-                  ///(west/east sizing,    usually rendered as ->||<-)
-                eCursor_sizeWE,
-                  ///(north/south sizing,  usually rendered as sizeWE rotated 90 degrees)
-                eCursor_sizeNS,
-                eCursor_arrow_north,
-                eCursor_arrow_north_plus,
-                eCursor_arrow_south,
-                eCursor_arrow_south_plus,
-                eCursor_arrow_west,
-                eCursor_arrow_west_plus,
-                eCursor_arrow_east,
-                eCursor_arrow_east_plus,
-                eCursor_crosshair,
-                //Don't know what 'move' cursor should be.  See CSS2.
-                eCursor_move,
-                eCursor_help
-                }; 
-
-
-/**
- * Basic struct for widget initialization data.
- * @see Create member function of nsIWidget
- */
-
-struct nsWidgetInitData {
-  nsWidgetInitData()
-    : clipChildren(PR_FALSE), clipSiblings(PR_FALSE),
-      mWindowType(eWindowType_child),
-      mBorderStyle(eBorderStyle_default)
-  {
-  }
-
-  // when painting exclude area occupied by child windows and sibling windows
-  PRPackedBool  clipChildren, clipSiblings;
-  nsWindowType mWindowType;
-  nsBorderStyle mBorderStyle;
-};
-
-/**
- * The base class for all the widgets. It provides the interface for
- * all basic and necessary functionality.
- */
-class nsIWidget : public nsISupports {
-
-  public:
-
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWIDGET_IID)
-
-    /**
-     * Create and initialize a widget. 
-     *
-     * The widget represents a window that can be drawn into. It also is the 
-     * base class for user-interface widgets such as buttons and text boxes.
-     *
-     * All the arguments can be NULL in which case a top level window
-     * with size 0 is created. The event callback function has to be
-     * provided only if the caller wants to deal with the events this
-     * widget receives.  The event callback is basically a preprocess
-     * hook called synchronously. The return value determines whether
-     * the event goes to the default window procedure or it is hidden
-     * to the os. The assumption is that if the event handler returns
-     * false the widget does not see the event. The widget should not 
-     * automatically clear the window to the background color. The 
-     * calling code must handle paint messages and clear the background 
-     * itself. 
-     *
-     * @param     parent or null if it's a top level window
-     * @param     aRect     the widget dimension
-     * @param     aHandleEventFunction the event handler callback function
-     * @param     aContext
-     * @param     aAppShell the parent application shell. If nsnull,
-     *                      the parent window's application shell will be used.
-     * @param     aToolkit
-     * @param     aInitData data that is used for widget initialization
-     *
-     */
-    NS_IMETHOD Create(nsIWidget        *aParent,
-                        const nsRect     &aRect,
-                        EVENT_CALLBACK   aHandleEventFunction,
-                        nsIDeviceContext *aContext,
-                        nsIAppShell      *aAppShell = nsnull,
-                        nsIToolkit       *aToolkit = nsnull,
-                        nsWidgetInitData *aInitData = nsnull) = 0;
-
-    /**
-     * Create and initialize a widget with a native window parent
-     *
-     * The widget represents a window that can be drawn into. It also is the 
-     * base class for user-interface widgets such as buttons and text boxes.
-     *
-     * All the arguments can be NULL in which case a top level window
-     * with size 0 is created. The event callback function has to be
-     * provided only if the caller wants to deal with the events this
-     * widget receives.  The event callback is basically a preprocess
-     * hook called synchronously. The return value determines whether
-     * the event goes to the default window procedure or it is hidden
-     * to the os. The assumption is that if the event handler returns
-     * false the widget does not see the event.
-     *
-     * @param     aParent   native window.
-     * @param     aRect     the widget dimension
-     * @param     aHandleEventFunction the event handler callback function
-     */
-    NS_IMETHOD Create(nsNativeWidget aParent,
-                        const nsRect     &aRect,
-                        EVENT_CALLBACK   aHandleEventFunction,
-                        nsIDeviceContext *aContext,
-                        nsIAppShell      *aAppShell = nsnull,
-                        nsIToolkit       *aToolkit = nsnull,
-                        nsWidgetInitData *aInitData = nsnull) = 0;
-
-
-    /**
-     * Accessor functions to get and set the client data associated with the
-     * widget.
-     */
-    //@{
-    NS_IMETHOD  GetClientData(void*& aClientData) = 0;
-    NS_IMETHOD  SetClientData(void* aClientData) = 0;
-    //@}
-
-    /**
-     * Close and destroy the internal native window. 
-     * This method does not delete the widget.
-     */
-
-    NS_IMETHOD Destroy(void) = 0;
-
-    /**
-     * Return the parent Widget of this Widget or nsnull if this is a 
-     * top level window
-     *
-     * @return the parent widget or nsnull if it does not have a parent
-     *
-     */
-    virtual nsIWidget* GetParent(void) = 0;
-
-    /**
-     * Return an nsEnumerator over the children of this widget.
-     *
-     * @return an enumerator over the list of children or nsnull if it does not
-     * have any children
-     *
-     */
-    virtual nsIEnumerator*  GetChildren(void) = 0;
-
-    /**
-     * Show or hide this widget
-     *
-     * @param aState PR_TRUE to show the Widget, PR_FALSE to hide it
-     *
-     */
-    NS_IMETHOD Show(PRBool aState) = 0;
-
-    /**
-     * Make the window modal
-     *
-     */
-    NS_IMETHOD SetModal(PRBool aModal) = 0;
-
-    /**
-     * Returns whether the window is visible
-     *
-     */
-    NS_IMETHOD IsVisible(PRBool & aState) = 0;
-
-    /**
-     * Move this widget.
-     *
-     * @param aX the new x position expressed in the parent's coordinate system
-     * @param aY the new y position expressed in the parent's coordinate system
-     *
-     **/
-    NS_IMETHOD Move(PRInt32 aX, PRInt32 aY) = 0;
-
-    /**
-     * Resize this widget. 
-     *
-     * @param aWidth  the new width expressed in the parent's coordinate system
-     * @param aHeight the new height expressed in the parent's coordinate system
-     * @param aRepaint whether the widget should be repainted
-     *
-     */
-    NS_IMETHOD Resize(PRInt32 aWidth,
-                      PRInt32 aHeight,
-                      PRBool   aRepaint) = 0;
-
-    /**
-     * Move or resize this widget.
-     *
-     * @param aX       the new x position expressed in the parent's coordinate system
-     * @param aY       the new y position expressed in the parent's coordinate system
-     * @param aWidth   the new width expressed in the parent's coordinate system
-     * @param aHeight  the new height expressed in the parent's coordinate system
-     * @param aRepaint whether the widget should be repainted if the size changes
-     *
-     */
-    NS_IMETHOD Resize(PRInt32 aX,
-                      PRInt32 aY,
-                      PRInt32 aWidth,
-                      PRInt32 aHeight,
-                      PRBool   aRepaint) = 0;
-
-    /**
-     * Set's the widget's z-index.
-     */
-    NS_IMETHOD SetZIndex(PRInt32 aZIndex) = 0;
-
-    /**
-     * Get's the widget's z-index. 
-     */
-    NS_IMETHOD GetZIndex(PRInt32* aZIndex) = 0;
-
-    /**
-     * Enable or disable this Widget
-     *
-     * @param aState PR_TRUE to enable the Widget, PR_FALSE to disable it.
-     *
-     */
-    NS_IMETHOD Enable(PRBool aState) = 0;
-
-    /**
-     * Give focus to this widget.
-     */
-    NS_IMETHOD SetFocus(void) = 0;
-
-    /**
-     * Get this widget's outside dimensions relative to it's parent widget
-     *
-     * @param aRect on return it holds the  x. y, width and height of this widget
-     *
-     */
-    NS_IMETHOD GetBounds(nsRect &aRect) = 0;
-  
-    
-    /**
-     * Get this widget's client area dimensions, if the window has a 3D border appearance
-     * this returns the area inside the border, The x and y are always zero
-     *
-     * @param aRect on return it holds the  x. y, width and height of the client area of this widget
-     *
-     */
-    NS_IMETHOD GetClientBounds(nsRect &aRect) = 0;
-
-    /**
-     * Gets the width and height of the borders
-     * @param aWidth the width of the border
-     * @param aHeight the height of the border
-     *
-     */
-    NS_IMETHOD GetBorderSize(PRInt32 &aWidth, PRInt32 &aHeight) = 0;
-
-    /**
-     * Get the foreground color for this widget
-     *
-     * @return this widget's foreground color
-     *
-     */
-    virtual nscolor GetForegroundColor(void) = 0;
-
-    /**
-     * Set the foreground color for this widget
-     *
-     * @param aColor the new foreground color
-     *
-     */
-
-    NS_IMETHOD SetForegroundColor(const nscolor &aColor) = 0;
-
-    /**
-     * Get the background color for this widget
-     *
-     * @return this widget's background color
-     *
-     */
-
-    virtual nscolor GetBackgroundColor(void) = 0;
-
-    /**
-     * Set the background color for this widget
-     *
-     * @param aColor the new background color
-     *
-     */
-
-    NS_IMETHOD SetBackgroundColor(const nscolor &aColor) = 0;
-
-    /**
-     * Get the font for this widget
-     *
-     * @return the font metrics 
-     */
-
-    virtual nsIFontMetrics* GetFont(void) = 0;
-
-    /**
-     * Set the font for this widget 
-     *
-     * @param aFont font to display. See nsFont for allowable fonts
-     */
-
-    NS_IMETHOD SetFont(const nsFont &aFont) = 0;
-
-    /**
-     * Get the cursor for this widget.
-     *
-     * @return this widget's cursor.
-     */
-
-    virtual nsCursor GetCursor(void) = 0;
-
-    /**
-     * Set the cursor for this widget
-     *
-     * @param aCursor the new cursor for this widget
-     */
-
-    NS_IMETHOD SetCursor(nsCursor aCursor) = 0;
-
-    /**
-     * Invalidate the widget and repaint it.
-     *
-     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-     * @see #Update()
-     */
-
-    NS_IMETHOD Invalidate(PRBool aIsSynchronous) = 0;
-
-    /**
-     * Invalidate a specified rect for a widget and repaints it.
-     *
-     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-     * @see #Update()
-     */
-
-    NS_IMETHOD Invalidate(const nsRect & aRect, PRBool aIsSynchronous) = 0;
-
-    /**
-     * Invalidate a specified region for a widget and repaints it.
-     *
-     * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-     * @see #Update()
-     */
-
-    NS_IMETHOD InvalidateRegion(const nsIRegion* aRegion, PRBool aIsSynchronous) = 0;
-
-    /**
-     * Force a synchronous repaint of the window if there are dirty rects.
-     *
-     * @see Invalidate()
-     */
-
-     NS_IMETHOD Update() = 0;
-
-    /**
-     * Adds a mouse listener to this widget
-     * Any existing mouse listener is replaced
-     *
-     * @param aListener mouse listener to add to this widget.
-     */
-
-    NS_IMETHOD AddMouseListener(nsIMouseListener * aListener) = 0;
-
-    /**
-     * Adds an event listener to this widget
-     * Any existing event listener is replaced
-     *
-     * @param aListener event listener to add to this widget.
-     */
-
-    NS_IMETHOD AddEventListener(nsIEventListener * aListener) = 0;
-
-    /**
-     * Adds a menu listener to this widget
-     * Any existing menu listener is replaced
-     *
-     * @param aListener menu listener to add to this widget.
-     */
-
-    NS_IMETHOD AddMenuListener(nsIMenuListener * aListener) = 0;
-    
-    /**
-     * Return the widget's toolkit
-     *
-     * @return the toolkit this widget was created in. See nsToolkit.
-     */
-
-    virtual nsIToolkit* GetToolkit() = 0;    
-
-    /**
-     * Set the color map for this widget
-     *
-     * @param aColorMap color map for displaying this widget
-     *
-     */
-
-    NS_IMETHOD SetColorMap(nsColorMap *aColorMap) = 0;
-
-    /**
-     * Scroll this widget.
-     *
-     * @param aDx amount to scroll along the x-axis
-     * @param aDy amount to scroll along the y-axis.
-     * @param aClipRect clipping rectangle to limit the scroll to.
-     *
-     */
-
-    NS_IMETHOD Scroll(PRInt32 aDx, PRInt32 aDy, nsRect *aClipRect) = 0;
-
-    /**
-     * Scroll an area of this widget.
-     *
-     * @param aRect source rectangle to scroll in the widget
-     * @param aDx x offset from the source
-     * @param aDy y offset from the source
-     *
-     */
-
-    NS_IMETHOD ScrollRect(nsRect &aSrcRect, PRInt32 aDx, PRInt32 aDy) = 0;
-
-    /** 
-     * Internal methods
-     */
-
-    //@{
-    virtual void AddChild(nsIWidget* aChild) = 0;
-    virtual void RemoveChild(nsIWidget* aChild) = 0;
-    virtual void* GetNativeData(PRUint32 aDataType) = 0;
-    virtual void FreeNativeData(void * data, PRUint32 aDataType) = 0;//~~~
-    virtual nsIRenderingContext* GetRenderingContext() = 0;
-    virtual nsIDeviceContext* GetDeviceContext() = 0;
-    virtual nsIAppShell *GetAppShell() = 0;
-    //@}
-
-    /**
-     * Set border style
-     * Must be called before Create.
-     * @param aBorderStyle @see nsBorderStyle
-     */
-
-    NS_IMETHOD SetBorderStyle(nsBorderStyle aBorderStyle) = 0;
-
-    /**
-     * Set the widget's title.
-     * Must be called after Create.
-     *
-     * @param aTitle string displayed as the title of the widget
-     */
-
-    NS_IMETHOD SetTitle(const nsString& aTitle) = 0;
-
-    /**
-     * Set the widget's MenuBar.
-     * Must be called after Create.
-     *
-     * @param aMenuBar the menubar
-     */
-
-    NS_IMETHOD SetMenuBar(nsIMenuBar * aMenuBar) = 0;
-
-    /**
-     * Set the widget's MenuBar's visibility
-     *
-     * @param aShow PR_TRUE to show, PR_FALSE to hide
-     */
-
-    NS_IMETHOD ShowMenuBar(PRBool aShow) = 0;
-
-     /**
-     * Convert from this widget coordinates to screen coordinates.
-     *
-     * @param  aOldRect  widget coordinates stored in the x,y members
-     * @param  aNewRect  screen coordinates stored in the x,y members
-     */
-
-    NS_IMETHOD WidgetToScreen(const nsRect& aOldRect, nsRect& aNewRect) = 0;
-
-    /**
-     * Convert from screen coordinates to this widget's coordinates.
-     *
-     * @param  aOldRect  screen coordinates stored in the x,y members
-     * @param  aNewRect  widget's coordinates stored in the x,y members
-     */
-
-    NS_IMETHOD ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect) = 0;
-
-    /**
-     * When adjustments are to made to a whole set of child widgets, call this
-     * before resizing/positioning the child windows to minimize repaints. Must
-     * be followed by EndResizingChildren() after child windows have been
-     * adjusted.
-     *
-     */
-
-    NS_IMETHOD BeginResizingChildren(void) = 0;
-
-    /**
-     * Call this when finished adjusting child windows. Must be preceded by
-     * BeginResizingChildren().
-     *
-     */
-
-    NS_IMETHOD EndResizingChildren(void) = 0;
-
-    /**
-     * Returns the preferred width and height for the widget
-     *
-     */
-    NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) = 0;
-
-    /**
-     * Set the preferred width and height for the widget
-     *
-     */
-    NS_IMETHOD SetPreferredSize(PRInt32 aWidth, PRInt32 aHeight) = 0;
-
-    /**
-     * Dispatches and event to the widget
-     *
-     */
-    NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus) = 0;
-
-
-#ifdef LOSER
-    /**
-     * FSets the vertical scrollbar widget
-     *
-     */
-    NS_IMETHOD SetVerticalScrollbar(nsIWidget * aScrollbar) = 0;
-#endif
-
-    /**
-     * For printing and lightweight widgets
-     *
-     */
-    NS_IMETHOD Paint(nsIRenderingContext& aRenderingContext,
-                     const nsRect& aDirtyRect) = 0;
-   
-    /**
-     * Enables the dropping of files to a widget (XXX this is temporary)
-     *
-     */
-    NS_IMETHOD EnableDragDrop(PRBool aEnable) = 0;
-   
-    virtual void  ConvertToDeviceCoordinates(nscoord	&aX,nscoord	&aY) = 0;
-
-    /**
-     * Enables/Disables system mouse capture.
-     * @param aCapture PR_TRUE enables mouse capture, PR_FALSE disables mouse capture 
-     *
-     */
-    NS_IMETHOD CaptureMouse(PRBool aCapture) = 0;
-
-	/**
-	 * Enables/Disables system capture of any and all events that would cause a
-	 * dropdown to be rolled up, This method ignores the aConsumeRollupEvent 
-   * parameter when aDoCapture is FALSE
-	 * @param aCapture PR_TRUE enables capture, PR_FALSE disables capture 
-	 * @param aConsumeRollupEvent PR_TRUE consumes the rollup event, PR_FALSE dispatches rollup event
-	 *
-	 */
-    NS_IMETHOD CaptureRollupEvents(nsIRollupListener * aListener, PRBool aDoCapture, PRBool aConsumeRollupEvent) = 0;
-
-  /**
-   *   Determine whether a given event should be processed assuming we are
-   * the currently active modal window.
-   *   Note that the exact semantics of this method are platform-dependent.
-   * The Macintosh, for instance, cares deeply that this method do exactly
-   * as advertised. Gtk, for instance, handles modality in a completely
-   * different fashion and does little if anything with this method.
-   * @param aRealEvent event is real or a null placeholder (Macintosh)
-   * @param aEvent void pointer to native event structure
-   * @param aForWindow return value. PR_TRUE iff event should be processed.
-   */
-  NS_IMETHOD ModalEventFilter(PRBool aRealEvent, void *aEvent, PRBool *aForWindow) = 0;
-
-};
-
-#endif // nsIWidget_h__

mozilla/widget/public/nsIWidget.idl

@@ -1,556 +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>
- *   Rod Spears <rods@netscape.com>
- *   Kevin McCluskey <kmcclusk@netscape.com>
- *   Mike Pinkerton <pinkerton@netscape.com>
- *   ... and other people
- */
-
-#include "nsISupports.idl"
-#include "nsIScriptableRegion.idl"
-#include "nsIRollupListener.idl"
-#include "nsIToolkit.idl"
-#include "nsIAppShell.idl"
-#include "nsIEnumerator.idl"
-
-%{ C++
-#include "nsRect.h"
-#include "nsColor.h"
-#include "nsIMouseListener.h"
-#include "nsIMenuListener.h"
-#include "nsIImage.h"
-
-#include "prthread.h"
-#include "nsGUIEvent.h"
-
-// forward declarations
-class   nsIAppShell;
-class   nsIToolkit;
-class   nsIRenderingContext;
-class   nsIEnumerator;
-class   nsIDeviceContext;
-struct  nsRect;
-struct  nsFont;
-class   nsIEventListener;
-class   nsIRollupListener;
-%}
-
-[ptr] native nsGUIEvent(nsGUIEvent);
-[ptr] native nsIMouseListener(nsIMouseListener);
-[ptr] native nsIEventListener(nsIEventListener);
-[ptr] native nsIMenuListener(nsIMenuListener);
-[ptr] native nsIRegion(nsIRegion);
-[ptr] native nsRect(nsRect);
-[ref] native nsRectRef(nsRect);
-[ptr] native nsFont(nsFont);
-[ptr] native nsColorMap(nsColorMap);
-
-[ptr] native nsIRenderingContext(nsIRenderingContext);
-[ptr] native nsIDeviceContext(nsIDeviceContext);
-
-native nscolor(nscolor);
-native nscoord(nscoord);
-native nsEventStatus(nsEventStatus);
-[ref] native nsEventStatusRef(nsEventStatus);
-native PR_CALLBACK(PR_CALLBACKK);
-native EVENT_CALLBACK(EVENT_CALLBACK);
-
-typedef long nsCursor;
-
-
-/*
- * Hide the native window systems real window type so as to avoid
- * including native window system types and api's. This is necessary
- * to ensure cross-platform code.
- */
-typedef voidStar nsNativeWidget;
-
-
-%{ C++
-typedef nsEventStatus (*PR_CALLBACK EVENT_CALLBACK)(nsGUIEvent *event);
-
-
-/**
- * Basic struct for widget initialization data.
- * @see Create member function of nsIWidget
- */
-
-  struct nsWidgetInitData {
-    nsWidgetInitData()
-      : clipChildren(PR_FALSE), clipSiblings(PR_FALSE)
-      //      mWindowType(eWindowType_child),
-      //      mBorderStyle(eBorderStyle_default)
-    {
-    }
-
-    // when painting exclude area occupied by child windows and sibling windows
-    PRPackedBool  clipChildren, clipSiblings;
-    //    nsWindowType mWindowType;
-    //    nsBorderStyle mBorderStyle;
-  };
-%}
-
-
-[uuid(18032AD5-B265-11d1-AA2A-000000000000)]
-interface nsIWidget : nsISupports
-{
-
-  /*
-   * Flags for GetNativeData()
-   */
-  const short NS_NATIVE_WINDOW            = 0;
-  const short NS_NATIVE_GRAPHIC           = 1;
-  const short NS_NATIVE_COLORMAP          = 2;
-  const short NS_NATIVE_WIDGET            = 3;
-  const short NS_NATIVE_DISPLAY           = 4;
-  const short NS_NATIVE_REGION            = 5;
-  const short NS_NATIVE_OFFSETX           = 6;
-  const short NS_NATIVE_OFFSETY           = 7;
-  const short NS_NATIVE_PLUGIN_PORT       = 8;
-  const short NS_NATIVE_SCREEN            = 9;
-
-
-  /**
-   * Cursor types.
-   */
-
-  //(normal cursor,       usually rendered as an arrow)
-  const long eCursor_standard            = 0;
-  //(system is busy,      usually rendered as a hourglass or watch)
-  const long eCursor_wait                = 1;
-  //(Selecting something, usually rendered as an IBeam)
-  const long eCursor_select              = 2;
-  //(can hyper-link,      usually rendered as a human hand)
-  const long eCursor_hyperlink           = 3;
-  //(west/east sizing,    usually rendered as ->||<-)
-  const long eCursor_sizeWE              = 4;
-  //(north/south sizing,  usually rendered as sizeWE rotated 90 degrees)
-  const long eCursor_sizeNS              = 5;
-  const long eCursor_arrow_north         = 6;
-  const long eCursor_arrow_north_plus    = 7;
-  const long eCursor_arrow_south         = 8;
-  const long eCursor_arrow_south_plus    = 9;
-  const long eCursor_arrow_west          = 10;
-  const long eCursor_arrow_west_plus     = 11;
-  const long eCursor_arrow_east          = 12;
-  const long eCursor_arrow_east_plus     = 13;
-  const long eCursor_crosshair           = 14;
-  //Don't know what 'move' cursor should be.  See CSS2.
-  const long eCursor_move                = 15;
-  const long eCursor_help                = 16;
-
-
-  /**
-   * initialize a widget
-   *
-   * The widget represents a window that can be drawn into. It also is the 
-   * base class for user-interface widgets such as buttons and text boxes.
-   *
-   * All the arguments can be NULL in which case a top level window
-   * with size 0 is created. The event callback function has to be
-   * provided only if the caller wants to deal with the events this
-   * widget receives.  The event callback is basically a preprocess
-   * hook called synchronously. The return value determines whether
-   * the event goes to the default window procedure or it is hidden
-   * to the os. The assumption is that if the event handler returns
-   * false the widget does not see the event. The widget should not 
-   * automatically clear the window to the background color. The 
-   * calling code must handle paint messages and clear the background 
-   * itself. 
-   *
-   * @param     aAppShell      the parent application shell. If nsnull,
-   *                           the parent window's application shell will be used.
-   * @param     aToolkit       toolkit
-   * @param     aContext       device context
-   * @param     aEventFunction the event handler callback function
-   *
-   */
-  void initWidget(in nsIAppShell      aAppShell,
-                  in nsIToolkit       aToolkit,
-                  in nsIDeviceContext aContext,
-                  in EVENT_CALLBACK   aEventFunction);
-              
-  /**
-   * Get some kind of native data
-   */
-  voidStar getNativeData(in PRUint32 aDataType);
-
-  /**
-   * Move this widget.
-   *
-   * @param aX the new x position expressed in the parent's coordinate system
-   * @param aY the new y position expressed in the parent's coordinate system
-   *
-   **/
-  void move(in PRInt32 aX, in PRInt32 aY);
-
-  /**
-   * Resize this widget. 
-   *
-   * @param aWidth  the new width expressed in the parent's coordinate system
-   * @param aHeight the new height expressed in the parent's coordinate system
-   * @param aRepaint whether the widget should be repainted
-   *
-   */
-  void resize(in PRInt32 aWidth,
-              in PRInt32 aHeight,
-              in PRBool  aRepaint);
-
-  /**
-   * Move and resize this widget.
-   *
-   * @param aX       the new x position expressed in the parent's coordinate system
-   * @param aY       the new y position expressed in the parent's coordinate system
-   * @param aWidth   the new width expressed in the parent's coordinate system
-   * @param aHeight  the new height expressed in the parent's coordinate system
-   * @param aRepaint whether the widget should be repainted if the size changes
-   *
-   */
-  void moveResize(in PRInt32 aX,
-                  in PRInt32 aY,
-                  in PRInt32 aWidth,
-                  in PRInt32 aHeight,
-                  in PRBool  aRepaint);
-
-  /**
-   * Enable or disable this Widget
-   *
-   * @param aState PR_TRUE to enable the Widget, PR_FALSE to disable it.
-   *
-   */
-  void enable(in PRBool aState);
-
-
-  // XXX GO AWAY
-
-  /**
-   * Get this widget's outside dimensions relative to it's parent widget
-   *
-   * @param aRect on return it holds the  x. y, width and height of this widget
-   *
-   */
-  //  readonly attribute nsRect Bounds;
-
-  // this is really out..
-  void getBounds(in nsRectRef aRect);
-
-
-  // XXX keep this, but make it ints
-  /**
-   * Get this widget's client area dimensions, if the window has a 3D border appearance
-   * this returns the area inside the border, The x and y are always zero
-   *
-   * @param aRect on return it holds the  x. y, width and height of the client area of this widget
-   *
-   */
-  //  readonly attribute nsRect ClientBounds;
-
-  // this is really out..
-  void getClientBounds(in nsRectRef aRect);
-
-
-
-  // Is this still used?
-  /**
-   * Returns the preferred width and height for the widget
-   *
-   */
-  void getPreferredSize(out PRInt32 aWidth,
-                        out PRInt32 aHeight);
-  
-  /**
-   * Set the preferred width and height for the widget
-   *
-   */
-  void setPreferredSize(in PRInt32 aWidth, in PRInt32 aHeight);
-
-
-
-
-  /**
-   * Invalidate the widget and repaint it.
-   *
-   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-   * @see #Update()
-   */
-  void invalidate(in PRBool aIsSynchronous);
-
-  /**
-   * Invalidate a specified rect for a widget and repaints it.
-   *
-   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-   * @see #Update()
-   */
-  void invalidateRect([const] in nsRect aRect, in PRBool aIsSynchronous);
-
-  /**
-   * Invalidate a specified rect for a widget and repaints it.
-   *
-   * @param aIsSynchronouse PR_TRUE then repaint synchronously. If PR_FALSE repaint later.
-   * @see #Update()
-   */
-  //  void InvalidateRegion([const] in nsIScriptableRegion aRegion, in PRBool aIsSynchronous);
-  void invalidateRegion([const] in nsIRegion aRegion, in PRBool aIsSynchronous);
-
-  /**
-   * Force a synchronous repaint of the window if there are dirty rects.
-   *
-   * @see Invalidate()
-   */
-  void update();
-
-
-  /**
-   * Convert from this widget coordinates to screen coordinates.
-   *
-   * @param  aOldRect  widget coordinates stored in the x,y members
-   * @param  aNewRect  screen coordinates stored in the x,y members
-   */
-  void widgetToScreen([const] in nsRect aOldRect, out nsRect aNewRect);
-
-  /**
-   * Convert from screen coordinates to this widget's coordinates.
-   *
-   * @param  aOldRect  screen coordinates stored in the x,y members
-   * @param  aNewRect  widget's coordinates stored in the x,y members
-   */
-  void screenToWidget([const] in nsRect aOldRect, out nsRect aNewRect);
-
-  // is this used?
-  void convertToDeviceCoordinates(inout nscoord aX, inout nscoord aY);
-
-
-  // can this go away?
-  /**
-   * For printing and lightweight widgets
-   *
-   */
-  void paint(in nsIRenderingContext aRenderingContext,
-             [const] in nsRect aDirtyRect);
-  
-
-
-  /**
-   * Enables the dropping of files to a widget (XXX this is temporary)
-   *
-   */
-  void enableDragDrop(in PRBool aEnable);
-
-
-
-  /**
-   * Enables/Disables system mouse capture.
-   * @param aCapture PR_TRUE enables mouse capture, PR_FALSE disables mouse capture 
-   *
-   */
-  void captureMouse(in PRBool aCapture);
-
-  /**
-   * Enables/Disables system capture of any and all events that would cause a
-   * dropdown to be rolled up, This method ignores the aConsumeRollupEvent 
-   * parameter when aDoCapture is FALSE
-   * @param aCapture PR_TRUE enables capture, PR_FALSE disables capture 
-   * @param aConsumeRollupEvent PR_TRUE consumes the rollup event, PR_FALSE dispatches rollup event
-   *
-   */
-  void captureRollupEvents(in nsIRollupListener aListener, in PRBool aDoCapture, in PRBool aConsumeRollupEvent);
-
-
-
-  /**
-   * Adds a mouse listener to this widget
-   * Any existing mouse listener is replaced
-   *
-   * @param aListener mouse listener to add to this widget.
-   */
-  void addMouseListener(in nsIMouseListener aListener);
-
-  /**
-   * Adds an event listener to this widget
-   * Any existing event listener is replaced
-   *
-   * @param aListener event listener to add to this widget.
-   */
-  void addEventListener(in nsIEventListener aListener);
-
-  /**
-   * Adds a menu listener to this widget
-   * Any existing menu listener is replaced
-   *
-   * @param aListener menu listener to add to this widget.
-   */
-  void addMenuListener(in nsIMenuListener aListener);
-
-
-  // is this an internal method?
-  /**
-   * Dispatches and event to the widget
-   *
-   */
-  void dispatchEvent(in nsGUIEvent event, in nsEventStatusRef aStatus);
-
-
-  /** 
-   * Internal methods
-   */
-  void addChild(in nsIWidget aChild);
-  void removeChild(in nsIWidget aChild);
-
-  /* ATTRIBUTES */
-
-
-  /**
-   * Device Context used to do printing... probably shouldn't be here
-   */
-  readonly attribute nsIDeviceContext deviceContext;
-
-  /* attributes */
-
-  /**
-   * Get the AppShell
-   */
-  readonly attribute nsIAppShell appShell;
-
-  /**
-   * Get the nsIToolkit
-   */
-  readonly attribute nsIToolkit toolkit;
-
-  /**
-   * callback for the event
-   */
-  [noscript] readonly attribute EVENT_CALLBACK eventFunction;
-
-
-  /* things that MUST be set AFTER the widget is created */
-
-  /**
-   * Get and Set the widget's z-index.
-   */
-  attribute PRInt32 zIndex;
-
-  /**
-   * Set/Get the foreground color for this widget
-   *
-   * @param aColor the new foreground color
-   *
-   */
-  attribute nscolor foregroundColor;
-
-  /**
-   * Set/Get the background color for this widget
-   *
-   * @param aColor the new background color
-   *
-   */
-  attribute nscolor backgroundColor;
-
-  /**
-   * Set/Get the font for this widget 
-   *
-   * @param aFont font to display. See nsFont for allowable fonts
-   */
-  attribute nsFont font;
-
-  /**
-   * Set/Get the cursor for this widget
-   *
-   * @param aCursor the new cursor for this widget
-   */
-
-  attribute nsCursor cursor;
-
-  /**
-   * Set the color map for this widget
-   *
-   * @param aColorMap color map for displaying this widget
-   *
-   */
-  attribute nsColorMap colorMap;
-
-  /**
-   * Accessor functions to get and set the client data associated with the
-   * widget.
-   */
-  attribute voidStar clientData;
-
-  /**
-   * Return an nsEnumerator over the children of this widget.
-   *
-   * @return an enumerator over the list of children or nsnull if it does not
-   * have any children
-   *
-   */
-  readonly attribute nsIEnumerator children;
-
-%{ C++
-  /* backwards compat stuff */
-  NS_IMETHOD Show(PRBool aShow) = 0;
-
-  NS_IMETHOD IsVisible(PRBool & aState) = 0;
-  NS_IMETHOD Resize(PRInt32 aX,
-                    PRInt32 aY,
-                    PRInt32 aWidth,
-                    PRInt32 aHeight,
-                    PRBool  aRepaint) = 0;
-
-  virtual nscolor GetForegroundColor(void) = 0;
-  virtual nscolor GetBackgroundColor(void) = 0;
-
-  NS_IMETHOD SetFont(const nsFont &aFont) = 0;
-  virtual nsIFontMetrics* GetFont(void) = 0;
-
-  NS_IMETHOD Invalidate(const nsRect & aRect, PRBool aIsSynchronous) = 0;
-  NS_IMETHOD SetTitle(const nsString& aTitle) = 0;
-  NS_IMETHOD GetPreferredSize(PRInt32& aWidth, PRInt32& aHeight) = 0;
-
-  virtual nsIWidget* GetParent(void) = 0;
-
-  virtual nsIEnumerator*  GetChildren(void) = 0;
-
-  virtual void* GetNativeData(PRUint32 aDataType) = 0;
-  virtual void FreeNativeData(void * data, PRUint32 aDataType) = 0;
-  virtual nsIRenderingContext* GetRenderingContext() = 0;
-  virtual nsIDeviceContext* GetDeviceContext() = 0;
-  virtual nsIAppShell *GetAppShell() = 0;
-  virtual nsIToolkit* GetToolkit() = 0;    
-
-  /* the big ugly ones */
-  NS_IMETHOD Create(nsIWidget        *aParent,
-                    const nsRect     &aRect,
-                    EVENT_CALLBACK   aHandleEventFunction,
-                    nsIDeviceContext *aContext,
-                    nsIAppShell      *aAppShell = nsnull,
-                    nsIToolkit       *aToolkit = nsnull,
-                    nsWidgetInitData *aInitData = nsnull) = 0;
-  NS_IMETHOD Create(nsNativeWidget aParent,
-                    const nsRect     &aRect,
-                    EVENT_CALLBACK   aHandleEventFunction,
-                    nsIDeviceContext *aContext,
-                    nsIAppShell      *aAppShell = nsnull,
-                    nsIToolkit       *aToolkit = nsnull,
-                    nsWidgetInitData *aInitData = nsnull) = 0;
-
-%}
-
-};
-

mozilla/widget/public/nsIWindow.idl

@@ -1,203 +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>
- *   Rod Spears <rods@netscape.com>
- *   Kevin McCluskey <kmcclusk@netscape.com>
- *   Mike Pinkerton <pinkerton@netscape.com>
- *   ... and other people
- */
-
-#include "nsISupports.idl"
-#include "nsIWidget.idl"
-
-%{ C++
-#include "nsRect.h"
-#include "nsIMouseListener.h"
-#include "nsIMenuListener.h"
-#include "nsIImage.h"
-
-#include "prthread.h"
-#include "nsGUIEvent.h"
-
-// forward declarations
-struct  nsRect;
-class   nsIMenuBar;
-%}
-
-[ptr] native nsIMenuBar(nsIMenuBar);
-
-typedef long nsBorderStyle;
-typedef long nsWindowType;
-
-
-[uuid(491359ea-1dd2-11b2-af7c-bb0346efd9b6)]
-interface nsIWindow : nsIWidget
-{
-  /*
-   * types of windows
-   */
-  const long eWindowType_toplevel = 0;
-  const long eWindowType_dialog = 1;
-  const long eWindowType_popup = 2;
-  const long eWindowType_child = 3; 
-
-  
-  /*
-   * Border styles
-   */
-  // no border, titlebar, etc.. opposite of all
-  const long eBorderStyle_none     = 0;
-
-  // all window decorations
-  const long eBorderStyle_all      = 1 << 0;
-
-  // enables the border on the window.  these are only for decoration and are not resize hadles
-  const long eBorderStyle_border   = 1 << 1;
-
-  // enables the resize handles for the window.  if this is set, border is implied to also be set
-  const long eBorderStyle_resizeh  = 1 << 2;
-
-  // enables the titlebar for the window
-  const long eBorderStyle_title    = 1 << 3;
-
-  // enables the window menu button on the title bar.  this being on should force the title bar to display
-  const long eBorderStyle_menu     = 1 << 4;
-
-  // enables the minimize button so the user can minimize the window.
-  //   turned off for tranient windows since they can not be minimized seperate from their parent
-  const long eBorderStyle_minimize = 1 << 5;
-
-  // enables the maxmize button so the user can maximize the window
-  const long eBorderStyle_maximize = 1 << 6;
-
-  // show the close button
-  const long eBorderStyle_close    = 1 << 7;
-
-  // whatever the OS wants... i.e. don't do anything
-  const long eBorderStyle_default  = -1;
-
-
-  /**
-   * initialize a window
-   *
-   * The widget represents a window that can be drawn into. It also is the 
-   * base class for user-interface widgets such as buttons and text boxes.
-   *
-   * All the arguments can be NULL in which case a top level window
-   * with size 0 is created. The event callback function has to be
-   * provided only if the caller wants to deal with the events this
-   * widget receives.  The event callback is basically a preprocess
-   * hook called synchronously. The return value determines whether
-   * the event goes to the default window procedure or it is hidden
-   * to the os. The assumption is that if the event handler returns
-   * false the widget does not see the event. The widget should not 
-   * automatically clear the window to the background color. The 
-   * calling code must handle paint messages and clear the background 
-   * itself. 
-   *
-   * @param     aWindowType    type of window to create
-   * @param     aBorderStyle   border style of the window to create
-   *
-   */
-  void initWindowStyle(in nsWindowType     aWindowType,
-                       in nsBorderStyle    aBorderStyle);
-
-  /**
-   * Make the window modal 
-   *
-   * 
-   *
-   */
-  void setModal(in boolean modal);
-
-  /**
-   * Gets the width and height of the borders
-   * @param aWidth the width of the border
-   * @param aHeight the height of the border
-   *
-   */
-  void getBorderSize(out PRInt32 aWidth, out PRInt32 aHeight);
-
-  /**
-   * Scroll this widget.
-   *
-   * @param aDx amount to scroll along the x-axis
-   * @param aDy amount to scroll along the y-axis.
-   * @param aClipRect clipping rectangle to limit the scroll to.
-   *
-   */
-  void scroll(in PRInt32 aDx, in PRInt32 aDy, in nsRect aClipRect);
-
-  /**
-   * Scroll an area of this widget.
-   *
-   * @param aRect source rectangle to scroll in the widget
-   * @param aDx x offset from the source
-   * @param aDy y offset from the source
-   *
-   */
-  void scrollRect(in nsRectRef aSrcRect, in PRInt32 aDx, in PRInt32 aDy);
-
-  /**
-   * Set the widget's MenuBar.
-   * Must be called after Create.
-   *
-   * @param aMenuBar the menubar
-   */
-  void setMenuBar(in nsIMenuBar aMenuBar);
-
-  /**
-   * Set the widget's MenuBar's visibility
-   *
-   * @param aShow PR_TRUE to show, PR_FALSE to hide
-   */
-  void showMenuBar(in PRBool aShow);
-
-  /**
-   * When adjustments are to made to a whole set of child widgets, call this
-   * before resizing/positioning the child windows to minimize repaints. Must
-   * be followed by EndResizingChildren() after child windows have been
-   * adjusted.
-   *
-   */
-  void beginResizingChildren();
-
-  /**
-   * Call this when finished adjusting child windows. Must be preceded by
-   * BeginResizingChildren().
-   *
-   */
-  void endResizingChildren();
-
-  /* ATTRIBUTES */
-
-
-  /**
-   * Window type
-   */
-  readonly attribute nsWindowType windowType;
-
-  /**
-   * Border style
-   */
-  readonly attribute nsBorderStyle borderStyle;
-
-};

mozilla/widget/public/nsRepeater.h

@@ -1,64 +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 nsRepeater_h___
-#define nsRepeater_h___
-
-#include "nscore.h"
-
-class EventRecord;
-
-class NS_BASE Repeater {
-  public:
-  
-    Repeater();
-    virtual ~Repeater();
-    
-    virtual	void RepeatAction(const EventRecord &aMacEvent) = 0;
-    
-    void StartRepeating();
-    void StopRepeating();
-    void StartIdling();
-    void StopIdling();
-    
-    static void DoRepeaters(const EventRecord &aMacEvent);
-    static void DoIdlers(const EventRecord &aMacEvent);
-    
-  protected:
-    
-    void AddToRepeatList();
-    void RemoveFromRepeatList();
-    void AddToIdleList();
-    void RemoveFromIdleList();
-    
-    static Repeater* sRepeaters;
-    static Repeater* sIdlers;
-    
-    bool mRepeating;
-    bool mIdling;
-    Repeater* mPrevRptr;
-    Repeater* mNextRptr;
-    Repeater* mPrevIdlr;
-    Repeater* mNextIdlr;
-};
-
-#endif

mozilla/widget/public/nsStringUtil.h

@@ -1,54 +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): 
- */
-
-// Convience macros for converting nsString's to chars +
-// creating temporary char[] bufs.
-
-#ifndef NS_STR_UTIL_H
-#define NS_STR_UTIL_H
-
-// nsString to temporary char[] macro
-
-// Convience MACROS to convert an nsString to a char * which use a 
-// static char array if possible to reduce memory fragmentation, 
-// otherwise they allocate a char[] which must be freed.
-// REMEMBER to always use the NS_FREE_STR_BUF after using the 
-// NS_ALLOC_STR_BUF. You can not nest NS_ALLOC_STR_BUF's. 
-
-#define NS_ALLOC_CHAR_BUF(aBuf, aSize, aActualSize) \
-  int _ns_tmpActualSize = aActualSize;              \
-  char _ns_smallBuffer[aSize];                      \
-  char * const aBuf = _ns_tmpActualSize <= aSize ? _ns_smallBuffer : new char[_ns_tmpActualSize]; 
-
-#define NS_FREE_CHAR_BUF(aBuf)   \
-  if (aBuf != _ns_smallBuffer) \
-   delete[] aBuf;
-
-#define NS_ALLOC_STR_BUF(aBuf, aStrName, aTempSize) \
-  NS_ALLOC_CHAR_BUF(aBuf, aTempSize, aStrName.Length()+1); \
-  aStrName.ToCString(aBuf, aStrName.Length()+1);
-
-#define NS_FREE_STR_BUF(aBuf)  \
-  NS_FREE_CHAR_BUF(aBuf)
-
-
-#endif  // NSStringUtil

mozilla/widget/public/nsWidgetSupport.h

@@ -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): 
- */
-
-#ifndef nsWidgetSupport_h__
-#define nsWidgetSupport_h__
-
-#include "nscore.h"
-#include "nsISupports.h"
-#include "nsIWidget.h"
-
-
-struct nsRect;
-class nsITextAreaWidget;
-class nsIFileWidget;
-class nsIAppShell;
-class nsIButton;
-class nsIComboBox;
-class nsIEventListener;
-class nsILabel;
-class nsIListBox;
-class nsIListWidget;
-class nsILookAndFeel;
-class nsIMouseListener;
-class nsIToolkit;
-class nsIWidget;
-class nsICheckButton;
-class nsIScrollbar;
-class nsIRadioButton;
-class nsITextWidget;
-class nsIBrowserWindow;
-
-// These are a series of support methods which help in the creation
-// of widgets. They are not needed, but are provided as a convenience
-// mechanism when creating widgets
-
-
-extern NS_WIDGET nsresult 
-NS_CreateButton( nsISupports* aParent, 
-								nsIButton* aButton, 
-								const nsRect& aRect, 
-								EVENT_CALLBACK aHandleEventFunction,
-								const nsFont* aFont = nsnull);
-
-extern NS_WIDGET nsresult 
-NS_CreateCheckButton( nsISupports* aParent, 
-											nsICheckButton* aCheckButton, 
-											const nsRect& aRect, 
-											EVENT_CALLBACK aHandleEventFunction,
-											const nsFont* aFont = nsnull);
-
-extern NS_WIDGET nsresult 
-NS_CreateRadioButton( nsISupports* aParent, 
-											nsIRadioButton* aButton, 
-											const nsRect& aRect, 
-											EVENT_CALLBACK aHandleEventFunction,
-											const nsFont* aFont = nsnull);
-
-extern NS_WIDGET nsresult 
-NS_CreateLabel( nsISupports* aParent,	
-                nsILabel* aLabel, 
-                const nsRect& aRect, 
-                EVENT_CALLBACK aHandleEventFunction,
-                const nsFont* aFont = nsnull);
-
-extern NS_WIDGET nsresult 
-NS_CreateTextWidget(nsISupports* aParent,	
-                    nsITextWidget* aWidget, 
-                    const nsRect& aRect, 
-                    EVENT_CALLBACK aHandleEventFunction,
-                    const nsFont* aFont = nsnull);
-
-extern NS_WIDGET nsresult 
-NS_CreateTextAreaWidget(nsISupports* aParent,	
-                    nsITextAreaWidget* aWidget, 
-                    const nsRect& aRect, 
-                    EVENT_CALLBACK aHandleEventFunction,
-                    const nsFont* aFont = nsnull);
-
-
-extern NS_WIDGET nsresult 
-NS_CreateListBox(nsISupports* aParent,	
-                      nsIListBox* aWidget, 
-                      const nsRect& aRect, 
-                      EVENT_CALLBACK aHandleEventFunction,
-                      const nsFont* aFont = nsnull);
-
-
-extern NS_WIDGET nsresult 
-NS_CreateComboBox(nsISupports* aParent,	
-                      nsIComboBox* aWidget, 
-                      const nsRect& aRect, 
-                      EVENT_CALLBACK aHandleEventFunction,
-                      const nsFont* aFont = nsnull);
-
-
-extern NS_WIDGET nsresult 
-NS_CreateScrollBar(nsISupports* aParent,	
-                      nsIScrollbar* aWidget, 
-                      const nsRect& aRect, 
-                      EVENT_CALLBACK aHandleEventFunction);
-
-
-extern NS_WIDGET nsresult 
-NS_ShowWidget(nsISupports* aWidget, PRBool aShow);
-
-extern NS_WIDGET nsresult 
-NS_MoveWidget(nsISupports* aWidget, PRUint32 aX, PRUint32 aY);
-
-extern NS_WIDGET nsresult 
-NS_EnableWidget(nsISupports* aWidget, PRBool aEnable);
-
-extern NS_WIDGET nsresult 
-NS_SetFocusToWidget(nsISupports* aWidget);
-
-extern NS_WIDGET nsresult 
-NS_GetWidgetNativeData(nsISupports* aWidget, void** aNativeData);
-
-
-
-
-
-#endif

mozilla/widget/public/nsWidgetsCID.h

@@ -1,200 +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): 
- */
-
-/* 2d96b3d0-c051-11d1-a827-0040959a28c9 */
-#define NS_WINDOW_CID \
-{ 0x2d96b3d0, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9}}
-
-/* 2d96b3d1-c051-11d1-a827-0040959a28c9 */
-#define NS_CHILD_CID \
-{ 0x2d96b3d1, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-
-/* BA7DE611-6088-11d3-A83E-00105A183419 */
-#define NS_POPUP_CID \
-{ 0xba7de611, 0x6088, 0x11d3,  \
-    { 0xa8, 0x3e, 0x0, 0x10, 0x5a, 0x18, 0x34, 0x19 } }
-
-
-/* 2d96b3d2-c051-11d1-a827-0040959a28c9 */
-#define NS_BUTTON_CID \
-{ 0x2d96b3d2, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d3-c051-11d1-a827-0040959a28c9 */
-#define NS_CHECKBUTTON_CID \
-{ 0x2d96b3d3, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d4-c051-11d1-a827-0040959a28c9 */
-#define NS_COMBOBOX_CID \
-{ 0x2d96b3d4, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d5-c051-11d1-a827-0040959a28c9 */
-#define NS_FILEWIDGET_CID \
-{ 0x2d96b3d5, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d6-c051-11d1-a827-0040959a28c9 */
-#define NS_LISTBOX_CID \
-{ 0x2d96b3d6, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d7-c051-11d1-a827-0040959a28c9 */
-#define NS_RADIOBUTTON_CID \
-{ 0x2d96b3d7, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3d9-c051-11d1-a827-0040959a28c9 */
-#define NS_HORZSCROLLBAR_CID \
-{ 0x2d96b3d9, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3da-c051-11d1-a827-0040959a28c9 */
-#define NS_VERTSCROLLBAR_CID \
-{ 0x2d96b3da, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3db-c051-11d1-a827-0040959a28c9 */
-#define NS_TEXTAREA_CID \
-{ 0x2d96b3db, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3dc-c051-11d1-a827-0040959a28c9 */
-#define NS_TEXTFIELD_CID \
-{ 0x2d96b3dc, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3df-c051-11d1-a827-0040959a28c9 */
-#define NS_APPSHELL_CID \
-{ 0x2d96b3df, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* 2d96b3e0-c051-11d1-a827-0040959a28c9 */
-#define NS_TOOLKIT_CID \
- { 0x2d96b3e0, 0xc051, 0x11d1, \
-    {0xa8, 0x27, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9} }
-
-/* XXX the following CID's are not in order. This needs
-   to be fixed. */
-
-/* 21B51DE0-21A3-11d2-B6E0-00805F8A2676 */
-#define NS_LOOKANDFEEL_CID \
-{ 0x21b51de0, 0x21a3, 0x11d2, \
-    { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } }
-
-/* 4A781D61-3D28-11d2-8DB8-00609703C14E */
-#define NS_DIALOG_CID \
-{ 0x4a781d61, 0x3d28, 0x11d2, \
-    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-/* F3131891-3DC7-11d2-8DB8-00609703C14E */
-#define NS_LABEL_CID \
-{ 0xf3131891, 0x3dc7, 0x11d2, \
-    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-//-----------------------------------------------------------
-// Menus 
-//-----------------------------------------------------------
-
-// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
-#define NS_MENUBAR_CID      \
-{ 0xbc658c81, 0x4beb, 0x11d2, \
-  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
-#define NS_MENU_CID      \
-{ 0x35a3dec1, 0x4992, 0x11d2, \
-  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-// {7F045771-4BEB-11d2-8DBB-00609703C14E}
-#define NS_MENUITEM_CID      \
-{ 0x7f045771, 0x4beb, 0x11d2, \
-  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-// {1677DAE1-04E2-11d3-B35C-00A0CC3C1CDE}
-#define NS_CONTEXTMENU_CID      \
-{ 0x1677dae1, 0x4e2, 0x11d3, \
-  { 0xb3, 0x5c, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
-
-//f58c2550-4a7c-11d2-bee2-00805f8a8dbd
-#define NS_IMAGEBUTTON_CID      \
- { 0xf58c2550, 0x4a7c, 0x11d2, \
-   {0xbe, 0xe2, 0x00, 0x80, 0x5f, 0x8a, 0x8d, 0xbd} }
-
-// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
-#define NS_POPUPMENU_CID      \
-{ 0xf6cd4f21, 0x53af, 0x11d2, \
-  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-#define NS_MENUBUTTON_CID      \
-{ 0x67b8e261, 0x53c3, 0x11d2,  \
-  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
-
-// {D3C3B8B2-55B5-11d2-9A2A-000000000000}
-#define NS_IMAGEBUTTONLISTENER_CID      \
-{ 0xd3c3b8b2, 0x55b5, 0x11d2, \
-  { 0x9a, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
-
-// {285EF9B2-094A-11d3-9A87-0050046CDA96}
-#define NS_FONTRETRIEVERSERVICE_CID \
-{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } }
-
-//-----------------------------------------------------------
-//Drag & Drop & Clipboard
-//-----------------------------------------------------------
-// {8B5314BB-DB01-11d2-96CE-0060B0FB9956}
-#define NS_DRAGSERVICE_CID      \
-{ 0x8b5314bb, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-// {8B5314BC-DB01-11d2-96CE-0060B0FB9956}
-#define NS_TRANSFERABLE_CID      \
-{ 0x8b5314bc, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-// {8B5314BA-DB01-11d2-96CE-0060B0FB9956}
-#define NS_CLIPBOARD_CID      \
-{ 0x8b5314ba, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-// {8B5314BD-DB01-11d2-96CE-0060B0FB9956}
-#define NS_DATAFLAVOR_CID      \
-{ 0x8b5314bd, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-// {948A0023-E3A7-11d2-96CF-0060B0FB9956}
-#define NS_XIFFORMATCONVERTER_CID      \
-{ 0x948a0023, 0xe3a7, 0x11d2, { 0x96, 0xcf, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-#define NS_DATAOBJ_CID \
-{ 0x1bba7640, 0xdf52, 0x11cf, { 0x82, 0x7b, 0, 0xa0, 0x24, 0x3a, 0xe5, 0x05 } }
-
-// {E93E73B1-0197-11d3-96D4-0060B0FB9956}
-#define NS_FILELISTTRANSFERABLE_CID      \
-{ 0xe93e73b1, 0x197, 0x11d3, { 0x96, 0xd4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } }
-
-//-----------------------------------------------------------
-//Other
-//-----------------------------------------------------------
-// {B148EED2-236D-11d3-B35C-00A0CC3C1CDE}
-#define NS_SOUND_CID \
-{ 0xb148eed2, 0x236d, 0x11d3, { 0xb3, 0x5c, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }

mozilla/widget/src/Makefile.in

@@ -1,62 +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
-
-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		+= 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/beos/Makefile.in

@@ -1,75 +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_beos
-
-REQUIRES	= util img xpcom raptor netlib
-
-CPPSRCS		= \
-		nsAppShell.cpp \
-		nsButton.cpp \
-		nsCheckButton.cpp \
-		nsClipboard.cpp \
-		nsComboBox.cpp \
-		nsDragService.cpp \
-		nsFileWidget.cpp \
-		nsFontRetrieverService.cpp \
-		nsFontSizeIterator.cpp \
-		nsLabel.cpp \
-		nsListBox.cpp \
-		nsLookAndFeel.cpp \
-		nsMenu.cpp \
-		nsMenuBar.cpp \
-		nsMenuItem.cpp \
-		nsObject.cpp \
-		nsPopUpMenu.cpp \
-		nsRadioButton.cpp \
-		nsScrollbar.cpp \
-		nsSound.cpp \
-		nsTextAreaWidget.cpp \
-		nsTextHelper.cpp \
-		nsTextWidget.cpp \
-		nsToolkit.cpp \
-		nsWidgetFactory.cpp \
-		nsWindow.cpp \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libraptorbasewidget_s.a
-
-EXTRA_DSO_LDOPTS = \
-		$(TOOLKIT_DSO_LDOPTS) \
-		$(MKSHLIB_FORCE_ALL) \
-		$(SHARED_LIBRARY_LIBS) \
-		$(MKSHLIB_UNFORCE_ALL) \
-		$(TK_LIBS) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_WIDGET -I$(srcdir)/../xpwidgets -I$(srcdir)
-
-CXXFLAGS	+= $(TK_CFLAGS)
-
-$(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile
-

mozilla/widget/src/beos/nsAppShell.cpp

@@ -1,332 +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.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 "nsAppShell.h"
-#include "nsIEventQueueService.h"
-#include "nsIServiceManager.h"
-#include "nsIWidget.h"
-#include "nsIAppShell.h"
-#include "nsWindow.h"
-#include "nsSwitchToUIThread.h"
-#include "plevent.h"
-
-#include <stdlib.h>
-#include <AppKit.h>
-#include <AppFileInfo.h>
-
-struct ThreadInterfaceData
-{
-	void	*data;
-	int32	sync;
-};
-
-static sem_id my_find_sem(const char *name)
-{
-	sem_id	ret = B_ERROR;
-
-	/* Get the sem_info for every sempahore in this team. */
-	sem_info info;
-	int32 cookie = 0;
-
-	while(get_next_sem_info(0, &cookie, &info) == B_OK)
-		if(strcmp(name, info.name) == 0)
-		{
-			ret = info.sem;
-			break;
-		}
-
-	return ret;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsISupports implementation macro
-//
-//-------------------------------------------------------------------------
-NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID);
-NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-NS_IMPL_ISUPPORTS(nsAppShell,kIAppShellIID);
-
-static bool GetAppSig(char *sig)
-{
-	app_info 		appInfo;
-	BFile 			file;
-	BAppFileInfo	appFileInfo;
-	image_info		info;
-	int32			cookie = 0;
-	*sig = 0;
-	return get_next_image_info(0, &cookie, &info) == B_OK &&
-		file.SetTo(info.name, B_READ_ONLY) == B_OK &&
-		appFileInfo.SetTo(&file) == B_OK &&
-		appFileInfo.GetSignature(sig) == B_OK;
-}
-
-class nsBeOSApp : public BApplication
-{
-	sem_id	init;
-public:
-	nsBeOSApp(const char *signature, sem_id initsem);
-	virtual void ReadyToRun(void);
-};
-
-nsBeOSApp::nsBeOSApp(const char *signature, sem_id initsem)
- : BApplication(signature), init(initsem)
-{
-}
-
-void nsBeOSApp::ReadyToRun(void)
-{
-	release_sem(init);
-}
-
-int32 bapp_thread(void *arg)
-{
-	// create and start BApplication
-	char	sig[B_MIME_TYPE_LENGTH + 1];
-	GetAppSig(sig);
-	nsBeOSApp	*app = new nsBeOSApp(sig, (sem_id)arg);
-	app->Run();
-	return 0;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell constructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::nsAppShell()  
-{ 
-  NS_INIT_REFCNT();
-  mDispatchListener = 0;
-
-	sem_id initsem = create_sem(0, "bapp init");
-	resume_thread(spawn_thread(bapp_thread, "BApplication", B_NORMAL_PRIORITY, (void *)initsem));
-	acquire_sem(initsem);
-	delete_sem(initsem);
-}
-
-
-//-------------------------------------------------------------------------
-//
-// Create the application shell
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsAppShell::Create(int* argc, char ** argv)
-{
-	// system wide unique names
-	// NOTE: this needs to be run from within the main application thread
-	char		portname[64];
-	char		semname[64];
-	sprintf(portname, "event%lx", PR_GetCurrentThread());
-	sprintf(semname, "sync%lx", PR_GetCurrentThread());
-
-	if((eventport = find_port(portname)) < 0)
-	{
-		// we're here first
-		eventport = create_port(100, portname);
-		syncsem = create_sem(0, semname);
-	}
-	else
-	{
-		// the PLEventQueue stuff (in plevent.c) created the queue before we started
-		syncsem = my_find_sem(semname);
-	}
-
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-NS_METHOD nsAppShell::SetDispatchListener(nsDispatchListener* aDispatchListener) 
-{
-  mDispatchListener = aDispatchListener;
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Enter a message handler loop
-//
-//-------------------------------------------------------------------------
-
-nsresult nsAppShell::Run()
-{
-	int32				code;
-	ThreadInterfaceData	id;
-
-	NS_ADDREF_THIS();
-
-	while(read_port(eventport, &code, &id, sizeof(id)) >= 0)
-	{
-		switch(code)
-		{
-			case 'WMti' :
-				extern void nsTimerExpired(void *);	// hack: this is in gfx
-				nsTimerExpired(id.data);
-				break;
-
-			case WM_CALLMETHOD :
-				{
-				MethodInfo *mInfo = (MethodInfo *)id.data;
-				mInfo->Invoke();
-				if(! id.sync)
-					delete mInfo;
-				}
-				break;
-
-			case 'natv' :	// native queue PLEvent
-				{
-				PREventQueue *queue = (PREventQueue *)id.data;
-				PR_ProcessPendingEvents(queue);
-				}
-				break;
-
-			default :
-				printf("nsAppShell::Run - UNKNOWN EVENT\n");
-				break;
-		}
-
-		if(mDispatchListener)
-			mDispatchListener->AfterDispatch();
-
-		if(id.sync)
-			release_sem(syncsem);
-	}
-
-	Release();
-
-	return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Exit a message handler loop
-//
-//-------------------------------------------------------------------------
-
-NS_METHOD nsAppShell::Exit()
-{
-	// interrupt message flow
-	close_port(eventport);
-
-	return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// nsAppShell destructor
-//
-//-------------------------------------------------------------------------
-nsAppShell::~nsAppShell()
-{
-	if(be_app->Lock())
-		be_app->Quit();
-}
-
-//-------------------------------------------------------------------------
-//
-// GetNativeData
-//
-//-------------------------------------------------------------------------
-void* nsAppShell::GetNativeData(PRUint32 aDataType)
-{
-  if (aDataType == NS_NATIVE_SHELL) {
-    return NULL;
-  }
-  return nsnull;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spinup - do any preparation necessary for running a message loop
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsAppShell::Spinup()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// Spindown - do any cleanup necessary for finishing a message loop
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsAppShell::Spindown()
-{
-  return NS_OK;
-}
-
-//-------------------------------------------------------------------------
-//
-// PushThreadEventQueue - begin processing events from a new queue
-//   note this is the Windows implementation and may suffice, but
-//   this is untested on beos.
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsAppShell::PushThreadEventQueue()
-{
-  nsresult rv;
-
-  // push a nested event queue for event processing from netlib
-  // onto our UI thread queue stack.
-  NS_WITH_SERVICE(nsIEventQueueService, eQueueService, kEventQueueServiceCID, &rv);
-  if (NS_SUCCEEDED(rv))
-    rv = eQueueService->PushThreadEventQueue();
-  else
-    NS_ERROR("Appshell unable to obtain eventqueue service.");
-  return rv;
-}
-
-//-------------------------------------------------------------------------
-//
-// PopThreadEventQueue - stop processing on a previously pushed event queue
-//   note this is the Windows implementation and may suffice, but
-//   this is untested on beos.
-//
-//-------------------------------------------------------------------------
-NS_METHOD nsAppShell::PopThreadEventQueue()
-{
-  nsresult rv;
-
-  NS_WITH_SERVICE(nsIEventQueueService, eQueueService, kEventQueueServiceCID, &rv);
-  if (NS_SUCCEEDED(rv))
-    rv = eQueueService->PopThreadEventQueue();
-  else
-    NS_ERROR("Appshell unable to obtain eventqueue service.");
-  return rv;
-}
-
-NS_METHOD nsAppShell::GetNativeEvent(PRBool &aRealEvent, void *&aEvent)
-{
-	printf("nsAppShell::GetNativeEvent - FIXME: not implemented\n");
-	return NS_OK;
-}
-
-NS_METHOD nsAppShell::DispatchNativeEvent(PRBool aRealEvent, void *aEvent)
-{
-	printf("nsAppShell::DispatchNativeEvent - FIXME: not implemented\n");
-	return NS_OK;
-}
-
-NS_METHOD nsAppShell::EventIsForModalWindow(PRBool aRealEvent, void *aEvent, nsIWidget *aWidget, PRBool *aForWindow)
-{
-	printf("nsAppShell::EventIsForModalWindow - FIXME: not implemented\n");
-	*aForWindow = PR_FALSE;
-	return NS_OK;
-}
-

mozilla/widget/src/beos/nsAppShell.h

@@ -1,60 +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.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 nsAppShell_h__
-#define nsAppShell_h__
-
-#include "nsObject.h"
-#include "nsIAppShell.h"
-#include <OS.h>
-
-/**
- * Native BeOS Application shell wrapper
- */
-
-class nsAppShell : public nsIAppShell
-{
-  public:
-                            nsAppShell(); 
-    virtual                 ~nsAppShell();
-
-    NS_DECL_ISUPPORTS
-
-    // nsIAppShellInterface
-  
-    NS_IMETHOD            Create(int* argc, char ** argv);
-    virtual nsresult      Run(); 
-    NS_IMETHOD          Spinup();
-    NS_IMETHOD          Spindown();
-    NS_IMETHOD          PushThreadEventQueue();
-    NS_IMETHOD          PopThreadEventQueue();
-    NS_IMETHOD          GetNativeEvent(PRBool &aRealEvent, void *&aEvent);
-    NS_IMETHOD          DispatchNativeEvent(PRBool aRealEvent, void * aEvent);
-    NS_IMETHOD          EventIsForModalWindow(PRBool aRealEvent, void *aEvent,
-                          nsIWidget *aWidget, PRBool *aForWindow);
-    NS_IMETHOD		Exit();
-    NS_IMETHOD		SetDispatchListener(nsDispatchListener* aDispatchListener);
-    virtual void*	GetNativeData(PRUint32 aDataType);
-
-  private:
-    nsDispatchListener	*mDispatchListener;
-	port_id					eventport;
-	sem_id					syncsem;
-};
-
-#endif // nsAppShell_h__