From 9ba0cbfac7716456af582b0a8228c6346aef799f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 21 Apr 2016 05:08:36 +0200
Subject: [PATCH] Cleanup menu_display_draw_cursor

---
 menu/drivers/materialui.c | 18 ++++++++----------
 menu/drivers/xmb.c        | 20 +++++++++-----------
 menu/menu_display.c       |  8 ++++++++
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index b66e669d32..9198456451 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -975,16 +975,14 @@ static void mui_frame(void *data)
       mui->box_message[0] = '\0';
    }
 
-   if (settings->menu.mouse.enable && (settings->video.fullscreen 
-            || !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL)))
-      menu_display_draw_cursor(
-            &white_bg[0],
-            mui->cursor.size,
-            mui->textures.list[MUI_TEXTURE_POINTER],
-            menu_input_mouse_state(MENU_MOUSE_X_AXIS),
-            menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
-            width,
-            height);
+   menu_display_draw_cursor(
+         &white_bg[0],
+         mui->cursor.size,
+         mui->textures.list[MUI_TEXTURE_POINTER],
+         menu_input_mouse_state(MENU_MOUSE_X_AXIS),
+         menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
+         width,
+         height);
 
    menu_display_ctl(MENU_DISPLAY_CTL_RESTORE_CLEAR_COLOR, NULL);
    menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 96da41cfc9..f457474736 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -48,7 +48,7 @@
 
 #include "../../tasks/tasks_internal.h"
 
-#if 1
+#if 0
 #define XMB_RIBBON_ENABLE
 #define XMB_RIBBON_ROWS 16
 #define XMB_RIBBON_COLS 32
@@ -2040,16 +2040,14 @@ static void xmb_frame(void *data)
 
    menu_display_set_alpha(coord_color2, 1.00f > xmb->alpha ? xmb->alpha : 1.00f);
 
-   if (        settings->menu.mouse.enable && (settings->video.fullscreen
-            || !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL)))
-      menu_display_draw_cursor(
-            &coord_color2[0],
-            xmb->cursor.size,
-            xmb->textures.list[XMB_TEXTURE_POINTER],
-            menu_input_mouse_state(MENU_MOUSE_X_AXIS),
-            menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
-            width,
-            height);
+   menu_display_draw_cursor(
+         &coord_color2[0],
+         xmb->cursor.size,
+         xmb->textures.list[XMB_TEXTURE_POINTER],
+         menu_input_mouse_state(MENU_MOUSE_X_AXIS),
+         menu_input_mouse_state(MENU_MOUSE_Y_AXIS),
+         width,
+         height);
 
    menu_display_ctl(MENU_DISPLAY_CTL_UNSET_VIEWPORT, NULL);
 }
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 895e60591a..5ecda24b62 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -662,6 +662,14 @@ void menu_display_draw_cursor(
 {
    menu_display_ctx_draw_t draw;
    struct gfx_coords coords;
+   settings_t *settings = config_get_ptr();
+   bool cursor_visible  = settings->video.fullscreen ||
+       !video_driver_ctl(RARCH_DISPLAY_CTL_HAS_WINDOWED, NULL);
+
+   if ( !settings->menu.mouse.enable)
+      return;
+   if (!cursor_visible)
+      return;
 
    coords.vertices      = 4;
    coords.vertex        = NULL;