We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch which fixes the beeping when key equivalents (Cmd+key) are pressed

key-composition-nobeep.diff (text/plain), 2.20 KB, created by Maarten ter Huurne on 2007-12-08 17:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maarten ter Huurne

Created: 2007-12-08 17:55:43 UTC

Size: 2.20 KB

patch

obsolete

>diff -ru SDL-1.2.12.org/src/video/quartz/SDL_QuartzEvents.m SDL-1.2.12/src/video/quartz/SDL_QuartzEvents.m
>--- SDL-1.2.12.org/src/video/quartz/SDL_QuartzEvents.m	2007-07-20 07:52:17.000000000 +0200
>+++ SDL-1.2.12/src/video/quartz/SDL_QuartzEvents.m	2007-12-08 21:00:16.000000000 +0100
>@@ -267,7 +267,9 @@
>         the scancode/keysym.
>     */
>     if (SDL_TranslateUNICODE && state == SDL_PRESSED) {
>-        [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
>+        if (!([event modifierFlags] & NSCommandKeyMask)) {
>+            [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
>+        }
>         chars = [ event characters ];
>         numChars = [ chars length ];
>     } else {
>@@ -303,7 +305,7 @@
>         }
>     }
>
>-    if (SDL_getenv ("SDL_ENABLEAPPEVENTS"))
>+    if (SDL_getenv ("SDL_ENABLEAPPEVENTS") && !(mode_flags & SDL_FULLSCREEN))
>         [ NSApp sendEvent:event ];
> }
>
>diff -ru SDL-1.2.12.org/src/video/quartz/SDL_QuartzWindow.h SDL-1.2.12/src/video/quartz/SDL_QuartzWindow.h
>--- SDL-1.2.12.org/src/video/quartz/SDL_QuartzWindow.h	2007-07-20 07:52:17.000000000 +0200
>+++ SDL-1.2.12/src/video/quartz/SDL_QuartzWindow.h	2007-12-08 20:57:26.000000000 +0100
>@@ -30,6 +30,7 @@
> - (void)appWillUnhide:(NSNotification*)note;
> - (void)appDidUnhide:(NSNotification*)note;
> - (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag;
>+- (BOOL)performKeyEquivalent:(NSEvent*)event;
> @end
>
> /* Delegate for our NSWindow to send SDLQuit() on close */
>diff -ru SDL-1.2.12.org/src/video/quartz/SDL_QuartzWindow.m SDL-1.2.12/src/video/quartz/SDL_QuartzWindow.m
>--- SDL-1.2.12.org/src/video/quartz/SDL_QuartzWindow.m	2007-07-20 07:52:17.000000000 +0200
>+++ SDL-1.2.12/src/video/quartz/SDL_QuartzWindow.m	2007-12-08 20:57:26.000000000 +0100
>@@ -198,6 +198,14 @@
>     return [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ];
> }
>
>+- (BOOL)performKeyEquivalent:(NSEvent*)event
>+{
>+	/* give the menu a chance to handle the key equivalent */
>+	[[NSApp mainMenu] performKeyEquivalent:event];
>+	/* avoid beep by pretending we handled it */
>+	return YES;
>+}
>+
> @end
>
> @implementation SDL_QuartzWindowDelegate

Actions: View | Diff

Attachments on bug 456: 237

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.