From 899304d6efcbba21e226dfab871bf35a948d52ed Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Tue, 28 Nov 2023 15:41:48 +0100
Subject: [PATCH] [viewer] form.cpp -> form.c

---
 src/ecmascript/ecmascript-c.cpp      | 31 ++++++++++++++++++++++++++++
 src/ecmascript/ecmascript-c.h        |  6 ++++++
 src/ecmascript/ecmascript.cpp        | 31 ----------------------------
 src/ecmascript/ecmascript.h          |  4 ----
 src/viewer/text/Makefile             |  2 +-
 src/viewer/text/{form.cpp => form.c} |  6 +++++-
 src/viewer/text/meson.build          |  2 +-
 7 files changed, 44 insertions(+), 38 deletions(-)
 rename src/viewer/text/{form.cpp => form.c} (99%)

diff --git a/src/ecmascript/ecmascript-c.cpp b/src/ecmascript/ecmascript-c.cpp
index d876af66..95b17c88 100644
--- a/src/ecmascript/ecmascript-c.cpp
+++ b/src/ecmascript/ecmascript-c.cpp
@@ -440,3 +440,34 @@ ecmascript_current_link_evhook(struct document_view *doc_view, enum script_event
 
 	return 1;
 }
+
+void
+ecmascript_detach_form_view(struct form_view *fv)
+{
+#ifdef CONFIG_MUJS
+#elif defined(CONFIG_QUICKJS)
+	quickjs_detach_form_view(fv);
+#else
+	spidermonkey_detach_form_view(fv);
+#endif
+}
+
+void ecmascript_detach_form_state(struct form_state *fs)
+{
+#ifdef CONFIG_MUJS
+#elif defined(CONFIG_QUICKJS)
+	quickjs_detach_form_state(fs);
+#else
+	spidermonkey_detach_form_state(fs);
+#endif
+}
+
+void ecmascript_moved_form_state(struct form_state *fs)
+{
+#ifdef CONFIG_MUJS
+#elif defined(CONFIG_QUICKJS)
+	quickjs_moved_form_state(fs);
+#else
+	spidermonkey_moved_form_state(fs);
+#endif
+}
diff --git a/src/ecmascript/ecmascript-c.h b/src/ecmascript/ecmascript-c.h
index 4ee3e772..1207c4fd 100644
--- a/src/ecmascript/ecmascript-c.h
+++ b/src/ecmascript/ecmascript-c.h
@@ -13,6 +13,8 @@ struct document;
 struct document_options;
 struct document_view;
 struct ecmascript_interpreter;
+struct form_state;
+struct form_view;
 struct session;
 struct string;
 struct term_event;
@@ -34,6 +36,10 @@ void ecmascript_reset_state(struct view_state *vs);
 int ecmascript_current_link_evhook(struct document_view *doc_view, enum script_event_hook_type type);
 int ecmascript_eval_boolback(struct ecmascript_interpreter *interpreter, struct string *code);
 
+void ecmascript_detach_form_view(struct form_view *fv);
+void ecmascript_detach_form_state(struct form_state *fs);
+void ecmascript_moved_form_state(struct form_state *fs);
+
 extern struct module ecmascript_module;
 
 #ifdef __cplusplus
diff --git a/src/ecmascript/ecmascript.cpp b/src/ecmascript/ecmascript.cpp
index 2f80e226..d42f111e 100644
--- a/src/ecmascript/ecmascript.cpp
+++ b/src/ecmascript/ecmascript.cpp
@@ -395,37 +395,6 @@ ecmascript_eval_stringback(struct ecmascript_interpreter *interpreter,
 	return result;
 }
 
-void
-ecmascript_detach_form_view(struct form_view *fv)
-{
-#ifdef CONFIG_MUJS
-#elif defined(CONFIG_QUICKJS)
-	quickjs_detach_form_view(fv);
-#else
-	spidermonkey_detach_form_view(fv);
-#endif
-}
-
-void ecmascript_detach_form_state(struct form_state *fs)
-{
-#ifdef CONFIG_MUJS
-#elif defined(CONFIG_QUICKJS)
-	quickjs_detach_form_state(fs);
-#else
-	spidermonkey_detach_form_state(fs);
-#endif
-}
-
-void ecmascript_moved_form_state(struct form_state *fs)
-{
-#ifdef CONFIG_MUJS
-#elif defined(CONFIG_QUICKJS)
-	quickjs_moved_form_state(fs);
-#else
-	spidermonkey_moved_form_state(fs);
-#endif
-}
-
 void
 ecmascript_timeout_dialog(struct terminal *term, int max_exec_time)
 {
diff --git a/src/ecmascript/ecmascript.h b/src/ecmascript/ecmascript.h
index 552f389f..9361535f 100644
--- a/src/ecmascript/ecmascript.h
+++ b/src/ecmascript/ecmascript.h
@@ -156,10 +156,6 @@ void ecmascript_free_urls(struct module *module);
 
 struct ecmascript_interpreter *ecmascript_get_interpreter(struct view_state*vs);
 
-void ecmascript_detach_form_view(struct form_view *fv);
-void ecmascript_detach_form_state(struct form_state *fs);
-void ecmascript_moved_form_state(struct form_state *fs);
-
 void ecmascript_reset_state(struct view_state *vs);
 
 void ecmascript_eval(struct ecmascript_interpreter *interpreter, struct string *code, struct string *ret, int element_offset);
diff --git a/src/viewer/text/Makefile b/src/viewer/text/Makefile
index 4f2bc81c..3ed42624 100644
--- a/src/viewer/text/Makefile
+++ b/src/viewer/text/Makefile
@@ -5,6 +5,6 @@ INCLUDES += $(TRE_CFLAGS)
 
 OBJS-$(CONFIG_MARKS) += marks.o
 
-OBJS = draw.o form.obj link.o search.o textarea.o view.o vs.o
+OBJS = draw.o form.o link.o search.o textarea.o view.o vs.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/viewer/text/form.cpp b/src/viewer/text/form.c
similarity index 99%
rename from src/viewer/text/form.cpp
rename to src/viewer/text/form.c
index 0e602e38..fa3e03b5 100644
--- a/src/viewer/text/form.cpp
+++ b/src/viewer/text/form.c
@@ -30,7 +30,11 @@
 #include "document/document.h"
 #include "document/forms.h"
 #include "document/view.h"
-#include "ecmascript/ecmascript.h"
+
+#if defined(CONFIG_ECMASCRIPT_SMJS) || defined(CONFIG_QUICKJS) || defined(CONFIG_MUJS)
+#include "ecmascript/ecmascript-c.h"
+#endif
+
 #include "intl/libintl.h"
 #include "formhist/formhist.h"
 #include "mime/mime.h"
diff --git a/src/viewer/text/meson.build b/src/viewer/text/meson.build
index a7dd6906..effeb0c8 100644
--- a/src/viewer/text/meson.build
+++ b/src/viewer/text/meson.build
@@ -4,4 +4,4 @@ if conf_data.get('CONFIG_MARKS')
 	srcs += files('marks.c')
 endif
 
-srcs += files('draw.c', 'form.cpp', 'link.c', 'search.c', 'textarea.c', 'view.c', 'vs.c')
+srcs += files('draw.c', 'form.c', 'link.c', 'search.c', 'textarea.c', 'view.c', 'vs.c')