diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-22 21:41:12 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-22 21:41:12 -0300 |
| commit | 1f0af5ea50e3e3b2c9ed882f7ef2fb8871e780bd (patch) | |
| tree | c3856c838ecb2c338420f7e7f5b2081a92a53878 | |
| parent | 862cbd8c1845b54a38996b92e8e22d153f38cdd2 (diff) | |
Correct logic in sw cursor handling and add missing entries to .gitignore.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/smi_driver.c | 11 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in *.la @@ -18,3 +20,4 @@ ltmain.sh missing stamp-h1 *~ +siliconmotion.4 diff --git a/src/smi_driver.c b/src/smi_driver.c index 9a3e979..fe48c8a 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -192,7 +192,7 @@ static const OptionInfoRec SMIOptions[] = { OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_MCLK, "set_mclk", OPTV_FREQ, {0}, FALSE }, { OPTION_SHOWCACHE, "show_cache", OPTV_BOOLEAN, {0}, FALSE }, - { OPTION_HWCURSOR, "HWCursor", OPTV_BOOLEAN, {0}, FALSE }, + { OPTION_HWCURSOR, "HWCursor", OPTV_BOOLEAN, {0}, TRUE }, { OPTION_SWCURSOR, "SWCursor", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_ROTATE, "Rotate", OPTV_ANYSTR, {0}, FALSE }, @@ -728,12 +728,13 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) pSmi->randrRotation ? "enabled" : "disabled"); } - from = X_DEFAULT; + from = X_CONFIG; pSmi->HwCursor = TRUE; /* SWCursor overrides HWCusor if both specified */ - if (xf86GetOptValBool(pSmi->Options, OPTION_SWCURSOR, &pSmi->HwCursor) || - xf86GetOptValBool(pSmi->Options, OPTION_HWCURSOR, &pSmi->HwCursor)) - from = X_CONFIG; + if (xf86ReturnOptValBool(pSmi->Options, OPTION_SWCURSOR, FALSE)) + pSmi->HwCursor = FALSE; + else if (!xf86GetOptValBool(pSmi->Options, OPTION_HWCURSOR, &pSmi->HwCursor)) + from = X_DEFAULT; if (pSmi->HwCursor && pSmi->randrRotation) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, |