From 72eb7e103d9212e6eb4d7ce5ef12d27e1c8a28a2 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Thu, 10 Jun 2004 07:26:51 +0000
Subject: [PATCH] small cursor update

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7888 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/accelerants/nvidia/InitAccelerant.c       |  7 ++++---
 src/add-ons/accelerants/nvidia/engine/nv_general.c    | 11 +++++++++--
 .../kernel/drivers/graphics/nvidia/UPDATE.html        |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/add-ons/accelerants/nvidia/InitAccelerant.c b/src/add-ons/accelerants/nvidia/InitAccelerant.c
index 649e60d0f3..f8b6b07f79 100644
--- a/src/add-ons/accelerants/nvidia/InitAccelerant.c
+++ b/src/add-ons/accelerants/nvidia/InitAccelerant.c
@@ -4,7 +4,7 @@
 
 	Other authors:
 	Mark Watson,
-	Rudolf Cornelissen 10/2002-5/2004.
+	Rudolf Cornelissen 10/2002-6/2004.
 */
 
 #define MODULE_BIT 0x00800000
@@ -177,12 +177,13 @@ status_t INIT_ACCELERANT(int the_fd) {
 	/* bail out if something failed */
 	if (result != B_OK) goto error1;
 
-	/* initialise various cursor stuff*/
+	/* initialise various cursor stuff */
 	head1_cursor_init();
 	if (si->ps.secondary_head) head2_cursor_init();
 
 	/* ensure cursor state */
-	SHOW_CURSOR(false);
+	head1_cursor_hide();
+	if (si->ps.secondary_head) head2_cursor_hide();
 
 	/* a winner! */
 	result = B_OK;
diff --git a/src/add-ons/accelerants/nvidia/engine/nv_general.c b/src/add-ons/accelerants/nvidia/engine/nv_general.c
index 3142b5ac9d..ee5e5f0827 100644
--- a/src/add-ons/accelerants/nvidia/engine/nv_general.c
+++ b/src/add-ons/accelerants/nvidia/engine/nv_general.c
@@ -823,9 +823,16 @@ return nv_general_bios_to_powergraphics();
 
 	/*power up the PLLs,LUT,DAC*/
 	LOG(2,("INIT: PLL/LUT/DAC powerup\n"));
-	/* turn off both displays and the hardcursor (also disables transfers) */
+
+	/* turn off both displays and the hardcursors (also disables transfers) */
 	head1_dpms(false, false, false);
 	head1_cursor_hide();
+	if (si->ps.secondary_head)
+	{
+		head2_dpms(false, false, false);
+		head2_cursor_hide();
+	}
+
 	/* G200 SGRAM and SDRAM use external pix and dac refs, do *not* activate internals!
 	 * (this would create electrical shortcuts,
 	 * resulting in extra chip heat and distortions visible on screen */
@@ -898,7 +905,7 @@ return nv_general_bios_to_powergraphics();
 //	VGAW_I(CRTC,0x11,0);
 
 	/* turn on display one */
-	head1_dpms(true , true, true);
+	head1_dpms(true, true, true);
 
 	return B_OK;
 }
diff --git a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
index bfa119fc7d..a4daba5bc3 100644
--- a/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
+++ b/src/add-ons/kernel/drivers/graphics/nvidia/UPDATE.html
@@ -30,6 +30,7 @@
 			<li>Added widescreen (16:10 aspect) modes 800x500, 1024x640, 1280x800, 1440x900, 1680x1050 and 1920x1200 for panel(s) to the modelist exported by the driver if only widescreen panel(s) is (are) connected (so also no analog monitors may be connected!);
 			<li>Added blocking of modes above panel (with lowest) native resotution: this includes blocking of all widescreen modes if a non-widescreen (analog) screen is detected.
 		</ul>	
+	<li>Cursor update for dualhead cards: when the 'softcursor' is used, the hardcursors are <strong>both</strong> actually turned off now.
 </ul>
 <br>
 <strong>NOTE:</strong><br>