diff options
author | Matthew Allum <breakfast@10.am> | 2004-09-08 11:31:49 +0000 |
---|---|---|
committer | Matthew Allum <breakfast@10.am> | 2004-09-08 11:31:49 +0000 |
commit | 501dcf37aac4ec9298e8c79ca65c048c362bce31 (patch) | |
tree | 6713dfc913f8c6fdd97a0e006606131bb883991b | |
parent | 20918ab480c8c8285a68e9f974b0208a18acec94 (diff) |
cursor fixes
-rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 8 | ||||
-rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index a105b284d..4c08e497e 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -492,12 +492,8 @@ ephyrCreateColormap (ColormapPtr pmap) Bool ephyrInitScreen (ScreenPtr pScreen) { -#ifdef TOUCHSCREEN - KdTsPhyScreen = pScreen->myNum; -#endif - - pScreen->CreateColormap = ephyrCreateColormap; - return TRUE; + pScreen->CreateColormap = ephyrCreateColormap; + return TRUE; } Bool diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 76df5885e..bf7b93ff9 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -37,11 +37,6 @@ InitCard (char *name) EPHYR_DBG("mark"); - if (hostx_want_host_cursor()) - { - ephyrFuncs.initCursor = &ephyrCursorInit; - ephyrFuncs.enableCursor = &ephyrCursorEnable; - } KdCardInfoAdd (&ephyrFuncs, &attr, 0); } @@ -100,6 +95,13 @@ void OsVendorInit (void) { EPHYR_DBG("mark"); + + if (hostx_want_host_cursor()) + { + ephyrFuncs.initCursor = &ephyrCursorInit; + ephyrFuncs.enableCursor = &ephyrCursorEnable; + } + KdOsInit (&EphyrOsFuncs); } |