diff options
| author | Kenneth Russel <[email protected]> | 2006-05-28 21:33:14 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2006-05-28 21:33:14 +0000 |
| commit | 66b19a72d52184ff4fa1951f7e5745ac9808275a (patch) | |
| tree | f84d0a2b44dc280a3b978f31c4e06d0bfe5ca861 /make | |
| parent | e1df17cd579e01e9350332cd63386384041ff7d3 (diff) | |
Preliminary fix for
Issue 216: Cannot create GLCanvas on non-default GraphicsDevice
Made JOGL Xinerama-aware; now uses screen 0 rather than the screen
reported from the AWT GraphicsDevice when Xinerama is enabled. So far
only compiled and tested on non-Xinerama configuration on Linux; more
testing needed on Xinerama setups and on Solaris.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@782 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rw-r--r-- | make/stub_includes/x11/window-system.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/make/build.xml b/make/build.xml index 728b93b6b..7d9c45efb 100644 --- a/make/build.xml +++ b/make/build.xml @@ -888,6 +888,10 @@ <include name="${rootrel.src.c.jogl}/InternalBufferUtils.c"/> <include name="${rootrel.src.c.jogl}/*.m" if="isOSX"/> <include name="${rootrel.generated.c.jogl}/*GL*.c"/> + <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> + <!-- Xinerama supporting functions for Linux only (for now) --> + <!-- Also supported on Solaris, but works differently --> + <include name="${rootrel.src.c.jogl}/Xinerama.c" if="isLinux"/> </patternset> <patternset id="c.src.files.jogl_awt"> diff --git a/make/stub_includes/x11/window-system.c b/make/stub_includes/x11/window-system.c index 00b474899..20cb91a08 100644 --- a/make/stub_includes/x11/window-system.c +++ b/make/stub_includes/x11/window-system.c @@ -36,6 +36,9 @@ extern int XFreePixmap( Pixmap /* pixmap */ ); +// Helper routine for querying whether Xinerama is enabled. +Bool XineramaEnabled(Display* display); + // Routines for changing gamma settings. // Note that these are not currently supported on Solaris. Bool XF86VidModeGetGammaRampSize( |