projects / packages / tigervnc.git / blame
| Commit | Line | Data |
|---|---|---|
| 13a33bd9 JR |
1 | diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx |
| 2 | --- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx.102434 2010-07-20 17:07:44.000000000 +0200 | |
| 3 | +++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/CConn.cxx 2010-07-21 17:02:09.900085594 +0200 | |
| 4 | @@ -40,6 +40,8 @@ | |
| 5 | #include "ServerDialog.h" | |
| 6 | #include "PasswdDialog.h" | |
| 7 | #include "parameters.h" | |
| 8 | +#include <string> | |
| 9 | +#include <iostream> | |
| 10 | ||
| 11 | using namespace rfb; | |
| 12 | ||
| 13 | @@ -214,6 +216,15 @@ void CConn::getUserPasswd(char** user, c | |
| 14 | return; | |
| 15 | } | |
| 16 | ||
| 17 | + /* XXX Who wrote this code? Yes, it is really ugly */ | |
| 18 | + if (passwdInput) { | |
| 19 | + std::string s; | |
| 20 | + std::cin >> s; | |
| 21 | + *password = strdup(s.c_str()); | |
| 22 | + if (user) *user = 0; | |
| 23 | + return; | |
| 24 | + } | |
| 25 | + | |
| 26 | const char* secType = secTypeName(csecurity->getType()); | |
| 27 | const char* titlePrefix = _("VNC authentication"); | |
| 28 | unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4; | |
| 29 | diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h | |
| 30 | --- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h.102434 2009-03-23 17:49:47.000000000 +0100 | |
| 31 | +++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/parameters.h 2010-07-21 16:55:44.414314911 +0200 | |
| 32 | @@ -42,6 +42,7 @@ extern rfb::BoolParameter customCompress | |
| 33 | extern rfb::IntParameter compressLevel; | |
| 34 | extern rfb::BoolParameter noJpeg; | |
| 35 | extern rfb::IntParameter qualityLevel; | |
| 36 | +extern rfb::BoolParameter passwdInput; | |
| 37 | ||
| 38 | extern char aboutText[]; | |
| 39 | extern char* programName; | |
| 40 | diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx | |
| 41 | --- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx.102434 2010-04-23 16:06:38.000000000 +0200 | |
| 42 | +++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.cxx 2010-07-21 17:01:05.979161234 +0200 | |
| 43 | @@ -59,7 +59,7 @@ IntParameter wmDecorationHeight("WMDecor | |
| 44 | StringParameter passwordFile("PasswordFile", | |
| 45 | "Password file for VNC authentication", ""); | |
| 46 | AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile); | |
| 47 | - | |
| 48 | +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false); | |
| 49 | BoolParameter useLocalCursor("UseLocalCursor", | |
| 50 | "Render the mouse cursor locally", true); | |
| 51 | BoolParameter dotWhenNoCursor("DotWhenNoCursor", | |
| 52 | diff -up tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434 tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man | |
| 53 | --- tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man.102434 2009-10-07 17:13:00.000000000 +0200 | |
| 54 | +++ tigervnc-1.0.90-20100721svn4113/unix/vncviewer/vncviewer.man 2010-07-21 16:55:44.414314911 +0200 | |
| 55 | @@ -119,6 +119,11 @@ the server, you can specify it here to a | |
| 56 | "~/.vnc/passwd". | |
| 57 | ||
| 58 | .TP | |
| 59 | +.B \-passwdInput \fItrue, false\fP | |
| 60 | +Force standard vnc dialog to getting password and reads password from stdin. | |
| 61 | +Default is false(shows dialog window) | |
| 62 | + | |
| 63 | +.TP | |
| 64 | .B \-Shared | |
| 65 | When you make a connection to a VNC server, all other existing connections are | |
| 66 | normally closed. This option requests that they be left open, allowing you to |