summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-01-13 10:43:50 +0100
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-01-13 10:43:50 +0100
commit08513f055814415e0c683450a438d37df644975b (patch)
treeee2a640d98dbdfa74c84a59b407b8bed5ad9f953 /scilab/modules
parent98b99d9df31d859c1fcc49ad64f7a07e6b4654cc (diff)
parent3cbe20b1c6e718bb8fdf27a0d6118ccd2d0b4345 (diff)
downloadscilab-08513f055814415e0c683450a438d37df644975b.zip
scilab-08513f055814415e0c683450a438d37df644975b.tar.gz
Merge branch '5.1' of git@git.scilab.org:scilab into 5.1
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst30
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java30
2 files changed, 53 insertions, 7 deletions
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst
new file mode 100644
index 0000000..9486509
--- /dev/null
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3919.tst
@@ -0,0 +1,30 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2008 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8//
9// <-- Non-regression test for bug 3919 -->
10//
11
12//
13// <-- Bugzilla URL -->
14// http://bugzilla.scilab.org/show_bug.cgi?id=3919
15//
16// <-- Short Description -->
17// scilab x64 doesn't display graphics from a remote desktop
18
19// <-- INTERACTIVE TEST -->
20
21// install scilab x64 on windows
22// configure your remote desktop and connect to your pc
23// and launch scilab
24
25if ~msdos then pause,end
26if win64() <> %t then pause,end
27if istssession() <> %t then pause,end
28
29// try to do a plot or plot3d
30// if you have a display it works \ No newline at end of file
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
index e5ee76c..128e99e 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
@@ -93,18 +93,34 @@ public class SwingScilabCanvasImpl implements GLAutoDrawable, ImageObserver, Men
93 tmpFrame.dispose(); 93 tmpFrame.dispose();
94 Debug.DEBUG("SwingScilabCanvasImpl", "Testing time = "+(Calendar.getInstance().getTimeInMillis() - lastTime)+"ms"); 94 Debug.DEBUG("SwingScilabCanvasImpl", "Testing time = "+(Calendar.getInstance().getTimeInMillis() - lastTime)+"ms");
95 95
96 // If we are running on a Linux with Intel video card and with DRI activated
97 // GLJPanel will not be supported, so we force switch to GLCanvas.
98 if (OS_NAME.contains("Linux") 96 if (OS_NAME.contains("Linux")
99 && GL_RENDERER.contains("Intel") 97 && GL_RENDERER.contains("Intel")
100 && GL_RENDERER.contains("DRI")) 98 && GL_RENDERER.contains("DRI")) {
101 { 99 noGLJPanel = true;
102 noGLJPanel = true;
103 } 100 }
104 else { 101 else {
105 noGLJPanel = false; 102 if ( OS_NAME.contains("Windows") && OS_ARCH.equals("amd64") ) {
103 // bug 3919 : JOGL x64 doesn't like x64 remote desktop on Windows
104 // @TODO : bug report to JOGL
105 String REMOTEDESKTOP = System.getenv("SCILAB_MSTS_SESSION");
106 if (REMOTEDESKTOP != null) {
107 if ( REMOTEDESKTOP.equals("OK") ) {
108 noGLJPanel = true;
109 }
110 else {
111 noGLJPanel = false;
112 }
113 }
114 else {
115 noGLJPanel = false;
116 }
117 }
118 else {
119 noGLJPanel = false;
120 }
121 }
122
106 } 123 }
107 }
108 124
109 GLCanvas realGLCanvas; 125 GLCanvas realGLCanvas;
110 GLJPanel realGLJPanel; 126 GLJPanel realGLJPanel;