[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 96ec2ac7d0: Fix nsmenu compilation under macOS 10.6
From: |
Alan Third |
Subject: |
master 96ec2ac7d0: Fix nsmenu compilation under macOS 10.6 |
Date: |
Mon, 25 Apr 2022 14:09:41 -0400 (EDT) |
branch: master
commit 96ec2ac7d0bdb6b1193217b35f7d74d79b7c2033
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>
Fix nsmenu compilation under macOS 10.6
* src/nsmenu.m ([EmacsMenu fillWithWidgetValue:]): Replace modern
shorthand dictionary and array definitions.
* src/nsterm.h (NSTextAlignmentRight): Redefine if necessary.
* src/macfont.m (mac_font_create_preferred_family_for_attributes):
isOperatingSystemAtLeastVersion is new in macOS 10.10, so it's
probably wrong to use it to check whether we're below 10.9.
(mac_font_copy_default_descriptors_for_language):
(mac_font_copy_default_name_for_charset_and_languages): It seems these
functions are only used on macOS 10.8 and below.
* src/nsterm.m ([NSColor colorUsingDefaultColorSpace]): Use the
generic colorspace.
(ns_parent_window_rect):
(ns_frame_scale_factor):
([EmacsWindow setParentChildRelationships]): Fix macOS version stuff.
Co-authored-by: Po Lu <luangruo@yahoo.com>
---
src/macfont.m | 15 +++++++++------
src/nsmenu.m | 10 ++++++----
src/nsterm.h | 1 +
src/nsterm.m | 39 ++++++++++++++++++++++++++++-----------
4 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/src/macfont.m b/src/macfont.m
index 34e48afb98..35648df06c 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -57,8 +57,10 @@ static CFStringRef
mac_font_create_preferred_family_for_attributes (CFDictionary
static CFIndex mac_font_shape (CTFontRef, CFStringRef,
struct mac_glyph_layout *, CFIndex,
enum lgstring_direction);
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
static CFArrayRef mac_font_copy_default_descriptors_for_language (CFStringRef);
static CFStringRef mac_font_copy_default_name_for_charset_and_languages
(CFCharacterSetRef, CFArrayRef);
+#endif
#if USE_CT_GLYPH_INFO
static CGGlyph mac_ctfont_get_glyph_for_cid (CTFontRef, CTCharacterCollection,
CGFontIndex);
@@ -3570,18 +3572,17 @@ mac_font_create_preferred_family_for_attributes
(CFDictionaryRef attributes)
if (languages && CFArrayGetCount (languages) > 0)
{
- if ([[NSProcessInfo processInfo]
- isOperatingSystemAtLeastVersion:
- ((NSOperatingSystemVersion){
- .majorVersion = 10, .minorVersion = 9})])
- values[num_values++] = CFArrayGetValueAtIndex (languages, 0);
- else
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
+ if (CTGetCoreTextVersion () < kCTVersionNumber10_9)
{
CFCharacterSetRef charset =
CFDictionaryGetValue (attributes,
kCTFontCharacterSetAttribute);
result = mac_font_copy_default_name_for_charset_and_languages
(charset, languages);
}
+ else
+#endif
+ values[num_values++] = CFArrayGetValueAtIndex (languages, 0);
}
if (result == NULL)
{
@@ -4000,6 +4001,7 @@ mac_ctfont_get_glyph_for_cid (CTFontRef font,
CTCharacterCollection collection,
}
#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
static CFArrayRef
mac_font_copy_default_descriptors_for_language (CFStringRef language)
{
@@ -4134,6 +4136,7 @@ mac_font_copy_default_name_for_charset_and_languages
(CFCharacterSetRef charset,
return result;
}
+#endif
void *
macfont_get_nsctfont (struct font *font)
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 81d7cd2da1..0f7d1fb98f 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -649,7 +649,8 @@ prettify_key (const char *key)
work around it by using tabs to split the title into two
columns. */
NSFont *menuFont = [NSFont menuFontOfSize:0];
- NSDictionary *font_attribs = @{NSFontAttributeName: menuFont};
+ NSDictionary *font_attribs = [NSDictionary dictionaryWithObjectsAndKeys:
+ menuFont, NSFontAttributeName,
nil];
CGFloat maxNameWidth = 0;
CGFloat maxKeyWidth = 0;
@@ -677,11 +678,12 @@ prettify_key (const char *key)
NSTextTab *tab =
[[[NSTextTab alloc] initWithTextAlignment: NSTextAlignmentRight
location: maxWidth
- options: @{}] autorelease];
+ options: [NSDictionary dictionary]]
autorelease];
NSMutableParagraphStyle *pstyle = [[[NSMutableParagraphStyle alloc] init]
autorelease];
- [pstyle setTabStops: @[tab]];
- attributes = @{NSParagraphStyleAttributeName: pstyle};
+ [pstyle setTabStops: [NSArray arrayWithObject:tab]];
+ attributes = [NSDictionary dictionaryWithObjectsAndKeys:
+ pstyle, NSParagraphStyleAttributeName, nil];
#endif
/* clear existing contents */
diff --git a/src/nsterm.h b/src/nsterm.h
index 4cba5c0be8..5b121ede98 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -1290,6 +1290,7 @@ extern char gnustep_base_version[]; /* version tracking
*/
#define NSAlertStyleCritical NSCriticalAlertStyle
#define NSControlSizeRegular NSRegularControlSize
#define NSCompositingOperationCopy NSCompositeCopy
+#define NSTextAlignmentRight NSRightTextAlignment
/* And adds NSWindowStyleMask. */
#ifdef __OBJC__
diff --git a/src/nsterm.m b/src/nsterm.m
index 4737cb1b35..5d2e74ad56 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -163,7 +163,7 @@ char const * nstrace_fullscreen_type_name (int fs_type)
&& NSAppKitVersionNumber >= NSAppKitVersionNumber10_7)
return [self colorUsingColorSpace: [NSColorSpace sRGBColorSpace]];
#endif
- return [self colorUsingColorSpace: [NSColorSpace deviceRGBColorSpace]];
+ return [self colorUsingColorSpace: [NSColorSpace genericRGBColorSpace]];
}
+ (NSColor *)colorWithUnsignedLong:(unsigned long)c
@@ -751,7 +751,18 @@ ns_parent_window_rect (struct frame *f)
EmacsView *parentView = FRAME_NS_VIEW (FRAME_PARENT_FRAME (f));
parentRect = [parentView convertRect:[parentView frame]
toView:nil];
+
+#if defined (NS_IMPL_COCOA) && !defined (MAC_OS_X_VERSION_10_7)
+ parentRect.origin = [[parentView window]
convertBaseToScreen:parentRect.origin];
+#elif defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED < 1070
+ if ([[parentView window]
+ respondsToSelector:@selector(convertRectToScreen:)])
+ parentRect = [[parentView window] convertRectToScreen:parentRect];
+ else
+ parentRect.origin = [[parentView window]
convertBaseToScreen:parentRect.origin];
+#else
parentRect = [[parentView window] convertRectToScreen:parentRect];
+#endif
}
else
parentRect = [[[NSScreen screens] objectAtIndex:0] frame];
@@ -788,10 +799,16 @@ ns_row_rect (struct window *w, struct glyph_row *row,
double
ns_frame_scale_factor (struct frame *f)
{
-#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED > 1060
- return [[FRAME_NS_VIEW (f) window] backingScaleFactor];
-#else
+#if defined (NS_IMPL_GNUSTEP) || !defined (MAC_OS_X_VERSION_10_7)
return [[FRAME_NS_VIEW (f) window] userSpaceScaleFactor];
+#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1070
+ if ([[FRAME_NS_VIEW (f) window]
+ respondsToSelector:@selector(backingScaleFactor:)])
+ return [[FRAME_NS_VIEW (f) window] backingScaleFactor];
+ else
+ return [[FRAME_NS_VIEW (f) window] userSpaceScaleFactor];
+#else
+ return [[FRAME_NS_VIEW (f) window] backingScaleFactor];
#endif
}
@@ -6943,7 +6960,7 @@ not_in_argv (NSString *arg)
[self mouseMoved: e];
}
-#ifdef NS_IMPL_COCOA
+#if defined NS_IMPL_COCOA && defined MAC_OS_X_VERSION_10_7
- (void) magnifyWithEvent: (NSEvent *) event
{
NSPoint pt = [self convertPoint: [event locationInWindow] fromView: nil];
@@ -8526,7 +8543,7 @@ not_in_argv (NSString *arg)
expected later. */
#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
- if ([child respondsToSelector:@selector(setAccessibilitySubrole:)])
+ if ([self respondsToSelector:@selector(setAccessibilitySubrole:)])
#endif
/* Set the accessibility subroles. */
if (parentFrame)
@@ -8558,7 +8575,7 @@ not_in_argv (NSString *arg)
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
- if ([ourView respondsToSelector:@selector (toggleFullScreen)]
+ if ([ourView respondsToSelector:@selector (toggleFullScreen)])
#endif
/* If we are the descendent of a fullscreen window and we
have no new parent, go fullscreen. */
@@ -8583,11 +8600,11 @@ not_in_argv (NSString *arg)
#ifdef NS_IMPL_COCOA
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
- if ([ourView respondsToSelector:@selector (toggleFullScreen)]
+ if ([ourView respondsToSelector:@selector (toggleFullScreen)])
#endif
- /* Child frames must not be fullscreen. */
- if ([ourView fsIsNative] && [ourView isFullscreen])
- [ourView toggleFullScreen:self];
+ /* Child frames must not be fullscreen. */
+ if ([ourView fsIsNative] && [ourView isFullscreen])
+ [ourView toggleFullScreen:self];
#endif
[parentWindow addChildWindow:self
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 96ec2ac7d0: Fix nsmenu compilation under macOS 10.6,
Alan Third <=