summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/jni/Core.mk1
-rw-r--r--pdf/mupdf-internal.h20
-rw-r--r--pdf/pdf_annot.c6
-rw-r--r--pdf/pdf_field.c56
-rw-r--r--pdf/pdf_form.c97
-rw-r--r--pdf/pdf_xref_aux.c2
-rw-r--r--win32/libmupdf.vcproj4
7 files changed, 101 insertions, 85 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk
index 100b8185..fb544f93 100644
--- a/android/jni/Core.mk
+++ b/android/jni/Core.mk
@@ -102,6 +102,7 @@ LOCAL_SRC_FILES := \
$(MY_ROOT)/pdf/pdf_device.c \
$(MY_ROOT)/pdf/pdf_encoding.c \
$(MY_ROOT)/pdf/pdf_event.c \
+ $(MY_ROOT)/pdf/pdf_field.c \
$(MY_ROOT)/pdf/pdf_font.c \
$(MY_ROOT)/pdf/pdf_fontfile.c \
$(MY_ROOT)/pdf/pdf_form.c \
diff --git a/pdf/mupdf-internal.h b/pdf/mupdf-internal.h
index e0c0c56a..74db6d1b 100644
--- a/pdf/mupdf-internal.h
+++ b/pdf/mupdf-internal.h
@@ -170,6 +170,7 @@ struct pdf_document_s
pdf_js *js;
int recalculating;
int dirty;
+ void (*update_appearance)(pdf_document *xref, pdf_obj *annot);
fz_doc_event_cb *event_cb;
void *event_cb_data;
@@ -519,6 +520,25 @@ pdf_annot *pdf_load_annots(pdf_document *, pdf_obj *annots, pdf_page *page);
void pdf_update_annot(pdf_document *, pdf_annot *annot);
void pdf_free_annot(fz_context *ctx, pdf_annot *link);
+/* Field flags */
+enum
+{
+ Ff_Multiline = 1 << (13-1),
+ Ff_Password = 1 << (14-1),
+ Ff_NoToggleToOff = 1 << (15-1),
+ Ff_Radio = 1 << (16-1),
+ Ff_Pushbutton = 1 << (17-1),
+ Ff_Combo = 1 << (18-1),
+ Ff_FileSelect = 1 << (21-1),
+ Ff_MultiSelect = 1 << (22-1),
+ Ff_DoNotSpellCheck = 1 << (23-1),
+ Ff_DoNotScroll = 1 << (24-1),
+ Ff_Comb = 1 << (25-1),
+ Ff_RadioInUnison = 1 << (26-1)
+};
+
+pdf_obj *pdf_get_inheritable(pdf_document *doc, pdf_obj *obj, char *key);
+int pdf_get_field_flags(pdf_document *doc, pdf_obj *obj);
int pdf_field_type(pdf_document *doc, pdf_obj *field);
char *pdf_field_value(pdf_document *doc, pdf_obj *field);
int pdf_field_set_value(pdf_document *doc, pdf_obj *field, char *text);
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c
index db5b10f1..ccb2549f 100644
--- a/pdf/pdf_annot.c
+++ b/pdf/pdf_annot.c
@@ -465,7 +465,8 @@ pdf_load_annots(pdf_document *xref, pdf_obj *annots, pdf_page *page)
{
obj = pdf_array_get(annots, i);
- pdf_update_appearance(xref, obj);
+ if (xref->update_appearance)
+ xref->update_appearance(xref, obj);
rect = pdf_dict_gets(obj, "Rect");
ap = pdf_dict_gets(obj, "AP");
@@ -550,7 +551,8 @@ pdf_update_annot(pdf_document *xref, pdf_annot *annot)
obj = annot->obj;
- pdf_update_appearance(xref, obj);
+ if (xref->update_appearance)
+ xref->update_appearance(xref, obj);
ap = pdf_dict_gets(obj, "AP");
as = pdf_dict_gets(obj, "AS");
diff --git a/pdf/pdf_field.c b/pdf/pdf_field.c
new file mode 100644
index 00000000..50caa2ab
--- /dev/null
+++ b/pdf/pdf_field.c
@@ -0,0 +1,56 @@
+#include "fitz-internal.h"
+#include "mupdf-internal.h"
+
+pdf_obj *pdf_get_inheritable(pdf_document *doc, pdf_obj *obj, char *key)
+{
+ pdf_obj *fobj = NULL;
+
+ while (!fobj && obj)
+ {
+ fobj = pdf_dict_gets(obj, key);
+
+ if (!fobj)
+ obj = pdf_dict_gets(obj, "Parent");
+ }
+
+ return fobj ? fobj
+ : pdf_dict_gets(pdf_dict_gets(pdf_dict_gets(doc->trailer, "Root"), "AcroForm"), key);
+}
+
+int pdf_get_field_flags(pdf_document *doc, pdf_obj *obj)
+{
+ return pdf_to_int(pdf_get_inheritable(doc, obj, "Ff"));
+}
+
+static char *get_field_type_name(pdf_document *doc, pdf_obj *obj)
+{
+ return pdf_to_name(pdf_get_inheritable(doc, obj, "FT"));
+}
+
+int pdf_field_type(pdf_document *doc, pdf_obj *obj)
+{
+ char *type = get_field_type_name(doc, obj);
+ int flags = pdf_get_field_flags(doc, obj);
+
+ if (!strcmp(type, "Btn"))
+ {
+ if (flags & Ff_Pushbutton)
+ return FZ_WIDGET_TYPE_PUSHBUTTON;
+ else if (flags & Ff_Radio)
+ return FZ_WIDGET_TYPE_RADIOBUTTON;
+ else
+ return FZ_WIDGET_TYPE_CHECKBOX;
+ }
+ else if (!strcmp(type, "Tx"))
+ return FZ_WIDGET_TYPE_TEXT;
+ else if (!strcmp(type, "Ch"))
+ {
+ if (flags & Ff_Combo)
+ return FZ_WIDGET_TYPE_COMBOBOX;
+ else
+ return FZ_WIDGET_TYPE_LISTBOX;
+ }
+ else
+ return FZ_WIDGET_TYPE_NOT_WIDGET;
+}
+
diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c
index 5ad5e845..118c818f 100644
--- a/pdf/pdf_form.c
+++ b/pdf/pdf_form.c
@@ -5,22 +5,6 @@
enum
{
- Ff_Multiline = 1 << (13-1),
- Ff_Password = 1 << (14-1),
- Ff_NoToggleToOff = 1 << (15-1),
- Ff_Radio = 1 << (16-1),
- Ff_Pushbutton = 1 << (17-1),
- Ff_Combo = 1 << (18-1),
- Ff_FileSelect = 1 << (21-1),
- Ff_MultiSelect = 1 << (22-1),
- Ff_DoNotSpellCheck = 1 << (23-1),
- Ff_DoNotScroll = 1 << (24-1),
- Ff_Comb = 1 << (25-1),
- Ff_RadioInUnison = 1 << (26-1)
-};
-
-enum
-{
F_Invisible = 1 << (1-1),
F_Hidden = 1 << (2-1),
F_Print = 1 << (3-1),
@@ -128,22 +112,6 @@ static void account_for_rot(fz_rect *rect, fz_matrix *mat, int rot)
}
}
-static pdf_obj *get_inheritable(pdf_document *doc, pdf_obj *obj, char *key)
-{
- pdf_obj *fobj = NULL;
-
- while (!fobj && obj)
- {
- fobj = pdf_dict_gets(obj, key);
-
- if (!fobj)
- obj = pdf_dict_gets(obj, "Parent");
- }
-
- return fobj ? fobj
- : pdf_dict_gets(pdf_dict_gets(pdf_dict_gets(doc->trailer, "Root"), "AcroForm"), key);
-}
-
static char *get_string_or_stream(pdf_document *doc, pdf_obj *obj)
{
fz_context *ctx = doc->ctx;
@@ -187,43 +155,6 @@ static char *get_string_or_stream(pdf_document *doc, pdf_obj *obj)
return text;
}
-static char *get_field_type_name(pdf_document *doc, pdf_obj *obj)
-{
- return pdf_to_name(get_inheritable(doc, obj, "FT"));
-}
-
-static int get_field_flags(pdf_document *doc, pdf_obj *obj)
-{
- return pdf_to_int(get_inheritable(doc, obj, "Ff"));
-}
-
-int pdf_field_type(pdf_document *doc, pdf_obj *obj)
-{
- char *type = get_field_type_name(doc, obj);
- int flags = get_field_flags(doc, obj);
-
- if (!strcmp(type, "Btn"))
- {
- if (flags & Ff_Pushbutton)
- return FZ_WIDGET_TYPE_PUSHBUTTON;
- else if (flags & Ff_Radio)
- return FZ_WIDGET_TYPE_RADIOBUTTON;
- else
- return FZ_WIDGET_TYPE_CHECKBOX;
- }
- else if (!strcmp(type, "Tx"))
- return FZ_WIDGET_TYPE_TEXT;
- else if (!strcmp(type, "Ch"))
- {
- if (flags & Ff_Combo)
- return FZ_WIDGET_TYPE_COMBOBOX;
- else
- return FZ_WIDGET_TYPE_LISTBOX;
- }
- else
- return FZ_WIDGET_TYPE_NOT_WIDGET;
-}
-
/* Find the point in a field hierarchy where all descendents
* share the same name */
static pdf_obj *find_head_of_field_group(pdf_obj *obj)
@@ -383,13 +314,13 @@ static void font_info_fin(fz_context *ctx, font_info *font_rec)
static void get_text_widget_info(pdf_document *doc, pdf_obj *widget, text_widget_info *info)
{
- char *da = pdf_to_str_buf(get_inheritable(doc, widget, "DA"));
- int ff = get_field_flags(doc, widget);
- pdf_obj *ml = get_inheritable(doc, widget, "MaxLen");
+ char *da = pdf_to_str_buf(pdf_get_inheritable(doc, widget, "DA"));
+ int ff = pdf_get_field_flags(doc, widget);
+ pdf_obj *ml = pdf_get_inheritable(doc, widget, "MaxLen");
- info->dr = get_inheritable(doc, widget, "DR");
+ info->dr = pdf_get_inheritable(doc, widget, "DR");
info->col = pdf_dict_getp(widget, "MK/BG");
- info->q = pdf_to_int(get_inheritable(doc, widget, "Q"));
+ info->q = pdf_to_int(pdf_get_inheritable(doc, widget, "Q"));
info->multiline = (ff & Ff_Multiline) != 0;
info->comb = (ff & (Ff_Multiline|Ff_Password|Ff_FileSelect|Ff_Comb)) == Ff_Comb;
@@ -1187,7 +1118,7 @@ static pdf_xobject *load_or_create_form(pdf_document *doc, pdf_obj *obj, fz_rect
pdf_update_xobject_contents(doc, form, fzbuf);
}
- copy_resources(form->resources, get_inheritable(doc, obj, "DR"));
+ copy_resources(form->resources, pdf_get_inheritable(doc, obj, "DR"));
}
fz_always(ctx)
{
@@ -1335,7 +1266,7 @@ static void update_combobox_appearance(pdf_document *doc, pdf_obj *obj)
{
get_text_widget_info(doc, obj, &info);
- val = get_inheritable(doc, obj, "V");
+ val = pdf_get_inheritable(doc, obj, "V");
if (pdf_is_array(val))
val = pdf_array_get(val, 0);
@@ -1463,7 +1394,7 @@ static void update_pushbutton_appearance(pdf_document *doc, pdf_obj *obj)
fz_rect clip = rect;
fz_rect bounds;
fz_matrix mat;
- char *da = pdf_to_str_buf(get_inheritable(doc, obj, "DA"));
+ char *da = pdf_to_str_buf(pdf_get_inheritable(doc, obj, "DA"));
char *text = pdf_to_str_buf(tobj);
clip.x0 += btotal;
@@ -1564,7 +1495,7 @@ static void reset_field(pdf_document *doc, pdf_obj *field)
case FZ_WIDGET_TYPE_RADIOBUTTON:
case FZ_WIDGET_TYPE_CHECKBOX:
{
- pdf_obj *leafv = get_inheritable(doc, field, "V");
+ pdf_obj *leafv = pdf_get_inheritable(doc, field, "V");
if (leafv)
pdf_keep_obj(leafv);
@@ -1975,7 +1906,7 @@ static void toggle_check_box(pdf_document *doc, pdf_obj *obj)
{
fz_context *ctx = doc->ctx;
pdf_obj *as = pdf_dict_gets(obj, "AS");
- int ff = get_field_flags(doc, obj);
+ int ff = pdf_get_field_flags(doc, obj);
int radio = ((ff & (Ff_Pushbutton|Ff_Radio)) == Ff_Radio);
char *val = NULL;
pdf_obj *grp = radio ? pdf_dict_gets(obj, "Parent") : find_head_of_field_group(obj);
@@ -2264,7 +2195,7 @@ int fz_widget_get_type(fz_widget *widget)
char *pdf_field_value(pdf_document *doc, pdf_obj *field)
{
- return get_string_or_stream(doc, get_inheritable(doc, field, "V"));
+ return get_string_or_stream(doc, pdf_get_inheritable(doc, field, "V"));
}
static int set_text_field_value(pdf_document *doc, pdf_obj *field, char *text)
@@ -2578,7 +2509,7 @@ void pdf_field_set_text_color(pdf_document *doc, pdf_obj *field, pdf_obj *col)
fz_context *ctx = doc->ctx;
da_info di;
fz_buffer *fzbuf = NULL;
- char *da = pdf_to_str_buf(get_inheritable(doc, field, "DA"));
+ char *da = pdf_to_str_buf(pdf_get_inheritable(doc, field, "DA"));
unsigned char *buf;
int len;
pdf_obj *daobj = NULL;
@@ -2652,7 +2583,7 @@ int pdf_text_widget_max_len(pdf_document *doc, fz_widget *tw)
{
pdf_annot *annot = (pdf_annot *)tw;
- return pdf_to_int(get_inheritable(doc, annot->obj, "MaxLen"));
+ return pdf_to_int(pdf_get_inheritable(doc, annot->obj, "MaxLen"));
}
int pdf_text_widget_content_type(pdf_document *doc, fz_widget *tw)
@@ -2765,7 +2696,7 @@ int pdf_choice_widget_is_multiselect(pdf_document *doc, fz_widget *tw)
{
case FZ_WIDGET_TYPE_LISTBOX:
case FZ_WIDGET_TYPE_COMBOBOX:
- return (get_field_flags(doc, annot->obj) & Ff_MultiSelect) != 0;
+ return (pdf_get_field_flags(doc, annot->obj) & Ff_MultiSelect) != 0;
default:
return 0;
}
diff --git a/pdf/pdf_xref_aux.c b/pdf/pdf_xref_aux.c
index 58335a4e..c34a86ed 100644
--- a/pdf/pdf_xref_aux.c
+++ b/pdf/pdf_xref_aux.c
@@ -25,6 +25,7 @@ pdf_open_document_with_stream(fz_context *ctx, fz_stream *file)
pdf_document *doc = pdf_open_document_no_run_with_stream(ctx, file);
doc->super.run_page_contents = pdf_run_page_contents_shim;
doc->super.run_annot = pdf_run_annot_shim;
+ doc->update_appearance = pdf_update_appearance;
return doc;
}
@@ -34,5 +35,6 @@ pdf_open_document(fz_context *ctx, const char *filename)
pdf_document *doc = pdf_open_document_no_run(ctx, filename);
doc->super.run_page_contents = pdf_run_page_contents_shim;
doc->super.run_annot = pdf_run_annot_shim;
+ doc->update_appearance = pdf_update_appearance;
return doc;
}
diff --git a/win32/libmupdf.vcproj b/win32/libmupdf.vcproj
index 9edcfeff..5e4a8d95 100644
--- a/win32/libmupdf.vcproj
+++ b/win32/libmupdf.vcproj
@@ -265,6 +265,10 @@
>
</File>
<File
+ RelativePath="..\pdf\pdf_field.c"
+ >
+ </File>
+ <File
RelativePath="..\pdf\pdf_font.c"
>
</File>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 22:39:23 +0000