update to use ns_quicksort so that this branch builds

git-svn-id: svn://10.0.0.236/branches/FAST-GTK-GFX@31772 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/gfx/src/gtk/Makefile.in

@@ -0,0 +1,53 @@
+#!gmake
+#
+# 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
+
+include $(topsrcdir)/config/config.mk
+
+LIBRARY_NAME = gfxgtk
+
+MODULE=raptor 
+
+REQUIRES=util img xpcom raptor netlib ps
+
+DEFINES += -D_IMPL_NS_GFXONXP 
+CXXFLAGS += $(TK_CFLAGS)
+INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
+
+CPPSRCS = \
+	nsDrawingSurfaceGTK.cpp \
+	nsDeviceContextGTK.cpp \
+	nsDeviceContextSpecFactoryG.cpp \
+	nsDeviceContextSpecG.cpp \
+	nsFontMetricsGTK.cpp \
+	nsGfxFactoryGTK.cpp \
+	nsRenderingContextGTK.cpp \
+	nsImageGTK.cpp \
+	nsRegionGTK.cpp 
+
+CSRCS = \
+	nsPrintdGTK.c
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/gfx/src/gtk/nsDeviceContextGTK.cpp

@@ -0,0 +1,375 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <math.h>
+
+#include "nspr.h"
+#include "il_util.h"
+
+#include "nsDeviceContextGTK.h"
+#include "nsGfxCIID.h"
+
+#include "../ps/nsDeviceContextPS.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define NS_TO_GDK_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
+
+#define GDK_COLOR_TO_NS_RGB(c) \
+  ((nscolor) NS_RGB(c.red, c.green, c.blue))
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID);
+
+nsDeviceContextGTK::nsDeviceContextGTK()
+{
+  NS_INIT_REFCNT();
+  mTwipsToPixels = 1.0;
+  mPixelsToTwips = 1.0;
+  mDepth = 0 ;
+  mPaletteInfo.isPaletteDevice = PR_FALSE;
+  mPaletteInfo.sizePalette = 0;
+  mPaletteInfo.numReserved = 0;
+  mPaletteInfo.palette = NULL;
+  mNumCells = 0;
+}
+
+nsDeviceContextGTK::~nsDeviceContextGTK()
+{
+}
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextGTK, kDeviceContextIID)
+NS_IMPL_ADDREF(nsDeviceContextGTK)
+NS_IMPL_RELEASE(nsDeviceContextGTK)
+
+NS_IMETHODIMP nsDeviceContextGTK::Init(nsNativeWidget aNativeWidget)
+{
+  GdkVisual *vis;
+  GtkRequisition req;
+  GtkWidget *sb;
+
+  mWidget = aNativeWidget;
+
+  // Compute dpi of display
+  float screenWidth = float(::gdk_screen_width());
+  float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f;
+  nscoord dpi = nscoord(screenWidth / screenWidthIn);
+
+  // Now for some wacky heuristics. 
+  if (dpi < 84) dpi = 72;
+  else if (dpi < 108) dpi = 96;
+  else if (dpi < 132) dpi = 120;
+
+  mTwipsToPixels = float(dpi) / float(NSIntPointsToTwips(72));
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+
+#if 0
+  mTwipsToPixels = ( ((float)::gdk_screen_width()) /
+                     ((float)::gdk_screen_width_mm()) * 25.4) /
+		     (float)NSIntPointsToTwips(72);
+
+  mPixelsToTwips = 1.0f / mTwipsToPixels;
+#endif
+
+  vis = gdk_rgb_get_visual();
+  mDepth = vis->depth;
+
+  sb = gtk_vscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarWidth = req.width;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+  
+  sb = gtk_hscrollbar_new(NULL);
+  gtk_widget_ref(sb);
+  gtk_object_sink(GTK_OBJECT(sb));
+  gtk_widget_size_request(sb,&req);
+  mScrollbarHeight = req.height;
+  gtk_widget_destroy(sb);
+  gtk_widget_unref(sb);
+
+#ifdef DEBUG
+  static PRBool once = PR_TRUE;
+  if (once) {
+    printf("GFX: dpi=%d t2p=%g p2t=%g depth=%d\n", dpi, mTwipsToPixels, mPixelsToTwips,mDepth);
+    once = PR_FALSE;
+  }
+#endif
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::CreateRenderingContext(nsIRenderingContext *&aContext)
+{
+  nsIRenderingContext *pContext;
+  nsresult             rv;
+  nsDrawingSurfaceGTK  *surf;
+
+  // to call init for this, we need to have a valid nsDrawingSurfaceGTK created
+  pContext = new nsRenderingContextGTK();
+
+  if (nsnull != pContext)
+  {
+    NS_ADDREF(pContext);
+
+    // create the nsDrawingSurfaceGTK
+    surf = new nsDrawingSurfaceGTK();
+
+    if (nsnull != surf)
+      {
+        GdkDrawable *win = nsnull;
+        // FIXME
+        if (GTK_IS_LAYOUT((GtkWidget*)mWidget))
+          win = (GdkDrawable*)gdk_window_ref(GTK_LAYOUT((GtkWidget*)mWidget)->bin_window);
+        else
+          win = (GdkDrawable*)gdk_window_ref(((GtkWidget*)mWidget)->window);
+
+        GdkGC *gc = gdk_gc_new(win);
+
+        // init the nsDrawingSurfaceGTK
+        rv = surf->Init(win,gc);
+
+        if (NS_OK == rv)
+          // Init the nsRenderingContextGTK
+          rv = pContext->Init(this, surf);
+      }
+    else
+      rv = NS_ERROR_OUT_OF_MEMORY;
+  }
+  else
+    rv = NS_ERROR_OUT_OF_MEMORY;
+
+  if (NS_OK != rv)
+  {
+    NS_IF_RELEASE(pContext);
+  }
+
+  aContext = pContext;
+
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::SupportsNativeWidgets(PRBool &aSupportsWidgets)
+{
+  //XXX it is very critical that this not lie!! MMP
+  // read the comments in the mac code for this
+  aSupportsWidgets = PR_TRUE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetScrollBarDimensions(float &aWidth, float &aHeight) const
+{
+  aWidth = mScrollbarWidth * mPixelsToTwips;
+  aHeight = mScrollbarHeight * mPixelsToTwips;
+ 
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const
+{
+  nsresult status = NS_OK;
+  GtkStyle *style = gtk_style_new();  // get the default styles
+
+  switch (anID) {
+    //---------
+    // Colors
+    //---------
+    case eSystemAttr_Color_WindowBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WindowForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_WidgetSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_WidgetSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_Widget3DHighlight:
+        *aInfo->mColor = NS_RGB(0xa0,0xa0,0xa0);
+        break;
+    case eSystemAttr_Color_Widget3DShadow:
+        *aInfo->mColor = NS_RGB(0x40,0x40,0x40);
+        break;
+    case eSystemAttr_Color_TextBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextForeground: 
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_NORMAL]);
+        break;
+    case eSystemAttr_Color_TextSelectBackground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->bg[GTK_STATE_SELECTED]);
+        break;
+    case eSystemAttr_Color_TextSelectForeground:
+        *aInfo->mColor = GDK_COLOR_TO_NS_RGB(style->text[GTK_STATE_SELECTED]);
+        break;
+    //---------
+    // Size
+    //---------
+    case eSystemAttr_Size_ScrollbarHeight:
+        aInfo->mSize = mScrollbarHeight;
+        break;
+    case eSystemAttr_Size_ScrollbarWidth: 
+        aInfo->mSize = mScrollbarWidth;
+        break;
+    case eSystemAttr_Size_WindowTitleHeight:
+        aInfo->mSize = 0;
+        break;
+    case eSystemAttr_Size_WindowBorderWidth:
+        aInfo->mSize = style->klass->xthickness;
+        break;
+    case eSystemAttr_Size_WindowBorderHeight:
+        aInfo->mSize = style->klass->ythickness;
+        break;
+    case eSystemAttr_Size_Widget3DBorder:
+        aInfo->mSize = 4;
+        break;
+    //---------
+    // Fonts
+    //---------
+    case eSystemAttr_Font_Caption:
+    case eSystemAttr_Font_Icon:
+    case eSystemAttr_Font_Menu:
+    case eSystemAttr_Font_MessageBox:
+    case eSystemAttr_Font_SmallCaption:
+    case eSystemAttr_Font_StatusBar:
+    case eSystemAttr_Font_Tooltips:
+    case eSystemAttr_Font_Widget:
+      status = NS_ERROR_FAILURE;
+      break;
+  } // switch
+
+  gtk_style_unref(style);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDrawingSurface(nsIRenderingContext &aContext, 
+                                                    nsDrawingSurface &aSurface)
+{
+  aContext.CreateDrawingSurface(nsnull, 0, aSurface);
+  return nsnull == aSurface ? NS_ERROR_OUT_OF_MEMORY : NS_OK;  
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::ConvertPixel(nscolor aColor, 
+                                               PRUint32 & aPixel)
+{
+  aPixel = ::gdk_rgb_xpixel_from_rgb (NS_TO_GDK_RGB(aColor));
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsDeviceContextGTK::CheckFontExistence(const nsString& aFontName)
+{
+  char        **fnames = nsnull;
+  PRInt32     namelen = aFontName.Length() + 1;
+  char        *wildstring = (char *)PR_Malloc(namelen + 200);
+  float       t2d;
+  GetTwipsToDevUnits(t2d);
+  PRInt32     dpi = NSToIntRound(t2d * 1440);
+  int         numnames = 0;
+  XFontStruct *fonts;
+  nsresult    rv = NS_ERROR_FAILURE;
+  
+  if (nsnull == wildstring)
+    return NS_ERROR_UNEXPECTED;
+  
+  if (abs(dpi - 75) < abs(dpi - 100))
+    dpi = 75;
+  else
+    dpi = 100;
+  
+  char* fontName = aFontName.ToNewCString();
+  PR_snprintf(wildstring, namelen + 200,
+             "*-%s-*-*-normal--*-*-%d-%d-*-*-*",
+             fontName, dpi, dpi);
+  delete [] fontName;
+  
+  fnames = ::XListFontsWithInfo(GDK_DISPLAY(), wildstring, 1, &numnames, &fonts);
+  
+  if (numnames > 0)
+  {
+    ::XFreeFontInfo(fnames, fonts, numnames);
+    rv = NS_OK;
+  }
+  
+  PR_Free(wildstring);
+  
+  return rv;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight)
+{
+  aWidth = 1;
+  aHeight = 1;
+
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                                      nsIDeviceContext *&aContext)
+{
+  // Create a Postscript device context 
+  aContext = new nsDeviceContextPS();
+  ((nsDeviceContextPS *)aContext)->SetSpec(aDevice);
+  NS_ADDREF(aDevice);
+  return((nsDeviceContextPS *) aContext)->Init((nsIDeviceContext*)aContext, (nsIDeviceContext*)this);
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndDocument(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::BeginPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::EndPage(void)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextGTK::GetDepth(PRUint32& aDepth)
+{
+  GdkVisual * rgb_visual = gdk_rgb_get_visual();
+
+  gint rgb_depth = rgb_visual->depth;
+
+  aDepth = (PRUint32) rgb_depth;
+
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsDeviceContextGTK.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextGTK_h___
+#define nsDeviceContextGTK_h___
+
+#include "nsDeviceContext.h"
+#include "nsUnitConversion.h"
+#include "nsIWidget.h"
+#include "nsIView.h"
+#include "nsIRenderingContext.h"
+
+#include "nsRenderingContextGTK.h"
+
+class nsDeviceContextGTK : public DeviceContextImpl
+{
+public:
+  nsDeviceContextGTK();
+  virtual ~nsDeviceContextGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(nsNativeWidget aNativeWidget);
+
+  NS_IMETHOD  CreateRenderingContext(nsIRenderingContext *&aContext);
+  NS_IMETHOD  SupportsNativeWidgets(PRBool &aSupportsWidgets);
+
+  NS_IMETHOD  GetScrollBarDimensions(float &aWidth, float &aHeight) const;
+  NS_IMETHOD  GetSystemAttribute(nsSystemAttrID anID, SystemAttrStruct * aInfo) const;
+
+  //get a low level drawing surface for rendering. the rendering context
+  //that is passed in is used to create the drawing surface if there isn't
+  //already one in the device context. the drawing surface is then cached
+  //in the device context for re-use.
+
+  NS_IMETHOD GetDrawingSurface(nsIRenderingContext &aContext, nsDrawingSurface &aSurface);
+
+  NS_IMETHOD ConvertPixel(nscolor aColor, PRUint32 & aPixel);
+  NS_IMETHOD CheckFontExistence(const nsString& aFontName);
+
+  NS_IMETHOD GetDeviceSurfaceDimensions(PRInt32 &aWidth, PRInt32 &aHeight);
+
+  NS_IMETHOD GetDeviceContextFor(nsIDeviceContextSpec *aDevice,
+                                 nsIDeviceContext *&aContext);
+
+  NS_IMETHOD BeginDocument(void);
+  NS_IMETHOD EndDocument(void);
+
+  NS_IMETHOD BeginPage(void);
+  NS_IMETHOD EndPage(void);
+
+  NS_IMETHOD GetDepth(PRUint32& aDepth);
+
+private:
+  PRUint32      mDepth;
+  PRBool        mWriteable;
+  nsPaletteInfo mPaletteInfo;
+  PRUint32 mNumCells;
+  PRInt16 mScrollbarHeight;
+  PRInt16 mScrollbarWidth;
+};
+
+#endif /* nsDeviceContextGTK_h___ */
+

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.cpp

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecFactoryG.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsGfxCIID.h"
+#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Constructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: nsDeviceContextSpecFactoryGTK()
+{
+}
+
+/** -------------------------------------------------------
+ *  Destructor
+ *  @update   dc 2/16/98
+ */
+nsDeviceContextSpecFactoryGTK :: ~nsDeviceContextSpecFactoryGTK()
+{
+}
+
+static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
+
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryGTK, kDeviceContextSpecFactoryIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecFactoryGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecFactoryGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the device context spec factory
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: Init(void)
+{
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ *  Get a device context specification
+ *  @update   dc 2/16/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecFactoryGTK :: CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                                                       nsIDeviceContextSpec *&aNewSpec,
+                                                                       PRBool aQuiet)
+{
+nsresult  						rv = NS_ERROR_FAILURE;
+nsIDeviceContextSpec  *devSpec = nsnull;
+
+	nsComponentManager::CreateInstance(kDeviceContextSpecCID, nsnull, kIDeviceContextSpecIID, (void **)&devSpec);
+
+	if (nsnull != devSpec){
+	  if (NS_OK == ((nsDeviceContextSpecGTK *)devSpec)->Init(aQuiet)){
+	    aNewSpec = devSpec;
+	    rv = NS_OK;
+	  }
+	}
+	return rv;
+}

mozilla/gfx/src/gtk/nsDeviceContextSpecFactoryG.h

@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecFactoryG_h___
+#define nsDeviceContextSpecFactoryG_h___
+
+#include "nsIDeviceContextSpecFactory.h"
+#include "nsIDeviceContextSpec.h"
+
+class nsDeviceContextSpecFactoryGTK : public nsIDeviceContextSpecFactory
+{
+public:
+  nsDeviceContextSpecFactoryGTK();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(void);
+  NS_IMETHOD CreateDeviceContextSpec(nsIDeviceContextSpec *aOldSpec,
+                                     nsIDeviceContextSpec *&aNewSpec,
+                                     PRBool aQuiet);
+
+protected:
+  virtual ~nsDeviceContextSpecFactoryGTK();
+};
+
+#endif

mozilla/gfx/src/gtk/nsDeviceContextSpecG.cpp

@@ -0,0 +1,197 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsDeviceContextSpecG.h"
+#include "prenv.h" /* for PR_GetEnv */
+
+//#include "prmem.h"
+//#include "plstr.h"
+
+/** -------------------------------------------------------
+ *  Construct the nsDeviceContextSpecGTK
+ *  @update   dc 12/02/98
+ */
+nsDeviceContextSpecGTK :: nsDeviceContextSpecGTK()
+{
+  NS_INIT_REFCNT();
+	
+}
+
+/** -------------------------------------------------------
+ *  Destroy the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ */
+nsDeviceContextSpecGTK :: ~nsDeviceContextSpecGTK()
+{
+}
+
+static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
+static NS_DEFINE_IID(kIDeviceContextSpecPSIID, NS_IDEVICE_CONTEXT_SPEC_PS_IID);
+
+#if 0
+NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecGTK, kDeviceContextSpecIID)
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+#endif
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDeviceContextSpecIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDeviceContextSpecPSIID))
+  {
+    nsIDeviceContextSpecPS* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDeviceContextSpec* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDeviceContextSpecGTK)
+NS_IMPL_RELEASE(nsDeviceContextSpecGTK)
+
+/** -------------------------------------------------------
+ *  Initialize the nsDeviceContextSpecGTK
+ *  @update   dc 2/15/98
+ *  @update   syd 3/2/99
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: Init(PRBool	aQuiet)
+{
+  char *path;
+
+  // XXX these settings should eventually come out of preferences 
+
+  mPrData.toPrinter = PR_TRUE;
+  mPrData.fpf = PR_TRUE;
+  mPrData.grayscale = PR_FALSE;
+  mPrData.size = NS_LETTER_SIZE;
+  sprintf( mPrData.command, "lpr" );
+
+  // PWD, HOME, or fail 
+
+  if ( ( path = PR_GetEnv( "PWD" ) ) == (char *) NULL ) 
+	if ( ( path = PR_GetEnv( "HOME" ) ) == (char *) NULL )
+  		strcpy( mPrData.path, "netscape.ps" );
+  if ( path != (char *) NULL )
+	sprintf( mPrData.path, "%s/netscape.ps", path );
+  else
+	return NS_ERROR_FAILURE;
+
+  ::UnixPrDialog( &mPrData );
+  if ( mPrData.cancel == PR_TRUE ) 
+	return NS_ERROR_FAILURE;
+  else
+        return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetToPrinter( PRBool &aToPrinter )     
+{
+  aToPrinter = mPrData.toPrinter;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetFirstPageFirst ( PRBool &aFpf )      
+{
+  aFpf = mPrData.fpf;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetGrayscale ( PRBool &aGrayscale )      
+{
+  aGrayscale = mPrData.grayscale;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetSize ( int &aSize )      
+{
+  aSize = mPrData.size;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetTopMargin ( float &value )      
+{
+  value = mPrData.top;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetBottomMargin ( float &value )      
+{
+  value = mPrData.bottom;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetRightMargin ( float &value )      
+{
+  value = mPrData.right;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetLeftMargin ( float &value )      
+{
+  value = mPrData.left;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetCommand ( char **aCommand )      
+{
+  *aCommand = &mPrData.command[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetPath ( char **aPath )      
+{
+  *aPath = &mPrData.path[0];
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDeviceContextSpecGTK :: GetUserCancelled( PRBool &aCancel )     
+{
+  aCancel = mPrData.cancel;
+  return NS_OK;
+}
+
+/** -------------------------------------------------------
+ * Closes the printmanager if it is open.
+ *  @update   dc 2/15/98
+ */
+NS_IMETHODIMP nsDeviceContextSpecGTK :: ClosePrintManager()
+{
+	return NS_OK;
+}  

mozilla/gfx/src/gtk/nsDeviceContextSpecG.h

@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDeviceContextSpecG_h___
+#define nsDeviceContextSpecG_h___
+
+#include "nsIDeviceContextSpec.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsIDeviceContextSpecPS.h"
+
+#include "nsPrintdGTK.h"
+
+class nsDeviceContextSpecGTK : public nsIDeviceContextSpec ,
+                                      public nsIDeviceContextSpecPS
+{
+public:
+/**
+ * Construct a nsDeviceContextSpecMac, which is an object which contains and manages a mac printrecord
+ * @update  dc 12/02/98
+ */
+  nsDeviceContextSpecGTK();
+
+  NS_DECL_ISUPPORTS
+
+/**
+ * Initialize the nsDeviceContextSpecMac for use.  This will allocate a printrecord for use
+ * @update   dc 2/16/98
+ * @param aQuiet if PR_TRUE, prevent the need for user intervention
+ *        in obtaining device context spec. if nsnull is passed in for
+ *        the aOldSpec, this will typically result in getting a device
+ *        context spec for the default output device (i.e. default
+ *        printer).
+ * @return error status
+ */
+  NS_IMETHOD Init(PRBool	aQuiet);
+  
+  
+/**
+ * Closes the printmanager if it is open.
+ * @update   dc 2/13/98
+ * @update   syd 3/20/99
+ * @return error status
+ */
+
+  NS_IMETHOD ClosePrintManager();
+
+  NS_IMETHOD GetToPrinter( PRBool &aToPrinter ); 
+
+  NS_IMETHOD GetFirstPageFirst ( PRBool &aFpf );     
+
+  NS_IMETHOD GetGrayscale( PRBool &aGrayscale );   
+
+  NS_IMETHOD GetSize ( int &aSize ); 
+
+  NS_IMETHOD GetTopMargin ( float &value ); 
+
+  NS_IMETHOD GetBottomMargin ( float &value ); 
+
+  NS_IMETHOD GetLeftMargin ( float &value ); 
+
+  NS_IMETHOD GetRightMargin ( float &value ); 
+
+  NS_IMETHOD GetCommand ( char **aCommand );   
+
+  NS_IMETHOD GetPath ( char **aPath );    
+
+  NS_IMETHOD GetUserCancelled( PRBool &aCancel );      
+
+protected:
+/**
+ * Destuct a nsDeviceContextSpecMac, this will release the printrecord
+ * @update  dc 2/16/98
+ */
+  virtual ~nsDeviceContextSpecGTK();
+
+protected:
+
+  UnixPrData mPrData;
+	
+};
+
+#endif

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.cpp

@@ -0,0 +1,367 @@
+/* -*- 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.
+ */
+
+#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
+#define USE_SHM
+#endif
+
+//#define USE_SHM
+
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
+#ifdef USE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+#endif /* USE_SHM */
+#include "nsDrawingSurfaceGTK.h"
+
+static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID);
+static NS_DEFINE_IID(kIDrawingSurfaceGTKIID, NS_IDRAWING_SURFACE_GTK_IID);
+
+nsDrawingSurfaceGTK :: nsDrawingSurfaceGTK()
+{
+  NS_INIT_REFCNT();
+  GdkVisual *v;
+
+  mPixmap = nsnull;
+  mGC = nsnull;
+  mDepth = 0;
+  mWidth = mHeight = 0;
+  mFlags = 0;
+
+  mImage = nsnull;
+  mLockWidth = mLockHeight = 0;
+  mLockFlags = 0;
+  mLocked = PR_FALSE;
+
+  v = ::gdk_rgb_get_visual();
+
+  mPixFormat.mRedMask = v->red_mask;
+  mPixFormat.mGreenMask = v->green_mask;
+  mPixFormat.mBlueMask = v->blue_mask;
+  // FIXME
+  mPixFormat.mAlphaMask = 0;
+
+  mPixFormat.mRedShift = v->red_shift;
+  mPixFormat.mGreenShift = v->green_shift;
+  mPixFormat.mBlueShift = v->blue_shift;
+  // FIXME
+  mPixFormat.mAlphaShift = 0;
+
+  mDepth = v->depth;
+}
+
+nsDrawingSurfaceGTK :: ~nsDrawingSurfaceGTK()
+{
+  if (mPixmap)
+    ::gdk_pixmap_unref(mPixmap);
+
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: QueryInterface(REFNSIID aIID, void** aInstancePtr)
+{
+  if (nsnull == aInstancePtr)
+    return NS_ERROR_NULL_POINTER;
+
+  if (aIID.Equals(kIDrawingSurfaceIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  if (aIID.Equals(kIDrawingSurfaceGTKIID))
+  {
+    nsDrawingSurfaceGTK* tmp = this;
+    *aInstancePtr = (void*) tmp;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+  if (aIID.Equals(kISupportsIID))
+  {
+    nsIDrawingSurface* tmp = this;
+    nsISupports* tmp2 = tmp;
+    *aInstancePtr = (void*) tmp2;
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsDrawingSurfaceGTK);
+NS_IMPL_RELEASE(nsDrawingSurfaceGTK);
+
+
+  /**
+   * Lock a rect of a drawing surface and return a
+   * pointer to the upper left hand corner of the
+   * bitmap.
+   * @param  aX x position of subrect of bitmap
+   * @param  aY y position of subrect of bitmap
+   * @param  aWidth width of subrect of bitmap
+   * @param  aHeight height of subrect of bitmap
+   * @param  aBits out parameter for upper left hand
+   *         corner of bitmap
+   * @param  aStride out parameter for number of bytes
+   *         to add to aBits to go from scanline to scanline
+   * @param  aWidthBytes out parameter for number of
+   *         bytes per line in aBits to process aWidth pixels
+   * @return error status
+   *
+   **/
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Lock(PRInt32 aX, PRInt32 aY,
+                                          PRUint32 aWidth, PRUint32 aHeight,
+                                          void **aBits, PRInt32 *aStride,
+                                          PRInt32 *aWidthBytes, PRUint32 aFlags)
+{
+#if 0
+  g_print("nsDrawingSurfaceGTK::Lock() called\n" \
+          "  aX = %i, aY = %i,\n" \
+	  "  aWidth = %i, aHeight = %i,\n" \
+	  "  aBits, aStride, aWidthBytes,\n" \
+	  "  aFlags = %i\n", aX, aY, aWidth, aHeight, aFlags);
+#endif
+
+  if (mLocked)
+  {
+    NS_ASSERTION(0, "nested lock attempt");
+    return NS_ERROR_FAILURE;
+  }
+  mLocked = PR_TRUE;
+
+  mLockX = aX;
+  mLockY = aY;
+  mLockWidth = aWidth;
+  mLockHeight = aHeight;
+  mLockFlags = aFlags;
+
+  // Obtain an ximage from the pixmap.
+#ifdef USE_SHM
+  if (gdk_get_use_xshm())
+  {
+    mImage = gdk_image_new(GDK_IMAGE_FASTEST,
+                           gdk_rgb_get_visual(),
+                           mLockWidth,
+                           mLockHeight);
+    
+    XShmGetImage(GDK_DISPLAY(),
+                 GDK_WINDOW_XWINDOW(mPixmap),
+                 GDK_IMAGE_XIMAGE(mImage),
+                 mLockX, mLockY,
+                 0xFFFFFFFF);
+
+    gdk_flush();
+  }
+  else
+  {
+#endif /* USE_SHM */
+    mImage = ::gdk_image_get(mPixmap, mLockX, mLockY, mLockWidth, mLockHeight);
+#ifdef USE_SHM
+  }
+#endif /* USE_SHM */
+
+  *aBits = GDK_IMAGE_XIMAGE(mImage)->data;
+
+  *aWidthBytes = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+  *aStride = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+
+#if 0
+  int bytes_per_line = GDK_IMAGE_XIMAGE(mImage)->bytes_per_line;
+
+  //
+  // All this code is a an attempt to set the stride width properly.
+  // Needs to be cleaned up alot.  For now, it will only work in the
+  // case where aWidthBytes and aStride are the same.  One is assigned to 
+  // the other.
+  // 
+
+  *aWidthBytes = mImage->bpl;
+  *aStride = mImage->bpl;
+
+  int width_in_pixels = *aWidthBytes << 8;
+
+
+  int bitmap_pad = GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+  int depth = GDK_IMAGE_XIMAGE(mImage)->depth;
+
+#define RASWIDTH8(width, bpp) (width)
+#define RASWIDTH16(width, bpp) ((((width) * (bpp) + 15) >> 4) << 1)
+#define RASWIDTH32(width, bpp) ((((width) * (bpp) + 31) >> 5) << 2)
+
+  switch(bitmap_pad)
+    {
+    case 8:
+      *aStride = RASWIDTH8(aWidth,bitmap_pad);
+      break;
+
+    case 16:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH16(aWidth,bitmap_pad);
+      break;
+
+    case 32:
+      *aStride = bytes_per_line;
+      *aStride = RASWIDTH32(aWidth,bitmap_pad);
+      break;
+
+    default:
+
+      NS_ASSERTION(nsnull,"something got screwed");
+
+    }
+
+  *aStride = (*aWidthBytes) + ((bitmap_pad >> 3) - 1);
+
+  GDK_IMAGE_XIMAGE(mImage)->bitmap_pad;
+
+  *aWidthBytes = mImage->bpl;
+#endif
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Unlock(void)
+{
+  //  g_print("nsDrawingSurfaceGTK::UnLock() called\n");
+  if (!mLocked)
+  {
+    NS_ASSERTION(0, "attempting to unlock an DS that isn't locked");
+    return NS_ERROR_FAILURE;
+  }
+
+  // If the lock was not read only, put the bits back on the pixmap
+  if (!(mLockFlags & NS_LOCK_SURFACE_READ_ONLY))
+  {
+#if 0
+    g_print("gdk_draw_image(pixmap=%p,lockx=%d,locky=%d,lockw=%d,lockh=%d)\n",
+            mPixmap,
+            mLockX, mLockY,
+            mLockWidth, mLockHeight);
+#endif
+
+    gdk_draw_image(mPixmap,
+                   mGC,
+                   mImage,
+                   0, 0,
+                   mLockX, mLockY,
+                   mLockWidth, mLockHeight);
+
+  }
+
+  // FIXME if we are using shared mem, we shouldn't destroy the image...
+  if (mImage)
+    ::gdk_image_destroy(mImage);
+  mImage = nsnull;
+
+  mLocked = PR_FALSE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight)
+{
+  *aWidth = mWidth;
+  *aHeight = mHeight;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsOffscreen(PRBool *aOffScreen)
+{
+  *aOffScreen = mIsOffscreen;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: IsPixelAddressable(PRBool *aAddressable)
+{
+// FIXME
+  *aAddressable = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetPixelFormat(nsPixelFormat *aFormat)
+{
+  *aFormat = mPixFormat;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkDrawable *aDrawable, GdkGC *aGC)
+{
+  mGC = aGC;
+  mPixmap = aDrawable;
+// this is definatly going to be on the screen, as it will be the window of a
+// widget or something.
+  mIsOffscreen = PR_FALSE;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: Init(GdkGC *aGC, PRUint32 aWidth,
+                                          PRUint32 aHeight, PRUint32 aFlags)
+{
+//  ::g_return_val_if_fail (aGC != nsnull, NS_ERROR_FAILURE);
+//  ::g_return_val_if_fail ((aWidth > 0) && (aHeight > 0), NS_ERROR_FAILURE);
+
+  mGC = aGC;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mFlags = aFlags;
+
+// we can draw on this offscreen because it has no parent
+  mIsOffscreen = PR_TRUE;
+
+  mPixmap = ::gdk_pixmap_new(nsnull, mWidth, mHeight, mDepth);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: GetGC(GdkGC *aGC)
+{
+  aGC = ::gdk_gc_ref(mGC);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsDrawingSurfaceGTK :: ReleaseGC(void)
+{
+  ::gdk_gc_unref(mGC);
+  return NS_OK;
+}
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+GdkGC *nsDrawingSurfaceGTK::GetGC(void)
+{
+  return mGC;
+}
+
+GdkDrawable *nsDrawingSurfaceGTK::GetDrawable(void)
+{
+  return mPixmap;
+}
+

mozilla/gfx/src/gtk/nsDrawingSurfaceGTK.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsDrawingSurfaceGTK_h___
+#define nsDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include "nsIDrawingSurfaceGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsDrawingSurfaceGTK : public nsIDrawingSurface,
+                            public nsIDrawingSurfaceGTK
+{
+public:
+  nsDrawingSurfaceGTK();
+  virtual ~nsDrawingSurfaceGTK();
+
+  NS_DECL_ISUPPORTS
+
+  //nsIDrawingSurface interface
+
+  NS_IMETHOD Lock(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                  void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                  PRUint32 aFlags);
+  NS_IMETHOD Unlock(void);
+  NS_IMETHOD GetDimensions(PRUint32 *aWidth, PRUint32 *aHeight);
+  NS_IMETHOD IsOffscreen(PRBool *aOffScreen);
+  NS_IMETHOD IsPixelAddressable(PRBool *aAddressable);
+  NS_IMETHOD GetPixelFormat(nsPixelFormat *aFormat);
+
+  //nsIDrawingSurfaceGTK interface
+
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC);
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight, PRUint32 aFlags);
+
+/* get the GC and manage the GdkGC's refcount */
+  NS_IMETHOD GetGC(GdkGC *aGC);
+  NS_IMETHOD ReleaseGC(void);
+
+/* below are utility functions used mostly for nsRenderingContext and nsImage
+ * to plug into gdk_* functions for drawing.  You should not set a pointer
+ * that might hang around with the return from these.  instead use the ones
+ * above.  pav
+ */
+  GdkGC *GetGC(void);
+  GdkDrawable *GetDrawable(void);
+
+private:
+  /* general */
+  GdkPixmap	*mPixmap;
+  GdkGC		*mGC;
+  gint		mDepth;
+  nsPixelFormat	mPixFormat;
+  PRUint32      mWidth;
+  PRUint32      mHeight;
+  PRUint32	mFlags;
+  PRBool	mIsOffscreen;
+
+  /* for locks */
+  GdkImage	*mImage;
+  PRInt32	mLockX;
+  PRInt32	mLockY;
+  PRUint32	mLockWidth;
+  PRUint32	mLockHeight;
+  PRUint32	mLockFlags;
+  PRBool	mLocked;
+};
+
+#endif

mozilla/gfx/src/gtk/nsFontMetricsGTK.h

@@ -0,0 +1,162 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsFontMetricsGTK_h__
+#define nsFontMetricsGTK_h__
+
+#include "nsIFontMetrics.h"
+#include "nsFont.h"
+#include "nsString.h"
+#include "nsUnitConversion.h"
+#include "nsIDeviceContext.h"
+#include "nsCRT.h"
+#include "nsDeviceContextGTK.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+
+#define FONT_SWITCHING
+#ifdef FONT_SWITCHING
+
+#ifdef ADD_GLYPH
+#undef ADD_GLYPH
+#endif
+#define ADD_GLYPH(map, g) (map)[(g) >> 3] |= (1 << ((g) & 7))
+
+#ifdef FONT_HAS_GLYPH
+#undef FONT_HAS_GLYPH
+#endif
+#define FONT_HAS_GLYPH(map, g) (((map)[(g) >> 3] >> ((g) & 7)) & 1)
+
+typedef struct nsFontCharSetInfo nsFontCharSetInfo;
+
+typedef gint (*nsFontCharSetConverter)(nsFontCharSetInfo* aSelf,
+  const PRUnichar* aSrcBuf, PRUint32 aSrcLen, PRUint8* aDestBuf,
+  PRUint32 aDestLen);
+
+struct nsFontCharSet;
+class nsFontMetricsGTK;
+
+struct nsFontGTK
+{
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  void LoadFont(nsFontCharSet* aCharSet, nsFontMetricsGTK* aMetrics);
+
+  GdkFont*               mFont;
+  PRUint8*               mMap;
+  nsFontCharSetInfo*     mCharSetInfo;
+  char*                  mName;
+  PRUint16               mSize;
+  PRUint16               mActualSize;
+  PRInt16                mBaselineAdjust;
+};
+
+struct nsFontStretch;
+struct nsFontFamily;
+typedef struct nsFontSearch nsFontSearch;
+
+#endif /* FONT_SWITCHING */
+
+class nsFontMetricsGTK : public nsIFontMetrics
+{
+public:
+  nsFontMetricsGTK();
+  virtual ~nsFontMetricsGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD  Init(const nsFont& aFont, nsIDeviceContext* aContext);
+  NS_IMETHOD  Destroy();
+
+  NS_IMETHOD  GetXHeight(nscoord& aResult);
+  NS_IMETHOD  GetSuperscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetSubscriptOffset(nscoord& aResult);
+  NS_IMETHOD  GetStrikeout(nscoord& aOffset, nscoord& aSize);
+  NS_IMETHOD  GetUnderline(nscoord& aOffset, nscoord& aSize);
+
+  NS_IMETHOD  GetHeight(nscoord &aHeight);
+  NS_IMETHOD  GetLeading(nscoord &aLeading);
+  NS_IMETHOD  GetMaxAscent(nscoord &aAscent);
+  NS_IMETHOD  GetMaxDescent(nscoord &aDescent);
+  NS_IMETHOD  GetMaxAdvance(nscoord &aAdvance);
+  NS_IMETHOD  GetFont(const nsFont *&aFont);
+  NS_IMETHOD  GetFontHandle(nsFontHandle &aHandle);
+
+#ifdef FONT_SWITCHING
+
+  nsFontGTK*  FindFont(PRUnichar aChar);
+  static gint GetWidth(nsFontGTK* aFont, const PRUnichar* aString,
+                       PRUint32 aLength);
+  static void DrawString(nsDrawingSurfaceGTK* aSurface, nsFontGTK* aFont,
+                         nscoord aX, nscoord aY, const PRUnichar* aString,
+			 PRUint32 aLength);
+  static void InitFonts(void);
+
+  friend void PickASizeAndLoad(nsFontSearch* aSearch, nsFontStretch* aStretch,
+                               nsFontCharSet* aCharSet);
+  friend void TryCharSet(nsFontSearch* aSearch, nsFontCharSet* aCharSet);
+  friend void TryFamily(nsFontSearch* aSearch, nsFontFamily* aFamily);
+  friend struct nsFontGTK;
+
+  nsFontGTK   **mLoadedFonts;
+  PRUint16    mLoadedFontsAlloc;
+  PRUint16    mLoadedFontsCount;
+
+  nsString    *mFonts;
+  PRUint16    mFontsAlloc;
+  PRUint16    mFontsCount;
+  PRUint16    mFontsIndex;
+
+#endif /* FONT_SWITCHING */
+
+protected:
+  char *PickAppropriateSize(char **names, XFontStruct *fonts, int cnt, nscoord desired);
+  void RealizeFont();
+
+  nsIDeviceContext    *mDeviceContext;
+  nsFont              *mFont;
+  GdkFont             *mFontHandle;
+
+  nscoord             mHeight;
+  nscoord             mAscent;
+  nscoord             mDescent;
+  nscoord             mLeading;
+  nscoord             mMaxAscent;
+  nscoord             mMaxDescent;
+  nscoord             mMaxAdvance;
+  nscoord             mXHeight;
+  nscoord             mSuperscriptOffset;
+  nscoord             mSubscriptOffset;
+  nscoord             mStrikeoutSize;
+  nscoord             mStrikeoutOffset;
+  nscoord             mUnderlineSize;
+  nscoord             mUnderlineOffset;
+
+#ifdef FONT_SWITCHING
+
+  PRUint16            mPixelSize;
+  PRUint8             mStretchIndex;
+  PRUint8             mStyleIndex;
+
+#endif /* FONT_SWITCHING */
+};
+
+#endif

mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp

@@ -0,0 +1,205 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsGfxCIID.h"
+#include "nsFontMetricsGTK.h"
+#include "nsRenderingContextGTK.h"
+#include "nsImageGTK.h"
+#include "nsDeviceContextGTK.h"
+#include "nsRegionGTK.h"
+#include "nsBlender.h"
+#include "nsDeviceContextSpecG.h"
+#include "nsDeviceContextSpecFactoryG.h" 
+#include "nsIDeviceContextSpecPS.h"
+
+static NS_DEFINE_IID(kCFontMetrics, NS_FONT_METRICS_CID);
+static NS_DEFINE_IID(kCRenderingContext, NS_RENDERING_CONTEXT_CID);
+static NS_DEFINE_IID(kCImage, NS_IMAGE_CID);
+static NS_DEFINE_IID(kCDeviceContext, NS_DEVICE_CONTEXT_CID);
+static NS_DEFINE_IID(kCRegion, NS_REGION_CID);
+
+static NS_DEFINE_IID(kCBlender, NS_BLENDER_CID);
+
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+
+static NS_DEFINE_IID(kCDeviceContextSpec, NS_DEVICE_CONTEXT_SPEC_CID);
+static NS_DEFINE_IID(kCDeviceContextSpecFactory, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); 
+
+
+class nsGfxFactoryGTK : public nsIFactory
+{   
+  public:   
+    // nsISupports methods   
+    NS_IMETHOD QueryInterface(const nsIID &aIID,    
+                                       void **aResult);   
+    NS_IMETHOD_(nsrefcnt) AddRef(void);   
+    NS_IMETHOD_(nsrefcnt) Release(void);   
+
+    // nsIFactory methods   
+    NS_IMETHOD CreateInstance(nsISupports *aOuter,   
+                                       const nsIID &aIID,   
+                                       void **aResult);   
+
+    NS_IMETHOD LockFactory(PRBool aLock);   
+
+    nsGfxFactoryGTK(const nsCID &aClass);   
+    virtual ~nsGfxFactoryGTK();   
+
+  private:   
+    nsrefcnt  mRefCnt;   
+    nsCID     mClassID;
+};   
+
+nsGfxFactoryGTK::nsGfxFactoryGTK(const nsCID &aClass)   
+{   
+  mRefCnt = 0;
+  mClassID = aClass;
+}   
+
+nsGfxFactoryGTK::~nsGfxFactoryGTK()   
+{   
+  NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");   
+}   
+
+nsresult nsGfxFactoryGTK::QueryInterface(const nsIID &aIID,   
+                                         void **aResult)   
+{   
+  if (aResult == NULL) {   
+    return NS_ERROR_NULL_POINTER;   
+  }   
+
+  // Always NULL result, in case of failure   
+  *aResult = NULL;   
+
+  if (aIID.Equals(kISupportsIID)) {   
+    *aResult = (void *)(nsISupports*)this;   
+  } else if (aIID.Equals(kIFactoryIID)) {   
+    *aResult = (void *)(nsIFactory*)this;   
+  }   
+
+  if (*aResult == NULL) {   
+    return NS_NOINTERFACE;   
+  }   
+
+  AddRef(); // Increase reference count for caller   
+  return NS_OK;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::AddRef()   
+{   
+  return ++mRefCnt;   
+}   
+
+nsrefcnt nsGfxFactoryGTK::Release()   
+{   
+  if (--mRefCnt == 0) {   
+    delete this;   
+    return 0; // Don't access mRefCnt after deleting!   
+  }   
+  return mRefCnt;   
+}  
+
+nsresult nsGfxFactoryGTK::CreateInstance(nsISupports *aOuter,  
+                                          const nsIID &aIID,  
+                                          void **aResult)  
+{  
+  if (aResult == NULL) {  
+    return NS_ERROR_NULL_POINTER;  
+  }  
+
+  *aResult = NULL;  
+  
+  nsISupports *inst = nsnull;
+
+  if (mClassID.Equals(kCFontMetrics)) {
+    inst = (nsISupports *)new nsFontMetricsGTK();
+  }
+  else if (mClassID.Equals(kCDeviceContext)) {
+    inst = (nsISupports *)new nsDeviceContextGTK();
+  }
+  else if (mClassID.Equals(kCRenderingContext)) {
+    inst = (nsISupports *)new nsRenderingContextGTK();
+  }
+  else if (mClassID.Equals(kCImage)) {
+    inst = (nsISupports *)new nsImageGTK();
+  }
+  else if (mClassID.Equals(kCRegion)) {
+    inst = (nsISupports *)new nsRegionGTK();
+  }
+  else if (mClassID.Equals(kCBlender)) {
+    inst = (nsISupports *)new nsBlender;
+  }
+  else if (mClassID.Equals(kCDeviceContextSpec)) {
+    nsDeviceContextSpecGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecGTK);
+    inst = (nsISupports *)((nsIDeviceContextSpecPS *)dcs);
+  }
+  else if (mClassID.Equals(kCDeviceContextSpecFactory)) {
+    nsDeviceContextSpecFactoryGTK* dcs;
+    NS_NEWXPCOM(dcs, nsDeviceContextSpecFactoryGTK);
+    inst = (nsISupports *)dcs;
+  }          
+	
+  if (inst == NULL) {  
+    return NS_ERROR_OUT_OF_MEMORY;  
+  }  
+
+  nsresult res = inst->QueryInterface(aIID, aResult);
+
+  if (res != NS_OK) {  
+    // We didn't get the right interface, so clean up  
+    delete inst;  
+  }  
+//  else {
+//    inst->Release();
+//  }
+
+  return res;  
+}  
+
+nsresult nsGfxFactoryGTK::LockFactory(PRBool aLock)  
+{  
+  // Not implemented in simplest case.  
+  return NS_OK;
+}  
+
+// return the proper factory to the caller
+extern "C" NS_GFXNONXP nsresult NSGetFactory(nsISupports* servMgr,
+                                             const nsCID &aClass,
+                                             const char *aClassName,
+                                             const char *aProgID,
+                                             nsIFactory **aFactory)
+{
+  if (nsnull == aFactory) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  *aFactory = new nsGfxFactoryGTK(aClass);
+
+  if (nsnull == aFactory) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return (*aFactory)->QueryInterface(kIFactoryIID, (void**)aFactory);
+}

mozilla/gfx/src/gtk/nsIDrawingSurfaceGTK.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsIDrawingSurfaceGTK_h___
+#define nsIDrawingSurfaceGTK_h___
+
+#include "nsIDrawingSurface.h"
+#include <gtk/gtk.h>
+
+// windows specific drawing surface method set
+
+#define NS_IDRAWING_SURFACE_GTK_IID   \
+{ 0x1ed958b0, 0xcab6, 0x11d2, \
+{ 0xa8, 0x49, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
+
+class nsIDrawingSurfaceGTK : public nsISupports
+{
+public:
+  /**
+   * Initialize a drawing surface using a windows DC.
+   * aDC is "owned" by the drawing surface until the drawing
+   * surface is destroyed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkDrawable *aDrawable, GdkGC *aGC) = 0;
+
+  /**
+   * Initialize an offscreen drawing surface using a
+   * windows DC. aDC is not "owned" by this drawing surface, instead
+   * it is used to create a drawing surface compatible
+   * with aDC. if width or height are less than zero, aDC will
+   * be created with no offscreen bitmap installed.
+   * @param  aDC HDC to initialize drawing surface with
+   * @param  aWidth width of drawing surface
+   * @param  aHeight height of drawing surface
+   * @param  aFlags flags used to control type of drawing
+   *         surface created
+   * @return error status
+   **/
+  NS_IMETHOD Init(GdkGC *aGC, PRUint32 aWidth, PRUint32 aHeight,
+                  PRUint32 aFlags) = 0;
+
+  /**
+   * Get a windows DC that represents the drawing surface.
+   * GetDC() must be paired with ReleaseDC(). Getting a DC
+   * and Lock()ing are mutually exclusive operations.
+   * @param  aDC out parameter for HDC
+   * @return error status
+   **/
+  NS_IMETHOD GetGC(GdkGC *aGC) = 0;
+
+  /**
+   * Release a windows DC obtained by GetDC().
+   * ReleaseDC() must be preceded by a call to ReleaseDC().
+   * @return error status
+   **/
+  NS_IMETHOD ReleaseGC(void) = 0;
+
+};
+
+#endif  // nsIDrawingSurfaceGTK_h___ 

mozilla/gfx/src/gtk/nsImageGTK.cpp

@@ -0,0 +1,515 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "nsImageGTK.h"
+#include "nsRenderingContextGTK.h"
+
+#include "nspr.h"
+
+#define IsFlagSet(a,b) (a & b)
+
+#undef CHEAP_PERFORMANCE_MEASURMENT
+
+
+// Defining this will trace the allocation of images.  This includes
+// ctor, dtor and update.
+#undef TRACE_IMAGE_ALLOCATION
+
+static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID);
+
+//------------------------------------------------------------
+
+nsImageGTK::nsImageGTK()
+{
+  NS_INIT_REFCNT();
+  mImageBits = nsnull;
+  mWidth = 0;
+  mHeight = 0;
+  mDepth = 0;
+  mAlphaBits = nsnull;
+  mAlphaPixmap = nsnull;
+  mImagePixmap = nsnull;
+  mGC = nsnull;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+//------------------------------------------------------------
+
+nsImageGTK::~nsImageGTK()
+{
+  if(nsnull != mImageBits) {
+    delete[] (PRUint8*)mImageBits;
+    mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (nsnull != mGC) {
+    gdk_gc_unref(mGC);
+    mGC = nsnull;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::~nsImageGTK(this=%p)\n",
+         this);
+#endif
+}
+
+NS_IMPL_ISUPPORTS(nsImageGTK, kIImageIID);
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Init(PRInt32 aWidth, PRInt32 aHeight,
+                          PRInt32 aDepth, nsMaskRequirements aMaskRequirements)
+{
+  g_return_val_if_fail ((aWidth != 0) || (aHeight != 0), NS_ERROR_FAILURE);
+
+  if (nsnull != mImageBits) {
+   delete[] (PRUint8*)mImageBits;
+   mImageBits = nsnull;
+  }
+
+  if (nsnull != mAlphaBits) {
+    delete[] (PRUint8*)mAlphaBits;
+    mAlphaBits = nsnull;
+  }
+
+  if (nsnull != mAlphaPixmap) {
+    gdk_pixmap_unref(mAlphaPixmap);
+    mAlphaPixmap = nsnull;
+  }
+
+  if (nsnull != mImagePixmap) {
+    gdk_pixmap_unref(mImagePixmap);
+    mImagePixmap = nsnull;
+  }
+
+  if (24 == aDepth) {
+    mNumBytesPixel = 3;
+  } else {
+    NS_ASSERTION(PR_FALSE, "unexpected image depth");
+    return NS_ERROR_UNEXPECTED;
+  }
+
+  mImageUpdated = PR_TRUE;
+  mWidth = aWidth;
+  mHeight = aHeight;
+  mDepth = aDepth;
+  mIsTopToBottom = PR_TRUE;
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Init(this=%p,%d,%d,%d,%d)\n",
+         this,
+         aWidth,
+         aHeight,
+         aDepth,
+         aMaskRequirements);
+#endif
+
+  // create the memory for the image
+  ComputMetrics();
+
+  mImageBits = (PRUint8*) new PRUint8[mSizeImage];
+
+  switch(aMaskRequirements)
+  {
+    case nsMaskRequirements_kNoMask:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      break;
+
+    case nsMaskRequirements_kNeeds1Bit:
+      mAlphaRowBytes = (aWidth + 7) / 8;
+      mAlphaDepth = 1;
+
+      // 32-bit align each row
+      mAlphaRowBytes = (mAlphaRowBytes + 3) & ~0x3;
+
+      mAlphaBits = new PRUint8[mAlphaRowBytes * aHeight];
+      mAlphaWidth = aWidth;
+      mAlphaHeight = aHeight;
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+
+    case nsMaskRequirements_kNeeds8Bit:
+      mAlphaBits = nsnull;
+      mAlphaWidth = 0;
+      mAlphaHeight = 0;
+      mAlphaDepth = 8;
+      g_print("TODO: want an 8bit mask for an image..\n");
+
+      mAlphaPixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                    mAlphaDepth);
+      break;
+  }
+
+
+  mImagePixmap = gdk_pixmap_new(nsnull, aWidth, aHeight,
+                                gdk_rgb_get_visual()->depth);
+  mGC = gdk_gc_new(mImagePixmap);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+PRInt32 nsImageGTK::CalcBytesSpan(PRUint32  aWidth)
+{
+  PRInt32 spanbytes;
+
+  spanbytes = (aWidth * mDepth) >> 5;
+
+  if (((PRUint32)aWidth * mDepth) & 0x1F)
+    spanbytes++;
+  spanbytes <<= 2;
+  return(spanbytes);
+}
+
+void nsImageGTK::ComputMetrics()
+{
+  mRowBytes = CalcBytesSpan(mWidth);
+  mSizeImage = mRowBytes * mHeight;
+}
+
+PRInt32 nsImageGTK::GetHeight()
+{
+  return mHeight;
+}
+
+PRInt32 nsImageGTK::GetWidth()
+{
+  return mWidth;
+}
+
+PRUint8 *nsImageGTK::GetBits()
+{
+  return mImageBits;
+}
+
+void *nsImageGTK::GetBitInfo()
+{
+  return nsnull;
+}
+
+PRInt32 nsImageGTK::GetLineStride()
+{
+  return mRowBytes;
+}
+
+nsColorMap *nsImageGTK::GetColorMap()
+{
+  return nsnull;
+}
+
+PRBool nsImageGTK::IsOptimized()
+{
+  return PR_TRUE;
+}
+
+PRUint8 *nsImageGTK::GetAlphaBits()
+{
+  return mAlphaBits;
+}
+
+PRInt32 nsImageGTK::GetAlphaWidth()
+{
+  return mAlphaWidth;
+}
+
+PRInt32 nsImageGTK::GetAlphaHeight()
+{
+  return mAlphaHeight;
+}
+
+PRInt32 nsImageGTK::GetAlphaLineStride()
+{
+  return mAlphaRowBytes;
+}
+
+nsIImage *nsImageGTK::DuplicateImage()
+{
+  return nsnull;
+}
+
+void nsImageGTK::SetAlphaLevel(PRInt32 aAlphaLevel)
+{
+}
+
+PRInt32 nsImageGTK::GetAlphaLevel()
+{
+  return 0;
+}
+
+void nsImageGTK::MoveAlphaMask(PRInt32 aX, PRInt32 aY)
+{
+}
+
+//------------------------------------------------------------
+
+// set up the palette to the passed in color array, RGB only in this array
+void nsImageGTK::ImageUpdated(nsIDeviceContext *aContext,
+                              PRUint8 aFlags,
+                              nsRect *aUpdateRect)
+{
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::ImageUpdated(this=%p,%d)\n",
+         this,
+         aFlags);
+#endif
+
+  if (IsFlagSet(nsImageUpdateFlags_kBitsChanged, aFlags)) {
+    mImageUpdated = PR_TRUE;
+    // FIXME do something with aUpdateRect
+  }
+}
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+static PRTime gConvertTime, gStartTime, gPixmapTime, gEndTime;
+#endif
+
+// Draw the bitmap, this method has a source and destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurface,
+                 PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                 PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+  nsDrawingSurfaceGTK *drawing = (nsDrawingSurfaceGTK*)aSurface;
+
+  if (mAlphaBits)
+    g_print("calling nsImageGTK::Draw() with alpha bits\n");
+
+  gdk_draw_rgb_image (drawing->GetDrawable(),
+                      mGC,
+                      aDX, aDY, aDWidth, aDHeight,
+                      GDK_RGB_DITHER_MAX,
+                      mImageBits + mRowBytes * aSY + 3 * aDX,
+                      mRowBytes);
+
+  return NS_OK;
+}
+
+//------------------------------------------------------------
+
+// Draw the bitmap, this draw just has destination coordinates
+NS_IMETHODIMP
+nsImageGTK::Draw(nsIRenderingContext &aContext,
+                 nsDrawingSurface aSurface,
+                 PRInt32 aX, PRInt32 aY,
+                 PRInt32 aWidth, PRInt32 aHeight)
+{
+  g_return_val_if_fail ((aSurface != nsnull), NS_ERROR_FAILURE);
+
+
+  // XXX kipp: this is temporary code until we eliminate the
+  // width/height arguments from the draw method.
+  if ((aWidth != mWidth) || (aHeight != mHeight)) {
+    aWidth = mWidth;
+    aHeight = mHeight;
+  }
+
+#ifdef TRACE_IMAGE_ALLOCATION
+  printf("nsImageGTK::Draw(this=%p,x=%d,y=%d,width=%d,height=%d)\n",
+         this,
+         aX,
+         aY,
+         aWidth,
+         aHeight);
+#endif
+
+  nsDrawingSurfaceGTK* drawing = (nsDrawingSurfaceGTK*) aSurface;
+
+  XImage *x_image = nsnull;
+  Pixmap pixmap = 0;
+  Display *dpy = nsnull;
+  Visual *visual = nsnull;
+  GC      gc;
+  XGCValues gcv;
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gStartTime = gPixmapTime = PR_Now();
+#endif
+
+  // Create gc clip-mask on demand
+  if ((mAlphaBits) && (mImageUpdated == PR_TRUE))
+  {
+    /* get the X primitives */
+    dpy = GDK_WINDOW_XDISPLAY(mAlphaPixmap);
+
+    
+    /* this is the depth of the pixmap that we are going to draw to.
+       It's always a bitmap.  We're doing alpha here folks. */
+    visual = GDK_VISUAL_XVISUAL(gdk_rgb_get_visual());
+
+    // Make an image out of the alpha-bits created by the image library
+    x_image = XCreateImage(dpy, visual,
+                           1, /* visual depth...1 for bitmaps */
+                           XYPixmap,
+                           0, /* x offset, XXX fix this */
+                           (char *)mAlphaBits,  /* cast away our sign. */
+                           aWidth,
+                           aHeight,
+                           32,/* bitmap pad */
+                           mAlphaRowBytes); /* bytes per line */
+
+    x_image->bits_per_pixel=1;
+
+    /* Image library always places pixels left-to-right MSB to LSB */
+    x_image->bitmap_bit_order = MSBFirst;
+
+    /* This definition doesn't depend on client byte ordering
+       because the image library ensures that the bytes in
+       bitmask data are arranged left to right on the screen,
+       low to high address in memory. */
+    x_image->byte_order = MSBFirst;
+#if defined(IS_LITTLE_ENDIAN)
+    // no, it's still MSB XXX check on this!!
+    //      x_image->byte_order = LSBFirst;
+#elif defined (IS_BIG_ENDIAN)
+    x_image->byte_order = MSBFirst;
+#else
+#error ERROR! Endianness is unknown;
+#endif
+
+    // Write into the pixemap that is underneath gdk's mAlphaPixmap
+    // the image we just created.
+
+    pixmap = GDK_WINDOW_XWINDOW(mAlphaPixmap);
+    memset(&gcv, 0, sizeof(XGCValues));
+    gcv.function = GXcopy;
+    gc = XCreateGC(dpy, pixmap, GCFunction, &gcv);
+    XPutImage(dpy, pixmap, gc, x_image, 0, 0, 0, 0,
+              aWidth, aHeight);
+    XFreeGC(dpy, gc);
+
+    // Now we are done with the temporary image
+    x_image->data = 0;          /* Don't free the IL_Pixmap's bits. */
+    XDestroyImage(x_image);
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+    gPixmapTime = PR_Now();
+#endif
+  }
+
+  // Render unique image bits onto an off screen pixmap only once
+  // The image bits can change as a result of ImageUpdated() - for
+  // example: animated GIFs.
+  if (mImageUpdated == PR_TRUE)
+  {
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_pixmap_new(nsnull,width=%d,height=%d,depth=%d)\n",
+           this,
+           aWidth,
+           aHeight,
+           mDepth);
+#endif
+
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+
+    // Render the image bits into an off screen pixmap
+    gdk_draw_rgb_image (mImagePixmap,
+                        mGC,
+                        0, 0, aWidth, aHeight,
+                        GDK_RGB_DITHER_MAX,
+                        mImageBits, mRowBytes);
+
+    if (mAlphaPixmap)
+    {
+      // Setup gc to use the given alpha-pixmap for clipping
+      gdk_gc_set_clip_mask(mGC, mAlphaPixmap);
+      gdk_gc_set_clip_origin(mGC, aX, aY);
+    }
+    
+#ifdef TRACE_IMAGE_ALLOCATION
+    printf("nsImageGTK::Draw(this=%p) gdk_draw_pixmap(x=%d,y=%d,width=%d,height=%d)\n",
+           this,
+           aX,
+           aY,
+           aWidth,
+           aHeight);
+#endif
+
+    mImageUpdated = PR_FALSE;
+  }
+
+
+  // copy our offscreen pixmap onto the window.
+  gdk_window_copy_area(drawing->GetDrawable(),      // dest window
+                       mGC,                         // gc
+                       aX,                          // xsrc
+                       aY,                          // ysrc
+                       mImagePixmap,                // source window
+                       0,                           // xdest
+                       0,                           // ydest
+                       aWidth,                      // width
+                       aHeight);                    // height
+
+  if (mAlphaBits)
+  {
+    // Revert gc to its old clip-mask and origin
+    gdk_gc_set_clip_origin(mGC, 0, 0);
+    gdk_gc_set_clip_mask(mGC, nsnull);
+  }
+
+#ifdef CHEAP_PERFORMANCE_MEASURMENT
+  gEndTime = PR_Now();
+  printf("nsImageGTK::Draw(this=%p,w=%d,h=%d) total=%lld pixmap=%lld, cvt=%lld\n",
+         this,
+         aWidth, aHeight,
+         gEndTime - gStartTime,
+         gPixmapTime - gStartTime,
+         gConvertTime - gPixmapTime);
+#endif
+
+  mImageUpdated = PR_FALSE;
+
+  return NS_OK;
+}
+
+
+//------------------------------------------------------------
+
+nsresult nsImageGTK::Optimize(nsIDeviceContext* aContext)
+{
+  return NS_OK;
+}

mozilla/gfx/src/gtk/nsImageGTK.h

@@ -0,0 +1,115 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsImageGTK_h___
+#define nsImageGTK_h___
+
+#include "nsIImage.h"
+
+#include "X11/Xlib.h"
+#include "X11/Xutil.h"
+#include <gdk/gdk.h>
+
+#undef Bool
+
+class nsImageGTK : public nsIImage
+{
+public:
+  nsImageGTK();
+  virtual ~nsImageGTK();
+
+  NS_DECL_ISUPPORTS
+
+  /**
+  @see nsIImage.h
+  */
+  virtual PRInt32     GetBytesPix()       { return mNumBytesPixel; }
+  virtual PRInt32     GetHeight();
+  virtual PRInt32     GetWidth();
+  virtual PRUint8*    GetBits();
+  virtual void*       GetBitInfo();
+  virtual PRBool      GetIsRowOrderTopToBottom() { return mIsTopToBottom; }
+  virtual PRInt32     GetLineStride();
+  virtual nsColorMap* GetColorMap();
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aX, PRInt32 aY,
+                  PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD Draw(nsIRenderingContext &aContext,
+                  nsDrawingSurface aSurface,
+                  PRInt32 aSX, PRInt32 aSY, PRInt32 aSWidth, PRInt32 aSHeight,
+                  PRInt32 aDX, PRInt32 aDY, PRInt32 aDWidth, PRInt32 aDHeight);
+  virtual void ImageUpdated(nsIDeviceContext *aContext,
+                            PRUint8 aFlags, nsRect *aUpdateRect);
+  virtual nsresult    Init(PRInt32 aWidth, PRInt32 aHeight,
+                           PRInt32 aDepth,
+                           nsMaskRequirements aMaskRequirements);
+  virtual PRBool      IsOptimized();
+
+  virtual nsresult    Optimize(nsIDeviceContext* aContext);
+  virtual PRUint8*    GetAlphaBits();
+  virtual PRInt32     GetAlphaWidth();
+  virtual PRInt32     GetAlphaHeight();
+  virtual PRInt32     GetAlphaLineStride();
+  virtual nsIImage*   DuplicateImage();
+
+  /**
+   * Calculate the number of bytes spaned for this image for a given width
+   * @param aWidth is the width to calculate the number of bytes for
+   * @return the number of bytes in this span
+   */
+  PRInt32  CalcBytesSpan(PRUint32  aWidth);
+  virtual void  SetAlphaLevel(PRInt32 aAlphaLevel);
+  virtual PRInt32 GetAlphaLevel();
+  virtual void  MoveAlphaMask(PRInt32 aX, PRInt32 aY);
+
+private:
+  /**
+   * Calculate the amount of memory needed for the initialization of the image
+   */
+  void ComputMetrics();
+  void ComputePaletteSize(PRIntn nBitCount);
+
+private:
+  PRInt32    mWidth;
+  PRInt32    mHeight;
+  PRInt32    mDepth;       // bits per pixel
+  PRInt32    mRowBytes;
+  PRUint8    *mImageBits;
+  PRUint8    *mConvertedBits;
+  PRInt32    mSizeImage;
+  PRBool     mIsTopToBottom;
+  PRBool     mImageUpdated;
+
+  PRInt8     mNumBytesPixel;
+
+  // alpha layer members
+  PRUint8    *mAlphaBits;
+  GdkPixmap  *mAlphaPixmap;
+  PRInt8     mAlphaDepth;        // alpha layer depth
+  PRInt16    mAlphaRowBytes;     // alpha bytes per row
+  PRInt16    mAlphaWidth;        // alpha layer width
+  PRInt16    mAlphaHeight;       // alpha layer height
+  nsPoint    mLocation;          // alpha mask location
+
+  GdkPixmap  *mImagePixmap;
+
+  GdkGC      *mGC;
+};
+
+#endif

mozilla/gfx/src/gtk/nsPrintdGTK.c

@@ -0,0 +1,452 @@
+/* -*- 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.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.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#include <gtk/gtk.h>
+
+#include "nspr.h"
+
+#include "nsPrintdGTK.h"
+
+/* A structure to hold widgets that need to be referenced in callbacks. We
+   declare this statically in the caller entry point (as a field of 
+   UnixPrOps, below), and pass a pointer to the structure to Gtk+ for each 
+   signal handler registered. This avoids use of globals. */
+
+typedef struct prwidgets {
+	GtkWidget *toplevel;		/* should be set to toplevel window */
+	GtkWidget *prDialog;		
+	GtkWidget *cmdEntry;
+	GtkWidget *pathEntry;
+	GtkWidget *browseButton;
+	GtkWidget *fpfToggle;
+	GtkWidget *greyToggle;
+	GtkWidget *letterToggle;
+	GtkWidget *legalToggle;
+	GtkWidget *execToggle;
+	GtkWidget *topSpinner;
+	GtkWidget *bottomSpinner;
+	GtkWidget *leftSpinner;
+	GtkWidget *rightSpinner;
+	GtkFileSelection *fsWidget;
+} PrWidgets;
+
+typedef struct unixprops {
+	UnixPrData *prData;	/* pointer to caller struct */
+	PrWidgets widgets;	 
+} UnixPrOps;
+
+/* user clicked cancel. tear things down, and set cancel field in 
+   caller data to PR_TRUE so printing will not happen */
+
+static void
+CancelPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_TRUE;
+}
+
+/* user selected the Print button. Collect any remaining data from the
+   widgets, and set cancel field in caller data to PR_FALSE so printing
+   will be performed. Also, tear down dialog and exit inner main loop */
+ 
+static void
+DoPrint (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->command, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.cmdEntry ) ) );
+	strcpy( prOps->prData->path, 
+		gtk_entry_get_text( GTK_ENTRY( prOps->widgets.pathEntry ) ) );
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.fpfToggle )->active == PR_TRUE )
+		prOps->prData->fpf = PR_TRUE;
+	else
+		prOps->prData->fpf = PR_FALSE;
+
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.greyToggle )->active == PR_TRUE )
+		prOps->prData->grayscale = PR_TRUE;
+	else
+		prOps->prData->grayscale = PR_FALSE;
+	if ( GTK_TOGGLE_BUTTON( prOps->widgets.letterToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LETTER_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.legalToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_LEGAL_SIZE;
+	else if ( GTK_TOGGLE_BUTTON( prOps->widgets.execToggle )->active == PR_TRUE )
+		prOps->prData->size = NS_EXECUTIVE_SIZE;
+	else
+		prOps->prData->size = NS_A4_SIZE;
+
+	/* margins */
+
+	prOps->prData->top = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.topSpinner) );
+	prOps->prData->bottom = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.bottomSpinner) );
+	prOps->prData->left = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.leftSpinner) );
+	prOps->prData->right = gtk_spin_button_get_value_as_float( 
+		GTK_SPIN_BUTTON(prOps->widgets.rightSpinner) );
+
+	/* we got everything... bring down the dialog and tell caller
+	   it's o.k. to print */
+
+	gtk_main_quit();
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.prDialog) );
+	prOps->prData->cancel = PR_FALSE;
+}
+
+/* User hit ok in file selection widget brought up by the browse button.
+   snarf the selected file, stuff it in caller data */
+
+static void
+ModifyPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+	strcpy( prOps->prData->path, 
+		gtk_file_selection_get_filename(prOps->widgets.fsWidget) );
+      	gtk_entry_set_text (GTK_ENTRY (prOps->widgets.pathEntry), 
+		prOps->prData->path);
+	gtk_widget_destroy( GTK_WIDGET(prOps->widgets.fsWidget) );
+}
+
+/* user selected print to printer. de-sensitize print to file fields */
+
+static void
+SwitchToPrinter (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_FALSE );
+	prOps->prData->toPrinter = PR_TRUE;
+}
+
+/* user selected print to file. de-sensitize print to printer fields */
+
+static void
+SwitchToFile (GtkWidget *widget, UnixPrOps *prOps)
+{
+	gtk_widget_set_sensitive( prOps->widgets.cmdEntry, PR_FALSE );
+	gtk_widget_set_sensitive( prOps->widgets.pathEntry, PR_TRUE );
+	gtk_widget_set_sensitive( prOps->widgets.browseButton, PR_TRUE );
+	prOps->prData->toPrinter = PR_FALSE;
+}
+
+/* user hit the browse button. Pop up a file selection widget and grab
+   result */
+
+static void
+GetPrPath (GtkWidget *widget, UnixPrOps *prOps)
+{
+    GtkWidget *fs;
+
+    fs = gtk_file_selection_new("Netscape: File Browser");
+
+    gtk_file_selection_set_filename( GTK_FILE_SELECTION(fs), 
+	prOps->prData->path );
+
+    gtk_window_set_modal (GTK_WINDOW(fs),PR_TRUE);
+
+#if 0
+    /* XXX not sure what the toplevel window should be. */
+
+    gtk_window_set_transient_for (GTK_WINDOW (fs), 
+	GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+
+    prOps->widgets.fsWidget = GTK_FILE_SELECTION(fs);
+
+    gtk_signal_connect (GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button), 
+	"clicked", GTK_SIGNAL_FUNC(ModifyPrPath), prOps);
+
+    gtk_signal_connect_object (GTK_OBJECT(
+	GTK_FILE_SELECTION(fs)->cancel_button), "clicked",
+	GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT (fs));
+
+    gtk_widget_show(fs);
+}
+
+/* create file data dialog. XXX widget should be NULL */
+
+static void
+DoPrintGTK (GtkWidget *widget, UnixPrOps *prOps)
+{
+	GtkWidget *separator, *dialog, *label, *vbox, *entry, *hbox, 
+		*button, *fileButton, *prButton, *table, *spinner1;
+        GtkAdjustment *adj;
+
+	prOps->widgets.prDialog = dialog = 
+		gtk_window_new( GTK_WINDOW_TOPLEVEL );
+	gtk_window_set_modal( GTK_WINDOW(dialog), PR_TRUE );
+#if 0
+	/* not yet sure what the toplevel window should be */
+
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), 
+		GTK_WINDOW (prOps->widgets.toplevel));
+#endif
+      	gtk_window_set_title( GTK_WINDOW(dialog), "Netscape: Print" );
+
+	vbox = gtk_vbox_new (PR_FALSE, 0);
+        gtk_container_add (GTK_CONTAINER (dialog), vbox);
+
+	table = gtk_table_new (3, 3, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+        gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_TRUE, 5);
+	label = gtk_label_new( "Print To:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = prButton = gtk_radio_button_new_with_label (NULL, "Printer");
+        if ( prOps->prData->toPrinter == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = fileButton = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), "File");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+        if ( prOps->prData->toPrinter == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+
+	label = gtk_label_new( "Print Command:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->command);
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 3, 1, 2,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	if ( prOps->prData->toPrinter == PR_FALSE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.cmdEntry = entry;
+
+	label = gtk_label_new( "File Name:" );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	0, GTK_EXPAND | GTK_FILL, 0, 0);
+	entry = gtk_entry_new ();
+	gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_entry_set_text (GTK_ENTRY (entry), prOps->prData->path);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.pathEntry = entry;
+
+	button = gtk_button_new_with_label ("Browse...");
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (GetPrPath), prOps);
+	if ( prOps->prData->toPrinter == PR_TRUE )
+		gtk_widget_set_sensitive( entry, PR_FALSE );
+	prOps->widgets.browseButton = button;
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	table = gtk_table_new (2, 4, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "First Page First");
+        if ( prOps->prData->fpf == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	prOps->widgets.fpfToggle = button;
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Last Page First");
+        if ( prOps->prData->fpf == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Print: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, "Greyscale");
+	prOps->widgets.greyToggle = button;
+        if ( prOps->prData->grayscale == PR_TRUE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Color");
+        if ( prOps->prData->grayscale == PR_FALSE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Paper Size: " );
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (NULL, 
+		"Letter (8 1/2 x 11 in.)");
+	prOps->widgets.letterToggle = button;
+        if ( prOps->prData->size == NS_LETTER_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Legal (8 1/2 x 14 in.)");
+	prOps->widgets.legalToggle = button;
+        if ( prOps->prData->size == NS_LEGAL_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 3, 4,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"Executive (7 1/2 x 10 in.)");
+	prOps->widgets.execToggle = button;
+        if ( prOps->prData->size == NS_EXECUTIVE_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	button = gtk_radio_button_new_with_label (
+		gtk_radio_button_group (GTK_RADIO_BUTTON (button)), 
+		"A4 (210 x 297 mm)");
+        if ( prOps->prData->size == NS_A4_SIZE ) 
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), 
+		PR_TRUE);
+	gtk_table_attach (GTK_TABLE (table), button, 2, 3, 4, 5,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	/* margins */
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+      	gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_FALSE, PR_FALSE, 5);
+	label = gtk_label_new( "Margins (inches):" );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_FALSE, PR_FALSE, 10);
+
+	table = gtk_table_new (1, 2, PR_FALSE);
+      	gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+        gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+      	gtk_box_pack_start (GTK_BOX (vbox), table, PR_TRUE, PR_FALSE, 0);
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+	label = gtk_label_new( "Top: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.topSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Bottom: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (1.0, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.bottomSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+	
+	hbox = gtk_hbox_new (PR_FALSE, 0);
+	gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
+        	GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+	label = gtk_label_new( "Left: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.leftSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	label = gtk_label_new( "Right: " );
+      	gtk_box_pack_start (GTK_BOX (hbox), label, PR_TRUE, PR_FALSE, 0);
+        adj = (GtkAdjustment *) gtk_adjustment_new (0.75, 0.0, 999.0,
+        	0.25, 1.0, 0.0);
+        prOps->widgets.rightSpinner = spinner1 = 
+		gtk_spin_button_new (adj, 1.0, 2);
+        gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
+        gtk_widget_set_usize (spinner1, 60, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), spinner1, FALSE, TRUE, 0);
+
+	separator = gtk_hseparator_new ();
+      	gtk_box_pack_start (GTK_BOX (vbox), separator, PR_TRUE, PR_FALSE, 0);
+
+        hbox = gtk_hbox_new (PR_FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), hbox, PR_TRUE, PR_FALSE, 5);
+	button = gtk_button_new_with_label ("Print");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC (DoPrint), prOps );
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
+
+	button = gtk_button_new_with_label ("Cancel");
+      	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+        	GTK_SIGNAL_FUNC ( CancelPrint ), prOps);
+        gtk_box_pack_start (GTK_BOX (hbox), button, PR_TRUE, PR_FALSE, 0);
+
+	/* Do this here, otherwise, upon creation the callbacks will be
+           triggered and the widgets these callbacks set sensitivity on
+	   do not exist yet */
+
+      	gtk_signal_connect (GTK_OBJECT (prButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToPrinter), prOps);
+      	gtk_signal_connect (GTK_OBJECT (fileButton), "clicked",
+        	GTK_SIGNAL_FUNC (SwitchToFile), prOps);
+
+	gtk_widget_show_all( dialog );
+	gtk_main ();
+}
+
+/* public interface to print dialog. Caller passes in preferences using
+   argument, we return any changes and indication of whether to print
+   or cancel. */
+
+void
+UnixPrDialog( UnixPrData *prData )
+{
+	static UnixPrOps prOps;
+
+	prOps.prData = prData;
+	DoPrintGTK( (GtkWidget *) NULL, &prOps );
+}
+

