From 7c7af9e70c14d55e371fa4d9354750c8dae85548 Mon Sep 17 00:00:00 2001
From: Rene Kita <mail@rkta.de>
Date: Sun, 25 Dec 2022 15:11:44 +0100
Subject: [PATCH] Move declarations to appropiate header files

This is in preparation for the next patch.
---
 display.c | 2 ++
 display.h | 7 +++++++
 file.c    | 1 +
 form.c    | 1 +
 main.c    | 1 +
 proto.h   | 3 ---
 terms.h   | 2 ++
 7 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 display.h

diff --git a/display.c b/display.c
index a45fc3e..f3df215 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,6 @@
 /* $Id: display.c,v 1.71 2010/07/18 14:10:09 htrb Exp $ */
+#include "display.h"
+
 #include <signal.h>
 #include "fm.h"
 
diff --git a/display.h b/display.h
new file mode 100644
index 0000000..62b6404
--- /dev/null
+++ b/display.h
@@ -0,0 +1,7 @@
+#ifndef W3M_DISPLAY_H
+#define W3M_DISPLAY_H
+
+void fmInit(void);
+void fmTerm(void);
+
+#endif
diff --git a/file.c b/file.c
index 3d71a8d..435005c 100644
--- a/file.c
+++ b/file.c
@@ -1,5 +1,6 @@
 /* $Id: file.c,v 1.266 2012/05/22 09:45:56 inu Exp $ */
 /* vi: set sw=4 ts=8 ai sm noet : */
+#include "display.h"
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
diff --git a/form.c b/form.c
index bc14d39..a4b0022 100644
--- a/form.c
+++ b/form.c
@@ -2,6 +2,7 @@
 /* 
  * HTML forms
  */
+#include "display.h"
 #include "fm.h"
 #include "parsetag.h"
 #include "parsetagx.h"
diff --git a/main.c b/main.c
index e7bb660..5712b88 100644
--- a/main.c
+++ b/main.c
@@ -15,6 +15,7 @@
 #if defined(__CYGWIN__) && defined(USE_BINMODE_STREAM)
 #include <io.h>
 #endif
+#include "display.h"
 #include "terms.h"
 #include "myctype.h"
 #include "regex.h"
diff --git a/proto.h b/proto.h
index 3be7d22..6c45406 100644
--- a/proto.h
+++ b/proto.h
@@ -320,8 +320,6 @@ extern void copyBuffer(Buffer *a, Buffer *b);
 extern Buffer *prevBuffer(Buffer *first, Buffer *buf);
 extern int writeBufferCache(Buffer *buf);
 extern int readBufferCache(Buffer *buf);
-extern void fmTerm(void);
-extern void fmInit(void);
 extern void displayBuffer(Buffer *buf, int mode);
 extern void addChar(char c, Lineprop mode);
 #ifdef USE_M17N
@@ -529,7 +527,6 @@ extern void term_cbreak(void);
 extern void term_title(char *s);
 extern void flush_tty(void);
 extern void toggle_stand(void);
-extern char getch(void);
 extern void bell(void);
 extern int sleep_till_anykey(int sec, int purge);
 #ifdef USE_IMAGE
diff --git a/terms.h b/terms.h
index 8c6992e..c45db2e 100644
--- a/terms.h
+++ b/terms.h
@@ -38,4 +38,6 @@ extern void put_image_kitty(char *url, int x, int y, int w, int h, int sx, int s
 extern int get_pixel_per_cell(int *ppc, int *ppl);
 #endif
 
+char getch(void);
+
 #endif				/* not TERMS_H */