From 287861ec890ccd504e0b916eba160a0f00353479 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 20 Nov 2006 09:26:44 +0000 Subject: [PATCH] Windows: Dont use DirectInput for keyboard input. This fixes shifted typing. --- .../org/lwjgl/opengl/WindowsAWTInput.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/java/org/lwjgl/opengl/WindowsAWTInput.java b/src/java/org/lwjgl/opengl/WindowsAWTInput.java index a840b9bb..ba827dcc 100644 --- a/src/java/org/lwjgl/opengl/WindowsAWTInput.java +++ b/src/java/org/lwjgl/opengl/WindowsAWTInput.java @@ -54,7 +54,7 @@ final class WindowsAWTInput extends AbstractAWTInput { private long cached_hwnd; private WindowsMouse cached_mouse; - private WindowsKeyboard cached_keyboard; +// private WindowsKeyboard cached_keyboard; private boolean has_grabbed; public WindowsAWTInput(AWTGLCanvas canvas) throws LWJGLException { @@ -73,14 +73,14 @@ final class WindowsAWTInput extends AbstractAWTInput { super.destroyMouse(); } - public synchronized void destroyKeyboard() { +/* public synchronized void destroyKeyboard() { if (cached_keyboard != null) { cached_keyboard.destroy(); cached_keyboard = null; } super.destroyKeyboard(); } - +*/ public synchronized void processInput(PeerInfo peer_info) { WindowsPeerInfo windows_peerinfo = (WindowsPeerInfo)peer_info; long hwnd = windows_peerinfo.getHwnd(); @@ -92,12 +92,12 @@ final class WindowsAWTInput extends AbstractAWTInput { if (cached_mouse != null) { cached_mouse.destroy(); } - if (cached_keyboard != null) { +/* if (cached_keyboard != null) { cached_keyboard.destroy(); - } + }*/ WindowsDirectInput dinput = WindowsDisplay.createDirectInput(); cached_mouse = new WindowsMouse(dinput, hwnd); - cached_keyboard = new WindowsKeyboard(dinput, hwnd); +// cached_keyboard = new WindowsKeyboard(dinput, hwnd); } if (isGrabbed() && getCanvas().getCursor() != blank_cursor) { cached_cursor = getCanvas().getCursor(); @@ -128,12 +128,12 @@ final class WindowsAWTInput extends AbstractAWTInput { private void grab(boolean grab) { if (has_grabbed != grab) { cached_mouse.grab(grab); - cached_keyboard.grab(grab); +// cached_keyboard.grab(grab); has_grabbed = grab; cached_mouse.flush(); - cached_keyboard.flush(); +// cached_keyboard.flush(); getMouseEventQueue().clearEvents(); - getKeyboardEventQueue().clearEvents(); +// getKeyboardEventQueue().clearEvents(); if (!grab) { getCanvas().setCursor(cached_cursor); } @@ -167,7 +167,7 @@ final class WindowsAWTInput extends AbstractAWTInput { super.readMouse(buffer); } - public synchronized void readKeyboard(ByteBuffer buffer) { +/* public synchronized void readKeyboard(ByteBuffer buffer) { if (isGrabbed()) { if (cached_keyboard != null) cached_keyboard.read(buffer); @@ -181,5 +181,5 @@ final class WindowsAWTInput extends AbstractAWTInput { cached_keyboard.poll(keyDownBuffer); } else super.pollKeyboard(keyDownBuffer); - } + }*/ }