macOS: Suppress the key combinations beep sound
This commit is contained in:
parent
ce63ddfe54
commit
5b5651ca7d
@ -753,6 +753,20 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
|
|||||||
|
|
||||||
@end // }}}
|
@end // }}}
|
||||||
|
|
||||||
|
// Text input context class for the GLFW content view {{{
|
||||||
|
|
||||||
|
@interface GLFWTextInputContext : NSTextInputContext
|
||||||
|
@end
|
||||||
|
|
||||||
|
@implementation GLFWTextInputContext
|
||||||
|
- (void)doCommandBySelector:(SEL)selector
|
||||||
|
{
|
||||||
|
// interpretKeyEvents: May call insertText: or doCommandBySelector:.
|
||||||
|
// With the default macOS keybindings, pressing certain key combinations
|
||||||
|
// (e.g. Ctrl+/, Ctrl+Cmd+Down/Left/Right) will produce a beep sound.
|
||||||
|
debug_key("\n\tTextInputCtx: doCommandBySelector: (%s)\n", [NSStringFromSelector(selector) UTF8String]);
|
||||||
|
}
|
||||||
|
@end // }}}
|
||||||
|
|
||||||
// Content view class for the GLFW window {{{
|
// Content view class for the GLFW window {{{
|
||||||
|
|
||||||
@ -760,6 +774,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
|
|||||||
{
|
{
|
||||||
_GLFWwindow* window;
|
_GLFWwindow* window;
|
||||||
NSTrackingArea* trackingArea;
|
NSTrackingArea* trackingArea;
|
||||||
|
GLFWTextInputContext* input_context;
|
||||||
NSMutableAttributedString* markedText;
|
NSMutableAttributedString* markedText;
|
||||||
NSRect markedRect;
|
NSRect markedRect;
|
||||||
bool marked_text_cleared_by_insert;
|
bool marked_text_cleared_by_insert;
|
||||||
@ -780,6 +795,7 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
|
|||||||
{
|
{
|
||||||
window = initWindow;
|
window = initWindow;
|
||||||
trackingArea = nil;
|
trackingArea = nil;
|
||||||
|
input_context = [[GLFWTextInputContext alloc] initWithClient:self];
|
||||||
markedText = [[NSMutableAttributedString alloc] init];
|
markedText = [[NSMutableAttributedString alloc] init];
|
||||||
markedRect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
|
markedRect = NSMakeRect(0.0, 0.0, 0.0, 0.0);
|
||||||
input_source_at_last_key_event = nil;
|
input_source_at_last_key_event = nil;
|
||||||
@ -1035,6 +1051,11 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
|
|||||||
[super updateTrackingAreas];
|
[super updateTrackingAreas];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSTextInputContext *)inputContext
|
||||||
|
{
|
||||||
|
return input_context;
|
||||||
|
}
|
||||||
|
|
||||||
static UInt32
|
static UInt32
|
||||||
convert_cocoa_to_carbon_modifiers(NSUInteger flags) {
|
convert_cocoa_to_carbon_modifiers(NSUInteger flags) {
|
||||||
UInt32 mods = 0;
|
UInt32 mods = 0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user