commit bfbdb10958a0f8b3f4ea12cb4b99398bbdaa0601
author Pierre Ossman <ossman@cendio.se> Thu Jan 05 12:32:03 2012 +0000
committer Pierre Ossman <ossman@cendio.se> Thu Jan 05 12:32:03 2012 +0000
tree 7263c0cf968e32451f9f451b0d17862d89161678
parent 9462d6f3d29eceb3d7565b7a4c1d11d8b1a5eb2d

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

vncviewer/Viewport.cxx

diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index fb19fa7..e29e375 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -887,7 +887,18 @@
   // 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;