diff options
| author | Martin Koegler <mkoegler@auto.tuwien.ac.at> | 2011-09-04 07:04:43 +0000 |
|---|---|---|
| committer | Martin Koegler <mkoegler@auto.tuwien.ac.at> | 2011-09-04 07:04:43 +0000 |
| commit | 498ef46cc28bb8a74b1d59f347294da1f5c57143 (patch) | |
| tree | e9f6740ba00e1538a1adeeedc53257edc21c3b41 /vncviewer/Viewport.cxx | |
| parent | 76745f1ef5868c4ca51964342ffe695cd95614bd (diff) | |
| download | tigervnc-498ef46cc28bb8a74b1d59f347294da1f5c57143.tar.gz tigervnc-498ef46cc28bb8a74b1d59f347294da1f5c57143.zip | |
Support other keys than F8 as menu key
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4665 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer/Viewport.cxx')
| -rw-r--r-- | vncviewer/Viewport.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx index 72de8e88..052b593b 100644 --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx @@ -46,6 +46,7 @@ #include "fltk_layout.h" #include "parameters.h" #include "keysym2ucs.h" +#include "menukey.h" #include "vncviewer.h" #include <FL/fl_draw.H> @@ -938,16 +939,7 @@ void Viewport::popupContextMenu() void Viewport::setMenuKey() { - const char *menuKeyStr; - - menuKeyCode = 0; - - menuKeyStr = menuKey; - if (menuKeyStr[0] == 'F') { - int num = atoi(menuKeyStr + 1); - if ((num >= 1) && (num <= 12)) - menuKeyCode = FL_F + num; - } + menuKeyCode = getMenuKeyCode(); // Need to repopulate the context menu as it contains references to // the menu key |