mozilla/gfx/src/gtk/nsPrintdGTK.h

@@ -0,0 +1,60 @@
+/* -*- 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.
+ */
+
+/* Original Code: Syd Logan (syd@netscape.com) 3/12/99 */
+
+#ifndef nsPrintdGTK_h___
+#define nsPrintdGTK_h___
+
+#include <limits.h>
+
+PR_BEGIN_EXTERN_C
+
+/* stolen from nsPostScriptObj.h. needs to be put somewhere else that
+   both ps and gtk can see easily */
+
+#ifndef NS_LEGAL_SIZE
+#define NS_LETTER_SIZE    0
+#define NS_LEGAL_SIZE     1
+#define NS_EXECUTIVE_SIZE 2
+#define NS_A4_SIZE        3
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX	_POSIX_PATH_MAX
+#endif
+
+typedef struct unixprdata {
+        PRBool toPrinter;          /* If PR_TRUE, print to printer */
+        PRBool fpf;                /* If PR_TRUE, first page first */
+        PRBool grayscale;          /* If PR_TRUE, print grayscale */
+        int size;                   /* Paper size e.g., SizeLetter */
+        char command[ PATH_MAX ];   /* Print command e.g., lpr */
+        char path[ PATH_MAX ];      /* If toPrinter = PR_FALSE, dest file */
+	PRBool cancel;		    /* If PR_TRUE, user cancelled */
+	float left;		    /* left margin */
+	float right;		    /* right margin */
+	float top;		    /* top margin */
+	float bottom;		    /* bottom margin */
+} UnixPrData;
+
+void UnixPrDialog(UnixPrData *prData);
+
+PR_END_EXTERN_C
+
+#endif /* nsPrintdGTK_h___ */

