author | dmarkov |
Tue, 16 Aug 2016 11:13:46 +0300 | |
changeset 40446 | cf666940a804 |
parent 39018 | df734f00b30a |
child 42735 | d9e129a783ab |
permissions | -rw-r--r-- |
12047 | 1 |
/* |
23624
863a7441b898
8036757: [macosx] Space menu accelerator not rendered correctly
pchelko
parents:
19365
diff
changeset
|
2 |
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
12047 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
#import <JavaNativeFoundation/JavaNativeFoundation.h> |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
27 |
#include <Carbon/Carbon.h> |
12047 | 28 |
#import "CMenuItem.h" |
29 |
#import "CMenu.h" |
|
30 |
#import "AWTEvent.h" |
|
31 |
#import "ThreadUtilities.h" |
|
32 |
||
33 |
#import "java_awt_Event.h" |
|
34 |
#import "java_awt_event_KeyEvent.h" |
|
35 |
#import "sun_lwawt_macosx_CMenuItem.h" |
|
36 |
||
37 |
#define NOT_A_CHECKBOXMENU -2 |
|
38 |
||
39 |
||
40 |
@implementation CMenuItem |
|
41 |
||
42 |
- (id) initWithPeer:(jobject)peer asSeparator: (NSNumber *) asSeparator{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
43 |
AWT_ASSERT_APPKIT_THREAD; |
12047 | 44 |
self = [super initWithPeer:peer]; |
45 |
if (self) { |
|
46 |
if ([asSeparator boolValue]) { |
|
47 |
fMenuItem = (NSMenuItem*)[NSMenuItem separatorItem]; |
|
48 |
[fMenuItem retain]; |
|
49 |
} else { |
|
50 |
fMenuItem = [[NSMenuItem alloc] init]; |
|
51 |
[fMenuItem setAction:@selector(handleAction:)]; |
|
52 |
[fMenuItem setTarget:self]; |
|
53 |
} |
|
54 |
fIsCheckbox = NO; |
|
55 |
fIsEnabled = YES; |
|
56 |
} |
|
57 |
return self; |
|
58 |
} |
|
59 |
||
60 |
// This is because NSApplication doesn't check the target's window when sending |
|
61 |
// actions; they only check the target itself. We always return YES, |
|
62 |
// since we shouldn't even be installed unless our window is active. |
|
63 |
- (BOOL) worksWhenModal { |
|
64 |
return YES; |
|
65 |
} |
|
39018
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
66 |
|
12047 | 67 |
// Events |
68 |
- (void)handleAction:(NSMenuItem *)sender { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
69 |
AWT_ASSERT_APPKIT_THREAD; |
12047 | 70 |
JNIEnv *env = [ThreadUtilities getJNIEnv]; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
71 |
JNF_COCOA_ENTER(env); |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
72 |
|
19022
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
73 |
// If we are called as a result of user pressing a shortcut, do nothing, |
17144
0c7842966236
8008366: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
leonidr
parents:
15985
diff
changeset
|
74 |
// because AVTView has already sent corresponding key event to the Java |
19022
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
75 |
// layer from performKeyEquivalent. |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
76 |
// There is an exception from the rule above, though: if a window with |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
77 |
// a menu gets minimized by user and there are no other windows to take |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
78 |
// focus, the window's menu won't be removed from the global menu bar. |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
79 |
// However, the Java layer won't handle invocation by a shortcut coming |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
80 |
// from this "frameless" menu, because there are no active windows. This |
4d36c6935abb
8007267: [macosx] com.apple.eawt.Application.setDefaultMenuBar is not working
leonidr
parents:
18756
diff
changeset
|
81 |
// means we have to handle it here. |
13781
bf3d53b1fba7
7160951: ActionListener called twice for JMenuItem using ScreenMenuBar
leonidr
parents:
12283
diff
changeset
|
82 |
NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent]; |
12047 | 83 |
if (fIsCheckbox) { |
84 |
static JNF_CLASS_CACHE(jc_CCheckboxMenuItem, "sun/lwawt/macosx/CCheckboxMenuItem"); |
|
85 |
static JNF_MEMBER_CACHE(jm_ckHandleAction, jc_CCheckboxMenuItem, "handleAction", "(Z)V"); |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
86 |
|
12047 | 87 |
// Send the opposite of what's currently checked -- the action |
88 |
// indicates what state we're going to. |
|
89 |
NSInteger state = [sender state]; |
|
90 |
jboolean newState = (state == NSOnState ? JNI_FALSE : JNI_TRUE); |
|
91 |
JNFCallVoidMethod(env, fPeer, jm_ckHandleAction, newState); |
|
38384
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
92 |
} |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
93 |
else { |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
94 |
if ([currEvent type] == NSKeyDown) { |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
95 |
// Event available through sender variable hence NSApplication |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
96 |
// not needed for checking the keyboard input sans the modifier keys |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
97 |
// Also, the method used to fetch eventKey earlier would be locale dependent |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
98 |
// With earlier implementation, if MenuKey: e EventKey: ा ; if input method |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
99 |
// is not U.S. (Devanagari in this case) |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
100 |
// With current implementation, EventKey = MenuKey = e irrespective of |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
101 |
// input method |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
102 |
NSString *eventKey = [sender keyEquivalent]; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
103 |
// Apple uses characters from private Unicode range for some of the |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
104 |
// keys, so we need to do the same translation here that we do |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
105 |
// for the regular key down events |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
106 |
if ([eventKey length] == 1) { |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
107 |
unichar origChar = [eventKey characterAtIndex:0]; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
108 |
unichar newChar = NsCharToJavaChar(origChar, 0); |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
109 |
if (newChar == java_awt_event_KeyEvent_CHAR_UNDEFINED) { |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
110 |
newChar = origChar; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
111 |
} |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
112 |
eventKey = [NSString stringWithCharacters: &newChar length: 1]; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
113 |
} |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
114 |
NSWindow *keyWindow = [NSApp keyWindow]; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
115 |
if (keyWindow != nil) { |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
116 |
return; |
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
117 |
} |
39018
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
118 |
} |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
119 |
else { |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
120 |
static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem"); |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
121 |
static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event) |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
122 |
|
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
123 |
NSUInteger modifiers = [currEvent modifierFlags]; |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
124 |
jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO); |
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
125 |
|
df734f00b30a
8158230: [macosx] ActionEvent is not fired for menu item with option apple.laf.useScreenMenuBar
aniyogi
parents:
38384
diff
changeset
|
126 |
JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) |
38384
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
127 |
} |
12047 | 128 |
} |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
129 |
JNF_COCOA_EXIT(env); |
38384
05e90f2c9ab8
8152492: [macosx swing] double key event actions when using Mac menubar
aniyogi
parents:
34809
diff
changeset
|
130 |
|
12047 | 131 |
} |
132 |
||
133 |
- (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
134 |
|
12047 | 135 |
NSUInteger modifierMask = 0; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
136 |
|
12047 | 137 |
if (![theKeyEquivalent isEqualToString:@""]) { |
138 |
// Force the key equivalent to lower case if not using the shift key. |
|
139 |
// Otherwise AppKit will draw a Shift glyph in the menu. |
|
140 |
if ((modifiers & java_awt_event_KeyEvent_SHIFT_MASK) == 0) { |
|
141 |
theKeyEquivalent = [theKeyEquivalent lowercaseString]; |
|
142 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
143 |
|
12047 | 144 |
// Hack for the question mark -- SHIFT and / means use the question mark. |
145 |
if ((modifiers & java_awt_event_KeyEvent_SHIFT_MASK) != 0 && |
|
146 |
[theKeyEquivalent isEqualToString:@"/"]) |
|
147 |
{ |
|
148 |
theKeyEquivalent = @"?"; |
|
149 |
modifiers &= ~java_awt_event_KeyEvent_SHIFT_MASK; |
|
150 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
151 |
|
13781
bf3d53b1fba7
7160951: ActionListener called twice for JMenuItem using ScreenMenuBar
leonidr
parents:
12283
diff
changeset
|
152 |
modifierMask = JavaModifiersToNsKeyModifiers(modifiers, NO); |
12047 | 153 |
} |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
154 |
|
15322
3638f33225ec
7179050: [macosx] Make LWAWT be able to run on AppKit thread
serb
parents:
14312
diff
changeset
|
155 |
[ThreadUtilities performOnMainThreadWaiting:YES block:^(){ |
12283
253d9a09f674
7124551: [macosx] Once added, Menu shortcut cannot be removed
serb
parents:
12047
diff
changeset
|
156 |
[fMenuItem setKeyEquivalent:theKeyEquivalent]; |
253d9a09f674
7124551: [macosx] Once added, Menu shortcut cannot be removed
serb
parents:
12047
diff
changeset
|
157 |
[fMenuItem setKeyEquivalentModifierMask:modifierMask]; |
12047 | 158 |
[fMenuItem setTitle:theLabel]; |
159 |
}]; |
|
160 |
} |
|
161 |
||
162 |
- (void) setJavaImage:(NSImage *)theImage { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
163 |
|
15322
3638f33225ec
7179050: [macosx] Make LWAWT be able to run on AppKit thread
serb
parents:
14312
diff
changeset
|
164 |
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ |
12047 | 165 |
[fMenuItem setImage:theImage]; |
166 |
}]; |
|
167 |
} |
|
168 |
||
169 |
- (void) setJavaToolTipText:(NSString *)theText { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
170 |
|
15322
3638f33225ec
7179050: [macosx] Make LWAWT be able to run on AppKit thread
serb
parents:
14312
diff
changeset
|
171 |
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ |
12047 | 172 |
[fMenuItem setToolTip:theText]; |
173 |
}]; |
|
174 |
} |
|
175 |
||
176 |
||
177 |
- (void)setJavaEnabled:(BOOL) enabled { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
178 |
|
15322
3638f33225ec
7179050: [macosx] Make LWAWT be able to run on AppKit thread
serb
parents:
14312
diff
changeset
|
179 |
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ |
12047 | 180 |
@synchronized(self) { |
181 |
fIsEnabled = enabled; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
182 |
|
12047 | 183 |
// Warning: This won't work if the parent menu is disabled. |
184 |
// See [CMenu syncFromJava]. We still need to call it here so |
|
185 |
// the NSMenuItem itself gets properly updated. |
|
186 |
[fMenuItem setEnabled:fIsEnabled]; |
|
187 |
} |
|
188 |
}]; |
|
189 |
} |
|
190 |
||
191 |
- (BOOL)isEnabled { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
192 |
|
12047 | 193 |
BOOL enabled = NO; |
194 |
@synchronized(self) { |
|
195 |
enabled = fIsEnabled; |
|
196 |
} |
|
197 |
return enabled; |
|
198 |
} |
|
199 |
||
200 |
||
201 |
- (void)setJavaState:(BOOL)newState { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
202 |
|
15322
3638f33225ec
7179050: [macosx] Make LWAWT be able to run on AppKit thread
serb
parents:
14312
diff
changeset
|
203 |
[ThreadUtilities performOnMainThreadWaiting:NO block:^(){ |
12047 | 204 |
[fMenuItem setState:(newState ? NSOnState : NSOffState)]; |
205 |
}]; |
|
206 |
} |
|
207 |
||
208 |
- (void)cleanup { |
|
209 |
[fMenuItem setAction:NULL]; |
|
210 |
[fMenuItem setTarget:nil]; |
|
211 |
} |
|
212 |
||
213 |
- (void)dealloc { |
|
214 |
[fMenuItem release]; |
|
215 |
fMenuItem = nil; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
216 |
|
12047 | 217 |
[super dealloc]; |
218 |
} |
|
219 |
||
220 |
- (void)addNSMenuItemToMenu:(NSMenu *)inMenu { |
|
221 |
[inMenu addItem:fMenuItem]; |
|
222 |
} |
|
223 |
||
224 |
- (NSMenuItem *)menuItem { |
|
225 |
return [[fMenuItem retain] autorelease]; |
|
226 |
} |
|
227 |
||
228 |
- (void)setIsCheckbox { |
|
229 |
fIsCheckbox = YES; |
|
230 |
} |
|
231 |
||
232 |
- (void) _createMenuItem_OnAppKitThread: (NSMutableArray *)argValue { |
|
233 |
jobject cPeerObjGlobal = (jobject)[[argValue objectAtIndex: 0] pointerValue]; |
|
234 |
NSNumber * asSeparator = (NSNumber *)[argValue objectAtIndex: 1]; |
|
235 |
CMenuItem *aCMenuItem = [self initWithPeer: cPeerObjGlobal asSeparator: asSeparator]; |
|
236 |
[argValue removeAllObjects]; |
|
237 |
[argValue addObject: aCMenuItem]; |
|
238 |
} |
|
239 |
||
240 |
- (NSString *)description { |
|
241 |
return [NSString stringWithFormat:@"CMenuItem[ %@ ]", fMenuItem]; |
|
242 |
} |
|
243 |
||
244 |
@end |
|
245 |
||
246 |
/** Convert a Java keycode for SetMenuItemCmd */ |
|
247 |
static unichar AWTKeyToMacShortcut(jint awtKey, BOOL doShift) { |
|
248 |
unichar macKey = 0; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
249 |
|
12047 | 250 |
if ((awtKey >= java_awt_event_KeyEvent_VK_0 && awtKey <= java_awt_event_KeyEvent_VK_9) || |
251 |
(awtKey >= java_awt_event_KeyEvent_VK_A && awtKey <= java_awt_event_KeyEvent_VK_Z)) |
|
252 |
{ |
|
253 |
// These ranges are the same in ASCII |
|
254 |
macKey = awtKey; |
|
255 |
} else if (awtKey >= java_awt_event_KeyEvent_VK_F1 && awtKey <= java_awt_event_KeyEvent_VK_F12) { |
|
256 |
// Support for F1 - F12 has been around since Java 1.0 and fall into a lower range. |
|
257 |
macKey = awtKey - java_awt_event_KeyEvent_VK_F1 + NSF1FunctionKey; |
|
258 |
} else if (awtKey >= java_awt_event_KeyEvent_VK_F13 && awtKey <= java_awt_event_KeyEvent_VK_F24) { |
|
259 |
// Support for F13-F24 came in Java 1.2 and are at a different range. |
|
260 |
macKey = awtKey - java_awt_event_KeyEvent_VK_F13 + NSF13FunctionKey; |
|
261 |
} else { |
|
262 |
// Special characters |
|
263 |
switch (awtKey) { |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
264 |
case java_awt_event_KeyEvent_VK_BACK_QUOTE : macKey = '`'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
265 |
case java_awt_event_KeyEvent_VK_QUOTE : macKey = '\''; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
266 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
267 |
case java_awt_event_KeyEvent_VK_ESCAPE : macKey = 0x1B; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
268 |
case java_awt_event_KeyEvent_VK_SPACE : macKey = ' '; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
269 |
case java_awt_event_KeyEvent_VK_PAGE_UP : macKey = NSPageUpFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
270 |
case java_awt_event_KeyEvent_VK_PAGE_DOWN : macKey = NSPageDownFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
271 |
case java_awt_event_KeyEvent_VK_END : macKey = NSEndFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
272 |
case java_awt_event_KeyEvent_VK_HOME : macKey = NSHomeFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
273 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
274 |
case java_awt_event_KeyEvent_VK_LEFT : macKey = NSLeftArrowFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
275 |
case java_awt_event_KeyEvent_VK_UP : macKey = NSUpArrowFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
276 |
case java_awt_event_KeyEvent_VK_RIGHT : macKey = NSRightArrowFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
277 |
case java_awt_event_KeyEvent_VK_DOWN : macKey = NSDownArrowFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
278 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
279 |
case java_awt_event_KeyEvent_VK_COMMA : macKey = ','; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
280 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
281 |
// Mac OS doesn't distinguish between the two '-' keys... |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
282 |
case java_awt_event_KeyEvent_VK_MINUS : |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
283 |
case java_awt_event_KeyEvent_VK_SUBTRACT : macKey = '-'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
284 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
285 |
// or the two '.' keys... |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
286 |
case java_awt_event_KeyEvent_VK_DECIMAL : |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
287 |
case java_awt_event_KeyEvent_VK_PERIOD : macKey = '.'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
288 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
289 |
// or the two '/' keys. |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
290 |
case java_awt_event_KeyEvent_VK_DIVIDE : |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
291 |
case java_awt_event_KeyEvent_VK_SLASH : macKey = '/'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
292 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
293 |
case java_awt_event_KeyEvent_VK_SEMICOLON : macKey = ';'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
294 |
case java_awt_event_KeyEvent_VK_EQUALS : macKey = '='; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
295 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
296 |
case java_awt_event_KeyEvent_VK_OPEN_BRACKET : macKey = '['; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
297 |
case java_awt_event_KeyEvent_VK_BACK_SLASH : macKey = '\\'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
298 |
case java_awt_event_KeyEvent_VK_CLOSE_BRACKET : macKey = ']'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
299 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
300 |
case java_awt_event_KeyEvent_VK_MULTIPLY : macKey = '*'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
301 |
case java_awt_event_KeyEvent_VK_ADD : macKey = '+'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
302 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
303 |
case java_awt_event_KeyEvent_VK_HELP : macKey = NSHelpFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
304 |
case java_awt_event_KeyEvent_VK_TAB : macKey = NSTabCharacter; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
305 |
case java_awt_event_KeyEvent_VK_ENTER : macKey = NSNewlineCharacter; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
306 |
case java_awt_event_KeyEvent_VK_BACK_SPACE : macKey = NSBackspaceCharacter; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
307 |
case java_awt_event_KeyEvent_VK_DELETE : macKey = NSDeleteCharacter; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
308 |
case java_awt_event_KeyEvent_VK_CLEAR : macKey = NSClearDisplayFunctionKey; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
309 |
case java_awt_event_KeyEvent_VK_AMPERSAND : macKey = '&'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
310 |
case java_awt_event_KeyEvent_VK_ASTERISK : macKey = '*'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
311 |
case java_awt_event_KeyEvent_VK_QUOTEDBL : macKey = '\"'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
312 |
case java_awt_event_KeyEvent_VK_LESS : macKey = '<'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
313 |
case java_awt_event_KeyEvent_VK_GREATER : macKey = '>'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
314 |
case java_awt_event_KeyEvent_VK_BRACELEFT : macKey = '{'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
315 |
case java_awt_event_KeyEvent_VK_BRACERIGHT : macKey = '}'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
316 |
case java_awt_event_KeyEvent_VK_AT : macKey = '@'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
317 |
case java_awt_event_KeyEvent_VK_COLON : macKey = ':'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
318 |
case java_awt_event_KeyEvent_VK_CIRCUMFLEX : macKey = '^'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
319 |
case java_awt_event_KeyEvent_VK_DOLLAR : macKey = '$'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
320 |
case java_awt_event_KeyEvent_VK_EXCLAMATION_MARK : macKey = '!'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
321 |
case java_awt_event_KeyEvent_VK_LEFT_PARENTHESIS : macKey = '('; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
322 |
case java_awt_event_KeyEvent_VK_NUMBER_SIGN : macKey = '#'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
323 |
case java_awt_event_KeyEvent_VK_PLUS : macKey = '+'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
324 |
case java_awt_event_KeyEvent_VK_RIGHT_PARENTHESIS: macKey = ')'; break; |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
325 |
case java_awt_event_KeyEvent_VK_UNDERSCORE : macKey = '_'; break; |
12047 | 326 |
} |
327 |
} |
|
328 |
return macKey; |
|
329 |
} |
|
330 |
||
331 |
/* |
|
332 |
* Class: sun_lwawt_macosx_CMenuItem |
|
333 |
* Method: nativeSetLabel |
|
334 |
* Signature: (JLjava/lang/String;CII)V |
|
335 |
*/ |
|
336 |
JNIEXPORT void JNICALL |
|
337 |
Java_sun_lwawt_macosx_CMenuItem_nativeSetLabel |
|
338 |
(JNIEnv *env, jobject peer, |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
339 |
jlong menuItemObj, jstring label, |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
340 |
jchar shortcutKey, jint shortcutKeyCode, jint mods) |
12047 | 341 |
{ |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
342 |
JNF_COCOA_ENTER(env); |
12047 | 343 |
NSString *theLabel = JNFJavaToNSString(env, label); |
344 |
NSString *theKeyEquivalent = nil; |
|
345 |
unichar macKey = shortcutKey; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
346 |
|
12047 | 347 |
if (macKey == 0) { |
348 |
macKey = AWTKeyToMacShortcut(shortcutKeyCode, (mods & java_awt_event_KeyEvent_SHIFT_MASK) != 0); |
|
349 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
350 |
|
12047 | 351 |
if (macKey != 0) { |
352 |
unichar equivalent[1] = {macKey}; |
|
353 |
theKeyEquivalent = [NSString stringWithCharacters:equivalent length:1]; |
|
354 |
} else { |
|
355 |
theKeyEquivalent = @""; |
|
356 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
357 |
|
12047 | 358 |
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaLabel:theLabel shortcut:theKeyEquivalent modifierMask:mods]; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
359 |
JNF_COCOA_EXIT(env); |
12047 | 360 |
} |
361 |
||
362 |
/* |
|
363 |
* Class: sun_lwawt_macosx_CMenuItem |
|
364 |
* Method: nativeSetTooltip |
|
365 |
* Signature: (JLjava/lang/String;)V |
|
366 |
*/ |
|
367 |
JNIEXPORT void JNICALL |
|
368 |
Java_sun_lwawt_macosx_CMenuItem_nativeSetTooltip |
|
369 |
(JNIEnv *env, jobject peer, jlong menuItemObj, jstring tooltip) |
|
370 |
{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
371 |
JNF_COCOA_ENTER(env); |
12047 | 372 |
NSString *theTooltip = JNFJavaToNSString(env, tooltip); |
373 |
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaToolTipText:theTooltip]; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
374 |
JNF_COCOA_EXIT(env); |
12047 | 375 |
} |
376 |
||
377 |
/* |
|
378 |
* Class: sun_lwawt_macosx_CMenuItem |
|
379 |
* Method: nativeSetImage |
|
380 |
* Signature: (JJ)V |
|
381 |
*/ |
|
382 |
JNIEXPORT void JNICALL |
|
383 |
Java_sun_lwawt_macosx_CMenuItem_nativeSetImage |
|
384 |
(JNIEnv *env, jobject peer, jlong menuItemObj, jlong image) |
|
385 |
{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
386 |
JNF_COCOA_ENTER(env); |
12047 | 387 |
[((CMenuItem *)jlong_to_ptr(menuItemObj)) setJavaImage:(NSImage*)jlong_to_ptr(image)]; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
388 |
JNF_COCOA_EXIT(env); |
12047 | 389 |
} |
390 |
||
391 |
/* |
|
392 |
* Class: sun_lwawt_macosx_CMenuItem |
|
393 |
* Method: nativeCreate |
|
394 |
* Signature: (JZ)J |
|
395 |
*/ |
|
396 |
JNIEXPORT jlong JNICALL |
|
397 |
Java_sun_lwawt_macosx_CMenuItem_nativeCreate |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
398 |
(JNIEnv *env, jobject peer, jlong parentCMenuObj, jboolean isSeparator) |
12047 | 399 |
{ |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
400 |
|
12047 | 401 |
CMenuItem *aCMenuItem = nil; |
402 |
CMenu *parentCMenu = (CMenu *)jlong_to_ptr(parentCMenuObj); |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
403 |
JNF_COCOA_ENTER(env); |
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
404 |
|
12047 | 405 |
jobject cPeerObjGlobal = (*env)->NewGlobalRef(env, peer); |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
406 |
|
12047 | 407 |
NSMutableArray *args = nil; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
408 |
|
12047 | 409 |
// Create a new item.... |
410 |
if (isSeparator == JNI_TRUE) { |
|
411 |
args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], [NSNumber numberWithBool:YES], nil]; |
|
412 |
} else { |
|
413 |
args = [[NSMutableArray alloc] initWithObjects:[NSValue valueWithBytes:&cPeerObjGlobal objCType:@encode(jobject)], [NSNumber numberWithBool:NO], nil]; |
|
414 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
415 |
|
15985
b9e25a486549
8006634: Unify LWCToolkit.invokeAndWait() and sun.awt.datatransfer.ToolkitThreadBlockedHandler
pchelko
parents:
15322
diff
changeset
|
416 |
[ThreadUtilities performOnMainThread:@selector(_createMenuItem_OnAppKitThread:) on:[CMenuItem alloc] withObject:args waitUntilDone:YES]; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
417 |
|
12047 | 418 |
aCMenuItem = (CMenuItem *)[args objectAtIndex: 0]; |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
419 |
|
12047 | 420 |
if (aCMenuItem == nil) { |
421 |
return 0L; |
|
422 |
} |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
423 |
|
12047 | 424 |
// and add it to the parent item. |
425 |
[parentCMenu addJavaMenuItem: aCMenuItem]; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
426 |
|
12047 | 427 |
// setLabel will be called after creation completes. |
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
428 |
|
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
429 |
JNF_COCOA_EXIT(env); |
12047 | 430 |
return ptr_to_jlong(aCMenuItem); |
431 |
} |
|
432 |
||
433 |
/* |
|
434 |
* Class: sun_lwawt_macosx_CMenuItem |
|
435 |
* Method: nativeSetEnabled |
|
436 |
* Signature: (JZ)V |
|
437 |
*/ |
|
438 |
JNIEXPORT void JNICALL |
|
439 |
Java_sun_lwawt_macosx_CMenuItem_nativeSetEnabled |
|
440 |
(JNIEnv *env, jobject peer, jlong menuItemObj, jboolean enable) |
|
441 |
{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
442 |
JNF_COCOA_ENTER(env); |
12047 | 443 |
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); |
444 |
[item setJavaEnabled: (enable == JNI_TRUE)]; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
445 |
JNF_COCOA_EXIT(env); |
12047 | 446 |
} |
447 |
||
448 |
/* |
|
449 |
* Class: sun_lwawt_macosx_CCheckboxMenuItem |
|
450 |
* Method: nativeSetState |
|
451 |
* Signature: (IZ)V |
|
452 |
*/ |
|
453 |
JNIEXPORT void JNICALL |
|
454 |
Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetState |
|
455 |
(JNIEnv *env, jobject peer, jlong menuItemObj, jboolean state) |
|
456 |
{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
457 |
JNF_COCOA_ENTER(env); |
12047 | 458 |
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); |
459 |
[item setJavaState: (state == JNI_TRUE)]; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
460 |
JNF_COCOA_EXIT(env); |
12047 | 461 |
} |
462 |
||
463 |
/* |
|
464 |
* Class: sun_lwawt_macosx_CCheckboxMenuItem |
|
465 |
* Method: nativeSetState |
|
466 |
* Signature: (IZ)V |
|
467 |
*/ |
|
468 |
JNIEXPORT void JNICALL |
|
469 |
Java_sun_lwawt_macosx_CCheckboxMenuItem_nativeSetIsCheckbox |
|
470 |
(JNIEnv *env, jobject peer, jlong menuItemObj) |
|
471 |
{ |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
472 |
JNF_COCOA_ENTER(env); |
12047 | 473 |
CMenuItem *item = (CMenuItem *)jlong_to_ptr(menuItemObj); |
474 |
[item setIsCheckbox]; |
|
34809
cfc824c24939
8139169: [macosx] Action registered for keyboard shortcut is called twice
aniyogi
parents:
26751
diff
changeset
|
475 |
JNF_COCOA_EXIT(env); |
12047 | 476 |
} |