summaryrefslogtreecommitdiff
path: root/src/savage_dga.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/savage_dga.c')
-rw-r--r--src/savage_dga.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/savage_dga.c b/src/savage_dga.c
index 50a36b0..49c9a3c 100644
--- a/src/savage_dga.c
+++ b/src/savage_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.3 2001/05/18 23:35:32 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.6 2003/01/18 15:22:29 eich Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
@@ -25,6 +25,9 @@ be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the XFree86 Project.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
/*
* file: savage_dga.c
@@ -275,7 +278,7 @@ Savage_SetMode(
psav->DGAactive = FALSE;
SavageSwitchMode(index, pScrn->currentMode, 0);
- if( psav->hwcursor )
+ if( psav->hwcursor && psav->hwc_on )
SavageShowCursor(pScrn);
} else {
Bool holdBIOS = psav->UseBIOS;
@@ -289,8 +292,11 @@ Savage_SetMode(
pMode->bitsPerPixel, pMode->depth);
#endif
- if( psav->hwcursor )
+ if( psav->hwcursor && psav->hwc_on) {
SavageHideCursor(pScrn);
+ psav->hwc_on = TRUE; /* save for later restauration */
+ }
+
if(!psav->DGAactive) { /* save the old parameters */
OldDisplayWidth[index] = pScrn->displayWidth;