mozilla/gfx/src/gtk/nsRegionGTK.cpp

@@ -0,0 +1,302 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include "nsRegionGTK.h"
+#include "xregion.h"
+#include "prmem.h"
+
+static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID);
+
+nsRegionGTK::nsRegionGTK()
+{
+  NS_INIT_REFCNT();
+  
+  mRegion = nsnull;
+  mRegionType = eRegionComplexity_empty;
+}
+
+nsRegionGTK::~nsRegionGTK()
+{
+   if (mRegion)
+     ::gdk_region_destroy(mRegion);
+  mRegion = nsnull;
+}
+
+NS_IMPL_QUERY_INTERFACE(nsRegionGTK, kRegionIID)
+NS_IMPL_ADDREF(nsRegionGTK)
+NS_IMPL_RELEASE(nsRegionGTK)
+
+nsresult nsRegionGTK::Init(void)
+{
+  NS_ADDREF_THIS();
+  mRegion = ::gdk_region_new();
+  mRegionType = eRegionComplexity_empty;
+  return NS_OK;
+}
+
+void nsRegionGTK::SetTo(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(const nsRegionGTK *aRegion)
+{
+  SetRegionEmpty();
+  
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, aRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  SetRegionEmpty();
+
+  GdkRectangle grect;
+
+  grect.x = aX;
+  grect.y = aY;
+  grect.width = aWidth;
+  grect.height = aHeight;
+  
+  GdkRegion *nRegion = ::gdk_region_union_with_rect(mRegion, &grect);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, pRegion->mRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_intersect(mRegion, tRegion);
+  ::gdk_region_destroy(tRegion);
+  ::gdk_region_destroy(mRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(const nsIRegion &aRegion)
+{
+   nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+   
+   GdkRegion *nRegion = ::gdk_regions_union(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+
+  GdkRegion *nRegion = ::gdk_regions_union(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(const nsIRegion &aRegion)
+{
+  nsRegionGTK * pRegion = (nsRegionGTK *)&aRegion;
+
+   GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, pRegion->mRegion);
+   ::gdk_region_destroy(mRegion);
+   mRegion = nRegion;
+}
+
+void nsRegionGTK::Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkRegion *tRegion = CreateRectRegion(aX, aY, aWidth, aHeight);
+  
+  GdkRegion *nRegion = ::gdk_regions_subtract(mRegion, tRegion);
+  ::gdk_region_destroy(mRegion);
+  ::gdk_region_destroy(tRegion);
+  mRegion = nRegion;
+}
+
+PRBool nsRegionGTK::IsEmpty(void)
+{
+  return (::gdk_region_empty(mRegion));
+}
+
+PRBool nsRegionGTK::IsEqual(const nsIRegion &aRegion)
+{
+  nsRegionGTK *pRegion = (nsRegionGTK *)&aRegion;
+
+  return(::gdk_region_equal(mRegion, pRegion->mRegion));
+
+}
+
+void nsRegionGTK::GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
+{
+  GdkRectangle rect;
+
+  ::gdk_region_get_clipbox(mRegion, &rect);
+
+  *aX = rect.x;
+  *aY = rect.y;
+  *aWidth = rect.width;
+  *aHeight = rect.height;
+}
+
+void nsRegionGTK::Offset(PRInt32 aXOffset, PRInt32 aYOffset)
+{
+   ::gdk_region_offset(mRegion, aXOffset, aYOffset);
+}
+
+PRBool nsRegionGTK::ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  GdkOverlapType containment;
+  GdkRectangle rect;
+   
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+   
+  containment = ::gdk_region_rect_in(mRegion, &rect);
+
+  if (containment != GDK_OVERLAP_RECTANGLE_OUT)
+    return PR_TRUE;
+  else
+    return PR_FALSE;
+
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRects(nsRegionRectSet **aRects)
+{
+  nsRegionRectSet   *rects;
+  GdkRegionPrivate  *priv = (GdkRegionPrivate *)mRegion;
+  Region            pRegion = priv->xregion;
+  int               nbox;
+  BOX               *pbox;
+  nsRegionRect      *rect;
+
+  NS_ASSERTION(!(nsnull == aRects), "bad ptr");
+
+  //code lifted from old xfe. MMP
+
+  pbox = pRegion->rects;
+  nbox = pRegion->numRects;
+
+  rects = *aRects;
+
+  if ((nsnull == rects) || (rects->mRectsLen < (PRUint32)nbox))
+  {
+    void *buf = PR_Realloc(rects, sizeof(nsRegionRectSet) + (sizeof(nsRegionRect) * (nbox - 1)));
+
+    if (nsnull == buf)
+    {
+      if (nsnull != rects)
+        rects->mNumRects = 0;
+
+      return NS_OK;
+    }
+
+    rects = (nsRegionRectSet *)buf;
+    rects->mRectsLen = nbox;
+  }
+
+  rects->mNumRects = nbox;
+  rects->mArea = 0;
+  rect = &rects->mRects[0];
+
+  while (nbox--)
+  {
+    rect->x = pbox->x1;
+    rect->width = (pbox->x2 - pbox->x1);
+    rect->y = pbox->y1;
+    rect->height = (pbox->y2 - pbox->y1);
+
+    rects->mArea += rect->width * rect->height;
+
+    pbox++;
+    rect++;
+  }
+
+  *aRects = rects;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::FreeRects(nsRegionRectSet *aRects)
+{
+  if (nsnull != aRects)
+    PR_Free((void *)aRects);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetNativeRegion(void *&aRegion) const
+{
+  aRegion = (void *)mRegion;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRegionGTK::GetRegionComplexity(nsRegionComplexity &aComplexity) const
+{
+  // cast to avoid const-ness problems on some compilers
+  if (((nsRegionGTK*)this)->IsEmpty())
+    aComplexity = eRegionComplexity_empty;
+  else
+    aComplexity = eRegionComplexity_complex;
+
+  return NS_OK;
+}
+
+void nsRegionGTK::SetRegionEmpty()
+{
+  if (!IsEmpty()) {
+    ::gdk_region_destroy(mRegion);
+    mRegion = ::gdk_region_new();
+  }
+}
+
+GdkRegion *nsRegionGTK::CreateRectRegion(PRInt32 aX,
+					 PRInt32 aY,
+					 PRInt32 aWidth,
+					 PRInt32 aHeight)
+{
+  GdkRegion *tRegion = ::gdk_region_new();
+  GdkRectangle rect;
+
+  rect.x = aX;
+  rect.y = aY;
+  rect.width = aWidth;
+  rect.height = aHeight;
+
+  GdkRegion *rRegion = ::gdk_region_union_with_rect(tRegion, &rect);
+  ::gdk_region_destroy(tRegion);
+  
+  return (rRegion);
+}

mozilla/gfx/src/gtk/nsRegionGTK.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRegionGTK_h___
+#define nsRegionGTK_h___
+
+#include "nsIRegion.h"
+
+class nsRegionGTK : public nsIRegion
+{
+public:
+  nsRegionGTK();
+  virtual ~nsRegionGTK();
+
+  NS_DECL_ISUPPORTS
+
+  virtual nsresult Init();
+
+  virtual void SetTo(const nsIRegion &aRegion);
+  virtual void SetTo(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  void SetTo(const nsRegionGTK *aRegion);
+  virtual void Intersect(const nsIRegion &aRegion);
+  virtual void Intersect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Union(const nsIRegion &aRegion);
+  virtual void Union(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual void Subtract(const nsIRegion &aRegion);
+  virtual void Subtract(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  virtual PRBool IsEmpty(void);
+  virtual PRBool IsEqual(const nsIRegion &aRegion);
+  virtual void GetBoundingBox(PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight);
+  virtual void Offset(PRInt32 aXOffset, PRInt32 aYOffset);
+  virtual PRBool ContainsRect(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+  NS_IMETHOD GetRects(nsRegionRectSet **aRects);
+  NS_IMETHOD FreeRects(nsRegionRectSet *aRects);
+  NS_IMETHOD GetNativeRegion(void *&aRegion) const;
+  NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const;
+
+  GdkRegion *CreateRectRegion(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight);
+
+private:
+  GdkRegion           *mRegion;
+  nsRegionComplexity  mRegionType;
+
+  virtual void SetRegionEmpty();
+
+};
+
+#endif  // nsRegionGTK_h___ 

mozilla/gfx/src/gtk/nsRenderingContextGTK.h

@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef nsRenderingContextGTK_h___
+#define nsRenderingContextGTK_h___
+
+#include "nsIRenderingContext.h"
+#include "nsUnitConversion.h"
+#include "nsFont.h"
+#include "nsIFontMetrics.h"
+#include "nsPoint.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "nsTransform2D.h"
+#include "nsIViewManager.h"
+#include "nsIWidget.h"
+#include "nsRect.h"
+#include "nsImageGTK.h"
+#include "nsIDeviceContext.h"
+#include "nsVoidArray.h"
+
+#include "nsDrawingSurfaceGTK.h"
+#include "nsRegionGTK.h"
+
+#include <gtk/gtk.h>
+
+class nsRenderingContextGTK : public nsIRenderingContext
+{
+public:
+  nsRenderingContextGTK();
+  virtual ~nsRenderingContextGTK();
+
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsIWidget *aWindow);
+  NS_IMETHOD Init(nsIDeviceContext* aContext, nsDrawingSurface aSurface);
+
+  NS_IMETHOD Reset(void);
+
+  NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext);
+
+  NS_IMETHOD LockDrawingSurface(PRInt32 aX, PRInt32 aY, PRUint32 aWidth, PRUint32 aHeight,
+                                void **aBits, PRInt32 *aStride, PRInt32 *aWidthBytes,
+                                PRUint32 aFlags);
+  NS_IMETHOD UnlockDrawingSurface(void);
+
+  NS_IMETHOD SelectOffScreenDrawingSurface(nsDrawingSurface aSurface);
+  NS_IMETHOD GetDrawingSurface(nsDrawingSurface *aSurface);
+  NS_IMETHOD GetHints(PRUint32& aResult);
+
+  NS_IMETHOD PushState(void);
+  NS_IMETHOD PopState(PRBool &aClipEmpty);
+
+  NS_IMETHOD IsVisibleRect(const nsRect& aRect, PRBool &aVisible);
+
+  NS_IMETHOD SetClipRect(const nsRect& aRect, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRect(nsRect &aRect, PRBool &aClipValid);
+  NS_IMETHOD SetClipRegion(const nsIRegion& aRegion, nsClipCombine aCombine, PRBool &aClipEmpty);
+  NS_IMETHOD GetClipRegion(nsIRegion **aRegion);
+
+  NS_IMETHOD SetLineStyle(nsLineStyle aLineStyle);
+  NS_IMETHOD GetLineStyle(nsLineStyle &aLineStyle);
+
+  NS_IMETHOD SetColor(nscolor aColor);
+  NS_IMETHOD GetColor(nscolor &aColor) const;
+
+  NS_IMETHOD SetFont(const nsFont& aFont);
+  NS_IMETHOD SetFont(nsIFontMetrics *aFontMetrics);
+
+  NS_IMETHOD GetFontMetrics(nsIFontMetrics *&aFontMetrics);
+
+  NS_IMETHOD Translate(nscoord aX, nscoord aY);
+  NS_IMETHOD Scale(float aSx, float aSy);
+  NS_IMETHOD GetCurrentTransform(nsTransform2D *&aTransform);
+
+  NS_IMETHOD CreateDrawingSurface(nsRect *aBounds, PRUint32 aSurfFlags, nsDrawingSurface &aSurface);
+  NS_IMETHOD DestroyDrawingSurface(nsDrawingSurface aDS);
+
+  NS_IMETHOD DrawLine(nscoord aX0, nscoord aY0, nscoord aX1, nscoord aY1);
+  NS_IMETHOD DrawPolyline(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawRect(const nsRect& aRect);
+  NS_IMETHOD DrawRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillRect(const nsRect& aRect);
+  NS_IMETHOD FillRect(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+  NS_IMETHOD FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoints);
+
+  NS_IMETHOD DrawEllipse(const nsRect& aRect);
+  NS_IMETHOD DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+  NS_IMETHOD FillEllipse(const nsRect& aRect);
+  NS_IMETHOD FillEllipse(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight);
+
+  NS_IMETHOD DrawArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD DrawArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(const nsRect& aRect,
+                     float aStartAngle, float aEndAngle);
+  NS_IMETHOD FillArc(nscoord aX, nscoord aY, nscoord aWidth, nscoord aHeight,
+                     float aStartAngle, float aEndAngle);
+
+  NS_IMETHOD GetWidth(char aC, nscoord &aWidth);
+  NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth,
+                      PRInt32 *aFontID);
+  NS_IMETHOD GetWidth(const char *aString, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const char *aString, PRUint32 aLength, nscoord &aWidth);
+  NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength, nscoord &aWidth,
+                      PRInt32 *aFontID);
+
+  NS_IMETHOD DrawString(const char *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const PRUnichar *aString, PRUint32 aLength,
+                        nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+  NS_IMETHOD DrawString(const nsString& aString, nscoord aX, nscoord aY,
+                        PRInt32 aFontID,
+                        const nscoord* aSpacing);
+
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY);
+  NS_IMETHOD DrawImage(nsIImage *aImage, nscoord aX, nscoord aY,
+                       nscoord aWidth, nscoord aHeight); 
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aRect);
+  NS_IMETHOD DrawImage(nsIImage *aImage, const nsRect& aSRect, const nsRect& aDRect);
+
+  NS_IMETHOD CopyOffScreenBits(nsDrawingSurface aSrcSurf, PRInt32 aSrcX, PRInt32 aSrcY,
+                               const nsRect &aDestBounds, PRUint32 aCopyFlags);
+
+  //locals
+  NS_IMETHOD CommonInit();
+
+protected:
+  nsDrawingSurfaceGTK   *mOffscreenSurface;  
+  nsDrawingSurfaceGTK   *mSurface;
+  nsIDeviceContext      *mContext;
+  nsIFontMetrics        *mFontMetrics;
+  nsRegionGTK           *mClipRegion;
+  nsTransform2D         *mTMatrix;
+  float                  mP2T;
+  GdkWChar*              mDrawStringBuf;
+  PRUint32               mDrawStringSize;
+
+ // graphic state stack (GraphicsState)
+  nsVoidArray           *mStateCache;
+
+  nscolor                mCurrentColor;
+  GdkFont               *mCurrentFont;
+  nsLineStyle            mCurrentLineStyle;
+};
+
+#endif /* nsRenderingContextGTK_h___ */

mozilla/gfx/src/gtk/xregion.h

@@ -0,0 +1,177 @@
+/* $XConsortium: region.h,v 11.13 91/09/10 08:21:49 rws Exp $ */
+/************************************************************************
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Digital or MIT not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+************************************************************************/
+
+#ifndef _XREGION_H
+#define _XREGION_H
+
+typedef struct {
+    short x1, x2, y1, y2;
+} Box, BOX, BoxRec, *BoxPtr;
+
+typedef struct {
+    short x, y, width, height;
+}RECTANGLE, RectangleRec, *RectanglePtr;
+
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#define TRUE 1
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef MAXSHORT
+#define MAXSHORT 32767
+#endif
+#ifndef MINSHORT
+#define MINSHORT -MAXSHORT
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+/* 
+ *   clip region
+ */
+
+typedef struct _XRegion {
+    long size;
+    long numRects;
+    BOX *rects;
+    BOX extents;
+} REGION;
+
+/* Xutil.h contains the declaration: 
+ * typedef struct _XRegion *Region; 
+ */   
+
+/*  1 if two BOXs overlap.
+ *  0 if two BOXs do not overlap.
+ *  Remember, x2 and y2 are not in the region 
+ */
+#define EXTENTCHECK(r1, r2) \
+	((r1)->x2 > (r2)->x1 && \
+	 (r1)->x1 < (r2)->x2 && \
+	 (r1)->y2 > (r2)->y1 && \
+	 (r1)->y1 < (r2)->y2)
+
+/*
+ *  update region extents
+ */
+#define EXTENTS(r,idRect){\
+            if((r)->x1 < (idRect)->extents.x1)\
+              (idRect)->extents.x1 = (r)->x1;\
+            if((r)->y1 < (idRect)->extents.y1)\
+              (idRect)->extents.y1 = (r)->y1;\
+            if((r)->x2 > (idRect)->extents.x2)\
+              (idRect)->extents.x2 = (r)->x2;\
+            if((r)->y2 > (idRect)->extents.y2)\
+              (idRect)->extents.y2 = (r)->y2;\
+        }
+
+/*
+ *   Check to see if there is enough memory in the present region.
+ */
+#define MEMCHECK(reg, rect, firstrect){\
+        if ((reg)->numRects >= ((reg)->size - 1)){\
+          (firstrect) = (BOX *) Xrealloc \
+          ((char *)(firstrect), (unsigned) (2 * (sizeof(BOX)) * ((reg)->size)));\
+          if ((firstrect) == 0)\
+            return(0);\
+          (reg)->size *= 2;\
+          (rect) = &(firstrect)[(reg)->numRects];\
+         }\
+       }
+
+/*  this routine checks to see if the previous rectangle is the same
+ *  or subsumes the new rectangle to add.
+ */
+
+#define CHECK_PREVIOUS(Reg, R, Rx1, Ry1, Rx2, Ry2)\
+               (!(((Reg)->numRects > 0)&&\
+                  ((R-1)->y1 == (Ry1)) &&\
+                  ((R-1)->y2 == (Ry2)) &&\
+                  ((R-1)->x1 <= (Rx1)) &&\
+                  ((R-1)->x2 >= (Rx2))))
+
+/*  add a rectangle to the given Region */
+#define ADDRECT(reg, r, rx1, ry1, rx2, ry2){\
+    if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&\
+        CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              EXTENTS((r), (reg));\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+
+
+/*  add a rectangle to the given Region */
+#define ADDRECTNOX(reg, r, rx1, ry1, rx2, ry2){\
+            if ((rx1 < rx2) && (ry1 < ry2) &&\
+                CHECK_PREVIOUS((reg), (r), (rx1), (ry1), (rx2), (ry2))){\
+              (r)->x1 = (rx1);\
+              (r)->y1 = (ry1);\
+              (r)->x2 = (rx2);\
+              (r)->y2 = (ry2);\
+              (reg)->numRects++;\
+              (r)++;\
+            }\
+        }
+
+#define EMPTY_REGION(pReg) pReg->numRects = 0
+
+#define REGION_NOT_EMPTY(pReg) pReg->numRects
+
+#define INBOX(r, x, y) \
+      ( ( ((r).x2 >  x)) && \
+        ( ((r).x1 <= x)) && \
+        ( ((r).y2 >  y)) && \
+        ( ((r).y1 <= y)) )
+
+/*
+ * number of points to buffer before sending them off
+ * to scanlines() :  Must be an even number
+ */
+#define NUMPTSTOBUFFER 200
+
+/*
+ * used to allocate buffers for points and link
+ * the buffers together
+ */
+typedef struct _POINTBLOCK {
+    XPoint pts[NUMPTSTOBUFFER];
+    struct _POINTBLOCK *next;
+} POINTBLOCK;
+
+#endif

mozilla/security/makefile.win

@@ -1,29 +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=..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = nss \
-	manager \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/Makefile.in

@@ -1,109 +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): 
-#  Brian Ryner <bryner@netscape.com>
-# 
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
-LOADABLE_ROOT_MODULE = nssckbi$(DLL_SUFFIX)
-NSS3_LIB = nss3$(DLL_SUFFIX)
-SMIME3_LIB = smime3$(DLL_SUFFIX)
-SSL3_LIB =  ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = softokn3$(DLL_SUFFIX)
-else
-LOADABLE_ROOT_MODULE = libnssckbi$(DLL_SUFFIX)
-NSS3_LIB = libnss3$(DLL_SUFFIX)
-SMIME3_LIB = libsmime3$(DLL_SUFFIX)
-SSL3_LIB =  libssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = libsoftokn3$(DLL_SUFFIX)
-endif
-FREEBL_PURE32_MODULE = libfreebl_pure32_3$(DLL_SUFFIX)
-FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
-
-# NSS makefiles are not safe for parallel execution.
-DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
-DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
-ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
-ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
-endif
-ifndef MOZ_DEBUG
-DEFAULT_GMAKE_FLAGS += BUILD_OPT=1
-endif
-ifdef GNU_CC
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC=1 NS_USE_NATIVE=
-else
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC= NS_USE_NATIVE=1
-endif
-ifdef USE_N32
-# It is not really necessary to specify USE_PTHREADS=1.  USE_PTHREADS
-# merely adds _PTH to coreconf's OBJDIR name.
-DEFAULT_GMAKE_FLAGS += USE_N32=1 USE_PTHREADS=1
-endif
-ifdef HAVE_64BIT_OS
-DEFAULT_GMAKE_FLAGS += USE_64=1
-endif
-
-SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile
-
-include $(topsrcdir)/config/rules.mk
-
-depend dependclean export::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-
-libs::
-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
-	cd $(DIST)/lib; cp -f libmozdbm_s.$(LIB_SUFFIX) libdbm.$(LIB_SUFFIX)
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
-ifneq ($(OS_TEST),i86pc)
-ifndef HAVE_64BIT_OS
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
-endif
-endif
-endif
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-
-clean clobber clobber_all realclean distclean::
-	$(MAKE) -C boot $@
-	$(MAKE) -C ssl $@
-	$(MAKE) -C pki $@
-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean

mozilla/security/manager/boot/Makefile.in

@@ -1,45 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk

mozilla/security/manager/boot/makefile.win

@@ -1,44 +0,0 @@
-#!nmake
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = public src
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/public/Makefile.in

@@ -1,53 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MODULE = pipboot
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS = \
-    nsISSLStatusProvider.idl \
-    nsISecurityWarningDialogs.idl \
-    nsIBufEntropyCollector.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/rules.mk

mozilla/security/manager/boot/public/makefile.win

@@ -1,55 +0,0 @@
-#!nmake
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MODULE = pipboot
-
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
-
-include <$(DEPTH)/config/config.mak>
-
-XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
-
-XPIDLSRCS= \
-    .\nsISSLStatusProvider.idl \
-    .\nsISecurityWarningDialogs.idl \
-    .\nsIBufEntropyCollector.idl \
-    $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/public/nsIBufEntropyCollector.idl

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-#include "nsIEntropyCollector.idl"
-
-[uuid(485b87a8-5dd7-4b8d-8ea8-dee53201f899)]
-interface nsIBufEntropyCollector : nsIEntropyCollector
-{
-  /**
-   * Forward the entropy collected so far to |collector| and then
-   * continue forwarding new entropy as it arrives.
-   */
-  void forwardTo(in nsIEntropyCollector collector);
-
-  /**
-   * No longer forward to a (possibly) previously remembered collector.
-   * Do buffering again.
-   */
-  void dontForward();
-};

mozilla/security/manager/boot/public/nsISSLStatusProvider.idl

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Terry Hayes <thayes@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(8de811f0-1dd2-11b2-8bf1-e9aa324984b2)]
-interface nsISSLStatusProvider : nsISupports {
-  readonly attribute nsISupports SSLStatus;
-};

mozilla/security/manager/boot/public/nsISecurityWarningDialogs.idl

@@ -1,69 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Terry Hayes <thayes@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIInterfaceRequestor;
-
-/**
- * nsISecurityWarningDialogs - functions that
- *   display warnings for transitions between secure
- *   and insecure pages, posts to insecure servers etc.
- */
-[scriptable, uuid(1c399d06-1dd2-11b2-bc58-c87cbcacdb78)]
-interface nsISecurityWarningDialogs : nsISupports
-{
-  /**
-   * alertEnteringSecure
-   */
-  void alertEnteringSecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertEnteringWeak
-   */
-  void alertEnteringWeak(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertLeavingSecure
-   */
-  void alertLeavingSecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * alertMixedMode
-   */
-  void alertMixedMode(in nsIInterfaceRequestor ctx);
-
-  /**
-   * confirmPostToInsecure
-   */
-  boolean confirmPostToInsecure(in nsIInterfaceRequestor ctx);
-
-  /**
-   * confirmPostToInsecureFromSecure
-   */
-  boolean confirmPostToInsecureFromSecure(in nsIInterfaceRequestor ctx);
-};
-

mozilla/security/manager/boot/src/Makefile.in

@@ -1,99 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#     Javier Delgadillo <javi@netscape.com>
-#     Terry Hayes <thayes@netscape.com>
-#     Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= pipboot
-LIBRARY_NAME	= pipboot
-IS_COMPONENT	= 1
-MODULE_NAME	= BOOT
-EXPORT_LIBRARY	= 1
-META_COMPONENT	= crypto
-
-EXPORTS =  \
-	$(NULL)
-
-CPPSRCS = \
-	nsEntropyCollector.cpp \
-	nsSecureBrowserUIImpl.cpp \
-	nsBOOTModule.cpp \
-	$(NULL)
-
-REQUIRES	= nspr \
-		  xpcom \
-		  string \
-		  necko \
-		  uriloader \
-		  pref \
-		  caps \
-		  dom \
-		  intl \
-		  locale \
-		  profile \
-		  windowwatcher \
-		  js \
-		  docshell \
-		  widget \
-		  layout \
-		  content \
-		  pippki \
-		  xpconnect \
-		  jar \
-		  unicharutil \
-                  pipnss \
-		  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(DIST)/public/security \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-		$(MOZ_COMPONENT_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(NULL)
-
-EXTRA_LIBS	+= \
-        $(NULL)

mozilla/security/manager/boot/src/makefile.win

@@ -1,86 +0,0 @@
-#!nmake
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#     Terry Hayes <thayes@netscape.com>
-#     Kai Engert <kaie@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-MODULE = pipboot
-
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
-
-LIBRARY_NAME   = pipboot
-PDBFILE        = $(LIBRARY_NAME).pdb
-MAPFILE        = $(LIBRARY_NAME).map
-MODULE_NAME = BOOT
-META_COMPONENT = crypto
-
-REQUIRES = \
-	xpcom \
-	string \
-	dom \
-	pref \
-	intl \
-	locale \
-	windowwatcher \
-	necko \
-	pipnss \
-	layout \
-	layout_xul \
-        uriloader \
-        docshell \
-        widget \
-        content \
-	$(NULL)
-
-include <$(DEPTH)/config/config.mak>
-
-LLIBS   = \
-    $(DIST)/lib/js3250.lib \
-    $(LIBNSPR) \
-    $(DIST)\lib\xpcom.lib \
-    $(NULL)
-
-EXPORTS = \
-    $(NULL)
-
-OBJS = \
-    .\$(OBJDIR)\nsEntropyCollector.obj \
-    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
-    .\$(OBJDIR)\nsBOOTModule.obj \
-    $(NULL)
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/boot/src/nsBOOTModule.cpp

@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Terry Hayes <thayes@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-
-#include "nsEntropyCollector.h"
-#include "nsSecureBrowserUIImpl.h"
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl)
-
-static nsModuleComponentInfo components[] =
-{
-  {
-    "Entropy Collector",
-    NS_ENTROPYCOLLECTOR_CID,
-    NS_ENTROPYCOLLECTOR_CONTRACTID,
-    nsEntropyCollectorConstructor
-  },
-
-  {
-    NS_SECURE_BROWSER_UI_CLASSNAME,
-    NS_SECURE_BROWSER_UI_CID,
-    NS_SECURE_BROWSER_UI_CONTRACTID,
-    nsSecureBrowserUIImplConstructor
-  }
-};
-
-NS_IMPL_NSGETMODULE(BOOT, components)

mozilla/security/manager/boot/src/nsEntropyCollector.cpp

@@ -1,131 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "prlog.h"
-#include "nsEntropyCollector.h"
-#include "nsMemory.h"
-
-nsEntropyCollector::nsEntropyCollector()
-:mBytesCollected(0), mWritePointer(mEntropyCache)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsEntropyCollector::~nsEntropyCollector()
-{
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsEntropyCollector,
-                              nsIEntropyCollector,
-                              nsIBufEntropyCollector)
-
-NS_IMETHODIMP
-nsEntropyCollector::RandomUpdate(void *new_entropy, PRInt32 bufLen)
-{
-  if (bufLen > 0) {
-    if (mForwardTarget) {
-      return mForwardTarget->RandomUpdate(new_entropy, bufLen);
-    }
-    else {
-      const unsigned char *InputPointer = (const unsigned char *)new_entropy;
-      const unsigned char *PastEndPointer = mEntropyCache + entropy_buffer_size;
-
-      // if the input is large, we only take as much as we can store
-      PRInt32 bytes_wanted = PR_MIN(bufLen, entropy_buffer_size);
-
-      // remember the number of bytes we will have after storing new_entropy
-      mBytesCollected = PR_MIN(entropy_buffer_size, mBytesCollected + bytes_wanted);
-
-      // as the above statements limit bytes_wanted to the entropy_buffer_size,
-      // this loop will iterate at most twice.
-      while (bytes_wanted > 0) {
-
-        // how many bytes to end of cyclic buffer?
-        const PRInt32 space_to_end = PastEndPointer - mWritePointer;
-
-        // how many bytes can we copy, not reaching the end of the buffer?
-        const PRInt32 this_time = PR_MIN(space_to_end, bytes_wanted);
-
-        // copy at most to the end of the cyclic buffer
-        for (PRInt32 i = 0; i < this_time; ++i) {
-
-          // accept the fact that we use our buffer's random uninitialized content
-          unsigned int old = *mWritePointer;
-
-          // combine new and old value already stored in buffer
-          // this logic comes from PSM 1
-          *mWritePointer++ = ((old << 1) | (old >> 7)) ^ *InputPointer++;
-        }
-
-        PR_ASSERT(mWritePointer <= PastEndPointer);
-        PR_ASSERT(mWritePointer >= mEntropyCache);
-
-        // have we arrived at the end of the buffer?
-        if (PastEndPointer == mWritePointer) {
-          // reset write pointer back to begining of our buffer
-          mWritePointer = mEntropyCache;
-        }
-
-        // subtract the number of bytes we have already copied
-        bytes_wanted -= this_time;
-      }
-    }
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEntropyCollector::ForwardTo(nsIEntropyCollector *aCollector)
-{
-  NS_PRECONDITION(!mForwardTarget, "|ForwardTo| should only be called once.");
-
-  mForwardTarget = aCollector;
-  mForwardTarget->RandomUpdate(mEntropyCache, mBytesCollected);
-  mBytesCollected = 0;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsEntropyCollector::DontForward()
-{
-  mForwardTarget = nsnull;
-  return NS_OK;
-}

mozilla/security/manager/boot/src/nsEntropyCollector.h

@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   L. David Baron <dbaron@fas.harvard.edu> (original author)
- *   Kai Engert <kaie@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef nsEntropyCollector_h___
-#define nsEntropyCollector_h___
-
-#include "nsIEntropyCollector.h"
-#include "nsIBufEntropyCollector.h"
-#include "nsCOMPtr.h"
-
-#define NS_ENTROPYCOLLECTOR_CID \
- { /* 34587f4a-be18-43c0-9112-b782b08c0add */       \
-  0x34587f4a, 0xbe18, 0x43c0,                       \
- {0x91, 0x12, 0xb7, 0x82, 0xb0, 0x8c, 0x0a, 0xdd} }
-
-class nsEntropyCollector : public nsIBufEntropyCollector
-{
-  public:
-    nsEntropyCollector();
-    virtual ~nsEntropyCollector();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIENTROPYCOLLECTOR
-    NS_DECL_NSIBUFENTROPYCOLLECTOR
-
-    enum { entropy_buffer_size = 1024 };
-
-  protected:
-    unsigned char mEntropyCache[entropy_buffer_size];
-    PRInt32 mBytesCollected;
-    unsigned char *mWritePointer;
-    nsCOMPtr<nsIEntropyCollector> mForwardTarget;
-};
-
-#endif /* !defined nsEntropyCollector_h__ */

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.cpp

@@ -1,834 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Stuart Parmenter <pavlov@netscape.com>
- *   Brian Ryner <bryner@netscape.com>
- *   Terry Hayes <thayes@netscape.com>
- *   Kai Engert <kaie@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-
-#include "nspr.h"
-#include "prlog.h"
-#include "prmem.h"
-
-#include "nsISecureBrowserUI.h"
-#include "nsSecureBrowserUIImpl.h"
-#include "nsCOMPtr.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIInterfaceRequestorUtils.h"
-#include "nsIServiceManager.h"
-#include "nsIScriptGlobalObject.h"
-#include "nsIObserverService.h"
-#include "nsIDocumentLoader.h"
-#include "nsCURILoader.h"
-#include "nsIDocShell.h"
-#include "nsIDocumentViewer.h"
-#include "nsIDocument.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIContent.h"
-#include "nsIWebProgress.h"
-#include "nsIChannel.h"
-#include "nsIHttpChannel.h"
-#include "nsIFileChannel.h"
-#include "nsITransportSecurityInfo.h"
-#include "nsIURI.h"
-#include "nsISecurityEventSink.h"
-#include "nsIPrompt.h"
-#include "nsIFormSubmitObserver.h"
-#include "nsISecurityWarningDialogs.h"
-#include "nsIProxyObjectManager.h"
-#include "nsINSSDialogs.h"
-
-#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties"
-
-static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
-static const char *kNSSDialogsContractId = NS_NSSDIALOGS_CONTRACTID;
-
-#define IS_SECURE(state) ((state & 0xFFFF) == STATE_IS_SECURE)
-
-#if defined(PR_LOGGING)
-//
-// Log module for nsSecureBroswerUI logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-PRLogModuleInfo* gSecureDocLog = nsnull;
-#endif /* PR_LOGGING */
-
-
-nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
-  : mMixContentAlertShown(PR_FALSE),
-    mSecurityState(STATE_IS_INSECURE)
-{
-  NS_INIT_ISUPPORTS();
-  
-#if defined(PR_LOGGING)
-  if (!gSecureDocLog)
-    gSecureDocLog = PR_NewLogModule("nsSecureBrowserUI");
-#endif /* PR_LOGGING */
-}
-
-nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
-{
-  nsresult rv;
-  // remove self from form post notifications:
-  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
-  if (NS_SUCCEEDED(rv)) {
-    svc->RemoveObserver(this, NS_FORMSUBMIT_SUBJECT);
-  }
-}
-
-NS_IMPL_ISUPPORTS6(nsSecureBrowserUIImpl,
-                   nsISecureBrowserUI,
-                   nsIWebProgressListener,
-                   nsIFormSubmitObserver,
-                   nsIObserver,
-                   nsISupportsWeakReference,
-                   nsISSLStatusProvider);
-
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Init(nsIDOMWindow *window,
-                            nsIDOMElement *button)
-{
-  nsresult rv = NS_OK;
-  mSecurityButton = button;  /* may be null */
-  mWindow = window;
-
-  nsCOMPtr<nsIStringBundleService> service(do_GetService(kCStringBundleServiceCID, &rv));
-  if (NS_FAILED(rv)) return rv;
-  
-  rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL,
-                             getter_AddRefs(mStringBundle));
-  if (NS_FAILED(rv)) return rv;
-  
-  // hook up to the form post notifications:
-  nsCOMPtr<nsIObserverService> svc(do_GetService("@mozilla.org/observer-service;1", &rv));
-  if (NS_SUCCEEDED(rv)) {
-    rv = svc->AddObserver(this, NS_FORMSUBMIT_SUBJECT, PR_TRUE);
-  }
-  
-  /* GetWebProgress(mWindow) */
-  // hook up to the webprogress notifications.
-  nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(mWindow));
-  if (!sgo) return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIDocShell> docShell;
-  sgo->GetDocShell(getter_AddRefs(docShell));
-  if (!docShell) return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIWebProgress> wp(do_GetInterface(docShell));
-  if (!wp) return NS_ERROR_FAILURE;
-  /* end GetWebProgress */
-  
-  wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::DisplayPageInfoUI()
-{
-#if 0
-  nsresult res = NS_OK;
-  nsCOMPtr<nsISecurityManagerComponent> psm(do_GetService(PSM_COMPONENT_CONTRACTID,
-                                                          &res));
-  if (NS_FAILED(res))
-    return res;
-  
-  nsXPIDLCString host;
-  if (mCurrentURI)
-    mCurrentURI->GetHost(getter_Copies(host));
-  
-  //    return psm->DisplayPSMAdvisor(mLastPSMStatus, host);
-#endif
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Observe(nsISupports*, const char*,
-                               const PRUnichar*)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child,
-                                   PRBool* value)
-{
-  *value = PR_FALSE;
-  
-  if (parent == child) {
-    *value = PR_TRUE;
-    return NS_OK;
-  }
-  
-  nsCOMPtr<nsIDOMWindow> childsParent;
-  child->GetParent(getter_AddRefs(childsParent));
-  
-  if (childsParent && childsParent.get() != child)
-    IsChildOfDomWindow(parent, childsParent, value);
-  
-  return NS_OK;
-}
-
-static PRInt32 GetSecurityStateFromChannel(nsIChannel* aChannel)
-{
-  nsresult res;
-  PRInt32 securityState;
-
-  // qi for the psm information about this channel load.
-  nsCOMPtr<nsISupports> info;
-  aChannel->GetSecurityInfo(getter_AddRefs(info));
-  nsCOMPtr<nsITransportSecurityInfo> psmInfo(do_QueryInterface(info));
-  if (!psmInfo) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - no nsITransportSecurityInfo for %p\n",
-                                         aChannel, (nsISupports *)info));
-    return nsIWebProgressListener::STATE_IS_INSECURE;
-  }
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - info is %p\n", aChannel,
-                                       (nsISupports *)info));
-  
-  res = psmInfo->GetSecurityState(&securityState);
-  if (!NS_SUCCEEDED(res)) {
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - GetSecurityState failed: %d\n",
-                                         aChannel, res));
-    securityState = nsIWebProgressListener::STATE_IS_BROKEN;
-  }
-  
-  PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - Returning %d\n", aChannel,
-                                       securityState));
-  return securityState;
-}
-
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::Notify(nsIContent* formNode,
-                              nsIDOMWindowInternal* window, nsIURI* actionURL,
-                              PRBool* cancelSubmit)
-{
-  // Return NS_OK unless we want to prevent this form from submitting.
-  *cancelSubmit = PR_FALSE;
-  if (!window || !actionURL || !formNode)
-    return NS_OK;
-  
-  nsCOMPtr<nsIDocument> document;
-  formNode->GetDocument(*getter_AddRefs(document));
-  if (!document) return NS_OK;
-
-  nsCOMPtr<nsIURI> formURL;
-  document->GetBaseURL(*getter_AddRefs(formURL));
-  
-  nsCOMPtr<nsIScriptGlobalObject> globalObject;
-  document->GetScriptGlobalObject(getter_AddRefs(globalObject));
-  nsCOMPtr<nsIDOMWindow> postingWindow(do_QueryInterface(globalObject));
-  
-  PRBool isChild;
-  IsChildOfDomWindow(mWindow, postingWindow, &isChild);
-  
-  // This notify call is not for our window, ignore it.
-  if (!isChild)
-    return NS_OK;
-  
-  PRBool okayToPost;
-  nsresult res = CheckPost(formURL, actionURL, &okayToPost);
-  
-  if (NS_SUCCEEDED(res) && !okayToPost)
-    *cancelSubmit = PR_TRUE;
-  
-  return res;
-}
-
-//  nsIWebProgressListener
-NS_IMETHODIMP 
-nsSecureBrowserUIImpl::OnProgressChange(nsIWebProgress* aWebProgress,
-                                        nsIRequest* aRequest,
-                                        PRInt32 aCurSelfProgress,
-                                        PRInt32 aMaxSelfProgress,
-                                        PRInt32 aCurTotalProgress,
-                                        PRInt32 aMaxTotalProgress)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
-                                     nsIRequest* aRequest,
-                                     PRInt32 aProgressStateFlags,
-                                     nsresult aStatus)
-{
-  nsresult res = NS_OK;
-
-  if (!aRequest)
-    return NS_ERROR_NULL_POINTER;
-  
-  // Get the channel from the request...
-  // If the request is not network based, then ignore it.
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest, &res));
-  if (NS_FAILED(res))
-    return NS_OK;
-
-  // We are only interested in HTTP and file requests.
-  nsCOMPtr<nsIHttpChannel> httpRequest(do_QueryInterface(aRequest));
-  nsCOMPtr<nsIFileChannel> fileRequest(do_QueryInterface(aRequest));
-  if (!httpRequest && !fileRequest) {
-    return NS_OK;
-  }
-  
-  nsCOMPtr<nsIInterfaceRequestor> requestor;
-  nsCOMPtr<nsISecurityEventSink> eventSink;
-  channel->GetNotificationCallbacks(getter_AddRefs(requestor));
-  if (requestor)
-    eventSink = do_GetInterface(requestor);
-  
-#if defined(DEBUG)
-  nsCOMPtr<nsIURI> loadingURI;
-  res = channel->GetURI(getter_AddRefs(loadingURI));
-  NS_ASSERTION(NS_SUCCEEDED(res), "GetURI failed");
-  if (loadingURI) {
-    nsXPIDLCString temp;
-    loadingURI->GetSpec(getter_Copies(temp));
-    PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
-           ("SecureUI:%p: OnStateChange: %x :%s\n", this,
-            aProgressStateFlags,(const char*)temp));
-  }
-#endif
-
-  // First event when loading doc
-  if (aProgressStateFlags & STATE_START) {
-    if (aProgressStateFlags & STATE_IS_NETWORK) {
-      // Reset state variables used per doc loading
-      mMixContentAlertShown = PR_FALSE;
-      mFirstRequest = PR_TRUE;
-      mSSLStatus = nsnull;
-    }
-  }
-  
-  // A Document is starting to load...
-  if ((aProgressStateFlags & (STATE_STOP)) &&
-      (aProgressStateFlags & STATE_IS_REQUEST)) {
-
-    // work-around for bug 48515.
-    nsCOMPtr<nsIURI> aURI;
-    channel->GetURI(getter_AddRefs(aURI));
-
-    // Sometimes URI is null, so ignore.
-    if (aURI == nsnull) {
-      return NS_OK;
-    }
-
-    // If this is the first request, then do a protocol check
-    if (mFirstRequest) {
-      mFirstRequest = PR_FALSE;
-      return CheckProtocolContextSwitch(eventSink, aRequest, channel);
-    }
-    // Check that the request does not have mixed content.
-    return CheckMixedContext(eventSink, aRequest, channel);
-  }
-
-  // A document has finished loading
-  if ((aProgressStateFlags & STATE_STOP) &&
-    (aProgressStateFlags & STATE_IS_NETWORK)) {
-
-    // Get SSL Status information if possible
-    nsCOMPtr<nsISupports> info;
-    channel->GetSecurityInfo(getter_AddRefs(info));
-    nsCOMPtr<nsISSLStatusProvider> sp = do_QueryInterface(info);
-    if (sp) {
-      // Ignore result
-      sp->GetSSLStatus(getter_AddRefs(mSSLStatus));
-    }
-
-    if (eventSink)
-      eventSink->OnSecurityChange(aRequest, mSecurityState);
-          
-    if (!mSecurityButton)
-      return res;
-          
-    /* TNH - need event for changing the tooltip */
-
-    // Do we really need to look at res here? What happens if there's an error?
-    // We should still set the certificate authority display.
-
-    nsXPIDLString tooltip;
-    if (info) {
-      nsCOMPtr<nsITransportSecurityInfo> secInfo(do_QueryInterface(info));
-      if (secInfo &&
-          NS_SUCCEEDED(secInfo->GetShortSecurityDescription(getter_Copies(tooltip))) &&
-          tooltip) {
-
-        res = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
-                                                nsString(tooltip));
-              
-      }
-    }
-  }
-
-  return res;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnLocationChange(nsIWebProgress* aWebProgress,
-                                        nsIRequest* aRequest,
-                                        nsIURI* aLocation)
-{
-  mCurrentURI = aLocation;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::OnStatusChange(nsIWebProgress* aWebProgress,
-                                      nsIRequest* aRequest,
-                                      nsresult aStatus,
-                                      const PRUnichar* aMessage)
-{
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::OnSecurityChange(nsIWebProgress *aWebProgress,
-                                        nsIRequest *aRequest,
-                                        PRInt32 state)
-{
-  nsresult res = NS_OK;
-
-#if defined(DEBUG_dougt)
-  nsCOMPtr<nsIChannel> channel(do_QueryInterface(aRequest));
-  if (!channel)
-    return NS_ERROR_FAILURE;
-  
-  nsCOMPtr<nsIURI> aURI;
-  channel->GetURI(getter_AddRefs(aURI));
-  
-  nsXPIDLCString temp;
-  aURI->GetSpec(getter_Copies(temp));
-  printf("OnSecurityChange: (%x) %s\n", state, (const char*)temp);
-#endif
-  /* Deprecated support for mSecurityButton */
-  if (mSecurityButton) {
-    NS_NAMED_LITERAL_STRING(level, "level");
-
-    if (state == (STATE_IS_SECURE|STATE_SECURE_HIGH)) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("high"));
-    } else if (state == (STATE_IS_SECURE|STATE_SECURE_LOW)) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("low"));
-    } else if (state == STATE_IS_BROKEN) {
-      res = mSecurityButton->SetAttribute(level, NS_LITERAL_STRING("broken"));
-    } else {
-      res = mSecurityButton->RemoveAttribute(level);
-    }
-  }
-
-  return res;
-}
-
-// nsISSLStatusProvider methods
-NS_IMETHODIMP
-nsSecureBrowserUIImpl::GetSSLStatus(nsISupports** _result)
-{
-  NS_ASSERTION(_result, "non-NULL destination required");
-
-  *_result = mSSLStatus;
-  NS_IF_ADDREF(*_result);
-
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
-{
-	*value = PR_FALSE;
-
-	if (!aURL)
-		return NS_OK;
-  
-  char* scheme;
-	aURL->GetScheme(&scheme);
-
-  // If no scheme, it's not an https url - not necessarily an error.
-  // See bugs 54845 and 54966  
-	if (!scheme)
-		return NS_OK;
-  
-  if (!PL_strncasecmp(scheme, "https",  5))
-		*value = PR_TRUE;
-	
-	nsMemory::Free(scheme);
-	return NS_OK;
-}
-
-void
-nsSecureBrowserUIImpl::GetBundleString(const PRUnichar* name,
-                                       nsString &outString)
-{
-  if (mStringBundle && name) {
-    PRUnichar *ptrv = nsnull;
-    if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name,
-                                                      &ptrv)))
-      outString = ptrv;
-    else
-      outString.SetLength(0);
-    
-    nsMemory::Free(ptrv);
-    
-  } else {
-    outString.SetLength(0);
-  }
-}
-
-nsresult 
-nsSecureBrowserUIImpl::CheckProtocolContextSwitch(nsISecurityEventSink* eventSink,
-                                                  nsIRequest* aRequest,
-                                                  nsIChannel* aChannel)
-{
-  PRInt32 newSecurityState, oldSecurityState = mSecurityState;
-  
-  newSecurityState = GetSecurityStateFromChannel(aChannel);
-  mSecurityState = newSecurityState;
-
-  // Check to see if we are going from a secure page to an insecure page
-  if (newSecurityState == STATE_IS_INSECURE &&
-      (IS_SECURE(oldSecurityState) ||
-       oldSecurityState == STATE_IS_BROKEN)) {
-
-    SetBrokenLockIcon(eventSink, aRequest, PR_TRUE);
-
-    AlertLeavingSecure();
-
-  }
-  // check to see if we are going from an insecure page to a secure one.
-  else if ((newSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH) ||
-            newSecurityState == STATE_IS_BROKEN) &&
-           oldSecurityState == STATE_IS_INSECURE) {
-    AlertEnteringSecure();
-  }
-  // check to see if we are going from a strong or insecure page to a
-  // weak one.
-  else if ((IS_SECURE(newSecurityState) &&
-            newSecurityState != (STATE_IS_SECURE|STATE_SECURE_HIGH)) &&
-           (oldSecurityState == STATE_IS_INSECURE ||
-            oldSecurityState == (STATE_IS_SECURE|STATE_SECURE_HIGH))) {
-
-    AlertEnteringWeak();
-  }
-  
-  mSecurityState = newSecurityState;
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::CheckMixedContext(nsISecurityEventSink *eventSink,
-                                         nsIRequest* aRequest, nsIChannel* aChannel)
-{
-  PRInt32 newSecurityState;
-
-  newSecurityState = GetSecurityStateFromChannel(aChannel);
-
-  // Deal with http redirect to https //
-  if (mSecurityState == STATE_IS_INSECURE && newSecurityState != STATE_IS_INSECURE) {
-      return CheckProtocolContextSwitch(eventSink, aRequest, aChannel);
-  }
-
-  if ((newSecurityState == STATE_IS_INSECURE ||
-       newSecurityState == STATE_IS_BROKEN) &&
-      IS_SECURE(mSecurityState)) {
-    
-    // work-around for bug 48515
-    nsCOMPtr<nsIURI> aURI;
-    aChannel->GetURI(getter_AddRefs(aURI));
-
-    nsXPIDLCString temp;
-    aURI->GetSpec(getter_Copies(temp));
-
-    if (!nsCRT::strncmp((const char*) temp, "file:", 5) ||
-        !nsCRT::strcmp((const char*) temp, "about:layout-dummy-request")) {
-      return NS_OK;
-    }
-
-    mSecurityState = STATE_IS_BROKEN;
-    SetBrokenLockIcon(eventSink, aRequest);
-
-    // Show alert to user (first time only)
-    // NOTE: doesn't mSecurityState provide the correct
-    // one-time checking?? Why have mMixContentAlertShown
-    // as well?
-    if (!mMixContentAlertShown) {
-      AlertMixedMode();
-      mMixContentAlertShown = PR_TRUE;
-    }
-  }
-  
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::CheckPost(nsIURI *formURL, nsIURI *actionURL, PRBool *okayToPost)
-{
-  PRBool formSecure,actionSecure;
-  *okayToPost = PR_TRUE;
-
-  nsresult rv = IsURLHTTPS(formURL, &formSecure);
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = IsURLHTTPS(actionURL, &actionSecure);
-  if (NS_FAILED(rv))
-    return rv;
-  
-  // if we are posting to a secure link from a secure page, all is okay.
-  if (actionSecure && formSecure) {
-    return NS_OK;
-  }
-    
-  // posting to insecure webpage from a secure webpage.
-  if (!actionSecure && formSecure) {
-    *okayToPost = ConfirmPostToInsecureFromSecure();
-  } else {
-    *okayToPost = ConfirmPostToInsecure();
-  }
-  
-  return NS_OK;
-}
-
-nsresult
-nsSecureBrowserUIImpl::SetBrokenLockIcon(nsISecurityEventSink *eventSink,
-                                         nsIRequest* aRequest,
-                                         PRBool removeValue)
-{
-  nsresult rv = NS_OK;
-  if (removeValue) {
-    if (eventSink)
-      (void) eventSink->OnSecurityChange(aRequest, STATE_IS_INSECURE);
-  } else {
-    if (eventSink)
-      (void) eventSink->OnSecurityChange(aRequest, (STATE_IS_BROKEN));
-  }
-  
-  nsAutoString tooltiptext;
-  GetBundleString(NS_LITERAL_STRING("SecurityButtonTooltipText").get(),
-                  tooltiptext);
-
-  /* TNH - need tooltip notification here */
-  if (mSecurityButton)
-    rv = mSecurityButton->SetAttribute(NS_LITERAL_STRING("tooltiptext"),
-                                       tooltiptext);
-  return rv;
-}
-
-//
-// Implementation of an nsIInterfaceRequestor for use
-// as context for NSS calls
-//
-class nsUIContext : public nsIInterfaceRequestor
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIINTERFACEREQUESTOR
-
-  nsUIContext(nsIDOMWindow *window);
-  virtual ~nsUIContext();
-
-private:
-  nsCOMPtr<nsIDOMWindow> mWindow;
-};
-
-NS_IMPL_ISUPPORTS1(nsUIContext, nsIInterfaceRequestor)
-
-nsUIContext::nsUIContext(nsIDOMWindow *aWindow)
-: mWindow(aWindow)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-nsUIContext::~nsUIContext()
-{
-}
-
-/* void getInterface (in nsIIDRef uuid, [iid_is (uuid), retval] out nsQIResult result); */
-NS_IMETHODIMP nsUIContext::GetInterface(const nsIID & uuid, void * *result)
-{
-  nsresult rv;
-
-  if (uuid.Equals(NS_GET_IID(nsIPrompt))) {
-    nsCOMPtr<nsIDOMWindowInternal> internal = do_QueryInterface(mWindow, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsIPrompt *prompt;
-
-    rv = internal->GetPrompter(&prompt);
-    *result = prompt;
-  } else {
-    rv = NS_ERROR_NO_INTERFACE;
-  }
-
-  return rv;
-}
-
-nsresult nsSecureBrowserUIImpl::
-GetNSSDialogs(nsISecurityWarningDialogs **result)
-{
-  nsresult rv;
-  nsCOMPtr<nsISecurityWarningDialogs> my_result(do_GetService(kNSSDialogsContractId, &rv));
-
-  if (NS_FAILED(rv)) 
-    return rv;
-
-  nsCOMPtr<nsIProxyObjectManager> proxyman(do_GetService(NS_XPCOMPROXY_CONTRACTID));
-  if (!proxyman)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsISupports> proxiedResult;
-  proxyman->GetProxyForObject(NS_UI_THREAD_EVENTQ,
-                              NS_GET_IID(nsISecurityWarningDialogs),
-                              my_result, PROXY_SYNC,
-                              getter_AddRefs(proxiedResult));
-
-  if (!proxiedResult) {
-    return NS_ERROR_FAILURE;
-  }
-
-  return CallQueryInterface(proxiedResult, result);
-}
-
-void nsSecureBrowserUIImpl::
-AlertEnteringSecure()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertEnteringSecure(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertEnteringWeak()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertEnteringWeak(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertLeavingSecure()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertLeavingSecure(ctx);
-
-  return;
-}
-
-void nsSecureBrowserUIImpl::
-AlertMixedMode()
-{
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return;
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  dialogs->AlertMixedMode(ctx);
-
-  return;
-}
-
-/**
- * ConfirmPostToInsecure - returns PR_TRUE if
- *   the user approves the submit (or doesn't care).
- *   returns PR_FALSE on errors.
- */
-PRBool nsSecureBrowserUIImpl::
-ConfirmPostToInsecure()
-{
-  nsresult rv;
-
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  PRBool result;
-
-  rv = dialogs->ConfirmPostToInsecure(ctx, &result);
-  if (NS_FAILED(rv)) return PR_FALSE;
-
-  return result;
-}
-
-/**
- * ConfirmPostToInsecureFromSecure - returns PR_TRUE if
- *   the user approves the submit (or doesn't care).
- *   returns PR_FALSE on errors.
- */
-PRBool nsSecureBrowserUIImpl::
-ConfirmPostToInsecureFromSecure()
-{
-  nsresult rv;
-
-  nsCOMPtr<nsISecurityWarningDialogs> dialogs;
-
-  GetNSSDialogs(getter_AddRefs(dialogs));
-  if (!dialogs) return PR_FALSE;  // Should this allow PR_TRUE for unimplemented?
-
-  nsCOMPtr<nsIInterfaceRequestor> ctx = new nsUIContext(mWindow);
-
-  PRBool result;
-
-  rv = dialogs->ConfirmPostToInsecureFromSecure(ctx, &result);
-  if (NS_FAILED(rv)) return PR_FALSE;
-
-  return result;
-}

mozilla/security/manager/boot/src/nsSecureBrowserUIImpl.h

@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * 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.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Hubbie Shaw
- *   Doug Turner <dougt@netscape.com>
- *   Brian Ryner <bryner@netscape.com>
- *   Kai Engert <kaie@netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsSecureBrowserUIImpl_h_
-#define nsSecureBrowserUIImpl_h_
-
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsString.h"
-#include "nsIObserver.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMWindow.h"
-#include "nsIStringBundle.h"
-#include "nsISecureBrowserUI.h"
-#include "nsIDocShell.h"
-#include "nsIWebProgressListener.h"
-#include "nsIFormSubmitObserver.h"
-#include "nsIURI.h"
-#include "nsISecurityEventSink.h"
-#include "nsWeakReference.h"
-#include "nsISSLStatusProvider.h"
-
-class nsITransportSecurityInfo;
-class nsISecurityWarningDialogs;
-
-#define NS_SECURE_BROWSER_UI_CID \
-{ 0xcc75499a, 0x1dd1, 0x11b2, {0x8a, 0x82, 0xca, 0x41, 0x0a, 0xc9, 0x07, 0xb8}}
-
-
-class nsSecureBrowserUIImpl : public nsISecureBrowserUI,
-                              public nsIWebProgressListener,
-                              public nsIFormSubmitObserver,
-                              public nsIObserver,
-                              public nsSupportsWeakReference,
-                              public nsISSLStatusProvider
-{
-public:
-  
-  nsSecureBrowserUIImpl();
-  virtual ~nsSecureBrowserUIImpl();
-  
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIWEBPROGRESSLISTENER
-  NS_DECL_NSISECUREBROWSERUI
-  
-  // nsIObserver
-  NS_DECL_NSIOBSERVER
-  NS_DECL_NSISSLSTATUSPROVIDER
-
-  NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindowInternal* window,
-                    nsIURI *actionURL, PRBool* cancelSubmit);
-  
-protected:
-  
-  nsCOMPtr<nsIDOMWindow> mWindow;
-  nsCOMPtr<nsIDOMElement> mSecurityButton;
-  nsCOMPtr<nsIStringBundle> mStringBundle;
-  nsCOMPtr<nsIURI> mCurrentURI;
-  
-  PRBool mMixContentAlertShown;
-  PRInt32 mSecurityState;
-  PRBool mFirstRequest;
-
-  nsCOMPtr<nsISupports> mSSLStatus;
-
-  void GetBundleString(const PRUnichar* name, nsString &outString);
-  
-  nsresult CheckProtocolContextSwitch(nsISecurityEventSink* sink,
-                                      nsIRequest* request, nsIChannel* aChannel);
-  nsresult CheckMixedContext(nsISecurityEventSink* sink, nsIRequest* request,
-                             nsIChannel* aChannel);
-  nsresult CheckPost(nsIURI *formURI, nsIURI *actionURL, PRBool *okayToPost);
-  nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
-  nsresult SetBrokenLockIcon(nsISecurityEventSink* sink, nsIRequest* request,
-                             PRBool removeValue = PR_FALSE);
-
-  // Alerts for security transitions
-  void AlertEnteringSecure();
-  void AlertEnteringWeak();
-  void AlertLeavingSecure();
-  void AlertMixedMode();
-  PRBool ConfirmPostToInsecure();
-  PRBool ConfirmPostToInsecureFromSecure();
-
-  // Support functions
-  nsresult GetNSSDialogs(nsISecurityWarningDialogs **);
-
-};
-
-
-#endif /* nsSecureBrowserUIImpl_h_ */

mozilla/security/manager/makefile.win

@@ -1,41 +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): 
-#	Javier Delgadillo
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-DEPTH=..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = boot ssl pki
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/Makefile.in

