[prev in list] [next in list] [prev in thread] [next in thread]
List: tigervnc-commits
Subject: [Tigervnc-commits] SF.net SVN: tigervnc:[5040] trunk/java/com/tigervnc/vncviewer
From: bphinz () users ! sourceforge ! net
Date: 2013-02-09 2:42:14
Message-ID: E1U40OM-00077T-Sc () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 5040
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5040&view=rev
Author: bphinz
Date: 2013-02-09 02:42:14 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Sending menu key from F8 menu was sending the keycode instead of the keysym.
Modified Paths:
--------------
trunk/java/com/tigervnc/vncviewer/F8Menu.java
trunk/java/com/tigervnc/vncviewer/MenuKey.java
Modified: trunk/java/com/tigervnc/vncviewer/F8Menu.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/F8Menu.java 2013-02-09 02:19:05 UTC (rev 5039)
+++ trunk/java/com/tigervnc/vncviewer/F8Menu.java 2013-02-09 02:42:14 UTC (rev 5040)
@@ -103,8 +103,8 @@
} else if (actionMatch(ev, clipboard)) {
cc.clipboardDialog.showDialog(cc.viewport);
} else if (actionMatch(ev, f8)) {
- cc.writeKeyEvent(cc.menuKeyCode, true);
- cc.writeKeyEvent(cc.menuKeyCode, false);
+ cc.writeKeyEvent(MenuKey.getMenuKeySym(), true);
+ cc.writeKeyEvent(MenuKey.getMenuKeySym(), false);
} else if (actionMatch(ev, ctrlAltDel)) {
cc.writeKeyEvent(Keysyms.Control_L, true);
cc.writeKeyEvent(Keysyms.Alt_L, true);
Modified: trunk/java/com/tigervnc/vncviewer/MenuKey.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/MenuKey.java 2013-02-09 02:19:05 UTC (rev 5039)
+++ trunk/java/com/tigervnc/vncviewer/MenuKey.java 2013-02-09 02:42:14 UTC (rev 5040)
@@ -27,36 +27,39 @@
public class MenuKey
{
static class MenuKeySymbol {
- public MenuKeySymbol(String name_, int keycode_) {
+ public MenuKeySymbol(String name_, int keycode_, int keysym_) {
name = name_;
keycode = keycode_;
+ keysym = keysym_;
}
String name;
int keycode;
+ int keysym;
}
private static final MenuKeySymbol[] menuSymbols = {
- new MenuKeySymbol("F1", KeyEvent.VK_F1),
- new MenuKeySymbol("F2", KeyEvent.VK_F2),
- new MenuKeySymbol("F3", KeyEvent.VK_F3),
- new MenuKeySymbol("F4", KeyEvent.VK_F4),
- new MenuKeySymbol("F5", KeyEvent.VK_F5),
- new MenuKeySymbol("F6", KeyEvent.VK_F6),
- new MenuKeySymbol("F7", KeyEvent.VK_F7),
- new MenuKeySymbol("F8", KeyEvent.VK_F8),
- new MenuKeySymbol("F9", KeyEvent.VK_F9),
- new MenuKeySymbol("F10", KeyEvent.VK_F10),
- new MenuKeySymbol("F11", KeyEvent.VK_F11),
- new MenuKeySymbol("F12", KeyEvent.VK_F12),
- new MenuKeySymbol("Pause", KeyEvent.VK_PAUSE),
- new MenuKeySymbol("Print", KeyEvent.VK_PRINTSCREEN),
- new MenuKeySymbol("Scroll_Lock", KeyEvent.VK_SCROLL_LOCK),
- new MenuKeySymbol("Escape", KeyEvent.VK_ESCAPE),
- new MenuKeySymbol("Insert", KeyEvent.VK_INSERT),
- new MenuKeySymbol("Delete", KeyEvent.VK_DELETE),
- new MenuKeySymbol("Home", KeyEvent.VK_HOME),
- new MenuKeySymbol("Page_Up", KeyEvent.VK_PAGE_UP),
- new MenuKeySymbol("Page_Down", KeyEvent.VK_PAGE_DOWN)
+ new MenuKeySymbol("F1", KeyEvent.VK_F1, Keysyms.F1),
+ new MenuKeySymbol("F2", KeyEvent.VK_F2, Keysyms.F2),
+ new MenuKeySymbol("F3", KeyEvent.VK_F3, Keysyms.F3),
+ new MenuKeySymbol("F4", KeyEvent.VK_F4, Keysyms.F4),
+ new MenuKeySymbol("F5", KeyEvent.VK_F5, Keysyms.F5),
+ new MenuKeySymbol("F6", KeyEvent.VK_F6, Keysyms.F6),
+ new MenuKeySymbol("F7", KeyEvent.VK_F7, Keysyms.F7),
+ new MenuKeySymbol("F8", KeyEvent.VK_F8, Keysyms.F8),
+ new MenuKeySymbol("F9", KeyEvent.VK_F9, Keysyms.F9),
+ new MenuKeySymbol("F10", KeyEvent.VK_F10, Keysyms.F10),
+ new MenuKeySymbol("F11", KeyEvent.VK_F11, Keysyms.F11),
+ new MenuKeySymbol("F12", KeyEvent.VK_F12, Keysyms.F12),
+ new MenuKeySymbol("Pause", KeyEvent.VK_PAUSE, Keysyms.Pause),
+ new MenuKeySymbol("Print", KeyEvent.VK_PRINTSCREEN, Keysyms.Print),
+ new MenuKeySymbol("Scroll_Lock", KeyEvent.VK_SCROLL_LOCK,
+ Keysyms.Scroll_Lock),
+ new MenuKeySymbol("Escape", KeyEvent.VK_ESCAPE, Keysyms.Escape),
+ new MenuKeySymbol("Insert", KeyEvent.VK_INSERT, Keysyms.Insert),
+ new MenuKeySymbol("Delete", KeyEvent.VK_DELETE, Keysyms.Delete),
+ new MenuKeySymbol("Home", KeyEvent.VK_HOME, Keysyms.Home),
+ new MenuKeySymbol("Page_Up", KeyEvent.VK_PAGE_UP, Keysyms.Page_Up),
+ new MenuKeySymbol("Page_Down", KeyEvent.VK_PAGE_DOWN, Keysyms.Page_Down)
};
static int getMenuKeySymbolCount() {
@@ -90,4 +93,17 @@
return menuKeyCode;
}
+ static int getMenuKeySym() {
+ int menuKeySym = Keysyms.F8;
+
+ @SuppressWarnings({"static"})
+ String menuKeyStr =
+ Configuration.global().getParam("menuKey").getValueStr();
+ for(int i = 0; i < getMenuKeySymbolCount(); i++)
+ if (menuSymbols[i].name.equals(menuKeyStr))
+ menuKeySym = menuSymbols[i].keysym;
+
+ return menuKeySym;
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic