Change encoding and quality defaults to what auto mode would choose.

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

diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index db364895122fcd8dba211f09e30369be40b0b770..4a1aeb0e7b382b8d14e03f5d13c2af878ce27414 100644 (file)
--- a/unix/vncviewer/CConn.cxx
+++ b/unix/vncviewer/CConn.cxx
@@ -54,7 +54,7 @@ CConn::CConn(Display* dpy_, int argc_, char** argv_, network::Socket* sock_,
   : dpy(dpy_), argc(argc_),
     argv(argv_), serverHost(0), serverPort(0), sock(sock_), viewport(0),
     desktop(0), desktopEventHandler(0),
-    currentEncoding(encodingZRLE), lastServerEncoding((unsigned int)-1),
+    currentEncoding(encodingTight), lastServerEncoding((unsigned int)-1),
     fullColour(::fullColour),
     autoSelect(::autoSelect), shared(::shared), formatChange(false),
     encodingChange(false), sameMachine(false), fullScreen(::fullScreen),

diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 8b9fea4ea6fd9b6723fade9b2d8aa8fb8742bc31..dc494309a79a1cb257a1a00ba5663719414e4c3c 100644 (file)
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -121,7 +121,7 @@ BoolParameter noJpeg("NoJPEG",
 IntParameter qualityLevel("QualityLevel",
                          "JPEG quality level. "
                          "0 = Low, 9 = High",
-                         6);
+                         8);
 
 char aboutText[1024];
 char* programName;

diff --git a/win/vncviewer/CConnOptions.cxx b/win/vncviewer/CConnOptions.cxx
index 7bf36eb7ba2bf95a52c237f9d1b2ec4136b7175e..cb561930dd7bbcea3b727ff3eeef177a6fbfb0ad 100644 (file)
--- a/win/vncviewer/CConnOptions.cxx
+++ b/win/vncviewer/CConnOptions.cxx
@@ -115,7 +115,7 @@ static BoolParameter noJpeg("NoJPEG",
 static IntParameter qualityLevel("QualityLevel",
                                 "JPEG quality level. "
                                 "0 = Low, 9 = High",
-                                6);
+                                8);
 
 static BoolParameter autoScaling("AutoScaling",
                           "Auto rescale local copy of the remote desktop to the client window.",
@@ -130,7 +130,7 @@ useDesktopResize(::useDesktopResize),
 fullScreen(::fullScreen), 
 fullColour(::fullColour), 
 lowColourLevel(::lowColourLevel), 
-preferredEncoding(encodingZRLE), 
+preferredEncoding(encodingTight), 
 autoSelect(::autoSelect), 
 shared(::sharedConnection), 
 sendPtrEvents(::sendPtrEvents), 
@@ -154,7 +154,7 @@ qualityLevel(::qualityLevel),
 passwordFile(::passwordFile.getData())
 {
   if (autoSelect) {
-    preferredEncoding = encodingZRLE;
+    preferredEncoding = encodingTight;
   } else {
     CharArray encodingName(::preferredEncoding.getData());
     preferredEncoding = encodingNum(encodingName.buf);