From bacd8d229c478918f477026bbef2e752d5d67647 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Fri, 20 Dec 2019 12:55:54 +0000
Subject: make RISC OS specific window_screen_ options limited to that frontend

---
 desktop/options.h          | 13 ++++---------
 docs/netsurf-fb.1          |  6 ------
 docs/netsurf-gtk.1         |  4 ----
 frontends/riscos/options.h | 26 ++++++++++++++++++++++----
 test/data/Choices          |  2 --
 test/data/Choices-all      |  2 --
 6 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/desktop/options.h b/desktop/options.h
index 9ae2b5ebb..0e56ad350 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -16,7 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
  * Option available on all platforms
  *
  * Non-platform specific options can be added by editing this file 
@@ -27,8 +28,8 @@
  *   with different macro definitions so there is no guard
  */
 
-#ifndef _NETSURF_DESKTOP_OPTIONS_H_
-#define _NETSURF_DESKTOP_OPTIONS_H_
+#ifndef NETSURF_DESKTOP_OPTIONS_H_
+#define NETSURF_DESKTOP_OPTIONS_H_
 
 #include "netsurf/types.h"
 
@@ -167,12 +168,6 @@ NSOPTION_INTEGER(window_width, 0)
 /** default height of new windows */
 NSOPTION_INTEGER(window_height, 0)
 
-/** width of screen when above options were saved */
-NSOPTION_INTEGER(window_screen_width, 0)
-
-/** height of screen when above options were saved */
-NSOPTION_INTEGER(window_screen_height, 0)
-
 /** default size of status bar vs. h scroll bar */
 NSOPTION_INTEGER(toolbar_status_size, 6667)
 
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index a196fcfa0..e9d721ca5 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -146,12 +146,6 @@ The width of the initial window.
 .B \-\-window_height
 The height of the initial window.
 .TP
-.B \-\-window_screen_width
-window screen width
-.TP
-.B \-\-window_screen_height
-window screen height
-.TP
 .B \-\-toolbar_status_size
 toolbar status size
 .TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index b2b97f779..daa014830 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -101,10 +101,6 @@ The Y co-ordinate of the initial window.
 The width of the initial window.
 .It Fl -window_height
 The height of the initial window.
-.It Fl -window_screen_width
-window screen width
-.It Fl -window_screen_height
-window screen height
 .It Fl -toolbar_status_size
 toolbar status size
 .It Fl -scale
diff --git a/frontends/riscos/options.h b/frontends/riscos/options.h
index cb2b78bd8..bf85f07c2 100644
--- a/frontends/riscos/options.h
+++ b/frontends/riscos/options.h
@@ -16,12 +16,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * RISC OS specific options.
+/**
+ * \file
+ * Option specific to RISC OS
+ *
+ * Platform specific options for RISC OS can be added by editing this file
+ *
+ * Global optionsshould be added in the desktop options.h.
+ *
+ * This header is specificaly intented to be included multiple times
+ *   with different macro definitions so there is no guard
  */
 
-#ifndef _NETSURF_RISCOS_OPTIONS_H_
-#define _NETSURF_RISCOS_OPTIONS_H_
+#ifndef NETSURF_RISCOS_OPTIONS_H_
+#define NETSURF_RISCOS_OPTIONS_H_
 
 #include "riscos/tinct.h"
 
@@ -66,3 +74,13 @@ NSOPTION_BOOL(thumbnail_iconise, true)
 NSOPTION_BOOL(interactive_help, true)
 NSOPTION_BOOL(external_hotlists, false)
 NSOPTION_STRING(external_hotlist_app, NULL)
+
+/**
+ * width of screen when window_width option was saved
+ */
+NSOPTION_INTEGER(window_screen_width, 0)
+
+/**
+ * height of screen when window_heigh option was saved
+ */
+NSOPTION_INTEGER(window_screen_height, 0)
diff --git a/test/data/Choices b/test/data/Choices
index 439a67fdc..8ca4becf6 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -50,8 +50,6 @@ window_x:0
 window_y:0
 window_width:0
 window_height:0
-window_screen_width:0
-window_screen_height:0
 toolbar_status_size:6667
 scale:100
 incremental_reflow:1
diff --git a/test/data/Choices-all b/test/data/Choices-all
index 492cd3e7e..2742339d0 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -41,8 +41,6 @@ window_x:0
 window_y:0
 window_width:0
 window_height:0
-window_screen_width:0
-window_screen_height:0
 toolbar_status_size:6667
 scale:100
 incremental_reflow:1
-- 
cgit v1.2.3