shadowfacts/lwjgl2-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/lwjgl2-arm64.git synced 2026-01-04 15:59:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue on OS X when using Command + Tab caused the command key to

Browse source 
become stuck.
This commit is contained in:
kappaOne 2013-11-03 00:17:37 +00:00
parent 43a6a8bfbb
commit e90e5dc172
2 changed files with 43 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/native/macosx/context.h
View file

@ -50,6 +50,17 @@
#include "common_tools.h"
#include <jawt_md.h>
enum {
NSControlLeftKeyMask = 0x0001,
NSControlRightKeyMask = 0x2000,
NSShiftLeftKeyMask = 0x0002,
NSShiftRightKeyMask = 0x0004,
NSCommandLeftKeyMask = 0x0008,
NSCommandRightKeyMask = 0x0010,
NSAlternateLeftKeyMask = 0x0020,
NSAlternateRightKeyMask = 0x0040
};
@class NSOpenGLContext, NSOpenGLPixelFormat, MacOSXOpenGLView, MacOSXKeyableWindow;
typedef struct {

45
src/native/macosx/org_lwjgl_opengl_Display.m
View file

@ -60,6 +60,8 @@ static MacOSXPeerInfo *peer_info;
static bool leftMouseDown = false;
static bool rightMouseDown = false;
static NSUInteger lastModifierFlags = 0;
@implementation MacOSXKeyableWindow
+ (void) createWindow {
@ -309,34 +311,51 @@ static bool rightMouseDown = false;
}
long time = [event timestamp] * 1000000000;
NSUInteger modifierFlags = [event modifierFlags];
unsigned short keyCode = [event keyCode];
NSUInteger mask = ~0;
switch([event keyCode]) {
case kVK_Control : mask = 0x0001; break;
case kVK_Shift : mask = 0x0002; break;
case kVK_RightShift : mask = 0x0004; break;
case kVK_Command : mask = 0x0008; break;
case 0x36 : mask = 0x0010; break; // Should be: kVK_RightCommand -- missing O.o
case kVK_Option : mask = 0x0020; break;
case kVK_RightOption : mask = 0x0040; break;
case kVK_RightControl: mask = 0x2000; break;
switch(keyCode) {
case kVK_Control : mask = NSControlLeftKeyMask; break;
case kVK_Shift : mask = NSShiftLeftKeyMask; break;
case kVK_RightShift : mask = NSShiftRightKeyMask; break;
case kVK_Command : mask = NSCommandLeftKeyMask; break;
case 0x36 : mask = NSCommandRightKeyMask; break; // Should be: kVK_RightCommand -- missing O.o
case kVK_Option : mask = NSAlternateLeftKeyMask; break;
case kVK_RightOption : mask = NSAlternateRightKeyMask; break;
case kVK_RightControl: mask = NSControlRightKeyMask; break;
case kVK_CapsLock : mask = NSAlphaShiftKeyMask; break;
case kVK_Function : mask = NSFunctionKeyMask; break;
// case 0x?? : mask = NSNumericPadKeyMask; break; // Didn't have the keycode for this one :(
default:
NSLog(@"Unknown modifier with keycode: %d\n", [event keyCode]);
return;
// key code not specified when left Command key + Tab moves focus to another Window, therefore manually detect and specify correct key code
if (((lastModifierFlags & NSCommandLeftKeyMask) == NSCommandLeftKeyMask) && ((modifierFlags & NSCommandLeftKeyMask) != NSCommandLeftKeyMask)) {
keyCode = kVK_Command; // left command key code
}
// key code not specified when right Command key + Tab moves focus to another Window, therefore manually detect and specify correct key code
else if (((lastModifierFlags & NSCommandLeftKeyMask) == NSCommandLeftKeyMask) && ((modifierFlags & NSCommandLeftKeyMask) != NSCommandLeftKeyMask)) {
keyCode = 0x36; // right command key code
}
else {
NSLog(@"Unknown modifier with keycode: %d\n", [event keyCode]);
return;
}
}
// save current modifierFlags for next use
lastModifierFlags = [event modifierFlags];
jclass keyboard_class = (*env)->GetObjectClass(env, _parent->jkeyboard);
jmethodID keyMethod;
if (([event modifierFlags] & mask) == mask) {
if ((modifierFlags & mask) == mask) {
keyMethod = (*env)->GetMethodID(env, keyboard_class, "keyPressed", "(ILjava/lang/String;J)V");
} else {
keyMethod = (*env)->GetMethodID(env, keyboard_class, "keyReleased", "(ILjava/lang/String;J)V");
}
(*env)->CallVoidMethod(env, _parent->jkeyboard, keyMethod, [event keyCode], NULL, time);
(*env)->CallVoidMethod(env, _parent->jkeyboard, keyMethod, keyCode, NULL, time);
}
- (void)mouseButtonState:(NSEvent *)event :(int)button :(int)state {