aboutsummaryrefslogtreecommitdiffstats
path: root/java/com/tigervnc/vncviewer
diff options
context:
space:
mode:
authorBrian P. Hinz <bphinz@users.sf.net>2017-08-12 20:19:50 -0400
committerBrian P. Hinz <bphinz@users.sf.net>2017-08-12 20:24:05 -0400
commitd698a6c9536dfa17d8ada12d0dea5c4b53ae08e8 (patch)
treeef5486d6fb447d3fd61dd93e9aa5e7896c6ea034 /java/com/tigervnc/vncviewer
parent39c0784f0a74e9fd65284aa051d33883952d158e (diff)
downloadtigervnc-d698a6c9536dfa17d8ada12d0dea5c4b53ae08e8.tar.gz
tigervnc-d698a6c9536dfa17d8ada12d0dea5c4b53ae08e8.zip
Fully implement support for alpha cursor pseudo encoding.
Alpha cursors are not supported in java on Windows so disable it in that case. Ideally it would be nice to be able to test whether or not the client OS supports it, but at the moment MS Windows is the only one that I'm aware of that doesn't.
Diffstat (limited to 'java/com/tigervnc/vncviewer')
-rw-r--r--java/com/tigervnc/vncviewer/CConn.java5
-rw-r--r--java/com/tigervnc/vncviewer/VncViewer.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index c53f8058..85bdcb69 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -104,6 +104,11 @@ public class CConn extends CConnection implements
currentEncoding = encNum;
cp.supportsLocalCursor = true;
+ if (VncViewer.os.contains("windows"))
+ // JRE on Windows does not support alpha cursor
+ cp.supportsLocalCursorWithAlpha = false;
+ else
+ cp.supportsLocalCursorWithAlpha = true;
cp.supportsDesktopResize = true;
cp.supportsExtendedDesktopSize = true;
diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index cab1fc53..d6a3930b 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -81,7 +81,7 @@ public class VncViewer extends javax.swing.JApplet
public static final InputStream timestamp =
VncViewer.class.getResourceAsStream("timestamp");
public static final String os =
- System.getProperty("os.name").toLowerCase();
+ System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
private static VncViewer applet;
private String defaultServerName;