@@ -1,30 +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): 
-#  Terry Hayes <thayes@netscape.com>
-# 
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-DIRS		= public resources src
-
-include $(topsrcdir)/config/rules.mk

mozilla/security/manager/pki/makefile.win

@@ -1,41 +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): 
-#	Terry Hayes <thayes@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>
-
-DIRS = public src resources
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/Makefile.in

@@ -1,49 +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): 
-#  Javier Delgadillo <javi@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-MODULE = pippki
-
-DEPTH           = ../../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS = \
-    nsIPKIParamBlock.idl \
-    nsIASN1Outliner.idl \
-    $(NULL)
-
-include $(topsrcdir)/config/rules.mk

mozilla/security/manager/pki/public/makefile.win

@@ -1,51 +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): 
-#	Javier Delgadillo
-#
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable
-# instead of those above.  If you wish to allow use of your
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-#
-
-MODULE = pippki
-
-DEPTH=..\..\..\..
-IGNORE_MANIFEST=1
-
-include <$(DEPTH)/config/config.mak>
-
-XPIDL_INCLUDES=-I$(DEPTH)\dist\idl
-
-XPIDLSRCS= \
-    .\nsIPKIParamBlock.idl \
-    .\nsIASN1Outliner.idl \
-    $(NULL)
-
-
-include <$(DEPTH)\config\rules.mak>

