--- sourceforge.net/trunk/rdesktop/rdesktop.c	2002/09/14 11:48:44	121
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2002/09/15 12:42:26	160
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Entrypoint and utility functions
-   Copyright (C) Matthew Chapman 1999-2001
+   Copyright (C) Matthew Chapman 1999-2002
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,8 +34,8 @@
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int width;
-int height;
+int width = 800;
+int height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
 BOOL bitmap_compression = True;
 BOOL sendmotion = True;
@@ -50,6 +50,10 @@
 static void
 usage(char *program)
 {
+	fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
+	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n");
+	fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
+
 	fprintf(stderr, "Usage: %s [options] server\n", program);
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
@@ -85,10 +89,6 @@
 	uint32 flags;
 	int c;
 
-	fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n");
-	fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n");
-	fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
-
 	flags = RDP_LOGON_NORMAL;
 	domain[0] = password[0] = shell[0] = directory[0] = 0;
 	strcpy(keymapname, "us");
@@ -234,17 +234,6 @@
 		STRNCPY(password, p, sizeof(password));
 	}
 
-	if ((width == 0) || (height == 0))
-	{
-		width = 800;
-		height = 600;
-	}
-	else
-	{
-		/* make sure width is a multiple of 4 */
-		width = (width + 3) & ~3;
-	}
-
 	if (!strlen(title))
 	{
 		strcpy(title, "rdesktop - ");
@@ -257,7 +246,7 @@
 	if (!rdp_connect(server, flags, domain, password, shell, directory))
 		return 1;
 
-	fprintf(stderr, "Connection successful.\n");
+	DEBUG(("Connection successful.\n"));
 
 	if (ui_create_window())
 	{
@@ -265,7 +254,7 @@
 		ui_destroy_window();
 	}
 
-	fprintf(stderr, "Disconnecting...\n");
+	DEBUG(("Disconnecting...\n"));
 	rdp_disconnect();
 	return 0;
 }
@@ -388,6 +377,7 @@
 	}
 }
 
+#ifdef SAVE_LICENCE
 int
 load_licence(unsigned char **data)
 {
@@ -441,3 +431,4 @@
 	write(fd, data, length);
 	close(fd);
 }
+#endif