[Jnode-svn-commits] SF.net SVN: jnode:[5842] trunk/core/src/driver/org/jnode/driver/input

[<ls...@us...>]

Revision: 5842
          http://jnode.svn.sourceforge.net/jnode/?rev=5842&view=rev
Author:   lsantha
Date:     2011-08-02 20:04:52 +0000 (Tue, 02 Aug 2011)

Log Message:
-----------
Fixes to restarting the PS/2 mouse and keyboard devices.

Modified Paths:
--------------
    trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java
    trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java

Modified: trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java	2011-07-31 13:48:44 UTC (rev 5841)
+++ trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java	2011-08-02 20:04:52 UTC (rev 5842)
@@ -34,16 +34,17 @@
     private final ArrayList<SystemListener> listeners = new ArrayList<SystemListener>();
 
     private QueueProcessorThread<E> eventQueueThread;
-    private final Queue<E> eventQueue = new Queue<E>();
+    private Queue<E> eventQueue = new Queue<E>();
     private InputDaemon daemon;
 
     protected final void startDispatcher(String id) {
+        this.eventQueue = new Queue<E>();
         this.daemon = new InputDaemon(id + "-daemon");
-        daemon.start();
+        this.daemon.start();
 
         this.eventQueueThread = new QueueProcessorThread<E>(id + "-dispatcher",
             eventQueue, new SystemEventDispatcher());
-        eventQueueThread.start();
+        this.eventQueueThread.start();
     }
 
     protected final void stopDispatcher() {

Modified: trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java	2011-07-31 13:48:44 UTC (rev 5841)
+++ trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java	2011-08-02 20:04:52 UTC (rev 5842)
@@ -68,7 +68,9 @@
                 return false;
             }
             int id = d.getPointerId();
-            if (id != 0) {
+            //todo -- 3 is for the wheel mouse identified bellow but when restarted the id remains 3 instead of
+            //todo -- 0 as on the first start. Investigate this anomaly.
+            if (id != 0 && id != 3) {
                 // does not seem to be a mouse, more likely a tablet of touch screen
                 log.debug("PointerId 0x" + NumberUtils.hex(id, 2));
                 return false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.