From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 5 Jan 2012 12:32:03 +0000 (+0000)
Subject: Make sure the mouse pointer is always the standard arrow for the popup menu.
X-Git-Tag: v1.2.0~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bfbdb10958a0f8b3f4ea12cb4b99398bbdaa0601;p=tigervnc.git

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 fb19fa72..e29e3756 100644
--- 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;