@@ -67,7 +67,7 @@ if (GUI STREQUAL "Cocoa") set(GUI_SOURCES ${COCOA_GUI_SOURCES}) endif(GUI STREQUAL "Cocoa") -set(VIM_DIR_PATH ".app/Contents/Resources/vim") +set(VIM_DIR_PATH "/Resources/vim") set(PATHDEF_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/pathdef.c") set(CONFIG_H "${CMAKE_CURRENT_BINARY_DIR}/auto/config.h") @@ -108,7 +108,7 @@ set_source_files_properties(${ICON_FILES} PROPERTIES set_source_files_properties(PSMTabBarControl.framework PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks) -add_executable(${PROGNAME} MACOSX_BUNDLE ${VIM_SOURCES} PSMTabBarControl.framework ${ICON_FILES}) +add_executable(${PROGNAME} MACOSX_BUNDLE ${VIM_SOURCES} ${ICON_FILES}) target_link_libraries(${PROGNAME} ${VIM_LIBRARIES}) # Variables used in pathdef.c.in @@ -144,9 +144,12 @@ set_target_properties(${PROGNAME} PROPERTIES # instead we just make a symlink from the source code position to here for # testing purpose. When we need to 'make install', another procedure will # be used to ensure these resource files and frameworks are correctly copied. -get_target_property(VIMAPP_LOCATION ${PROGNAME} LOCATION) +get_target_property(VIMEXE_LOCATION ${PROGNAME} LOCATION) -set(VIM_BUNDLE_FRAMEWORK_PATH "${VIMAPP_LOCATION}.app/Contents/Frameworks") +string(REPLACE "/MacOS/Vim" "" VIMAPP_LOCATION "${VIMEXE_LOCATION}") + +message("${VIMAPP_LOCATION}") +set(VIM_BUNDLE_FRAMEWORK_PATH "${VIMAPP_LOCATION}/Frameworks") set(PSMTBC_FRAMEWORK_PATH_IN_BUNDLE "${VIM_BUNDLE_FRAMEWORK_PATH}/PSMTabBarControl.framework") set(VIM_RUNTIME_PATH "${VIM_SOURCE_DIR}/../runtime") src/CMakeLists.txt @@ -176,7 +176,7 @@ static int VIMAlertTextFieldHeight = 22; @end -@interface VimAppController: NSObject +@interface VimAppController: NSObject <NSWindowDelegate> - (void) alertDidEnd:(VIMAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo; - (void) panelDidEnd:(NSSavePanel *)panel code:(int)code context:(void *)context; - (void) initializeApplicationTimer:(NSTimer *)timer; @@ -934,7 +934,7 @@ NSMenuItem *gui_mac_insert_menu_item(vimmenu_T *menu) action: @selector(menuAction:) keyEquivalent: @""]; [mac_menu_item setTarget: gui_mac.app_delegate]; - [mac_menu_item setTag: (int) menu]; + [mac_menu_item setTag: (NSInteger) menu]; alloc = 1; if (menu->actext != NULL) @@ -1357,7 +1357,7 @@ guicolor_T gui_mch_get_color(char_u *name) { if (STRICMP(name, "hilite") == 0) { - float red, green, blue, alpha; + CGFloat red, green, blue, alpha; [[NSColor highlightColor] getRed: &red green: &green blue: &blue @@ -2867,7 +2867,7 @@ didDragTabViewItem: (NSTabViewItem *) tabViewItem return nil; } -- (unsigned int) characterIndexForPoint:(NSPoint)thePoint +- (NSUInteger) characterIndexForPoint:(NSPoint)thePoint { // gui_mac_msg(MSG_DEBUG, @"characterIndexForPoint: x = %g, y = %g", thePoint.x, thePoint.y); return NSNotFound; @@ -3755,15 +3755,16 @@ int gui_mac_select_from_font_panel(char_u *font_name) - (void) setThumbValue:(long)value size:(long)size max:(long)max { - float fval = max - size + 1 > 0 ? (float) value / (max - size + 1) : 0; - float prop = (float) size / (max + 1); + double fval = max - size + 1 > 0 ? (float) value / (max - size + 1) : 0; + double prop = (double) size / (max + 1); if (fval < 0) fval = 0; else if (fval > 1.0f) fval = 1.0f; if (prop < 0) prop = 0; else if (prop > 1.0f) prop = 1.0f; - [self setFloatValue: fval knobProportion: prop]; + [self setDoubleValue: fval]; + [self setKnobProportion: prop]; } - (scrollbar_T *) vimScrollBar src/gui_mac.m @@ -93,7 +93,7 @@ 13F8B88A07B434F6008AE28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; }; 32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl_Prefix.pch; path = source/PSMTabBarControl_Prefix.pch; sourceTree = "<group>"; }; 53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PSMTabBarControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "PSMTabBarControlFramework-Info.plist"; sourceTree = "<group>"; }; + 53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PSMTabBarControlFramework-Info.plist"; sourceTree = "<group>"; }; 54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PSMTabBarControl.ibclassdescription; sourceTree = "<group>"; }; 8D1AC9730486D14A00FE50C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D1AC97B0486D23100FE50C9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; @@ -123,7 +123,7 @@ A251BE930959A23A0058BC7F /* TabClose_Front_Rollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabClose_Front_Rollover.tif; path = images/TabClose_Front_Rollover.tif; sourceTree = "<group>"; }; A251BE940959A23A0058BC7F /* TabClose_Front.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabClose_Front.tif; path = images/TabClose_Front.tif; sourceTree = "<group>"; }; A251BE9B0959A2530058BC7F /* ReadMe.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = ReadMe.rtfd; sourceTree = "<group>"; }; - A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = "<group>"; }; + A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = "<group>"; }; A251BEC30959BC0E0058BC7F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; }; A268E7F809A9822900E082AA /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNew.png; path = images/AquaTabNew.png; sourceTree = "<group>"; }; A268E7F909A9822900E082AA /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewPressed.png; path = images/AquaTabNewPressed.png; sourceTree = "<group>"; }; @@ -617,8 +617,8 @@ C056398108A954F8003078D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; @@ -686,10 +686,12 @@ C056398D08A954F8003078D8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = ""; }; name = Release; }; src/mac/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj @@ -141,8 +141,8 @@ static void bilinearShadedColor(void *info, const float *in, float *out) // draw gradient colorspace = CGColorSpaceCreateDeviceRGB(); size_t components = 1 + CGColorSpaceGetNumberOfComponents(colorspace); - static const float domain[2] = {0.0, 1.0}; - static const float range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1}; + static const CGFloat domain[2] = {0.0, 1.0}; + static const CGFloat range[10] = {0, 1, 0, 1, 0, 1, 0, 1, 0, 1}; //static const CGFunctionCallbacks callbacks = {0, &bilinearShadedColor, NULL}; // Create a CGFunctionRef that describes a function taking 1 input and kChannelsPerColor outputs. src/mac/PSMTabBarControl/source/NSBezierPath_AMShading.m @@ -39,7 +39,7 @@ enum { PSMTab_PositionSingleMask = 1 << 7 }; -@interface PSMTabBarControl : NSControl { +@interface PSMTabBarControl : NSControl <NSTabViewDelegate> { // control basics NSMutableArray *_cells; // the cells that draw the tabs src/mac/PSMTabBarControl/source/PSMTabBarControl.h @@ -393,7 +393,7 @@ [bindingOptions setObject:NSNegateBooleanTransformerName forKey:@"NSValueTransformerName"]; [[cell indicator] bind:@"animate" toObject:[item identifier] withKeyPath:@"selection.isProcessing" options:nil]; [[cell indicator] bind:@"hidden" toObject:[item identifier] withKeyPath:@"selection.isProcessing" options:bindingOptions]; - [[item identifier] addObserver:self forKeyPath:@"selection.isProcessing" options:nil context:nil]; + [[item identifier] addObserver:self forKeyPath:@"selection.isProcessing" options:0 context:nil]; } } } @@ -406,7 +406,7 @@ NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary]; [bindingOptions setObject:NSIsNotNilTransformerName forKey:@"NSValueTransformerName"]; [cell bind:@"hasIcon" toObject:[item identifier] withKeyPath:@"selection.icon" options:bindingOptions]; - [[item identifier] addObserver:self forKeyPath:@"selection.icon" options:nil context:nil]; + [[item identifier] addObserver:self forKeyPath:@"selection.icon" options:0 context:nil]; } } } @@ -417,7 +417,7 @@ if([[item identifier] respondsToSelector:@selector(content)]){ if([[[[cell representedObject] identifier] content] respondsToSelector:@selector(objectCount)]){ [cell bind:@"count" toObject:[item identifier] withKeyPath:@"selection.objectCount" options:nil]; - [[item identifier] addObserver:self forKeyPath:@"selection.objectCount" options:nil context:nil]; + [[item identifier] addObserver:self forKeyPath:@"selection.objectCount" options:0 context:nil]; } } } @@ -965,7 +965,7 @@ } // NSDraggingSource -- (unsigned int)draggingSourceOperationMaskForLocal:(BOOL)isLocal +- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal { return (isLocal ? NSDragOperationMove : NSDragOperationNone); } @@ -1026,7 +1026,7 @@ #if 1 // HACK! Notify the delegate that a tab was dragged to a new position. if (delegate && [delegate respondsToSelector:@selector(tabView:didDragTabViewItem:toIndex:)]) { - int idx = [[self representedTabViewItems] indexOfObject:tvi]; + NSUInteger idx = [[self representedTabViewItems] indexOfObject:tvi]; if (NSNotFound != idx) { [delegate tabView:[self tabView] didDragTabViewItem:tvi toIndex:idx]; } @@ -1189,7 +1189,7 @@ { if([self delegate]){ if([[self delegate] respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)]){ - return (int)[[self delegate] performSelector:@selector(tabView:shouldSelectTabViewItem:) withObject:aTabView withObject:tabViewItem]; + return (NSInteger)[[self delegate] performSelector:@selector(tabView:shouldSelectTabViewItem:) withObject:aTabView withObject:tabViewItem]; } else { return YES; } src/mac/PSMTabBarControl/source/PSMTabBarControl.m d4686259542202089ea3a381dda1fe6eab5f533a Jjgod Jiang gzjjgod@gmail.com http://github.com/jjgod/vim-cocoa/commit/b8e77b25b95b1d25454307ad2c487abdd5f30f31 b8e77b25b95b1d25454307ad2c487abdd5f30f31 2009-06-17T04:02:36-07:00 2009-06-17T04:02:36-07:00 Mac OS X 10.6 support, unfinished 5104f5c693f78b8c04c9249d51cc9fd7fca7f244 Jjgod Jiang gzjjgod@gmail.com