From 6c4557817d1b0625da826487bbf47575faa028be Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 30 Nov 2015 22:02:54 +0100
Subject: [PATCH] Move force_fullscreen to retroarch.c

---
 configuration.c |  6 +++---
 retroarch.c     | 10 +++++++++-
 retroarch.h     |  6 +++++-
 runloop.h       |  2 --
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/configuration.c b/configuration.c
index f32803d855..29f85b40a0 100644
--- a/configuration.c
+++ b/configuration.c
@@ -28,6 +28,7 @@
 #include "input/input_keymaps.h"
 #include "input/input_remapping.h"
 #include "general.h"
+#include "retroarch.h"
 #include "system.h"
 #include "verbosity.h"
 
@@ -441,8 +442,7 @@ static void config_set_defaults(void)
 #endif
    settings->multimedia.builtin_imageviewer_enable = true;
    settings->video.scale                 = scale;
-   settings->video.fullscreen            = global->force_fullscreen
-      ? true : fullscreen;
+   settings->video.fullscreen            = rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL)  ? true : fullscreen;
    settings->video.windowed_fullscreen   = windowed_fullscreen;
    settings->video.monitor_index         = monitor_index;
    settings->video.fullscreen_x          = fullscreen_x;
@@ -1232,7 +1232,7 @@ static bool config_load_file(const char *path, bool set_defaults)
    CONFIG_GET_INT_BASE  (conf, settings, video.fullscreen_x, "video_fullscreen_x");
    CONFIG_GET_INT_BASE  (conf, settings, video.fullscreen_y, "video_fullscreen_y");
 
-   if (!global->force_fullscreen)
+   if (!rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL))
       CONFIG_GET_BOOL_BASE(conf, settings, video.fullscreen, "video_fullscreen");
 
    CONFIG_GET_BOOL_BASE(conf, settings, bundle_assets_extract_enable, "bundle_assets_extract_enable");
diff --git a/retroarch.c b/retroarch.c
index f12c33d80a..3239b96d9b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -88,6 +88,7 @@ enum
 static char current_savestate_dir[PATH_MAX_LENGTH];
 static char current_savefile_dir[PATH_MAX_LENGTH];
 
+static bool rarch_force_fullscreen;
 static bool error_on_init;
 static char error_string[PATH_MAX_LENGTH];
 static jmp_buf error_sjlj_context;
@@ -686,7 +687,7 @@ static void parse_input(int argc, char *argv[])
             break;
 
          case 'f':
-            global->force_fullscreen = true;
+            rarch_ctl(RARCH_CTL_SET_FORCE_FULLSCREEN, NULL);
             break;
 
          case 'S':
@@ -1041,6 +1042,8 @@ static bool init_state(void)
    video_driver_ctl(RARCH_DISPLAY_CTL_SET_ACTIVE, NULL);
    audio_driver_ctl(RARCH_AUDIO_CTL_SET_ACTIVE, NULL);
 
+   rarch_force_fullscreen = false;
+
    return true;
 }
 
@@ -1329,6 +1332,11 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
 
    switch(state)
    {
+      case RARCH_CTL_SET_FORCE_FULLSCREEN:
+         rarch_force_fullscreen = true;
+         break;
+      case RARCH_CTL_IS_FORCE_FULLSCREEN:
+         return rarch_force_fullscreen;
       case RARCH_CTL_REPLACE_CONFIG:
          {
             char *path = (char*)data;
diff --git a/retroarch.h b/retroarch.h
index e60e8737a9..f9299dca63 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -93,7 +93,11 @@ enum rarch_ctl_state
        * but this will do for now. */
    RARCH_CTL_VALIDATE_CPU_FEATURES,
 
-   RARCH_CTL_FILL_PATHNAMES
+   RARCH_CTL_FILL_PATHNAMES,
+
+   RARCH_CTL_SET_FORCE_FULLSCREEN,
+
+   RARCH_CTL_IS_FORCE_FULLSCREEN
 };
 
 enum rarch_content_type
diff --git a/runloop.h b/runloop.h
index 0b28c14a13..091ca74717 100644
--- a/runloop.h
+++ b/runloop.h
@@ -124,8 +124,6 @@ typedef struct rarch_resolution
 
 typedef struct global
 {
-   bool force_fullscreen;
-
    struct
    {
       core_info_list_t *list;