Windows: Rename Win32* files to Windows*

This commit is contained in:
Elias Naur 2006-07-12 18:32:58 +00:00
parent 7815607e09
commit bb8dcf3996
27 changed files with 140 additions and 143 deletions

View file

@ -89,7 +89,7 @@ public class AWTGLCanvas extends Canvas implements Drawable, ComponentListener,
class_name = "org.lwjgl.opengl.LinuxCanvasImplementation";
break;
case LWJGLUtil.PLATFORM_WINDOWS:
class_name = "org.lwjgl.opengl.Win32CanvasImplementation";
class_name = "org.lwjgl.opengl.WindowsCanvasImplementation";
break;
case LWJGLUtil.PLATFORM_MACOSX:
class_name = "org.lwjgl.opengl.MacOSXCanvasImplementation";

View file

@ -79,7 +79,7 @@ final class Context {
class_name = "org.lwjgl.opengl.LinuxContextImplementation";
break;
case LWJGLUtil.PLATFORM_WINDOWS:
class_name = "org.lwjgl.opengl.Win32ContextImplementation";
class_name = "org.lwjgl.opengl.WindowsContextImplementation";
break;
case LWJGLUtil.PLATFORM_MACOSX:
class_name = "org.lwjgl.opengl.MacOSXContextImplementation";

View file

@ -144,7 +144,7 @@ public final class Display {
class_name = "org.lwjgl.opengl.LinuxDisplay";
break;
case LWJGLUtil.PLATFORM_WINDOWS:
class_name = "org.lwjgl.opengl.Win32Display";
class_name = "org.lwjgl.opengl.WindowsDisplay";
break;
case LWJGLUtil.PLATFORM_MACOSX:
class_name = "org.lwjgl.opengl.MacOSXDisplay";

View file

@ -41,13 +41,13 @@ import org.lwjgl.LWJGLException;
* @version $Revision$
* $Id$
*/
final class Win32AWTGLCanvasPeerInfo extends Win32PeerInfo {
final class WindowsAWTGLCanvasPeerInfo extends WindowsPeerInfo {
private final AWTGLCanvas canvas;
private final AWTSurfaceLock awt_surface = new AWTSurfaceLock();
private final PixelFormat pixel_format;
private boolean has_pixel_format= false;
public Win32AWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) {
public WindowsAWTGLCanvasPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) {
this.canvas = canvas;
this.pixel_format = pixel_format;
}

View file

@ -46,7 +46,7 @@ import org.lwjgl.LWJGLUtil;
* @version $Revision$
* $Id$
*/
final class Win32CanvasImplementation implements AWTCanvasImplementation {
final class WindowsCanvasImplementation implements AWTCanvasImplementation {
static {
// Make sure the awt stuff is properly initialised (the jawt library in particular)
Toolkit.getDefaultToolkit();
@ -66,7 +66,7 @@ final class Win32CanvasImplementation implements AWTCanvasImplementation {
}
public PeerInfo createPeerInfo(AWTGLCanvas canvas, PixelFormat pixel_format) throws LWJGLException {
return new Win32AWTGLCanvasPeerInfo(canvas, pixel_format);
return new WindowsAWTGLCanvasPeerInfo(canvas, pixel_format);
}
/**

View file

@ -41,7 +41,7 @@ import org.lwjgl.LWJGLException;
* @version $Revision$
* $Id$
*/
final class Win32ContextImplementation implements ContextImplementation {
final class WindowsContextImplementation implements ContextImplementation {
public ByteBuffer create(PeerInfo peer_info, ByteBuffer shared_context_handle) throws LWJGLException {
ByteBuffer peer_handle = peer_info.lockAndGetHandle();
try {

View file

@ -46,7 +46,7 @@ import org.lwjgl.LWJGLException;
import org.lwjgl.LWJGLUtil;
import org.lwjgl.input.Cursor;
final class Win32Display implements DisplayImplementation {
final class WindowsDisplay implements DisplayImplementation {
private final static int GAMMA_LENGTH = 256;
private final static int WM_MOUSEMOVE = 0x0200;
private final static int WM_LBUTTONDOWN = 0x0201;
@ -98,9 +98,9 @@ final class Win32Display implements DisplayImplementation {
private final static int SW_SHOWMINNOACTIVE = 7;
private final static int SW_RESTORE = 9;
private static Win32Display current_display;
private static WindowsDisplay current_display;
private Win32DisplayPeerInfo peer_info;
private WindowsDisplayPeerInfo peer_info;
private WindowsKeyboard keyboard;
private WindowsMouse mouse;
@ -119,7 +119,7 @@ final class Win32Display implements DisplayImplementation {
private boolean did_maximize;
private boolean inAppActivate;
public Win32Display() {
public WindowsDisplay() {
current_display = this;
}
@ -228,14 +228,14 @@ final class Win32Display implements DisplayImplementation {
public String getAdapter() {
try {
String adapter_string = Win32Registry.queryRegistrationKey(
Win32Registry.HKEY_LOCAL_MACHINE,
String adapter_string = WindowsRegistry.queryRegistrationKey(
WindowsRegistry.HKEY_LOCAL_MACHINE,
"HARDWARE\\DeviceMap\\Video",
"\\Device\\Video0");
String root_key = "\\registry\\machine\\";
if (adapter_string.toLowerCase().startsWith(root_key)) {
String driver_value = Win32Registry.queryRegistrationKey(
Win32Registry.HKEY_LOCAL_MACHINE,
String driver_value = WindowsRegistry.queryRegistrationKey(
WindowsRegistry.HKEY_LOCAL_MACHINE,
adapter_string.substring(root_key.length()),
"InstalledDisplayDrivers");
return driver_value;
@ -284,7 +284,7 @@ final class Win32Display implements DisplayImplementation {
}
public PeerInfo createPeerInfo(PixelFormat pixel_format) throws LWJGLException {
peer_info = new Win32DisplayPeerInfo(pixel_format);
peer_info = new WindowsDisplayPeerInfo(pixel_format);
return peer_info;
}
public void update() {
@ -410,25 +410,25 @@ final class Win32Display implements DisplayImplementation {
private native int nGetPbufferCapabilities(PixelFormat format) throws LWJGLException;
public boolean isBufferLost(PeerInfo handle) {
return ((Win32PbufferPeerInfo)handle).isBufferLost();
return ((WindowsPbufferPeerInfo)handle).isBufferLost();
}
public PeerInfo createPbuffer(int width, int height, PixelFormat pixel_format,
IntBuffer pixelFormatCaps,
IntBuffer pBufferAttribs) throws LWJGLException {
return new Win32PbufferPeerInfo(width, height, pixel_format, pixelFormatCaps, pBufferAttribs);
return new WindowsPbufferPeerInfo(width, height, pixel_format, pixelFormatCaps, pBufferAttribs);
}
public void setPbufferAttrib(PeerInfo handle, int attrib, int value) {
((Win32PbufferPeerInfo)handle).setPbufferAttrib(attrib, value);
((WindowsPbufferPeerInfo)handle).setPbufferAttrib(attrib, value);
}
public void bindTexImageToPbuffer(PeerInfo handle, int buffer) {
((Win32PbufferPeerInfo)handle).bindTexImageToPbuffer(buffer);
((WindowsPbufferPeerInfo)handle).bindTexImageToPbuffer(buffer);
}
public void releaseTexImageFromPbuffer(PeerInfo handle, int buffer) {
((Win32PbufferPeerInfo)handle).releaseTexImageFromPbuffer(buffer);
((WindowsPbufferPeerInfo)handle).releaseTexImageFromPbuffer(buffer);
}

View file

@ -41,8 +41,8 @@ import org.lwjgl.LWJGLException;
* @version $Revision$
* $Id$
*/
final class Win32DisplayPeerInfo extends Win32PeerInfo {
public Win32DisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException {
final class WindowsDisplayPeerInfo extends WindowsPeerInfo {
public WindowsDisplayPeerInfo(PixelFormat pixel_format) throws LWJGLException {
GLContext.loadOpenGLLibrary();
try {
createDummyDC(getHandle());

View file

@ -42,8 +42,8 @@ import org.lwjgl.LWJGLException;
* @version $Revision$
* $Id$
*/
final class Win32PbufferPeerInfo extends Win32PeerInfo {
public Win32PbufferPeerInfo(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException {
final class WindowsPbufferPeerInfo extends WindowsPeerInfo {
public WindowsPbufferPeerInfo(int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException {
nCreate(getHandle(), width, height, pixel_format, pixelFormatCaps, pBufferAttribs);
}
private static native void nCreate(ByteBuffer handle, int width, int height, PixelFormat pixel_format, IntBuffer pixelFormatCaps, IntBuffer pBufferAttribs) throws LWJGLException;

View file

@ -42,8 +42,8 @@ import org.lwjgl.LWJGLException;
* @version $Revision$
* $Id$
*/
abstract class Win32PeerInfo extends PeerInfo {
public Win32PeerInfo() {
abstract class WindowsPeerInfo extends PeerInfo {
public WindowsPeerInfo() {
super(createHandle());
}
private static native ByteBuffer createHandle();

View file

@ -38,7 +38,7 @@ package org.lwjgl.opengl;
import org.lwjgl.LWJGLException;
final class Win32Registry {
final class WindowsRegistry {
final static int HKEY_CLASSES_ROOT = 1;
final static int HKEY_CURRENT_USER = 2;
final static int HKEY_LOCAL_MACHINE = 3;