aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-17 10:39:56 +0100
committerSven Gothel <[email protected]>2010-11-17 10:39:56 +0100
commit984d1ef68ce7e353e9192fe3a4c3ec4ad7a2929c (patch)
tree59367df59c23445265cdf92af4080dec5267b2c4 /make
parentdd0038a68a9aa99646549644c3338266546b05f8 (diff)
Moving NEWT X11Window GetRelativeLocation() native implementation to NativeWindow X11.
Diffstat (limited to 'make')
-rw-r--r--make/config/nativewindow/x11-CustomJavaCode.java5
-rw-r--r--make/config/nativewindow/x11-lib.cfg2
2 files changed, 6 insertions, 1 deletions
diff --git a/make/config/nativewindow/x11-CustomJavaCode.java b/make/config/nativewindow/x11-CustomJavaCode.java
index 5afa86737..0570901d5 100644
--- a/make/config/nativewindow/x11-CustomJavaCode.java
+++ b/make/config/nativewindow/x11-CustomJavaCode.java
@@ -29,6 +29,11 @@
public static native long CreateDummyWindow(long display, int screen_index, long visualID);
public static native void DestroyDummyWindow(long display, long window);
+ public static Point GetRelativeLocation(long display, int screen_index, long src_win, long dest_win, int src_x, int src_y) {
+ return (Point) GetRelativeLocation0(display, screen_index, src_win, dest_win, src_x, src_y);
+ }
+ private static native Object GetRelativeLocation0(long display, int screen_index, long src_win, long dest_win, int src_x, int src_y);
+
public static native int XCloseDisplay(long display);
public static native void XUnlockDisplay(long display);
public static native void XLockDisplay(long display);
diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg
index e554259b8..fb481ac51 100644
--- a/make/config/nativewindow/x11-lib.cfg
+++ b/make/config/nativewindow/x11-lib.cfg
@@ -12,6 +12,7 @@ NativeOutputDir gensrc/native/X11
# Imports needed by all glue code
Import java.nio.*
Import java.util.*
+Import javax.media.nativewindow.util.Point
# XID needs to be treated as a long for 32/64 bit compatibility
Opaque long XID
@@ -21,7 +22,6 @@ Opaque boolean Bool
Opaque long GLXFBConfig
IncludeAs CustomJavaCode X11Lib x11-CustomJavaCode.java
-# Now resides in x11/Xmisc.c: IncludeAs CustomCCode x11-CustomCCode.c
ArgumentIsString XOpenDisplay 0
ReturnsString XDisplayString