shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-04-05 06:25:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Windows: Implemented Display.setParent support

Browse source
This commit is contained in:
Elias Naur 2008-04-07 10:18:09 +00:00
parent e2596d8efa
commit 3948769802
5 changed files with 58 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/java/org/lwjgl/opengl/WindowsDisplay.java
View file

@ -71,6 +71,8 @@ final class WindowsDisplay implements DisplayImplementation {
private final static int WM_QUIT = 0x0012;
private final static int WM_SYSCOMMAND = 0x0112;
private final static int WM_PAINT = 0x000F;
private final static int WM_KILLFOCUS = 8;
private final static int WM_SETFOCUS = 7;
private final static int SC_SIZE = 0xF000;
private final static int SC_MOVE = 0xF010;
@ -118,6 +120,7 @@ final class WindowsDisplay implements DisplayImplementation {
private static boolean cursor_clipped;
private WindowsDisplayPeerInfo peer_info;
private Object current_cursor;
private Canvas parent;
private WindowsKeyboard keyboard;
private WindowsMouse mouse;
@ -140,20 +143,40 @@ final class WindowsDisplay implements DisplayImplementation {
current_display = this;
}
public void createWindow(DisplayMode mode, boolean fullscreen, Canvas container, int x, int y) throws LWJGLException {
public void createWindow(DisplayMode mode, boolean fullscreen, Canvas parent, int x, int y) throws LWJGLException {
close_requested = false;
is_dirty = false;
isFullscreen = fullscreen;
isMinimized = false;
isFocused = false;
did_maximize = false;
nCreateWindow(mode, fullscreen, x, y);
this.parent = parent;
long parent_hwnd = parent != null ? getHwnd(parent) : 0;
boolean isUndecorated = isUndecorated();
nCreateWindow(mode, fullscreen, x, y, isUndecorated, parent_hwnd);
peer_info.initDC();
showWindow(getHwnd(), SW_SHOWDEFAULT);
setForegroundWindow(getHwnd());
setFocus(getHwnd());
if (parent == null) {
setForegroundWindow(getHwnd());
setFocus(getHwnd());
}
}
private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y, boolean undecorated, long parent_hwnd) throws LWJGLException;
private static boolean isUndecorated() {
return Display.getPrivilegedBoolean("org.lwjgl.opengl.Window.undecorated");
}
private static long getHwnd(Canvas parent) throws LWJGLException {
AWTCanvasImplementation awt_impl = AWTGLCanvas.createImplementation();
WindowsPeerInfo parent_peer_info = (WindowsPeerInfo)awt_impl.createPeerInfo(parent, null);
ByteBuffer parent_peer_info_handle = parent_peer_info.lockAndGetHandle();
try {
return parent_peer_info.getHwnd();
} finally {
parent_peer_info.unlock();
}
}
private native void nCreateWindow(DisplayMode mode, boolean fullscreen, int x, int y) throws LWJGLException;
public void destroyWindow() {
nDestroyWindow();
@ -213,7 +236,6 @@ final class WindowsDisplay implements DisplayImplementation {
return;
}
inAppActivate = true;
isFocused = active;
if (active) {
if (isFullscreen) {
restoreDisplayMode();
@ -350,6 +372,9 @@ final class WindowsDisplay implements DisplayImplementation {
public void update() {
nUpdate();
if (parent != null && parent.isFocusOwner()) {
setFocus(getHwnd());
}
if (did_maximize) {
did_maximize = false;
/**
@ -369,9 +394,9 @@ final class WindowsDisplay implements DisplayImplementation {
public void reshape(int x, int y, int width, int height) {
if (!isFullscreen)
nReshape(getHwnd(), x, y, width, height);
nReshape(getHwnd(), x, y, width, height, isUndecorated(), parent != null);
}
private static native void nReshape(long hwnd, int x, int y, int width, int height);
private static native void nReshape(long hwnd, int x, int y, int width, int height, boolean undecorated, boolean child);
public native DisplayMode[] getAvailableDisplayModes() throws LWJGLException;
/* Mouse */
@ -682,6 +707,12 @@ final class WindowsDisplay implements DisplayImplementation {
break;
}
return defWindowProc(hwnd, msg, wParam, lParam);
case WM_KILLFOCUS:
isFocused = false;
return 0;
case WM_SETFOCUS:
isFocused = true;
return 0;
case WM_MOUSEMOVE:
int xPos = (int)(short)(lParam & 0xFFFF);
int yPos = transformY(getHwnd(), (int)(short)((lParam >> 16) & 0xFFFF));

7
src/java/org/lwjgl/test/opengl/awt/DisplayParentTest.java
View file

@ -65,11 +65,12 @@ public class DisplayParentTest extends Frame {
final Canvas display_parent = new Canvas();
display_parent.setFocusable(true);
add(display_parent);
addWindowListener(new WindowAdapter() {
/* addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
Display.destroy();
dispose();
}
});
});*/
setResizable(true);
setVisible(true);
Display.setParent(display_parent);
@ -102,7 +103,9 @@ public class DisplayParentTest extends Frame {
while(Keyboard.next()) {
// closing on ESCAPE
if(Keyboard.getEventKey() == Keyboard.KEY_ESCAPE && Keyboard.getEventKeyState()) {
Display.destroy();
dispose();
break;
}
if(Keyboard.getEventKey() == Keyboard.KEY_SPACE && Keyboard.getEventKeyState()) {