author | wenzelm |
Sat, 01 Dec 2012 22:23:42 +0100 | |
changeset 50307 | 6f64ce2e5a40 |
parent 50306 | b655d2d0406d |
child 50727 | 76ae4e6318fb |
permissions | -rw-r--r-- |
50306 | 1 |
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java |
2 |
--- 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java 2012-11-17 16:42:29.000000000 +0100 |
|
3 |
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java 2012-12-01 17:32:47.000000000 +0100 |
|
4 |
@@ -318,6 +318,10 @@ |
|
48786 | 5 |
{ |
50306 | 6 |
os = WINDOWS_NT; |
48786 | 7 |
} |
8 |
+ else if(osName.contains("Mac OS X")) |
|
9 |
+ { |
|
10 |
+ os = MAC_OS_X; |
|
11 |
+ } |
|
12 |
else if(osName.contains("VMS")) |
|
13 |
{ |
|
14 |
os = VMS; |
|
50306 | 15 |
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java |
16 |
--- 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java 2012-11-17 16:42:29.000000000 +0100 |
|
50307
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
17 |
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java 2012-12-01 21:55:48.000000000 +0100 |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
18 |
@@ -109,6 +109,7 @@ |
48787
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
19 |
* used to handle a modifier key press in conjunction with an alphabet |
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
20 |
* key. <b>On by default on MacOS.</b> |
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
21 |
*/ |
50307
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
22 |
+ public static boolean ALTERNATIVE_DISPATCHER0 = false; |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
23 |
public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS(); |
48787
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
24 |
|
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
25 |
/** |
50307
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
26 |
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/gui/KeyEventTranslator.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/KeyEventTranslator.java |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
27 |
--- 5.0.0/jEdit/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2012-11-17 16:41:58.000000000 +0100 |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
28 |
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2012-12-01 21:56:04.000000000 +0100 |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
29 |
@@ -79,7 +79,7 @@ |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
30 |
|| (keyCode >= KeyEvent.VK_A |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
31 |
&& keyCode <= KeyEvent.VK_Z)) |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
32 |
{ |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
33 |
- if(Debug.ALTERNATIVE_DISPATCHER) |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
34 |
+ if(Debug.ALTERNATIVE_DISPATCHER0) |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
35 |
return null; |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
36 |
else |
6f64ce2e5a40
leave ALTERNATIVE_DISPATCHER mostly enabled on Mac OS X, to get events for COMMAND/Meta combinations, which seem to produce only KEY_PRESSED in Java 7, not KEY_TYPED as in Java 6;
wenzelm
parents:
50306
diff
changeset
|
37 |
{ |
48786 | 38 |