From 009d09ba52474494cc0e0751f62e1d412a8b8f6f Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 25 Nov 2023 14:13:10 +0100
Subject: [PATCH] [viewer] action.cpp -> action.c

---
 src/ecmascript/Makefile             |  6 +++---
 src/ecmascript/ecmascript-c.cpp     | 21 +++++++++++++++++++++
 src/ecmascript/ecmascript-c.h       |  3 +++
 src/ecmascript/ecmascript.cpp       | 15 +--------------
 src/ecmascript/meson.build          |  4 ++--
 src/viewer/Makefile                 |  2 +-
 src/viewer/{action.cpp => action.c} |  2 +-
 src/viewer/meson.build              |  2 +-
 8 files changed, 33 insertions(+), 22 deletions(-)
 rename src/viewer/{action.cpp => action.c} (99%)

diff --git a/src/ecmascript/Makefile b/src/ecmascript/Makefile
index 7f09034f..c4f2fab4 100644
--- a/src/ecmascript/Makefile
+++ b/src/ecmascript/Makefile
@@ -10,11 +10,11 @@ SUBDIRS-$(CONFIG_QUICKJS)	+= quickjs
 
 SUBDIRS-$(CONFIG_ECMASCRIPT_SMJS)	+= spidermonkey
 
-OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= ecmascript.obj localstorage-db.obj spidermonkey.obj timer.obj
+OBJS-$(CONFIG_ECMASCRIPT_SMJS)		+= ecmascript.obj ecmascript-c.obj localstorage-db.obj spidermonkey.obj timer.obj
 
-OBJS-$(CONFIG_MUJS)		+= ecmascript.obj localstorage-db.obj mujs.obj timer.obj
+OBJS-$(CONFIG_MUJS)		+= ecmascript.obj ecmascript-c.obj localstorage-db.obj mujs.obj timer.obj
 
-OBJS-$(CONFIG_QUICKJS)		+= ecmascript.obj localstorage-db.obj quickjs.obj timer.obj
+OBJS-$(CONFIG_QUICKJS)		+= ecmascript.obj ecmascript-c.obj localstorage-db.obj quickjs.obj timer.obj
 
 ifeq ($(CONFIG_ECMASCRIPT_SMJS), yes)
 CONFIG_ANY_SPIDERMONKEY = yes
diff --git a/src/ecmascript/ecmascript-c.cpp b/src/ecmascript/ecmascript-c.cpp
index cdb6b8af..5430fa8d 100644
--- a/src/ecmascript/ecmascript-c.cpp
+++ b/src/ecmascript/ecmascript-c.cpp
@@ -4,12 +4,33 @@
 #include "config.h"
 #endif
 
+#include "elinks.h"
+
+#include "dialogs/status.h"
 #include "ecmascript/ecmascript-c.h"
+#include "intl/libintl.h"
+#include "session/session.h"
+#include "util/memory.h"
+#include "util/string.h"
 
 extern int interpreter_count;
+extern int ecmascript_enabled;
 
 int
 ecmascript_get_interpreter_count(void)
 {
 	return interpreter_count;
 }
+
+void
+toggle_ecmascript(struct session *ses)
+{
+	ecmascript_enabled = !ecmascript_enabled;
+
+	if (ecmascript_enabled) {
+		mem_free_set(&ses->status.window_status, stracpy(_("Ecmascript enabled", ses->tab->term)));
+	} else {
+		mem_free_set(&ses->status.window_status, stracpy(_("Ecmascript disabled", ses->tab->term)));
+	}
+	print_screen_status(ses);
+}
diff --git a/src/ecmascript/ecmascript-c.h b/src/ecmascript/ecmascript-c.h
index abb61cc1..fc1d8faf 100644
--- a/src/ecmascript/ecmascript-c.h
+++ b/src/ecmascript/ecmascript-c.h
@@ -5,7 +5,10 @@
 extern "C" {
 #endif
 
+struct session;
+
 int ecmascript_get_interpreter_count(void);
+void toggle_ecmascript(struct session *ses);
 
 #ifdef __cplusplus
 }
diff --git a/src/ecmascript/ecmascript.cpp b/src/ecmascript/ecmascript.cpp
index a141c629..66a37459 100644
--- a/src/ecmascript/ecmascript.cpp
+++ b/src/ecmascript/ecmascript.cpp
@@ -160,20 +160,7 @@ read_url_list(void)
 	}
 }
 
-static int ecmascript_enabled;
-
-void
-toggle_ecmascript(struct session *ses)
-{
-	ecmascript_enabled = !ecmascript_enabled;
-
-	if (ecmascript_enabled) {
-		mem_free_set(&ses->status.window_status, stracpy(_("Ecmascript enabled", ses->tab->term)));
-	} else {
-		mem_free_set(&ses->status.window_status, stracpy(_("Ecmascript disabled", ses->tab->term)));
-	}
-	print_screen_status(ses);
-}
+int ecmascript_enabled;
 
 int
 get_ecmascript_enable(struct ecmascript_interpreter *interpreter)
diff --git a/src/ecmascript/meson.build b/src/ecmascript/meson.build
index 749be217..32b750e7 100644
--- a/src/ecmascript/meson.build
+++ b/src/ecmascript/meson.build
@@ -17,12 +17,12 @@ if CONFIG_ANY_SPIDERMONKEY
 endif
 
 if conf_data.get('CONFIG_MUJS')
-	srcs += files('ecmascript.cpp', 'localstorage-db.cpp', 'mujs.cpp', 'timer.cpp')
+	srcs += files('ecmascript.cpp', 'ecmascript-c.cpp', 'localstorage-db.cpp', 'mujs.cpp', 'timer.cpp')
 	subdir('mujs')
 endif
 
 if conf_data.get('CONFIG_QUICKJS')
-	srcs += files('ecmascript.cpp', 'localstorage-db.cpp', 'quickjs.cpp', 'timer.cpp')
+	srcs += files('ecmascript.cpp', 'ecmascript-c.cpp', 'localstorage-db.cpp', 'quickjs.cpp', 'timer.cpp')
 	subdir('quickjs')
 endif
 
diff --git a/src/viewer/Makefile b/src/viewer/Makefile
index da9e79f5..6acdb3ff 100644
--- a/src/viewer/Makefile
+++ b/src/viewer/Makefile
@@ -2,6 +2,6 @@ top_builddir=../..
 include $(top_builddir)/Makefile.config
 
 SUBDIRS = dump text
-OBJS	= action.obj timer.o viewer.o
+OBJS	= action.o timer.o viewer.o
 
 include $(top_srcdir)/Makefile.lib
diff --git a/src/viewer/action.cpp b/src/viewer/action.c
similarity index 99%
rename from src/viewer/action.cpp
rename to src/viewer/action.c
index 664e8cd4..31a61fb0 100644
--- a/src/viewer/action.cpp
+++ b/src/viewer/action.c
@@ -26,7 +26,7 @@
 #include "document/document.h"
 #include "document/view.h"
 #ifdef CONFIG_ECMASCRIPT
-#include "ecmascript/ecmascript.h"
+#include "ecmascript/ecmascript-c.h"
 #endif
 #include "formhist/dialogs.h"
 #include "globhist/dialogs.h"
diff --git a/src/viewer/meson.build b/src/viewer/meson.build
index 4463a385..c74665a5 100644
--- a/src/viewer/meson.build
+++ b/src/viewer/meson.build
@@ -1,3 +1,3 @@
 subdir('dump')
 subdir('text')
-srcs += files('action.cpp', 'timer.c', 'viewer.c')
+srcs += files('action.c', 'timer.c', 'viewer.c')