From: <cr...@us...> - 2008-10-04 06:43:51
|
Revision: 4602 http://jnode.svn.sourceforge.net/jnode/?rev=4602&view=rev Author: crawley Date: 2008-10-04 06:39:30 +0000 (Sat, 04 Oct 2008) Log Message: ----------- Tidied imports Modified Paths: -------------- trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java trunk/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java trunk/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java trunk/core/src/driver/org/jnode/driver/input/KeyboardEvent.java trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java trunk/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java Modified: trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.nio.channels.ByteChannel; import java.util.ArrayList; + import org.jnode.driver.Driver; import org.jnode.system.event.SystemEvent; import org.jnode.util.Queue; Modified: trunk/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -23,6 +23,7 @@ import java.io.IOException; import java.nio.channels.ByteChannel; + import org.apache.log4j.Logger; import org.jnode.driver.Device; import org.jnode.driver.DeviceException; Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -22,6 +22,7 @@ package org.jnode.driver.input; import java.util.ArrayList; + import org.apache.log4j.Logger; /** Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardEvent.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/KeyboardEvent.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/KeyboardEvent.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -23,6 +23,7 @@ import java.awt.event.InputEvent; import java.awt.event.KeyEvent; + import org.jnode.system.event.SystemEvent; /** Modified: trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; + import org.apache.log4j.Logger; import org.jnode.driver.DeviceException; import org.jnode.driver.DriverException; Modified: trunk/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java 2008-10-04 06:27:09 UTC (rev 4601) +++ trunk/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java 2008-10-04 06:39:30 UTC (rev 4602) @@ -22,6 +22,7 @@ package org.jnode.driver.input; import java.util.ArrayList; + import org.apache.log4j.Logger; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2008-10-05 02:46:26
|
Revision: 4605 http://jnode.svn.sourceforge.net/jnode/?rev=4605&view=rev Author: crawley Date: 2008-10-05 02:46:23 +0000 (Sun, 05 Oct 2008) Log Message: ----------- Headers, javadocs and checkstyle changes. Modified Paths: -------------- trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreterException.java trunk/core/src/driver/org/jnode/driver/input/KeyboardLayoutManager.java trunk/core/src/driver/org/jnode/driver/input/MissingKeyboardInterpreterClassException.java Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java 2008-10-05 02:25:18 UTC (rev 4604) +++ trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java 2008-10-05 02:46:23 UTC (rev 4605) @@ -63,4 +63,4 @@ */ public KeyboardEvent interpretKeycode(int keycode); -} \ No newline at end of file +} Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreterException.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreterException.java 2008-10-05 02:25:18 UTC (rev 4604) +++ trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreterException.java 2008-10-05 02:46:23 UTC (rev 4605) @@ -1,5 +1,31 @@ +/* + * $Id: KeyboardInterpreter.java 4604 2008-10-05 02:25:18Z crawley $ + * + * JNode.org + * Copyright (C) 2003-2006 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ package org.jnode.driver.input; +/** + * This exception is thrown to indicate a problem in configuring or using + * a keyboard interpreter. + * + * @author cr...@jn... + */ public class KeyboardInterpreterException extends Exception { public KeyboardInterpreterException(String message, Throwable cause) { Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardLayoutManager.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/KeyboardLayoutManager.java 2008-10-05 02:25:18 UTC (rev 4604) +++ trunk/core/src/driver/org/jnode/driver/input/KeyboardLayoutManager.java 2008-10-05 02:46:23 UTC (rev 4605) @@ -28,7 +28,6 @@ import java.util.TreeSet; import org.apache.log4j.Logger; -import org.apache.log4j.Priority; import org.jnode.plugin.ConfigurationElement; import org.jnode.plugin.Extension; import org.jnode.plugin.ExtensionPoint; @@ -207,7 +206,8 @@ } /** - * Register a keyboard interpreter factory object. + * Register a keyboard interpreter factory object. This factory could be an + * instance of {@link KIClassWrapper} or some other factory. * * @param name the keyboard layout identifier. * @param factory the factory to be registered. @@ -305,7 +305,7 @@ * This wrapper class allows us to treat a class name as a keyboard interpreter * factory. */ - private static class KIClassWrapper implements KeyboardInterpreter.Factory { + public static class KIClassWrapper implements KeyboardInterpreter.Factory { private final String className; /** Modified: trunk/core/src/driver/org/jnode/driver/input/MissingKeyboardInterpreterClassException.java =================================================================== --- trunk/core/src/driver/org/jnode/driver/input/MissingKeyboardInterpreterClassException.java 2008-10-05 02:25:18 UTC (rev 4604) +++ trunk/core/src/driver/org/jnode/driver/input/MissingKeyboardInterpreterClassException.java 2008-10-05 02:46:23 UTC (rev 4605) @@ -1,5 +1,31 @@ +/* + * $Id: KeyboardInterpreter.java 4604 2008-10-05 02:25:18Z crawley $ + * + * JNode.org + * Copyright (C) 2003-2006 JNode.org + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; If not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ package org.jnode.driver.input; +/** + * This exception is thrown to indicate that a keyboard layout identifier maps + * to a non-existent {@link KeyboardInterpreter} class. + * + * @author cr...@jn... + */ public class MissingKeyboardInterpreterClassException extends KeyboardInterpreterException { public MissingKeyboardInterpreterClassException(String message, Throwable cause) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2011-08-02 20:04:58
|
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. |