Add proxy icon support

src/MacVim/MMBackend.h

@@ -83,6 +83,7 @@
 - (void)showTabBar:(BOOL)enable;
 - (void)setRows:(int)rows columns:(int)cols;
 - (void)setWindowTitle:(char *)title;
+- (void)setDocumentFilename:(char *)filename;
 - (char *)browseForFileInDirectory:(char *)dir title:(char *)title
                             saving:(int)saving;
 - (int)presentDialogWithType:(int)type title:(char *)title message:(char *)msg

src/MacVim/MMBackend.m

@@ -641,6 +641,18 @@ static NSString *MMSymlinkWarningString =
     [self queueMessage:SetWindowTitleMsgID data:data];
 }
 
+- (void)setDocumentFilename:(char *)filename
+{
+    NSMutableData *data = [NSMutableData data];
+    int len = filename ? strlen(filename) : 0;
+
+    [data appendBytes:&len length:sizeof(int)];
+    if (len > 0)
+        [data appendBytes:filename length:len];
+
+    [self queueMessage:SetDocumentFilenameMsgID data:data];
+}
+
 - (char *)browseForFileInDirectory:(char *)dir title:(char *)title
                             saving:(int)saving
 {

src/MacVim/MMVimController.m

@@ -685,6 +685,20 @@ static BOOL isUnsafeMessage(int msgid);
         [windowController setTitle:string];
 
         [string release];
+    } else if (SetDocumentFilenameMsgID == msgid) {
+        const void *bytes = [data bytes];
+        int len = *((int*)bytes);  bytes += sizeof(int);
+
+        if (len > 0) {
+            NSString *filename = [[NSString alloc] initWithBytes:(void*)bytes
+                    length:len encoding:NSUTF8StringEncoding];
+
+            [windowController setDocumentFilename:filename];
+
+            [filename release];
+        } else {
+            [windowController setDocumentFilename:@""];
+        }
     } else if (AddMenuMsgID == msgid) {
         NSDictionary *attrs = [NSDictionary dictionaryWithData:data];
         [self addMenuWithDescriptor:[attrs objectForKey:@"descriptor"]

src/MacVim/MMWindowController.h

@@ -40,6 +40,7 @@
 - (void)selectTabWithIndex:(int)idx;
 - (void)setTextDimensionsWithRows:(int)rows columns:(int)cols live:(BOOL)live;
 - (void)setTitle:(NSString *)title;
+- (void)setDocumentFilename:(NSString *)filename;
 - (void)setToolbar:(NSToolbar *)toolbar;
 - (void)createScrollbarWithIdentifier:(long)ident type:(int)type;
 - (BOOL)destroyScrollbarWithIdentifier:(long)ident;

src/MacVim/MMWindowController.m

@@ -314,6 +314,12 @@
     }
 }
 
+- (void)setDocumentFilename:(NSString *)filename
+{
+    if (filename)
+        [decoratedWindow setRepresentedFilename:filename];
+}
+
 - (void)setToolbar:(NSToolbar *)toolbar
 {
     // The full-screen window has no toolbar.

src/MacVim/MacVim.h

@@ -168,6 +168,7 @@ enum {
     EnableAntialiasMsgID,
     DisableAntialiasMsgID,
     SetVimStateMsgID,
+    SetDocumentFilenameMsgID,
 };
 
 

src/MacVim/MacVim.m

@@ -76,6 +76,7 @@ char *MessageStrings[] =
     "EnableAntialiasMsgID",
     "DisableAntialiasMsgID",
     "SetVimStateMsgID",
+    "SetDocumentFilenameMsgID",
 };
 
 

src/MacVim/gui_macvim.m

@@ -1532,7 +1532,12 @@ gui_mch_settitle(char_u *title, char_u *icon)
     title = CONVERT_TO_UTF8(title);
 #endif
 
-    [[MMBackend sharedInstance] setWindowTitle:(char*)title];
+    MMBackend *backend = [MMBackend sharedInstance];
+    [backend setWindowTitle:(char*)title];
+
+    // TODO: Convert filename to UTF-8?
+    if (curbuf)
+        [backend setDocumentFilename:(char*)curbuf->b_ffname];
 
 #ifdef FEAT_MBYTE
     CONVERT_TO_UTF8_FREE(title);
@@ -1825,6 +1830,7 @@ odb_event(buf_T *buf, const AEEventID action)
                                    bytes:&buf->b_odb_server_id
                                   length:sizeof(OSType)];
 
+    // TODO: Convert b_ffname to UTF-8?
     NSString *path = [NSString stringWithUTF8String:(char*)buf->b_ffname];
     NSData *pathData = [[[NSURL fileURLWithPath:path] absoluteString]
             dataUsingEncoding:NSUTF8StringEncoding];