add support for "hidden" compression levels 0,7,8,9 in the gui (JComboBox is now editable). Also addded some sanity checks to make sure only 0-9 can be passed in via the gui or the command line.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4636 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 11 insertions, 2 deletions

diff --git a/java/src/com/tigervnc/vncviewer/CConn.java b/java/src/com/tigervnc/vncviewer/CConn.java
index 2d4276ec..27f9dc60 100644
--- a/java/src/com/tigervnc/vncviewer/CConn.java
+++ b/java/src/com/tigervnc/vncviewer/CConn.java
@@ -681,7 +681,11 @@ public class CConn extends CConnection
 
     options.customCompressLevel.setSelected(viewer.customCompressLevel.getValue());
     digit = 0 + viewer.compressLevel.getValue();
-    options.compressLevel.setSelectedItem(digit);
+    if (digit >= 0 && digit <= 9) {
+      options.compressLevel.setSelectedItem(digit);
+    } else {
+      options.compressLevel.setSelectedItem(Integer.parseInt(viewer.compressLevel.getDefaultStr()));
+    }
     options.noJpeg.setSelected(!viewer.noJpeg.getValue());
     digit = 0 + viewer.qualityLevel.getValue();
     options.qualityLevel.setSelectedItem(digit);
@@ -815,7 +819,12 @@ public class CConn extends CConnection
       cp.customCompressLevel = viewer.customCompressLevel.getValue();
       encodingChange = true;
     }
-    viewer.compressLevel.setParam(options.compressLevel.getSelectedItem().toString());
+    if (Integer.parseInt(options.compressLevel.getSelectedItem().toString()) >= 0 && 
+        Integer.parseInt(options.compressLevel.getSelectedItem().toString()) <= 9) {
+      viewer.compressLevel.setParam(options.compressLevel.getSelectedItem().toString());
+    } else {
+      viewer.compressLevel.setParam(viewer.compressLevel.getDefaultStr());
+    }
     if (cp.compressLevel != viewer.compressLevel.getValue()) {
       cp.compressLevel = viewer.compressLevel.getValue();
       encodingChange = true;