From ef6ff61043ab54c2b374bf33f0eb4dc9c78490cc Mon Sep 17 00:00:00 2001 From: "bjorn.winckler" Date: Mon, 17 Sep 2007 19:43:57 +0000 Subject: [PATCH] Removed 'wait' parameter from [MMVimController sendMessage:] git-svn-id: http://macvim.googlecode.com/svn/trunk@238 96c4425d-ca35-0410-94e5-3396d5c13a8f --- MMAppController.m | 2 +- MMTextView.m | 23 +++++++++++------------ MMVimController.h | 4 ++-- MMVimController.m | 10 +++++----- MMWindowController.m | 23 +++++++++++------------ 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/MMAppController.m b/MMAppController.m index 4c6c8b45..0a74902a 100644 --- a/MMAppController.m +++ b/MMAppController.m @@ -467,7 +467,7 @@ static NSTimeInterval MMTerminateTimeout = 3; MMVimController *vc = [self topmostVimController]; if (vc) { // Open a new tab first, since dropString: does not do this. - [vc sendMessage:AddNewTabMsgID data:nil wait:NO]; + [vc sendMessage:AddNewTabMsgID data:nil]; [vc dropString:[pboard stringForType:NSStringPboardType]]; } else { // NOTE: There is no window to paste the selection into, so save the diff --git a/MMTextView.m b/MMTextView.m index a9afde9e..6c2ff701 100644 --- a/MMTextView.m +++ b/MMTextView.m @@ -202,8 +202,7 @@ static NSString *MMKeypadEnterString = @"KA"; string = [string string]; [[self vimController] sendMessage:InsertTextMsgID - data:[string dataUsingEncoding:NSUTF8StringEncoding] - wait:NO]; + data:[string dataUsingEncoding:NSUTF8StringEncoding]]; } @@ -305,7 +304,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&len length:sizeof(int)]; [data appendBytes:[unmodchars UTF8String] length:len]; - [[self vimController] sendMessage:CmdKeyMsgID data:data wait:NO]; + [[self vimController] sendMessage:CmdKeyMsgID data:data]; return YES; } @@ -443,7 +442,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&flags length:sizeof(int)]; [data appendBytes:&dy length:sizeof(float)]; - [[self vimController] sendMessage:ScrollWheelMsgID data:data wait:NO]; + [[self vimController] sendMessage:ScrollWheelMsgID data:data]; } - (void)mouseDown:(NSEvent *)event @@ -474,7 +473,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&flags length:sizeof(int)]; [data appendBytes:&count length:sizeof(int)]; - [[self vimController] sendMessage:MouseDownMsgID data:data wait:NO]; + [[self vimController] sendMessage:MouseDownMsgID data:data]; } - (void)rightMouseDown:(NSEvent *)event @@ -501,7 +500,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&col length:sizeof(int)]; [data appendBytes:&flags length:sizeof(int)]; - [[self vimController] sendMessage:MouseUpMsgID data:data wait:NO]; + [[self vimController] sendMessage:MouseUpMsgID data:data]; isDragging = NO; } @@ -532,7 +531,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&col length:sizeof(int)]; [data appendBytes:&flags length:sizeof(int)]; - [[self vimController] sendMessage:MouseDraggedMsgID data:data wait:NO]; + [[self vimController] sendMessage:MouseDraggedMsgID data:data]; } dragPoint = pt; @@ -575,7 +574,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&row length:sizeof(int)]; [data appendBytes:&col length:sizeof(int)]; - [[self vimController] sendMessage:MouseMovedMsgID data:data wait:NO]; + [[self vimController] sendMessage:MouseMovedMsgID data:data]; } } @@ -603,7 +602,7 @@ static NSString *MMKeypadEnterString = @"KA"; int shape = 0; NSMutableData *data = [NSMutableData data]; [data appendBytes:&shape length:sizeof(int)]; - [[self vimController] sendMessage:SetMouseShapeMsgID data:data wait:NO]; + [[self vimController] sendMessage:SetMouseShapeMsgID data:data]; } } @@ -726,7 +725,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&len length:sizeof(unsigned)]; [data appendBytes:[name UTF8String] length:len]; - [[self vimController] sendMessage:SetFontMsgID data:data wait:NO]; + [[self vimController] sendMessage:SetFontMsgID data:data]; } } } @@ -897,7 +896,7 @@ static NSString *MMKeypadEnterString = @"KA"; [data appendBytes:&col length:sizeof(int)]; [data appendBytes:&dragFlags length:sizeof(int)]; - [[self vimController] sendMessage:MouseDraggedMsgID data:data wait:NO]; + [[self vimController] sendMessage:MouseDraggedMsgID data:data]; isAutoscrolling = YES; } @@ -933,7 +932,7 @@ static NSString *MMKeypadEnterString = @"KA"; [NSCursor setHiddenUntilMouseMoves:YES]; //NSLog(@"%s len=%d chars=0x%x", _cmd, len, chars[0]); - [[self vimController] sendMessage:KeyDownMsgID data:data wait:NO]; + [[self vimController] sendMessage:KeyDownMsgID data:data]; } } diff --git a/MMVimController.h b/MMVimController.h index 2179b751..ec6c543e 100644 --- a/MMVimController.h +++ b/MMVimController.h @@ -12,7 +12,7 @@ #import "MacVim.h" -// If sendMessage:: fails, store the message and resend after a delay. +// If sendMessage: fails, store the message and resend after a delay. #define MM_RESEND_LAST_FAILURE 1 @@ -50,7 +50,7 @@ - (void)cleanup; - (void)dropFiles:(NSArray *)filenames; - (void)dropString:(NSString *)string; -- (void)sendMessage:(int)msgid data:(NSData *)data wait:(BOOL)wait; +- (void)sendMessage:(int)msgid data:(NSData *)data; @end diff --git a/MMVimController.m b/MMVimController.m index b28a3266..ea3ca67c 100644 --- a/MMVimController.m +++ b/MMVimController.m @@ -25,7 +25,7 @@ static int MMAlertTextFieldHeight = 22; // be delivered instantly; otherwise there is a possibility that MacVim will // 'beachball' while waiting to deliver DO messages to an unresponsive Vim // process. This means that you cannot rely on any message sent with -// sendMessage:: to actually reach Vim. +// sendMessage: to actually reach Vim. static NSTimeInterval MMBackendProxyRequestTimeout = 0; #if MM_RESEND_LAST_FAILURE @@ -204,7 +204,7 @@ static NSMenuItem *findMenuItemWithTagInMenu(NSMenu *root, int tag) } } - [self sendMessage:DropFilesMsgID data:data wait:NO]; + [self sendMessage:DropFilesMsgID data:data]; } - (void)dropString:(NSString *)string @@ -216,11 +216,11 @@ static NSMenuItem *findMenuItemWithTagInMenu(NSMenu *root, int tag) [data appendBytes:&len length:sizeof(int)]; [data appendBytes:[string UTF8String] length:len]; - [self sendMessage:DropStringMsgID data:data wait:NO]; + [self sendMessage:DropStringMsgID data:data]; } } -- (void)sendMessage:(int)msgid data:(NSData *)data wait:(BOOL)wait +- (void)sendMessage:(int)msgid data:(NSData *)data { //NSLog(@"sendMessage:%s (isInitialized=%d inProcessCommandQueue=%d)", // MessageStrings[msgid], isInitialized, inProcessCommandQueue); @@ -1207,7 +1207,7 @@ static NSMenuItem *findMenuItemWithTagInMenu(NSMenu *root, int tag) data = [resendData copy]; //NSLog(@"Resending message: %s", MessageStrings[msgid]); - [self sendMessage:msgid data:data wait:NO]; + [self sendMessage:msgid data:data]; } #endif diff --git a/MMWindowController.m b/MMWindowController.m index 3f5d9237..a691ff9a 100644 --- a/MMWindowController.m +++ b/MMWindowController.m @@ -554,12 +554,12 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) // NOTE! This can get called a lot if the user holds down the key // equivalent for this action, which causes the ports to fill up. If we // wait for the message to be sent then the app might become unresponsive. - [vimController sendMessage:AddNewTabMsgID data:nil wait:NO]; + [vimController sendMessage:AddNewTabMsgID data:nil]; } - (IBAction)toggleToolbar:(id)sender { - [vimController sendMessage:ToggleToolbarMsgID data:nil wait:NO]; + [vimController sendMessage:ToggleToolbarMsgID data:nil]; } @@ -584,7 +584,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) int idx = [self representedIndexOfTabViewItem:tabViewItem]; if (NSNotFound != idx) { NSData *data = [NSData dataWithBytes:&idx length:sizeof(int)]; - [vimController sendMessage:SelectTabMsgID data:data wait:YES]; + [vimController sendMessage:SelectTabMsgID data:data]; } } @@ -602,7 +602,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) int idx = [self representedIndexOfTabViewItem:tabViewItem]; //NSLog(@"Closing tab with index %d", idx); NSData *data = [NSData dataWithBytes:&idx length:sizeof(int)]; - [vimController sendMessage:CloseTabMsgID data:data wait:YES]; + [vimController sendMessage:CloseTabMsgID data:data]; return NO; } @@ -613,7 +613,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) NSMutableData *data = [NSMutableData data]; [data appendBytes:&idx length:sizeof(int)]; - [vimController sendMessage:DraggedTabMsgID data:data wait:YES]; + [vimController sendMessage:DraggedTabMsgID data:data]; } @@ -623,7 +623,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) - (void)windowDidBecomeMain:(NSNotification *)notification { - [vimController sendMessage:GotFocusMsgID data:nil wait:NO]; + [vimController sendMessage:GotFocusMsgID data:nil]; if (textStorage) [[NSFontManager sharedFontManager] setSelectedFont:[textStorage font] @@ -632,7 +632,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) - (void)windowDidResignMain:(NSNotification *)notification { - [vimController sendMessage:LostFocusMsgID data:nil wait:NO]; + [vimController sendMessage:LostFocusMsgID data:nil]; if (textView) [textView hideMarkedTextField]; @@ -640,7 +640,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) - (BOOL)windowShouldClose:(id)sender { - [vimController sendMessage:VimShouldCloseMsgID data:nil wait:YES]; + [vimController sendMessage:VimShouldCloseMsgID data:nil]; return NO; } @@ -891,7 +891,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) NSMutableData *data = [NSMutableData data]; [data appendBytes:&tag length:sizeof(int)]; - [vimController sendMessage:ExecuteMenuMsgID data:data wait:NO]; + [vimController sendMessage:ExecuteMenuMsgID data:data]; } - (MMScroller *)scrollbarForIdentifier:(long)ident index:(unsigned *)idx @@ -1078,7 +1078,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) [data appendBytes:&hitPart length:sizeof(int)]; [data appendBytes:&value length:sizeof(float)]; - [vimController sendMessage:ScrollbarEventMsgID data:data wait:NO]; + [vimController sendMessage:ScrollbarEventMsgID data:data]; } - (void)placeViews @@ -1105,8 +1105,7 @@ NSMutableArray *buildMenuAddress(NSMenu *menu) // NOTE! This can get called a lot when in live resize, which causes // the connection buffers to fill up. If we wait for the message to be // sent then the app might become unresponsive. - [vimController sendMessage:SetTextDimensionsMsgID data:data - wait:![textView inLiveResize]]; + [vimController sendMessage:SetTextDimensionsMsgID data:data]; } [textView setFrame:textViewRect]; -- 2.11.4.GIT