mozilla/security/manager/pki/public/nsIASN1Outliner.idl

@@ -1,54 +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 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):
- *   Ian McGreer <mcgreer@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-#include "nsIOutlinerView.idl"
-#include "nsIX509Cert.idl"
-
-[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
-interface nsIASN1Outliner : nsIOutlinerView {
-
-  void loadASN1Structure(in nsIASN1Object asn1Object);
-
-  wstring getDisplayData(in unsigned long index);
-
-};
-
-%{C++
-
-#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
-
-%}
-

mozilla/security/manager/pki/public/nsIASN1Tree.idl

@@ -1,54 +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 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):
- *   Ian McGreer <mcgreer@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-#include "nsIOutlinerView.idl"
-#include "nsIX509Cert.idl"
-
-[scriptable, uuid(c727b2f2-1dd1-11b2-95df-f63c15b4cd35)]
-interface nsIASN1Outliner : nsIOutlinerView {
-
-  void loadASN1Structure(in nsIASN1Object asn1Object);
-
-  wstring getDisplayData(in unsigned long index);
-
-};
-
-%{C++
-
-#define NS_ASN1OUTLINER_CONTRACTID "@mozilla.org/security/nsASN1Outliner;1"
-
-%}
-

mozilla/security/manager/pki/public/nsIPKIParamBlock.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 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.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):
- *   Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable
- * instead of those above.  If you wish to allow use of your
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(b6fe3d78-1dd1-11b2-9058-ced9016984c8)]
-interface nsIPKIParamBlock : nsISupports {
-
-  void setISupportAtIndex(in PRInt32 index, in nsISupports object);
-  nsISupports getISupportAtIndex(in PRInt32 index);
-};

mozilla/security/manager/pki/resources/Makefile.in

@@ -1,33 +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): 
-#  Terry Hayes <thayes@netscape.com>
-# 
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(REGCHROME) content pippki pippki.jar
-	$(REGCHROME) locale en-US/pippki en-US.jar

mozilla/security/manager/pki/resources/content/CAOverlay.xul

@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="CAOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="CACerts">
-    <description>&certmgr.cas;</description>
-    <separator class="thin"/>
-    <outliner id="ca-outliner" multiple="true" enableColumnDrag="true"
-              onselect="ca_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="ca_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="ca_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="ca_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="ca_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/MineOverlay.xul

@@ -1,87 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="MineOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="myCerts">
-    <description>&certmgr.mine;</description>
-    <separator class="thin"/>
-    <outliner id="user-outliner" multiple="true" enableColumnDrag="true"
-              onselect="mine_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="verifiedcol" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="purposecol" label="&certmgr.purpose;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="serialnumcol" label="&certmgr.serial;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="issuedcol" label="&certmgr.issued;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   hidden="true" persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="expiredcol" label="&certmgr.expires;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-       <button id="mine_viewButton" class="normal" 
-               label="&certmgr.view.label;"
-               disabled="true" oncommand="viewCerts();"/>
-       <button id="mine_backupButton" class="normal" 
-               label="&certmgr.backup.label;"
-               disabled="true" oncommand="backupCerts();"/>
-       <button id="mine_backupAllButton" class="normal" 
-               label="&certmgr.backupall.label;"
-               oncommand="backupAllCerts();"/>
-       <button id="mine_restoreButton" class="normal" 
-               label="&certmgr.restore.label;"
-               oncommand="restoreCerts();"/>
-       <button id="mine_deleteButton" class="normal" 
-               label="&certmgr.delete.label;"
-               disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/OthersOverlay.xul

@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - 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 the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Kai Engert <kaie@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="WebSitesOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="othersCerts">
-    <description>&certmgr.others;</description>
-    <separator class="thin"/>
-    <outliner id="email-outliner" multiple="true"
-              onselect="email_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="emailcol" label="&certmgr.email;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="email_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="email_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="email_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="email_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/PageInfoOverlay.xul

@@ -1,210 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<!-- This file extends "chrome://navigator/content/pageInfo.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PageInfoOverlay.dtd">
-
-<overlay id="pipPageInfoOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var security = {
-      // Display the server certificate (static)
-      viewCert : function () {
-        var cert = security._cert;
-        if (cert) cert.view();
-      },
-
-      _getSecurityInfo : function() {
-        const nsIX509Cert = Components.interfaces.nsIX509Cert;
-        const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-        const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-        const nsISSLStatusProvider = Components.interfaces.nsISSLStatusProvider;
-        const nsISSLStatus = Components.interfaces.nsISSLStatus;
-
-        // Get the window for this information
-        var w;
-        if ("arguments" in window && window.arguments.length > 1 && window.arguments[0])
-          w = window.arguments[0];
-        else
-          w = window.opener.frames[0];
-
-        var hName = null;
-        try
-        {
-           hName = w.location.host;
-        } catch(exception){}
-
-        var ui = security._getSecurityUI();
-        var sp = ui.QueryInterface(nsISSLStatusProvider);
-        var status = sp.SSLStatus;
-        if (status) {
-          status = status.QueryInterface(nsISSLStatus);
-        }
-        if (status) {
-          var cert = status.serverCert;
-          var issuerName;
-
-          issuerName = this.mapIssuerOrganization(cert.issuerOrganization);
-          if (!issuerName) issuerName = cert.issuerName;
-        
-          return {
-            hostName : hName,
-            cAName : issuerName,
-            encryptionAlgorithm : status.cipherName,
-            encryptionStrength : status.secretKeyLength,
-            cert : cert
-          };
-        } else {
-          return {
-            hostName : hName,
-            cAName : "",
-            encryptionAlgorithm : "",
-            encryptionStrength : 0,
-            cert : null
-          };
-        } 
-      },
-
-      // Find the secureBrowserUI object (if present)
-      _getSecurityUI : function() {
-        return window.opener.gBrowser.boxObject.getPropertyAsSupports("secureBrowserUI");
-      },
-
-      // Interface for mapping a certificate issuer organization to
-      // the value to be displayed.
-      // Bug 82017 - this implementation should be moved to pipnss C++ code
-      mapIssuerOrganization: function(name) {
-        if (!name) return null;
-
-        if (name == "RSA Data Security, Inc.") return "Verisign, Inc.";
-
-        // No mapping required
-        return name;
-      },
-
-      _cert : null
-    };
-
-    function securityOnLoad() {
-      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-      var info = security._getSecurityInfo();
-      var idHdr;
-      var message1;
-      var message2;
-
-      /* Set the identification messages */
-      if (info.cert)
-      {
-        idHdr = bundle.GetStringFromName("pageInfo_WebSiteVerified");
-        document.getElementById("security-identity").setAttribute("value", idHdr);
-
-        message1 = bundle.formatStringFromName("pageInfo_Identity_Verified", 
-                                [ info.hostName, info.cAName ],
-                                2);
-        setText("security-identity-text", message1);
-
-        var viewText = bundle.GetStringFromName("pageInfo_ViewCertificate");
-        setText("security-view-text", viewText);
-        security._cert = info.cert;
-      } else {
-        idHdr = bundle.GetStringFromName("pageInfo_SiteNotVerified");
-        document.getElementById("security-identity").setAttribute("value", idHdr);
-
-        document.getElementById("security-view-cert").setAttribute("disabled", "true");
-        document.getElementById("security-view-cert").setAttribute("hidden", "true");
-      }
-
-      var hdr;
-      var msg1;
-      var msg2;
-      
-      /* Set the encryption messages */
-      if (info.encryptionStrength >= 90) {
-        hdr = bundle.formatStringFromName("pageInfo_StrongEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        msg1 = bundle.GetStringFromName("pageInfo_Privacy_Strong1");
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Strong2");
-        setText("security-privacy-msg2", msg2);
-
-        security._cert = info.cert;
-      } else if (info.encryptionStrength > 0) {
-        hdr = bundle.formatStringFromName("pageInfo_WeakEncryption",
-                             [ info.encryptionAlgorithm, info.encryptionStrength+"" ], 2);
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        msg1 = bundle.formatStringFromName("pageInfo_Privacy_Weak1",
-                                               [ info.hostName ], 1);
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_Weak2");
-        setText("security-privacy-msg2", msg2);
-      } else {
-        hdr = bundle.GetStringFromName("pageInfo_NoEncryption");
-        document.getElementById("security-privacy").setAttribute("value", hdr);
-
-        if(info.hostName != null)
-          msg1 = bundle.formatStringFromName("pageInfo_Privacy_None1", [ info.hostName ], 1);
-        else
-          msg1 = bundle.GetStringFromName("pageInfo_Privacy_None3");
-
-        setText("security-privacy-msg1", msg1);
-
-        msg2 = bundle.GetStringFromName("pageInfo_Privacy_None2");
-        setText("security-privacy-msg2", msg2);
-      }
-    }
-
-    /* Register for pageInfo onload calls */
-    onLoadRegistry.push(securityOnLoad);
-  ]]>
-  </script>
-  <tabs id="tabs">
-    <tab id="securityTab" label="&pageInfo.securityTab;"/>
-  </tabs>
-  <tabpanels id="tabpanels">
-    <vbox id="securityPanel" flex="1">
-      <label id="security-identity" class="header"/>
-      <description id="security-identity-text" flex="1"/>
-      <hbox>
-        <button id="security-view-cert" label="&pageInfo.view.label;" 
-                oncommand="security.viewCert();"/>
-        <description id="security-view-text" flex="1"/>
-      </hbox>
-      <separator class="groove"/>
-      <label id="security-privacy" class="header"/>
-      <vbox flex="1">
-        <description id="security-privacy-msg1"/>
-        <description id="security-privacy-msg2"/>
-      </vbox>
-    </vbox>
-  </tabpanels>
-</overlay>

mozilla/security/manager/pki/resources/content/PrefOverlay.xul

@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<!-- This file overlays "chrome://communicator/content/pref/preftree.xul" -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefOverlay.dtd">
-
-<overlay id="pipPrefOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <treechildren id="securityChildren">
-    <treeitem id="masterpassItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-masterpass.xul"
-                  label="&masterpass.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="sslItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-ssl.xul"
-                  label="&ssl.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="certItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-certs.xul"
-                  label="&certs.label;"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="validationItem">
-      <treerow>
-        <treecell class="treecell-indent" url="chrome://pippki/content/pref-validation.xul"
-                 label="&validation.label;"/>
-      </treerow>
-    </treeitem>
-  </treechildren>
-</overlay>

mozilla/security/manager/pki/resources/content/WebSitesOverlay.xul

@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="WebSitesOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <vbox id="webCerts">
-    <description>&certmgr.websites;</description>
-    <separator class="thin"/>
-    <outliner id="server-outliner" multiple="true" enableColumnDrag="true"
-              onselect="websites_enableButtons()" flex="1">
-      <outlinercol id="certcol" label="&certmgr.certname;" primary="true" 
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-      <splitter class="tree-splitter"/>
-      <outlinercol id="tokencol" label="&certmgr.tokenname;"
-                   class="outlinercol-header outlinercell-inset-header" 
-                   persist="hidden width ordinal" flex="1"/>
-<!--      <outlinercol id="certdbkeycol" collapsed="true" flex="1"/> -->
-      <outlinerbody flex="1" ondblclick="viewCerts();"/>
-    </outliner>
-    <hbox>
-      <button id="websites_viewButton"
-              label="&certmgr.view.label;"
-              disabled="true" oncommand="viewCerts();"/>
-      <button id="websites_editButton"
-              label="&certmgr.edit.label;"
-              disabled="true" oncommand="editCerts();"/>
-<!-- future - import a DER cert?
-      <button id="websites_addButton"
-              label="&certmgr.add.label;"
-              oncommand="addCerts();"/>
--->
-      <button id="websites_deleteButton"
-              label="&certmgr.delete.label;"
-              disabled="true" oncommand="deleteCerts();"/>
-    </hbox>
-  </vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/cacertexists.js

@@ -1,26 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Rangan Sen <rangansen@netscape.com>
- */
-
-function doOK()
-{
-  window.close();
-}

mozilla/security/manager/pki/resources/content/cacertexists.xul

@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Rangan Sen <rangansen@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="cacertexists" 
-  title="&caCertExists.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/cacertexists.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description>&caCertExists.message;</description>
-    
-    <separator/>
-
-    <hbox align="center">
-      <button id="ok-button" label="&ok.label;"
-              oncommand="doOK();"/> 
-    </hbox>
-    
-    <separator/>
-
-  </vbox>
-
-</window>
-

mozilla/security/manager/pki/resources/content/certDump.xul

