Revision: 5068
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5068&view=rev
Author: ossman_
Date: 2013-04-09 14:54:17 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
Copy the -verbose and -quiet parameters from Xorg so that we
can control log output from the X core.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/xvnc.cc
Modified: trunk/unix/xserver/hw/vnc/xvnc.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/xvnc.cc 2013-04-09 14:50:15 UTC (rev 5067)
+++ trunk/unix/xserver/hw/vnc/xvnc.cc 2013-04-09 14:54:17 UTC (rev 5068)
@@ -87,8 +87,8 @@
#undef VENDOR_RELEASE
#undef VENDOR_STRING
#include "version-config.h"
+#endif
#include "site.h"
-#endif
#undef class
#undef public
}
@@ -170,7 +170,9 @@
char *listenaddr = NULL;
+static int vncVerbose = DEFAULT_LOG_VERBOSITY;
+
static void
vfbInitializePixmapDepths(void)
{
@@ -326,6 +328,8 @@
ErrorF("-inetd has been launched from inetd\n");
ErrorF("-interface IP_address listen on specified interface\n");
ErrorF("-noclipboard disable clipboard settings modification via
vncconfig utility\n");
+ ErrorF("-verbose [n] verbose startup messages\n");
+ ErrorF("-quiet minimal startup messages\n");
ErrorF("\nVNC parameters:\n");
fprintf(stderr,"\n"
@@ -609,7 +613,30 @@
noclipboard = true;
return 1;
}
-
+
+ if (!strcmp(argv[i], "-verbose")) {
+ if (++i < argc && argv[i]) {
+ char *end;
+ long val;
+
+ val = strtol(argv[i], &end, 0);
+ if (*end == '\0') {
+ vncVerbose = val;
+ LogSetParameter(XLOG_VERBOSITY, vncVerbose);
+ return 2;
+ }
+ }
+ vncVerbose++;
+ LogSetParameter(XLOG_VERBOSITY, vncVerbose);
+ return 1;
+ }
+
+ if (!strcmp(argv[i], "-quiet")) {
+ vncVerbose = -1;
+ LogSetParameter(XLOG_VERBOSITY, vncVerbose);
+ return 1;
+ }
+
if (rfb::Configuration::setParam(argv[i]))
return 1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
