From: <as...@us...> - 2009-08-27 08:35:55
|
Revision: 1509 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1509&view=rev Author: astrand Date: 2009-08-27 08:35:48 +0000 (Thu, 27 Aug 2009) Log Message: ----------- Indent fixes; ran indent-all with modern indent (F11) Modified Paths: -------------- rdesktop/trunk/cache.c rdesktop/trunk/disk.c rdesktop/trunk/serial.c Modified: rdesktop/trunk/cache.c =================================================================== --- rdesktop/trunk/cache.c 2009-08-27 07:30:32 UTC (rev 1508) +++ rdesktop/trunk/cache.c 2009-08-27 08:35:48 UTC (rev 1509) @@ -50,6 +50,7 @@ static int g_bmpcache_lru[3] = { NOT_SET, NOT_SET, NOT_SET }; static int g_bmpcache_mru[3] = { NOT_SET, NOT_SET, NOT_SET }; + static int g_bmpcache_count[3]; /* Setup the bitmap cache lru/mru linked list */ Modified: rdesktop/trunk/disk.c =================================================================== --- rdesktop/trunk/disk.c 2009-08-27 07:30:32 UTC (rev 1508) +++ rdesktop/trunk/disk.c 2009-08-27 08:35:48 UTC (rev 1509) @@ -833,8 +833,8 @@ in_uint32_le(in, delete_on_close); if (delete_on_close || - (pfinfo-> - accessmask & (FILE_DELETE_ON_CLOSE | FILE_COMPLETE_IF_OPLOCKED))) + (pfinfo->accessmask & + (FILE_DELETE_ON_CLOSE | FILE_COMPLETE_IF_OPLOCKED))) { pfinfo->delete_on_close = True; } Modified: rdesktop/trunk/serial.c =================================================================== --- rdesktop/trunk/serial.c 2009-08-27 07:30:32 UTC (rev 1508) +++ rdesktop/trunk/serial.c 2009-08-27 08:35:48 UTC (rev 1509) @@ -271,9 +271,8 @@ pser_inf->stop_bits = (ptermios->c_cflag & CSTOPB) ? STOP_BITS_2 : STOP_BITS_1; pser_inf->parity = - (ptermios-> - c_cflag & PARENB) ? ((ptermios-> - c_cflag & PARODD) ? ODD_PARITY : EVEN_PARITY) : NO_PARITY; + (ptermios->c_cflag & PARENB) ? ((ptermios->c_cflag & PARODD) ? ODD_PARITY : + EVEN_PARITY) : NO_PARITY; switch (ptermios->c_cflag & CSIZE) { case CS5: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2009-09-02 13:03:55
|
Revision: 1510 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1510&view=rev Author: astrand Date: 2009-09-02 13:03:43 +0000 (Wed, 02 Sep 2009) Log Message: ----------- Clean up and document the return values. Trying to solve a number of issues: * The current return values have been selected pretty much without any thought. Basically, the value 1 is used for all different kinds of errors, except for a corner case where the server doesn't send a RDP_PDU_DEACTIVATE in combination with a few special "reasons", where the value 2 is used instead. * rdesktop will currently also return with 2 if the user is closing the rdesktop window, the same error as many other fatal errors, which is somewhat strange. * The main principle of my patch is to utilize more of the available 256 return codes. We are currently only using 3 values out of 256. This is bad; rdesktop should expose more information to the caller about error conditions if it can. Besides using the standardized exit codes for generic errors such as EX_USAGE for command line usage errors, I've also exposed the "extended disconnect reasons" from RDP. This allows for, for example, to be able to distinguish between a logoff and a disconnect. Modified Paths: -------------- rdesktop/trunk/cache.c rdesktop/trunk/configure.ac rdesktop/trunk/constants.h rdesktop/trunk/disk.c rdesktop/trunk/doc/rdesktop.1 rdesktop/trunk/rdesktop.c rdesktop/trunk/rdesktop.h rdesktop/trunk/tcp.c Modified: rdesktop/trunk/cache.c =================================================================== --- rdesktop/trunk/cache.c 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/cache.c 2009-09-02 13:03:43 UTC (rev 1510) @@ -95,7 +95,7 @@ { error("Oops. %d in bitmap cache linked list, %d in ui cache...\n", c, g_bmpcache_count[id]); - exit(1); + exit(EX_SOFTWARE); } } Modified: rdesktop/trunk/configure.ac =================================================================== --- rdesktop/trunk/configure.ac 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/configure.ac 2009-09-02 13:03:43 UTC (rev 1510) @@ -36,6 +36,7 @@ AC_CHECK_HEADER(sys/strtio.h, AC_DEFINE(HAVE_SYS_STRTIO_H)) AC_CHECK_HEADER(locale.h, AC_DEFINE(HAVE_LOCALE_H)) AC_CHECK_HEADER(langinfo.h, AC_DEFINE(HAVE_LANGINFO_H)) +AC_CHECK_HEADER(sysexits.h, AC_DEFINE(HAVE_SYSEXITS_H)) AC_CHECK_TOOL(STRIP, strip, :) Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/constants.h 2009-09-02 13:03:43 UTC (rev 1510) @@ -408,6 +408,7 @@ #define exDiscReasonOutOfMemory 0x0006 #define exDiscReasonServerDeniedConnection 0x0007 #define exDiscReasonServerDeniedConnectionFips 0x0008 +#define exDiscReasonWindows7Disconnect 0x000b /* unofficial */ #define exDiscReasonLicenseInternal 0x0100 #define exDiscReasonLicenseNoLicenseServer 0x0101 #define exDiscReasonLicenseNoLicense 0x0102 Modified: rdesktop/trunk/disk.c =================================================================== --- rdesktop/trunk/disk.c 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/disk.c 2009-09-02 13:03:43 UTC (rev 1510) @@ -480,7 +480,7 @@ { error("Maximum number of open files (%s) reached. Increase MAX_OPEN_FILES!\n", handle); - exit(1); + exit(EX_SOFTWARE); } if (dirp) Modified: rdesktop/trunk/doc/rdesktop.1 =================================================================== --- rdesktop/trunk/doc/rdesktop.1 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/doc/rdesktop.1 2009-09-02 13:03:43 UTC (rev 1510) @@ -220,6 +220,64 @@ .BR "-5" Use RDP version 5 (default). .PP +.SH "EXIT VALUES" +.PP +.IP "\fB0\fP" +RDP session terminated normally +.IP "\fB1\fP" +Server initiated disconnect +.IP "\fB2\fP" +Server initiated logoff +.IP "\fB3\fP" +Server idle timeout reached +.IP "\fB4\fP" +Server logon timeout reached +.IP "\fB5\fP" +The session was replaced +.IP "\fB6\fP" +The server is out of memory +.IP "\fB7\fP" +The server denied the connection +.IP "\fB8\fP" +The server denied the connection for security reason +.IP "\fB16\fP" +Internal licensing error +.IP "\fB17\fP" +No license server available +.IP "\fB18\fP" +No valid license available +.IP "\fB19\fP" +Invalid licensing message +.IP "\fB20\fP" +Hardware id doesn't match software license +.IP "\fB21\fP" +Client license error +.IP "\fB22\fP" +Network error during licensing protocol +.IP "\fB23\fP" +Licensing protocol was not completed +.IP "\fB24\fP" +Incorrect client license enryption +.IP "\fB25\fP" +Can't upgrade license +.IP "\fB26\fP" +The server is not licensed to accept remote connections +.IP "\fB62\fP" +The local client window was closed +.IP "\fB63\fP" +Some other, unknown error occured +.IP "\fB64\fP" +Command line usage error +.IP "\fB69\fP" +A service or resource (such as memory) is unavailable +.IP "\fB70\fP" +An internal software error has been detected +.IP "\fB71\fP" +Operating system error +.IP "\fB76\fP" +Protocol error or unable to connect to remote host. + +.PP .SH LINKS Main website of rdesktop .br Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/rdesktop.c 2009-09-02 13:03:43 UTC (rev 1510) @@ -91,6 +91,7 @@ RD_BOOL g_owncolmap = False; RD_BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */ RD_BOOL g_seamless_rdp = False; +RD_BOOL g_user_quit = False; uint32 g_embed_wnd; uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; @@ -213,91 +214,116 @@ fprintf(stderr, " -5: use RDP version 5 (default)\n"); } -static void -print_disconnect_reason(uint16 reason) +static int +handle_disconnect_reason(RD_BOOL deactivated, uint16 reason) { char *text; + int retval; switch (reason) { case exDiscReasonNoInfo: text = "No information available"; + if (deactivated) + retval = EX_OK; + else + retval = EXRD_UNKNOWN; break; case exDiscReasonAPIInitiatedDisconnect: + case exDiscReasonWindows7Disconnect: text = "Server initiated disconnect"; + retval = EXRD_API_DISCONNECT; break; case exDiscReasonAPIInitiatedLogoff: text = "Server initiated logoff"; + retval = EXRD_API_LOGOFF; break; case exDiscReasonServerIdleTimeout: text = "Server idle timeout reached"; + retval = EXRD_IDLE_TIMEOUT; break; case exDiscReasonServerLogonTimeout: text = "Server logon timeout reached"; + retval = EXRD_LOGON_TIMEOUT; break; case exDiscReasonReplacedByOtherConnection: text = "The session was replaced"; + retval = EXRD_REPLACED; break; case exDiscReasonOutOfMemory: text = "The server is out of memory"; + retval = EXRD_OUT_OF_MEM; break; case exDiscReasonServerDeniedConnection: text = "The server denied the connection"; + retval = EXRD_DENIED; break; case exDiscReasonServerDeniedConnectionFips: text = "The server denied the connection for security reason"; + retval = EXRD_DENIED_FIPS; break; case exDiscReasonLicenseInternal: text = "Internal licensing error"; + retval = EXRD_LIC_INTERNAL; break; case exDiscReasonLicenseNoLicenseServer: text = "No license server available"; + retval = EXRD_LIC_NOSERVER; break; case exDiscReasonLicenseNoLicense: text = "No valid license available"; + retval = EXRD_LIC_NOLICENSE; break; case exDiscReasonLicenseErrClientMsg: text = "Invalid licensing message"; + retval = EXRD_LIC_MSG; break; case exDiscReasonLicenseHwidDoesntMatchLicense: text = "Hardware id doesn't match software license"; + retval = EXRD_LIC_HWID; break; case exDiscReasonLicenseErrClientLicense: text = "Client license error"; + retval = EXRD_LIC_CLIENT; break; case exDiscReasonLicenseCantFinishProtocol: text = "Network error during licensing protocol"; + retval = EXRD_LIC_NET; break; case exDiscReasonLicenseClientEndedProtocol: text = "Licensing protocol was not completed"; + retval = EXRD_LIC_PROTO; break; case exDiscReasonLicenseErrClientEncryption: text = "Incorrect client license enryption"; + retval = EXRD_LIC_ENC; break; case exDiscReasonLicenseCantUpgradeLicense: text = "Can't upgrade license"; + retval = EXRD_LIC_UPGRADE; break; case exDiscReasonLicenseNoRemoteConnections: text = "The server is not licensed to accept remote connections"; + retval = EXRD_LIC_NOREMOTE; break; default: @@ -309,8 +335,12 @@ { text = "Unknown reason"; } + retval = EXRD_UNKNOWN; } - fprintf(stderr, "disconnect: %s.\n", text); + if (reason != exDiscReasonNoInfo) + fprintf(stderr, "disconnect: %s.\n", text); + + return retval; } static void @@ -535,7 +565,7 @@ if (g_width <= 0) { error("invalid geometry\n"); - return 1; + return EX_USAGE; } if (*p == 'x') @@ -544,7 +574,7 @@ if (g_height <= 0) { error("invalid geometry\n"); - return 1; + return EX_USAGE; } if (*p == '%') @@ -613,7 +643,7 @@ if (*p) { error("invalid button size\n"); - return 1; + return EX_USAGE; } break; @@ -638,7 +668,7 @@ && g_server_depth != 32) { error("Invalid server colour depth.\n"); - return 1; + return EX_USAGE; } break; @@ -789,14 +819,14 @@ case '?': default: usage(argv[0]); - return 1; + return EX_USAGE; } } if (argc - optind != 1) { usage(argv[0]); - return 1; + return EX_USAGE; } STRNCPY(server, argv[optind], sizeof(server)); @@ -807,33 +837,33 @@ if (g_win_button_size) { error("You cannot use -S and -A at the same time\n"); - return 1; + return EX_USAGE; } g_rdp5_performanceflags &= ~RDP5_NO_FULLWINDOWDRAG; if (geometry_option) { error("You cannot use -g and -A at the same time\n"); - return 1; + return EX_USAGE; } if (g_fullscreen) { error("You cannot use -f and -A at the same time\n"); - return 1; + return EX_USAGE; } if (g_hide_decorations) { error("You cannot use -D and -A at the same time\n"); - return 1; + return EX_USAGE; } if (g_embed_wnd) { error("You cannot use -X and -A at the same time\n"); - return 1; + return EX_USAGE; } if (!g_use_rdp5) { error("You cannot use -4 and -A at the same time\n"); - return 1; + return EX_USAGE; } g_width = -100; g_grab_keyboard = False; @@ -845,7 +875,7 @@ if ((pw == NULL) || (pw->pw_name == NULL)) { error("could not determine username, use -u\n"); - return 1; + return EX_OSERR; } /* +1 for trailing \0 */ int pwlen = strlen(pw->pw_name) + 1; @@ -872,7 +902,7 @@ if (gethostname(fullhostname, sizeof(fullhostname)) == -1) { error("could not determine local hostname, use -n\n"); - return 1; + return EX_OSERR; } p = strchr(fullhostname, '.'); @@ -908,11 +938,11 @@ #ifdef RDP2VNC rdp2vnc_connect(server, flags, domain, password, shell, directory); - return 0; + return EX_OK; #else if (!ui_init()) - return 1; + return EX_OSERR; #ifdef WITH_RDPSND if (g_rdpsnd) @@ -934,11 +964,11 @@ if (run_count == 0) { if (!rdp_connect(server, flags, domain, password, shell, directory)) - return 1; + return EX_PROTOCOL; } else if (!rdp_reconnect (server, flags, domain, password, shell, directory, g_redirect_cookie)) - return 1; + return EX_PROTOCOL; /* By setting encryption to False here, we have an encrypted login packet but unencrypted transfer of other packets */ @@ -987,28 +1017,10 @@ cache_save_state(); ui_deinit(); - if (ext_disc_reason >= 2) - print_disconnect_reason(ext_disc_reason); + if (g_user_quit) + return EXRD_WINDOW_CLOSED; - if (deactivated) - { - /* clean disconnect */ - return 0; - } - else - { - if (ext_disc_reason == exDiscReasonAPIInitiatedDisconnect - || ext_disc_reason == exDiscReasonAPIInitiatedLogoff) - { - /* not so clean disconnect, but nothing to worry about */ - return 0; - } - else - { - /* return error */ - return 2; - } - } + return handle_disconnect_reason(deactivated, ext_disc_reason); #endif if (g_redirect_username) @@ -1108,7 +1120,7 @@ if (mem == NULL) { error("xmalloc %d\n", size); - exit(1); + exit(EX_UNAVAILABLE); } return mem; } @@ -1120,7 +1132,7 @@ if (ptr == NULL) { error("unexpected null pointer. Out of memory?\n"); - exit(1); + exit(EX_UNAVAILABLE); } } @@ -1132,7 +1144,7 @@ if (mem == NULL) { perror("strdup"); - exit(1); + exit(EX_UNAVAILABLE); } return mem; } @@ -1149,7 +1161,7 @@ if (mem == NULL) { error("xrealloc %ld\n", size); - exit(1); + exit(EX_UNAVAILABLE); } return mem; } Modified: rdesktop/trunk/rdesktop.h =================================================================== --- rdesktop/trunk/rdesktop.h 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/rdesktop.h 2009-09-02 13:03:43 UTC (rev 1510) @@ -38,9 +38,87 @@ #endif #endif #include <limits.h> /* PATH_MAX */ +#ifdef HAVE_SYSEXITS_H +#include <sysexits.h> +#endif #define VERSION "1.6.0" +/* standard exit codes */ +#ifndef EX_OK +#define EX_OK 0 +#endif +#ifndef EX_USAGE +#define EX_USAGE 64 +#endif +#ifndef EX_DATAERR +#define EX_DATAERR 65 +#endif +#ifndef EX_NOINPUT +#define EX_NOINPUT 66 +#endif +#ifndef EX_NOUSER +#define EX_NOUSER 67 +#endif +#ifndef EX_NOHOST +#define EX_NOHOST 68 +#endif +#ifndef EX_UNAVAILABLE +#define EX_UNAVAILABLE 69 +#endif +#ifndef EX_SOFTWARE +#define EX_SOFTWARE 70 +#endif +#ifndef EX_OSERR +#define EX_OSERR 71 +#endif +#ifndef EX_OSFILE +#define EX_OSFILE 72 +#endif +#ifndef EX_CANTCREAT +#define EX_CANTCREAT 73 +#endif +#ifndef EX_IOERR +#define EX_IOERR 74 +#endif +#ifndef EX_TEMPFAIL +#define EX_TEMPFAIL 75 +#endif +#ifndef EX_PROTOCOL +#define EX_PROTOCOL 76 +#endif +#ifndef EX_NOPERM +#define EX_NOPERM 77 +#endif +#ifndef EX_CONFIG +#define EX_CONFIG 78 +#endif + +/* rdesktop specific exit codes, lined up with disconnect PDU reasons */ +#define EXRD_API_DISCONNECT 1 +#define EXRD_API_LOGOFF 2 +#define EXRD_IDLE_TIMEOUT 3 +#define EXRD_LOGON_TIMEOUT 4 +#define EXRD_REPLACED 5 +#define EXRD_OUT_OF_MEM 6 +#define EXRD_DENIED 7 +#define EXRD_DENIED_FIPS 8 +#define EXRD_LIC_INTERNAL 16 +#define EXRD_LIC_NOSERVER 17 +#define EXRD_LIC_NOLICENSE 18 +#define EXRD_LIC_MSG 19 +#define EXRD_LIC_HWID 20 +#define EXRD_LIC_CLIENT 21 +#define EXRD_LIC_NET 22 +#define EXRD_LIC_PROTO 23 +#define EXRD_LIC_ENC 24 +#define EXRD_LIC_UPGRADE 25 +#define EXRD_LIC_NOREMOTE 26 + +/* other exit codes */ +#define EXRD_WINDOW_CLOSED 62 +#define EXRD_UNKNOWN 63 + #ifdef WITH_DEBUG #define DEBUG(args) printf args; #else Modified: rdesktop/trunk/tcp.c =================================================================== --- rdesktop/trunk/tcp.c 2009-08-27 08:35:48 UTC (rev 1509) +++ rdesktop/trunk/tcp.c 2009-09-02 13:03:43 UTC (rev 1510) @@ -56,6 +56,7 @@ static struct stream g_in; static struct stream g_out[STREAM_COUNT]; int g_tcp_port_rdp = TCP_PORT_RDP; +extern RD_BOOL g_user_quit; /* wait till socket is ready to write or timeout */ static RD_BOOL @@ -173,8 +174,11 @@ while (length > 0) { if (!ui_select(g_sock)) + { /* User quit */ + g_user_quit = True; return NULL; + } rcvd = recv(g_sock, s->end, length, 0); if (rcvd < 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2009-09-17 13:52:18
|
Revision: 1512 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1512&view=rev Author: astrand Date: 2009-09-17 13:52:04 +0000 (Thu, 17 Sep 2009) Log Message: ----------- When modifiers are used and a key is released, the generated keysym might be different from the one generated when the key was pressed. This can happen if the user physically releases the modifier key before the symbol key. It can also happen with VNC servers such as Xvnc, since it only "fakes" the correct modifiers during key presses. So, we must remember which keysym that was used during the key press, and use the same on release, otherwise keys such as the Windows key can be stuck activated. Modified Paths: -------------- rdesktop/trunk/doc/keymapping.txt rdesktop/trunk/xkeymap.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/doc/keymapping.txt =================================================================== --- rdesktop/trunk/doc/keymapping.txt 2009-09-17 12:42:36 UTC (rev 1511) +++ rdesktop/trunk/doc/keymapping.txt 2009-09-17 13:52:04 UTC (rev 1512) @@ -260,3 +260,16 @@ * Release F1 Verify that shift is not stuck down, by clicking on the text. + +14. Use a keyboard layout where Meta_L can be generated with Shift_R + + Alt_L. Then: + + * Start Notepad + * Press Shift_R + * Press Alt_L + * Release Shift_R + * Release Alt_L + * Press "e" + + Verify that you get an "e" in Notepad, rather than start Windows + Explorer. Modified: rdesktop/trunk/xkeymap.c =================================================================== --- rdesktop/trunk/xkeymap.c 2009-09-17 12:42:36 UTC (rev 1511) +++ rdesktop/trunk/xkeymap.c 2009-09-17 13:52:04 UTC (rev 1512) @@ -31,6 +31,7 @@ #include <limits.h> #include <time.h> #include <string.h> +#include <assert.h> #include "rdesktop.h" #include "scancodes.h" @@ -52,6 +53,7 @@ static RD_BOOL keymap_loaded; static key_translation *keymap[KEYMAP_SIZE]; +static KeySym keypress_keysyms[256]; static int min_keycode; static uint16 remote_modifier_state = 0; static uint16 saved_remote_modifier_state = 0; @@ -503,6 +505,36 @@ } } + +void +set_keypress_keysym(unsigned int keycode, KeySym keysym) +{ + if (keycode < 8 || keycode > 255) + return; + keypress_keysyms[keycode] = keysym; +} + + +KeySym +reset_keypress_keysym(unsigned int keycode, KeySym keysym) +{ + KeySym ks; + if (keycode < 8 || keycode > 255) + return keysym; + ks = keypress_keysyms[keycode]; + if (ks != 0) + { + keypress_keysyms[keycode] = 0; + } + else + { + ks = keysym; + } + + return ks; +} + + /* Handle special key combinations */ RD_BOOL handle_special_keys(uint32 keysym, unsigned int state, uint32 ev_time, RD_BOOL pressed) Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2009-09-17 12:42:36 UTC (rev 1511) +++ rdesktop/trunk/xwin.c 2009-09-17 13:52:04 UTC (rev 1512) @@ -2341,6 +2341,7 @@ DEBUG_KBD(("KeyPress for keysym (0x%lx, %s)\n", keysym, get_ksname(keysym))); + set_keypress_keysym(xevent.xkey.keycode, keysym); ev_time = time(NULL); if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True)) break; @@ -2357,6 +2358,7 @@ DEBUG_KBD(("\nKeyRelease for keysym (0x%lx, %s)\n", keysym, get_ksname(keysym))); + keysym = reset_keypress_keysym(xevent.xkey.keycode, keysym); ev_time = time(NULL); if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <js...@us...> - 2009-10-25 21:36:24
|
Revision: 1520 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1520&view=rev Author: jsorg71 Date: 2009-10-25 21:36:17 +0000 (Sun, 25 Oct 2009) Log Message: ----------- added new pointers Modified Paths: -------------- rdesktop/trunk/constants.h rdesktop/trunk/proto.h rdesktop/trunk/rdp.c rdesktop/trunk/rdp5.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2009-10-19 23:02:52 UTC (rev 1519) +++ rdesktop/trunk/constants.h 2009-10-25 21:36:17 UTC (rev 1520) @@ -149,7 +149,8 @@ RDP_POINTER_SYSTEM = 1, RDP_POINTER_MOVE = 3, RDP_POINTER_COLOR = 6, - RDP_POINTER_CACHED = 7 + RDP_POINTER_CACHED = 7, + RDP_POINTER_NEW = 8 }; enum RDP_SYSTEM_POINTER_TYPE @@ -244,6 +245,7 @@ #define RDP_CAPSET_POINTER 8 #define RDP_CAPLEN_POINTER 0x08 +#define RDP_CAPLEN_NEWPOINTER 0x0a #define RDP_CAPSET_SHARE 9 #define RDP_CAPLEN_SHARE 0x08 Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2009-10-19 23:02:52 UTC (rev 1519) +++ rdesktop/trunk/proto.h 2009-10-25 21:36:17 UTC (rev 1520) @@ -144,6 +144,7 @@ uint16 param2); void rdp_send_client_window_status(int status); void process_colour_pointer_pdu(STREAM s); +void process_new_pointer_pdu(STREAM s); void process_cached_pointer_pdu(STREAM s); void process_system_pointer_pdu(STREAM s); void process_bitmap_updates(STREAM s); @@ -249,7 +250,7 @@ RD_HGLYPH ui_create_glyph(int width, int height, uint8 * data); void ui_destroy_glyph(RD_HGLYPH glyph); RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 * andmask, - uint8 * xormask); + uint8 * xormask, int bpp); void ui_set_cursor(RD_HCURSOR cursor); void ui_destroy_cursor(RD_HCURSOR cursor); void ui_set_null_cursor(void); Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2009-10-19 23:02:52 UTC (rev 1519) +++ rdesktop/trunk/rdp.c 2009-10-25 21:36:17 UTC (rev 1520) @@ -778,6 +778,18 @@ out_uint16_le(s, 20); /* Cache size */ } +/* Output new pointer capability set */ +static void +rdp_out_newpointer_caps(STREAM s) +{ + out_uint16_le(s, RDP_CAPSET_POINTER); + out_uint16_le(s, RDP_CAPLEN_NEWPOINTER); + + out_uint16_le(s, 1); /* Colour pointer */ + out_uint16_le(s, 20); /* Cache size */ + out_uint16_le(s, 20); /* Cache size for new pointers */ +} + /* Output share capability set */ static void rdp_out_share_caps(STREAM s) @@ -855,12 +867,23 @@ uint32 sec_flags = g_encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG; uint16 caplen = RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER + - RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE + + RDP_CAPLEN_COLCACHE + RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL + - RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + + RDP_CAPLEN_SHARE + RDP_CAPLEN_BRUSHCACHE + 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ + 4 /* w2k fix, sessionid */ ; + if (g_use_rdp5) + { + caplen += RDP_CAPLEN_BMPCACHE2; + caplen += RDP_CAPLEN_NEWPOINTER; + } + else + { + caplen += RDP_CAPLEN_BMPCACHE; + caplen += RDP_CAPLEN_POINTER; + } + s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE)); out_uint16_le(s, 2 + 14 + caplen + sizeof(RDP_SOURCE)); @@ -879,11 +902,19 @@ rdp_out_general_caps(s); rdp_out_bitmap_caps(s); rdp_out_order_caps(s); - g_use_rdp5 ? rdp_out_bmpcache2_caps(s) : rdp_out_bmpcache_caps(s); + if (g_use_rdp5) + { + rdp_out_bmpcache2_caps(s); + rdp_out_newpointer_caps(s); + } + else + { + rdp_out_bmpcache_caps(s); + rdp_out_pointer_caps(s); + } rdp_out_colcache_caps(s); rdp_out_activate_caps(s); rdp_out_control_caps(s); - rdp_out_pointer_caps(s); rdp_out_share_caps(s); rdp_out_brushcache_caps(s); @@ -1022,11 +1053,13 @@ } /* Process a colour pointer PDU */ -void -process_colour_pointer_pdu(STREAM s) +static void +process_colour_pointer_common(STREAM s, int bpp) { - uint16 x, y, width, height, cache_idx, masklen, datalen; - uint8 *mask, *data; + uint16 width, height, cache_idx, masklen, datalen; + sint16 x, y; + uint8 * mask; + uint8 * data; RD_HCURSOR cursor; in_uint16_le(s, cache_idx); @@ -1038,11 +1071,38 @@ in_uint16_le(s, datalen); in_uint8p(s, data, datalen); in_uint8p(s, mask, masklen); - cursor = ui_create_cursor(x, y, width, height, mask, data); + if ((width != 32) || (height != 32)) + { + warning("process_colour_pointer_common: " + "width %d height %d\n", width, height); + } + /* sometimes x or y is out of bounds */ + x = MAX(x, 0); + x = MIN(x, width - 1); + y = MAX(y, 0); + y = MIN(y, height - 1); + cursor = ui_create_cursor(x, y, width, height, mask, data, bpp); ui_set_cursor(cursor); cache_put_cursor(cache_idx, cursor); } +/* Process a colour pointer PDU */ +void +process_colour_pointer_pdu(STREAM s) +{ + process_colour_pointer_common(s, 24); +} + +/* Process a New Pointer PDU - these pointers have variable bit depth */ +void +process_new_pointer_pdu(STREAM s) +{ + int xor_bpp; + + in_uint16_le(s, xor_bpp); + process_colour_pointer_common(s, xor_bpp); +} + /* Process a cached pointer PDU */ void process_cached_pointer_pdu(STREAM s) @@ -1102,6 +1162,10 @@ process_system_pointer_pdu(s); break; + case RDP_POINTER_NEW: + process_new_pointer_pdu(s); + break; + default: unimpl("Pointer message 0x%x\n", message_type); } Modified: rdesktop/trunk/rdp5.c =================================================================== --- rdesktop/trunk/rdp5.c 2009-10-19 23:02:52 UTC (rev 1519) +++ rdesktop/trunk/rdp5.c 2009-10-25 21:36:17 UTC (rev 1520) @@ -111,6 +111,9 @@ case 10: /* cached pointer */ process_cached_pointer_pdu(ts); break; + case 11: + process_new_pointer_pdu(ts); + break; default: unimpl("RDP5 opcode %d\n", type); } Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2009-10-19 23:02:52 UTC (rev 1519) +++ rdesktop/trunk/xwin.c 2009-10-25 21:36:17 UTC (rev 1520) @@ -2099,7 +2099,7 @@ /* create invisible 1x1 cursor to be used as null cursor */ if (g_null_cursor == NULL) - g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data); + g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data, 24); if (g_seamless_rdp) { @@ -2772,9 +2772,62 @@ XFreePixmap(g_display, (Pixmap) glyph); } +/* convert next pixel to 32 bpp */ +static int +get_next_xor_pixel(uint8 * xormask, int bpp, int * k) +{ + int rv = 0; + PixelColour pc; + uint8 * s8; + uint16 * s16; + + switch (bpp) + { + case 1: + s8 = xormask + (*k) / 8; + rv = (*s8) & (0x80 >> ((*k) % 8)); + rv = rv ? 0xffffff : 0; + (*k) += 1; + break; + case 8: + s8 = xormask + *k; + /* should use colour map */ + rv = s8[0]; + rv = rv ? 0xffffff : 0; + (*k) += 1; + break; + case 15: + s16 = (uint16 *) xormask; + SPLITCOLOUR15(s16[*k], pc); + rv = (pc.red << 16) | (pc.green << 8) | pc.blue; + (*k) += 1; + break; + case 16: + s16 = (uint16 *) xormask; + SPLITCOLOUR16(s16[*k], pc); + rv = (pc.red << 16) | (pc.green << 8) | pc.blue; + (*k) += 1; + break; + case 24: + s8 = xormask + *k; + rv = (s8[0] << 16) | (s8[1] << 8) | s8[2]; + (*k) += 3; + break; + case 32: + s8 = xormask + *k; + rv = (s8[1] << 16) | (s8[2] << 8) | s8[3]; + (*k) += 4; + break; + default: + error("unknown bpp in get_next_xor_pixel %d\n", bpp); + break; + } + return rv; +} + RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, - uint8 * andmask, uint8 * xormask) + uint8 * andmask, uint8 * xormask, int bpp) { RD_HGLYPH maskglyph, cursorglyph; XColor bg, fg; @@ -2782,9 +2835,10 @@ uint8 *cursor, *pcursor; uint8 *mask, *pmask; uint8 nextbit; - int scanline, offset; - int i, j; + int scanline, offset, delta; + int i, j, k; + k = 0; scanline = (width + 7) / 8; offset = scanline * height; @@ -2793,11 +2847,19 @@ mask = (uint8 *) xmalloc(offset); memset(mask, 0, offset); - + if (bpp == 1) + { + offset = 0; + delta = scanline; + } + else + { + offset = scanline * height - scanline; + delta = -scanline; + } /* approximate AND and XOR masks with a monochrome X pointer */ for (i = 0; i < height; i++) { - offset -= scanline; pcursor = &cursor[offset]; pmask = &mask[offset]; @@ -2805,7 +2867,7 @@ { for (nextbit = 0x80; nextbit != 0; nextbit >>= 1) { - if (xormask[0] || xormask[1] || xormask[2]) + if (get_next_xor_pixel(xormask, bpp, &k)) { *pcursor |= (~(*andmask) & nextbit); *pmask |= nextbit; @@ -2815,14 +2877,13 @@ *pcursor |= ((*andmask) & nextbit); *pmask |= (~(*andmask) & nextbit); } - - xormask += 3; } andmask++; pcursor++; pmask++; } + offset += delta; } fg.red = fg.blue = fg.green = 0xffff; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-07 18:43:01
|
Revision: 1526 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1526&view=rev Author: astrand Date: 2010-01-07 18:42:47 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Avoid code duplication in iso_connect/iso_reconnect. Modified Paths: -------------- rdesktop/trunk/iso.c rdesktop/trunk/mcs.c rdesktop/trunk/proto.h Modified: rdesktop/trunk/iso.c =================================================================== --- rdesktop/trunk/iso.c 2010-01-07 18:39:20 UTC (rev 1525) +++ rdesktop/trunk/iso.c 2010-01-07 18:42:47 UTC (rev 1526) @@ -174,39 +174,22 @@ /* Establish a connection up to the ISO layer */ RD_BOOL -iso_connect(char *server, char *username) +iso_connect(char *server, char *username, RD_BOOL reconnect) { uint8 code = 0; if (!tcp_connect(server)) return False; - iso_send_connection_request(username); - - if (iso_recv_msg(&code, NULL) == NULL) - return False; - - if (code != ISO_PDU_CC) + if (reconnect) { - error("expected CC, got 0x%x\n", code); - tcp_disconnect(); - return False; + iso_send_msg(ISO_PDU_CR); } + else + { + iso_send_connection_request(username); + } - return True; -} - -/* Establish a reconnection up to the ISO layer */ -RD_BOOL -iso_reconnect(char *server) -{ - uint8 code = 0; - - if (!tcp_connect(server)) - return False; - - iso_send_msg(ISO_PDU_CR); - if (iso_recv_msg(&code, NULL) == NULL) return False; Modified: rdesktop/trunk/mcs.c =================================================================== --- rdesktop/trunk/mcs.c 2010-01-07 18:39:20 UTC (rev 1525) +++ rdesktop/trunk/mcs.c 2010-01-07 18:42:47 UTC (rev 1526) @@ -377,16 +377,8 @@ { unsigned int i; - if (reconnect) - { - if (!iso_reconnect(server)) - return False; - } - else - { - if (!iso_connect(server, username)) - return False; - } + if (!iso_connect(server, username, reconnect)) + return False; mcs_send_connect_initial(mcs_data); if (!mcs_recv_connect_response(mcs_data)) Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-07 18:39:20 UTC (rev 1525) +++ rdesktop/trunk/proto.h 2010-01-07 18:42:47 UTC (rev 1526) @@ -75,8 +75,7 @@ STREAM iso_init(int length); void iso_send(STREAM s); STREAM iso_recv(uint8 * rdpver); -RD_BOOL iso_connect(char *server, char *username); -RD_BOOL iso_reconnect(char *server); +RD_BOOL iso_connect(char *server, char *username, RD_BOOL reconnect); void iso_disconnect(void); void iso_reset_state(void); /* licence.c */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-07 20:02:14
|
Revision: 1528 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1528&view=rev Author: astrand Date: 2010-01-07 20:01:58 +0000 (Thu, 07 Jan 2010) Log Message: ----------- Elminate code duplication in rdp_reconnect and sec_connect. Modified Paths: -------------- rdesktop/trunk/constants.h rdesktop/trunk/mcs.c rdesktop/trunk/proto.h rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c rdesktop/trunk/secure.c Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/constants.h 2010-01-07 20:01:58 UTC (rev 1528) @@ -122,12 +122,26 @@ RDP_DATA_PDU_SYNCHRONISE = 31, RDP_DATA_PDU_BELL = 34, RDP_DATA_PDU_CLIENT_WINDOW_STATUS = 35, - RDP_DATA_PDU_LOGON = 38, + RDP_DATA_PDU_LOGON = 38, /* PDUTYPE2_SAVE_SESSION_INFO */ RDP_DATA_PDU_FONT2 = 39, RDP_DATA_PDU_KEYBOARD_INDICATORS = 41, RDP_DATA_PDU_DISCONNECT = 47 }; +enum RDP_SAVE_SESSION_PDU_TYPE +{ + INFOTYPE_LOGON = 0, + INFOTYPE_LOGON_LONG = 1, + INFOTYPE_LOGON_PLAINNOTIFY = 2, + INFOTYPE_LOGON_EXTENDED_INF = 3 +}; + +enum RDP_LOGON_INFO_EXTENDED_TYPE +{ + LOGON_EX_AUTORECONNECTCOOKIE = 1, + LOGON_EX_LOGONERRORS = 2 +}; + enum RDP_CONTROL_PDU_TYPE { RDP_CTL_REQUEST_CONTROL = 1, Modified: rdesktop/trunk/mcs.c =================================================================== --- rdesktop/trunk/mcs.c 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/mcs.c 2010-01-07 20:01:58 UTC (rev 1528) @@ -373,7 +373,7 @@ } RD_BOOL -mcs_connect_common(char *server, STREAM mcs_data, char *username, RD_BOOL reconnect) +mcs_connect(char *server, STREAM mcs_data, char *username, RD_BOOL reconnect) { unsigned int i; @@ -412,21 +412,6 @@ return False; } -/* Establish a connection up to the MCS layer */ -RD_BOOL -mcs_connect(char *server, STREAM mcs_data, char *username) -{ - return mcs_connect_common(server, mcs_data, username, False); -} - - -/* Establish a connection up to the MCS layer */ -RD_BOOL -mcs_reconnect(char *server, STREAM mcs_data) -{ - return mcs_connect_common(server, mcs_data, NULL, False); -} - /* Disconnect from the MCS layer */ void mcs_disconnect(void) Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/proto.h 2010-01-07 20:01:58 UTC (rev 1528) @@ -85,8 +85,7 @@ void mcs_send_to_channel(STREAM s, uint16 channel); void mcs_send(STREAM s); STREAM mcs_recv(uint16 * channel, uint8 * rdpver); -RD_BOOL mcs_connect(char *server, STREAM mcs_data, char *username); -RD_BOOL mcs_reconnect(char *server, STREAM mcs_data); +RD_BOOL mcs_connect(char *server, STREAM mcs_data, char *username, RD_BOOL reconnect); void mcs_disconnect(void); void mcs_reset_state(void); /* orders.c */ @@ -152,9 +151,7 @@ void rdp_main_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason); RD_BOOL rdp_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason); RD_BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, - char *directory); -RD_BOOL rdp_reconnect(char *server, uint32 flags, char *domain, char *password, char *command, - char *directory, char *cookie); + char *directory, RD_BOOL reconnect); void rdp_reset_state(void); void rdp_disconnect(void); /* rdpdr.c */ @@ -190,8 +187,7 @@ void sec_send(STREAM s, uint32 flags); void sec_process_mcs_data(STREAM s); STREAM sec_recv(uint8 * rdpver); -RD_BOOL sec_connect(char *server, char *username); -RD_BOOL sec_reconnect(char *server); +RD_BOOL sec_connect(char *server, char *username, RD_BOOL reconnect); void sec_disconnect(void); void sec_reset_state(void); /* serial.c */ Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/rdesktop.c 2010-01-07 20:01:58 UTC (rev 1528) @@ -963,11 +963,10 @@ { if (run_count == 0) { - if (!rdp_connect(server, flags, domain, password, shell, directory)) + if (!rdp_connect(server, flags, domain, password, shell, directory, False)) return EX_PROTOCOL; } - else if (!rdp_reconnect - (server, flags, domain, password, shell, directory, g_redirect_cookie)) + else if (!rdp_connect(server, flags, domain, password, shell, directory, True)) return EX_PROTOCOL; /* By setting encryption to False here, we have an encrypted login Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/rdp.c 2010-01-07 20:01:58 UTC (rev 1528) @@ -1513,27 +1513,15 @@ /* Establish a connection up to the RDP layer */ RD_BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, - char *command, char *directory) + char *command, char *directory, RD_BOOL reconnect) { - if (!sec_connect(server, g_username)) + if (!sec_connect(server, g_username, reconnect)) return False; rdp_send_logon_info(flags, domain, g_username, password, command, directory); return True; } -/* Establish a reconnection up to the RDP layer */ -RD_BOOL -rdp_reconnect(char *server, uint32 flags, char *domain, char *password, - char *command, char *directory, char *cookie) -{ - if (!sec_reconnect(server)) - return False; - - rdp_send_logon_info(flags, domain, g_username, password, command, directory); - return True; -} - /* Called during redirection to reset the state to support redirection */ void rdp_reset_state(void) Modified: rdesktop/trunk/secure.c =================================================================== --- rdesktop/trunk/secure.c 2010-01-07 18:52:26 UTC (rev 1527) +++ rdesktop/trunk/secure.c 2010-01-07 20:01:58 UTC (rev 1528) @@ -838,7 +838,7 @@ /* Establish a secure connection */ RD_BOOL -sec_connect(char *server, char *username) +sec_connect(char *server, char *username, RD_BOOL reconnect) { struct stream mcs_data; @@ -847,7 +847,7 @@ mcs_data.p = mcs_data.data = (uint8 *) xmalloc(mcs_data.size); sec_out_mcs_data(&mcs_data); - if (!mcs_connect(server, &mcs_data, username)) + if (!mcs_connect(server, &mcs_data, username, reconnect)) return False; /* sec_process_mcs_data(&mcs_data); */ @@ -857,27 +857,6 @@ return True; } -/* Establish a secure connection */ -RD_BOOL -sec_reconnect(char *server) -{ - struct stream mcs_data; - - /* We exchange some RDP data during the MCS-Connect */ - mcs_data.size = 512; - mcs_data.p = mcs_data.data = (uint8 *) xmalloc(mcs_data.size); - sec_out_mcs_data(&mcs_data); - - if (!mcs_reconnect(server, &mcs_data)) - return False; - - /* sec_process_mcs_data(&mcs_data); */ - if (g_encryption) - sec_establish_key(); - xfree(mcs_data.data); - return True; -} - /* Disconnect a connection */ void sec_disconnect(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-12 10:19:50
|
Revision: 1538 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1538&view=rev Author: astrand Date: 2010-01-12 10:19:35 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Moved code that determines desktop size from ui_init to ui_create_window. ui_init is only called once during the execution, but the size of the screen can change, for example, when resizing using Xrandr. Note however that this also means that ui_create_window must be called before rdp_connect. rdesktop.c has been modified accordingly. One additional advantage is that you will get a window during the connection phase, which gives the user better feedback in case the connection takes time. Modified Paths: -------------- rdesktop/trunk/rdesktop.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-12 09:58:16 UTC (rev 1537) +++ rdesktop/trunk/rdesktop.c 2010-01-12 10:19:35 UTC (rev 1538) @@ -961,6 +961,10 @@ while (run_count < 2 && continue_connect) /* add support for Session Directory; only reconnect once */ { if (run_count == 0) + if (!ui_create_window()) + return EX_OSERR; + + if (run_count == 0) { if (!rdp_connect(server, flags, domain, password, shell, directory, False)) return EX_PROTOCOL; @@ -977,10 +981,6 @@ DEBUG(("Connection successful.\n")); memset(password, 0, sizeof(password)); - if (run_count == 0) - if (!ui_create_window()) - continue_connect = False; - if (continue_connect) rdp_main_loop(&deactivated, &ext_disc_reason); Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2010-01-12 09:58:16 UTC (rev 1537) +++ rdesktop/trunk/xwin.c 2010-01-12 10:19:35 UTC (rev 1538) @@ -1874,44 +1874,6 @@ g_ownbackstore = True; } - /* - * Determine desktop size - */ - if (g_fullscreen) - { - g_width = WidthOfScreen(g_screen); - g_height = HeightOfScreen(g_screen); - g_using_full_workarea = True; - } - else if (g_width < 0) - { - /* Percent of screen */ - if (-g_width >= 100) - g_using_full_workarea = True; - g_height = HeightOfScreen(g_screen) * (-g_width) / 100; - g_width = WidthOfScreen(g_screen) * (-g_width) / 100; - } - else if (g_width == 0) - { - /* Fetch geometry from _NET_WORKAREA */ - uint32 x, y, cx, cy; - if (get_current_workarea(&x, &y, &cx, &cy) == 0) - { - g_width = cx; - g_height = cy; - g_using_full_workarea = True; - } - else - { - warning("Failed to get workarea: probably your window manager does not support extended hints\n"); - g_width = WidthOfScreen(g_screen); - g_height = HeightOfScreen(g_screen); - } - } - - /* make sure width is a multiple of 4 */ - g_width = (g_width + 3) & ~3; - g_mod_map = XGetModifierMapping(g_display); xwin_refresh_pointer_map(); @@ -1999,6 +1961,44 @@ long input_mask, ic_input_mask; XEvent xevent; + /* + * Determine desktop size + */ + if (g_fullscreen) + { + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + g_using_full_workarea = True; + } + else if (g_width < 0) + { + /* Percent of screen */ + if (-g_width >= 100) + g_using_full_workarea = True; + g_height = HeightOfScreen(g_screen) * (-g_width) / 100; + g_width = WidthOfScreen(g_screen) * (-g_width) / 100; + } + else if (g_width == 0) + { + /* Fetch geometry from _NET_WORKAREA */ + uint32 x, y, cx, cy; + if (get_current_workarea(&x, &y, &cx, &cy) == 0) + { + g_width = cx; + g_height = cy; + g_using_full_workarea = True; + } + else + { + warning("Failed to get workarea: probably your window manager does not support extended hints\n"); + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + } + } + + /* make sure width is a multiple of 4 */ + g_width = (g_width + 3) & ~3; + wndwidth = g_fullscreen ? WidthOfScreen(g_screen) : g_width; wndheight = g_fullscreen ? HeightOfScreen(g_screen) : g_height; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-12 10:34:45
|
Revision: 1539 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1539&view=rev Author: astrand Date: 2010-01-12 10:34:38 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Implemented support for "Client Auto-Reconnect". This means that the client can re-connect using a cookie, instead of going through the normal authentication. This patch saves those cookies, and uses them during logon. Note that this feature is currently unused. It remains to add support for, say, detecting when the TCP connection has gone done and restart a new one. Modified Paths: -------------- rdesktop/trunk/constants.h rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c rdesktop/trunk/secure.c rdesktop/trunk/ssl.c rdesktop/trunk/ssl.h Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/constants.h 2010-01-12 10:34:38 UTC (rev 1539) @@ -121,12 +121,26 @@ RDP_DATA_PDU_SYNCHRONISE = 31, RDP_DATA_PDU_BELL = 34, RDP_DATA_PDU_CLIENT_WINDOW_STATUS = 35, - RDP_DATA_PDU_LOGON = 38, + RDP_DATA_PDU_LOGON = 38, /* PDUTYPE2_SAVE_SESSION_INFO */ RDP_DATA_PDU_FONT2 = 39, RDP_DATA_PDU_KEYBOARD_INDICATORS = 41, RDP_DATA_PDU_DISCONNECT = 47 }; +enum RDP_SAVE_SESSION_PDU_TYPE +{ + INFOTYPE_LOGON = 0, + INFOTYPE_LOGON_LONG = 1, + INFOTYPE_LOGON_PLAINNOTIFY = 2, + INFOTYPE_LOGON_EXTENDED_INF = 3 +}; + +enum RDP_LOGON_INFO_EXTENDED_TYPE +{ + LOGON_EX_AUTORECONNECTCOOKIE = 1, + LOGON_EX_LOGONERRORS = 2 +}; + enum RDP_CONTROL_PDU_TYPE { RDP_CTL_REQUEST_CONTROL = 1, Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/rdesktop.c 2010-01-12 10:34:38 UTC (rev 1539) @@ -103,6 +103,10 @@ char g_redirect_cookie[128]; uint32 g_redirect_flags = 0; +uint32 g_reconnect_logonid = 0; +char g_reconnect_random[16]; +uint8 g_client_random[SEC_RANDOM_SIZE]; + #ifdef WITH_RDPSND RD_BOOL g_rdpsnd = False; #endif Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/rdp.c 2010-01-12 10:34:38 UTC (rev 1539) @@ -67,6 +67,10 @@ extern uint32 g_redirect_flags; /* END Session Directory support */ +extern uint32 g_reconnect_logonid; +extern char g_reconnect_random[16]; +extern uint8 g_client_random[SEC_RANDOM_SIZE]; + #if WITH_DEBUG static uint32 g_packetno; #endif @@ -331,6 +335,7 @@ STREAM s; time_t t = time(NULL); time_t tzone; + uint8 security_verifier[16]; if (!g_use_rdp5 || 1 == g_server_rdp_version) { @@ -456,9 +461,16 @@ /* Rest of TS_EXTENDED_INFO_PACKET */ out_uint32_le(s, 0xfffffffe); /* clientSessionId, consider changing to 0 */ out_uint32_le(s, g_rdp5_performanceflags); - out_uint16(s, 0); - + /* Client Auto-Reconnect */ + out_uint16_le(s, 28); /* cbAutoReconnectLen */ + /* ARC_CS_PRIVATE_PACKET */ + out_uint32_le(s, 28); /* cbLen */ + out_uint32_le(s, 1); /* Version */ + out_uint32_le(s, g_reconnect_logonid); /* LogonId */ + ssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), + g_client_random, SEC_RANDOM_SIZE, security_verifier); + out_uint8a(s, security_verifier, sizeof(security_verifier)); } s_mark_end(s); sec_send(s, sec_flags); @@ -1306,6 +1318,50 @@ ui_end_update(); } + +/* Process a Save Session Info PDU */ +void +process_pdu_logon(STREAM s) +{ + uint32 infotype; + in_uint32_le(s, infotype); + if (infotype == INFOTYPE_LOGON_EXTENDED_INF) + { + uint32 fieldspresent; + + in_uint8s(s, 2); /* Length */ + in_uint32_le(s, fieldspresent); + if (fieldspresent & LOGON_EX_AUTORECONNECTCOOKIE) + { + uint32 len; + uint32 version; + + /* TS_LOGON_INFO_FIELD */ + in_uint8s(s, 4); /* cbFieldData */ + + /* ARC_SC_PRIVATE_PACKET */ + in_uint32_le(s, len); + if (len != 28) + { + warning("Invalid length in Auto-Reconnect packet\n"); + return; + } + + in_uint32_le(s, version); + if (version != 1) + { + warning("Unsupported version of Auto-Reconnect packet\n"); + return; + } + + in_uint32_le(s, g_reconnect_logonid); + in_uint8a(s, g_reconnect_random, 16); + DEBUG(("Saving auto-reconnect cookie, id=%u\n", g_reconnect_logonid)); + } + } +} + + /* Process a disconnect PDU */ void process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason) @@ -1382,6 +1438,7 @@ case RDP_DATA_PDU_LOGON: DEBUG(("Received Logon PDU\n")); /* User logged on */ + process_pdu_logon(s); break; case RDP_DATA_PDU_DISCONNECT: Modified: rdesktop/trunk/secure.c =================================================================== --- rdesktop/trunk/secure.c 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/secure.c 2010-01-12 10:34:38 UTC (rev 1539) @@ -34,6 +34,7 @@ extern int g_server_depth; extern VCHANNEL g_channels[]; extern unsigned int g_num_channels; +extern uint8 g_client_random[SEC_RANDOM_SIZE]; static int g_rc4_key_len; static SSL_RC4 g_rc4_decrypt_key; @@ -667,7 +668,6 @@ sec_process_crypt_info(STREAM s) { uint8 *server_random = NULL; - uint8 client_random[SEC_RANDOM_SIZE]; uint8 modulus[SEC_MAX_MODULUS_SIZE]; uint8 exponent[SEC_EXPONENT_SIZE]; uint32 rc4_key_size; @@ -680,10 +680,10 @@ return; } DEBUG(("Generating client random\n")); - generate_random(client_random); - sec_rsa_encrypt(g_sec_crypted_random, client_random, SEC_RANDOM_SIZE, + generate_random(g_client_random); + sec_rsa_encrypt(g_sec_crypted_random, g_client_random, SEC_RANDOM_SIZE, g_server_public_key_len, modulus, exponent); - sec_generate_keys(client_random, server_random, rc4_key_size); + sec_generate_keys(g_client_random, server_random, rc4_key_size); } Modified: rdesktop/trunk/ssl.c =================================================================== --- rdesktop/trunk/ssl.c 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/ssl.c 2010-01-12 10:34:38 UTC (rev 1539) @@ -223,3 +223,13 @@ */ return True; } + + +void +ssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, unsigned char *md) +{ + HMAC_CTX ctx; + HMAC_CTX_init(&ctx); + HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); + HMAC_CTX_cleanup(&ctx); +} Modified: rdesktop/trunk/ssl.h =================================================================== --- rdesktop/trunk/ssl.h 2010-01-12 10:19:35 UTC (rev 1538) +++ rdesktop/trunk/ssl.h 2010-01-12 10:34:38 UTC (rev 1539) @@ -26,6 +26,7 @@ #include <openssl/sha.h> #include <openssl/bn.h> #include <openssl/x509v3.h> +#include <openssl/hmac.h> #if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) #define D2I_X509_CONST const @@ -60,4 +61,7 @@ RD_BOOL ssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len, uint8 * signature, uint32 sig_len); +void ssl_hmac_md5(const void *key, int key_len, + const unsigned char *msg, int msg_len, unsigned char *md); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-12 15:01:06
|
Revision: 1541 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1541&view=rev Author: astrand Date: 2010-01-12 15:00:49 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Only try to use automatic reconnect if we have earlier recieved the reconnect random. It seems to work anyway, but let's take care. Modified Paths: -------------- rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-12 14:52:04 UTC (rev 1540) +++ rdesktop/trunk/rdesktop.c 2010-01-12 15:00:49 UTC (rev 1541) @@ -105,6 +105,7 @@ uint32 g_reconnect_logonid = 0; char g_reconnect_random[16]; +RD_BOOL g_has_reconnect_random = False; uint8 g_client_random[SEC_RANDOM_SIZE]; #ifdef WITH_RDPSND Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2010-01-12 14:52:04 UTC (rev 1540) +++ rdesktop/trunk/rdp.c 2010-01-12 15:00:49 UTC (rev 1541) @@ -70,6 +70,7 @@ extern uint32 g_reconnect_logonid; extern char g_reconnect_random[16]; +extern RD_BOOL g_has_reconnect_random; extern uint8 g_client_random[SEC_RANDOM_SIZE]; #if WITH_DEBUG @@ -464,14 +465,22 @@ out_uint32_le(s, g_rdp5_performanceflags); /* Client Auto-Reconnect */ - out_uint16_le(s, 28); /* cbAutoReconnectLen */ - /* ARC_CS_PRIVATE_PACKET */ - out_uint32_le(s, 28); /* cbLen */ - out_uint32_le(s, 1); /* Version */ - out_uint32_le(s, g_reconnect_logonid); /* LogonId */ - ssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), - g_client_random, SEC_RANDOM_SIZE, security_verifier); - out_uint8a(s, security_verifier, sizeof(security_verifier)); + if (g_has_reconnect_random) + { + out_uint16_le(s, 28); /* cbAutoReconnectLen */ + /* ARC_CS_PRIVATE_PACKET */ + out_uint32_le(s, 28); /* cbLen */ + out_uint32_le(s, 1); /* Version */ + out_uint32_le(s, g_reconnect_logonid); /* LogonId */ + ssl_hmac_md5(g_reconnect_random, sizeof(g_reconnect_random), + g_client_random, SEC_RANDOM_SIZE, security_verifier); + out_uint8a(s, security_verifier, sizeof(security_verifier)); + } + else + { + out_uint16_le(s, 0); /* cbAutoReconnectLen */ + } + } s_mark_end(s); sec_send(s, sec_flags); @@ -1357,6 +1366,7 @@ in_uint32_le(s, g_reconnect_logonid); in_uint8a(s, g_reconnect_random, 16); + g_has_reconnect_random = True; DEBUG(("Saving auto-reconnect cookie, id=%u\n", g_reconnect_logonid)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-12 08:31:14
|
Revision: 1534 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1534&view=rev Author: astrand Date: 2010-01-12 08:31:06 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Changed license to GPLv3 Modified Paths: -------------- rdesktop/trunk/COPYING rdesktop/trunk/bitmap.c rdesktop/trunk/cache.c rdesktop/trunk/channels.c rdesktop/trunk/cliprdr.c rdesktop/trunk/constants.h rdesktop/trunk/disk.c rdesktop/trunk/disk.h rdesktop/trunk/ewmhints.c rdesktop/trunk/iso.c rdesktop/trunk/licence.c rdesktop/trunk/lspci.c rdesktop/trunk/mcs.c rdesktop/trunk/mppc.c rdesktop/trunk/orders.c rdesktop/trunk/orders.h rdesktop/trunk/parallel.c rdesktop/trunk/parse.h rdesktop/trunk/printer.c rdesktop/trunk/printercache.c rdesktop/trunk/proto.h rdesktop/trunk/proto.head rdesktop/trunk/pstcache.c rdesktop/trunk/rdesktop.c rdesktop/trunk/rdesktop.h rdesktop/trunk/rdp.c rdesktop/trunk/rdp5.c rdesktop/trunk/rdpdr.c rdesktop/trunk/rdpsnd.c rdesktop/trunk/rdpsnd.h rdesktop/trunk/rdpsnd_alsa.c rdesktop/trunk/rdpsnd_dsp.c rdesktop/trunk/rdpsnd_dsp.h rdesktop/trunk/rdpsnd_libao.c rdesktop/trunk/rdpsnd_oss.c rdesktop/trunk/rdpsnd_sgi.c rdesktop/trunk/rdpsnd_sun.c rdesktop/trunk/scard.c rdesktop/trunk/scard.h rdesktop/trunk/seamless.c rdesktop/trunk/seamless.h rdesktop/trunk/secure.c rdesktop/trunk/serial.c rdesktop/trunk/ssl.c rdesktop/trunk/ssl.h rdesktop/trunk/tcp.c rdesktop/trunk/types.h rdesktop/trunk/xclip.c rdesktop/trunk/xkeymap.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/COPYING =================================================================== --- rdesktop/trunk/COPYING 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/COPYING 2010-01-12 08:31:06 UTC (rev 1534) @@ -1,308 +1,643 @@ -This software is released under the GNU General Public License -(reproduced below) with the additional exemption that compiling, -linking, and/or using OpenSSL together with this software is -allowed. ---- - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + TERMS AND CONDITIONS -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. + 0. Definitions. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. + "This License" refers to version 3 of the GNU General Public License. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. + 1. Source Code. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. + The Corresponding Source for a work in source code form is that +same work. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. + 2. Basic Permissions. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + 13. Use with the GNU Affero General Public License. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. + 14. Revised Versions of this License. - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. - NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. + 15. Disclaimer of Warranty. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -311,36 +646,31 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. Modified: rdesktop/trunk/bitmap.c =================================================================== --- rdesktop/trunk/bitmap.c 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/bitmap.c 2010-01-12 08:31:06 UTC (rev 1534) @@ -3,9 +3,9 @@ Bitmap decompression routines Copyright (C) Matthew Chapman 1999-2008 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* three seperate function for speed when decompressing the bitmaps Modified: rdesktop/trunk/cache.c =================================================================== --- rdesktop/trunk/cache.c 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/cache.c 2010-01-12 08:31:06 UTC (rev 1534) @@ -4,9 +4,9 @@ Copyright (C) Matthew Chapman 1999-2008 Copyright (C) Jeroen Meijer 2005 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "rdesktop.h" Modified: rdesktop/trunk/channels.c =================================================================== --- rdesktop/trunk/channels.c 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/channels.c 2010-01-12 08:31:06 UTC (rev 1534) @@ -4,9 +4,9 @@ Copyright (C) Erik Forsberg <for...@ce...> 2003 Copyright (C) Matthew Chapman 2003-2008 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "rdesktop.h" Modified: rdesktop/trunk/cliprdr.c =================================================================== --- rdesktop/trunk/cliprdr.c 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/cliprdr.c 2010-01-12 08:31:06 UTC (rev 1534) @@ -4,9 +4,9 @@ Copyright (C) Erik Forsberg <for...@ce...> 2003 Copyright (C) Matthew Chapman 2003-2008 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "rdesktop.h" Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/constants.h 2010-01-12 08:31:06 UTC (rev 1534) @@ -3,9 +3,9 @@ Miscellaneous protocol constants Copyright (C) Matthew Chapman 1999-2008 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* TCP port for Remote Desktop Protocol */ Modified: rdesktop/trunk/disk.c =================================================================== --- rdesktop/trunk/disk.c 2010-01-12 08:06:15 UTC (rev 1533) +++ rdesktop/trunk/disk.c 2010-01-12 08:31:06 UTC (rev 1534) @@ -3,9 +3,9 @@ Disk Redirection Copyright (C) Jeroen Meijer 2003-2008 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License ... [truncated message content] |
From: <as...@us...> - 2010-01-13 13:51:15
|
Revision: 1545 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1545&view=rev Author: astrand Date: 2010-01-13 13:51:06 +0000 (Wed, 13 Jan 2010) Log Message: ----------- This patch is a re-work of patch r1538. One one hand, the plain old behaviour of setting the session size in ui_init is not going to work, due to xrandr, as pointed out in r1538. However, the approach implemented in this revision doesn't work either: When the window is created before the connection, this means that as soon as X11 events are recieved, this is going to trigger RDP transmissions. For example, a call to reset_modifiers_keys. But if the RDP connection is not ready, the WTS is not prepared to handle such data. We must wait with, for example, keyboard input until the connection is READY. OTOH, we can't just ignore those X11 events; that might lead to that we are not sending information that we need to send. So, it is actually better to wait with creating the window until we have been connected. An additional advantage of this is that for the load balancing / session directory case, there's no risk of confusion of which RDP connection we are actually sending data to. The previous behaviour of creating the window after we have been connected has been restored. Since we still need to set connection data (currently screen size) on a per connection basis, we need to create a new UI function for this. Non-X11 backends need to implement this new function. Modified Paths: -------------- rdesktop/trunk/proto.h rdesktop/trunk/rdesktop.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-12 15:22:33 UTC (rev 1544) +++ rdesktop/trunk/proto.h 2010-01-13 13:51:06 UTC (rev 1545) @@ -231,6 +231,7 @@ /* xwin.c */ RD_BOOL get_key_state(unsigned int state, uint32 keysym); RD_BOOL ui_init(void); +void ui_init_connection(void); void ui_deinit(void); RD_BOOL ui_create_window(void); void ui_resize_window(void); Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-12 15:22:33 UTC (rev 1544) +++ rdesktop/trunk/rdesktop.c 2010-01-13 13:51:06 UTC (rev 1545) @@ -965,9 +965,7 @@ while (run_count < 2 && continue_connect) /* add support for Session Directory; only reconnect once */ { - if (run_count == 0) - if (!ui_create_window()) - return EX_OSERR; + ui_init_connection(); if (run_count == 0) { @@ -986,6 +984,10 @@ DEBUG(("Connection successful.\n")); memset(password, 0, sizeof(password)); + if (run_count == 0) + if (!ui_create_window()) + return EX_OSERR; + if (continue_connect) rdp_main_loop(&deactivated, &ext_disc_reason); Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2010-01-12 15:22:33 UTC (rev 1544) +++ rdesktop/trunk/xwin.c 2010-01-13 13:51:06 UTC (rev 1545) @@ -1818,6 +1818,7 @@ return g_old_error_handler(dpy, eev); } +/* Initialize the UI. This is done once per process. */ RD_BOOL ui_init(void) { @@ -1894,7 +1895,54 @@ return True; } + +/* + Initialize connection specific data, such as session size. + */ void +ui_init_connection(void) +{ + /* + * Determine desktop size + */ + if (g_fullscreen) + { + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + g_using_full_workarea = True; + } + else if (g_width < 0) + { + /* Percent of screen */ + if (-g_width >= 100) + g_using_full_workarea = True; + g_height = HeightOfScreen(g_screen) * (-g_width) / 100; + g_width = WidthOfScreen(g_screen) * (-g_width) / 100; + } + else if (g_width == 0) + { + /* Fetch geometry from _NET_WORKAREA */ + uint32 x, y, cx, cy; + if (get_current_workarea(&x, &y, &cx, &cy) == 0) + { + g_width = cx; + g_height = cy; + g_using_full_workarea = True; + } + else + { + warning("Failed to get workarea: probably your window manager does not support extended hints\n"); + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + } + } + + /* make sure width is a multiple of 4 */ + g_width = (g_width + 3) & ~3; +} + + +void ui_deinit(void) { while (g_seamless_windows) @@ -1961,44 +2009,6 @@ long input_mask, ic_input_mask; XEvent xevent; - /* - * Determine desktop size - */ - if (g_fullscreen) - { - g_width = WidthOfScreen(g_screen); - g_height = HeightOfScreen(g_screen); - g_using_full_workarea = True; - } - else if (g_width < 0) - { - /* Percent of screen */ - if (-g_width >= 100) - g_using_full_workarea = True; - g_height = HeightOfScreen(g_screen) * (-g_width) / 100; - g_width = WidthOfScreen(g_screen) * (-g_width) / 100; - } - else if (g_width == 0) - { - /* Fetch geometry from _NET_WORKAREA */ - uint32 x, y, cx, cy; - if (get_current_workarea(&x, &y, &cx, &cy) == 0) - { - g_width = cx; - g_height = cy; - g_using_full_workarea = True; - } - else - { - warning("Failed to get workarea: probably your window manager does not support extended hints\n"); - g_width = WidthOfScreen(g_screen); - g_height = HeightOfScreen(g_screen); - } - } - - /* make sure width is a multiple of 4 */ - g_width = (g_width + 3) & ~3; - wndwidth = g_fullscreen ? WidthOfScreen(g_screen) : g_width; wndheight = g_fullscreen ? HeightOfScreen(g_screen) : g_height; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-14 11:48:18
|
Revision: 1549 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1549&view=rev Author: astrand Date: 2010-01-14 11:48:12 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Update the license for uiports/vnc to GPLv3. Modified Paths: -------------- rdesktop/trunk/uiports/nanoxwin.c rdesktop/trunk/uiports/qtewin.cpp rdesktop/trunk/uiports/qtwin.cpp rdesktop/trunk/uiports/svgawin.c rdesktop/trunk/uiports/xxxwin.c rdesktop/trunk/vnc/vnc.c Modified: rdesktop/trunk/uiports/nanoxwin.c =================================================================== --- rdesktop/trunk/uiports/nanoxwin.c 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/uiports/nanoxwin.c 2010-01-14 11:48:12 UTC (rev 1549) @@ -3,9 +3,9 @@ User interface services - NanoX(microwindows) Copyright (C) Jay Sorg 2004-2005 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* problems with nanox lib Modified: rdesktop/trunk/uiports/qtewin.cpp =================================================================== --- rdesktop/trunk/uiports/qtewin.cpp 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/uiports/qtewin.cpp 2010-01-14 11:48:12 UTC (rev 1549) @@ -3,9 +3,9 @@ User interface services - QT Emb System Copyright (C) Jay Sorg 2004-2005 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ //#define SHARP Modified: rdesktop/trunk/uiports/qtwin.cpp =================================================================== --- rdesktop/trunk/uiports/qtwin.cpp 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/uiports/qtwin.cpp 2010-01-14 11:48:12 UTC (rev 1549) @@ -3,9 +3,9 @@ User interface services - QT Window System Copyright (C) Jay Sorg 2004-2007 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "rdesktop.h" Modified: rdesktop/trunk/uiports/svgawin.c =================================================================== --- rdesktop/trunk/uiports/svgawin.c 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/uiports/svgawin.c 2010-01-14 11:48:12 UTC (rev 1549) @@ -3,9 +3,9 @@ User interface services - SVGA lib Copyright (C) Jay Sorg 2004-2007 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "../rdesktop.h" Modified: rdesktop/trunk/uiports/xxxwin.c =================================================================== --- rdesktop/trunk/uiports/xxxwin.c 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/uiports/xxxwin.c 2010-01-14 11:48:12 UTC (rev 1549) @@ -3,20 +3,18 @@ User interface services - Generic Copyright (C) Jay Sorg 2004-2007 - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include "../rdesktop.h" Modified: rdesktop/trunk/vnc/vnc.c =================================================================== --- rdesktop/trunk/vnc/vnc.c 2010-01-13 16:22:35 UTC (rev 1548) +++ rdesktop/trunk/vnc/vnc.c 2010-01-14 11:48:12 UTC (rev 1549) @@ -6,19 +6,18 @@ Copyright (C) 2001 James "Wez" Weatherall Copyright (C) 2001 Johannes E. Schindelin - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see <http://www.gnu.org/licenses/>. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-14 15:53:30
|
Revision: 1551 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1551&view=rev Author: astrand Date: 2010-01-14 15:53:24 +0000 (Thu, 14 Jan 2010) Log Message: ----------- We have been handling the special "relative" session sizes (workarea and percent of screen) by abusing the g_width variable. However, this is only works once, since g_width in this case is calculated using itself. This will not work if we want to support xrandr. Besides, it's quite ugly. The patch changes this so that a separate variable, g_sizeopt, is used. Modified Paths: -------------- rdesktop/trunk/rdesktop.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-14 15:21:45 UTC (rev 1550) +++ rdesktop/trunk/rdesktop.c 2010-01-14 15:53:24 UTC (rev 1551) @@ -54,12 +54,11 @@ int g_keyboard_type = 0x4; /* Defaults to US keyboard layout */ int g_keyboard_subtype = 0x0; /* Defaults to US keyboard layout */ int g_keyboard_functionkeys = 0xc; /* Defaults to US keyboard layout */ - -int g_width = 800; /* width is special: If 0, the - geometry will be fetched from - _NET_WORKAREA. If negative, - absolute value specifies the - percent of the whole screen. */ +int g_sizeopt = 0; /* If non-zero, a special size has been + requested. If 1, the geometry will be fetched + from _NET_WORKAREA. If negative, absolute value + specifies the percent of the whole screen. */ +int g_width = 800; int g_height = 600; int g_xpos = 0; int g_ypos = 0; @@ -559,7 +558,7 @@ g_fullscreen = False; if (!strcmp(optarg, "workarea")) { - g_width = g_height = 0; + g_sizeopt = 1; break; } @@ -581,7 +580,8 @@ if (*p == '%') { - g_width = -g_width; + g_sizeopt = -g_width; + g_width = 800; p++; } Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2010-01-14 15:21:45 UTC (rev 1550) +++ rdesktop/trunk/xwin.c 2010-01-14 15:53:24 UTC (rev 1551) @@ -29,6 +29,7 @@ #include "rdesktop.h" #include "xproto.h" +extern int g_sizeopt; extern int g_width; extern int g_height; extern int g_xpos; @@ -1911,15 +1912,15 @@ g_height = HeightOfScreen(g_screen); g_using_full_workarea = True; } - else if (g_width < 0) + else if (g_sizeopt < 0) { /* Percent of screen */ - if (-g_width >= 100) + if (-g_sizeopt >= 100) g_using_full_workarea = True; - g_height = HeightOfScreen(g_screen) * (-g_width) / 100; - g_width = WidthOfScreen(g_screen) * (-g_width) / 100; + g_height = HeightOfScreen(g_screen) * (-g_sizeopt) / 100; + g_width = WidthOfScreen(g_screen) * (-g_sizeopt) / 100; } - else if (g_width == 0) + else if (g_sizeopt == 1) { /* Fetch geometry from _NET_WORKAREA */ uint32 x, y, cx, cy; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-20 09:59:54
|
Revision: 1556 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1556&view=rev Author: astrand Date: 2010-01-20 09:59:47 +0000 (Wed, 20 Jan 2010) Log Message: ----------- Added RandR support: If the specified geometry depends on the screen size, and the screen size is changed, rdesktop will automatically reconnect using the new screen size. This feature uses the previously implemented autoreconnect feature. The new UI function ui_seamless_end() has been introduced, to make it possible to resize in seamless mode as well. Modified Paths: -------------- rdesktop/trunk/configure.ac rdesktop/trunk/doc/rdesktop.1 rdesktop/trunk/proto.h rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/configure.ac =================================================================== --- rdesktop/trunk/configure.ac 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/configure.ac 2010-01-20 09:59:47 UTC (rev 1556) @@ -105,6 +105,15 @@ LIBS="$LIBS -L$ssldir/lib -lcrypto" rpath="$rpath:$ssldir/lib" ]) +# xrandr +if test -n "$PKG_CONFIG"; then + PKG_CHECK_MODULES(XRANDR, xrandr, [HAVE_XRANDR=1], [HAVE_XRANDR=0]) +fi +if test x"$HAVE_XRANDR" = "x1"; then + CFLAGS="$CFLAGS $XRANDR_CFLAGS" + LIBS="$LIBS $XRANDR_LIBS" + AC_DEFINE(HAVE_XRANDR) +fi AC_ARG_ENABLE(smartcard, [ --enable-smartcard Enables smart-card support. Modified: rdesktop/trunk/doc/rdesktop.1 =================================================================== --- rdesktop/trunk/doc/rdesktop.1 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/doc/rdesktop.1 2010-01-20 09:59:47 UTC (rev 1556) @@ -66,6 +66,11 @@ will be fetched from the extended window manager hints property _NET_WORKAREA, from the root window. The geometry can also be specified as a percentage of the whole screen, e.g. "-g 80%". + +If the specified geometry depends on the screen size, and the screen +size is changed, rdesktop will automatically reconnect using the new +screen size. This requires that rdesktop has been compiled with RandR +support. .TP .BR "-f" Enable fullscreen mode. This overrides the window manager and causes the Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/proto.h 2010-01-20 09:59:47 UTC (rev 1556) @@ -279,6 +279,7 @@ void ui_begin_update(void); void ui_end_update(void); void ui_seamless_begin(RD_BOOL hidden); +void ui_seamless_end(); void ui_seamless_hide_desktop(void); void ui_seamless_unhide_desktop(void); void ui_seamless_toggle(void); Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/rdesktop.c 2010-01-20 09:59:47 UTC (rev 1556) @@ -106,6 +106,7 @@ char g_reconnect_random[16]; RD_BOOL g_has_reconnect_random = False; uint8 g_client_random[SEC_RANDOM_SIZE]; +RD_BOOL g_pending_resize = False; #ifdef WITH_RDPSND RD_BOOL g_rdpsnd = False; @@ -1001,7 +1002,15 @@ if (g_redirect) continue; + + ui_seamless_end(); ui_destroy_window(); + if (g_pending_resize) + { + /* If we have a pending resize, reconnect using the new size, rather than exit */ + g_pending_resize = False; + continue; + } break; } Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/rdp.c 2010-01-20 09:59:47 UTC (rev 1556) @@ -52,6 +52,7 @@ extern RD_BOOL g_bitmap_cache; extern RD_BOOL g_bitmap_cache_persist_enable; extern RD_BOOL g_numlock_sync; +extern RD_BOOL g_pending_resize; uint8 *g_next_packet; uint32 g_rdp_shareid; @@ -1530,12 +1531,16 @@ } /* Process incoming packets */ -/* nevers gets out of here till app is done */ void rdp_main_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason) { while (rdp_loop(deactivated, ext_disc_reason)) - ; + { + if (g_pending_resize) + { + return; + } + } } /* used in uiports and rdp_main_loop, processes the rdp packets waiting */ Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2010-01-18 10:06:54 UTC (rev 1555) +++ rdesktop/trunk/xwin.c 2010-01-20 09:59:47 UTC (rev 1556) @@ -28,6 +28,9 @@ #include <strings.h> #include "rdesktop.h" #include "xproto.h" +#ifdef HAVE_XRANDR +#include <X11/extensions/Xrandr.h> +#endif extern int g_sizeopt; extern int g_width; @@ -39,6 +42,7 @@ extern RD_BOOL g_fullscreen; extern RD_BOOL g_grab_keyboard; extern RD_BOOL g_hide_decorations; +extern RD_BOOL g_pending_resize; extern char g_title[]; /* Color depth of the RDP session. As of RDP 5.1, it may be 8, 15, 16 or 24. */ @@ -1946,12 +1950,6 @@ void ui_deinit(void) { - while (g_seamless_windows) - { - XDestroyWindow(g_display, g_seamless_windows->wnd); - sw_remove_window(g_seamless_windows); - } - xclip_deinit(); if (g_IM != NULL) @@ -2085,6 +2083,9 @@ } XSelectInput(g_display, g_wnd, input_mask); +#ifdef HAVE_XRANDR + XSelectInput(g_display, RootWindowOfScreen(g_screen), StructureNotifyMask); +#endif XMapWindow(g_display, g_wnd); /* wait for VisibilityNotify */ @@ -2303,6 +2304,11 @@ /* Ignore events between ui_destroy_window and ui_create_window */ continue; + /* Also ignore root window events except ConfigureNotify */ + if (xevent.type != ConfigureNotify + && xevent.xany.window == DefaultRootWindow(g_display)) + continue; + if ((g_IC != NULL) && (XFilterEvent(&xevent, None) == True)) { DEBUG_KBD(("Filtering event\n")); @@ -2575,6 +2581,20 @@ rdp_send_client_window_status(0); break; case ConfigureNotify: +#ifdef HAVE_XRANDR + if ((g_sizeopt || g_fullscreen) + && xevent.xconfigure.window == DefaultRootWindow(g_display)) + { + if (xevent.xconfigure.width != WidthOfScreen(g_screen) + || xevent.xconfigure.height != HeightOfScreen(g_screen)) + { + XRRUpdateConfiguration(&xevent); + XSync(g_display, False); + g_pending_resize = True; + } + + } +#endif if (!g_seamless_active) break; @@ -3775,6 +3795,22 @@ void +ui_seamless_end() +{ + /* Destroy all seamless windows */ + while (g_seamless_windows) + { + XDestroyWindow(g_display, g_seamless_windows->wnd); + sw_remove_window(g_seamless_windows); + } + + g_seamless_started = False; + g_seamless_active = False; + g_seamless_hidden = False; +} + + +void ui_seamless_hide_desktop() { if (!g_seamless_rdp) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-21 09:24:46
|
Revision: 1557 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1557&view=rev Author: astrand Date: 2010-01-21 09:24:40 +0000 (Thu, 21 Jan 2010) Log Message: ----------- Committed load balancing fixes from Daniel Drown. Hopefully fixes bug #2845414. Modified Paths: -------------- rdesktop/trunk/constants.h rdesktop/trunk/rdp.c Modified: rdesktop/trunk/constants.h =================================================================== --- rdesktop/trunk/constants.h 2010-01-20 09:59:47 UTC (rev 1556) +++ rdesktop/trunk/constants.h 2010-01-21 09:24:40 UTC (rev 1557) @@ -455,3 +455,20 @@ #define SCARD_LOCK_CHANNEL 2 #define SCARD_LOCK_RDPDR 3 #define SCARD_LOCK_LAST 4 + + +/* redirect flags, from [MS-RDPBCGR] 2.2.13.1 */ +enum RDP_PDU_REDIRECT_FLAGS +{ + PDU_REDIRECT_HAS_IP = 0x1, + PDU_REDIRECT_HAS_COOKIE = 0x2, + PDU_REDIRECT_HAS_USERNAME = 0x4, + PDU_REDIRECT_HAS_DOMAIN = 0x8, + PDU_REDIRECT_HAS_PASSWORD = 0x10, + PDU_REDIRECT_DONT_STORE_USERNAME = 0x20, + PDU_REDIRECT_USE_SMARTCARD = 0x40, + PDU_REDIRECT_INFORMATIONAL = 0x80, + PDU_REDIRECT_HAS_TARGET_FQDN = 0x100, + PDU_REDIRECT_HAS_TARGET_NETBIOS = 0x200, + PDU_REDIRECT_HAS_TARGET_IP_ARRAY = 0x800 +}; Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2010-01-20 09:59:47 UTC (rev 1556) +++ rdesktop/trunk/rdp.c 2010-01-21 09:24:40 UTC (rev 1557) @@ -1481,50 +1481,95 @@ /* read connection flags */ in_uint32_le(s, g_redirect_flags); - /* read length of ip string */ - in_uint32_le(s, len); + if (g_redirect_flags & PDU_REDIRECT_HAS_IP) + { + /* read length of ip string */ + in_uint32_le(s, len); - /* read ip string */ - rdp_in_unistr(s, g_redirect_server, sizeof(g_redirect_server), len); + /* read ip string */ + rdp_in_unistr(s, g_redirect_server, sizeof(g_redirect_server), len); + } - /* read length of cookie string */ - in_uint32_le(s, len); + if (g_redirect_flags & PDU_REDIRECT_HAS_COOKIE) + { + /* read length of cookie string */ + in_uint32_le(s, len); - /* read cookie string (plain ASCII) */ - if (len > sizeof(g_redirect_cookie) - 1) + /* read cookie string (plain ASCII) */ + if (len > sizeof(g_redirect_cookie) - 1) + { + uint32 rem = len - (sizeof(g_redirect_cookie) - 1); + len = sizeof(g_redirect_cookie) - 1; + + warning("Unexpectedly large redirection cookie\n"); + in_uint8a(s, g_redirect_cookie, len); + in_uint8s(s, rem); + } + else + { + in_uint8a(s, g_redirect_cookie, len); + } + g_redirect_cookie[len] = 0; + } + + if (g_redirect_flags & PDU_REDIRECT_HAS_USERNAME) { - uint32 rem = len - (sizeof(g_redirect_cookie) - 1); - len = sizeof(g_redirect_cookie) - 1; + /* read length of username string */ + in_uint32_le(s, len); - warning("Unexpectedly large redirection cookie\n"); - in_uint8a(s, g_redirect_cookie, len); - in_uint8s(s, rem); + /* read username string */ + g_redirect_username = (char *) xmalloc(len + 1); + rdp_in_unistr(s, g_redirect_username, strlen(g_redirect_username), len); } - else + + if (g_redirect_flags & PDU_REDIRECT_HAS_DOMAIN) { - in_uint8a(s, g_redirect_cookie, len); + /* read length of domain string */ + in_uint32_le(s, len); + + /* read domain string */ + rdp_in_unistr(s, g_redirect_domain, sizeof(g_redirect_domain), len); } - g_redirect_cookie[len] = 0; - /* read length of username string */ - in_uint32_le(s, len); + if (g_redirect_flags & PDU_REDIRECT_HAS_PASSWORD) + { + /* read length of password string */ + in_uint32_le(s, len); - /* read username string */ - g_redirect_username = (char *) xmalloc(len + 1); - rdp_in_unistr(s, g_redirect_username, strlen(g_redirect_username), len); + /* read password string */ + rdp_in_unistr(s, g_redirect_password, sizeof(g_redirect_password), len); + } - /* read length of domain string */ - in_uint32_le(s, len); + if (g_redirect_flags & PDU_REDIRECT_DONT_STORE_USERNAME) + { + warning("PDU_REDIRECT_DONT_STORE_USERNAME set\n"); + } - /* read domain string */ - rdp_in_unistr(s, g_redirect_domain, sizeof(g_redirect_domain), len); + if (g_redirect_flags & PDU_REDIRECT_USE_SMARTCARD) + { + warning("PDU_REDIRECT_USE_SMARTCARD set\n"); + } - /* read length of password string */ - in_uint32_le(s, len); + if (g_redirect_flags & PDU_REDIRECT_INFORMATIONAL) + { + warning("PDU_REDIRECT_INFORMATIONAL set\n"); + } - /* read password string */ - rdp_in_unistr(s, g_redirect_password, sizeof(g_redirect_password), len); + if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_FQDN) + { + warning("PDU_REDIRECT_HAS_TARGET_FQDN set\n"); + } + if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_NETBIOS) + { + warning("PDU_REDIRECT_HAS_TARGET_NETBIOS set\n"); + } + + if (g_redirect_flags & PDU_REDIRECT_HAS_TARGET_IP_ARRAY) + { + warning("PDU_REDIRECT_HAS_TARGET_IP_ARRAY set\n"); + } + g_redirect = True; return True; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-26 10:14:04
|
Revision: 1558 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1558&view=rev Author: astrand Date: 2010-01-26 10:13:53 +0000 (Tue, 26 Jan 2010) Log Message: ----------- Need two more smart card prototypes, to avoid warnings. Modified Paths: -------------- rdesktop/trunk/proto.h rdesktop/trunk/scard.h Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-21 09:24:40 UTC (rev 1557) +++ rdesktop/trunk/proto.h 2010-01-26 10:13:53 UTC (rev 1558) @@ -312,6 +312,8 @@ /* scard.c */ void scard_lock(int lock); void scard_unlock(int lock); +int scard_enum_devices(uint32 * id, char *optarg); +void scardSetInfo(uint32 device, uint32 id, uint32 bytes_out); /* *INDENT-OFF* */ #ifdef __cplusplus Modified: rdesktop/trunk/scard.h =================================================================== --- rdesktop/trunk/scard.h 2010-01-21 09:24:40 UTC (rev 1557) +++ rdesktop/trunk/scard.h 2010-01-26 10:13:53 UTC (rev 1558) @@ -172,4 +172,3 @@ struct _TThreadListElement *next; } TThreadListElement, *PThreadListElement; -int scard_enum_devices(uint32 * id, char *optarg); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-26 14:33:32
|
Revision: 1561 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1561&view=rev Author: astrand Date: 2010-01-26 12:23:53 +0000 (Tue, 26 Jan 2010) Log Message: ----------- Reset smart card state before reconnect. This fixes stability problems when using smart cards in conjunction with RandR. Modified Paths: -------------- rdesktop/trunk/proto.h rdesktop/trunk/rdesktop.c rdesktop/trunk/scard.c Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-01-26 10:24:26 UTC (rev 1560) +++ rdesktop/trunk/proto.h 2010-01-26 12:23:53 UTC (rev 1561) @@ -314,6 +314,7 @@ void scard_unlock(int lock); int scard_enum_devices(uint32 * id, char *optarg); void scardSetInfo(uint32 device, uint32 id, uint32 bytes_out); +void scard_reset_state(); /* *INDENT-OFF* */ #ifdef __cplusplus Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-26 10:24:26 UTC (rev 1560) +++ rdesktop/trunk/rdesktop.c 2010-01-26 12:23:53 UTC (rev 1561) @@ -351,6 +351,7 @@ rdesktop_reset_state(void) { rdp_reset_state(); + scard_reset_state(); } static RD_BOOL Modified: rdesktop/trunk/scard.c =================================================================== --- rdesktop/trunk/scard.c 2010-01-26 10:24:26 UTC (rev 1560) +++ rdesktop/trunk/scard.c 2010-01-26 12:23:53 UTC (rev 1561) @@ -2626,3 +2626,12 @@ { pthread_mutex_unlock(scard_mutex[lock]); } + +void scard_reset_state() +{ + curDevice = 0; + curId = 0; + curBytesOut = 0; + + queueFirst = queueLast = NULL; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-04-09 13:12:38
|
Revision: 1592 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1592&view=rev Author: astrand Date: 2010-04-09 13:12:31 +0000 (Fri, 09 Apr 2010) Log Message: ----------- Properly reset sound subsystem when reconnecting due to screen size change (RandR). Modified Paths: -------------- rdesktop/trunk/proto.h rdesktop/trunk/rdesktop.c rdesktop/trunk/rdpsnd.c Modified: rdesktop/trunk/proto.h =================================================================== --- rdesktop/trunk/proto.h 2010-04-09 12:51:14 UTC (rev 1591) +++ rdesktop/trunk/proto.h 2010-04-09 13:12:31 UTC (rev 1592) @@ -174,6 +174,7 @@ RD_BOOL rdpsnd_queue_empty(void); void rdpsnd_queue_next(unsigned long completed_in_us); int rdpsnd_queue_next_tick(void); +void rdpsnd_reset_state(void); /* secure.c */ void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt); void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2); Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-04-09 12:51:14 UTC (rev 1591) +++ rdesktop/trunk/rdesktop.c 2010-04-09 13:12:31 UTC (rev 1592) @@ -354,6 +354,9 @@ #ifdef WITH_SCARD scard_reset_state(); #endif +#ifdef WITH_RDPSND + rdpsnd_reset_state(); +#endif } static RD_BOOL Modified: rdesktop/trunk/rdpsnd.c =================================================================== --- rdesktop/trunk/rdpsnd.c 2010-04-09 12:51:14 UTC (rev 1591) +++ rdesktop/trunk/rdpsnd.c 2010-04-09 13:12:31 UTC (rev 1592) @@ -73,6 +73,7 @@ static void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index); static void rdpsnd_queue_init(void); +static void rdpsnd_queue_clear(void); static void rdpsnd_queue_complete_pending(void); static long rdpsnd_queue_next_completion(void); @@ -150,6 +151,16 @@ record_buffer_size = 0; } +static void +rdpsnd_clear_record(void) +{ + /* + * Silently drop everything we have in the record buffer as + * we've somehow gotten a reset in regard to the server. + */ + record_buffer_size = 0; +} + void rdpsnd_record(const void *data, unsigned int size) { @@ -727,6 +738,23 @@ } void +rdpsnd_reset_state(void) +{ + if (device_open) + current_driver->wave_out_close(); + device_open = False; + + rdpsnd_queue_clear(); + + if (rec_device_open) + current_driver->wave_in_close(); + rec_device_open = False; + + rdpsnd_clear_record(); +} + + +void rdpsnd_show_help(void) { struct audio_driver *pos; @@ -811,6 +839,23 @@ queue_pending = queue_lo = queue_hi = 0; } +static void +rdpsnd_queue_clear(void) +{ + struct audio_packet *packet; + + /* Go through everything, not just the pending packets */ + while (queue_pending != queue_hi) + { + packet = &packet_queue[queue_pending]; + xfree(packet->s.data); + queue_pending = (queue_pending + 1) % MAX_QUEUE; + } + + /* Reset everything back to the initial state */ + queue_pending = queue_lo = queue_hi = 0; +} + void rdpsnd_queue_next(unsigned long completed_in_us) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-04-07 11:39:35
|
Revision: 1589 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1589&view=rev Author: stargo Date: 2010-04-07 11:39:29 +0000 (Wed, 07 Apr 2010) Log Message: ----------- fix two problems found by clang static analyzer secure.c: Dereference of null pointer xkeymap.c: Pass-by-value argument in function call is undefined both seem to be noncritical, as sec_recv is never called with a null pointer and ensure_remote_modifiers only accesses initialized fields Modified Paths: -------------- rdesktop/trunk/secure.c rdesktop/trunk/xkeymap.c Modified: rdesktop/trunk/secure.c =================================================================== --- rdesktop/trunk/secure.c 2010-03-31 12:48:59 UTC (rev 1588) +++ rdesktop/trunk/secure.c 2010-04-07 11:39:29 UTC (rev 1589) @@ -825,7 +825,8 @@ if (channel != MCS_GLOBAL_CHANNEL) { channel_process(s, channel); - *rdpver = 0xff; + if (rdpver != NULL) + *rdpver = 0xff; return s; } Modified: rdesktop/trunk/xkeymap.c =================================================================== --- rdesktop/trunk/xkeymap.c 2010-03-31 12:48:59 UTC (rev 1588) +++ rdesktop/trunk/xkeymap.c 2010-04-07 11:39:29 UTC (rev 1589) @@ -820,7 +820,7 @@ void restore_remote_modifiers(uint32 ev_time, uint8 scancode) { - key_translation dummy; + key_translation dummy = { }; if (is_modifier(scancode)) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-13 08:55:53
|
Revision: 1612 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1612&view=rev Author: astrand Date: 2011-04-13 08:55:42 +0000 (Wed, 13 Apr 2011) Log Message: ----------- Updated the copyright notices for the things we have been working on. Modified Paths: -------------- rdesktop/trunk/cache.c rdesktop/trunk/disk.c rdesktop/trunk/ewmhints.c rdesktop/trunk/iso.c rdesktop/trunk/mcs.c rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c rdesktop/trunk/rdpdr.c rdesktop/trunk/rdpsnd.c rdesktop/trunk/rdpsnd_oss.c rdesktop/trunk/rdpsnd_sun.c rdesktop/trunk/secure.c rdesktop/trunk/tcp.c rdesktop/trunk/xclip.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/cache.c =================================================================== --- rdesktop/trunk/cache.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/cache.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -3,6 +3,7 @@ Cache routines Copyright (C) Matthew Chapman 1999-2008 Copyright (C) Jeroen Meijer 2005 + Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/disk.c =================================================================== --- rdesktop/trunk/disk.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/disk.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Disk Redirection Copyright (C) Jeroen Meijer 2003-2008 + Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/ewmhints.c =================================================================== --- rdesktop/trunk/ewmhints.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/ewmhints.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -4,7 +4,7 @@ Support functions for Extended Window Manager Hints, http://www.freedesktop.org/wiki/Standards_2fwm_2dspec - Copyright 2005 Peter Astrand <as...@ce...> for Cendio AB + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB Copyright 2007 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/iso.c =================================================================== --- rdesktop/trunk/iso.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/iso.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - ISO layer Copyright (C) Matthew Chapman 1999-2008 + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/mcs.c =================================================================== --- rdesktop/trunk/mcs.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/mcs.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - Multipoint Communications Service Copyright (C) Matthew Chapman 1999-2008 + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdesktop.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,8 @@ rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions Copyright (C) Matthew Chapman 1999-2008 + Copyright 2002-2011 Peter Astrand <as...@ce...> for Cendio AB + Copyright 2010-2011 Henrik Andersson <he...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdp.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer Copyright (C) Matthew Chapman 1999-2008 + Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/rdpdr.c =================================================================== --- rdesktop/trunk/rdpdr.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdpdr.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -1,6 +1,8 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Copyright (C) Matthew Chapman 1999-2008 + Copyright 2004-2011 Peter Astrand <as...@ce...> for Cendio AB + Copyright 2010-2011 Henrik Andersson <he...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/rdpsnd.c =================================================================== --- rdesktop/trunk/rdpsnd.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdpsnd.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions Copyright 2006-2010 Pierre Ossman <os...@ce...> for Cendio AB + Copyright 2009-2011 Peter Astrand <as...@ce...> for Cendio AB Copyright (C) Matthew Chapman 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Modified: rdesktop/trunk/rdpsnd_oss.c =================================================================== --- rdesktop/trunk/rdpsnd_oss.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdpsnd_oss.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -4,6 +4,7 @@ Copyright (C) Matthew Chapman 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/rdpsnd_sun.c =================================================================== --- rdesktop/trunk/rdpsnd_sun.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/rdpsnd_sun.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -5,6 +5,7 @@ Copyright (C) GuoJunBo guo...@ic... 2003 Copyright (C) Michael Gernoth mi...@ze... 2003-2008 Copyright 2007-2008 Pierre Ossman <os...@ce...> for Cendio AB + Copyright 2008-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/secure.c =================================================================== --- rdesktop/trunk/secure.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/secure.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - RDP encryption and licensing Copyright (C) Matthew Chapman 1999-2008 + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/tcp.c =================================================================== --- rdesktop/trunk/tcp.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/tcp.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -2,6 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - TCP layer Copyright (C) Matthew Chapman 1999-2008 + Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/xclip.c =================================================================== --- rdesktop/trunk/xclip.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/xclip.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -3,6 +3,7 @@ Protocol services - Clipboard functions Copyright (C) Erik Forsberg <for...@ce...> 2003-2008 Copyright (C) Matthew Chapman 2003-2008 + Copyright 2006-2011 Pierre Ossman <os...@ce...> for Cendio AB 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 Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2011-04-13 08:46:04 UTC (rev 1611) +++ rdesktop/trunk/xwin.c 2011-04-13 08:55:42 UTC (rev 1612) @@ -3,6 +3,7 @@ User interface services - X Window System Copyright (C) Matthew Chapman 1999-2008 Copyright 2007-2008 Pierre Ossman <os...@ce...> for Cendio AB + Copyright 2002-2011 Peter Astrand <as...@ce...> for Cendio AB 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-13 10:52:01
|
Revision: 1613 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1613&view=rev Author: astrand Date: 2011-04-13 10:51:50 +0000 (Wed, 13 Apr 2011) Log Message: ----------- A few copyright tweaks: added email, years, organization. Modified Paths: -------------- rdesktop/trunk/rdp5.c rdesktop/trunk/rdpsnd_dsp.c rdesktop/trunk/xkeymap.c Modified: rdesktop/trunk/rdp5.c =================================================================== --- rdesktop/trunk/rdp5.c 2011-04-13 08:55:42 UTC (rev 1612) +++ rdesktop/trunk/rdp5.c 2011-04-13 10:51:50 UTC (rev 1613) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - RDP5 short form PDU processing Copyright (C) Matthew Chapman 1999-2008 - Copyright (C) Erik Forsberg 2003-2008 + Copyright (C) Erik Forsberg <for...@ce...> 2003-2008 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 Modified: rdesktop/trunk/rdpsnd_dsp.c =================================================================== --- rdesktop/trunk/rdpsnd_dsp.c 2011-04-13 08:55:42 UTC (rev 1612) +++ rdesktop/trunk/rdpsnd_dsp.c 2011-04-13 10:51:50 UTC (rev 1613) @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Sound DSP routines - Copyright (C) Michael Gernoth 2006-2008 + Copyright (C) Michael Gernoth mi...@ze... 2006-2008 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 Modified: rdesktop/trunk/xkeymap.c =================================================================== --- rdesktop/trunk/xkeymap.c 2011-04-13 08:55:42 UTC (rev 1612) +++ rdesktop/trunk/xkeymap.c 2011-04-13 10:51:50 UTC (rev 1613) @@ -3,7 +3,7 @@ User interface services - X keyboard mapping Copyright (C) Matthew Chapman 1999-2008 - Copyright (C) Peter Astrand <as...@ce...> 2003-2008 + Copyright (C) 2003-2008 Peter Astrand <as...@ce...> for Cendio AB 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-13 11:13:16
|
Revision: 1615 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1615&view=rev Author: astrand Date: 2011-04-13 11:13:04 +0000 (Wed, 13 Apr 2011) Log Message: ----------- Include emails in copyright statements. Modified Paths: -------------- rdesktop/trunk/bitmap.c rdesktop/trunk/cache.c rdesktop/trunk/channels.c rdesktop/trunk/cliprdr.c rdesktop/trunk/disk.c rdesktop/trunk/iso.c rdesktop/trunk/licence.c rdesktop/trunk/mcs.c rdesktop/trunk/mppc.c rdesktop/trunk/orders.c rdesktop/trunk/parallel.c rdesktop/trunk/printer.c rdesktop/trunk/printercache.c rdesktop/trunk/pstcache.c rdesktop/trunk/rdesktop.c rdesktop/trunk/rdp.c rdesktop/trunk/rdp5.c rdesktop/trunk/rdpdr.c rdesktop/trunk/rdpsnd.c rdesktop/trunk/rdpsnd_alsa.c rdesktop/trunk/rdpsnd_libao.c rdesktop/trunk/rdpsnd_oss.c rdesktop/trunk/rdpsnd_sgi.c rdesktop/trunk/rdpsnd_sun.c rdesktop/trunk/secure.c rdesktop/trunk/serial.c rdesktop/trunk/ssl.c rdesktop/trunk/tcp.c rdesktop/trunk/xclip.c rdesktop/trunk/xkeymap.c rdesktop/trunk/xwin.c Modified: rdesktop/trunk/bitmap.c =================================================================== --- rdesktop/trunk/bitmap.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/bitmap.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Bitmap decompression routines - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/cache.c =================================================================== --- rdesktop/trunk/cache.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/cache.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,8 +1,8 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Cache routines - Copyright (C) Matthew Chapman 1999-2008 - Copyright (C) Jeroen Meijer 2005 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 + Copyright (C) Jeroen Meijer <je...@ol...> 2005 Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/channels.c =================================================================== --- rdesktop/trunk/channels.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/channels.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - Virtual channels Copyright (C) Erik Forsberg <for...@ce...> 2003 - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 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 Modified: rdesktop/trunk/cliprdr.c =================================================================== --- rdesktop/trunk/cliprdr.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/cliprdr.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - Clipboard functions Copyright (C) Erik Forsberg <for...@ce...> 2003 - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 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 Modified: rdesktop/trunk/disk.c =================================================================== --- rdesktop/trunk/disk.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/disk.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Disk Redirection - Copyright (C) Jeroen Meijer 2003-2008 + Copyright (C) Jeroen Meijer <je...@ol...> 2003-2008 Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/iso.c =================================================================== --- rdesktop/trunk/iso.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/iso.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - ISO layer - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/licence.c =================================================================== --- rdesktop/trunk/licence.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/licence.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. RDP licensing negotiation - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/mcs.c =================================================================== --- rdesktop/trunk/mcs.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/mcs.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - Multipoint Communications Service - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/mppc.c =================================================================== --- rdesktop/trunk/mppc.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/mppc.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP decompression - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/orders.c =================================================================== --- rdesktop/trunk/orders.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/orders.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. RDP order processing - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/parallel.c =================================================================== --- rdesktop/trunk/parallel.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/parallel.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/printer.c =================================================================== --- rdesktop/trunk/printer.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/printer.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/printercache.c =================================================================== --- rdesktop/trunk/printercache.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/printercache.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,8 +1,8 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2008 - Copyright (C) Jeroen Meijer 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 + Copyright (C) Jeroen Meijer <je...@ol...> 2003-2008 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 Modified: rdesktop/trunk/pstcache.c =================================================================== --- rdesktop/trunk/pstcache.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/pstcache.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Persistent Bitmap Cache routines - Copyright (C) Jeroen Meijer 2004-2008 + Copyright (C) Jeroen Meijer <je...@ol...> 2004-2008 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 Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdesktop.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2002-2011 Peter Astrand <as...@ce...> for Cendio AB Copyright 2010-2011 Henrik Andersson <he...@ce...> for Cendio AB Modified: rdesktop/trunk/rdp.c =================================================================== --- rdesktop/trunk/rdp.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdp.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2003-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/rdp5.c =================================================================== --- rdesktop/trunk/rdp5.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdp5.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP5 short form PDU processing - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Erik Forsberg <for...@ce...> 2003-2008 This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/rdpdr.c =================================================================== --- rdesktop/trunk/rdpdr.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpdr.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2004-2011 Peter Astrand <as...@ce...> for Cendio AB Copyright 2010-2011 Henrik Andersson <he...@ce...> for Cendio AB Modified: rdesktop/trunk/rdpsnd.c =================================================================== --- rdesktop/trunk/rdpsnd.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -3,7 +3,7 @@ Sound Channel Process Functions Copyright 2006-2010 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2009-2011 Peter Astrand <as...@ce...> for Cendio AB - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/rdpsnd_alsa.c =================================================================== --- rdesktop/trunk/rdpsnd_alsa.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd_alsa.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - alsa-driver - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright (C) Michael Gernoth mi...@ze... 2006-2008 Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB Modified: rdesktop/trunk/rdpsnd_libao.c =================================================================== --- rdesktop/trunk/rdpsnd_libao.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd_libao.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - libao-driver - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright (C) Michael Gernoth mi...@ze... 2005-2008 Modified: rdesktop/trunk/rdpsnd_oss.c =================================================================== --- rdesktop/trunk/rdpsnd_oss.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd_oss.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - Open Sound System - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB Modified: rdesktop/trunk/rdpsnd_sgi.c =================================================================== --- rdesktop/trunk/rdpsnd_sgi.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd_sgi.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - SGI/IRIX - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright (C) Jeremy Meng voi...@gm... 2004, 2005 Modified: rdesktop/trunk/rdpsnd_sun.c =================================================================== --- rdesktop/trunk/rdpsnd_sun.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/rdpsnd_sun.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - Sun - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright (C) GuoJunBo guo...@ic... 2003 Copyright (C) Michael Gernoth mi...@ze... 2003-2008 Copyright 2007-2008 Pierre Ossman <os...@ce...> for Cendio AB Modified: rdesktop/trunk/secure.c =================================================================== --- rdesktop/trunk/secure.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/secure.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP encryption and licensing - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/serial.c =================================================================== --- rdesktop/trunk/serial.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/serial.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 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 Modified: rdesktop/trunk/ssl.c =================================================================== --- rdesktop/trunk/ssl.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/ssl.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,8 +1,8 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Secure sockets abstraction layer - Copyright (C) Matthew Chapman 1999-2008 - Copyright (C) Jay Sorg 2006-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 + Copyright (C) Jay Sorg <j...@am...> 2006-2008 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 Modified: rdesktop/trunk/tcp.c =================================================================== --- rdesktop/trunk/tcp.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/tcp.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - TCP layer - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/xclip.c =================================================================== --- rdesktop/trunk/xclip.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/xclip.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Protocol services - Clipboard functions Copyright (C) Erik Forsberg <for...@ce...> 2003-2008 - Copyright (C) Matthew Chapman 2003-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 Copyright 2006-2011 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/xkeymap.c =================================================================== --- rdesktop/trunk/xkeymap.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/xkeymap.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. User interface services - X keyboard mapping - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) 2003-2008 Peter Astrand <as...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/xwin.c =================================================================== --- rdesktop/trunk/xwin.c 2011-04-13 10:53:05 UTC (rev 1614) +++ rdesktop/trunk/xwin.c 2011-04-13 11:13:04 UTC (rev 1615) @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. User interface services - X Window System - Copyright (C) Matthew Chapman 1999-2008 + Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright 2007-2008 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2002-2011 Peter Astrand <as...@ce...> for Cendio AB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-13 11:28:29
|
Revision: 1616 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1616&view=rev Author: astrand Date: 2011-04-13 11:28:19 +0000 (Wed, 13 Apr 2011) Log Message: ----------- Consistent formatting of emails in copyright headers. Modified Paths: -------------- rdesktop/trunk/rdpsnd.c rdesktop/trunk/rdpsnd_alsa.c rdesktop/trunk/rdpsnd_dsp.c rdesktop/trunk/rdpsnd_libao.c rdesktop/trunk/rdpsnd_oss.c rdesktop/trunk/rdpsnd_sgi.c rdesktop/trunk/rdpsnd_sun.c Modified: rdesktop/trunk/rdpsnd.c =================================================================== --- rdesktop/trunk/rdpsnd.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -4,7 +4,7 @@ Copyright 2006-2010 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2009-2011 Peter Astrand <as...@ce...> for Cendio AB Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 + Copyright (C) GuoJunBo <guo...@ic...> 2003 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 Modified: rdesktop/trunk/rdpsnd_alsa.c =================================================================== --- rdesktop/trunk/rdpsnd_alsa.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_alsa.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -2,8 +2,8 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - alsa-driver Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 - Copyright (C) Michael Gernoth mi...@ze... 2006-2008 + Copyright (C) GuoJunBo <guo...@ic...> 2003 + Copyright (C) Michael Gernoth <mi...@ze...> 2006-2008 Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB This program is free software: you can redistribute it and/or modify Modified: rdesktop/trunk/rdpsnd_dsp.c =================================================================== --- rdesktop/trunk/rdpsnd_dsp.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_dsp.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Sound DSP routines - Copyright (C) Michael Gernoth mi...@ze... 2006-2008 + Copyright (C) Michael Gernoth <mi...@ze...> 2006-2008 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 Modified: rdesktop/trunk/rdpsnd_libao.c =================================================================== --- rdesktop/trunk/rdpsnd_libao.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_libao.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -2,8 +2,8 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - libao-driver Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 - Copyright (C) Michael Gernoth mi...@ze... 2005-2008 + Copyright (C) GuoJunBo <guo...@ic...> 2003 + Copyright (C) Michael Gernoth <mi...@ze...> 2005-2008 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 Modified: rdesktop/trunk/rdpsnd_oss.c =================================================================== --- rdesktop/trunk/rdpsnd_oss.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_oss.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -2,7 +2,7 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - Open Sound System Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 + Copyright (C) GuoJunBo <guo...@ic...> 2003 Copyright 2006-2008 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2005-2011 Peter Astrand <as...@ce...> for Cendio AB Modified: rdesktop/trunk/rdpsnd_sgi.c =================================================================== --- rdesktop/trunk/rdpsnd_sgi.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_sgi.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -2,8 +2,8 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - SGI/IRIX Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 - Copyright (C) Jeremy Meng voi...@gm... 2004, 2005 + Copyright (C) GuoJunBo <guo...@ic...> 2003 + Copyright (C) Jeremy Meng <voi...@gm...> 2004-2005 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 Modified: rdesktop/trunk/rdpsnd_sun.c =================================================================== --- rdesktop/trunk/rdpsnd_sun.c 2011-04-13 11:13:04 UTC (rev 1615) +++ rdesktop/trunk/rdpsnd_sun.c 2011-04-13 11:28:19 UTC (rev 1616) @@ -2,8 +2,8 @@ rdesktop: A Remote Desktop Protocol client. Sound Channel Process Functions - Sun Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 2003-2008 - Copyright (C) GuoJunBo guo...@ic... 2003 - Copyright (C) Michael Gernoth mi...@ze... 2003-2008 + Copyright (C) GuoJunBo <guo...@ic...> 2003 + Copyright (C) Michael Gernoth <mi...@ze...> 2003-2008 Copyright 2007-2008 Pierre Ossman <os...@ce...> for Cendio AB Copyright 2008-2011 Peter Astrand <as...@ce...> for Cendio AB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-13 11:33:35
|
Revision: 1617 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1617&view=rev Author: astrand Date: 2011-04-13 11:33:22 +0000 (Wed, 13 Apr 2011) Log Message: ----------- Make it possible to automatically generate the AUTHORS file from the source code. This adds a few new developers to AUTHORS. In some cases, the email adress is also changed. Modified Paths: -------------- rdesktop/trunk/Makefile.in rdesktop/trunk/doc/AUTHORS Added Paths: ----------- rdesktop/trunk/genauthors Modified: rdesktop/trunk/Makefile.in =================================================================== --- rdesktop/trunk/Makefile.in 2011-04-13 11:28:19 UTC (rev 1616) +++ rdesktop/trunk/Makefile.in 2011-04-13 11:33:22 UTC (rev 1617) @@ -159,3 +159,6 @@ .c.o: $(CC) $(CFLAGS) -o $@ -c $< +.PHONY: +doc/AUTHORS: + ./genauthors *.c Modified: rdesktop/trunk/doc/AUTHORS =================================================================== --- rdesktop/trunk/doc/AUTHORS 2011-04-13 11:28:19 UTC (rev 1616) +++ rdesktop/trunk/doc/AUTHORS 2011-04-13 11:33:22 UTC (rev 1617) @@ -2,13 +2,19 @@ contributions to the code. If you have been unintentionally omitted please let one of the team members know. +Alexi Volkov <al...@my...> Erik Forsberg <for...@ce...> +GuoJunBo <guo...@ic...> +Henrik Andersson <he...@ce...> for Cendio AB Hugo Trippaers <sp...@is...> Jay Sorg <j...@am...> +Jeremy Meng <voi...@gm...> Jeroen Meijer <je...@ol...> -Matt Chapman <mat...@cs...> -Michael Gernoth <mi...@ge...> +Matrox Graphics Inc. +Matthew Chapman <matthewc.unsw.edu.au> +Michael Gernoth <mi...@ze...> Michal Mihalik <mmi...@sm...> Norbert Federa <no...@th...> +Peter Astrand <as...@ce...> for Cendio AB Peter Kallden <pet...@ub...> -Peter Åstrand <as...@ce...> +Pierre Ossman <os...@ce...> for Cendio AB Added: rdesktop/trunk/genauthors =================================================================== --- rdesktop/trunk/genauthors (rev 0) +++ rdesktop/trunk/genauthors 2011-04-13 11:33:22 UTC (rev 1617) @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# -*-mode: python; coding: utf-8 -*- + +import re +import sys + +# Filled in with historical authors which are not mentioned in the source +authors = { + "Hugo Trippaers <sp...@is...>": 1, + "Michal Mihalik <mmi...@sm...>": 1, + "Norbert Federa <no...@th...>": 1, + "Peter Kallden <pet...@ub...>": 1, + } + + +def dostatement(s): + # Get rid of (C) + s = re.sub('\(C\)', '', s).strip() + + # Get rid of years + s = re.sub('\d\d\d\d(-\d\d\d\d)?', '', s).strip() + + # Get rid of in-code statements + if s.find('"') != -1: + return + + global authors + authors[s] = 1 + + +def dofile(fname): + f = open(fname) + pt = re.compile('\sCopyright (.*)') + for line in f: + m = pt.search(line) + if m != None: + dostatement(m.group(1).strip()) + + +def main(): + for fname in sys.argv[1:]: + dofile(fname) + + print """This is an attempt at a list of people who have made significant +contributions to the code. If you have been unintentionally omitted +please let one of the team members know. +""" + + keys = authors.keys() + keys.sort() + for k in keys: + print k + + + + + +main() Property changes on: rdesktop/trunk/genauthors ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-18 07:28:41
|
Revision: 1621 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1621&view=rev Author: astrand Date: 2011-04-18 07:28:31 +0000 (Mon, 18 Apr 2011) Log Message: ----------- Use PACKAGE_VERSION from Autoconf instead of hardcoded VERSION define. Modified Paths: -------------- rdesktop/trunk/rdesktop.c rdesktop/trunk/rdesktop.h Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2011-04-14 14:05:32 UTC (rev 1620) +++ rdesktop/trunk/rdesktop.c 2011-04-18 07:28:31 UTC (rev 1621) @@ -135,7 +135,7 @@ usage(char *program) { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); - fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2008 Matthew Chapman.\n"); + fprintf(stderr, "Version " PACKAGE_VERSION ". Copyright (C) 1999-2008 Matthew Chapman.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); fprintf(stderr, "Usage: %s [options] server[:port]\n", program); Modified: rdesktop/trunk/rdesktop.h =================================================================== --- rdesktop/trunk/rdesktop.h 2011-04-14 14:05:32 UTC (rev 1620) +++ rdesktop/trunk/rdesktop.h 2011-04-18 07:28:31 UTC (rev 1621) @@ -41,8 +41,6 @@ #include <sysexits.h> #endif -#define VERSION "1.6.0" - /* standard exit codes */ #ifndef EX_OK #define EX_OK 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |