Attachment 305931 Details for Bug 436454 – The same as the previous patch with an update to the man page, too

[patch] The same as the previous patch with an update to the man page, too

rdesktop-mouse-buttons.patch (text/plain), 2.73 KB, created by Fred New on 2008-05-19 11:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fred New

Created: 2008-05-19 11:47:04 UTC

Size: 2.73 KB

patch

obsolete

>diff -uNr rdesktop-1.6.0/rdesktop.c rdesktop-1.6.0a/rdesktop.c
>--- rdesktop-1.6.0/rdesktop.c	2008-04-05 08:22:26.000000000 +0300
>+++ rdesktop-1.6.0a/rdesktop.c	2008-05-19 13:35:37.000000000 +0300
>@@ -102,6 +102,7 @@
> char g_redirect_username[64];
> char g_redirect_cookie[128];
> uint32 g_redirect_flags = 0;
>+RD_BOOL g_lefthanded = False;
> 
> #ifdef WITH_RDPSND
> RD_BOOL g_rdpsnd = False;
>@@ -153,6 +154,7 @@
> 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
> 	fprintf(stderr, "   -E: disable encryption from client to server\n");
> 	fprintf(stderr, "   -m: do not send motion events\n");
>+	fprintf(stderr, "   -l: left handed mouse\n");
> 	fprintf(stderr, "   -C: use private colour map\n");
> 	fprintf(stderr, "   -D: hide window manager decorations\n");
> 	fprintf(stderr, "   -K: keep window manager key bindings\n");
>@@ -450,7 +452,7 @@
> #endif
> 
> 	while ((c = getopt(argc, argv,
>-			   VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
>+			   VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEmlzCDKS:T:NX:a:x:Pr:045h?")) != -1)
> 	{
> 		switch (c)
> 		{
>@@ -588,6 +590,10 @@
> 				g_sendmotion = False;
> 				break;
> 
>+			case 'l':
>+				g_lefthanded = True;
>+				break;
>+
> 			case 'C':
> 				g_owncolmap = True;
> 				break;
>diff -uNr rdesktop-1.6.0/xkeymap.c rdesktop-1.6.0a/xkeymap.c
>--- rdesktop-1.6.0/xkeymap.c	2007-10-08 15:34:05.000000000 +0300
>+++ rdesktop-1.6.0a/xkeymap.c	2008-05-19 13:35:58.000000000 +0300
>@@ -49,6 +49,7 @@
> extern RD_BOOL g_enable_compose;
> extern RD_BOOL g_use_rdp5;
> extern RD_BOOL g_numlock_sync;
>+extern RD_BOOL g_lefthanded;
> 
> static RD_BOOL keymap_loaded;
> static key_translation *keymap[KEYMAP_SIZE];
>@@ -750,11 +751,13 @@
> 	switch (button)
> 	{
> 		case Button1:	/* left */
>-			return MOUSE_FLAG_BUTTON1;
>+			return g_lefthanded
>+				? MOUSE_FLAG_BUTTON2 : MOUSE_FLAG_BUTTON1;
> 		case Button2:	/* middle */
> 			return MOUSE_FLAG_BUTTON3;
> 		case Button3:	/* right */
>-			return MOUSE_FLAG_BUTTON2;
>+			return g_lefthanded
>+				? MOUSE_FLAG_BUTTON1 : MOUSE_FLAG_BUTTON2;
> 		case Button4:	/* wheel up */
> 			return MOUSE_FLAG_BUTTON4;
> 		case Button5:	/* wheel down */
>diff -uNr rdesktop-1.6.0/doc/rdesktop.1 rdesktop-1.6.0a/doc/rdesktop.1
>--- rdesktop-1.6.0/doc/rdesktop.1	2007-01-19 15:47:35.000000000 +0200
>+++ rdesktop-1.6.0a/doc/rdesktop.1	2008-05-19 14:27:50.000000000 +0300
>@@ -98,6 +98,10 @@
> Disable encryption from client to server.  This sends an encrypted login packet,
> but everything after this is unencrypted (including interactive logins).
> .TP
>+.BR "-l"
>+Switch mouse buttons.  Useful if you have configured a left-handed mouse on
>+the remote system and your local desktop has a right-handed mouse.
>+.TP
> .BR "-m"
> Do not send mouse motion events.  This saves bandwidth, although some Windows
> applications may rely on receiving mouse motion.

Actions: View | Diff

Attachments on bug 436454: 297167 | 305926 | 305931