Make sure the mouse pointer is always the standard arrow for the popup menu.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4831 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index fb19fa72128f605b063952c094d26228a891c1e1..e29e375629e7e3c9d36f062b767552d16e978511 100644 (file)
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -887,7 +887,18 @@ void Viewport::popupContextMenu()
   // initialize context menu before display
   initContextMenu();
 
+#ifdef HAVE_FLTK_CURSOR
+  if (Fl::belowmouse() == this)
+    window()->cursor(FL_CURSOR_DEFAULT);
+#endif
+
   m = contextMenu->popup();
+
+#ifdef HAVE_FLTK_CURSOR
+  if (Fl::belowmouse() == this)
+    window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y);
+#endif
+
   if (m == NULL)
     return;