Merge remote-tracking branch 'vim/master'

Author: splhack

src/MacVim/MMBackend.h

@@ -156,8 +156,8 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 - (BOOL)imState;
 - (void)setImState:(BOOL)activated;
 
-- (void)addChannel:(int)idx fileDescriptor:(int)fd;
-- (void)removeChannel:(int)idx;
+- (void)addChannel:(channel_T *)channel;
+- (void)removeChannel:(channel_T *)channel;
 
 #ifdef FEAT_BEVAL
 - (void)setLastToolTip:(NSString *)toolTip;

src/MacVim/MMBackend.m

@@ -168,7 +168,7 @@ @interface MMChannel : NSObject {
     CFRunLoopSourceRef  runLoopSource;
 }
 
-- (id)initWithIndex:(int)idx fileDescriptor:(int)fd;
+- (id)initWithChannel:(channel_T *)channel;
 @end
 
 
@@ -1684,20 +1684,17 @@ - (void)setImState:(BOOL)activated
     [self flushQueue:YES];
 }
 
-- (void)addChannel:(int)idx fileDescriptor:(int)fd
+- (void)addChannel:(channel_T *)channel
 {
-    if (fd == -1)
-        return;
-
-    NSNumber *key = [NSNumber numberWithInt:idx];
-    MMChannel *channel =
-        [[[MMChannel alloc] initWithIndex:idx fileDescriptor:fd] autorelease];
-    [channelDict setObject:channel forKey:key];
+    NSValue *key = [NSValue valueWithPointer:channel];
+    MMChannel *mmChannel =
+        [[[MMChannel alloc] initWithChannel:channel] autorelease];
+    [channelDict setObject:mmChannel forKey:key];
 }
 
-- (void)removeChannel:(int)idx
+- (void)removeChannel:(channel_T *)channel
 {
-    NSNumber *key = [NSNumber numberWithInt:idx];
+    NSValue *key = [NSValue valueWithPointer:channel];
     [channelDict removeObjectForKey:key];
 }
 
@@ -3432,20 +3429,19 @@ static void socketReadCallback(CFSocketRef s,
                                void *info)
 {
 #ifdef FEAT_CHANNEL
-    int idx = (int)(intptr_t)info;
-    channel_read(idx, FALSE, "socketReadCallback");
+    channel_read((channel_T *)info, FALSE, "socketReadCallback");
 #endif
 }
 
-- (id)initWithIndex:(int)idx fileDescriptor:(int)fd
+- (id)initWithChannel:(channel_T *)channel
 {
     self = [super init];
     if (!self) return nil;
 
     // Tell CFRunLoop that we are interested in channel socket input.
-    CFSocketContext ctx = {0, (void *)(intptr_t)idx, NULL, NULL, NULL};
+    CFSocketContext ctx = {0, channel, NULL, NULL, NULL};
     socket = CFSocketCreateWithNative(kCFAllocatorDefault,
-                                      fd,
+                                      channel->ch_sock,
                                       kCFSocketReadCallBack,
                                       &socketReadCallback,
                                       &ctx);

src/MacVim/gui_macvim.m

@@ -2242,15 +2242,15 @@ static int vimModMaskToEventModifierFlags(int mods)
 // -- Channel Support ------------------------------------------------------
 
     void
-gui_macvim_add_channel(int idx, int fd)
+gui_macvim_add_channel(channel_T *channel)
 {
-    [[MMBackend sharedInstance] addChannel:idx fileDescriptor:fd];
+    [[MMBackend sharedInstance] addChannel:channel];
 }
 
     void
-gui_macvim_remove_channel(int idx)
+gui_macvim_remove_channel(channel_T *channel)
 {
-    [[MMBackend sharedInstance] removeChannel:idx];
+    [[MMBackend sharedInstance] removeChannel:channel];
 }