Synched with Xpdf 1.01

[evince.git] / pdf / xpdf / Annot.cc

diff --git a/pdf/xpdf/FormWidget.cc b/pdf/xpdf/Annot.cc
similarity index 54%
rename from pdf/xpdf/FormWidget.cc
rename to pdf/xpdf/Annot.cc
index 76428d05e6da8e325c1cea32124d0215cae76df0..b9c606f4d47c305aee429846167dbee438073daf 100644 (file)
--- a/pdf/xpdf/FormWidget.cc
+++ b/pdf/xpdf/Annot.cc
@@ -1,8 +1,8 @@
 //========================================================================
 //
-// FormWidget.cc
+// Annot.cc
 //
-// Copyright 2000 Derek B. Noonburg
+// Copyright 2000-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
@@ -10,33 +10,43 @@
 #pragma implementation
 #endif
 
+#include <aconf.h>
 #include "gmem.h"
 #include "Object.h"
 #include "Gfx.h"
-#include "FormWidget.h"
+#include "Annot.h"
 
 //------------------------------------------------------------------------
-// FormWidget
+// Annot
 //------------------------------------------------------------------------
 
-FormWidget::FormWidget(Dict *dict) {
-  Object obj1, obj2;
+Annot::Annot(XRef *xrefA, Dict *dict) {
+  Object apObj, asObj, obj1, obj2;
   double t;
 
   ok = gFalse;
-
-  if (dict->lookup("AP", &obj1)->isDict()) {
-    obj1.dictLookupNF("N", &obj2);
-    //~ this doesn't handle appearances with multiple states --
-    //~ need to look at AS key to get state and then get the
-    //~ corresponding entry from the N dict
-    if (obj2.isRef()) {
-      obj2.copy(&appearance);
-      ok = gTrue;
+  xref = xrefA;
+
+  if (dict->lookup("AP", &apObj)->isDict()) {
+    if (dict->lookup("AS", &asObj)->isName()) {
+      if (apObj.dictLookup("N", &obj1)->isDict()) {
+       if (obj1.dictLookupNF(asObj.getName(), &obj2)->isRef()) {
+         obj2.copy(&appearance);
+         ok = gTrue;
+       }
+       obj2.free();
+      }
+      obj1.free();
+    } else {
+      if (apObj.dictLookupNF("N", &obj1)->isRef()) {
+       obj1.copy(&appearance);
+       ok = gTrue;
+      }
+      obj1.free();
     }
-    obj2.free();
+    asObj.free();
   }
-  obj1.free();
+  apObj.free();
 
   if (dict->lookup("Rect", &obj1)->isArray() &&
       obj1.arrayGetLength() == 4) {
@@ -67,49 +77,48 @@ FormWidget::FormWidget(Dict *dict) {
   obj1.free();
 }
 
-FormWidget::~FormWidget() {
+Annot::~Annot() {
   appearance.free();
 }
 
-void FormWidget::draw(Gfx *gfx) {
+void Annot::draw(Gfx *gfx) {
   Object obj;
 
-  if (appearance.fetch(&obj)->isStream()) {
-    gfx->doWidgetForm(&obj, xMin, yMin, xMax, yMax);
+  if (appearance.fetch(xref, &obj)->isStream()) {
+    gfx->doAnnot(&obj, xMin, yMin, xMax, yMax);
   }
   obj.free();
 }
 
 //------------------------------------------------------------------------
-// FormWidgets
+// Annots
 //------------------------------------------------------------------------
 
-FormWidgets::FormWidgets(Object *annots) {
-  FormWidget *widget;
+Annots::Annots(XRef *xref, Object *annotsObj) {
+  Annot *annot;
   Object obj1, obj2;
   int size;
   int i;
 
-  widgets = NULL;
+  annots = NULL;
   size = 0;
-  nWidgets = 0;
+  nAnnots = 0;
 
-  if (annots->isArray()) {
-    for (i = 0; i < annots->arrayGetLength(); ++i) {
-      if (annots->arrayGet(i, &obj1)->isDict()) {
+  if (annotsObj->isArray()) {
+    for (i = 0; i < annotsObj->arrayGetLength(); ++i) {
+      if (annotsObj->arrayGet(i, &obj1)->isDict()) {
        obj1.dictLookup("Subtype", &obj2);
        if (obj2.isName("Widget") ||
            obj2.isName("Stamp")) {
-         widget = new FormWidget(obj1.getDict());
-         if (widget->isOk()) {
-           if (nWidgets >= size) {
+         annot = new Annot(xref, obj1.getDict());
+         if (annot->isOk()) {
+           if (nAnnots >= size) {
              size += 16;
-             widgets = (FormWidget **)grealloc(widgets,
-                                               size * sizeof(FormWidget *));
+             annots = (Annot **)grealloc(annots, size * sizeof(Annot *));
            }
-           widgets[nWidgets++] = widget;
+           annots[nAnnots++] = annot;
          } else {
-           delete widget;
+           delete annot;
          }
        }
        obj2.free();
@@ -119,11 +128,11 @@ FormWidgets::FormWidgets(Object *annots) {
   }
 }
 
-FormWidgets::~FormWidgets() {
+Annots::~Annots() {
   int i;
 
-  for (i = 0; i < nWidgets; ++i) {
-    delete widgets[i];
+  for (i = 0; i < nAnnots; ++i) {
+    delete annots[i];
   }
-  gfree(widgets);
+  gfree(annots);
 }