2 files changed, 18 insertions, 6 deletions

diff --git a/vnc.c b/vnc.c
index b965121..b9adad2 100644
--- a/vnc.c
+++ b/vnc.c
@@ -392,10 +392,18 @@ static gboolean button_cb(GtkWidget *widget, GdkEventButton *event,
 			  gpointer data)
 {
     struct vnc_window *vnc = data;
-
-    if (vnc->debug)
-	fprintf(stderr,"%s: called\n", __FUNCTION__);
-    SendPointerEvent(vnc->client, event->x, event->y, event->state);
+    int rfbstate = 0;
+
+    if (event->state & Button1Mask)
+	rfbstate |= rfbButton1Mask;
+    if (event->state & Button2Mask)
+	rfbstate |= rfbButton2Mask;
+    if (event->state & Button3Mask)
+	rfbstate |= rfbButton4Mask;
+    if (1 || vnc->debug)
+	fprintf(stderr,"%s: +%lf+%lf x11state 0x%x rfbstate 0x%x\n", __FUNCTION__,
+		event->x, event->y, event->state, rfbstate);
+    SendPointerEvent(vnc->client, event->x, event->y, rfbstate);
     return TRUE;
 }
 
diff --git a/xd_view.c b/xd_view.c
index 5fae256..61a8bc5 100644
--- a/xd_view.c
+++ b/xd_view.c
@@ -393,6 +393,9 @@ static const GtkActionEntry entries[] = {
 	.name        = "FileMenu",
 	.label       = "_File",
     },{
+	.name        = "ConnectMenu",
+	.label       = "_Connect",
+    },{
 	.name        = "DomainMenu",
 	.label       = "_Domain",
     },{
@@ -479,10 +482,11 @@ static char ui_xml[] =
 "    <menu action='FileMenu'>"
 "      <menuitem action='Quit'/>"
 "    </menu>"
-"    <menu action='DomainMenu'>"
+"    <menu action='ConnectMenu'>"
 "      <menuitem action='OpenVNC'/>"
 "      <menuitem action='OpenConsole'/>"
-"      <separator/>"
+"    </menu>"
+"    <menu action='DomainMenu'>"
 "      <menuitem action='DomainPause'/>"
 "      <menuitem action='DomainUnpause'/>"
 "      <menuitem action='DomainReboot'/>"