From 3e986f9562d395c58ba3263dfca7e76ee15a35dc Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 20 Nov 2015 17:22:19 +0100
Subject: [PATCH] Add RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE

---
 command_event.c    |  2 +-
 driver.c           |  2 +-
 dynamic.h          |  3 ++-
 gfx/video_driver.c | 21 +++++++++++++--------
 gfx/video_driver.h |  3 +--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/command_event.c b/command_event.c
index 94a6afdea9..887a97fdef 100644
--- a/command_event.c
+++ b/command_event.c
@@ -1420,7 +1420,7 @@ bool event_command(enum event_command cmd)
       case EVENT_CMD_VIDEO_SET_NONBLOCKING_STATE:
          boolean = true; /* fall-through */
       case EVENT_CMD_VIDEO_SET_BLOCKING_STATE:
-         video_driver_set_nonblock_state(boolean);
+         video_driver_ctl(RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE, &boolean);
          break;
       case EVENT_CMD_VIDEO_SET_ASPECT_RATIO:
          video_driver_set_aspect_ratio(settings->video.aspect_ratio_idx);
diff --git a/driver.c b/driver.c
index b12f07c996..5c1f197481 100644
--- a/driver.c
+++ b/driver.c
@@ -283,7 +283,7 @@ void driver_set_nonblock_state(bool enable)
 
       if (!settings->video.vsync || system->force_nonblock)
          video_nonblock = true;
-      video_driver_set_nonblock_state(video_nonblock);
+      video_driver_ctl(RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE, &video_nonblock);
    }
 
    audio_driver_set_nonblocking_state(enable);
diff --git a/dynamic.h b/dynamic.h
index 214e26831e..5c671540aa 100644
--- a/dynamic.h
+++ b/dynamic.h
@@ -125,7 +125,8 @@ const struct retro_controller_description *
  **/
 bool rarch_environment_cb(unsigned cmd, void *data);
 
-struct retro_core_t {
+struct retro_core_t
+{
    void (*retro_init)(void);
    void (*retro_deinit)(void);
    unsigned (*retro_api_version)(void);
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index fdc5c40ac0..26c79aba19 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -590,14 +590,6 @@ bool video_driver_suppress_screensaver(bool enable)
    return video->suppress_screensaver(driver->video_data, enable);
 }
 
-void video_driver_set_nonblock_state(bool toggle)
-{
-   driver_t              *driver = driver_get_ptr();
-   const video_driver_t   *video = video_driver_ctx_get_ptr(driver);
-
-   if (video && video->set_nonblock_state)
-      video->set_nonblock_state(driver->video_data, toggle);
-}
 
 bool video_driver_set_viewport(unsigned width, unsigned height,
       bool force_fullscreen, bool allow_rotate)
@@ -1165,6 +1157,19 @@ bool video_driver_ctl(enum rarch_display_ctl_state state, void *data)
 
    switch (state)
    {
+      case RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE:
+         {
+            driver_t              *driver = driver_get_ptr();
+            const video_driver_t   *video = video_driver_ctx_get_ptr(driver);
+            bool *toggle                  = (bool*)data;
+
+            if (!toggle || !video || !driver)
+               return false;
+
+            if (video && video->set_nonblock_state)
+               video->set_nonblock_state(driver->video_data, *toggle);
+         }
+         return true;
       case RARCH_DISPLAY_CTL_FIND_DRIVER:
          return find_video_driver();
       case RARCH_DISPLAY_CTL_APPLY_STATE_CHANGES:
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 9eedec4962..f14556b367 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -228,6 +228,7 @@ enum rarch_display_ctl_state
    RARCH_DISPLAY_CTL_HAS_WINDOWED,
    RARCH_DISPLAY_CTL_IS_FOCUSED,
    RARCH_DISPLAY_CTL_READ_VIEWPORT,
+   RARCH_DISPLAY_CTL_SET_NONBLOCK_STATE,
    /* Renders the current video frame. */
    RARCH_DISPLAY_CTL_CACHED_FRAME_RENDER,
    RARCH_DISPLAY_CTL_CACHED_FRAME_HAS_VALID_FB,
@@ -293,8 +294,6 @@ void uninit_video_input(void);
 
 void init_video(void);
 
-void video_driver_set_nonblock_state(bool toggle);
-
 bool video_driver_set_rotation(unsigned rotation);
 
 void video_driver_set_video_mode(unsigned width,