| | 1 | --- mars/venus/editors/jeditsyntax/DefaultInputHandler.java.orig 2013-03-07 17:51:06.000000000 +0100 |
| | 2 | +++ mars/venus/editors/jeditsyntax/DefaultInputHandler.java 2013-03-07 18:21:45.000000000 +0100 |
| | 3 | @@ -14,6 +14,7 @@ |
| | 4 | import java.awt.Toolkit; |
| | 5 | import java.util.Hashtable; |
| | 6 | import java.util.StringTokenizer; |
| | 7 | + import java.util.Properties; |
| | 8 | |
| | 9 | /** |
| | 10 | * The default input handler. It maps sequences of keystrokes into actions |
| | 11 | @@ -232,19 +233,45 @@ |
| | 12 | // matches KeyEvent.META_MASK. DPS 30-Nov-2010 |
| | 13 | if ((modifiers & KeyEvent.META_MASK) != 0) |
| | 14 | return; |
| | 15 | - // DPS 9-Jan-2013. Umberto Villano from Italy describes Alt combinations |
| | 16 | - // not working on Italian Mac keyboards, where # requires Alt (Option). |
| | 17 | - // This is preventing him from writing comments. Similar complaint from |
| | 18 | - // Joachim Parrow in Sweden, only for the $ character. Villano pointed |
| | 19 | - // me to this method. Plus a Google search on "jeditsyntax alt key" |
| | 20 | - // (without quotes) took me to |
| | 21 | - // http://compgroups.net/comp.lang.java.programmer/option-key-in-jedit-syntax-package/1068227 |
| | 22 | - // which says to comment out the second condition in this IF statement: |
| | 23 | - // if(c != KeyEvent.CHAR_UNDEFINED && (modifiers & KeyEvent.ALT_MASK) == 0) |
| | 24 | - // So let's give it a try! |
| | 25 | - // (...later) Bummer, it results in keystroke echoed into editing area when I use Alt |
| | 26 | - // combination for shortcut menu access (e.g. Alt+f to open the File menu). |
| | 27 | - if(c != KeyEvent.CHAR_UNDEFINED && (modifiers & KeyEvent.ALT_MASK) == 0) |
| | 28 | + // DPS 9-Jan-2013. Umberto Villano from Italy describes Alt combinations |
| | 29 | + // not working on Italian Mac keyboards, where # requires Alt (Option). |
| | 30 | + // This is preventing him from writing comments. Similar complaint from |
| | 31 | + // Joachim Parrow in Sweden, only for the $ character. Villano pointed |
| | 32 | + // me to this method. Plus a Google search on "jeditsyntax alt key" |
| | 33 | + // (without quotes) took me to |
| | 34 | + // http://compgroups.net/comp.lang.java.programmer/option-key-in-jedit-syntax-package/1068227 |
| | 35 | + // which says to comment out the second condition in this IF statement: |
| | 36 | + // if(c != KeyEvent.CHAR_UNDEFINED && (modifiers & KeyEvent.ALT_MASK) == 0) |
| | 37 | + // So let's give it a try! |
| | 38 | + // (...later) Bummer, it results in keystroke echoed into editing area when I use Alt |
| | 39 | + // combination for shortcut menu access (e.g. Alt+f to open the File menu). |
| | 40 | + // |
| | 41 | + // Torsten Maehne: This is a shortcoming of the menu |
| | 42 | + // shortcuts handling in the jedit component: It assumes that |
| | 43 | + // modifier keys are the same across all platforms. However, |
| | 44 | + // the menu shortcut keymask varies between OS X and |
| | 45 | + // Windows/Linux, it is Cmd + <key> instead of Alt + |
| | 46 | + // <key>. The "Java Development Guide for Mac" explicitly |
| | 47 | + // discusses the issue in: |
| | 48 | + // <https://developer.apple.com/library/mac/#documentation/Java/Conceptual/Java14Development/07-NativePlatformIntegration/NativePlatformIntegration.html#//apple_ref/doc/uid/TP40001909-211884-TPXREF130> |
| | 49 | + // |
| | 50 | + // As jedit always considers Alt + <key> as a keyboard |
| | 51 | + // shortcut, they block their output in the editor, which |
| | 52 | + // prevents the entry of special characters on OS X that uses |
| | 53 | + // Alt + <key> for this purpose instead of AltGr + <key>, as |
| | 54 | + // on Windows or Linux. |
| | 55 | + // |
| | 56 | + // For the latest jedit version (5.0.0), the menu |
| | 57 | + // accelerators don't work on OS X, at least the special |
| | 58 | + // characters can be entered using Alt + <key>. The issue is |
| | 59 | + // still open, but there seems to be progress: |
| | 60 | + // |
| | 61 | + // http://sourceforge.net/tracker/index.php?func=detail&aid=3558572&group_id=588&atid=300588 |
| | 62 | + // http://sourceforge.net/tracker/?func=detail&atid=300588&aid=3604532&group_id=588 |
| | 63 | + // |
| | 64 | + // Until this is resolved upstream, don't ignore characters |
| | 65 | + // on OS X, which have been entered with the ALT modifier: |
| | 66 | + if(c != KeyEvent.CHAR_UNDEFINED && (((modifiers & KeyEvent.ALT_MASK) == 0) || System.getProperty("os.name").contains("OS X"))) |
| | 67 | { |
| | 68 | if(c >= 0x20 && c != 0x7f) |
| | 69 | { |
