Misc.

2 files changed, 13 insertions, 20 deletions

diff --git a/src/driver.c b/src/driver.c
index df7b22e..6caa1ec 100644
--- a/src/driver.c
+++ b/src/driver.c
@@ -160,14 +160,22 @@ typedef struct NestedPrivate {
 
 /*static ScrnInfoPtr NESTEDScrn;*/
 
+static CARD32
+NestedMouseTimer(OsTimerPtr timer, CARD32 time, pointer arg) {
+    Load_Nested_Mouse(arg);
+    return 0;
+}
+
 static pointer
 NestedSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
     static Bool setupDone = FALSE;
 
     if (!setupDone) {
         setupDone = TRUE;
-        Load_Nested_Mouse(module);
         xf86AddDriver(&NESTED, module, HaveDriverFuncs);
+    
+        //pNested->timer = 
+        TimerSet(NULL, 0, 1, NestedMouseTimer, module);
         
         return (pointer)1;
     } else {
diff --git a/src/xNestedMouse.c b/src/xNestedMouse.c
index 66cee22..0dadd65 100644
--- a/src/xNestedMouse.c
+++ b/src/xNestedMouse.c
@@ -96,8 +96,8 @@ NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) {
 
     /* process driver specific options */
     pNestedMouse->device = xf86SetStrOption(dev->commonOptions,
-                                         "Device",
-                                         "/dev/nestedmouse");
+                                            "Device",
+                                            "/dev/random");
 
     xf86Msg(X_INFO, "%s: Using device %s.\n", pInfo->name, pNestedMouse->device);
     
@@ -120,8 +120,8 @@ NestedMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) {
     }
     
     /* do more funky stuff */
-    close(pInfo->fd);
-    pInfo->fd = -1;
+  //  close(pInfo->fd);
+   // pInfo->fd = -1;
     pInfo->flags |= XI86_OPEN_ON_INIT;
     pInfo->flags |= XI86_CONFIGURED;
     return pInfo;
@@ -194,21 +194,6 @@ void Load_Nested_Mouse(pointer module) {
     xf86Msg(X_INFO, "NESTED MOUSE LOADING\n");
     xf86AddInputDriver(&NESTEDMOUSE, module, 0);
    
-    /*
-    InputOption driverOption = {
-        "driver",
-        "nestedmouse",
-        NULL
-    };
-
-    InputOption options = {
-        "identifier",
-        "nesmouse",
-        &driverOption
-        //NULL
-    };
-*/
- 
     InputOption* options = (InputOption*)xalloc(sizeof(InputOption));
     
     options->key = "driver";