Revision: 4588
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4588&view=rev
Author: ossman_
Date: 2011-07-14 14:34:09 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Managed to consistently get the colour levels reversed. Fix up everything so
that it behaves like documented.
Modified Paths:
--------------
trunk/vncviewer/CConn.cxx
trunk/vncviewer/OptionsDialog.cxx
Modified: trunk/vncviewer/CConn.cxx
===================================================================
--- trunk/vncviewer/CConn.cxx 2011-07-14 13:35:48 UTC (rev 4587)
+++ trunk/vncviewer/CConn.cxx 2011-07-14 14:34:09 UTC (rev 4588)
@@ -50,9 +50,14 @@
static rfb::LogWriter vlog("CConn");
-static const PixelFormat mediumColourPF(8,3,0,1,1,1,1,2,1,0);
-static const PixelFormat lowColourPF(8,6,0,1,3,3,3,4,2,0);
-static const PixelFormat verylowColourPF(8,8,0,0);
+// 8 colours (1 bit per component)
+static const PixelFormat verylowColourPF(8, 3,false, true,
+ 1, 1, 1, 2, 1, 0);
+// 64 colours (2 bits per component)
+static const PixelFormat lowColourPF(8, 6, false, true,
+ 3, 3, 3, 4, 2, 0);
+// 256 colours (palette)
+static const PixelFormat mediumColourPF(8, 8, false, false);
CConn::CConn(const char* vncServerName)
: serverHost(0), serverPort(0), sock(NULL), desktop(NULL),
@@ -503,11 +508,11 @@
pf = fullColourPF;
} else {
if (lowColourLevel == 0)
- pf = mediumColourPF;
+ pf = verylowColourPF;
else if (lowColourLevel == 1)
pf = lowColourPF;
else
- pf = verylowColourPF;
+ pf = mediumColourPF;
}
char str[256];
pf.print(str, 256);
@@ -564,11 +569,11 @@
pf = self->fullColourPF;
} else {
if (lowColourLevel == 0)
- pf = mediumColourPF;
+ pf = verylowColourPF;
else if (lowColourLevel == 1)
pf = lowColourPF;
else
- pf = verylowColourPF;
+ pf = mediumColourPF;
}
if (!pf.equal(self->cp.pf()))
Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx 2011-07-14 13:35:48 UTC (rev 4587)
+++ trunk/vncviewer/OptionsDialog.cxx 2011-07-14 14:34:09 UTC (rev 4588)
@@ -150,13 +150,13 @@
else {
switch (lowColourLevel) {
case 0:
- mediumcolorCheckbox->setonly();
+ verylowcolorCheckbox->setonly();
break;
case 1:
lowcolorCheckbox->setonly();
break;
case 2:
- verylowcolorCheckbox->setonly();
+ mediumcolorCheckbox->setonly();
break;
}
}
@@ -292,11 +292,11 @@
preferredEncoding.setParam(encodingName(encodingRaw));
fullColour.setParam(fullcolorCheckbox->value());
- if (mediumcolorCheckbox->value())
+ if (verylowcolorCheckbox->value())
lowColourLevel.setParam(0);
else if (lowcolorCheckbox->value())
lowColourLevel.setParam(1);
- else if (verylowcolorCheckbox->value())
+ else if (mediumcolorCheckbox->value())
lowColourLevel.setParam(2);
customCompressLevel.setParam(compressionCheckbox->value());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