@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Javier Delgadillo <javi@netscape.com>
-  -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<overlay id="certDumpOverlay" 
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:cert="http://netscape.com/rdf-cert#" 
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<vbox class="box-padded" id="certPrettyPrint" flex="1">
-  <label class="header" value="&certmgr.hierarchy.label;"/>
-  <tree id="treesetDump" rows="4"
-        onselect="updateCertDump();">
-    <treecolgroup>
-      <treecol flex="1"/>
-    </treecolgroup>
-    <treechildren id="chainDump"/>
-  </tree>
-  <outliner class="inset" id="prettyDumpOutliner" style="height:150px">
-    <outlinercol flex ="1" id="certDataCol" label="&certmgr.details.label;"
-                 ignoreincolumnpicker="true" class="header outlinercol-header" primary="true"/>
-    <splitter/>
-    <outlinerbody flex="1" onselect="displaySelected();"/>
-  </outliner>
-  <label class="header" value="&certmgr.fields.label;"/>
-  <textbox class="inset" id="certDumpVal"  multiline="true" rows="8"
-           readonly="true" style="font-family: -moz-fixed;"/>
-</vbox>
-</overlay>

mozilla/security/manager/pki/resources/content/certManager.js

@@ -1,371 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsFilePicker = "@mozilla.org/filepicker;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsICertOutliner = Components.interfaces.nsICertOutliner;
-const nsCertOutliner = "@mozilla.org/security/nsCertOutliner;1";
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsPKIParamBlock    = "@mozilla.org/security/pkiparamblock;1";
-
-
-var helpURL = "chrome://help/content/help.xul";
-var key;
-
-var selected_certs = [];
-var certdb;
-
-var caOutlinerView;
-var serverOutlinerView;
-var emailOutlinerView;
-var userOutlinerView;
-
-function LoadCerts()
-{
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-
-  caOutlinerView = Components.classes[nsCertOutliner]
-                    .createInstance(nsICertOutliner);
-  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
-  document.getElementById('ca-outliner')
-   .outlinerBoxObject.view = caOutlinerView;
-
-  serverOutlinerView = Components.classes[nsCertOutliner]
-                        .createInstance(nsICertOutliner);
-  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
-  document.getElementById('server-outliner')
-   .outlinerBoxObject.view = serverOutlinerView;
-
-  emailOutlinerView = Components.classes[nsCertOutliner]
-                       .createInstance(nsICertOutliner);
-  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
-  document.getElementById('email-outliner')
-   .outlinerBoxObject.view = emailOutlinerView; 
-
-  userOutlinerView = Components.classes[nsCertOutliner]
-                      .createInstance(nsICertOutliner);
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-  document.getElementById('user-outliner')
-   .outlinerBoxObject.view = userOutlinerView;
-
-  var rowCnt = userOutlinerView.rowCount;
-  var enableBackupAllButton=document.getElementById('mine_backupAllButton');
-  if(rowCnt < 1) {
-    enableBackupAllButton.setAttribute("disabled",true);
-  } else  {
-    enableBackupAllButton.setAttribute("enabled",true);
-  }
-
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var verifiedColText;
-  if (certdb.ocspOn) {
-    verifiedColText = bundle.GetStringFromName("certmgr.verifiedNoOCSP");
-  } else {
-    verifiedColText = bundle.GetStringFromName("certmgr.verified");
-  }
-  var verifiedCol = document.getElementById('verifiedcol');
-  verifiedCol.setAttribute('label', verifiedColText);
-}
-
-function ReloadCerts()
-{
-  caOutlinerView.loadCerts(nsIX509Cert.CA_CERT);
-  serverOutlinerView.loadCerts(nsIX509Cert.SERVER_CERT);
-  emailOutlinerView.loadCerts(nsIX509Cert.EMAIL_CERT);
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-}
-
-function getSelectedTab()
-{
-  var selTab = document.getElementById('certMgrTabbox').selectedItem;
-  var selTabID = selTab.getAttribute('id');
-  if (selTabID == 'mine_tab') {
-    key = "?my_certs";
-  } else if (selTabID == "others_tab") {
-    key = "?others_certs";
-  } else if (selTabID == "websites_tab") {
-    key = "?web_certs";
-  } else if (selTabID == "ca_tab") {
-    key = "?ca_certs";
-  }  
-  var context = helpURL + key;
-  return context;
-}
-
-
-function doHelpButton() {
-   var uri = getSelectedTab();
-   openHelp(uri);
-}
-
-
-function getSelectedCerts()
-{
-  var ca_tab = document.getElementById("ca_tab");
-  var mine_tab = document.getElementById("mine_tab");
-  var others_tab = document.getElementById("others_tab");
-  var websites_tab = document.getElementById("websites_tab");
-  var items = null;
-  if (ca_tab.selected) {
-    items = caOutlinerView.selection;
-  } else if (mine_tab.selected) {
-    items = userOutlinerView.selection;
-  } else if (others_tab.selected) {
-    items = emailOutlinerView.selection;
-  } else if (websites_tab.selected) {
-    items = serverOutlinerView.selection;
-  }
-  selected_certs = [];
-  var cert = null;
-  var nr = 0;
-  if (items != null) nr = items.getRangeCount();
-  if (nr > 0) {
-    for (var i=0; i<nr; i++) {
-      var o1 = {};
-      var o2 = {};
-      items.getRangeAt(i, o1, o2);
-      var min = o1.value;
-      var max = o2.value;
-      for (var j=min; j<=max; j++) {
-        if (ca_tab.selected) {
-          cert = caOutlinerView.getCert(j);
-        } else if (mine_tab.selected) {
-          cert = userOutlinerView.getCert(j);
-        } else if (others_tab.selected) {
-          cert = emailOutlinerView.getCert(j);
-        } else if (websites_tab.selected) {
-          cert = serverOutlinerView.getCert(j);
-        }
-        if (cert)
-          selected_certs[selected_certs.length] = cert;
-      }
-    }
-  }
-}
-
-function ca_enableButtons()
-{
-  var items = caOutlinerView.selection;
-  var nr = items.getRangeCount();
-  var toggle="false";
-  if (nr == 0) {
-    toggle="true";
-  }
-  var edit_toggle=toggle;
-/*
-  var edit_toggle="true";
-  if (nr > 0) {
-    for (var i=0; i<nr; i++) {
-      var o1 = {};
-      var o2 = {};
-      items.getRangeAt(i, o1, o2);
-      var min = o1.value;
-      var max = o2.value;
-      var stop = false;
-      for (var j=min; j<=max; j++) {
-        var tokenName = items.outliner.view.getCellText(j, "tokencol");
-	if (tokenName == "Builtin Object Token") { stop = true; } break;
-      }
-      if (stop) break;
-    }
-    if (i == nr) {
-      edit_toggle="false";
-    }
-  }
-*/
-  var enableViewButton=document.getElementById('ca_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('ca_editButton');
-  enableEditButton.setAttribute("disabled",edit_toggle);
-  var enableDeleteButton=document.getElementById('ca_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function mine_enableButtons()
-{
-  var items = userOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('mine_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableBackupButton=document.getElementById('mine_backupButton');
-  enableBackupButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('mine_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function websites_enableButtons()
-{
-  var items = serverOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('websites_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('websites_editButton');
-  enableEditButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('websites_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function email_enableButtons()
-{
-  var items = emailOutlinerView.selection;
-  var toggle="false";
-  if (items.getRangeCount() == 0) {
-    toggle="true";
-  }
-  var enableViewButton=document.getElementById('email_viewButton');
-  enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('email_editButton');
-  enableEditButton.setAttribute("disabled",toggle);
-  var enableDeleteButton=document.getElementById('email_deleteButton');
-  enableDeleteButton.setAttribute("disabled",toggle);
-}
-
-function backupCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          bundle.GetStringFromName("chooseP12BackupFileDialog"),
-          nsIFilePicker.modeSave);
-  fp.appendFilter("PKCS12 Files", "*.p12");
-  fp.appendFilters(nsIFilePicker.filterAll);
-  var rv = fp.show();
-  if (rv == nsIFilePicker.returnOK || rv == nsIFilePicker.returnReplace) {
-    certdb.exportPKCS12File(null, fp.file, 
-                            selected_certs.length, selected_certs);
-  }
-}
-
-function backupAllCerts()
-{
-  // Select all rows, then call doBackup()
-  var items = userOutlinerView.selection.selectAll();
-  backupCerts();
-}
-
-function editCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  for (var t=0; t<numcerts; t++) {
-    var cert = selected_certs[t];
-    var certkey = cert.dbKey;
-    var ca_tab = document.getElementById("ca_tab");
-    if (ca_tab.selected) {
-      window.openDialog('chrome://pippki/content/editcacert.xul', certkey,
-                  'chrome,width=100,resizable=1,modal');
-    } else {
-      window.openDialog('chrome://pippki/content/editsslcert.xul', certkey,
-                  'chrome,width=100,resizable=1,modal');
-    }
-  }
-}
-
-function restoreCerts()
-{
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          bundle.GetStringFromName("chooseP12RestoreFileDialog"),
-          nsIFilePicker.modeOpen);
-  fp.appendFilter("PKCS12 Files", "*.p12;*.pfx");
-  fp.appendFilters(nsIFilePicker.filterAll);
-  if (fp.show() == nsIFilePicker.returnOK) {
-    var certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-    certdb.importPKCS12File(null, fp.file);
-  }
-  userOutlinerView.loadCerts(nsIX509Cert.USER_CERT);
-}
-
-function deleteCerts()
-{
-  getSelectedCerts();
-  
-  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
-  
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var selTab = document.getElementById('certMgrTabbox').selectedItem;
-  var selTabID = selTab.getAttribute('id');
-  if (selTabID == 'mine_tab') 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteUserCertFlag"));
-  } 
-  else if (selTabID == "websites_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteSslCertFlag"));
-  } 
-  else if (selTabID == "ca_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteCaCertFlag"));
-  }
-  else if (selTabID == "others_tab") 
-  {
-    params.SetString(1,bundle.GetStringFromName("deleteEmailCertFlag"));
-  }
-  else
-  {
-    return;
-  }
-
-  var numcerts = selected_certs.length;
-  params.SetInt(2,numcerts);
-  for (var t=0; t<numcerts; t++) 
-  {
-    var cert = selected_certs[t];
-    params.SetString(t+3, cert.dbKey);  
-  }
-   
-  window.openDialog('chrome://pippki/content/deletecert.xul', "",
-                'chrome,resizable=1,modal',params);
- 
-  ReloadCerts();
-}
-
-function viewCerts()
-{
-  getSelectedCerts();
-  var numcerts = selected_certs.length;
-  for (var t=0; t<numcerts; t++) {
-    selected_certs[t].view();
-  }
-}
-
-/* XXX future - import a DER cert from a file? */
-function addCerts()
-{
-  alert("Add cert chosen");
-}

mozilla/security/manager/pki/resources/content/certManager.xul

@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<?xul-overlay href="chrome://pippki/content/MineOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/OthersOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/WebSitesOverlay.xul"?>
-<?xul-overlay href="chrome://pippki/content/CAOverlay.xul"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="certmanager" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        title="&certmgr.title;"
-        onload="LoadCerts();">
-
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
-
-  <vbox flex="1">
-    <tabbox flex="1">
-      <tabs id="certMgrTabbox">
-        <tab id="mine_tab" label="&certmgr.tab.mine;"/>
-        <tab id="others_tab" label="&certmgr.tab.others;"/>
-        <tab id="websites_tab" label="&certmgr.tab.websites;"/>
-        <tab id="ca_tab" label="&certmgr.tab.ca;" selected="true"/>
-      </tabs>
-      <tabpanels flex="1">
-        <vbox id="myCerts" flex="1"/>
-        <vbox id="othersCerts" flex="1"/>
-        <vbox id="webCerts" flex="1"/>
-        <vbox id="CACerts" flex="1"/>
-      </tabpanels>
-    </tabbox>
-
-    <hbox>
-      <button id="HelpButton"
-              label="&certmgr.help.label;" 
-              accesskey="&certmgr.helpButtonAccessKey;"
-              oncommand="doHelpButton();"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/certViewer.xul

@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-   -   Javier Delgadillo <javi@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<?xul-overlay href="chrome://pippki/content/viewCertDetails.xul"?>
-<?xul-overlay href="chrome://pippki/content/certDump.xul"?>
-
-
-<window id="certDetails" 
-  title="&certmgr.certdetail.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close()"/>
-</keyset>
-
-  <grid flex="1">
-    <column flex="1"/>
-    <rows>
-      <row flex="1">
-        <tabbox flex="1">
-          <tabs>
-            <tab id="general_tab" label="&certmgr.detail.general_tab.title;"/>
-            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;"/>
-          </tabs>
-          <tabpanels flex="1">
-            <vbox id="general_info" flex="1"/>
-            <vbox id="certPrettyPrint" flex="1"/>
-          </tabpanels>
-        </tabbox>
-      </row>
-      <row>
-        <separator class="thin"/>
-      </row>
-      <row>
-        <hbox align="right" flex="1">
-          <button id="HelpButton"
-                  label="&certmgr.help.label;" 
-                  accesskey="&certmgr.helpButtonAccessKey;"
-                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');"/>
-          <button id="closeButton"
-                  label="&certmgr.close.label;" 
-                  accesskey="&certmgr.closeWindowAccessKey;"
-                  oncommand="window.close();"/>
-        </hbox>
-      </row>
-    </rows>
-  </grid>
-</window>

mozilla/security/manager/pki/resources/content/certpicker.js

