--- sourceforge.net/trunk/rdesktop/xwin.c	2003/02/18 13:44:27	331
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/02/18 13:51:43	332
@@ -858,12 +858,9 @@
 				/* If win_button_size is nonzero, enable single app mode */
 				if (xevent.xbutton.y < win_button_size)
 				{
-					if (xevent.xbutton.x < win_button_size)
-					{
-						/* The system menu, do not send to server */
-						break;
-					}
-					else if (xevent.xbutton.x >= width - win_button_size)
+					/* Check from right to left: */
+
+					if (xevent.xbutton.x >= width - win_button_size)
 					{
 						/* The close button, continue */
 						;
@@ -883,6 +880,13 @@
 							       DefaultScreen(display));
 						break;
 					}
+					else
+					{
+						/* Ignore clicks to the rest of the border. This includes 
+						   the system menu, but also inhibits double clicks on the 
+						   border itself. */
+						break;
+					}
 				}
 
 				rdp_send_input(time(NULL), RDP_INPUT_MOUSE,