From 0f0cf43e6e7ddcedafd10850b6bba99041bad0a6 Mon Sep 17 00:00:00 2001
From: sibel <lesibel at free dot fr>
Date: Mon, 20 Sep 2010 16:08:12 +0200
Subject: maj de rdesktop#1.6.0-2

---
 extra/rdesktop/.md5sum                             |  1 +
 extra/rdesktop/Pkgfile                             |  9 ++-
 extra/rdesktop/rdesktop-send_physical_buttons.diff | 70 ++++++++++++++++++++++
 3 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 extra/rdesktop/rdesktop-send_physical_buttons.diff

diff --git a/extra/rdesktop/.md5sum b/extra/rdesktop/.md5sum
index aa67a8401..cdeba13dc 100644
--- a/extra/rdesktop/.md5sum
+++ b/extra/rdesktop/.md5sum
@@ -1 +1,2 @@
 c6fcbed7f0ad7e60ac5fcb2d324d8b16  rdesktop-1.6.0.tar.gz
+880d3aeac67b901e6bf44d1323374768  rdesktop-send_physical_buttons.diff
diff --git a/extra/rdesktop/Pkgfile b/extra/rdesktop/Pkgfile
index 9738a3668..32626a1ee 100755
--- a/extra/rdesktop/Pkgfile
+++ b/extra/rdesktop/Pkgfile
@@ -2,15 +2,18 @@
 # URL: http://www.rdesktop.org/
 # Maintainer: NutyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg-libx11, libao, libsamplerate
+# Depends on: xorg-libx11, libao, libsamplerate, openssli
 
 name=rdesktop
 version=1.6.0
-release=1
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
+release=2
+source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz
+	rdesktop-send_physical_buttons.diff)
 
 build() {
 	cd $name-$version
+	 patch -i $SRC/rdesktop-send_physical_buttons.diff 
+
         ./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff
new file mode 100644
index 000000000..8e0f6cee7
--- /dev/null
+++ b/extra/rdesktop/rdesktop-send_physical_buttons.diff
@@ -0,0 +1,70 @@
+? aclocal.m4
+Index: rdesktop.c
+===================================================================
+RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
+retrieving revision 1.163
+diff -u -r1.163 rdesktop.c
+--- rdesktop.c	5 Apr 2008 06:15:45 -0000	1.163
++++ rdesktop.c	5 Aug 2008 11:46:04 -0000
+@@ -73,6 +73,7 @@
+ int g_win_button_size = 0;	/* If zero, disable single app mode */
+ RD_BOOL g_bitmap_compression = True;
+ RD_BOOL g_sendmotion = True;
++RD_BOOL g_send_physical_buttons = True;
+ RD_BOOL g_bitmap_cache = True;
+ RD_BOOL g_bitmap_cache_persist_enable = False;
+ RD_BOOL g_bitmap_cache_precache = True;
+@@ -152,6 +153,7 @@
+ 	fprintf(stderr, "   -B: use BackingStore of X-server (if available)\n");
+ 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
+ 	fprintf(stderr, "   -E: disable encryption from client to server\n");
++	fprintf(stderr, "   -M: do not map logical mouse buttons to physical\n");
+ 	fprintf(stderr, "   -m: do not send motion events\n");
+ 	fprintf(stderr, "   -C: use private colour map\n");
+ 	fprintf(stderr, "   -D: hide window manager decorations\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:fbBeEMmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
+ 	{
+ 		switch (c)
+ 		{
+@@ -584,6 +586,9 @@
+ 			case 'E':
+ 				g_packet_encryption = False;
+ 				break;
++			case 'M':
++				g_send_physical_buttons = False;
++				break;
+ 			case 'm':
+ 				g_sendmotion = False;
+ 				break;
+Index: xwin.c
+===================================================================
+RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
+retrieving revision 1.235
+diff -u -r1.235 xwin.c
+--- xwin.c	11 Jul 2008 03:51:23 -0000	1.235
++++ xwin.c	5 Aug 2008 11:46:06 -0000
+@@ -36,6 +36,7 @@
+ extern int g_ypos;
+ extern int g_pos;
+ extern RD_BOOL g_sendmotion;
++extern RD_BOOL g_send_physical_buttons;
+ extern RD_BOOL g_fullscreen;
+ extern RD_BOOL g_grab_keyboard;
+ extern RD_BOOL g_hide_decorations;
+@@ -2190,7 +2191,8 @@
+ 	   receive physical buttons (true in mstsc as well) and
+ 	   logical button behavior depends on the remote desktop's own
+ 	   mouse settings */
+-	xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
++	if (g_send_physical_buttons)
++		xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
+ 	button = xkeymap_translate_button(xevent.xbutton.button);
+ 	if (button == 0)
+ 		return;
+
+ 	  	 
-- 
cgit v1.2.3-70-g09d2