Skip to content

Commit fa649b7

Browse files
splhacksplhack
authored
Merge pull request #369 from macvim-dev/fix/warnings
Suppress warnings 2nd round for Xcode 8
2 parents 8839232 + f701767 commit fa649b7

File tree

10 files changed

+49
-32
lines changed

10 files changed

+49
-32
lines changed

‎src/MacVim/DBPrefsWindowController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ - (void)crossFadeView:(NSView *)oldView withView:(NSView *)newView
349349
{
350350
[viewAnimation stopAnimation];
351351

352-
if ([self shiftSlowsAnimation] && [[[self window] currentEvent] modifierFlags] & NSShiftKeyMask)
352+
if ([self shiftSlowsAnimation] && [[[self window] currentEvent] modifierFlags] & NSEventModifierFlagShift)
353353
[viewAnimation setDuration:1.25];
354354
else
355355
[viewAnimation setDuration:0.25];

‎src/MacVim/MMAppController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,7 @@ - (void)preloadVimController:(id)sender
18691869
// background, the runloop won't bother flushing the autorelease pool.
18701870
// Triggering an NSEvent works around this.
18711871
// http://www.mikeash.com/pyblog/more-fun-with-autorelease.html
1872-
NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
1872+
NSEvent* event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
18731873
location:NSZeroPoint
18741874
modifierFlags:0
18751875
timestamp:0

‎src/MacVim/MMApplication.m‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ - (void)sendEvent:(NSEvent *)event
2727
// help mode' (the keyDown: event itself never reaches the text view). By
2828
// clearing the 'help key flag' this event will be treated like a normal
2929
// key event.
30-
if ((NSKeyDown == type || NSKeyUp == type) && (flags & NSHelpKeyMask)) {
31-
flags &= ~NSHelpKeyMask;
30+
if ((NSEventTypeKeyDown == type || NSEventTypeKeyUp == type) &&
31+
(flags & NSEventModifierFlagHelp)) {
32+
flags &= ~NSEventModifierFlagHelp;
3233
event = [NSEvent keyEventWithType:[event type]
3334
location:[event locationInWindow]
3435
modifierFlags:flags
3536
timestamp:[event timestamp]
3637
windowNumber:[event windowNumber]
37-
context:[event context]
38+
context:nil // [event context] is always nil
3839
characters:[event characters]
3940
charactersIgnoringModifiers:[event charactersIgnoringModifiers]
4041
isARepeat:[event isARepeat]

‎src/MacVim/MMBackend.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3173,11 +3173,11 @@ static int eventModifierFlagsToVimModMask(int modifierFlags)
31733173
{
31743174
int modMask = 0;
31753175

3176-
if (modifierFlags & NSShiftKeyMask)
3176+
if (modifierFlags & NSEventModifierFlagShift)
31773177
modMask |= MOD_MASK_SHIFT;
3178-
if (modifierFlags & NSControlKeyMask)
3178+
if (modifierFlags & NSEventModifierFlagControl)
31793179
modMask |= MOD_MASK_CTRL;
3180-
if (modifierFlags & NSAlternateKeyMask)
3180+
if (modifierFlags & NSEventModifierFlagOption)
31813181
modMask |= MOD_MASK_ALT;
31823182
if (modifierFlags & NSEventModifierFlagCommand)
31833183
modMask |= MOD_MASK_CMD;
@@ -3189,11 +3189,11 @@ static int eventModifierFlagsToVimMouseModMask(int modifierFlags)
31893189
{
31903190
int modMask = 0;
31913191

3192-
if (modifierFlags & NSShiftKeyMask)
3192+
if (modifierFlags & NSEventModifierFlagShift)
31933193
modMask |= MOUSE_SHIFT;
3194-
if (modifierFlags & NSControlKeyMask)
3194+
if (modifierFlags & NSEventModifierFlagControl)
31953195
modMask |= MOUSE_CTRL;
3196-
if (modifierFlags & NSAlternateKeyMask)
3196+
if (modifierFlags & NSEventModifierFlagOption)
31973197
modMask |= MOUSE_ALT;
31983198

31993199
return modMask;

‎src/MacVim/MMCoreTextView+ToolTip.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ - (void)_removeTrackingRects:(NSTrackingRectTag *)tags count:(int)count
150150
}
151151
}
152152

153-
// Sends a fake NSMouseExited event to the view for its current tracking rect.
153+
// Sends a fake NSEventTypeMouseExited event to the view for its current tracking rect.
154154
- (void)_sendToolTipMouseExited
155155
{
156156
// Nothing matters except window, trackingNumber, and userData.
157157
int windowNumber = [[self window] windowNumber];
158-
NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseExited
158+
NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseExited
159159
location:NSMakePoint(0, 0)
160160
modifierFlags:0
161161
timestamp:0
@@ -167,12 +167,12 @@ - (void)_sendToolTipMouseExited
167167
[trackingRectOwner_ mouseExited:fakeEvent];
168168
}
169169

170-
// Sends a fake NSMouseEntered event to the view for its current tracking rect.
170+
// Sends a fake NSEventTypeMouseEntered event to the view for its current tracking rect.
171171
- (void)_sendToolTipMouseEntered
172172
{
173173
// Nothing matters except window, trackingNumber, and userData.
174174
int windowNumber = [[self window] windowNumber];
175-
NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSMouseEntered
175+
NSEvent *fakeEvent = [NSEvent enterExitEventWithType:NSEventTypeMouseEntered
176176
location:NSMakePoint(0, 0)
177177
modifierFlags:0
178178
timestamp:0

‎src/MacVim/MMCoreTextView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ - (void)batchDrawData:(NSData *)data
910910
numColumns:width];
911911
[signImg drawInRect:r
912912
fromRect:NSZeroRect
913-
operation:NSCompositeSourceOver
913+
operation:NSCompositingOperationSourceOver
914914
fraction:1.0];
915915
} else if (DrawStringDrawType == type) {
916916
int bg = *((int*)bytes); bytes += sizeof(int);

‎src/MacVim/MMFullScreenWindow.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ - (MMFullScreenWindow *)initWithWindow:(NSWindow *)t view:(MMVimView *)v
6767
// (another way would be to make the existing window large enough that the
6868
// title bar is off screen. but that doesn't work with multiple screens).
6969
self = [super initWithContentRect:[screen frame]
70-
styleMask:NSBorderlessWindowMask
70+
styleMask:NSWindowStyleMaskBorderless
7171
backing:NSBackingStoreBuffered
7272
defer:YES
7373
// since we're passing [screen frame] above,

‎src/MacVim/MMTextViewHelper.m‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,13 @@ - (void)keyDown:(NSEvent *)event
158158
// ASCII chars in the range after space (0x20) and before backspace (0x7f).
159159
// Note that this implies that 'mmta' (if enabled) breaks input methods
160160
// when the Alt key is held.
161-
if ((flags & NSAlternateKeyMask) && [mmta boolValue] && [unmod length] == 1
161+
if ((flags & NSEventModifierFlagOption)
162+
&& [mmta boolValue] && [unmod length] == 1
162163
&& [unmod characterAtIndex:0] > 0x20) {
163164
ASLogDebug(@"MACMETA key, don't interpret it");
164165
string = unmod;
165-
} else if (imState && (flags & NSControlKeyMask)
166-
&& !(flags & (NSAlternateKeyMask|NSEventModifierFlagCommand))
166+
} else if (imState && (flags & NSEventModifierFlagControl)
167+
&& !(flags & (NSEventModifierFlagOption|NSEventModifierFlagCommand))
167168
&& [unmod length] == 1
168169
&& ([unmod characterAtIndex:0] == '6' ||
169170
[unmod characterAtIndex:0] == '^')) {
@@ -186,8 +187,9 @@ - (void)keyDown:(NSEvent *)event
186187
// following heuristic seems to work but it may have to change.
187188
// Note that the Shift and Alt flags may also need to be cleared
188189
// (see doKeyDown:keyCode:modifiers: in MMBackend).
189-
if ((flags & NSShiftKeyMask && !(flags & NSAlternateKeyMask))
190-
|| flags & NSControlKeyMask)
190+
if ((flags & NSEventModifierFlagShift
191+
&& !(flags & NSEventModifierFlagOption))
192+
|| flags & NSEventModifierFlagControl)
191193
string = unmod;
192194
}
193195
}
@@ -339,12 +341,12 @@ - (void)mouseDown:(NSEvent *)event
339341
// If desired, intepret Ctrl-Click as a right mouse click.
340342
BOOL translateCtrlClick = [[NSUserDefaults standardUserDefaults]
341343
boolForKey:MMTranslateCtrlClickKey];
342-
flags = flags & NSDeviceIndependentModifierFlagsMask;
344+
flags = flags & NSEventModifierFlagDeviceIndependentFlagsMask;
343345
if (translateCtrlClick && button == 0 &&
344-
(flags == NSControlKeyMask ||
345-
flags == (NSControlKeyMask|NSAlphaShiftKeyMask))) {
346+
(flags == NSEventModifierFlagControl || flags ==
347+
(NSEventModifierFlagControl|NSEventModifierFlagCapsLock))) {
346348
button = 1;
347-
flags &= ~NSControlKeyMask;
349+
flags &= ~NSEventModifierFlagControl;
348350
}
349351

350352
[data appendBytes:&row length:sizeof(int)];
@@ -853,7 +855,7 @@ - (void)doKeyDown:(NSString *)key
853855

854856
// The low 16 bits are not used for modifier flags by NSEvent. Use
855857
// these bits for custom flags.
856-
flags &= NSDeviceIndependentModifierFlagsMask;
858+
flags &= NSEventModifierFlagDeviceIndependentFlagsMask;
857859
if ([currentEvent isARepeat])
858860
flags |= 1;
859861

@@ -886,8 +888,8 @@ - (void)doInsertText:(NSString *)text
886888
// HACK! Keys on the numeric key pad are treated as special keys by Vim
887889
// so we need to pass on key code and modifier flags in this situation.
888890
unsigned mods = [currentEvent modifierFlags];
889-
if (mods & NSNumericPadKeyMask) {
890-
flags = mods & NSDeviceIndependentModifierFlagsMask;
891+
if (mods & NSEventModifierFlagNumericPad) {
892+
flags = mods & NSEventModifierFlagDeviceIndependentFlagsMask;
891893
keyCode = [currentEvent keyCode];
892894
}
893895

‎src/MacVim/MacVim.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,24 @@
4141
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
4242
// Deprecated constants in 10.12 SDK
4343
# define NSAlertStyleWarning NSWarningAlertStyle
44+
# define NSCompositingOperationSourceOver NSCompositeSourceOver
4445
# define NSControlSizeRegular NSRegularControlSize
46+
# define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
4547
# define NSEventModifierFlagCommand NSCommandKeyMask
48+
# define NSEventModifierFlagControl NSControlKeyMask
49+
# define NSEventModifierFlagDeviceIndependentFlagsMask NSDeviceIndependentModifierFlagsMask
50+
# define NSEventModifierFlagHelp NSHelpKeyMask
51+
# define NSEventModifierFlagNumericPad NSNumericPadKeyMask
52+
# define NSEventModifierFlagOption NSAlternateKeyMask
53+
# define NSEventModifierFlagShift NSShiftKeyMask
54+
# define NSEventTypeApplicationDefined NSApplicationDefined
55+
# define NSEventTypeKeyDown NSKeyDown
56+
# define NSEventTypeKeyUp NSKeyUp
4657
# define NSEventTypeLeftMouseUp NSLeftMouseUp
58+
# define NSEventTypeMouseEntered NSMouseEntered
59+
# define NSEventTypeMouseExited NSMouseExited
4760
# define NSEventTypeRightMouseDown NSRightMouseDown
61+
# define NSWindowStyleMaskBorderless NSBorderlessWindowMask
4862
# define NSWindowStyleMaskClosable NSClosableWindowMask
4963
# define NSWindowStyleMaskFullScreen NSFullScreenWindowMask
5064
# define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask

‎src/MacVim/gui_macvim.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2247,11 +2247,11 @@ static int vimModMaskToEventModifierFlags(int mods)
22472247
int flags = 0;
22482248

22492249
if (mods & MOD_MASK_SHIFT)
2250-
flags |= NSShiftKeyMask;
2250+
flags |= NSEventModifierFlagShift;
22512251
if (mods & MOD_MASK_CTRL)
2252-
flags |= NSControlKeyMask;
2252+
flags |= NSEventModifierFlagControl;
22532253
if (mods & MOD_MASK_ALT)
2254-
flags |= NSAlternateKeyMask;
2254+
flags |= NSEventModifierFlagOption;
22552255
if (mods & MOD_MASK_CMD)
22562256
flags |= NSEventModifierFlagCommand;
22572257

0 commit comments

Comments
 (0)