@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * 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 the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Kai Engert <kaie@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-var itemCount = 0;
-
-function onLoad()
-{
-  dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-
-  var pickerTitle = dialogParams.GetString(1);
-  var mainwin = document.getElementById("certPicker");
-  mainwin.setAttribute("title", pickerTitle);
-
-  var pickerInfo = dialogParams.GetString(2);
-  setText("pickerInfo", pickerInfo);
-
-  var selectElement = document.getElementById("nicknames");
-  itemCount = dialogParams.GetInt(1);
-
-  for (var i=0; i < itemCount; i++) {
-      var menuItemNode = document.createElement("menuitem");
-      var nick = dialogParams.GetString(i+3);
-      menuItemNode.setAttribute("value", i);
-      menuItemNode.setAttribute("label", nick); // this is displayed
-      selectElement.firstChild.appendChild(menuItemNode);
-      if (i == 0) {
-          selectElement.selectedItem = menuItemNode;
-      }
-  }
-
-  dialogParams.SetInt(1,0); // set cancel return value
-  setDetails();
-}
-
-function setDetails()
-{
-  var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+3);
-  document.getElementById("details").value = details;
-}
-
-function onCertSelected()
-{
-  setDetails();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/certpicker.xul

@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - 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 the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Kai Engert <kaie@netscape.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="certPicker" title="&certPicker.defaultTitle;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certpicker.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-</keyset>
-
-<vbox style="margin: 5px;">
-    <groupbox>
-    <description id="pickerInfo" style="font-weight: bold;">&certPicker.defaultInfo;</description>
-    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
-    <!-- The items in this menulist must never be sorted,
-         but remain in the order filled by the application
-    -->
-    <menulist id="nicknames" observes="certSelected">
-        <menupopup/>
-    </menulist>
-    <label value="&certPicker.detailsLabel;"/>
-    <textbox readonly="true" id="details" multiline="true"
-      style="height: 11em; width=80em;"/>
-    </groupbox>
-  <separator class="thin"/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/changepassword.xul

@@ -1,117 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="set_password" title="&setPassword.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<vbox style="margin: 5px;" flex="1">
-
-<hbox align="center">
-  <label value="&setPassword.tokenName.label;: "/>
-  <label id="tokenName" />
-  <menulist id="tokenMenu" oncommand="onMenuChange()">
-     <menupopup/>
-  </menulist>
-</hbox>
-
-
-<!--
-    <menulist id="signerList" disabled="true">
-      <menupopup>
-        <menuitem id="token-menu" label="Built-in private key database"/>
-        <menuitem label="Bob Lord's iButton"/>
-      </menupopup>
-    </menulist>
--->
-<separator/>
-
-<groupbox>
-<grid>
- <columns>
-   <column/>
-   <column/> 
- </columns>
- <rows>
-   <row>
-     <label value="&setPassword.oldPassword.label;"/> 
-     <textbox id="oldpw" type="password"/>
-     <!-- This textbox is inserted as a workaround to the fact that making the 'type' 
-          & 'disabled' property of the 'oldpw' textbox toggle between ['password' & 
-          'false'] and ['text' & 'true'] - as would be necessary if the menu has more 
-          than one tokens, some initialized and some not - does not work properly. So, 
-          either the textbox 'oldpw' or the textbox 'message' would be displayed, 
-          depending on the state of the token selected 
-     -->
-     <textbox id="message" disabled="true" />
-   </row>
-   <row>
-     <label value="&setPassword.newPassword.label;"/> 
-     <textbox id="pw1" type="password" 
-       onkeypress="setPasswordStrength(); checkPasswords();"/> 
-   </row>
-   <row>
-     <label value="&setPassword.reenterPassword.label;"/> 
-     <textbox id="pw2" type="password" onkeypress="checkPasswords();"/>  
-   </row>
- </rows>
-</grid>
-</groupbox>
-
-<groupbox>
- <caption label="&setPassword.meter.label;"/>
- <progressmeter id="pwmeter" mode="determined" 
-                  value="0"/>
-</groupbox>
-
-<separator/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<hbox>
-<button id="ok-button" label="&ok.label;"
-        oncommand="setPassword();" disabled="true" default="true"/>
-<button id="cancel-button" label="&cancel.label;"
-        oncommand="window.close();"/> 
-<button id="help-button" label="&help.label;"
-        oncommand="openHelp('chrome://help/content/help.xul?change_pwd');"/> 
-</hbox>
-
-
-</vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/choosetoken.js

@@ -1,58 +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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- * David Drinan.
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-
-function onLoad()
-{
-    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-    var selectElement = document.getElementById("tokens");
-    for (var i=1; i <= dialogParams.GetInt(1); i++) {
-        var menuItemNode = document.createElement("menuitem");
-        var token = dialogParams.GetString(i);
-        menuItemNode.setAttribute("value", token);
-        menuItemNode.setAttribute("label", token);
-        selectElement.firstChild.appendChild(menuItemNode);
-        if (i == 1) {
-            selectElement.selectedItem = menuItemNode;
-        }
-    }
-}
-
-function doOK()
-{
-  var tokenList = document.getElementById("tokens");
-  var token = tokenList.value;
-  dialogParams.SetInt(1,1);
-  dialogParams.SetString(1, token);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/choosetoken.xul

@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  - 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.org code.
-  -
-  - The Initial Developer of the Original Code is Netscape
-  - Communications Corporation.  Portions created by Netscape are
-  - Copyright (C) 2001 Netscape Communications Corporation. All
-  - Rights Reserved.
-  -
-  - Contributor(s):
-  - David Drinan (ddrinan@netscape.com)
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="ssl_warning" title="&chooseToken.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="360"
-  width="400"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-    <groupbox>
-    <description>&chooseToken.message1;</description>
-    <menulist id="tokens">
-        <menupopup/>
-    </menulist>
-    </groupbox>
-  <separator />
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?which_token');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/clientauthask.js

@@ -1,92 +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 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):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var dialogParams;
-var itemCount = 0;
-
-function onLoad()
-{
-    var cn;
-    var org;
-    var issuer;
-
-    dialogParams = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-    cn = dialogParams.GetString(1);
-    org = dialogParams.GetString(2);
-    issuer = dialogParams.GetString(3);
-
-    var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-    var message1 = bundle.formatStringFromName("clientAuthMessage1", 
-                                             [org],
-                                             1);
-    var message2 = bundle.formatStringFromName("clientAuthMessage2",
-                                             [issuer],
-                                             1);
-    setText("hostname", cn);
-    setText("organization", message1);
-    setText("issuer", message2);
-
-    var selectElement = document.getElementById("nicknames");
-    itemCount = dialogParams.GetInt(1);
-    for (var i=0; i < itemCount; i++) {
-        var menuItemNode = document.createElement("menuitem");
-        var nick = dialogParams.GetString(i+4);
-        menuItemNode.setAttribute("value", i);
-        menuItemNode.setAttribute("label", nick); // this is displayed
-        selectElement.firstChild.appendChild(menuItemNode);
-        if (i == 0) {
-            selectElement.selectedItem = menuItemNode;
-        }
-    }
-
-    setDetails();
-}
-
-function setDetails()
-{
-  var index = parseInt(document.getElementById("nicknames").value);
-  details = dialogParams.GetString(index+itemCount+4);
-  document.getElementById("details").value = details;
-}
-
-function onCertSelected()
-{
-  setDetails();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  var index = parseInt(document.getElementById("nicknames").value);
-  dialogParams.SetInt(2, index);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/clientauthask.xul

@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - 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.
-   -
-   -
-   - Contributor(s):
-   - David Drinan (ddrinan@netscape.com)
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-
-<window id="ssl_warning" title="&clientAuthAsk.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<vbox style="margin: 5px;">
-    <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
-    <description id="hostname"/>
-    <description id="organization"/>
-    <description id="issuer"/>
-    </groupbox>
-    <groupbox>
-    <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
-    <broadcaster id="certSelected" oncommand="onCertSelected();"/>
-    <!-- The items in this menulist must never be sorted,
-         but remain in the order filled by the application
-    -->
-    <menulist id="nicknames" observes="certSelected">
-        <menupopup/>
-    </menulist>
-    <description>&clientAuthAsk.message3;</description>
-    <textbox readonly="true" id="details" multiline="true"
-      style="height: 11em; width=80em;"/>
-    </groupbox>
-  <separator/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-     style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?which_cert');" /> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/contents.rdf

@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:pippki"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:pippki"
-        chrome:displayName="pippki"
-        chrome:author="PSM Team"
-        chrome:name="pippki"
- 	chrome:localeVersion="0.9.6">
-  </RDF:Description>
-
-  <!-- Declare overlay points used in this package -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://navigator/content/pageInfo.xul"/>
-  </RDF:Seq>
-
-  <!-- Define the local overlay file(s) for each overlay point -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://pippki/content/PrefOverlay.xul</RDF:li>
-  </RDF:Seq>
-  <RDF:Seq about="chrome://navigator/content/pageInfo.xul">
-    <RDF:li>chrome://pippki/content/PageInfoOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>  
-

mozilla/security/manager/pki/resources/content/createCertInfo.js

@@ -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 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.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.
- */
-
-var keygenThread;
-
-function onLoad()
-{
-  keygenThread = window.arguments[0].QueryInterface(Components.interfaces.nsIKeygenThread);
-  
-  if (!keygenThread) {
-    window.close();
-    return;
-  }
-  
-  setCursor("wait");
-  
-  keygenThread.startKeyGeneration(window);
-}
-
-function onClose()
-{
-  setCursor("default");
-
-  var alreadyClosed = new Object();
-  keygenThread.userCanceled(alreadyClosed);
-}

mozilla/security/manager/pki/resources/content/createCertInfo.xul

@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - 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.
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window
-  id="domainMismatch" title="&createCertInfo.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();"
-  onclose="onClose();"
->
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="createCertInfo.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
-
-<vbox style="margin: 5px; max-width: 50em;">
-
-  <description>&createCertInfo.msg1;</description>
-  <separator/>
-  <description style="font-weight: bold; text-align: center; text-decoration: blink;">&createCertInfo.msg2;</description>
-  <separator/>
-
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/crlManager.js

@@ -1,105 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  David Drinan <ddrinan@netscape.com>
- */
-
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsICrlEntry = Components.interfaces.nsICrlEntry;
-const nsISupportsArray = Components.interfaces.nsISupportsArray;
-
-var certdb;
-var crls;
-
-function onLoad()
-{
-  var crlEntry;
-  var i;
-
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  crls = certdb.getCrls();
-
-  for (i=0; i<crls.Count(); i++) {
-    crlEntry = crls.GetElementAt(i).QueryInterface(nsICrlEntry);
-    var org = crlEntry.org;
-    var orgUnit = crlEntry.orgUnit;
-    var lastUpdate = crlEntry.lastUpdate;
-    var nextUpdate = crlEntry.nextUpdate;
-    AddItem("crlList", [org, orgUnit, lastUpdate, nextUpdate], "crltree_", i);
-  }
-}
-
-function AddItem(children,cells,prefix,idfier)
-{
-  var kids = document.getElementById(children);
-  var item  = document.createElement("treeitem");
-  var row   = document.createElement("treerow");
-  for(var i = 0; i < cells.length; i++)
-  {
-    var cell  = document.createElement("treecell");
-    cell.setAttribute("class", "propertylist");
-    cell.setAttribute("label", cells[i])
-    row.appendChild(cell);
-  }
-  item.appendChild(row);
-  item.setAttribute("id",prefix + idfier);
-  kids.appendChild(item);
-}
-
-function DeleteCrlSelected() {
-  var crlEntry;
-
-  // delete selected item
-  var crltree = document.getElementById("crltree");
-  var i = crltree.selectedIndex;
-
-  // Delete it
-  certdb.deleteCrl(i);
-  DeleteItemSelected("crltree", "crltree_", "crlList");
-  if( !crltree.selectedItems.length ) {
-    if( !document.getElementById("deleteCrl").disabled ) {
-      document.getElementById("deleteCrl").setAttribute("disabled", "true")
-    }
-  }
-}
-
-function EnableCrlActions() {
-  document.getElementById("deleteCrl").removeAttribute("disabled", "true");
-  // document.getElementById("updateCrl").removeAttribute("disabled", "true");
-}
-
-function DeleteItemSelected(tree, prefix, kids) {
-  var i;
-  var delnarray = [];
-  var rv = "";
-  var cookietree = document.getElementById(tree);
-  var selitems = cookietree.selectedItems;
-  for(i = 0; i < selitems.length; i++) 
-  { 
-    delnarray[i] = document.getElementById(selitems[i].getAttribute("id"));
-    var itemid = parseInt(selitems[i].getAttribute("id").substring(prefix.length,selitems[i].getAttribute("id").length));
-    rv += (itemid + ",");
-  }
-  for(i = 0; i < delnarray.length; i++) 
-  { 
-    document.getElementById(kids).removeChild(delnarray[i]);
-  }
-  return rv;
-}

mozilla/security/manager/pki/resources/content/crlManager.xul

@@ -1,80 +0,0 @@
-<?xml version="1.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 Communicator client code, released
-  March 31, 1998.
-  
-  The Initial Developer of the Original Code is Netscape
-  Communications Corporation. Portions created by Netscape are
-  Copyright (C) 1998-1999 Netscape Communications Corporation. All
-  Rights Reserved.
-  
-  Contributor(s):
-    David Drinan (ddrinan@netscape.com)
--->
-
-<!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!-- CHANGE THIS WHEN MOVING FILES -->
-<!DOCTYPE window [
-    <!ENTITY % prefValDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
-    %prefValDTD;
-    <!ENTITY % prefCertMgrDTD SYSTEM "chrome://pippki/locale/certManager.dtd">
-    %prefCertMgrDTD;
-]>
-
-<window id="crlviewer"
-        class="dialog"
-        title="&validation.crlmanager.label;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: 30em;"
-        onload="onLoad();">
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
-
-  <description value="&validation.crlmanager.label;"/>
-  <separator class="thin"/>
-  <tree id="crltree" style="height: 10em;"
-   multiple="false" onclick="EnableCrlActions()" flex="1">
-    <treecolgroup>
-      <treecol flex="3" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="5" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="2" width="0"/>
-      <splitter class="tree-splitter"/>
-      <treecol flex="2" width="0"/>
-    </treecolgroup>
-    <treehead>
-      <treerow>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&certmgr.certdetail.o;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&certmgr.certdetail.ou;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&validation.crllastupdate.label;"/>
-        <treecell class="treecell-header sortDirectionIndicator"
-                  label="&validation.crlnextupdate.label;"/>
-      </treerow>          
-    </treehead>
-    <treechildren id="crlList" flex="1"/>
-  </tree>
-  <hbox>
-    <button id="deleteCrl" disabled="true"
-            label="&validation.deletecrl.label;"
-            oncommand="DeleteCrlSelected();"/>
-  </hbox>
-  <separator class="thin"/>
-</window>

mozilla/security/manager/pki/resources/content/deletecert.js

@@ -1,126 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-
-var certdb;
-var certs = [];
-var helpUrl;
-
-function setWindowName()
-{
-  var params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-  
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  
-  var typeFlag = params.GetString(1);
-  var numberOfCerts = params.GetInt(2);
-  var dbkey;
-  for(var x=0; x<numberOfCerts;x++)
-  {
-     dbkey = params.GetString(x+3);
-     certs[x] = certdb.getCertByDBKey(dbkey , null);
-  }
-  
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var title;
-  var confirm;
-  var impact;
-  
-  if(typeFlag == bundle.GetStringFromName("deleteUserCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteUserCertTitle");
-     confirm = bundle.GetStringFromName("deleteUserCertConfirm");
-     impact = bundle.GetStringFromName("deleteUserCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_my_certs"
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteSslCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteSslCertTitle");
-     confirm = bundle.GetStringFromName("deleteSslCertConfirm");
-     impact = bundle.GetStringFromName("deleteSslCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_web_certs"
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteCaCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteCaCertTitle");
-     confirm = bundle.GetStringFromName("deleteCaCertConfirm");
-     impact = bundle.GetStringFromName("deleteCaCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_ca_certs"   
-  }
-  else if(typeFlag == bundle.GetStringFromName("deleteEmailCertFlag"))
-  {
-     title = bundle.GetStringFromName("deleteEmailCertTitle");
-     confirm = bundle.GetStringFromName("deleteEmailCertConfirm");
-     impact = bundle.GetStringFromName("deleteEmailCertImpact");
-     helpUrl = "chrome://help/content/help.xul?delete_email_certs"
-  }
-  else
-  {
-     return;
-  }
-  var windowReference = document.getElementById('deleteCertificate');
-  var confirReference = document.getElementById('confirm');
-  var impactReference = document.getElementById('impact');
-  windowReference.setAttribute("title", title);
-  
-  setText("confirm",confirm);
-
-  var box=document.getElementById("certlist");
-  var text;
-  for(var x=0;x<certs.length;x++)
-  {
-    text = document.createElement("text");
-    text.setAttribute("value",certs[x].commonName);
-    box.appendChild(text);
-  }
-
-  setText("impact",impact);
-
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("height",window.innerHeight + 40);
-
-  
-}
-
-function doOK()
-{
-  for(var i=0;i<certs.length;i++)
-  {
-    certdb.deleteCertificate(certs[i]);
-  }
-  window.close();
-}
-
-function doHelp()
-{
-   openHelp(helpUrl);
-}

mozilla/security/manager/pki/resources/content/deletecert.xul

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="deleteCertificate" 
-  title="&certmgr.deletecert.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();"
-  style="width:8ex">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="pippki.js" />
-
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-  </keyset>
-
-  <vbox flex="1">
-     <description id="confirm"/>
-     <separator />
-     <vbox id="certlist" flex="100%"/>
-     <description id="impact"/>
-     <separator />
-
-    <hbox align="center">
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="doHelp();"/> 
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/device_manager.js

@@ -1,420 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIFilePicker = Components.interfaces.nsIFilePicker;
-const nsFilePicker = "@mozilla.org/filepicker;1";
-const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
-const nsIPKCS11Module = Components.interfaces.nsIPKCS11Module;
-const nsPKCS11ModuleDB = "@mozilla.org/security/pkcs11moduledb;1";
-const nsIPKCS11ModuleDB = Components.interfaces.nsIPKCS11ModuleDB;
-const nsIPK11Token = Components.interfaces.nsIPK11Token;
-const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
-const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
-
-var bundle;
-var secmoddb;
-
-/* Do the initial load of all PKCS# modules and list them. */
-function LoadModules()
-{
-  bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  secmoddb = Components.classes[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
-  var modules = secmoddb.listModules();
-  var done = false;
-  try {
-    modules.isDone();
-  } catch (e) { done = true; }
-  while (!done) {
-    var module = modules.currentItem().QueryInterface(nsIPKCS11Module);
-    if (module) {
-      var slotnames = [];
-      var slots = module.listSlots();
-      var slots_done = false;
-      try {
-        slots.isDone();
-      } catch (e) { slots_done = true; }
-      while (!slots_done) {
-        var slot = null;
- 	try {
-          slot = slots.currentItem().QueryInterface(nsIPKCS11Slot);
-        } catch (e) { slot = null; }
-        // in the ongoing discussion of whether slot names or token names
-        // are to be shown, I've gone with token names because NSS will
-        // prefer lookup by token name.  However, the token may not be
-        // present, so maybe slot names should be listed, while token names
-        // are "remembered" for lookup?
-	if (slot != null) {
-          if (slot.tokenName)
-            slotnames[slotnames.length] = slot.tokenName;
-          else
-            slotnames[slotnames.length] = slot.name;
-	}
-        try {
-          slots.next();
-        } catch (e) { slots_done = true; }
-      }
-      AddModule(module.name, slotnames);
-    }
-    try {
-      modules.next();
-    } catch (e) { done = true; }
-  }
-  /* Set the text on the fips button */
-  SetFIPSButtonText();
-}
-
-function SetFIPSButtonText()
-{
-  var fipsButton = document.getElementById("fipsbutton");
-  var label;
-  if (secmoddb.isFIPSEnabled) {
-   label = bundle.GetStringFromName("disable_fips"); 
-  } else {
-   label = bundle.GetStringFromName("enable_fips"); 
-  }
-  fipsButton.setAttribute("label", label);
-}
-
-/* Add a module to the tree.  slots is the array of slots in the module,
- * to be represented as children.
- */
-function AddModule(module, slots)
-{
-  var tree = document.getElementById("device_list");
-  var item  = document.createElement("treeitem");
-  var row  = document.createElement("treerow");
-  var cell = document.createElement("treecell");
-  cell.setAttribute("class", "propertylist");
-  cell.setAttribute("label", module);
-  cell.setAttribute("style", "font-weight: bold");
-  cell.setAttribute("crop", "never");
-  row.appendChild(cell);
-  item.appendChild(row);
-  var parent = document.createElement("treechildren");
-  for (var i = 0; i<slots.length; i++) {
-    var child_item = document.createElement("treeitem");
-    var child_row = document.createElement("treerow");
-    var child_cell = document.createElement("treecell");
-    child_cell.setAttribute("label", slots[i]);
-    child_cell.setAttribute("class", "treecell-indent");
-    child_row.appendChild(child_cell);
-    child_item.appendChild(child_row);
-    child_item.setAttribute("pk11kind", "slot");
-    parent.appendChild(child_item);
-  }
-  item.appendChild(parent);
-  item.setAttribute("pk11kind", "module");
-  item.setAttribute("open", "true");
-  item.setAttribute("container", "true");
-  tree.appendChild(item);
-}
-
-var selected_slot;
-var selected_module;
-
-/* get the slot selected by the user (can only be one-at-a-time) */
-function getSelectedItem()
-{
-  var tree = document.getElementById('device_tree');
-  var items = tree.selectedItems;
-  selected_slot = null;
-  selected_module = null;
-  if (items.length > 0) {
-    var kind = items[0].getAttribute("pk11kind");
-    var module_name;
-    if (kind == "slot") {
-      // get the module cell for this slot cell
-      var cell = items[0].parentNode.parentNode.firstChild.firstChild;
-      module_name = cell.getAttribute("label");
-      var module = secmoddb.findModuleByName(module_name);
-      // get the cell for the selected row (the slot to display)
-      cell = items[0].firstChild.firstChild;
-      var slot_name = cell.getAttribute("label");
-      selected_slot = module.findSlotByName(slot_name);
-    } else { // (kind == "module")
-      // get the cell for the selected row (the module to display)
-      cell = items[0].firstChild.firstChild;
-      module_name = cell.getAttribute("label");
-      selected_module = secmoddb.findModuleByName(module_name);
-    }
-  }
-}
-
-function enableButtons()
-{
-  var login_toggle = "true";
-  var logout_toggle = "true";
-  var pw_toggle = "true";
-  var unload_toggle = "true";
-  getSelectedItem();
-  if (selected_module) {
-    unload_toggle = "false";
-    showModuleInfo();
-  } else if (selected_slot) {
-    // here's the workaround - login functions are all with token,
-    // so grab the token type
-    var selected_token = selected_slot.getToken();
-    if (selected_token != null) {
-      if (selected_token.needsLogin() || !(selected_token.needsUserInit)) {
-        pw_toggle = "false";
-        if(selected_token.needsLogin()) {
-          if (selected_token.isLoggedIn()) {
-            logout_toggle = "false";
-          } else {
-            login_toggle = "false";
-          }
-        }
-      }
-    }
-    showSlotInfo();
-  }
-  var thebutton = document.getElementById('login_button');
-  thebutton.setAttribute("disabled", login_toggle);
-  thebutton = document.getElementById('logout_button');
-  thebutton.setAttribute("disabled", logout_toggle);
-  thebutton = document.getElementById('change_pw_button');
-  thebutton.setAttribute("disabled", pw_toggle);
-  thebutton = document.getElementById('unload_button');
-  thebutton.setAttribute("disabled", unload_toggle);
-  // not implemented
-  //thebutton = document.getElementById('change_slotname_button');
-  //thebutton.setAttribute("disabled", toggle);
-}
-
-// clear the display of information for the slot
-function ClearInfoList()
-{
-  var info_list = document.getElementById("info_list");
-  while (info_list.firstChild)
-      info_list.removeChild(info_list.firstChild);
-}
-
-// show a list of info about a slot
-function showSlotInfo()
-{
-  ClearInfoList();
-  switch (selected_slot.status) {
-   case nsIPKCS11Slot.SLOT_DISABLED:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_disabled"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_NOT_PRESENT:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_notpresent"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_UNINITIALIZED:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_uninitialized"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_NOT_LOGGED_IN:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_notloggedin"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_LOGGED_IN:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_loggedin"), 
-                "tok_status");
-     break;
-   case nsIPKCS11Slot.SLOT_READY:
-     AddInfoRow(bundle.GetStringFromName("devinfo_status"), 
-                bundle.GetStringFromName("devinfo_stat_ready"), 
-                "tok_status");
-     break;
-  }
-  AddInfoRow(bundle.GetStringFromName("devinfo_desc"), 
-             selected_slot.desc, "slot_desc");
-  AddInfoRow(bundle.GetStringFromName("devinfo_manID"), 
-             selected_slot.manID, "slot_manID");
-  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
-             selected_slot.HWVersion, "slot_hwv");
-  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
-             selected_slot.FWVersion, "slot_fwv");
-}
-
-function showModuleInfo()
-{
-  ClearInfoList();
-  AddInfoRow(bundle.GetStringFromName("devinfo_modname"),
-             selected_module.name, "module_name");
-  AddInfoRow(bundle.GetStringFromName("devinfo_modpath"),
-             selected_module.libName, "module_path");
-}
-
-// add a row to the info list, as [col1 col2] (ex.: ["status" "logged in"])
-function AddInfoRow(col1, col2, cell_id)
-{
-  var tree = document.getElementById("info_list");
-  var item  = document.createElement("treeitem");
-  var row  = document.createElement("treerow");
-  var cell1 = document.createElement("treecell");
-  cell1.setAttribute("label", col1);
-  cell1.setAttribute("crop", "never");
-  row.appendChild(cell1);
-  var cell2 = document.createElement("treecell");
-  cell2.setAttribute("label", col2);
-  cell2.setAttribute("crop", "never");
-  cell2.setAttribute("id", cell_id);
-  row.appendChild(cell2);
-  item.appendChild(row);
-  tree.appendChild(item);
-}
-
-// log in to a slot
-function doLogin()
-{
-  getSelectedItem();
-  // here's the workaround - login functions are with token
-  var selected_token = selected_slot.getToken();
-  try {
-    selected_token.login(false);
-    var tok_status = document.getElementById("tok_status");
-    if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label", 
-                          bundle.GetStringFromName("devinfo_stat_loggedin"));
-    } else {
-      tok_status.setAttribute("label",
-                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
-    }
-  } catch (e) {
-    var alertStr = bundle.GetStringFromName("login_failed"); 
-    alert(alertStr);
-  }
-  enableButtons();
-}
-
-// log out of a slot
-function doLogout()
-{
-  getSelectedItem();
-  // here's the workaround - login functions are with token
-  var selected_token = selected_slot.getToken();
-  try {
-    selected_token.logout(false);
-    var tok_status = document.getElementById("tok_status");
-    if (selected_token.isLoggedIn()) {
-      tok_status.setAttribute("label", 
-                          bundle.GetStringFromName("devinfo_stat_loggedin"));
-    } else {
-      tok_status.setAttribute("label",
-                       bundle.GetStringFromName("devinfo_stat_notloggedin"));
-    }
-  } catch (e) {
-  }
-  enableButtons();
-}
-
-// load a new device
-function doLoad()
-{
-  //device.loaddlg.width=300
-  //device.loaddlg.height=200
-  var dlgWidth = bundle.GetStringFromName("device.loaddlg.width");
-  var dlgHeight = bundle.GetStringFromName("device.loaddlg.height");
-  //
-  window.open("load_device.xul", "loaddevice", 
-              "chrome,width=" + dlgWidth + ",height="+ dlgHeight+ ",resizable=1,dialog=1,modal=1");
-  var device_list = document.getElementById("device_list");
-  while (device_list.firstChild)
-    device_list.removeChild(device_list.firstChild);
-  LoadModules();
-}
-
-function doUnload()
-{
-  getSelectedItem();
-  if (selected_module) {
-    pkcs11.deletemodule(selected_module.name);
-    var device_list = document.getElementById("device_list");
-    while (device_list.firstChild)
-      device_list.removeChild(device_list.firstChild);
-    LoadModules();
-  }
-}
-
-function changePassword()
-{
-  getSelectedItem();
-  token = selected_slot.getToken();
-  window.open("changepassword.xul",
-              selected_slot.tokenName, 
-              "chrome,resizable=1,modal=1,dialog=1");
-  showSlotInfo();
-  enableButtons();
-}
-
-// browse fs for PKCS#11 device
-function doBrowseFiles()
-{
-  var srbundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var fp = Components.classes[nsFilePicker].createInstance(nsIFilePicker);
-  fp.init(window,
-          srbundle.GetStringFromName("loadPK11TokenDialog"),
-          nsIFilePicker.modeOpen);
-  fp.appendFilters(nsIFilePicker.filterAll);
-  if (fp.show() == nsIFilePicker.returnOK) {
-    var pathbox = document.getElementById("device_path");
-    pathbox.setAttribute("value", fp.file.persistentDescriptor);
-  }
-}
-
-function doLoadDevice()
-{
-  var name_box = document.getElementById("device_name");
-  var path_box = document.getElementById("device_path");
-  pkcs11.addmodule(name_box.value, path_box.value, 0,0);
-  window.close();
-}
-
-// -------------------------------------   Old code
-
-function showTokenInfo()
-{
-  ClearInfoList();
-  getSelectedToken();
-  AddInfoRow(bundle.GetStringFromName("devinfo_label"), 
-             selected_token.tokenLabel, "tok_label");
-  AddInfoRow(bundle.GetStringFromName("devinfo_manID"),
-             selected_token.tokenManID, "tok_manID");
-  AddInfoRow(bundle.GetStringFromName("devinfo_serialnum"), 
-             selected_token.tokenSerialNumber, "tok_sNum");
-  AddInfoRow(bundle.GetStringFromName("devinfo_hwversion"),
-             selected_token.tokenHWVersion, "tok_hwv");
-  AddInfoRow(bundle.GetStringFromName("devinfo_fwversion"),
-             selected_token.tokenFWVersion, "tok_fwv");
-}
-
-function toggleFIPS()
-{
-  secmoddb.toggleFIPSMode();
-  //Remove the existing listed modules so that re-fresh doesn't 
-  //display the module that just changed.
-  var device_list = document.getElementById("device_list");
-  while (device_list.firstChild)
-    device_list.removeChild(device_list.firstChild);
-
-  LoadModules();
-}

mozilla/security/manager/pki/resources/content/device_manager.xul

@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
-%deviceManangerDTD;
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-<window id="devicemanager" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        title="&devmgr.title;"
-        persist="screenX screenY width height"
-        onload="LoadModules();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<grid flex="1">
-  <columns>
-    <column flex="1"/> 
-    <column flex="1"/> 
-    <column flex="1"/> 
-  </columns>
-  <rows>
-    <row>
-      <hbox flex="1"> <!-- List of devices -->
-        <tree id="device_tree" rows="12" multiple="false"
-              onselect="enableButtons();"
-              flex="1" style="min-width:15em">
-          <treecolgroup> 
-            <treecol flex="1"/> 
-          </treecolgroup>
-          <treehead>
-            <treerow>
-              <treecell class="treecell-header" 
-                        label="&devmgr.devlist.label;"
-                        flex="1"/>
-            </treerow>
-          </treehead>
-          <treechildren id="device_list"/>
-        </tree>
-      </hbox> <!-- / List of devices -->
-      <hbox flex="1"> <!-- Device status -->
-        <tree id="info_tree" rows="12" multiple="false" 
-              class="list" flex="1" style="min-width:10em">
-          <treecolgroup> 
-            <treecol flex="5"/> 
-            <treecol flex="7"/> 
-          </treecolgroup>
-          <treehead>
-            <treerow>
-              <treecell class="treecell-header"
-                        label="&devmgr.details.title;" flex="2"/>
-              <treecell class="treecell-header"
-                        label="&devmgr.details.title2;" flex="7"/>
-            </treerow>
-          </treehead>
-          <treechildren id="info_list"/>
-        </tree>
-      </hbox> <!-- / Device status -->
-      <vbox> <!-- Buttons for manipulating devices -->
-        <button id="login_button" 
-                label="&devmgr.button.login.label;"
-                oncommand="doLogin();" disabled="true"/> 
-        <button id="logout_button" 
-                label="&devmgr.button.logout.label;"
-                oncommand="doLogout();" disabled="true"/> 
-        <button id="change_pw_button" 
-                label="&devmgr.button.changepw.label;"
-                oncommand="changePassword();" disabled="true"/> 
-        <button id="load_button" 
-                label="&devmgr.button.load.label;"
-                oncommand="doLoad();"/> 
-        <button id="unload_button" 
-                label="&devmgr.button.unload.label;"
-                oncommand="doUnload();" disabled="true"/> 
-        <button id="fipsbutton" 
-                label=""
-                oncommand="toggleFIPS();"/>
-      </vbox> <!-- / Buttons for manipulating devices -->
-    </row>
-    <row>
-      <hbox>
-        <button id="help_button" 
-                label="&help.label;" 
-                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');"/> 
-        <button id="ok_button" 
-                label="&ok.label;" 
-                oncommand="window.close();"/> 
-      </hbox>
-    </row>
-  </rows>
-</grid>
-</window>

mozilla/security/manager/pki/resources/content/domainMismatch.js

@@ -1,80 +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 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):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIX509Cert         = Components.interfaces.nsIX509Cert;
-
-var pkiParams;
-var dialogParams;
-var cert;
-
-function onLoad()
-{
-  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);  
-  var isupport = pkiParams.getISupportAtIndex(1);
-  cert     = isupport.QueryInterface(nsIX509Cert);
-  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
-  var connectURL = dialogParams.GetString(1); 
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-  var message1 = bundle.formatStringFromName("mismatchDomainMsg1", 
-                                             [ connectURL, cert.commonName ],
-                                             2);
-  var message2 = bundle.formatStringFromName("mismatchDomainMsg2", 
-                                             [ connectURL ],
-                                              1);
-  setText("message1", message1);
-  setText("message2", message2);
-  //Set the focus so key press events work
-  document.getElementById('ok-button').focus();
-
-  var xulWindow = document.getElementById("domainMismatch");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 40);
-   
-}
-
-function viewCert()
-{
-  cert.view();
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/domainMismatch.xul

@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - 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.
-   -
-   -
-   - Contributor(s):
-   -  Javier Delgadillo <javi@netscape.com>
-   -  Bob Lord <lord@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="domainMismatch" title="&domainMismatch.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  width="320"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/domainMismatch.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK()"    />
-  <key id="return-key" keycode="VK_RETURN" oncommand="doOK()"    />
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel()"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-
-  <description id="message1"/>
-  <separator/>
-  <description id="message2" flex="100%"/>
-
-  <hbox>
-  <button id="examineCert-button" label="&examineCert.label;"
-     oncommand="viewCert();"/> 
-  </hbox>
-  <separator/>
- 
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-  </keyset>
- 
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/downloadcert.js

@@ -1,92 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Bob Lord <lord@netscape.com>
- *  Terry Hayes <thayes@netscape.com>
- */
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-
-var pkiParams;
-var params;
-var caName;
-var cert;
-
-function onLoad()
-{
-  pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  params = pkiParams.QueryInterface(nsIDialogParamBlock);
-  var isupport = pkiParams.getISupportAtIndex(1);
-  cert = isupport.QueryInterface(nsIX509Cert);
-
-  caName = cert.commonName; 
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-  if (!caName.length)
-    caName = bundle.GetStringFromName("unnamedCA");
-
-  var message2 = bundle.formatStringFromName("newCAMessage1",
-                                             [ caName ],
-                                              1);
-  setText("message2", message2);
-
-  var xulWindow = document.getElementById("download_cert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 40);
-}
-
-function viewCert()
-{
-  cert.view();
-}
-
-function doOK()
-{
-  var checkSSL = document.getElementById("trustSSL");
-  var checkEmail = document.getElementById("trustEmail");
-  var checkObjSign = document.getElementById("trustObjSign");
-  if (checkSSL.checked)
-    params.SetInt(2,1);
-  else
-    params.SetInt(2,0);
-  if (checkEmail.checked)
-    params.SetInt(3,1);
-  else
-    params.SetInt(3,0);
-  if (checkObjSign.checked)
-    params.SetInt(4,1);
-  else
-    params.SetInt(4,0);
-  params.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  params.SetInt(1,0);
-  window.close();
-}

mozilla/security/manager/pki/resources/content/downloadcert.xul

@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="download_cert" title="&downloadCert.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="320"
-  width="460"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-<vbox style="margin: 5px;" flex="1">
-
-  <!--  Let 'em know what they're doing -->
-  <vbox>
-    <description>&downloadCert.message1;</description>
-  </vbox>
-
-  <separator/>
-
-  <!--  checkboxes for trust bits
-     -  "do you want to?"
-     -  * trust for SSL
-     -  * trust for email
-     -  * trust for object signing
-    -->
-  <vbox>
-    <description id="message2"/>
-    <checkbox label="&downloadCert.trustSSL;"
-              id="trustSSL"/>
-    <checkbox label="&downloadCert.trustEmail;"
-              id="trustEmail"/>
-    <checkbox label="&downloadCert.trustObjSign;"
-              id="trustObjSign"/>
-  </vbox>
-
-  <separator/>
-
-  <!--  buttons for viewing cert and policies
-     -  "suggested you view the following:"
-     -  <>  view cert
-     -  <>  view policy
-    -->
-  <vbox>
-    <description>&downloadCert.message3;</description>
-    <separator/>
-    <grid>
-      <columns>
-        <column/>
-        <column/>
-      </columns>
-      <rows>
-        <row>
-          <button id="viewC-button"
-                  label="&downloadCert.viewCert.label;"
-                  oncommand="viewCert();"/> 
-          <description style="margin: 4px;">&downloadCert.viewCert.text;</description>
-        </row>
-      </rows>
-    </grid>
-  </vbox>
-
-  <separator/>
-
-  <!--  usual runaround
-     -  <ok>  <cancel> <help>
-    -->
-  <hbox align="center">
-    <button id="ok-button" label="&ok.label;"
-            oncommand="doOK();"/> 
-    <button id="cancel-button" label="&cancel.label;"
-            oncommand="doCancel();"/> 
-    <button id="help-button" label="&help.label;"
-            oncommand="openHelp('chrome://help/content/help.xul?new_ca');"/> 
-  </hbox>
-
-</vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/editcacert.xul

@@ -1,70 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="editCaCert" 
-        title="&certmgr.editcacert.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="setWindowName();"
->
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description id="certmsg"/>
-    <separator />
-    <description flex="100%">&certmgr.editcert.edittrust;</description>
-    <vbox flex="100%">
-      <checkbox label="&certmgr.editcert.trustssl;"
-                id="trustSSL"/>
-      <checkbox label="&certmgr.editcert.trustemail;"
-                id="trustEmail"/>
-      <checkbox label="&certmgr.editcert.trustobjsign;"
-                id="trustObjSign"/>
-    </vbox>
-
-    <keyset id="keys">
-      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doSSLOK();"/>
-      <key id="return-key" keycode="VK_RETURN" oncommand="doSSLOK();"/>
-      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-    </keyset>
-
-    <hbox>
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/editcerts.js

@@ -1,209 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Bob Lord <lord@netscape.com>
- *  Ian McGreer <mcgreer@netscape.com>
- */
-
-const nsIX509Cert = Components.interfaces.nsIX509Cert;
-const nsX509CertDB = "@mozilla.org/security/x509certdb;1";
-const nsIX509CertDB = Components.interfaces.nsIX509CertDB;
-const nsIPKIParamBlock = Components.interfaces.nsIPKIParamBlock;
-
-var certdb;
-var cert;
-
-function setWindowName()
-{
-  var dbkey = self.name;
-
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  //var pkiParams = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  //var isupport = pkiParams.getISupportAtIndex(1);
-  //cert = isupport.QueryInterface(nsIX509Cert);
-  cert = certdb.getCertByDBKey(dbkey, null);
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var windowReference = document.getElementById('editCaCert');
-
-  var message1 = bundle.formatStringFromName("editTrustCA",
-                                             [ cert.commonName ],
-                                             1);
-  setText("certmsg", message1);
-
-  var ssl = document.getElementById("trustSSL");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
-                          nsIX509CertDB.TRUSTED_SSL)) {
-    ssl.setAttribute("checked", "true");
-  } else {
-    ssl.setAttribute("checked", "false");
-  }
-  var email = document.getElementById("trustEmail");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT, 
-                          nsIX509CertDB.TRUSTED_EMAIL)) {
-    email.setAttribute("checked", "true");
-  } else {
-    email.setAttribute("checked", "false");
-  }
-  var objsign = document.getElementById("trustObjSign");
-  if (certdb.getCertTrust(cert, nsIX509Cert.CA_CERT,  
-                          nsIX509CertDB.TRUSTED_OBJSIGN)) {
-    objsign.setAttribute("checked", "true");
-  } else {
-    objsign.setAttribute("checked", "false");
-  }
-
-  var xulWindow = document.getElementById("editCaCert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 70);
-  
-
-}
-
-function doOK()
-{
-  var ssl = document.getElementById("trustSSL");
-  var email = document.getElementById("trustEmail");
-  var objsign = document.getElementById("trustObjSign");
-  var trustssl = (ssl.checked) ? nsIX509CertDB.TRUSTED_SSL : 0;
-  var trustemail = (email.checked) ? nsIX509CertDB.TRUSTED_EMAIL : 0;
-  var trustobjsign = (objsign.checked) ? nsIX509CertDB.TRUSTED_OBJSIGN : 0;
-  //
-  //  Set the cert trust
-  //
-  certdb.setCertTrust(cert, nsIX509Cert.CA_CERT, 
-                      trustssl | trustemail | trustobjsign);
-  window.close();
-}
-
-function doLoadForSSLCert()
-{
-  var dbkey = self.name;
-
-  //  Get the cert from the cert database
-  certdb = Components.classes[nsX509CertDB].getService(nsIX509CertDB);
-  cert = certdb.getCertByDBKey(dbkey, null);
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var windowReference = document.getElementById('editWebsiteCert');
-
-  var message1 = bundle.formatStringFromName("editTrustSSL",
-                                             [ cert.commonName ],
-                                             1);
-  setText("certmsg", message1);
-
-  setText("issuer", cert.issuerName);
-
-  var cacert = getCaCertForServerCert(cert);
-  if(cacert == null)
-  {
-     setText("explainations",bundle.GetStringFromName("issuerNotKnown"));
-  }
-  else if(certdb.getCertTrust(cacert, nsIX509Cert.CA_CERT,
-                                                nsIX509CertDB.TRUSTED_SSL))
-  {
-     setText("explainations",bundle.GetStringFromName("issuerTrusted"));
-  }
-  else
-  {
-     setText("explainations",bundle.GetStringFromName("issuerNotTrusted"));
-  }
-/*
-  if(cacert == null)
-  {
-     var editButton = document.getElementById('editca-button');
-	 editButton.setAttribute("disabled","true");
-  }
-*/  
-  var trustssl = document.getElementById("trustSSLCert");
-  var notrustssl = document.getElementById("dontTrustSSLCert");
-  if (certdb.getCertTrust(cert, nsIX509Cert.SERVER_CERT, 
-                          nsIX509CertDB.TRUSTED_SSL)) {
-    trustssl.radioGroup.selectedItem = trustssl;
-  } else {
-    trustssl.radioGroup.selectedItem = notrustssl;
-  }
-
-  var xulWindow = document.getElementById("editWebsiteCert");
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  xulWindow.setAttribute("height",window.innerHeight + 70);
-
-}
-
-function doSSLOK()
-{
-  var ssl = document.getElementById("trustSSLCert");
-  //var checked = ssl.getAttribute("value");
-  var trustssl = ssl.selected ? nsIX509CertDB.TRUSTED_SSL : 0;
-  //
-  //  Set the cert trust
-  //
-  certdb.setCertTrust(cert, nsIX509Cert.SERVER_CERT, trustssl);
-  window.close();
-}
-
-function editCaTrust()
-{
-   var cacert = getCaCertForServerCert(cert);
-   if(cacert != null)
-   {
-      window.openDialog('chrome://pippki/content/editcacert.xul', cacert.dbKey,
-                               'chrome,resizable=1,modal');
-   }
-   else
-   {
-      var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-      alert(bundle.GetStringFromName("issuerCertNotFound"));
-   }
-}
-
-function getCaCertForServerCert(cert)
-{
-   var i=1;
-   var nextCertInChain;
-   nextCertInChain = cert;
-   var lastSubjectName="";
-   while(true)
-   {
-     if(nextCertInChain == null)
-     {
-        return null;
-     }
-     if((nextCertInChain.type == nsIX509Cert.CA_CERT) || 
-                                 (nextCertInChain.subjectName = lastSubjectName))
-     {
-        break;
-     }
-
-     lastSubjectName = nextCertInChain.subjectName;
-     nextCertInChain = nextCertInChain.issuer;
-   }
-
-   return nextCertInChain;
-}
-

mozilla/security/manager/pki/resources/content/editsslcert.xul

@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
-
-<window id="editWebsiteCert" 
-        title="&certmgr.editsslcert.title;"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="doLoadForSSLCert();"
->
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-
-  <vbox flex="1">
-    <description id="certmsg"/>
-    <description id="issuer"/>
-    <separator/>
-    <description id="explainations"/>
-    <separator />
-    <description>&certmgr.editsslcert.edittrust;</description>
-    <vbox>
-      <radiogroup id="sslTrustGroup" flex="1">
-        <radio label="&certmgr.editsslcert.dotrust;"
-               id="trustSSLCert"/>
-        <radio label="&certmgr.editsslcert.donttrust;"
-               id="dontTrustSSLCert"/>
-      </radiogroup>
-    </vbox>
-    <hbox>
-      <button id="editca-button" label="&certmgr.editca.label;"
-            oncommand="editCaTrust();"/> 
-    </hbox>
-
-    <hbox> 
-      <button id="ok-button" label="&certmgr.ok.label;"
-              oncommand="doSSLOK();"/> 
-      <button id="cancel-button" label="&certmgr.cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&certmgr.help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');"/>
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/escrowWarn.js

@@ -1,73 +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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsIX509Cert         = Components.interfaces.nsIX509Cert;
-
-var dialogParams;
-var pkiParams;
-var cert=null;
-
-function onLoad()
-{
-  pkiParams    = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
- 
-  var isupports = pkiParams.getISupportAtIndex(1);
-  cert = isupports.QueryInterface(nsIX509Cert); 
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  var dispName = cert.commonName;
-  if (dispName == null)
-    dispName = cert.windowTitle;
-
-  var msg = bundle.formatStringFromName("escrowFinalMessage",
-                                        [dispName], 1);
-  setText("message1",msg);
-
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("height",window.innerHeight + 30);
-
-}
-
-function doOK()
-{
-  dialogParams.SetInt(1,1);
-  window.close();
-}
-
-function doCancel()
-{
-  dialogParams.SetInt(1,0);
-  window.close();
-}
-
-function viewCert()
-{
-  cert.view();
-}

