Adds support for setting the menu key via cmd line arg. Adds all menu keys supported by native viewer to the combo box in the OptionsDialog.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4914 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/com/tigervnc/vncviewer/F8Menu.java b/java/com/tigervnc/vncviewer/F8Menu.java
index 6a06786..ca09ac2 100644
--- a/java/com/tigervnc/vncviewer/F8Menu.java
+++ b/java/com/tigervnc/vncviewer/F8Menu.java
@@ -51,7 +51,7 @@
addSeparator();
clipboard = addMenuItem("Clipboard...");
addSeparator();
- f8 = addMenuItem("Send F"+(cc.menuKey-Keysyms.F1+1));
+ f8 = addMenuItem("Send "+KeyEvent.getKeyText(menukey.getMenuKeyCode()), menukey.getMenuKeyCode());
ctrlAltDel = addMenuItem("Send Ctrl-Alt-Del");
addSeparator();
refresh = addMenuItem("Refresh Screen", KeyEvent.VK_H);
@@ -100,8 +100,8 @@
} else if (actionMatch(ev, clipboard)) {
cc.clipboardDialog.showDialog(cc.viewport);
} else if (actionMatch(ev, f8)) {
- cc.writeKeyEvent(cc.menuKey, true);
- cc.writeKeyEvent(cc.menuKey, false);
+ cc.writeKeyEvent(cc.menuKeyCode, true);
+ cc.writeKeyEvent(cc.menuKeyCode, false);
} else if (actionMatch(ev, ctrlAltDel)) {
cc.writeKeyEvent(Keysyms.Control_L, true);
cc.writeKeyEvent(Keysyms.Alt_L, true);