misc

1 files changed, 18 insertions, 4 deletions

diff --git a/vnc-client.c b/vnc-client.c
index 479428c..94f3507 100644
--- a/vnc-client.c
+++ b/vnc-client.c
@@ -20,7 +20,7 @@ static void usage(FILE *fp)
     fprintf(fp,
 	    "This is a simple vnc client\n"
 	    "\n"
-	    "usage: vnc-client [options] hostname displayno\n"
+	    "usage: vnc-client [options] display\n"
 	    "options:\n"
 	    "   -h   Print this text.\n"
 	    "   -d   Enable debug output.\n"
@@ -35,6 +35,8 @@ int
 main(int argc, char *argv[])
 {
     unsigned long vnc_flags = VNC_FLAG_STANDALONE;
+    char hostname[65];
+    int displayno, port;
     int debug = 0;
     int c;
 
@@ -61,12 +63,24 @@ main(int argc, char *argv[])
         }
     }
 
-    if (optind+2 > argc) {
+    if (optind+1 > argc) {
 	usage(stderr);
 	exit(1);
     }
-    
-    if (NULL == vnc_open(argv[optind], atoi(argv[optind+1]), vnc_flags, debug))
+
+    if (2 == sscanf(argv[optind], "%64[^:]:%d", hostname, &displayno))
+	goto connect;
+    if (2 == sscanf(argv[optind], "%64[^:]::%d", hostname, &port)) {
+	displayno = port - 5900;
+	if (displayno >= 0)
+	    goto connect;
+    }
+
+    usage(stderr);
+    exit(1);
+
+ connect:
+    if (NULL == vnc_open(hostname, displayno, vnc_flags, debug))
 	exit(1);
 
     gtk_main();