aboutsummaryrefslogtreecommitdiffstats
path: root/vncviewer/Viewport.cxx
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2012-01-05 12:32:03 +0000
committerPierre Ossman <ossman@cendio.se>2012-01-05 12:32:03 +0000
commitbfbdb10958a0f8b3f4ea12cb4b99398bbdaa0601 (patch)
tree7263c0cf968e32451f9f451b0d17862d89161678 /vncviewer/Viewport.cxx
parent9462d6f3d29eceb3d7565b7a4c1d11d8b1a5eb2d (diff)
downloadtigervnc-bfbdb10958a0f8b3f4ea12cb4b99398bbdaa0601.tar.gz
tigervnc-bfbdb10958a0f8b3f4ea12cb4b99398bbdaa0601.zip
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
Diffstat (limited to 'vncviewer/Viewport.cxx')
-rw-r--r--vncviewer/Viewport.cxx11
1 files changed, 11 insertions, 0 deletions
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;