mozilla/security/manager/pki/resources/content/escrowWarn.xul

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - 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.
-   -
-   -
-   - Contributor(s):
-   -  Javier Delgadillo <javi@netscape.com>
-   -  Bob Lord <lord@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="escrowWarnDialog" title="&escrowWarn.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  width="400"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="keys">
-  <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
-  <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
-  <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-</keyset>
-
-<vbox style="margin: 5px;" flex="1">
-
-  <description>&escrowWarn.message1;</description>
-  <separator/>
-  <description>&escrowWarn.benefit1;</description>
-  <separator/>
-  <description>&escrowWarn.message2;</description>
-  <separator/>
-  <description id="message1"/>
-  <hbox>
-  <button id="examineCert-button" label="&examineCert.label;"
-          oncommand="viewCert();"/> 
-  </hbox>
-  <separator/>
-  <hbox>
-  <button id="ok-button" label="&ok.label;"
-          oncommand="doOK();"/> 
-  <button id="cancel-button" label="&cancel.label;"
-          oncommand="doCancel();"/> 
-  <button id="help-button" label="&help.label;"
-          oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');"/> 
-  </hbox>
-</vbox>
-</window>

mozilla/security/manager/pki/resources/content/getp12password.xul

@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="getp12password" title="&pkcs12.getpassword.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="200"
-  width="300"
-  onload="onP12Load();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-  <keyset id="keys">
-    <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
-    <key id="return-key" keycode="VK_RETURN" oncommand="getPassword();"/>
-    <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close();"/>
-  </keyset>
-
-  <vbox style="margin: 5px;" flex="1">
-    <description>&pkcs12.getpassword.message;</description>
-    <separator />
-    <grid>
-      <columns> <column/> <column/> </columns>
-      <rows>
-        <row>
-          <label value="&getPassword.password.label;"/> 
-          <textbox id="pw1" type="password"/> 
-        </row>
-      </rows>
-    </grid>
-    <hbox>
-      <button id="ok-button" label="&ok.label;"
-              oncommand="getPassword();" 
-              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
-      <button id="cancel-button" label="&cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" label="&help.label;"
-              oncommand="openHelp('chrome://help/content/help.xul?my_certs');"/> 
-    </hbox>
-  </vbox>
-</window>

mozilla/security/manager/pki/resources/content/getpassword.xul

@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
-
-<window id="getpassword" title="&getPassword.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  height="320"
-  width="300"
-  onload="onLoad();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-
-  <vbox style="margin: 5px;" flex="1">
-    <hbox>
-      <text value="&getPassword.tokenName.label;:"/>
-      <text id="tokenName"/>
-    </hbox>
-    <separator/>
-    <grid>
-      <columns> <column/> <column/> </columns>
-      <rows>
-        <row>
-          <text value="&getPassword.password.label;"/> 
-          <textbox id="pw1" type="password"/> 
-        </row>
-      </rows>
-    </grid>
-
-    <keyset id="keys">
-      <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
-      <key id="return-key" keycode="VK_RETURN" oncommand="doOK();"/>
-      <key id="esc-key"    keycode="VK_ESCAPE" oncommand="doCancel();"/>
-    </keyset>
-
-    <hbox>
-      <button id="ok-button" class="dialog" label="&ok.label;"
-              oncommand="getPassword();" 
-              default="true" accesskey="&createCertInfo.okButtonAccessKey;"/> 
-      <button id="cancel-button" class="dialog" label="&cancel.label;"
-              oncommand="window.close();"/> 
-      <button id="help-button" class="dialog" label="&help.label;"
-              oncommand="alert('help goes here');"/> 
-    </hbox>
-  </vbox>
-</window>

mozilla/security/manager/pki/resources/content/load_device.xul

@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % deviceManangerDTD SYSTEM "chrome://pippki/locale/deviceManager.dtd">
-%deviceManangerDTD;
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-<window id="loaddevice" 
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        title="&loaddevice.title;">
-
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
-
-  <vbox>
-    <description>&loaddevice.info;</description>
-    <hbox>
-      <label value="&loaddevice.modname;"/>
-      <textbox id="device_name" flex="1" value="&loaddevice.modname.default;"/>
-    </hbox>
-    <hbox>
-      <label value="&loaddevice.filename;"/>
-      <textbox id="device_path" flex="1"/>
-      <button label="&loaddevice.browse;" flex="1" oncommand="doBrowseFiles();"/>
-    </hbox>
-    <hbox>
-      <button id="ok_button"
-              label="&ok.label;" 
-              oncommand="doLoadDevice();"/> 
-      <button id="cancel_button" 
-              label="&cancel.label;" 
-              oncommand="window.close();"/> 
-    </hbox>
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/newserver.js

@@ -1,103 +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 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):
- *  Javier Delgadillo <javi@netscape.com>
- *  Håkan Waara <hwaara@chello.se>
- */
-
-
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsIPKIParamBlock    = Components.interfaces.nsIPKIParamBlock;
-const nsIX509Cert         = Components.interfaces.nsIX509Cert;
-
-var dialogParams;
-var pkiParams;
-var cert;
-
-
-function onLoad()
-{
-
-  doSetOKCancel(doOK, doCancel, doHelpButton);
-
-  pkiParams    = window.arguments[0].QueryInterface(nsIPKIParamBlock);
-  dialogParams = pkiParams.QueryInterface(nsIDialogParamBlock);
-
-  var isupport = pkiParams.getISupportAtIndex(1);
-  cert = isupport.QueryInterface(nsIX509Cert);
-
-  var bundle = srGetStrBundle("chrome://pippki/locale/newserver.properties");
-  var gBundleBrand = srGetStrBundle("chrome://global/locale/brand.properties");
-
-  var brandName = gBundleBrand.GetStringFromName("brandShortName");
-  var continueButton = bundle.GetStringFromName("continueButton");
-
-  document.getElementById("ok").label = continueButton;
-
-  var message = 
-    bundle.formatStringFromName("newServerMessage",
-                                 [cert.commonName],
-                                 1);
-  var notRecognized = 
-    bundle.formatStringFromName("certNotRecognized", 
-                                 [brandName], 
-                                 1);
-
-  setText("message", message);
-  setText("notRecognized", notRecognized);
-
-  var windowReference = document.getElementById('ssl_warning');
-  var wdth = window.innerWidth; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("width",window.innerWidth + 30);
-  var hght = window.innerHeight; // THIS IS NEEDED,
-  window.sizeToContent();
-  windowReference.setAttribute("height",window.innerHeight + 40);
-
-}
-
-function doHelpButton()
-{
-  openHelp('chrome://help/content/help.xul?new_web_cert');
-}
-
-function doOK()
-{
-  // the user pressed OK
-  dialogParams.SetInt(1,1);
-  var checkbox = document.getElementById("alwaysAccept");
-
-  // 0 = accept perm, 1 = accept for this session - just the opposite
-  // of the checkbox value.
-  dialogParams.SetInt(2, !checkbox.checked);
-  window.close();
-}
-
-function doCancel()
-{
-  // the user pressed cancel
-  dialogParams.SetInt(1,0);
-  window.close();
-}
-
-function viewCert()
-{
-  cert.view();
-}

mozilla/security/manager/pki/resources/content/newserver.xul

@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   - 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.
-   -
-   -
-   - Contributor(s):
-   -  Javier Delgadillo <javi@netscape.com>
-   -  Bob Lord <lord@netscape.com>
-   -  Håkan Waara <hwaara@chello.se>
-  -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE window [
-<!ENTITY % newserverDTD SYSTEM "chrome://pippki/locale/newserver.dtd" >
-%newserverDTD;
-<!ENTITY % pippkiDTD SYSTEM "chrome://pippki/locale/pippki.dtd" >
-%pippkiDTD;
-]>
-
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<window id="ssl_warning" title="&newserver.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  style="width: 30em; height: 16em"
-  class="dialog"
-  onload="onLoad();">
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/newserver.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js"/>
-
-<keyset id="dialogKeys"/>
-
-<vbox flex="1">
-  <hbox valign="top" align="center">
-
-    <image class="alert-icon" style="margin: 5px"/>
-    <vbox flex="1" valign="middle">
-
-      <description id="message"/>
-      <separator class="thin"/>
-      <description id="notRecognized"/>
-      <separator/>
-
-      <vbox flex="1" align="start">
-        <button id="examineCert-button" label="&examineCert.label;"
-                oncommand="viewCert();"/> 
-      </vbox>
-
-      <checkbox id="alwaysAccept" label="&alwaysAccept.label;"/>
-
-    </vbox>
-  </hbox>
-
-  <hbox id="okCancelHelpButtonsRight" flex="1"/>
-</vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/password.js

@@ -1,311 +0,0 @@
-/*
- * 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.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- *  Bob Lord <lord@netscape.com>
- *  Terry Hayes <thayes@netscape.com>
- */
-const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
-const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsPKCS11ModuleDB = "@mozilla.org/security/pkcs11moduledb;1";
-const nsIPKCS11ModuleDB = Components.interfaces.nsIPKCS11ModuleDB;
-const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
-const nsIPK11Token = Components.interfaces.nsIPK11Token;
-
-
-var params;
-var tokenName="";
-var pw1;
-
-function onLoad()
-{
-
-  pw1 = document.getElementById("pw1");
-  try {
-     params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-     tokenName = params.GetString(1);
-  }catch(exception)
-	 {tokenName = self.name;}
-
-  if(tokenName=="" || tokenName=="_blank") {
-     var sectokdb = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
-     var tokenList = sectokdb.listTokens();
-     var enumElement;
-     i=0;
-     var menu = document.getElementById("tokenMenu");
-     try {
-        for ( ; !tokenList.isDone(); tokenList.next()) {
-           enumElement = tokenList.currentItem();
-           var token = enumElement.QueryInterface(nsIPK11Token);
-           if(token.needsLogin() || !(token.needsUserInit)) {
-              var menuItemNode = document.createElement("menuitem");
-              menuItemNode.setAttribute("value", token.tokenName);
-              menuItemNode.setAttribute("label", token.tokenName);
-              menu.firstChild.appendChild(menuItemNode);
-              if (i == 0) {
-                 menu.selectedItem = menuItemNode;
-                 tokenName = token.tokenName;
-              }
-              i++;
-           }
-        }
-     }catch(exception){}
-  } else {
-    var sel = document.getElementById("tokenMenu");
-    sel.setAttribute("hidden", "true");
-    var tag = document.getElementById("tokenName");
-    tag.setAttribute("value",tokenName);
-  }
-	 	 
-  process();
-}
-
-function onMenuChange()
-{
-   //get the selected token
-   var list = document.getElementById("tokenMenu");
-   tokenName = list.value;
-
-   process();
-}
-
-
-function process()
-{
-   var secmoddb = Components.classes[nsPKCS11ModuleDB].getService(nsIPKCS11ModuleDB);
-   var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-
-   // If the token is unitialized, don't use the old password box.
-   // Otherwise, do.
-
-   var slot = secmoddb.findSlotByName(tokenName);
-   if (slot) {
-     var oldpwbox = document.getElementById("oldpw");
-     var msgBox = document.getElementById("message");
-     var status = slot.status;
-     if (status == nsIPKCS11Slot.SLOT_UNINITIALIZED
-         || status == nsIPKCS11Slot.SLOT_READY) {
-      
-       oldpwbox.setAttribute("hidden", "true");
-       msgBox.setAttribute("value", bundle.GetStringFromName("password_not_set")); 
-       msgBox.setAttribute("hidden", "false");
-
-       if (status == nsIPKCS11Slot.SLOT_READY) {
-         oldpwbox.setAttribute("inited", "empty");
-       } else {
-         oldpwbox.setAttribute("inited", "true");
-       }
-      
-       // Select first password field
-       document.getElementById('pw1').focus();
-    
-     } else {
-       // Select old password field
-       oldpwbox.setAttribute("hidden", "false");
-       msgBox.setAttribute("hidden", "true");
-       oldpwbox.setAttribute("inited", "false");
-       oldpwbox.focus();
-     }
-   }
-
-  if (params) {
-    // Return value 0 means "canceled"
-    params.SetInt(1, 0);
-  }
-  
-  checkPasswords();
-}
-
-function onP12Load()
-{
-  pw1 = document.getElementById("pw1");
-  params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
-  // Select first password field
-  document.getElementById('pw1').focus();
-}
-
-function setPassword()
-{
-  var pk11db = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
-  var token = pk11db.findTokenByName(tokenName);
-
-  var oldpwbox = document.getElementById("oldpw");
-  var initpw = oldpwbox.getAttribute("inited");
-  var bundle = srGetStrBundle("chrome://pippki/locale/pippki.properties");
-  
-  var success = false;
-  
-  if (initpw == "false" || initpw == "empty") {
-    try {
-      var oldpw = "";
-      var passok = 0;
-      
-      if (initpw == "empty") {
-        passok = 1;
-      } else {
-        oldpw = oldpwbox.value;
-        passok = token.checkPassword(oldpw);
-      }
-      
-      if (passok) {
-        if (initpw == "empty" && pw1.value == "") {
-          // This makes no sense that we arrive here, 
-          // we reached a case that should have been prevented by checkPasswords.
-        } else {
-          token.changePassword(oldpw, pw1.value);
-          if (pw1.value == "") {
-            alert(bundle.GetStringFromName("pw_erased_ok")
-                  + " "
-                  + bundle.GetStringFromName("pw_empty_warning"));
-          } else {
-            alert(bundle.GetStringFromName("pw_change_ok")); 
-          }
-        }
-        success = true;
-      } else {
-        oldpwbox.focus();
-        oldpwbox.setAttribute("value", "");
-        alert(bundle.GetStringFromName("incorrect_pw")); 
-      }
-    } catch (e) {
-      alert(bundle.GetStringFromName("failed_pw_change")); 
-    }
-  } else {
-    token.initPassword(pw1.value);
-    if (pw1.value == "") {
-      alert(bundle.GetStringFromName("pw_not_wanted")
-            + " " 
-            + bundle.GetStringFromName("pw_empty_warning"));
-    }
-    success = true;
-  }
-
-  // Terminate dialog
-  if (success) {
-    if (params) {
-      // Return value 1 means "successfully executed ok"
-      params.SetInt(1, 1);
-    }
-
-    window.close();
-  }
-}
-
-function getPassword()
-{
-  // grab what was entered
-  params.SetString(2, pw1.value);
-  // Return value
-  params.SetInt(1, 1);
-  // Terminate dialog
-  window.close();
-}
-
-function setP12Password()
-{
-  // grab what was entered
-  params.SetString(2, pw1.value);
-  // Return value
-  params.SetInt(1, 1);
-  // Terminate dialog
-  window.close();
-}
-
-function setPasswordStrength()
-{
-// Here is how we weigh the quality of the password
-// number of characters
-// numbers
-// non-alpha-numeric chars
-// upper and lower case characters
-
-  var pw=document.getElementById('pw1').value;
-//  alert("password='" + pw +"'");
-
-//length of the password
-  var pwlength=(pw.length);
-  if (pwlength>5)
-    pwlength=5;
-
-
-//use of numbers in the password
-  var numnumeric = pw.replace (/[0-9]/g, "");
-  var numeric=(pw.length - numnumeric.length);
-  if (numeric>3)
-    numeric=3;
-
-//use of symbols in the password
-  var symbols = pw.replace (/\W/g, "");
-  var numsymbols=(pw.length - symbols.length);
-  if (numsymbols>3)
-    numsymbols=3;
-
-//use of uppercase in the password
-  var numupper = pw.replace (/[A-Z]/g, "");
-  var upper=(pw.length - numupper.length);
-  if (upper>3)
-    upper=3;
-
-
-  var pwstrength=((pwlength*10)-20) + (numeric*10) + (numsymbols*15) + (upper*10);
-
-  // make sure we're give a value between 0 and 100
-  if ( pwstrength < 0 ) {
-    pwstrength = 0;
-  }
-  
-  if ( pwstrength > 100 ) {
-    pwstrength = 100;
-  }
-
-  var mymeter=document.getElementById('pwmeter');
-  mymeter.setAttribute("value",pwstrength);
-
-  return;
-}
-
-function checkPasswords()
-{
-  var pw1=document.getElementById('pw1').value;
-  var pw2=document.getElementById('pw2').value;
-
-  var ok=document.getElementById('ok-button');
-
-  var oldpwbox = document.getElementById("oldpw");
-  if (oldpwbox) {
-    var initpw = oldpwbox.getAttribute("inited");
-
-    if (initpw == "empty" && pw1 == "") {
-      // The token has already been initialized, therefore this dialog
-      // was called with the intention to change the password.
-      // The token currently uses an empty password.
-      // We will not allow changing the password from empty to empty.
-      ok.setAttribute("disabled","true");
-      return;
-    }
-  }
-
-  if (pw1 == pw2){
-    ok.setAttribute("disabled","false");
-  } else
-  {
-    ok.setAttribute("disabled","true");
-  }
-
-}

mozilla/security/manager/pki/resources/content/pippki.js

@@ -1,37 +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 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):
- *  Javier Delgadillo <javi@netscape.com>
- */
-
-/*
- * These are helper functions to be included
- * pippki UI js files.
- */
-
-function setText(id, value) {
-  var element = document.getElementById(id);
-  if (!element) return;
-     if (element.hasChildNodes())
-       element.removeChild(element.firstChild);
-  var textNode = document.createTextNode(value);
-  element.appendChild(textNode);
-}
-

mozilla/security/manager/pki/resources/content/pref-certs.xul

@@ -1,86 +0,0 @@
-<?xml version="1.0"?> 
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
-  <!ENTITY % prefSec SYSTEM "chrome://pippki/locale/pref-security.dtd">
-  <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
-  %brandDTD;
-  %prefSec;
-  %prefSslDTD;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://pippki/content/pref-certs.xul');">
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-security.js"/>
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = [ "certSelection" ];
-  ]]>
-  </script>
-            
-  <!-- Fancy panel header -->
-  <hbox class="box-smallheader" title="&certs.label;"/>
-
-  <groupbox align="start">
-    <caption label="&SSLClientAuthMethod;"/>
-    <description> &certselect.description; </description>
-    <!-- Prefs -->
-    <radiogroup id="certSelection" orient="horizontal" preftype="string" 
-	        prefstring="security.default_personal_cert">
-    <radio label="&certselect.auto;" value="Select Automatically"/>
-    <radio label="&certselect.ask;" value="Ask Every Time"/>
-    </radiogroup>
-  </groupbox>
-
-  <!-- Certificate manager -->
-  <groupbox>
-    <caption label="&managecerts.label;"/>
-    <description>&managecerts.text;</description>
-    <hbox align="center">
-      <button label="&managecerts.button;"
-              oncommand="openCertManager();" 
-              id="openCertManagerButton"
-              prefstring="security.disable_button.openCertManager"/>
-    </hbox>
-  </groupbox>
-
-  <!-- Device manager -->
-  <groupbox>
-    <caption label="&managedevices.label;"/>
-    <description>&managedevices.text;</description>
-    <hbox align="center">
-      <button label="&managedevices.button;"
-              oncommand="openDeviceManager();"
-              id="openDeviceManagerButton"
-              prefstring="security.disable_button.openDeviceManager"/>
-    </hbox>
-  </groupbox>
-
-</page>

mozilla/security/manager/pki/resources/content/pref-ciphers.xul

@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.com>
-  -->
-
-<!DOCTYPE window SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<window id="pref-ciphers" title="&cipher.title;"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();">
-
-  <script type="application/x-javascript"><![CDATA[
-    var prefs = null;
-
-    function onLoad() {
-      doSetOKCancel(doOK, doCancel);
-
-      // Set checkboxes from prefs
-      const nsIPref = Components.interfaces.nsIPref;
-
-      prefs = Components.classes["@mozilla.org/preferences;1"].getService(nsIPref);
-
-      // Enumerate each checkbox on this page and set value
-      var prefElements = document.getElementsByAttribute("prefstring", "*");
-      for (var i = 0; i < prefElements.length; i++) {
-        var element = prefElements[i];
-        var prefString = element.getAttribute("prefstring");
-        var prefValue = false;
-
-        try {
-          prefValue = prefs.GetBoolPref(prefString);
-        } catch(e) { /* Put debug output here */ }
-
-        element.setAttribute("checked", prefValue);
-        // disable xul element if the pref is locked.
-        if (prefs.PrefIsLocked(prefString)) {
-          element.disabled=true;
-        }
-      }
-    }
-
-    function doOK() {
-     // Save the prefs
-     try {
-      // Enumerate each checkbox on this page and save the value
-      var prefElements = document.getElementsByAttribute("prefstring", "true");
-      for (var i = 0; i < prefElements.length; i++) {
-        var element = prefElements[i];
-        var prefString = element.getAttribute("prefstring");
-        var prefValue = element.getAttribute("checked");
-
-        
-        if (typeof(prefValue) == "string") prefValue = (prefValue == "true");
-
-        prefs.SetBoolPref(prefString, prefValue);
-      }
-
-      prefs.savePrefFile(null);
-     } catch(e) { }
-
-     window.close();
-    }
-
-    function doCancel() {
-      window.close();
-    }
-  ]]></script>
-
-  <vbox style="overflow: hidden;" flex="1">
-
-  <groupbox align="start">
-    <caption label="&cipher.ssl2.label;"/>
-
-    <checkbox label="&cipher.ssl2.rc4_128;"
-              prefstring="security.ssl2.rc4_128"/>
-    <checkbox label="&cipher.ssl2.rc2_128;"
-              prefstring="security.ssl2.rc2_128"/>
-    <checkbox label="&cipher.ssl2.des_ede3_192;"
-              prefstring="security.ssl2.des_ede3_192"/>
-    <checkbox label="&cipher.ssl2.des_64;"
-              prefstring="security.ssl2.des_64"/>
-    <checkbox label="&cipher.ssl2.rc4_40;"
-              prefstring="security.ssl2.rc4_40"/>
-    <checkbox label="&cipher.ssl2.rc2_40;"
-              prefstring="security.ssl2.rc2_40"/>
-
-  </groupbox>
-
-  <groupbox align="start">
-    <caption label="&cipher.ssl3.label;"/>
-
-    <checkbox label="&cipher.ssl3.rsa_rc4_128_md5;"
-              prefstring="security.ssl3.rsa_rc4_128_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_fips_des_ede3_sha;"
-              prefstring="security.ssl3.rsa_fips_des_ede3_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_des_ede3_sha;"
-              prefstring="security.ssl3.rsa_des_ede3_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_fips_des_sha;"
-              prefstring="security.ssl3.rsa_fips_des_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_des_sha;"
-              prefstring="security.ssl3.rsa_des_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_1024_rc4_56_sha;"
-              prefstring="security.ssl3.rsa_1024_rc4_56_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_1024_des_cbc_sha;"
-              prefstring="security.ssl3.rsa_1024_des_cbc_sha"/>
-    <checkbox label="&cipher.ssl3.rsa_rc4_40_md5;"
-              prefstring="security.ssl3.rsa_rc4_40_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_rc2_40_md5;"
-              prefstring="security.ssl3.rsa_rc2_40_md5"/>
-    <checkbox label="&cipher.ssl3.rsa_null_md5;"
-              prefstring="security.ssl3.rsa_null_md5"/>
-  </groupbox>
-
-  <separator/>
-
-  <keyset id="dialogKeys"/>
-  <hbox id="okCancelButtonsRight"/>
-
-  </vbox>
-
-</window>

mozilla/security/manager/pki/resources/content/pref-masterpass.js

@@ -1,114 +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 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):
- *  Javier Delgadillo <javi@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU General Public License Version 2 or later (the
- * "GPL"), in which case the provisions of the GPL are applicable 
- * instead of those above.  If you wish to allow use of your 
- * version of this file only under the terms of the GPL and not to
- * allow others to use your version of this file under the MPL,
- * indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by
- * the GPL.  If you do not delete the provisions above, a recipient
- * may use your version of this file under either the MPL or the
- * GPL.
- */
-
-const nsIPK11Token = Components.interfaces.nsIPK11Token;
-const nsPK11TokenDB = "@mozilla.org/security/pk11tokendb;1";
-const nsIPK11TokenDB = Components.interfaces.nsIPK11TokenDB;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsDialogParamBlock = "@mozilla.org/embedcomp/dialogparam;1";
-
-var internal_token;
-
-function onMasterPasswordLoad()
-{
-  var tokendb = Components.classes[nsPK11TokenDB].getService(nsIPK11TokenDB);
-  internal_token = tokendb.getInternalKeyToken();
-  var askTimes = internal_token.getAskPasswordTimes();
-  switch (askTimes) {
-  case nsIPK11Token.ASK_FIRST_TIME:  askTimes = 0; break;
-  case nsIPK11Token.ASK_EVERY_TIME:  askTimes = 1; break;
-  case nsIPK11Token.ASK_EXPIRE_TIME: askTimes = 2; break;
-  }
-  var radiogroup = document.getElementById("passwordAskTimes");
-  var radioitem;
-  switch (askTimes) {
-  case 0: radioitem = document.getElementById("askFirstTime"); break;
-  case 1: radioitem = document.getElementById("askEveryTime"); break;
-  case 2: radioitem = document.getElementById("askTimeout"); break;
-  }
-  radiogroup.selectedItem = radioitem;
-  var timeout = internal_token.getAskPasswordTimeout();
-  var timeoutField = document.getElementById("passwordTimeout");
-  timeoutField.setAttribute("value", timeout);
-  
-  changePasswordSettings();
-}
-
-function changePasswordSettings()
-{
-  var askTimes = 0;
-  var timeout = internal_token.getAskPasswordTimeout();
-  var timeoutField = document.getElementById("passwordTimeout");
-  var radiogroup = document.getElementById("passwordAskTimes");
-  switch ( radiogroup.value ) {
-  case "0": 
-    timeoutField.setAttribute("disabled", true);
-    askTimes = nsIPK11Token.ASK_FIRST_TIME;
-    break;
-  case "1": 
-    timeoutField.setAttribute("disabled", true);
-    askTimes = nsIPK11Token.ASK_EVERY_TIME;
-    break;
-  case "2":
-    timeoutField.removeAttribute("disabled");
-    timeoutField.focus();
-    timeout = timeoutField.value;
-    var re = new RegExp("^[0-9]+$");
-    if (!re.test(timeout)) {
-      timeout = "1";
-    }
-    askTimes = nsIPK11Token.ASK_EXPIRE_TIME;
-    break;
-  }
-  internal_token.setAskPasswordDefaults(askTimes, timeout);
-
-  var askEveryTimeHidden = document.getElementById("askEveryTimeHidden");
-  askEveryTimeHidden.setAttribute("checked",(radiogroup.value == 1)?"true":"false");
-}
-
-function ChangePW()
-{
-  var params = Components.classes[nsDialogParamBlock].createInstance(nsIDialogParamBlock);
-  params.SetString(1,"_blank");
-  window.openDialog("chrome://pippki/content/changepassword.xul","",
-              "chrome,resizable=1,modal=1,dialog=1",params);
-}
-
-function ResetPW()
-{
-  window.open("chrome://pippki/content/resetpassword.xul",
-              internal_token.tokenName,
-              "centerscreen,chrome,resizable=1,modal=1,dialog=1");
-}

mozilla/security/manager/pki/resources/content/pref-masterpass.xul

@@ -1,109 +0,0 @@
-<?xml version="1.0"?> 
-<!-- 
-   - 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.org code.
-   - 
-   - The Initial Developer of the Original Code is Netscape
-   - Communications Corp.  Portions created by Netscape are
-   - Copyright (C) 2001 Netscape Communications Corp.  All
-   - Rights Reserved.
-   - 
-   - Contributor(s):
-   -   Ian McGreer <mcgreer@netscape.com>
-  -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
-
-<!DOCTYPE window [
-  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
-  <!ENTITY % prefPass SYSTEM "chrome://pippki/locale/pref-masterpass.dtd">
-  %brandDTD;
-  %prefPass;
-]>
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();">
-
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>
-
-  <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["askEveryTimeHidden",
-                       "changePasswordButton",
-                       "resetPasswordButton",
-                       "passwordAskTimes",
-                       "passwordTimeout"];
-  ]]>
-  </script>
-            
-  <!-- Fancy panel header -->
-  <hbox class="box-smallheader" title="&lheader;"/>
-
-  <!-- Change Password -->
-  <groupbox>
-    <caption label="&changepassword.label;"/>
-    <description>&changepassword.text;</description>
-    <hbox align="center">
-      <button label="&changepassword.button;"
-              oncommand="ChangePW();"
-              id="changePasswordButton"
-              prefstring="security.disable_button.changePassword"/>
-    </hbox>
-  </groupbox>
-
-  <!-- Password Prefs -->
-  <groupbox>
-
-    <checkbox id="askEveryTimeHidden"
-              prefstring="signon.expireMasterPassword"
-              hidden="true"/>
-
-    <caption label="&managepassword.label;"/>
-    <description>&managepassword.text;</description>
-    <hbox align="center">
-      <radiogroup id="passwordAskTimes"
-                  prefstring="security.ask_for_password"
-                  flex="1">
-        <!-- note that these values are different than what NSS uses, which
-             are (0, -1, 1) respectively -->
-        <radio value="0" label="&managepassword.askfirsttime;" id="askFirstTime"
-               style="margin: 0px;" oncommand="changePasswordSettings();"/>
-        <radio value="1" label="&managepassword.askeverytime;" id="askEveryTime"
-               style="margin: 0px;" oncommand="changePasswordSettings();"/>
-        <hbox align="center">
-          <radio value="2" label="&managepassword.asktimeout;" id="askTimeout"
-                 style="margin: 0px;" oncommand="changePasswordSettings();"/>
-          <textbox id="passwordTimeout" size="4"
-                   preftype="int"
-                   prefstring="security.password_lifetime"
-                   oninput="changePasswordSettings();"/>
-          <label value="&managepassword.timeout.unit;" style="margin: 4px;"/>
-        </hbox>
-      </radiogroup>
-    </hbox>
-  </groupbox>
-
-  <!-- Reset Password -->
-  <groupbox>
-    <caption label="&resetpassword.label;"/>
-    <description>&resetpassword.text;</description>
-    <hbox align="center">
-      <button label="&resetpassword.button;"
-              oncommand="ResetPW();"
-              id="resetPasswordButton"
-              prefstring="security.disable_button.resetPassword"/>
-    </hbox>
-  </groupbox>
-
-</page>