diff --git a/src/MacVim/DBPrefsWindowController.h b/src/MacVim/DBPrefsWindowController.h index 74ca024f1a..20dc300744 100644 --- a/src/MacVim/DBPrefsWindowController.h +++ b/src/MacVim/DBPrefsWindowController.h @@ -42,11 +42,8 @@ #import -@interface DBPrefsWindowController : NSWindowController -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060) - // 10.6 has turned delegate messages into formal protocols - -#endif +@interface DBPrefsWindowController : NSWindowController { NSMutableArray *toolbarIdentifiers; NSMutableDictionary *toolbarViews; diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib index 8a7b8adefa..83fcd54b7d 100644 --- a/src/MacVim/English.lproj/Preferences.nib/designable.nib +++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib @@ -1,1719 +1,276 @@ - - - - 1050 - 12A269 - 2549 - 1187 - 624.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2549 - - - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSMatrix - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSTextField - NSTextFieldCell - NSUserDefaultsController - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - MMPreferenceController - - - FirstResponder - - - NSApplication - - - YES - - - - 268 - - - - 256 - {{17, 162}, {187, 17}} - - - - YES - - 67108864 - 71303168 - Open files from applications: - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - - 256 - {{17, 253}, {187, 17}} - - - - YES - - 67108864 - 71303168 - Open untitled window: - - - - - - NO - - - - 256 - {{209, 212}, {243, 58}} - - - - YES - NO - 3 - 1 - - - -2080374784 - 0 - on launch and re-activation - - - 3 - 1211912448 - 0 - - NSRadioButton - - - - - - 200 - 25 - - - 67108864 - 0 - only when MacVim launches - - - 1 - 1211912448 - 0 - - - - 200 - 25 - - - 67108864 - 0 - never - - - 1211912448 - 0 - - 549453824 - {18, 18} - - - - - - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw -IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ -29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 -dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA -AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG -AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ -0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ -7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ -5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ -3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD -AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns -AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ -6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ -/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ -///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl -YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA -AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD -AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu -AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAABDoAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAQ6GFw -cGwCAAAAbW50clJHQiBYWVogB9gAAgACABEAIwAlYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBsuR+jvsxNwCFjdjK72KIUegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA -AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAYSbmRpbgAA -B+wAAAY+ZGVzYwAADiwAAABkZHNjbQAADpAAAAH+bW1vZAAAEJAAAAAoY3BydAAAELgAAAAtWFlaIAAA -AAAAAF/MAAA2wgAACVlYWVogAAAAAAAAcKYAALKbAAAm8lhZWiAAAAAAAAAmZAAAFr0AAKLaWFlaIAAA -AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1 -cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD -AQAAAgAAAQYC8AUGBgcIDAkHCw4MCw4RDwwRDRIXFBMWFhcVGRgaGBwbHRseHSAhISMjICQmJicnJigp -KiorLCwrLi8vLzAwMjMzMjQ1NjU3Njg3OTg7Ojw8PT4+Pj9AQUBCQ0NDRENFRkdGSElJSUpKS0xNTU5N -T09QUVFRUlNUUlVVVlZXV1hYWVhbXFxcXVxeXl9fYGFhYmJiY2NkZWVlZmZnZ2hoaWlqa2trbGxtbW5u -b3BwcHFxcnJzc3R0dXR2dnd4eHh5enp6e3x8fH18fn5/foCAgYGCgYODhISFhYaGh4eIiIkIiYmKiouL -jIuNjY6Oj4+QkJGRkpKTk5SUlZWWlpeXmJiZGJmZmpqbm5ycnZ2enp+foKChoaKio6OkI6SkpaWmpqen -qKipqaqqq6usrK2trq6vr7AvsLCxsbKys7O0tLW1tra3t7i4ubm6Obq6u7u8vL29vr6/v8DAwcHCQcLC -w8PExMXFxsbHx8jIyUjJycrKy8vMzM3Nzs7PTs/P0NDR0dLS09PUU9TU1dXW1tfX2NjZWNnZ2trb29zc -3Vzd3d7e39/g4OFg4eHi4uPj5OTlZOXl5ubn5+hn6Ojp6erq6+vsa+zs7e3u7u9u7+/w8PHx8nHy8vPz -9HP09PX19vb3dvf3+Pj5ePn5+vr7evv7/Pz9fP39/n3+/v//AAADBQP4BgcHBwgMCQcLDgwLDRIPCRAO -ERYTEhQUFRMWFRgUGRgbFxwbHSAfICAeISMjJCQjJSYmJygpKSgqKywsLS0uLy8uMTEyMjMyNDM1NDc2 -ODg5Ojo6Ozw9PD4/Pz9AP0FCQ0JERUVFRkZHSElJSklLS0xNTU1OTk9OUFBRUVJSU1NUU1VWVlZXVlhY -WlpbXFxdXV1eXl9gYGBhYWJiY2NkZGVmZmZoaGlpamprbGxsbW1ubm9vcHBxcHJyc3R0dHV2dnZ3eHh4 -eXh6ent6fHx9fX59f3+AgIGBgoKDg4SEhYWGhoeHiIiJiIqKi4uMjI2Njo6Pj5CQkZGSkpOTlJSVlZaW -l5eYmJmZmpqbm5ycnZ2enp+foB+goKGhoqKjo6SkpaWmpqenqKipqaqqq6usrK2trq6vr7AvsLCxsbKy -s7O0tLW1tra3t7i4ubm6urs6u7u8vL29vr6/v8DAwcHCwsPDxMTFxcbGx8fIyMnJysrLy8zMzc3Ozs/P -0NDR0dLS09PU1NVU1dXW1tfX2NjZ2dra29vc3N3d3t7f3+Dg4WDh4eLi4+Pk5OVk5eXm5ufn6Gfo6Onp -6mnq6uvr7OztbO3t7u7v7/Bv8PDx8fLy83Lz8/T09XT19fb293b39/j4+Xj5+fp5+vr7evv7/Pz9fP39 -/n3+/v9+//8AAAIEAvcEBQUFBgoHBQgLCQgKDQsIDAoNEA4NDooPDhAPEQ8SERMRE5EUFRUWFhQXGBgZ -GRgaGhqZGxwcGx0eHh4fHyAhISAiIiKhIyMkIyUkJiYnJygpKSkqKysqLC0tLS4tLy8wMDEyMjIzMzQ1 -NTU2NTc3N7c4ODk5Ojk7Ozw8PT0+Pj8+QEFBQUJBQ0NEREVFRcVGRkdHSElJSUpKS0tMTE1NTk5Ozk9P -UFBRUVJTU1NUVFTUVVVWVldWWFhZWVnZWltbW1xdXV1d3V5eX15gYGFhYeFiYmNjZGRlZWXlZmZnZ2ho -aWlqamtqbGxtbW5ub29wcHDwcXFycnNzdHR1dXZ2d3d4eHl5enp7e3x8fPx9fX5+f3+AgIGBggGCgoOD -hISFhYaGh4eIiIkIiYmKiouLjIyNjY6Oj4+QD5CQkZGSkpOTlJSVlZYVlpaXl5iYmZmampubnJydnZ6e -n5+gH6CgoaGioqOjpKSlpaamp6eoqKmpqqqrq6ysra2urq+vsLCxsbKys7O0tLW1tra3t7i4ubm6uru7 -vLy+vr+/wD/AwMHBwsLDw8TExcXGxsfHyMjJycrKy8vMzM3Nzs7Pz9DQ0dHS0tPT1NTV1dbW19fY2NnZ -2trb29zc3d3e3uDg4eHi4uTk5eXn5unp6+vt7fDw8/P29vn5/f3//wAAbmRpbgAAAAAAAAY2AACVGAAA -Vl8AAFFhAACIhgAAKTQAABaoAABQDQAAVDkAAl64AAJPXAABeFEAAwEAAAIAAAADAAYACwAQABYAJQAu -ADcATQBZAGUAgQCQAJ8AwQDSAOUBCwEgATUBSwFhAZABqAHBAfUCDwIrAmQCnwK9AtwDHAM9A18DowPG -A+oENAR/BKYEzQUdBXAFmgXEBhsGdAahBs8HLQeMB70H7ghSCLgJIAlUCYoJ9gpkCtULRwuBC7wMMgyr -DSYNog3hDiEOoQ8kD6kQLxBzELgRQxHPEl0S7hOAE8oUFRSrFUMV3RZ5FxcXZhe2GFgY/BmhGkga8Ruc -HEkc+B2oHlsfDx/FIH0hNyHyIrAjbyQwJPMltyZ+J0YoECjcKakqeStKLBws8S3HLqAveTBVMTMyEjLz -M9U0uTWgNoc3cThcOUk6ODsoPQ4+Az77P/RA7kHqQuhD6ETpRexG8Uf3SP9KCUsUTCFOQE9SUGZRe1KS -U6tUxVXhVv9YHlk/W4Vcq13SXvtgJWFSYn9jr2TgZhJnR2h8au1sKG1kbqJv4XEicmVzqXTvdjZ4yXoV -e2N8sn4Df1WAqYH/hK+GCYdliMKKIYuBjOOPrJESknuT5JVQlryZm5sMnH+d9J9qolqj1aVRps+oTqtR -rNSuWq/gsvK0frYLt5m6urxNveG/d8KnxEHF3ckZyrrMW83/0UrS8dSb1/HZn9tO3rHgZOPQ5YjnQeq5 -7Hbv9/G59UL3CPqa/jH//wAAAAAAAQADAAsAEAAWACUANwBNAFkAZQCBAJ8AsADBAOUBCwEgATUBYQGQ -AcEB2gH1AisCRwJkAp8C3AL8AxwDXwOjA8YD6gQ0BH8EzQT1BR0FcAXEBe8GGwZ0Bs8HLQdcB4wH7ghS -CLgJIAlUCYoJ9gpkCtULRwuBC7wMMgyrDSYNog3hDiEOoQ8kD6kQLxBzELgRQxHPEl0S7hOAFBUUqxVD -Fd0WeRcXF7YYWBj8GaEZ9BpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwIw8jbyQwJPMltyZ+J0YoECjc -KakqeStKLBws8S3HLqAveTBVMTMyEjLzM9U0uTWgNoc3cThcOUk6ODsoPBo9Dj4DPvs/9EDuQepC6EPo -ROlF7EbxR/dI/0oJSxRMIU0wTkBPUlBmUXtSklOrVMVV4Vb/WT9aYVuFXKtd0l77YCVhUmJ/Y69k4GYS -Z0dofGm0au1tZG6ib+FxInJlc6l073Y2d394yXoVfLJ+A39VgKmB/4NWhK+GCYdliMKKIYuBjOOOR4+s -kRKSe5PklVCWvJgrmZubDJx/nfSfaqJao9WlUabPqE6pzqtRrNSuWq/gsWmy8rYLt5m5Kbq6veG/d8EO -xEHF3ckZyrrMW8+j0UrS8dZF1/HZn9z/3rHiGePQ50Ho/Ox27/fzfPVC+ND8Zf//AAAAAQADAAsAFgAl -ADcATQBlAIEAnwDBAOUBCwE1AZABwQH1AisCZALcAxwDXwOjA+oENAR/BR0FcAXEBhsGdAbPBy0HjAhS -CLgJIAmKCfYKZArVC0cLvAwyDKsNJg2iDiEOoQ8kD6kQLxC4EUMRzxLuE4AUFRSrFUMV3RZ5FxcXthhY -GPwZoRpIGvEcSRz4HageWx8PH8UgfSE3IfIjbyQwJPMltyZ+J0Yo3CmpKnkrSiwcLccuoC95MFUyEjLz -M9U0uTaHN3E4XDlJOyg8Gj0OPgM++z/0QO5B6kLoQ+hE6UbxR/dI/0oJSxRMIU0wTkBPUlBmUXtSklTF -VeFW/1geWT9bhVyrXdJe+2AlYVJif2TgZhJnR2h8abRq7WwobqJv4XEicmVzqXTvd394yXoVe2N8sn4D -f1WAqYH/g1aGCYdliMKKIYuBjOOOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnO -q1Gs1K5arx2v4LFptH62C7eZuSm6urxNveG/d8EOwqfEQcXdx3vJGcq6zFvN/8+j0UrS8dSb1kXX8dmf -207c/96x4GTiGePQ5YjmZOdB6PzqueuX7HbuNu8W7/fw1/G58przfPRf9UL12fZw9wj3oPg4+ND5afoB -+pr7M/vM/GX82P1L/b7+Mf8Y//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AABtbHVjAAAAAAAAAA8AAAAMaXRJVAAAABQAAADEZnJGUgAAAEIAAADYbmJOTwAAABIAAAEaZXNFUwAA -ABIAAAEsZmlGSQAAABAAAAE+cHRQVAAAABgAAAFOemhUVwAAAA4AAAFmamFKUAAAAA4AAAF0bmxOTAAA -ABYAAAGCZGVERQAAABAAAAGYa29LUgAAAAwAAAGoZW5VUwAAABIAAAG0c3ZTRQAAABAAAAHGZGFESwAA -ABwAAAHWemhDTgAAAAwAAAHyAEwAQwBEACAAYwBvAGwAbwByAGkAyQBjAHIAYQBuACAA4AAgAGMAcgBp -AHMAdABhAHUAeAAgAGwAaQBxAHUAaQBkAGUAcwAgAGMAbwB1AGwAZQB1AHIARgBhAHIAZwBlAC0ATABD -AEQATABDAEQAIABjAG8AbABvAHIAVgDkAHIAaQAtAEwAQwBEAEwAQwBEACAAYwBvAGwAbwByAGkAZABv -X2mCcm2yZnaYb3k6VmgwqzDpMPwAIABMAEMARABLAGwAZQB1AHIAZQBuAC0ATABDAEQARgBhAHIAYgAt -AEwAQwBEzuy37AAgAEwAQwBEAEMAbwBsAG8AcgAgAEwAQwBEAEYA5AByAGcALQBMAEMARABMAEMARAAt -AGYAYQByAHYAZQBzAGsA5gByAG1faYJyACAATABDAEQAAG1tb2QAAAAAAAAGEAAAnEUAAAAAvnORAAAA -AAAAAAAAAAAAAAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAA -AAA - - - - - - 3 - MCAwAA - - - - 400 - 75 - - - {243, 18} - {4, 2} - 1143472128 - NSActionCell - - 67108864 - 0 - Radio - - 1211912448 - 0 - - - 400 - 75 - - - - - 3 - MQA - - - - - - 268 - {{209, 141}, {243, 38}} - - - - YES - NO - 2 - 1 - - - 67108864 - 0 - in a new window - - - 1211912448 - 0 - - - - 200 - 25 - - - -2080374784 - 0 - in the current window - - - 1 - 1211912448 - 0 - - 549453824 - {18, 18} - - - - - - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw -IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ -29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 -dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA -AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG -AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ -0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ -7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ -5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ -3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD -AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns -AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ -6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ -/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ -///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl -YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA -AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD -AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu -AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAAwYAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAMGGFw -cGwCAAAAbW50clJHQiBYWVogB9YABAADABMALAASYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA -AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAMSbmRpbgAA -BOwAAAY+ZGVzYwAACywAAABkZHNjbQAAC5AAAAAubW1vZAAAC8AAAAAoY3BydAAAC+gAAAAtWFlaIAAA -AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA -AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1 -cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD -AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH -SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF -hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8 -vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt -7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq -Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo -aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e -n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX -2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW -FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O -Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6 -ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt -rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA -AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA -AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl -A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq -DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU -HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8 -MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v -UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/ -eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj -rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn -5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh -AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK -CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY -GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95 -MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S -UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2 -d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV -pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK -0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf// -AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw -BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA -FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H -LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh -Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ -h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp -svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb -1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX -8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE -AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg -QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA - - - - - - - - 400 - 75 - - - {243, 18} - {4, 2} - 1151868928 - NSActionCell - - 67108864 - 0 - Radio - - 1211912448 - 0 - - 549453824 - {18, 18} - - - - - - TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw -IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/ -29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5 -dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA -AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG -AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/ -0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/ -7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/ -5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/ -3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD -AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns -AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/ -6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/ -/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/ -///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl -YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA -AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD -AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu -AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB -AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES -AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS -AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - - - - - - - 400 - 75 - - 1 - - - - - - - - 256 - {{209, 47}, {243, 58}} - - - - YES - - 67108864 - 4194304 - This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode. - - LucidaGrande - 11 - 3100 - - - - - 6 - System - disabledControlTextColor - - 3 - MC4zMzMzMzMzMzMzAA - - - - NO - - - - 256 - {{207, 186}, {258, 18}} - - - - YES - - 67108864 - 0 - Check for updates - - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 256 - {{17, 187}, {187, 17}} - - - - YES - - 67108864 - 71303168 - When MacVim launches: - - - - - - NO - - - - 268 - {{218, 109}, {229, 26}} - - - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - - - 400 - 75 - - - and set the arglist - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - - - with a tab for each file - - 1048576 - 2147483647 - - - _popUpItemAction: - 3 - - - - - with a window for each file - - 1048576 - 2147483647 - - - _popUpItemAction: - 4 - - - - - with a split for each file - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - - 3 - 1 - YES - YES - 2 - - NO - - - - 256 - {{17, 22}, {187, 17}} - - - - YES - - 67108864 - 71303168 - After last window closes: - - - - - - NO - - - - 268 - {{206, 16}, {197, 26}} - - - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - - - 400 - 75 - - - Keep MacVim Running - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - OtherViews - - - - - Hide MacVim - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Quit MacVim - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1 - YES - YES - 2 - - NO - - - {483, 290} - - - - NSView - - - - 268 - - - - 268 - {{18, 50}, {388, 18}} - - - - YES - - -2080374784 - 0 - Prefer native full-screen support (requires Mac OS X 10.7) - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{17, 20}, {415, 28}} - - - - YES - - 67108864 - 272760832 - You may want to disable this option when using multiple monitors since the native full-screen support renders secondary monitors useless. - - - - - 3 - MC41AA - - - NO - - - - 268 - {{18, 146}, {174, 18}} - - - - YES - - 67108864 - 0 - Draw marked text inline - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{17, 74}, {444, 70}} - - - - YES - - 67108864 - 272760832 - This option causes marked text to be rendered like normal text which is very convenient when using a complex input method (e.g. Kotoeri). However, it has some known limitations which may be circumvented by disabling this option (e.g. mapping to "dead keys" may not work). Note that without this option the Core Text renderer will not draw marked text at all. - - - - - - NO - - - - 268 - {{18, 282}, {174, 18}} - - - - YES - - 67108864 - 0 - Use Core Text renderer - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{17, 252}, {449, 28}} - - - - YES - - 67108864 - 272760832 - Selecting this option will increase rendering performance but double-tapping with three fingers to look up words will no longer work. - - - - - - NO - - - - 268 - {{18, 228}, {133, 18}} - - - - YES - - 67108864 - 0 - Enable Quickstart - - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{17, 170}, {449, 56}} - - - - YES - - 67108864 - 272760832 - New windows open instantaneously with Quickstart enabled but they may not have the latest runtime files sourced. If you modify your runtime files (e.g files inside the ~/.vim directory) then you may need to disable and re-enable Quickstart to ensure that the next window you open will pick up on those changes. - - - - - 3 - MC41AA - - 2 - - - - NO - - - {483, 318} - - - - NSView - - - - - - - generalPreferences - - - - 143 - - - - openInCurrentWindowSelectionChanged: - - - - 572 - - - - layoutPopUpButton - - - - 596 - - - - advancedPreferences - - - - 632 - - - - quickstartButtonClicked: - - - - 858 - - - - atsuiButtonClicked: - - - - 892 - - - - selectedTag: values.MMUntitledWindow - - - - - - selectedTag: values.MMUntitledWindow - selectedTag - values.MMUntitledWindow - 2 - - - 171 - - - - selectedTag: values.MMOpenInCurrentWindow - - - - - - selectedTag: values.MMOpenInCurrentWindow - selectedTag - values.MMOpenInCurrentWindow - 2 - - - 520 - - - - value: values.SUCheckAtStartup - - - - - - value: values.SUCheckAtStartup - value - values.SUCheckAtStartup - 2 - - - 169 - - - - selectedTag: values.MMOpenLayout - - - - - - selectedTag: values.MMOpenLayout - selectedTag - values.MMOpenLayout - 2 - - - 441 - - - - enabled: values.MMOpenInCurrentWindow - - - - - - enabled: values.MMOpenInCurrentWindow - enabled - values.MMOpenInCurrentWindow - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 546 - - - - value: values.MMRenderer - - - - - - value: values.MMRenderer - value - values.MMRenderer - 2 - - - 1000 - - - - value: values.MMPreloadCacheSize - - - - - - value: values.MMPreloadCacheSize - value - values.MMPreloadCacheSize - 2 - - - 828 - - - - selectedIndex: values.MMLastWindowClosedBehavior - - - - - - selectedIndex: values.MMLastWindowClosedBehavior - selectedIndex - values.MMLastWindowClosedBehavior - 2 - - - 968 - - - - value: values.MMUseInlineIm - - - - - - value: values.MMUseInlineIm - value - values.MMUseInlineIm - 2 - - - 1016 - - - - value: values.MMNativeFullScreen - - - - - - value: values.MMNativeFullScreen - value - values.MMNativeFullScreen - 2 - - - 1031 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 58 - - - Shared Defaults - - - 115 - - - - - - - - - - - - - - - General - - - 116 - - - - - - - - 117 - - - - - - - - 119 - - - - - - - - - - - 137 - - - - - 138 - - - - - 139 - - - - - 120 - - - - - - - - - - 134 - - - - - 135 - - - - - 121 - - - - - - - - 122 - - - - - - - - 124 - - - - - - - - 126 - - - - - - - - 427 - - - - - - - - 957 - - - - - - - - 620 - - - - - - - - - - - - - Advanced - - - 782 - - - - - - - - 815 - - - - - - - - 817 - - - - - - - - 826 - - - - - - - - 972 - - - - - 973 - - - - - 974 - - - - - 975 - - - - - 976 - - - - - 977 - - - - - 978 - - - - - - - - 979 - - - - - - - - 990 - - - - - 991 - - - - - 992 - - - - - 993 - - - - - 996 - - - - - 997 - - - - - 429 - - - - - - - - - - - 544 - - - - - 436 - - - - - 431 - - - - - 430 - - - - - 959 - - - - - - - - - - 962 - - - - - 961 - - - - - 960 - - - - - 1001 - - - - - - - - 1004 - - - - - 1013 - - - - - - - - 1014 - - - - - 1017 - - - - - - - - 1020 - - - - - 1028 - - - - - - - - 1029 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 1031 - - - - - DBPrefsWindowController - NSWindowController - - IBProjectSource - ./Classes/DBPrefsWindowController.h - - - - FirstResponder - - id - id - id - - - - atsuiButtonClicked: - id - - - loginShellButtonClicked: - id - - - quickstartButtonClicked: - id - - - - IBUserSource - - - - - MMPreferenceController - DBPrefsWindowController - - openInCurrentWindowSelectionChanged: - id - - - openInCurrentWindowSelectionChanged: - - openInCurrentWindowSelectionChanged: - id - - - - NSView - NSView - NSPopUpButton - - - - advancedPreferences - NSView - - - generalPreferences - NSView - - - layoutPopUpButton - NSPopUpButton - - - - IBProjectSource - ./Classes/MMPreferenceController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - {11, 11} - {10, 3} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + New windows open instantaneously with Quickstart enabled but they may not have the latest runtime files sourced. If you modify your runtime files (e.g files inside the ~/.vim directory) then you may need to disable and re-enable Quickstart to ensure that the next window you open will pick up on those changes. + + + + + + + + + + + Selecting this option will increase rendering performance but double-tapping with three fingers to look up words will no longer work. + + + + + + + + + + + This option causes marked text to be rendered like normal text which is very convenient when using a complex input method (e.g. Kotoeri). However, it has some known limitations which may be circumvented by disabling this option (e.g. mapping to "dead keys" may not work). Note that without this option the Core Text renderer will not draw marked text at all. + + + + + + + + + + + You may want to disable this option when using multiple monitors since the native full-screen support renders secondary monitors useless. + + + + + + + + + diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index 993915f03e..cd0271eebc 100644 Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/src/MacVim/Info_legacy.plist b/src/MacVim/Info_legacy.plist deleted file mode 100644 index e39cb23a96..0000000000 --- a/src/MacVim/Info_legacy.plist +++ /dev/null @@ -1,2696 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - - - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - vim - - CFBundleTypeIconFile - MacVim-vim - CFBundleTypeName - Vim Script File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - txt - text - utf8 - - CFBundleTypeIconFile - MacVim-txt - CFBundleTypeMIMETypes - - text/plain - - CFBundleTypeName - Plain Text File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - tex - sty - cls - ltx - ins - dtx - - CFBundleTypeIconFile - MacVim-tex - CFBundleTypeName - TeX File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - h - - CFBundleTypeIconFile - MacVim-h - CFBundleTypeName - C Header Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.c-header - - - - CFBundleTypeExtensions - - pch - - CFBundleTypeIconFile - MacVim-h - CFBundleTypeName - C Precompiled Header Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.precompiled-c-header - - - - CFBundleTypeExtensions - - hh - hp - hpp - hxx - h++ - - CFBundleTypeIconFile - MacVim-h - CFBundleTypeName - C++ Header Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - pch++ - - CFBundleTypeIconFile - MacVim-h - CFBundleTypeName - C++ Precompiled Header Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.precompiled-c-plus-plus-header - - - - CFBundleTypeExtensions - - c - - CFBundleTypeIconFile - MacVim-c - CFBundleTypeName - C Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.c-source - - - - CFBundleTypeExtensions - - m - - CFBundleTypeIconFile - MacVim-m - CFBundleTypeName - Objective-C Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.objective-c-source - - - - CFBundleTypeExtensions - - mm - - CFBundleTypeIconFile - MacVim-mm - CFBundleTypeName - Objective-C++ Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.objective-c-plus-plus-source - - - - CFBundleTypeExtensions - - cc - cp - cpp - cxx - c++ - - CFBundleTypeIconFile - MacVim-cpp - CFBundleTypeName - C++ Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.c-plus-plus-source - - - - CFBundleTypeExtensions - - s - asm - - CFBundleTypeName - Assembly Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.assembler-source - - - - CFBundleTypeExtensions - - r - - CFBundleTypeName - Rez Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.rez-source - - - - CFBundleTypeExtensions - - java - jav - - CFBundleTypeIconFile - MacVim-java - CFBundleTypeName - Java Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - com.sun.java-source - - - - CFBundleTypeExtensions - - l - lm - lmm - lpp - lxx - - CFBundleTypeName - Lex Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.lex-source - - - - CFBundleTypeExtensions - - y - ym - ymm - ypp - yxx - - CFBundleTypeName - Yacc Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.yacc-source - - - - CFBundleTypeExtensions - - defs - - CFBundleTypeName - Mig Definition File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - exp - - CFBundleTypeName - Symbol Export File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.symbol-export - - - - CFBundleTypeExtensions - - f - for - fpp - f77 - f90 - f95 - - CFBundleTypeIconFile - MacVim-f - CFBundleTypeName - Fortran Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.fortran-source - - - - CFBundleTypeExtensions - - pas - - CFBundleTypeName - Pascal Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.pascal-source - - - - CFBundleTypeExtensions - - ada - adb - ads - - CFBundleTypeName - Ada Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.ada-source - - - - CFBundleTypeExtensions - - html - phtml - shtml - xhtml - htm - pht - sht - xht - phtm - shtm - xhtm - - CFBundleTypeIconFile - MacVim-html - CFBundleTypeMIMETypes - - text/html - - CFBundleTypeName - HTML Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.html - - - - CFBundleTypeExtensions - - xml - rss - tld - pt - cpt - dtml - - CFBundleTypeIconFile - MacVim-xml - CFBundleTypeMIMETypes - - text/xml - - CFBundleTypeName - XML Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - public.xml - - - - CFBundleTypeExtensions - - js - htc - jscript - javascript - - CFBundleTypeIconFile - MacVim-js - CFBundleTypeMIMETypes - - text/javascript - - CFBundleTypeName - JavaScript Source File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - LSItemContentTypes - - com.netscape.javascript-source - - - - CFBundleTypeName - Perl Source File - CFBundleTypeExtensions - - pl - pm - pod - perl - - CFBundleTypeIconFile - MacVim-perl - CFBundleTypeMIMETypes - - text/x-perl-script - - CFBundleTypeRole - Editor - LSItemContentTypes - - public.perl-script - - - - CFBundleTypeName - Python Source File - CFBundleTypeExtensions - - py - rpy - cpy - python - - CFBundleTypeIconFile - MacVim-py - CFBundleTypeMIMETypes - - text/x-python-script - - CFBundleTypeRole - Editor - LSItemContentTypes - - public.python-script - - - - CFBundleTypeName - PHP Source File - CFBundleTypeExtensions - - php - php3 - php4 - php5 - ph3 - ph4 - phtml - - CFBundleTypeIconFile - MacVim-php - CFBundleTypeMIMETypes - - text/php - - CFBundleTypeRole - Editor - LSItemContentTypes - - public.php-script - - - - CFBundleTypeName - Ruby Source File - CFBundleTypeExtensions - - rb - rbw - rbx - rjs - rxml - - CFBundleTypeIconFile - MacVim-rb - CFBundleTypeMIMETypes - - text/ruby-script - - CFBundleTypeRole - Editor - LSItemContentTypes - - public.ruby-script - - - - CFBundleTypeName - Shell script - CFBundleTypeExtensions - - sh - csh - command - ss - bashrc - bash_profile - bash_login - profile - bash_logout - - CFBundleTypeIconFile - MacVim-bash - CFBundleTypeRole - Editor - LSItemContentTypes - - public.shell-script - - - - CFBundleTypeExtensions - - class - - CFBundleTypeName - Java Class File - CFBundleTypeRole - Viewer - LSIsAppleDefaultForType - - LSItemContentTypes - - com.sun.java-class - - - - CFBundleTypeExtensions - - patch - diff - - CFBundleTypeIconFile - MacVim-patch - CFBundleTypeName - Patch File - CFBundleTypeRole - Editor - LSIsAppleDefaultForType - - - - CFBundleTypeExtensions - - strings - - CFBundleTypeName - Strings File - CFBundleTypeRole - Editor - LSItemContentTypes - - public.strings-text - - - - CFBundleTypeExtensions - - * - - CFBundleTypeName - Text File - CFBundleTypeOSTypes - - **** - - CFBundleTypeRole - Editor - - - CFBundleTypeName - AppleScript Source File - CFBundleTypeExtensions - - applescript - - CFBundleTypeIconFile - MacVim-applescript - CFBundleTypeRole - Editor - LSItemContentTypes - - com.apple.applescript.text - - - - CFBundleTypeName - ActionScript Source File - CFBundleTypeExtensions - - as - - CFBundleTypeIconFile - MacVim-as - CFBundleTypeRole - Editor - - - CFBundleTypeName - ASP document - CFBundleTypeExtensions - - asp - asa - - CFBundleTypeIconFile - MacVim-asp - CFBundleTypeRole - Editor - - - CFBundleTypeName - ASP.NET document - CFBundleTypeExtensions - - aspx - ascx - asmx - ashx - - CFBundleTypeIconFile - MacVim-asp - CFBundleTypeRole - Editor - - - CFBundleTypeName - BibTeX bibliography - CFBundleTypeExtensions - - bib - - CFBundleTypeIconFile - MacVim-bib - CFBundleTypeRole - Editor - - - CFBundleTypeName - C# Source File - CFBundleTypeExtensions - - cs - - CFBundleTypeIconFile - MacVim-cs - CFBundleTypeRole - Editor - - - CFBundleTypeName - Context Free Design Grammar - CFBundleTypeExtensions - - cfdg - - CFBundleTypeIconFile - MacVim-csfg - CFBundleTypeRole - Editor - - - CFBundleTypeName - Comma separated values - CFBundleTypeExtensions - - csv - - CFBundleTypeIconFile - MacVim-csv - CFBundleTypeRole - Editor - - - CFBundleTypeName - Tab separated values - CFBundleTypeExtensions - - tsv - - CFBundleTypeIconFile - MacVim-tsv - CFBundleTypeRole - Editor - - - CFBundleTypeName - CGI script - CFBundleTypeExtensions - - cgi - fcgi - - CFBundleTypeIconFile - MacVim-cgi - CFBundleTypeRole - Editor - - - CFBundleTypeName - Configuration file - CFBundleTypeExtensions - - cfg - conf - config - htaccess - - CFBundleTypeIconFile - MacVim-cfg - CFBundleTypeRole - Editor - - - CFBundleTypeName - Cascading style sheet - CFBundleTypeExtensions - - css - - CFBundleTypeIconFile - MacVim-css - CFBundleTypeRole - Editor - - - CFBundleTypeName - Document Type Definition - CFBundleTypeExtensions - - dtd - - CFBundleTypeIconFile - MacVim-dtd - CFBundleTypeRole - Editor - - - CFBundleTypeName - Dylan Source File - CFBundleTypeExtensions - - dylan - - CFBundleTypeIconFile - MacVim-dylan - CFBundleTypeRole - Editor - - - CFBundleTypeName - Erlang Source File - CFBundleTypeExtensions - - erl - hrl - - CFBundleTypeIconFile - MacVim-erl - CFBundleTypeRole - Editor - - - CFBundleTypeName - F-Script Source File - CFBundleTypeExtensions - - fscript - - CFBundleTypeIconFile - MacVim-fscript - CFBundleTypeRole - Editor - - - CFBundleTypeName - Haskell Source File - CFBundleTypeExtensions - - hs - lhs - - CFBundleTypeIconFile - MacVim-hs - CFBundleTypeRole - Editor - - - CFBundleTypeName - Include file - CFBundleTypeExtensions - - inc - - CFBundleTypeIconFile - MacVim-inc - CFBundleTypeRole - Editor - - - CFBundleTypeName - iCalendar schedule - CFBundleTypeExtensions - - ics - - CFBundleTypeIconFile - MacVim-ics - CFBundleTypeRole - Editor - - - CFBundleTypeName - MS Windows initialization file - CFBundleTypeExtensions - - ini - - CFBundleTypeIconFile - MacVim-ini - CFBundleTypeRole - Editor - - - CFBundleTypeName - Io Source File - CFBundleTypeExtensions - - io - - CFBundleTypeIconFile - MacVim-io - CFBundleTypeRole - Editor - - - CFBundleTypeName - BeanShell script - CFBundleTypeExtensions - - bsh - - CFBundleTypeIconFile - MacVim-bsh - CFBundleTypeRole - Editor - - - CFBundleTypeName - Java properties file - CFBundleTypeExtensions - - properties - - CFBundleTypeIconFile - MacVim-properties - CFBundleTypeRole - Editor - - - CFBundleTypeName - Java Server Page - CFBundleTypeExtensions - - jsp - - CFBundleTypeIconFile - MacVim-jsp - CFBundleTypeRole - Editor - - - CFBundleTypeName - LISP Source File - CFBundleTypeExtensions - - lisp - cl - l - lsp - mud - el - - CFBundleTypeIconFile - MacVim-lisp - CFBundleTypeRole - Editor - - - CFBundleTypeName - Log file - CFBundleTypeExtensions - - log - - CFBundleTypeIconFile - MacVim-log - CFBundleTypeRole - Editor - - - CFBundleTypeName - Mediawiki document - CFBundleTypeExtensions - - wiki - wikipedia - mediawiki - - CFBundleTypeIconFile - MacVim-wiki - CFBundleTypeRole - Editor - - - CFBundleTypeName - PostScript Source File - CFBundleTypeExtensions - - ps - eps - - CFBundleTypeIconFile - MacVim-ps - CFBundleTypeRole - Editor - - - - CFBundleTypeName - Scheme Source File - CFBundleTypeExtensions - - scm - sch - - CFBundleTypeIconFile - MacVim-sch - CFBundleTypeRole - Editor - - - CFBundleTypeName - SQL Source File - CFBundleTypeExtensions - - sql - - CFBundleTypeIconFile - MacVim-sql - CFBundleTypeRole - Editor - - - CFBundleTypeName - Tcl Source File - CFBundleTypeExtensions - - tcl - - CFBundleTypeIconFile - MacVim-tcl - CFBundleTypeRole - Editor - - - CFBundleTypeName - XSL stylesheet - CFBundleTypeExtensions - - xsl - xslt - - CFBundleTypeIconFile - MacVim-xsl - CFBundleTypeRole - Editor - - - CFBundleTypeName - Electronic business card - CFBundleTypeExtensions - - vcf - vcard - - CFBundleTypeIconFile - MacVim-vcf - CFBundleTypeRole - Editor - - - CFBundleTypeName - Visual Basic Source File - CFBundleTypeExtensions - - vb - - CFBundleTypeIconFile - MacVim-vb - CFBundleTypeRole - Editor - - - CFBundleTypeName - YAML document - CFBundleTypeExtensions - - yaml - yml - - CFBundleTypeIconFile - MacVim-yaml - CFBundleTypeRole - Editor - - - CFBundleTypeName - GTD document - CFBundleTypeExtensions - - gtd - gtdlog - - CFBundleTypeIconFile - MacVim-gtd - CFBundleTypeRole - Editor - - - CFBundleTypeName - Markdown document - CFBundleTypeExtensions - - markdown - markd - mdown - md - - CFBundleTypeIconFile - MacVim-markdown - CFBundleTypeRole - Editor - - - CFBundleTypeName - reStructuredText document - CFBundleTypeExtensions - - rst - - CFBundleTypeIconFile - MacVim-rst - CFBundleTypeRole - Editor - - - CFBundleTypeName - Vimball Archive - CFBundleTypeExtensions - - vba - - CFBundleTypeIconFile - MacVim-vba - CFBundleTypeRole - Editor - - - CFBundleTypeName - VHDL Source File - CFBundleTypeExtensions - - vhd - vhdl - - CFBundleTypeIconFile - MacVim-generic - CFBundleTypeRole - Editor - - - CFBundleTypeName - Lua Source File - CFBundleTypeExtensions - - lua - - CFBundleTypeIconFile - MacVim-generic - CFBundleTypeMIMETypes - - text/x-lua-script - - CFBundleTypeRole - Editor - - - CFBundleTypeName - Verilog HDL Source File - CFBundleTypeExtensions - - v - - CFBundleTypeIconFile - MacVim-generic - CFBundleTypeRole - Editor - - - CFBundleTypeName - Verilog HDL Header Source File - CFBundleTypeExtensions - - vh - - CFBundleTypeIconFile - MacVim-generic - CFBundleTypeRole - Editor - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - MacVim - CFBundleIdentifier - org.vim.MacVim - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 7.4 - CFBundleSignature - VIMM - CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLName - org.vim.MacVim - CFBundleURLSchemes - - mvim - - - - CFBundleVersion - 82 - NSMainNibFile - MainMenu - NSPrincipalClass - MMApplication - NSServices - - - NSMenuItem - - default - MacVim/New MacVim Buffer With Selection - - NSMessage - openSelection - NSPortName - MacVim - NSSendTypes - - NSStringPboardType - - NSRequiredContext - - - - NSMenuItem - - default - MacVim/New MacVim Buffer Here - - NSMessage - newFileHere - NSPortName - MacVim - NSSendTypes - - NSFilenamesPboardType - - NSUserData - Window - NSRequiredContext - - - - - SUFeedURL - http://b4winckler.github.com/macvim/appcast/stable.xml - NSAppleScriptEnabled - - - - UTExportedTypeDeclarations - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Vim Script File - UTTypeIdentifier - org.vim.vim-script - UTTypeTagSpecification - - public.filename-extension - - vim - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Plain Text File - UTTypeIdentifier - public.plain-text - UTTypeTagSpecification - - public.filename-extension - - txt - text - utf8 - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - TeX File - UTTypeIdentifier - org.vim.tex-file - UTTypeTagSpecification - - public.filename-extension - - tex - sty - cls - ltx - ins - dtx - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C Header Source File - UTTypeIdentifier - public.c-header - UTTypeTagSpecification - - public.filename-extension - - h - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C Precompiled Header Source File - UTTypeIdentifier - org.vim.pch-file - UTTypeTagSpecification - - public.filename-extension - - pch - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C++ Header Source File - UTTypeIdentifier - public.c-plus-plus-header - UTTypeTagSpecification - - public.filename-extension - - hh - hp - hpp - hxx - h++ - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C++ Precompiled Header Source File - UTTypeIdentifier - org.vim.pch++-file - UTTypeTagSpecification - - public.filename-extension - - pch++ - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C Source File - UTTypeIdentifier - public.c-source - UTTypeTagSpecification - - public.filename-extension - - c - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Objective-C Source File - UTTypeIdentifier - public.objective-c-source - UTTypeTagSpecification - - public.filename-extension - - m - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Objective-C++ Source File - UTTypeIdentifier - public.objective-c-plus-plus-source - UTTypeTagSpecification - - public.filename-extension - - mm - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C++ Source File - UTTypeIdentifier - public.c-plus-plus-source - UTTypeTagSpecification - - public.filename-extension - - cc - cp - cpp - cxx - c++ - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Assembly Source File - UTTypeIdentifier - public.assembly-source - UTTypeTagSpecification - - public.filename-extension - - s - asm - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Rez Source File - UTTypeIdentifier - com.apple.rez-source - UTTypeTagSpecification - - public.filename-extension - - r - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Java Source File - UTTypeIdentifier - com.sun.java-source - UTTypeTagSpecification - - public.filename-extension - - java - jav - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Lex Source File - UTTypeIdentifier - com.apple.xcode.lex-source - UTTypeTagSpecification - - public.filename-extension - - l - lm - lmm - lpp - lxx - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Yacc Source File - UTTypeIdentifier - com.apple.xcode.yacc-source - UTTypeTagSpecification - - public.filename-extension - - y - ym - ymm - ypp - yxx - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Mig Definition File - UTTypeIdentifier - public.mig-source - UTTypeTagSpecification - - public.filename-extension - - defs - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Symbol Export File - UTTypeIdentifier - com.apple.symbol-export - UTTypeTagSpecification - - public.filename-extension - - exp - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Fortran Source File - UTTypeIdentifier - com.apple.xcode.fortran-source - UTTypeTagSpecification - - public.filename-extension - - f - for - fpp - f77 - f90 - f95 - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Pascal Source file - UTTypeIdentifier - com.apple.xcode.pascal-source - UTTypeTagSpecification - - public.filename-extension - - pas - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Ada Source File - UTTypeIdentifier - com.apple.xcode.ada-source - UTTypeTagSpecification - - public.filename-extension - - ada - adb - ads - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - HTML Source File - UTTypeIdentifier - public.html - UTTypeTagSpecification - - public.filename-extension - - html - phtml - shtml - xhtml - htm - pht - sht - xht - phtm - shtm - xhtm - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - XML Source File - UTTypeIdentifier - public.xml - UTTypeTagSpecification - - public.filename-extension - - xml - rss - tld - pt - cpt - dtml - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - JavaScript Source File - UTTypeIdentifier - com.netscape.javascript-source - UTTypeTagSpecification - - public.filename-extension - - js - htc - jscript - javascript - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Perl Source File - UTTypeIdentifier - public.perl-script - UTTypeTagSpecification - - public.filename-extension - - pl - pm - pod - perl - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Python Source File - UTTypeIdentifier - public.python-script - UTTypeTagSpecification - - public.filename-extension - - py - rpy - cpy - python - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - PHP Source File - UTTypeIdentifier - public.php-script - UTTypeTagSpecification - - public.filename-extension - - php - php3 - php4 - php5 - ph3 - ph4 - phtml - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Ruby Source File - UTTypeIdentifier - public.ruby-script - UTTypeTagSpecification - - public.filename-extension - - rb - rbw - rbx - rjs - rxml - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Shell script - UTTypeIdentifier - public.shell-script - UTTypeTagSpecification - - public.filename-extension - - sh - csh - command - ss - bashrc - bash_profile - bash_login - profile - bash_logout - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Java Class File - UTTypeIdentifier - com.sun.java-class - UTTypeTagSpecification - - public.filename-extension - - class - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Patch File - UTTypeIdentifier - org.vim.patch-file - UTTypeTagSpecification - - public.filename-extension - - patch - diff - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Strings File - UTTypeIdentifier - com.apple.xcode.strings-text - UTTypeTagSpecification - - public.filename-extension - - strings - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - AppleScript Source File - UTTypeIdentifier - com.apple.applescript.text - UTTypeTagSpecification - - public.filename-extension - - applescript - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - ActionScript Source File - UTTypeIdentifier - org.vim.as-file - UTTypeTagSpecification - - public.filename-extension - - as - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - ASP document - UTTypeIdentifier - org.vim.asp-file - UTTypeTagSpecification - - public.filename-extension - - asp - asa - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - ASP.NET document - UTTypeIdentifier - org.vim.aspx-file - UTTypeTagSpecification - - public.filename-extension - - aspx - ascx - asmx - ashx - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - BibTeX bibliography - UTTypeIdentifier - org.vim.bib-file - UTTypeTagSpecification - - public.filename-extension - - bib - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - C# Source File - UTTypeIdentifier - org.vim.cs-file - UTTypeTagSpecification - - public.filename-extension - - cs - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Context Free Design Grammar - UTTypeIdentifier - org.vim.cfdg-file - UTTypeTagSpecification - - public.filename-extension - - cfdg - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Comma separated values - UTTypeIdentifier - org.vim.csv-file - UTTypeTagSpecification - - public.filename-extension - - csv - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Tab separated values - UTTypeIdentifier - org.vim.tsv-file - UTTypeTagSpecification - - public.filename-extension - - tsv - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - CGI script - UTTypeIdentifier - org.vim.cgi-file - UTTypeTagSpecification - - public.filename-extension - - cgi - fcgi - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Configuration file - UTTypeIdentifier - org.vim.cfg-file - UTTypeTagSpecification - - public.filename-extension - - cfg - conf - config - htaccess - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Cascading style sheet - UTTypeIdentifier - org.vim.css-file - UTTypeTagSpecification - - public.filename-extension - - css - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Document Type Definition - UTTypeIdentifier - org.vim.dtd-file - UTTypeTagSpecification - - public.filename-extension - - dtd - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Dylan Source File - UTTypeIdentifier - org.vim.dylan-file - UTTypeTagSpecification - - public.filename-extension - - dylan - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Erlang Source File - UTTypeIdentifier - org.vim.erl-file - UTTypeTagSpecification - - public.filename-extension - - erl - hrl - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - F-Script Source File - UTTypeIdentifier - org.vim.fscript-file - UTTypeTagSpecification - - public.filename-extension - - fscript - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Haskell Source File - UTTypeIdentifier - org.vim.hs-file - UTTypeTagSpecification - - public.filename-extension - - hs - lhs - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Include file - UTTypeIdentifier - org.vim.inc-file - UTTypeTagSpecification - - public.filename-extension - - inc - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - iCalendar schedule - UTTypeIdentifier - org.vim.ics-file - UTTypeTagSpecification - - public.filename-extension - - ics - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - MS Windows initialization file - UTTypeIdentifier - org.vim.ini-file - UTTypeTagSpecification - - public.filename-extension - - ini - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Io Source File - UTTypeIdentifier - org.vim.io-file - UTTypeTagSpecification - - public.filename-extension - - io - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - BeanShell script - UTTypeIdentifier - org.vim.bsh-file - UTTypeTagSpecification - - public.filename-extension - - bsh - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Java properties file - UTTypeIdentifier - org.vim.properties-file - UTTypeTagSpecification - - public.filename-extension - - properties - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Java Server Page - UTTypeIdentifier - org.vim.jsp-file - UTTypeTagSpecification - - public.filename-extension - - jsp - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - LISP Source File - UTTypeIdentifier - org.vim.lisp-file - UTTypeTagSpecification - - public.filename-extension - - lisp - cl - l - lsp - mud - el - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Log file - UTTypeIdentifier - org.vim.log-file - UTTypeTagSpecification - - public.filename-extension - - log - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Mediawiki document - UTTypeIdentifier - org.vim.wiki-file - UTTypeTagSpecification - - public.filename-extension - - wiki - wikipedia - mediawiki - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - PostScript Source File - UTTypeIdentifier - com.adobe.postscript - UTTypeTagSpecification - - public.filename-extension - - ps - eps - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Scheme Source File - UTTypeIdentifier - org.vim.scm-file - UTTypeTagSpecification - - public.filename-extension - - scm - sch - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - SQL Source File - UTTypeIdentifier - org.vim.sql-file - UTTypeTagSpecification - - public.filename-extension - - sql - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Tcl Source File - UTTypeIdentifier - org.vim.tcl-file - UTTypeTagSpecification - - public.filename-extension - - tcl - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - XSL stylesheet - UTTypeIdentifier - org.vim.xsl-file - UTTypeTagSpecification - - public.filename-extension - - xsl - xslt - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Electronic business card - UTTypeIdentifier - public.vcard - UTTypeTagSpecification - - public.filename-extension - - vcf - vcard - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Visual Basic Source File - UTTypeIdentifier - org.vim.vb-file - UTTypeTagSpecification - - public.filename-extension - - vb - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - YAML document - UTTypeIdentifier - org.vim.yaml-file - UTTypeTagSpecification - - public.filename-extension - - yaml - yml - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - GTD document - UTTypeIdentifier - org.vim.gtd-file - UTTypeTagSpecification - - public.filename-extension - - gtd - gtdlog - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Markdown document - UTTypeIdentifier - net.daringfireball.markdown - UTTypeTagSpecification - - public.filename-extension - - markdown - markd - mdown - md - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - reStructuredText document - UTTypeIdentifier - org.vim.rst-file - UTTypeTagSpecification - - public.filename-extension - - rst - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Vimball Archive - UTTypeIdentifier - org.vim.vba-file - UTTypeTagSpecification - - public.filename-extension - - vba - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - VHDL Source File - UTTypeIdentifier - org.vim.vhdl-file - UTTypeTagSpecification - - public.filename-extension - - vhdl - vhd - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Lua Source File - UTTypeIdentifier - org.lua.lua-source - UTTypeTagSpecification - - public.filename-extension - - lua - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Verilog HDL Source File - UTTypeIdentifier - org.vim.v-file - UTTypeTagSpecification - - public.filename-extension - - v - - - - - UTTypeConformsTo - - public.plain-text - - UTTypeDescription - Verilog HDL Header Source File - UTTypeIdentifier - org.vim.vh-file - UTTypeTagSpecification - - public.filename-extension - - vh - - - - - - diff --git a/src/MacVim/MMAppController.h b/src/MacVim/MMAppController.h index 289c1cdd3c..15edf5cf97 100644 --- a/src/MacVim/MMAppController.h +++ b/src/MacVim/MMAppController.h @@ -31,9 +31,7 @@ NSMutableDictionary *inputQueues; int processingFlag; -#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) FSEventStreamRef fsEventStream; -#endif } + (MMAppController *)sharedInstance; diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 42b4b9e349..6c346594ca 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -45,10 +45,8 @@ #import "Miscellaneous.h" #import #import -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // Need Carbon for TIS...() functions #import -#endif #define MM_HANDLE_XCODE_MOD_EVENT 0 @@ -61,12 +59,10 @@ static NSTimeInterval MMReplyTimeout = 5; static NSString *MMWebsiteString = @"https://macvim-dev.github.io/macvim/"; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // Latency (in s) between FS event occuring and being reported to MacVim. // Should be small so that MacVim is notified of changes to the ~/.vim // directory more or less immediately. static CFTimeInterval MMEventStreamLatency = 0.1; -#endif static float MMCascadeHorizontalOffset = 21; static float MMCascadeVerticalOffset = 23; @@ -143,14 +139,11 @@ typedef struct - (NSScreen *)screenContainingTopLeftPoint:(NSPoint)pt; - (void)addInputSourceChangedObserver; - (void)removeInputSourceChangedObserver; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - (void)inputSourceChanged:(NSNotification *)notification; -#endif @end -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) static void fsEventCallback(ConstFSEventStreamRef streamRef, void *clientCallBackInfo, @@ -161,7 +154,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, { [[MMAppController sharedInstance] handleFSEvent]; } -#endif @implementation MMAppController @@ -207,10 +199,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [NSNumber numberWithInt:0], MMOpenInCurrentWindowKey, [NSNumber numberWithBool:NO], MMNoFontSubstitutionKey, [NSNumber numberWithBool:YES], MMLoginShellKey, - [NSNumber numberWithInt:2], MMRendererKey, + [NSNumber numberWithInt:MMRendererCoreText], + MMRendererKey, [NSNumber numberWithInt:MMUntitledWindowAlways], MMUntitledWindowKey, - [NSNumber numberWithBool:NO], MMTexturedWindowKey, [NSNumber numberWithBool:NO], MMZoomBothKey, @"", MMLoginShellCommandKey, @"", MMLoginShellArgumentKey, @@ -547,9 +539,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [alert setMessageText:NSLocalizedString( @"Are you sure you want to quit MacVim?", @"Quit dialog with no changed buffers, title")]; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) [alert setShowsSuppressionButton:YES]; -#endif NSString *info = nil; if (numWindows > 1) { @@ -579,12 +569,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef, if ([alert runModal] != NSAlertFirstButtonReturn) reply = NSTerminateCancel; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) if ([[alert suppressionButton] state] == NSOnState) { [[NSUserDefaults standardUserDefaults] setBool:YES forKey:MMSuppressTerminationAlertKey]; } -#endif [alert release]; } @@ -1081,10 +1069,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [panel setAllowsMultipleSelection:YES]; [panel setCanChooseDirectories:YES]; [panel setAccessoryView:showHiddenFilesView()]; -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) - // NOTE: -[NSOpenPanel runModalForDirectory:file:types:] is deprecated on - // 10.7 but -[NSOpenPanel setDirectoryURL:] requires 10.6 so jump through - // the following hoops on 10.6+. dir = [dir stringByExpandingTildeInPath]; if (dir) { NSURL *dirURL = [NSURL fileURLWithPath:dir isDirectory:YES]; @@ -1093,9 +1077,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, } NSInteger result = [panel runModal]; -#else - NSInteger result = [panel runModalForDirectory:dir file:nil types:nil]; -#endif #if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_10) if (NSModalResponseOK == result) { @@ -1197,18 +1178,14 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES]; } -- (IBAction)atsuiButtonClicked:(id)sender +- (IBAction)coreTextButtonClicked:(id)sender { - ASLogDebug(@"Toggle ATSUI renderer"); + ASLogDebug(@"Toggle CoreText renderer"); NSInteger renderer = MMRendererDefault; BOOL enable = ([sender state] == NSOnState); if (enable) { -#if MM_ENABLE_ATSUI - renderer = MMRendererATSUI; -#else renderer = MMRendererCoreText; -#endif } // Update the user default MMRenderer and synchronize the change so that @@ -1221,7 +1198,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, ASLogInfo(@"Use renderer=%ld", renderer); - // This action is called when the user clicks the "use ATSUI renderer" + // This action is called when the user clicks the "use CoreText renderer" // button in the advanced preferences pane. [self rebuildPreloadCache]; } @@ -1999,13 +1976,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, } } - -// HACK: fileAttributesAtPath was deprecated in 10.5 -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) -#define MM_fileAttributes(fm,p) [fm attributesOfItemAtPath:p error:NULL] -#else -#define MM_fileAttributes(fm,p) [fm fileAttributesAtPath:p traverseLink:YES] -#endif - (NSDate *)rcFilesModificationDate { // Check modification dates for ~/.vimrc and ~/.gvimrc and return the @@ -2017,20 +1987,20 @@ fsEventCallback(ConstFSEventStreamRef streamRef, NSFileManager *fm = [NSFileManager defaultManager]; NSString *path = [@"~/.vimrc" stringByExpandingTildeInPath]; - NSDictionary *attr = MM_fileAttributes(fm, path); + NSDictionary *attr = [fm attributesOfItemAtPath:path error:NULL]; if (!attr) { path = [@"~/_vimrc" stringByExpandingTildeInPath]; - attr = MM_fileAttributes(fm, path); + attr = [fm attributesOfItemAtPath:path error:NULL]; } NSDate *modDate = [attr objectForKey:NSFileModificationDate]; if (modDate) date = modDate; path = [@"~/.gvimrc" stringByExpandingTildeInPath]; - attr = MM_fileAttributes(fm, path); + attr = [fm attributesOfItemAtPath:path error:NULL]; if (!attr) { path = [@"~/_gvimrc" stringByExpandingTildeInPath]; - attr = MM_fileAttributes(fm, path); + attr = [fm attributesOfItemAtPath:path error:NULL]; } modDate = [attr objectForKey:NSFileModificationDate]; if (modDate) @@ -2038,7 +2008,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, return date; } -#undef MM_fileAttributes - (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments { @@ -2079,11 +2048,8 @@ fsEventCallback(ConstFSEventStreamRef streamRef, - (void)startWatchingVimDir { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) if (fsEventStream) return; - if (NULL == &FSEventStreamStart) - return; // FSEvent functions are weakly linked NSString *path = [@"~/.vim" stringByExpandingTildeInPath]; NSArray *pathsToWatch = [NSArray arrayWithObject:path]; @@ -2098,15 +2064,10 @@ fsEventCallback(ConstFSEventStreamRef streamRef, FSEventStreamStart(fsEventStream); ASLogDebug(@"Started FS event stream"); -#endif } - (void)stopWatchingVimDir { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (NULL == &FSEventStreamStop) - return; // FSEvent functions are weakly linked - if (fsEventStream) { FSEventStreamStop(fsEventStream); FSEventStreamInvalidate(fsEventStream); @@ -2114,8 +2075,6 @@ fsEventCallback(ConstFSEventStreamRef streamRef, fsEventStream = NULL; ASLogDebug(@"Stopped FS event stream"); } -#endif - } - (void)handleFSEvent @@ -2493,36 +2452,21 @@ fsEventCallback(ConstFSEventStreamRef streamRef, - (void)addInputSourceChangedObserver { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - // The TIS symbols are weakly linked. - if (NULL != &TISCopyCurrentKeyboardInputSource) { - // We get here when compiled on >=10.5 and running on >=10.5. - - id nc = [NSDistributedNotificationCenter defaultCenter]; - NSString *notifyInputSourceChanged = - (NSString *)kTISNotifySelectedKeyboardInputSourceChanged; - [nc addObserver:self - selector:@selector(inputSourceChanged:) - name:notifyInputSourceChanged - object:nil]; - } -#endif + id nc = [NSDistributedNotificationCenter defaultCenter]; + NSString *notifyInputSourceChanged = + (NSString *)kTISNotifySelectedKeyboardInputSourceChanged; + [nc addObserver:self + selector:@selector(inputSourceChanged:) + name:notifyInputSourceChanged + object:nil]; } - (void)removeInputSourceChangedObserver { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - // The TIS symbols are weakly linked. - if (NULL != &TISCopyCurrentKeyboardInputSource) { - // We get here when compiled on >=10.5 and running on >=10.5. - - id nc = [NSDistributedNotificationCenter defaultCenter]; - [nc removeObserver:self]; - } -#endif + id nc = [NSDistributedNotificationCenter defaultCenter]; + [nc removeObserver:self]; } -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - (void)inputSourceChanged:(NSNotification *)notification { unsigned i, count = [vimControllers count]; @@ -2533,6 +2477,5 @@ fsEventCallback(ConstFSEventStreamRef streamRef, [tv checkImState]; } } -#endif @end // MMAppController (Private) diff --git a/src/MacVim/MMApplication.m b/src/MacVim/MMApplication.m index 9127d43807..b68870b986 100644 --- a/src/MacVim/MMApplication.m +++ b/src/MacVim/MMApplication.m @@ -15,15 +15,6 @@ #import "MMApplication.h" -// Ctrl-Tab is broken on pre 10.5, so we add a hack to make it work. -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 -# import "MMTextView.h" -# define MM_CTRL_TAB_HACK 1 -#endif - - - - @implementation MMApplication - (void)sendEvent:(NSEvent *)event @@ -31,19 +22,6 @@ NSEventType type = [event type]; unsigned flags = [event modifierFlags]; -#ifdef MM_CTRL_TAB_HACK - NSResponder *firstResponder = [[self keyWindow] firstResponder]; - - if (NSKeyDown == type && NSControlKeyMask & flags && 48 == [event keyCode] - && [firstResponder isKindOfClass:[MMTextView class]]) { - // HACK! This is a Ctrl-Tab key down event and the first responder is - // an MMTextView; send the event directly to the text view, else it - // will never receive it on pre 10.5 systems. - [firstResponder keyDown:event]; - return; - } -#endif - // HACK! Intercept 'help' key presses and clear the 'help key flag', else // Cocoa turns the mouse cursor into a question mark and goes into 'context // help mode' (the keyDown: event itself never reaches the text view). By @@ -66,7 +44,6 @@ [super sendEvent:event]; } - - (void)orderFrontStandardAboutPanel:(id)sender { NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey: diff --git a/src/MacVim/MMAtsuiTextView.h b/src/MacVim/MMAtsuiTextView.h deleted file mode 100644 index d4da817bab..0000000000 --- a/src/MacVim/MMAtsuiTextView.h +++ /dev/null @@ -1,108 +0,0 @@ -/* vi:set ts=8 sts=4 sw=4 ft=objc: - * - * VIM - Vi IMproved by Bram Moolenaar - * MacVim GUI port by Bjorn Winckler - * - * Do ":help uganda" in Vim to read copying and usage conditions. - * Do ":help credits" in Vim to see a list of people who contributed. - * See README.txt for an overview of the Vim source code. - */ - - -#import -#import "Miscellaneous.h" - -#if MM_ENABLE_ATSUI - -enum { MMMaxCellsPerChar = 2 }; - -@class MMTextViewHelper; - - -@interface MMAtsuiTextView : NSView { - // From MMTextStorage - int maxRows, maxColumns; - NSColor *defaultBackgroundColor; - NSColor *defaultForegroundColor; - NSSize cellSize; - NSFont *font; - NSFont *fontWide; - float linespace; - float ascender; - - // From NSTextView - NSSize insetSize; - - // From vim-cocoa - NSImage *contentImage; - NSSize imageSize; - ATSUStyle atsuStyles[MMMaxCellsPerChar]; - BOOL antialias; - - MMTextViewHelper *helper; -} - -- (id)initWithFrame:(NSRect)frame; - -// -// MMTextStorage methods -// -- (int)maxRows; -- (int)maxColumns; -- (void)getMaxRows:(int*)rows columns:(int*)cols; -- (void)setMaxRows:(int)rows columns:(int)cols; -- (void)setDefaultColorsBackground:(NSColor *)bgColor - foreground:(NSColor *)fgColor; -- (NSColor *)defaultBackgroundColor; -- (NSColor *)defaultForegroundColor; -- (NSRect)rectForRowsInRange:(NSRange)range; -- (NSRect)rectForColumnsInRange:(NSRange)range; - -- (void)setFont:(NSFont *)newFont; -- (void)setWideFont:(NSFont *)newFont; -- (NSFont *)font; -- (NSFont *)fontWide; -- (NSSize)cellSize; -- (void)setLinespace:(float)newLinespace; - -// -// MMTextView methods -// -- (void)deleteSign:(NSString *)signName; -- (void)setToolTipAtMousePoint:(NSString *)string; -- (void)setPreEditRow:(int)row column:(int)col; -- (void)setMouseShape:(int)shape; -- (void)setAntialias:(BOOL)state; -- (void)setLigatures:(BOOL)state; -- (void)setImControl:(BOOL)enable; -- (void)activateIm:(BOOL)enable; -- (void)checkImState; -- (BOOL)convertPoint:(NSPoint)point toRow:(int *)row column:(int *)column; -- (NSPoint)pointForRow:(int)row column:(int)col; -- (NSRect)rectForRow:(int)row column:(int)col numRows:(int)nr - numColumns:(int)nc; - -// -// NSTextView methods -// -- (void)keyDown:(NSEvent *)event; -- (void)insertText:(id)string; -- (void)doCommandBySelector:(SEL)selector; -- (BOOL)performKeyEquivalent:(NSEvent *)event; - -// -// NSTextContainer methods -// -- (void)setTextContainerInset:(NSSize)inset; - -// -// MMAtsuiTextView methods -// -- (void)performBatchDrawWithData:(NSData *)data; -- (NSSize)desiredSize; -- (NSSize)minSize; -- (NSSize)constrainRows:(int *)rows columns:(int *)cols toSize:(NSSize)size; - -@end - -#endif // MM_ENABLE_ATSUI diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m deleted file mode 100644 index f4b568646d..0000000000 --- a/src/MacVim/MMAtsuiTextView.m +++ /dev/null @@ -1,1304 +0,0 @@ -/* vi:set ts=8 sts=4 sw=4 ft=objc: - * - * VIM - Vi IMproved by Bram Moolenaar - * MacVim GUI port by Bjorn Winckler - * - * Do ":help uganda" in Vim to read copying and usage conditions. - * Do ":help credits" in Vim to see a list of people who contributed. - * See README.txt for an overview of the Vim source code. - */ -/* - * MMAtsuiTextView - * - * Dispatches keyboard and mouse input to the backend. Handles drag-n-drop of - * files onto window. The rendering is done using ATSUI. - * - * The text view area consists of two parts: - * 1. The text area - this is where text is rendered; the size is governed by - * the current number of rows and columns. - * 2. The inset area - this is a border around the text area; the size is - * governed by the user defaults MMTextInset[Left|Right|Top|Bottom]. - * - * The current size of the text view frame does not always match the desired - * area, i.e. the area determined by the number of rows, columns plus text - * inset. This distinction is particularly important when the view is being - * resized. - */ - -#import "MMAppController.h" -#import "MMAtsuiTextView.h" -#import "MMTextViewHelper.h" -#import "MMVimController.h" -#import "MMWindowController.h" - -#if MM_ENABLE_ATSUI - -// TODO: What does DRAW_TRANSP flag do? If the background isn't drawn when -// this flag is set, then sometimes the character after the cursor becomes -// blank. Everything seems to work fine by just ignoring this flag. -#define DRAW_TRANSP 0x01 /* draw with transparant bg */ -#define DRAW_BOLD 0x02 /* draw bold text */ -#define DRAW_UNDERL 0x04 /* draw underline text */ -#define DRAW_UNDERC 0x08 /* draw undercurl text */ -#define DRAW_ITALIC 0x10 /* draw italic text */ -#define DRAW_CURSOR 0x20 -#define DRAW_WIDE 0x40 /* draw wide text */ - -#define kUnderlineOffset (-2) -#define kUnderlineHeight 1 -#define kUndercurlHeight 2 -#define kUndercurlOffset (-2) -#define kUndercurlDotWidth 2 -#define kUndercurlDotDistance 2 - - -@interface NSFont (AppKitPrivate) -- (ATSUFontID) _atsFontID; -@end - - -@interface MMAtsuiTextView (Private) -- (void)initAtsuStyles; -- (void)disposeAtsuStyles; -- (void)updateAtsuStyles; -- (MMWindowController *)windowController; -- (MMVimController *)vimController; -@end - - -@interface MMAtsuiTextView (Drawing) -- (NSPoint)originForRow:(int)row column:(int)column; -- (NSRect)rectFromRow:(int)row1 column:(int)col1 - toRow:(int)row2 column:(int)col2; -- (NSSize)textAreaSize; -- (void)resizeContentImage; -- (void)beginDrawing; -- (void)endDrawing; -- (void)drawString:(UniChar *)string length:(UniCharCount)length - atRow:(int)row column:(int)col cells:(int)cells - withFlags:(int)flags foregroundColor:(NSColor *)fg - backgroundColor:(NSColor *)bg specialColor:(NSColor *)sp; -- (void)deleteLinesFromRow:(int)row lineCount:(int)count - scrollBottom:(int)bottom left:(int)left right:(int)right - color:(NSColor *)color; -- (void)insertLinesAtRow:(int)row lineCount:(int)count - scrollBottom:(int)bottom left:(int)left right:(int)right - color:(NSColor *)color; -- (void)clearBlockFromRow:(int)row1 column:(int)col1 toRow:(int)row2 - column:(int)col2 color:(NSColor *)color; -- (void)clearAll; -- (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape - fraction:(int)percent; -- (void)drawInvertedRectAtRow:(int)row column:(int)col numRows:(int)nrows - numColumns:(int)ncols; -@end - - - - static float -defaultLineHeightForFont(NSFont *font) -{ - // HACK: -[NSFont defaultLineHeightForFont] is deprecated but since the - // ATSUI renderer does not use NSLayoutManager we create one temporarily. - NSLayoutManager *lm = [[NSLayoutManager alloc] init]; - float height = [lm defaultLineHeightForFont:font]; - [lm release]; - - return height; -} - -@implementation MMAtsuiTextView - -- (id)initWithFrame:(NSRect)frame -{ - if (!(self = [super initWithFrame:frame])) - return nil; - - // NOTE! It does not matter which font is set here, Vim will set its - // own font on startup anyway. Just set some bogus values. - font = [[NSFont userFixedPitchFontOfSize:0] retain]; - ascender = 0; - cellSize.width = cellSize.height = 1; - contentImage = nil; - imageSize = NSZeroSize; - insetSize = NSZeroSize; - - // NOTE: If the default changes to 'NO' then the intialization of - // p_antialias in option.c must change as well. - antialias = YES; - - helper = [[MMTextViewHelper alloc] init]; - [helper setTextView:self]; - - [self initAtsuStyles]; - - [self registerForDraggedTypes:[NSArray arrayWithObjects: - NSFilenamesPboardType, NSStringPboardType, nil]]; - - return self; -} - -- (void)dealloc -{ - ASLogDebug(@""); - - [self disposeAtsuStyles]; - [font release]; font = nil; - [fontWide release]; fontWide = nil; - [defaultBackgroundColor release]; defaultBackgroundColor = nil; - [defaultForegroundColor release]; defaultForegroundColor = nil; - - [helper setTextView:nil]; - [helper release]; helper = nil; - - [super dealloc]; -} - -- (int)maxRows -{ - return maxRows; -} - -- (int)maxColumns -{ - return maxColumns; -} - -- (void)getMaxRows:(int*)rows columns:(int*)cols -{ - if (rows) *rows = maxRows; - if (cols) *cols = maxColumns; -} - -- (void)setMaxRows:(int)rows columns:(int)cols -{ - // NOTE: Just remember the new values, the actual resizing is done lazily. - maxRows = rows; - maxColumns = cols; -} - -- (void)setDefaultColorsBackground:(NSColor *)bgColor - foreground:(NSColor *)fgColor -{ - if (defaultBackgroundColor != bgColor) { - [defaultBackgroundColor release]; - defaultBackgroundColor = bgColor ? [bgColor retain] : nil; - } - - if (defaultForegroundColor != fgColor) { - [defaultForegroundColor release]; - defaultForegroundColor = fgColor ? [fgColor retain] : nil; - } -} - -- (NSColor *)defaultBackgroundColor -{ - return defaultBackgroundColor; -} - -- (NSColor *)defaultForegroundColor -{ - return defaultForegroundColor; -} - -- (void)setTextContainerInset:(NSSize)size -{ - insetSize = size; -} - -- (NSRect)rectForRowsInRange:(NSRange)range -{ - // Compute rect whose vertical dimensions cover the rows in the given - // range. - // NOTE: The rect should be in _flipped_ coordinates and the first row must - // include the top inset as well. (This method is only used to place the - // scrollbars inside MMVimView.) - - NSRect rect = { {0, 0}, {0, 0} }; - unsigned start = range.location > maxRows ? maxRows : range.location; - unsigned length = range.length; - - if (start + length > maxRows) - length = maxRows - start; - - if (start > 0) { - rect.origin.y = cellSize.height * start + insetSize.height; - rect.size.height = cellSize.height * length; - } else { - // Include top inset - rect.origin.y = 0; - rect.size.height = cellSize.height * length + insetSize.height; - } - - return rect; -} - -- (NSRect)rectForColumnsInRange:(NSRange)range -{ - // Compute rect whose horizontal dimensions cover the columns in the given - // range. - // NOTE: The first column must include the left inset. (This method is - // only used to place the scrollbars inside MMVimView.) - - NSRect rect = { {0, 0}, {0, 0} }; - unsigned start = range.location > maxColumns ? maxColumns : range.location; - unsigned length = range.length; - - if (start+length > maxColumns) - length = maxColumns - start; - - if (start > 0) { - rect.origin.x = cellSize.width * start + insetSize.width; - rect.size.width = cellSize.width * length; - } else { - // Include left inset - rect.origin.x = 0; - rect.size.width = cellSize.width * length + insetSize.width; - } - - return rect; -} - - -- (void)setFont:(NSFont *)newFont -{ - if (newFont && font != newFont) { - [font release]; - font = [newFont retain]; - ascender = roundf([font ascender]); - - float em = [@"m" sizeWithAttributes: - [NSDictionary dictionaryWithObject:newFont - forKey:NSFontAttributeName]].width; - float cellWidthMultiplier = [[NSUserDefaults standardUserDefaults] - floatForKey:MMCellWidthMultiplierKey]; - - // NOTE! Even though NSFontFixedAdvanceAttribute is a float, it will - // only render at integer sizes. Hence, we restrict the cell width to - // an integer here, otherwise the window width and the actual text - // width will not match. - cellSize.width = ceilf(em * cellWidthMultiplier); - cellSize.height = linespace + defaultLineHeightForFont(newFont); - - [self updateAtsuStyles]; - } -} - -- (void)setWideFont:(NSFont *)newFont -{ - if (!newFont) { - if (font) [self setWideFont:font]; - } else if (newFont != fontWide) { - [fontWide release]; - - float pointSize = [newFont pointSize]; - NSFontDescriptor *desc = [newFont fontDescriptor]; - NSDictionary *dictWide = [NSDictionary - dictionaryWithObject:[NSNumber numberWithFloat:2*cellSize.width] - forKey:NSFontFixedAdvanceAttribute]; - desc = [desc fontDescriptorByAddingAttributes:dictWide]; - fontWide = [NSFont fontWithDescriptor:desc size:pointSize]; - [fontWide retain]; - } -} - -- (NSFont *)font -{ - return font; -} - -- (NSFont *)fontWide -{ - return fontWide; -} - -- (NSSize)cellSize -{ - return cellSize; -} - -- (void)setLinespace:(float)newLinespace -{ - linespace = newLinespace; - - // NOTE: The linespace is added to the cell height in order for a multiline - // selection not to have white (background color) gaps between lines. Also - // this simplifies the code a lot because there is no need to check the - // linespace when calculating the size of the text view etc. When the - // linespace is non-zero the baseline will be adjusted as well; check - // MMTypesetter. - cellSize.height = linespace + defaultLineHeightForFont(font); -} - - - -- (void)setShouldDrawInsertionPoint:(BOOL)on -{ -} - -- (void)deleteSign:(NSString *)signName -{ - // ONLY in Core Text! -} - -- (void)setToolTipAtMousePoint:(NSString *)string -{ - // ONLY in Core Text! -} - -- (void)setPreEditRow:(int)row column:(int)col -{ - [helper setPreEditRow:row column:col]; -} - -- (void)setMouseShape:(int)shape -{ - [helper setMouseShape:shape]; -} - -- (void)setAntialias:(BOOL)state -{ - antialias = state; -} - -- (void)setLigatures:(BOOL)state -{ - // ONLY in Core Text! -} - -- (void)setImControl:(BOOL)enable -{ - [helper setImControl:enable]; -} - -- (void)activateIm:(BOOL)enable -{ - [helper activateIm:enable]; -} - -- (void)checkImState -{ - [helper checkImState]; -} - -- (BOOL)_wantsKeyDownForEvent:(id)event -{ - // HACK! This is an undocumented method which is called from within - // -[NSWindow sendEvent] (and perhaps in other places as well) when the - // user presses e.g. Ctrl-Tab or Ctrl-Esc . Returning YES here effectively - // disables the Cocoa "key view loop" (which is undesirable). It may have - // other side-effects, but we really _do_ want to process all key down - // events so it seems safe to always return YES. - return YES; -} - -- (void)keyDown:(NSEvent *)event -{ - [helper keyDown:event]; -} - -- (void)insertText:(id)string -{ - [helper insertText:string]; -} - -- (void)doCommandBySelector:(SEL)selector -{ - [helper doCommandBySelector:selector]; -} - -- (BOOL)performKeyEquivalent:(NSEvent *)event -{ - return [helper performKeyEquivalent:event]; -} - -- (BOOL)hasMarkedText -{ - return [helper hasMarkedText]; -} - -- (NSRange)markedRange -{ - return [helper markedRange]; -} - -- (NSDictionary *)markedTextAttributes -{ - return [helper markedTextAttributes]; -} - -- (void)setMarkedTextAttributes:(NSDictionary *)attr -{ - [helper setMarkedTextAttributes:attr]; -} - -- (void)setMarkedText:(id)text selectedRange:(NSRange)range -{ - [helper setMarkedText:text selectedRange:range]; -} - -- (void)unmarkText -{ - [helper unmarkText]; -} - -- (void)scrollWheel:(NSEvent *)event -{ - [helper scrollWheel:event]; -} - -- (void)mouseDown:(NSEvent *)event -{ - [helper mouseDown:event]; -} - -- (void)rightMouseDown:(NSEvent *)event -{ - [helper mouseDown:event]; -} - -- (void)otherMouseDown:(NSEvent *)event -{ - [helper mouseDown:event]; -} - -- (void)mouseUp:(NSEvent *)event -{ - [helper mouseUp:event]; -} - -- (void)rightMouseUp:(NSEvent *)event -{ - [helper mouseUp:event]; -} - -- (void)otherMouseUp:(NSEvent *)event -{ - [helper mouseUp:event]; -} - -- (void)mouseDragged:(NSEvent *)event -{ - [helper mouseDragged:event]; -} - -- (void)rightMouseDragged:(NSEvent *)event -{ - [helper mouseDragged:event]; -} - -- (void)otherMouseDragged:(NSEvent *)event -{ - [helper mouseDragged:event]; -} - -- (void)mouseMoved:(NSEvent *)event -{ - [helper mouseMoved:event]; -} - -- (NSMenu*)menuForEvent:(NSEvent *)event -{ - // HACK! Return nil to disable default popup menus (Vim provides its own). - // Called when user Ctrl-clicks in the view (this is already handled in - // rightMouseDown:). - return nil; -} - -- (BOOL)performDragOperation:(id )sender -{ - return [helper performDragOperation:sender]; -} - -- (NSDragOperation)draggingEntered:(id )sender -{ - return [helper draggingEntered:sender]; -} - -- (NSDragOperation)draggingUpdated:(id )sender -{ - return [helper draggingUpdated:sender]; -} - - - -- (BOOL)mouseDownCanMoveWindow -{ - return NO; -} - -- (BOOL)isOpaque -{ - return YES; -} - -- (BOOL)acceptsFirstResponder -{ - return YES; -} - -- (BOOL)isFlipped -{ - return NO; -} - -- (void)drawRect:(NSRect)rect -{ - [defaultBackgroundColor set]; - NSRectFill(rect); - - NSPoint pt = { insetSize.width, insetSize.height }; - [contentImage compositeToPoint:pt operation:NSCompositeCopy]; - -#ifdef INCLUDE_OLD_IM_CODE - if ([self hasMarkedText] && ![helper useInlineIm]) { - int len = [[helper markedText] length]; - int rows = 0; - int cols = maxColumns - [helper preEditColumn]; - NSFont *theFont = [[self markedTextAttributes] - valueForKey:NSFontAttributeName]; - if (theFont == [self fontWide]) - cols = cols / 2; - int done = 0; - int lend = cols > len ? len : cols; - NSAttributedString *aString = [[helper markedText] - attributedSubstringFromRange:NSMakeRange(done, lend)]; - NSPoint pt = [self pointForRow:[helper preEditRow] - column:[helper preEditColumn]]; - [aString drawAtPoint:pt]; - done = lend; - if (done != len) { - int r; - rows = (len - done) / (maxColumns / 2) + 1; - for (r = 1; r <= rows; r++) { - lend = len - done > maxColumns / 2 - ? maxColumns / 2 : len - done; - aString = [[helper markedText] attributedSubstringFromRange: - NSMakeRange(done, lend)]; - NSPoint pt = [self pointForRow:[helper preEditRow]+r - column:0]; - [aString drawAtPoint:pt]; - done += lend; - } - } - - rows = maxRows - 1 - [helper preEditRow]; - cols = [helper preEditColumn]; - if (theFont == fontWide) { - cols += ([helper imRange].location+[helper imRange].length) * 2; - if (cols >= maxColumns - 1) { - rows -= cols / maxColumns; - cols = cols % 2 ? cols % maxColumns + 1 : - cols % maxColumns; - } - } else { - cols += ([helper imRange].location+[helper imRange].length); - if (cols >= maxColumns) { - rows -= cols / maxColumns; - cols = cols % 2 ? cols % maxColumns + 1 : - cols % maxColumns; - } - } - - // TODO: Could IM be in "right-left" mode? If so the insertion point - // will be on the wrong side. - [self drawInsertionPointAtRow:rows - column:cols - shape:MMInsertionPointVertical - fraction:25]; - } -#endif // INCLUDE_OLD_IM_CODE -} - -- (BOOL) wantsDefaultClipping -{ - return NO; -} - - -#define MM_DEBUG_DRAWING 0 - -- (void)performBatchDrawWithData:(NSData *)data -{ - const void *bytes = [data bytes]; - const void *end = bytes + [data length]; - - if (! NSEqualSizes(imageSize, [self textAreaSize])) - [self resizeContentImage]; - -#if MM_DEBUG_DRAWING - ASLogDebug(@"====> BEGIN %s", _cmd); -#endif - [self beginDrawing]; - - // TODO: Sanity check input - - while (bytes < end) { - int type = *((int*)bytes); bytes += sizeof(int); - - if (ClearAllDrawType == type) { -#if MM_DEBUG_DRAWING - ASLogDebug(@" Clear all"); -#endif - [self clearAll]; - } else if (ClearBlockDrawType == type) { - unsigned color = *((unsigned*)bytes); bytes += sizeof(unsigned); - int row1 = *((int*)bytes); bytes += sizeof(int); - int col1 = *((int*)bytes); bytes += sizeof(int); - int row2 = *((int*)bytes); bytes += sizeof(int); - int col2 = *((int*)bytes); bytes += sizeof(int); - -#if MM_DEBUG_DRAWING - ASLogDebug(@" Clear block (%d,%d) -> (%d,%d)", row1, col1, - row2,col2); -#endif - [self clearBlockFromRow:row1 column:col1 - toRow:row2 column:col2 - color:[NSColor colorWithArgbInt:color]]; - } else if (DeleteLinesDrawType == type) { - unsigned color = *((unsigned*)bytes); bytes += sizeof(unsigned); - int row = *((int*)bytes); bytes += sizeof(int); - int count = *((int*)bytes); bytes += sizeof(int); - int bot = *((int*)bytes); bytes += sizeof(int); - int left = *((int*)bytes); bytes += sizeof(int); - int right = *((int*)bytes); bytes += sizeof(int); - -#if MM_DEBUG_DRAWING - ASLogDebug(@" Delete %d line(s) from %d", count, row); -#endif - [self deleteLinesFromRow:row lineCount:count - scrollBottom:bot left:left right:right - color:[NSColor colorWithArgbInt:color]]; - } else if (DrawStringDrawType == type) { - int bg = *((int*)bytes); bytes += sizeof(int); - int fg = *((int*)bytes); bytes += sizeof(int); - int sp = *((int*)bytes); bytes += sizeof(int); - int row = *((int*)bytes); bytes += sizeof(int); - int col = *((int*)bytes); bytes += sizeof(int); - int cells = *((int*)bytes); bytes += sizeof(int); - int flags = *((int*)bytes); bytes += sizeof(int); - int len = *((int*)bytes); bytes += sizeof(int); - // UniChar *string = (UniChar*)bytes; bytes += len; - NSString *string = [[NSString alloc] - initWithBytesNoCopy:(void*)bytes - length:len - encoding:NSUTF8StringEncoding - freeWhenDone:NO]; - bytes += len; -#if MM_DEBUG_DRAWING - ASLogDebug(@" Draw string at (%d,%d) length=%d flags=%d fg=0x%x " - "bg=0x%x sp=0x%x", row, col, len, flags, fg, bg, sp); -#endif - unichar *characters = malloc(sizeof(unichar) * [string length]); - [string getCharacters:characters]; - - [self drawString:characters - length:[string length] - atRow:row - column:col - cells:cells withFlags:flags - foregroundColor:[NSColor colorWithRgbInt:fg] - backgroundColor:[NSColor colorWithArgbInt:bg] - specialColor:[NSColor colorWithRgbInt:sp]]; - free(characters); - [string release]; - } else if (InsertLinesDrawType == type) { - unsigned color = *((unsigned*)bytes); bytes += sizeof(unsigned); - int row = *((int*)bytes); bytes += sizeof(int); - int count = *((int*)bytes); bytes += sizeof(int); - int bot = *((int*)bytes); bytes += sizeof(int); - int left = *((int*)bytes); bytes += sizeof(int); - int right = *((int*)bytes); bytes += sizeof(int); - -#if MM_DEBUG_DRAWING - ASLogDebug(@" Insert %d line(s) at row %d", count, row); -#endif - [self insertLinesAtRow:row lineCount:count - scrollBottom:bot left:left right:right - color:[NSColor colorWithArgbInt:color]]; - } else if (DrawCursorDrawType == type) { - unsigned color = *((unsigned*)bytes); bytes += sizeof(unsigned); - int row = *((int*)bytes); bytes += sizeof(int); - int col = *((int*)bytes); bytes += sizeof(int); - int shape = *((int*)bytes); bytes += sizeof(int); - int percent = *((int*)bytes); bytes += sizeof(int); - -#if MM_DEBUG_DRAWING - ASLogDebug(@" Draw cursor at (%d,%d)", row, col); -#endif - [helper setInsertionPointColor:[NSColor colorWithRgbInt:color]]; - [self drawInsertionPointAtRow:row column:col shape:shape - fraction:percent]; - } else if (DrawInvertedRectDrawType == type) { - int row = *((int*)bytes); bytes += sizeof(int); - int col = *((int*)bytes); bytes += sizeof(int); - int nr = *((int*)bytes); bytes += sizeof(int); - int nc = *((int*)bytes); bytes += sizeof(int); - /*int invert = *((int*)bytes);*/ bytes += sizeof(int); - -#if MM_DEBUG_DRAWING - ASLogDebug(@" Draw inverted rect: row=%d col=%d nrows=%d " - "ncols=%d", row, col, nr, nc); -#endif - [self drawInvertedRectAtRow:row column:col numRows:nr - numColumns:nc]; - } else if (SetCursorPosDrawType == type) { - // TODO: This is used for Voice Over support in MMTextView, - // MMAtsuiTextView currently does not support Voice Over. - /*cursorRow = *((int*)bytes);*/ bytes += sizeof(int); - /*cursorCol = *((int*)bytes);*/ bytes += sizeof(int); - } else { - ASLogWarn(@"Unknown draw type (type=%d)", type); - } - } - - [self endDrawing]; - - [self setNeedsDisplay:YES]; - - // NOTE: During resizing, Cocoa only sends draw messages before Vim's rows - // and columns are changed (due to ipc delays). Force a redraw here. - if ([self inLiveResize]) - [self display]; - -#if MM_DEBUG_DRAWING - ASLogDebug(@"<==== END %s", _cmd); -#endif -} - -- (NSSize)constrainRows:(int *)rows columns:(int *)cols toSize:(NSSize)size -{ - // TODO: - // - Rounding errors may cause size change when there should be none - // - Desired rows/columns shold not be 'too small' - - // Constrain the desired size to the given size. Values for the minimum - // rows and columns are taken from Vim. - NSSize desiredSize = [self desiredSize]; - int desiredRows = maxRows; - int desiredCols = maxColumns; - - if (size.height != desiredSize.height) { - float fh = cellSize.height; - float ih = 2 * insetSize.height; - if (fh < 1.0f) fh = 1.0f; - - desiredRows = floor((size.height - ih)/fh); - desiredSize.height = fh*desiredRows + ih; - } - - if (size.width != desiredSize.width) { - float fw = cellSize.width; - float iw = 2 * insetSize.width; - if (fw < 1.0f) fw = 1.0f; - - desiredCols = floor((size.width - iw)/fw); - desiredSize.width = fw*desiredCols + iw; - } - - if (rows) *rows = desiredRows; - if (cols) *cols = desiredCols; - - return desiredSize; -} - -- (NSSize)desiredSize -{ - // Compute the size the text view should be for the entire text area and - // inset area to be visible with the present number of rows and columns. - return NSMakeSize(maxColumns * cellSize.width + 2 * insetSize.width, - maxRows * cellSize.height + 2 * insetSize.height); -} - -- (NSSize)minSize -{ - // Compute the smallest size the text view is allowed to be. - return NSMakeSize(MMMinColumns * cellSize.width + 2 * insetSize.width, - MMMinRows * cellSize.height + 2 * insetSize.height); -} - -- (void)changeFont:(id)sender -{ - [helper changeFont:sender]; -} - - -// -// NOTE: The menu items cut/copy/paste/undo/redo/select all/... must be bound -// to the same actions as in IB otherwise they will not work with dialogs. All -// we do here is forward these actions to the Vim process. -// -- (IBAction)cut:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (IBAction)copy:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (IBAction)paste:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (IBAction)undo:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (IBAction)redo:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (IBAction)selectAll:(id)sender -{ - [[self windowController] vimMenuItemAction:sender]; -} - -- (BOOL)convertPoint:(NSPoint)point toRow:(int *)row column:(int *)column -{ - // View is not flipped, instead the atsui code draws to a flipped image; - // thus we need to 'flip' the coordinate here since the column number - // increases in an up-to-down order. - point.y = [self frame].size.height - point.y; - - NSPoint origin = { insetSize.width, insetSize.height }; - - if (!(cellSize.width > 0 && cellSize.height > 0)) - return NO; - - if (row) *row = floor((point.y-origin.y-1) / cellSize.height); - if (column) *column = floor((point.x-origin.x-1) / cellSize.width); - - return YES; -} - -- (NSPoint)pointForRow:(int)row column:(int)col -{ - // Return the lower left coordinate of the cell at (row,column). - NSPoint pt; - - pt.x = insetSize.width + col*cellSize.width; - pt.y = [self frame].size.height - - (insetSize.height + (1+row)*cellSize.height); - - return pt; -} - -- (NSRect)rectForRow:(int)row column:(int)col numRows:(int)nr - numColumns:(int)nc -{ - // Return the rect for the block which covers the specified rows and - // columns. The lower-left corner is the origin of this rect. - NSRect rect; - - rect.origin.x = insetSize.width + col*cellSize.width; - rect.origin.y = [self frame].size.height - - (insetSize.height + (nr+row)*cellSize.height); - rect.size.width = nc*cellSize.width; - rect.size.height = nr*cellSize.height; - - return rect; -} - -- (NSArray *)validAttributesForMarkedText -{ - return nil; -} - -- (NSAttributedString *)attributedSubstringFromRange:(NSRange)range -{ - return nil; -} - -- (NSUInteger)characterIndexForPoint:(NSPoint)point -{ - return NSNotFound; -} - -// The return type of this message changed with OS X 10.5 so we need this -// kludge in order to avoid compiler warnings on OS X 10.4. -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) -- (NSInteger)conversationIdentifier -{ - return (NSInteger)self; -} -#else -- (long)conversationIdentifier -{ - return (long)self; -} -#endif - -- (NSRange)selectedRange -{ - return [helper imRange]; -} - -- (NSRect)firstRectForCharacterRange:(NSRange)range -{ - return [helper firstRectForCharacterRange:range]; -} - -@end // MMAtsuiTextView - - - - -@implementation MMAtsuiTextView (Private) - -- (void)initAtsuStyles -{ - int i; - for (i = 0; i < MMMaxCellsPerChar; i++) - ATSUCreateStyle(&atsuStyles[i]); -} - -- (void)disposeAtsuStyles -{ - int i; - - for (i = 0; i < MMMaxCellsPerChar; i++) - if (atsuStyles[i] != NULL) - { - if (ATSUDisposeStyle(atsuStyles[i]) != noErr) - atsuStyles[i] = NULL; - } -} - -- (void)updateAtsuStyles -{ - ATSUFontID fontID; - Fixed fontSize; - Fixed fontWidth; - int i; - CGAffineTransform transform = CGAffineTransformMakeScale(1, -1); - ATSStyleRenderingOptions options; - - fontID = [font _atsFontID]; - fontSize = Long2Fix([font pointSize]); - options = kATSStyleApplyAntiAliasing; - - ATSUAttributeTag attribTags[] = - { - kATSUFontTag, kATSUSizeTag, kATSUImposeWidthTag, - kATSUFontMatrixTag, kATSUStyleRenderingOptionsTag, - kATSUMaxATSUITagValue + 1 - }; - - ByteCount attribSizes[] = - { - sizeof(ATSUFontID), sizeof(Fixed), sizeof(fontWidth), - sizeof(CGAffineTransform), sizeof(ATSStyleRenderingOptions), - sizeof(font) - }; - - ATSUAttributeValuePtr attribValues[] = - { - &fontID, &fontSize, &fontWidth, &transform, &options, &font - }; - - ATSUFontFeatureType featureTypes[] = { - kLigaturesType, kLigaturesType - }; - - ATSUFontFeatureSelector featureSelectors[] = { - kCommonLigaturesOffSelector, kRareLigaturesOffSelector - }; - - for (i = 0; i < MMMaxCellsPerChar; i++) - { - fontWidth = Long2Fix(cellSize.width * (i + 1)); - - if (ATSUSetAttributes(atsuStyles[i], - (sizeof attribTags) / sizeof(ATSUAttributeTag), - attribTags, attribSizes, attribValues) != noErr) - { - ATSUDisposeStyle(atsuStyles[i]); - atsuStyles[i] = NULL; - } - - // Turn off ligatures by default - ATSUSetFontFeatures(atsuStyles[i], - sizeof(featureTypes) / sizeof(featureTypes[0]), - featureTypes, featureSelectors); - } -} - -- (MMWindowController *)windowController -{ - id windowController = [[self window] windowController]; - if ([windowController isKindOfClass:[MMWindowController class]]) - return (MMWindowController*)windowController; - return nil; -} - -- (MMVimController *)vimController -{ - return [[self windowController] vimController]; -} - -@end // MMAtsuiTextView (Private) - - - - -@implementation MMAtsuiTextView (Drawing) - -- (NSPoint)originForRow:(int)row column:(int)col -{ - return NSMakePoint(col * cellSize.width, row * cellSize.height); -} - -- (NSRect)rectFromRow:(int)row1 column:(int)col1 - toRow:(int)row2 column:(int)col2 -{ - NSPoint origin = [self originForRow:row1 column:col1]; - return NSMakeRect(origin.x, origin.y, - (col2 + 1 - col1) * cellSize.width, - (row2 + 1 - row1) * cellSize.height); -} - -- (NSSize)textAreaSize -{ - // Calculate the (desired) size of the text area, i.e. the text view area - // minus the inset area. - return NSMakeSize(maxColumns * cellSize.width, maxRows * cellSize.height); -} - -- (void)resizeContentImage -{ - [contentImage release]; - contentImage = [[NSImage alloc] initWithSize:[self textAreaSize]]; - [contentImage setFlipped:YES]; - imageSize = [self textAreaSize]; -} - -- (void)beginDrawing -{ - [contentImage lockFocus]; -} - -- (void)endDrawing -{ - [contentImage unlockFocus]; -} - -#define atsu_style_set_bool(s, t, b) \ - ATSUSetAttributes(s, 1, &t, &(sizeof(Boolean)), &&b); -#define FILL_Y(y) (y * cellSize.height) - -- (void)drawString:(UniChar *)string length:(UniCharCount)length - atRow:(int)row column:(int)col cells:(int)cells - withFlags:(int)flags foregroundColor:(NSColor *)fg - backgroundColor:(NSColor *)bg specialColor:(NSColor *)sp -{ - // 'string' consists of 'length' utf-16 code pairs and should cover 'cells' - // display cells (a normal character takes up one display cell, a wide - // character takes up two) - ATSUStyle style = (flags & DRAW_WIDE) ? atsuStyles[1] : atsuStyles[0]; - ATSUTextLayout layout; - - // Font selection and rendering options for ATSUI - ATSUAttributeTag attribTags[3] = { kATSUQDBoldfaceTag, - kATSUFontMatrixTag, - kATSUStyleRenderingOptionsTag }; - - ByteCount attribSizes[] = { sizeof(Boolean), - sizeof(CGAffineTransform), - sizeof(UInt32) }; - Boolean useBold; - CGAffineTransform theTransform = CGAffineTransformMakeScale(1.0, -1.0); - UInt32 useAntialias; - - ATSUAttributeValuePtr attribValues[3] = { &useBold, &theTransform, - &useAntialias }; - - useBold = (flags & DRAW_BOLD) ? true : false; - - if (flags & DRAW_ITALIC) - theTransform.c = Fix2X(kATSItalicQDSkew); - - useAntialias = antialias ? kATSStyleApplyAntiAliasing - : kATSStyleNoAntiAliasing; - - ATSUSetAttributes(style, sizeof(attribValues) / sizeof(attribValues[0]), - attribTags, attribSizes, attribValues); - - ATSUCreateTextLayout(&layout); - ATSUSetTextPointerLocation(layout, string, - kATSUFromTextBeginning, kATSUToTextEnd, - length); - ATSUSetRunStyle(layout, style, kATSUFromTextBeginning, kATSUToTextEnd); - - NSRect rect = NSMakeRect(col * cellSize.width, row * cellSize.height, - length * cellSize.width, cellSize.height); - if (flags & DRAW_WIDE) - rect.size.width = rect.size.width * 2; - CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort]; - - // Clip drawing to avoid text bleeding into adjacent display cells when - // antialiasing is enabled. - CGContextSaveGState(context); - CGContextClipToRect(context, *(CGRect*)&rect); - - ATSUAttributeTag tags[] = { kATSUCGContextTag }; - ByteCount sizes[] = { sizeof(CGContextRef) }; - ATSUAttributeValuePtr values[] = { &context }; - ATSUSetLayoutControls(layout, 1, tags, sizes, values); - - if (! (flags & DRAW_TRANSP)) - { - [bg set]; - NSRectFill(rect); - } - - [fg set]; - - ATSUSetTransientFontMatching(layout, TRUE); - ATSUDrawText(layout, - kATSUFromTextBeginning, - kATSUToTextEnd, - X2Fix(rect.origin.x), - X2Fix(rect.origin.y + ascender)); - ATSUDisposeTextLayout(layout); - - if (flags & DRAW_UNDERL) - { - [sp set]; - NSRectFill(NSMakeRect(rect.origin.x, - (row + 1) * cellSize.height + kUnderlineOffset, - rect.size.width, kUnderlineHeight)); - } - - if (flags & DRAW_UNDERC) - { - [sp set]; - - float line_end_x = rect.origin.x + rect.size.width; - int i = 0; - NSRect line_rect = NSMakeRect( - rect.origin.x, - (row + 1) * cellSize.height + kUndercurlOffset, - kUndercurlDotWidth, kUndercurlHeight); - - while (line_rect.origin.x < line_end_x) - { - if (i % 2) - NSRectFill(line_rect); - - line_rect.origin.x += kUndercurlDotDistance; - i++; - } - } - - CGContextRestoreGState(context); -} - -- (void)scrollRect:(NSRect)rect lineCount:(int)count -{ - NSPoint destPoint = rect.origin; - destPoint.y += count * cellSize.height; - - NSCopyBits(0, rect, destPoint); -} - -- (void)deleteLinesFromRow:(int)row lineCount:(int)count - scrollBottom:(int)bottom left:(int)left right:(int)right - color:(NSColor *)color -{ - NSRect rect = [self rectFromRow:row + count - column:left - toRow:bottom - column:right]; - [color set]; - // move rect up for count lines - [self scrollRect:rect lineCount:-count]; - [self clearBlockFromRow:bottom - count + 1 - column:left - toRow:bottom - column:right - color:color]; -} - -- (void)insertLinesAtRow:(int)row lineCount:(int)count - scrollBottom:(int)bottom left:(int)left right:(int)right - color:(NSColor *)color -{ - NSRect rect = [self rectFromRow:row - column:left - toRow:bottom - count - column:right]; - [color set]; - // move rect down for count lines - [self scrollRect:rect lineCount:count]; - [self clearBlockFromRow:row - column:left - toRow:row + count - 1 - column:right - color:color]; -} - -- (void)clearBlockFromRow:(int)row1 column:(int)col1 toRow:(int)row2 - column:(int)col2 color:(NSColor *)color -{ - [color set]; - NSRectFill([self rectFromRow:row1 column:col1 toRow:row2 column:col2]); -} - -- (void)clearAll -{ - [defaultBackgroundColor set]; - NSRectFill(NSMakeRect(0, 0, imageSize.width, imageSize.height)); -} - -- (void)drawInsertionPointAtRow:(int)row column:(int)col shape:(int)shape - fraction:(int)percent -{ - NSPoint origin = [self originForRow:row column:col]; - NSRect rect = NSMakeRect(origin.x, origin.y, - cellSize.width, cellSize.height); - - if (MMInsertionPointHorizontal == shape) { - int frac = (cellSize.height * percent + 99)/100; - rect.origin.y += rect.size.height - frac; - rect.size.height = frac; - } else if (MMInsertionPointVertical == shape) { - int frac = (cellSize.width * percent + 99)/100; - rect.size.width = frac; - } else if (MMInsertionPointVerticalRight == shape) { - int frac = (cellSize.width * percent + 99)/100; - rect.origin.x += rect.size.width - frac; - rect.size.width = frac; - } - - [[helper insertionPointColor] set]; - if (MMInsertionPointHollow == shape) { - NSFrameRect(rect); - } else { - NSRectFill(rect); - } -} - -- (void)drawInvertedRectAtRow:(int)row column:(int)col numRows:(int)nrows - numColumns:(int)ncols -{ - // TODO: THIS CODE HAS NOT BEEN TESTED! - CGContextRef cgctx = [[NSGraphicsContext currentContext] graphicsPort]; - CGContextSaveGState(cgctx); - CGContextSetBlendMode(cgctx, kCGBlendModeDifference); - CGContextSetRGBFillColor(cgctx, 1.0, 1.0, 1.0, 1.0); - - CGRect rect = { col * cellSize.width, row * cellSize.height, - ncols * cellSize.width, nrows * cellSize.height }; - CGContextFillRect(cgctx, rect); - - CGContextRestoreGState(cgctx); -} - -@end // MMAtsuiTextView (Drawing) - -#endif // MM_ENABLE_ATSUI diff --git a/src/MacVim/MMBackend.h b/src/MacVim/MMBackend.h index d4f5063afa..4ae028d48a 100644 --- a/src/MacVim/MMBackend.h +++ b/src/MacVim/MMBackend.h @@ -137,10 +137,7 @@ extern NSTimeInterval MMBalloonEvalInternalDelay; - (void)setAntialias:(BOOL)antialias; - (void)setLigatures:(BOOL)ligatures; - -#ifdef BLUR_TRANSPARENCY - (void)setBlurRadius:(int)radius; -#endif - (void)updateModifiedFlag; diff --git a/src/MacVim/MMBackend.m b/src/MacVim/MMBackend.m index c1c609a308..9dbeceb28d 100644 --- a/src/MacVim/MMBackend.m +++ b/src/MacVim/MMBackend.m @@ -196,9 +196,7 @@ extern GuiFont gui_mch_retain_font(GuiFont font); - (void)redrawScreen; - (void)handleFindReplace:(NSDictionary *)args; - (void)handleMarkedText:(NSData *)data; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)handleGesture:(NSData *)data; -#endif #ifdef FEAT_BEVAL - (void)bevalCallback:(id)sender; #endif @@ -1187,8 +1185,6 @@ extern GuiFont gui_mch_retain_font(GuiFont font); [self queueMessage:msgid data:nil]; } -#ifdef BLUR_TRANSPARENCY - - (void)setBlurRadius:(int)radius { NSMutableData *data = [NSMutableData data]; @@ -1197,8 +1193,6 @@ extern GuiFont gui_mch_retain_font(GuiFont font); [self queueMessage:SetBlurRadiusMsgID data:data]; } -#endif - - (void)updateModifiedFlag { int state = [self checkForModifiedBuffers]; @@ -2107,9 +2101,7 @@ static void netbeansReadCallback(CFSocketRef s, winposY = *((int*)bytes); bytes += sizeof(int); ASLogDebug(@"SetWindowPositionMsgID: x=%d y=%d", winposX, winposY); } else if (GestureMsgID == msgid) { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) [self handleGesture:data]; -#endif } else if (ActivatedImMsgID == msgid) { [self setImState:YES]; } else if (DeactivatedImMsgID == msgid) { @@ -3004,7 +2996,6 @@ static void netbeansReadCallback(CFSocketRef s, } } -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)handleGesture:(NSData *)data { const void *bytes = [data bytes]; @@ -3032,7 +3023,6 @@ static void netbeansReadCallback(CFSocketRef s, add_to_input_buf(string, 6); } } -#endif #ifdef FEAT_BEVAL - (void)bevalCallback:(id)sender diff --git a/src/MacVim/MMCoreTextView+ToolTip.m b/src/MacVim/MMCoreTextView+ToolTip.m index 7d6a261fea..83fd12abb1 100644 --- a/src/MacVim/MMCoreTextView+ToolTip.m +++ b/src/MacVim/MMCoreTextView+ToolTip.m @@ -19,10 +19,6 @@ * changes were made to adapt the code to MacVim. */ -#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI - -#if !MM_ENABLE_ATSUI - #import "MMCoreTextView.h" @@ -232,5 +228,3 @@ static const NSTrackingRectTag kTrackingRectTag = 0xBADFACE; } @end - -#endif // !MM_ENABLE_ATSUI diff --git a/src/MacVim/MMCoreTextView.h b/src/MacVim/MMCoreTextView.h index d109ff0524..f0ed0c5cb8 100644 --- a/src/MacVim/MMCoreTextView.h +++ b/src/MacVim/MMCoreTextView.h @@ -9,9 +9,6 @@ */ #import -#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI - -#if !MM_ENABLE_ATSUI @class MMTextViewHelper; @@ -93,7 +90,6 @@ - (void)keyDown:(NSEvent *)event; - (void)insertText:(id)string; - (void)doCommandBySelector:(SEL)selector; -- (BOOL)performKeyEquivalent:(NSEvent *)event; // // NSTextContainer methods @@ -116,5 +112,3 @@ @interface MMCoreTextView (ToolTip) - (void)setToolTipAtMousePoint:(NSString *)string; @end - -#endif // !MM_ENABLE_ATSUI diff --git a/src/MacVim/MMCoreTextView.m b/src/MacVim/MMCoreTextView.m index 107225618d..bb4edf9463 100644 --- a/src/MacVim/MMCoreTextView.m +++ b/src/MacVim/MMCoreTextView.m @@ -25,10 +25,7 @@ * resized. */ -#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI - -#if !MM_ENABLE_ATSUI - +#import "Miscellaneous.h" #import "MMAppController.h" #import "MMCoreTextView.h" #import "MMTextViewHelper.h" @@ -423,11 +420,6 @@ defaultAdvanceForFont(NSFont *font) [helper doCommandBySelector:selector]; } -- (BOOL)performKeyEquivalent:(NSEvent *)event -{ - return [helper performKeyEquivalent:event]; -} - - (BOOL)hasMarkedText { return [helper hasMarkedText]; @@ -513,13 +505,10 @@ defaultAdvanceForFont(NSFont *font) [helper mouseMoved:event]; } -// Gesture event are new for OS X 10.6 -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)swipeWithEvent:(NSEvent *)event { [helper swipeWithEvent:event]; } -#endif - (NSMenu*)menuForEvent:(NSEvent *)event { @@ -1523,5 +1512,3 @@ recurseDraw(const unichar *chars, CGGlyph *glyphs, CGPoint *positions, } @end // MMCoreTextView (Drawing) - -#endif // !MM_ENABLE_ATSUI diff --git a/src/MacVim/MMFullScreenWindow.m b/src/MacVim/MMFullScreenWindow.m index eccf9147c4..f9e2acac66 100644 --- a/src/MacVim/MMFullScreenWindow.m +++ b/src/MacVim/MMFullScreenWindow.m @@ -189,23 +189,19 @@ enum { // dimensions when exiting full-screen. startFuFlags = options; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // HACK! Put window on all Spaces to avoid Spaces (available on OS X 10.5 // and later) from moving the full-screen window to a separate Space from // the one the decorated window is occupying. The collection behavior is // restored further down. NSWindowCollectionBehavior wcb = [self collectionBehavior]; [self setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces]; -#endif // make us visible and target invisible [target orderOut:self]; [self makeKeyAndOrderFront:self]; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // Restore collection behavior (see hack above). [self setCollectionBehavior:wcb]; -#endif // fade back in if (didBlend) { @@ -281,7 +277,6 @@ enum { // button on the tabline steals the first responder status. [target setInitialFirstResponder:[view textView]]; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // HACK! Put decorated window on all Spaces (available on OS X 10.5 and // later) so that the decorated window stays on the same Space as the full // screen window (they may occupy different Spaces e.g. if the full-screen @@ -289,7 +284,7 @@ enum { // restored further down. NSWindowCollectionBehavior wcb = [target collectionBehavior]; [target setCollectionBehavior:NSWindowCollectionBehaviorCanJoinAllSpaces]; -#endif + #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) // HACK! On Mac OS X 10.7 windows animate when makeKeyAndOrderFront: is // called. This is distracting here, so disable the animation and restore @@ -308,10 +303,9 @@ enum { if (NSWindowAnimationBehaviorNone != a) [target setAnimationBehavior:a]; #endif -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) + // Restore collection behavior (see hack above). [target setCollectionBehavior:wcb]; -#endif // ...but we don't want a focus gained message either, so don't set this // sooner diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m index 79caa64afb..61309711d0 100644 --- a/src/MacVim/MMTextView.m +++ b/src/MacVim/MMTextView.m @@ -685,11 +685,6 @@ [helper doCommandBySelector:selector]; } -- (BOOL)performKeyEquivalent:(NSEvent *)event -{ - return [helper performKeyEquivalent:event]; -} - - (BOOL)hasMarkedText { return [helper hasMarkedText]; @@ -780,13 +775,10 @@ [helper mouseMoved:event]; } -// Gesture event are new for OS X 10.6 -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)swipeWithEvent:(NSEvent *)event { [helper swipeWithEvent:event]; } -#endif - (NSMenu*)menuForEvent:(NSEvent *)event { diff --git a/src/MacVim/MMTextViewHelper.h b/src/MacVim/MMTextViewHelper.h index 837f1c7e19..96536ab27f 100644 --- a/src/MacVim/MMTextViewHelper.h +++ b/src/MacVim/MMTextViewHelper.h @@ -10,10 +10,8 @@ #import -#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) // Need Carbon for TIS...() functions #import -#endif #define BLUE(argb) ((argb & 0xff)/255.0f) @@ -47,10 +45,8 @@ int preEditColumn; BOOL imControl; BOOL imState; -#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) TISInputSourceRef lastImSource; TISInputSourceRef asciiImSource; -#endif } - (id)init; @@ -61,15 +57,12 @@ - (void)keyDown:(NSEvent *)event; - (void)insertText:(id)string; - (void)doCommandBySelector:(SEL)selector; -- (BOOL)performKeyEquivalent:(NSEvent *)event; - (void)scrollWheel:(NSEvent *)event; - (void)mouseDown:(NSEvent *)event; - (void)mouseUp:(NSEvent *)event; - (void)mouseDragged:(NSEvent *)event; - (void)mouseMoved:(NSEvent *)event; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)swipeWithEvent:(NSEvent *)event; -#endif - (BOOL)performDragOperation:(id )sender; - (NSDragOperation)draggingEntered:(id )sender; - (NSDragOperation)draggingUpdated:(id )sender; @@ -96,8 +89,6 @@ - (void)setImControl:(BOOL)enable; - (void)activateIm:(BOOL)enable; - (BOOL)useInlineIm; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - (void)checkImState; -#endif @end diff --git a/src/MacVim/MMTextViewHelper.m b/src/MacVim/MMTextViewHelper.m index 07a5eb7af6..d6dedfb278 100644 --- a/src/MacVim/MMTextViewHelper.m +++ b/src/MacVim/MMTextViewHelper.m @@ -12,7 +12,7 @@ * * Contains code shared between the different text renderers. Unfortunately it * is not possible to let the text renderers inherit from this class since - * MMTextView needs to inherit from NSTextView whereas MMAtsuiTextView needs to + * MMTextView needs to inherit from NSTextView whereas MMCoreTextView needs to * inherit from NSView. */ @@ -36,7 +36,6 @@ static float MMDragAreaSize = 73.0f; - (MMVimController *)vimController; - (void)doKeyDown:(NSString *)key; - (void)doInsertText:(NSString *)text; -- (void)pollImState; - (void)hideMouseCursor; - (void)startDragTimerWithInterval:(NSTimeInterval)t; - (void)dragTimerFired:(NSTimer *)timer; @@ -45,15 +44,12 @@ static float MMDragAreaSize = 73.0f; - (BOOL)inputManagerHandleMouseEvent:(NSEvent *)event; - (void)sendMarkedText:(NSString *)text position:(int32_t)pos; - (void)abandonMarkedText; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)sendGestureEvent:(int)gesture flags:(int)flags; -#endif @end -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) static BOOL KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) { @@ -68,7 +64,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) return [as isEqualToString:bs]; } -#endif @implementation MMTextViewHelper @@ -98,7 +93,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) [signImages release]; signImages = nil; [mouseDownTime release]; mouseDownTime = nil; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) if (asciiImSource) { CFRelease(asciiImSource); asciiImSource = NULL; @@ -107,7 +101,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) CFRelease(lastImSource); lastImSource = NULL; } -#endif [super dealloc]; } @@ -135,20 +128,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) { ASLogDebug(@"%@", event); -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (NULL == &TISCopyCurrentKeyboardInputSource) { -#endif - - // NOTE: Check IM state _before_ key has been interpreted or we'll pick - // up the old IM state when it has been switched via a keyboard shortcut - // that MacVim cannot handle. - if (imControl) - [self pollImState]; - -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - } -#endif - // NOTE: Keyboard handling is complicated by the fact that we must call // interpretKeyEvents: otherwise key equivalents set up by input methods do // not work (e.g. Ctrl-Shift-; would not work under Kotoeri). @@ -298,47 +277,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) else interpretKeyEventsSwallowedKey = NO; } -- (BOOL)performKeyEquivalent:(NSEvent *)event -{ - ASLogDebug(@""); - if ([event type] != NSKeyDown) - return NO; - - // NOTE: Key equivalent handling was fixed in Leopard. That is, an - // unhandled key equivalent is passed to keyDown: -- contrast this with - // pre-Leopard where unhandled key equivalents would simply disappear - // (hence the ugly hack below for Tiger). - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) - return NO; - - // HACK! KeyCode 50 represent the key which switches between windows - // within an application (like Cmd+Tab is used to switch between - // applications). Return NO here, else the window switching does not work. - if ([event keyCode] == 50) - return NO; - - // HACK! The -[NSRespoder cancelOperation:] indicates that Cmd-. is handled - // in a special way by the key window. Indeed, if we pass this event on to - // keyDown: it will result in doCommandBySelector: being called with - // cancelOperation: as selector, otherwise it is called with cancel: as the - // selector (and we respond to cancel: there). - int flags = [event modifierFlags] & NSDeviceIndependentModifierFlagsMask; - NSString *unmod = [event charactersIgnoringModifiers]; - if (flags == NSCommandKeyMask && [unmod isEqual:@"."]) - return NO; - - // HACK! Let the main menu try to handle any key down event, before - // passing it on to vim, otherwise key equivalents for menus will - // effectively be disabled. - if ([[NSApp mainMenu] performKeyEquivalent:event]) - return YES; - - // HACK! Pass the event on or it may disappear (Tiger does not pass Cmd-key - // events to keyDown:). - [self keyDown:event]; - return YES; -} - - (void)scrollWheel:(NSEvent *)event { if ([self hasMarkedText]) { @@ -346,11 +284,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) // marked text moves outside the view as a result of scrolling. [self sendMarkedText:nil position:0]; [self unmarkText]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 [[NSTextInputContext currentInputContext] discardMarkedText]; -#else - [[NSInputManager currentInputManager] markedTextAbandoned:self]; -#endif } float dx = [event deltaX]; @@ -501,7 +435,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) [[self vimController] sendMessage:MouseMovedMsgID data:data]; } -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)swipeWithEvent:(NSEvent *)event { CGFloat dx = [event deltaX]; @@ -515,7 +448,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) [self sendGestureEvent:type flags:[event modifierFlags]]; } -#endif - (BOOL)performDragOperation:(id )sender { @@ -810,31 +742,24 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) { // This flag corresponds to the (negation of the) 'imd' option. When // enabled changes to the input method are detected and forwarded to the - // backend. On >=10.5 and later we do not forward changes to the input - // method, instead we let Vim be in complete control. + // backend. We do not forward changes to the input method, instead we let + // Vim be in complete control. -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - // The TIS symbols are weakly linked. - if (NULL != &TISCopyCurrentKeyboardInputSource) { - // We get here when compiled on >=10.5 and running on >=10.5. - - if (asciiImSource) { - CFRelease(asciiImSource); - asciiImSource = NULL; - } - if (lastImSource) { - CFRelease(lastImSource); - lastImSource = NULL; - } - if (enable) { - // Save current locale input source for use when IM is active and - // get an ASCII source for use when IM is deactivated (by Vim). - asciiImSource = TISCopyCurrentASCIICapableKeyboardInputSource(); - NSString *locale = [[NSLocale currentLocale] localeIdentifier]; - lastImSource = TISCopyInputSourceForLanguage((CFStringRef)locale); - } + if (asciiImSource) { + CFRelease(asciiImSource); + asciiImSource = NULL; + } + if (lastImSource) { + CFRelease(lastImSource); + lastImSource = NULL; + } + if (enable) { + // Save current locale input source for use when IM is active and + // get an ASCII source for use when IM is deactivated (by Vim). + asciiImSource = TISCopyCurrentASCIICapableKeyboardInputSource(); + NSString *locale = [[NSLocale currentLocale] localeIdentifier]; + lastImSource = TISCopyInputSourceForLanguage((CFStringRef)locale); } -#endif imControl = enable; ASLogDebug(@"IM control %sabled", enable ? "en" : "dis"); @@ -850,31 +775,14 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) imState = enable; -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - // The TIS symbols are weakly linked. - if (NULL != &TISCopyCurrentKeyboardInputSource) { - // We get here when compiled on >=10.5 and running on >=10.5. - - // Enable IM: switch back to input source used when IM was last on - // Disable IM: switch back to ASCII input source (set in setImControl:) - TISInputSourceRef ref = enable ? lastImSource : asciiImSource; - if (ref) { - ASLogDebug(@"Change input source: %@", - TISGetInputSourceProperty(ref, kTISPropertyInputSourceID)); - TISSelectInputSource(ref); - } - - return; + // Enable IM: switch back to input source used when IM was last on + // Disable IM: switch back to ASCII input source (set in setImControl:) + TISInputSourceRef ref = enable ? lastImSource : asciiImSource; + if (ref) { + ASLogDebug(@"Change input source: %@", + TISGetInputSourceProperty(ref, kTISPropertyInputSourceID)); + TISSelectInputSource(ref); } - - // We get here when compiled on >=10.5 but running on 10.4 -- fall through - // and use old IM code... -#endif -#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) - // NOTE: The IM code is delegated to the frontend since calling it in - // the backend caused weird bugs (second dock icon appearing etc.). - KeyScript(enable ? smKeySysScript : smKeyRoman); -#endif } - (BOOL)useInlineIm @@ -889,9 +797,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) - (void)checkImState { -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (imControl && NULL != &TISCopyCurrentKeyboardInputSource) { - // We get here when compiled on >=10.5 and running on >=10.5. + if (imControl) { TISInputSourceRef cur = TISCopyCurrentKeyboardInputSource(); BOOL state = !KeyboardInputSourcesEqual(asciiImSource, cur); BOOL isChanged = !KeyboardInputSourcesEqual(lastImSource, cur); @@ -912,7 +818,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) } return; } -#endif } @end // MMTextViewHelper @@ -1000,28 +905,6 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) [[self vimController] sendMessage:KeyDownMsgID data:data]; } -- (void)pollImState -{ -#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) - // Compiled for <=10.4, running on 10.4 - - // IM is active whenever the current script is the system script and the - // system script isn't roman. (Hence IM can only be active when using - // non-roman scripts.) - - // NOTE: The IM code is delegated to the frontend since calling it in the - // backend caused weird bugs (second dock icon appearing etc.). - SInt32 currentScript = GetScriptManagerVariable(smKeyScript); - SInt32 systemScript = GetScriptManagerVariable(smSysScript); - BOOL state = currentScript != smRoman && currentScript == systemScript; - if (imState != state) { - imState = state; - int msgid = state ? ActivatedImMsgID : DeactivatedImMsgID; - [[self vimController] sendMessage:msgid data:nil]; - } -#endif -} - - (void)hideMouseCursor { // Check 'mousehide' option @@ -1145,13 +1028,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) // the Kotoeri manager "commits" the text on left clicks). if (event) { -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 return [[NSTextInputContext currentInputContext] handleEvent:event]; -#else - NSInputManager *imgr = [NSInputManager currentInputManager]; - if ([imgr wantsToHandleMouseEvents]) - return [imgr handleMouseEvent:event]; -#endif } return NO; @@ -1184,14 +1061,9 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) // that the marked text should be abandoned. (If pos is set to 0 Vim will // send backspace sequences to delete the old marked text.) [self sendMarkedText:nil position:-1]; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 [[NSTextInputContext currentInputContext] discardMarkedText]; -#else - [[NSInputManager currentInputManager] markedTextAbandoned:self]; -#endif } -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - (void)sendGestureEvent:(int)gesture flags:(int)flags { NSMutableData *data = [NSMutableData data]; @@ -1201,6 +1073,5 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) [[self vimController] sendMessage:GestureMsgID data:data]; } -#endif @end // MMTextViewHelper (Private) diff --git a/src/MacVim/MMVimController.h b/src/MacVim/MMVimController.h index 07421b0448..cb5665ccf7 100644 --- a/src/MacVim/MMVimController.h +++ b/src/MacVim/MMVimController.h @@ -15,11 +15,8 @@ -@interface MMVimController : NSObject -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - // 10.6 has turned delegate messages into formal protocols - -#endif +@interface MMVimController : NSObject { unsigned identifier; BOOL isInitialized; diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m index fe588048fe..91f908e36d 100644 --- a/src/MacVim/MMVimController.m +++ b/src/MacVim/MMVimController.m @@ -35,7 +35,6 @@ #import "Miscellaneous.h" #import "MMCoreTextView.h" #import "MMWindow.h" -#import "blur.h" static NSString *MMDefaultToolbarImageName = @"Attention"; @@ -885,12 +884,10 @@ static BOOL isUnsafeMessage(int msgid); if (filenames) [[NSDocumentController sharedDocumentController] noteNewRecentFilePaths:filenames]; -#ifdef BLUR_TRANSPARENCY } else if (SetBlurRadiusMsgID == msgid) { const void *bytes = [data bytes]; int radius = *((int*)bytes); [windowController setBlurRadius:radius]; -#endif // IMPORTANT: When adding a new message, make sure to update // isUnsafeMessage() if necessary! @@ -1404,11 +1401,8 @@ static BOOL isUnsafeMessage(int msgid); dir = [vimState objectForKey:@"pwd"]; } -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) - // 10.6+ APIs uses URLs instead of paths dir = [dir stringByExpandingTildeInPath]; NSURL *dirURL = dir ? [NSURL fileURLWithPath:dir isDirectory:YES] : nil; -#endif if (saving) { NSSavePanel *panel = [NSSavePanel savePanel]; @@ -1419,10 +1413,6 @@ static BOOL isUnsafeMessage(int msgid); [panel setDelegate:self]; if ([panel isExpanded]) [panel setAccessoryView:showHiddenFilesView()]; -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) - // NOTE: -[NSSavePanel beginSheetForDirectory::::::] is deprecated on - // 10.6 but -[NSSavePanel setDirectoryURL:] requires 10.6 so jump - // through the following hoops on 10.6+. if (dirURL) [panel setDirectoryURL:dirURL]; @@ -1430,13 +1420,6 @@ static BOOL isUnsafeMessage(int msgid); completionHandler:^(NSInteger result) { [self savePanelDidEnd:panel code:result context:nil]; }]; -#else - [panel beginSheetForDirectory:dir file:nil - modalForWindow:[windowController window] - modalDelegate:self - didEndSelector:@selector(savePanelDidEnd:code:context:) - contextInfo:NULL]; -#endif } else { NSOpenPanel *panel = [NSOpenPanel openPanel]; [panel setAllowsMultipleSelection:NO]; @@ -1447,10 +1430,6 @@ static BOOL isUnsafeMessage(int msgid); [panel setCanChooseFiles:NO]; } -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6) - // NOTE: -[NSOpenPanel beginSheetForDirectory:::::::] is deprecated on - // 10.6 but -[NSOpenPanel setDirectoryURL:] requires 10.6 so jump - // through the following hoops on 10.6+. if (dirURL) [panel setDirectoryURL:dirURL]; @@ -1458,13 +1437,6 @@ static BOOL isUnsafeMessage(int msgid); completionHandler:^(NSInteger result) { [self savePanelDidEnd:panel code:result context:nil]; }]; -#else - [panel beginSheetForDirectory:dir file:nil types:nil - modalForWindow:[windowController window] - modalDelegate:self - didEndSelector:@selector(savePanelDidEnd:code:context:) - contextInfo:NULL]; -#endif } } diff --git a/src/MacVim/MMVimView.m b/src/MacVim/MMVimView.m index 9f9c1e0909..3dee3aa989 100644 --- a/src/MacVim/MMVimView.m +++ b/src/MacVim/MMVimView.m @@ -18,13 +18,8 @@ * the view is filled by the text view. */ -#import "Miscellaneous.h" // Defines MM_ENABLE_ATSUI - -#if MM_ENABLE_ATSUI -# import "MMAtsuiTextView.h" -#else -# import "MMCoreTextView.h" -#endif +#import "Miscellaneous.h" +#import "MMCoreTextView.h" #import "MMTextView.h" #import "MMVimController.h" #import "MMVimView.h" @@ -97,20 +92,11 @@ enum { NSInteger renderer = [ud integerForKey:MMRendererKey]; ASLogInfo(@"Use renderer=%ld", renderer); -#if MM_ENABLE_ATSUI - if (MMRendererATSUI == renderer) { - // HACK! 'textView' has type MMTextView, but MMAtsuiTextView is not - // derived from MMTextView. - textView = [[MMAtsuiTextView alloc] initWithFrame:frame]; - } -#else if (MMRendererCoreText == renderer) { // HACK! 'textView' has type MMTextView, but MMCoreTextView is not // derived from MMTextView. textView = (MMTextView *)[[MMCoreTextView alloc] initWithFrame:frame]; - } -#endif - else { + } else { // Use Cocoa text system for text rendering. textView = [[MMTextView alloc] initWithFrame:frame]; } @@ -175,7 +161,7 @@ enum { // HACK! The text storage is the principal owner of the text system, but we // keep only a reference to the text view, so release the text storage - // first (unless we are using the ATSUI renderer). + // first (unless we are using the CoreText renderer). if ([textView isKindOfClass:[MMTextView class]]) [[textView textStorage] release]; @@ -454,12 +440,8 @@ enum { identifier:(int32_t)ident { MMScroller *scroller = [self scrollbarForIdentifier:ident index:NULL]; -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) [scroller setDoubleValue:val]; [scroller setKnobProportion:prop]; -#else - [scroller setFloatValue:val knobProportion:prop]; -#endif [scroller setEnabled:prop != 1.f]; } diff --git a/src/MacVim/MMWindow.h b/src/MacVim/MMWindow.h index d55100e01b..9eb7be1cba 100644 --- a/src/MacVim/MMWindow.h +++ b/src/MacVim/MMWindow.h @@ -9,7 +9,6 @@ */ #import "MacVim.h" -#import "blur.h" @@ -29,9 +28,7 @@ - (void)setContentMinSize:(NSSize)size; - (void)setContentMaxSize:(NSSize)size; - (void)setContentSize:(NSSize)size; -#ifdef BLUR_TRANSPARENCY - (void)setBlurRadius:(int)radius; -#endif - (IBAction)toggleFullScreen:(id)sender; - (IBAction)realToggleFullScreen:(id)sender; diff --git a/src/MacVim/MMWindow.m b/src/MacVim/MMWindow.m index d570c7833b..5fa0a02e4d 100644 --- a/src/MacVim/MMWindow.m +++ b/src/MacVim/MMWindow.m @@ -29,9 +29,6 @@ #import "MMWindow.h" #import "Miscellaneous.h" - -#ifdef BLUR_TRANSPARENCY - #import "CGSInternal/CGSWindow.h" typedef CGError CGSSetWindowBackgroundBlurRadiusFunction(CGSConnectionID cid, CGSWindowID wid, NSUInteger blur); @@ -62,9 +59,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa return function; } -#endif // BLUR_TRANSPARENCY - - @implementation MMWindow @@ -167,8 +161,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa [super setContentSize:size]; } -#ifdef BLUR_TRANSPARENCY - - (void)setBlurRadius:(int)radius { if (radius >= 0) { @@ -183,8 +175,6 @@ static CGSSetWindowBackgroundBlurRadiusFunction* GetCGSSetWindowBackgroundBlurRa } } -#endif // BLUR_TRANSPARENCY - - (void)performClose:(id)sender { id wc = [self windowController]; diff --git a/src/MacVim/MMWindowController.h b/src/MacVim/MMWindowController.h index 68889fca58..34c3a95fac 100644 --- a/src/MacVim/MMWindowController.h +++ b/src/MacVim/MMWindowController.h @@ -9,7 +9,6 @@ */ #import "MacVim.h" -#import "blur.h" @@ -18,11 +17,7 @@ @class MMVimController; @class MMVimView; -@interface MMWindowController : NSWindowController -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) - // 10.6 has turned delegate messages into formal protocols - -#endif +@interface MMWindowController : NSWindowController { MMVimController *vimController; MMVimView *vimView; @@ -47,9 +42,7 @@ NSPoint defaultTopLeft; NSToolbar *toolbar; BOOL resizingDueToMove; -#ifdef BLUR_TRANSPARENCY int blurRadius; -#endif } - (id)initWithVimController:(MMVimController *)controller; @@ -86,9 +79,7 @@ - (void)liveResizeWillStart; - (void)liveResizeDidEnd; -#ifdef BLUR_TRANSPARENCY - (void)setBlurRadius:(int)radius; -#endif - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back; - (void)leaveFullScreen; diff --git a/src/MacVim/MMWindowController.m b/src/MacVim/MMWindowController.m index 2faa2bd42d..ba29399c45 100644 --- a/src/MacVim/MMWindowController.m +++ b/src/MacVim/MMWindowController.m @@ -62,7 +62,6 @@ */ #import "MMAppController.h" -#import "MMAtsuiTextView.h" #import "MMFindReplaceController.h" #import "MMFullScreenWindow.h" #import "MMTextView.h" @@ -128,7 +127,8 @@ { unsigned styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask - | NSUnifiedTitleAndToolbarWindowMask; + | NSUnifiedTitleAndToolbarWindowMask + | NSTexturedBackgroundWindowMask; if ([[NSUserDefaults standardUserDefaults] boolForKey:MMNoTitleBarWindowKey]) { @@ -136,12 +136,6 @@ styleMask &= ~NSTitledWindowMask; } - // Use textured background on Leopard or later (skip the 'if' on Tiger for - // polished metal window). - if ([[NSUserDefaults standardUserDefaults] boolForKey:MMTexturedWindowKey] - || (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4)) - styleMask |= NSTexturedBackgroundWindowMask; - // NOTE: The content rect is only used the very first time MacVim is // started (or rather, when ~/Library/Preferences/org.vim.MacVim.plist does // not exist). The chosen values will put the window somewhere near the @@ -336,9 +330,7 @@ if (fullScreenEnabled && !fullScreenWindow) [decoratedWindow setAlphaValue:0]; -#ifdef BLUR_TRANSPARENCY [decoratedWindow setBlurRadius:blurRadius]; -#endif // Flag that the window is now placed on screen. From now on it is OK for // code to depend on the screen state. (Such as constraining views etc.) @@ -729,7 +721,6 @@ } } -#ifdef BLUR_TRANSPARENCY - (void)setBlurRadius:(int)radius { blurRadius = radius; @@ -737,7 +728,6 @@ [decoratedWindow setBlurRadius:radius]; } } -#endif - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back { diff --git a/src/MacVim/MacVim.h b/src/MacVim/MacVim.h index 05ab9e2286..0865efed51 100644 --- a/src/MacVim/MacVim.h +++ b/src/MacVim/MacVim.h @@ -13,15 +13,6 @@ // Taken from /usr/include/AvailabilityMacros.h -#ifndef MAC_OS_X_VERSION_10_4 -# define MAC_OS_X_VERSION_10_4 1040 -#endif -#ifndef MAC_OS_X_VERSION_10_5 -# define MAC_OS_X_VERSION_10_5 1050 -#endif -#ifndef MAC_OS_X_VERSION_10_6 -# define MAC_OS_X_VERSION_10_6 1060 -#endif #ifndef MAC_OS_X_VERSION_10_7 # define MAC_OS_X_VERSION_10_7 1070 #endif @@ -34,16 +25,16 @@ #ifndef MAC_OS_X_VERSION_10_10 # define MAC_OS_X_VERSION_10_10 101000 #endif -#ifndef MAC_OS_X_VERSION_10_10_2 -# define MAC_OS_X_VERSION_10_10_2 101002 -#endif -#ifndef MAC_OS_X_VERSION_10_10_3 -# define MAC_OS_X_VERSION_10_10_3 101003 -#endif #ifndef MAC_OS_X_VERSION_10_11 # define MAC_OS_X_VERSION_10_11 101100 #endif +// Needed for pre-10.11 SDK +#ifndef NSAppKitVersionNumber10_10_Max +# define NSAppKitVersionNumber10_10_Max 1349 +#endif + + // // This is the protocol MMBackend implements. // @@ -282,7 +273,6 @@ extern NSString *MMRendererKey; enum { MMRendererDefault = 0, - MMRendererATSUI, MMRendererCoreText }; @@ -332,41 +322,6 @@ extern NSString *VimFindPboardType; #define keyMMUntitledWindow 'MMuw' - - -#ifndef NSINTEGER_DEFINED -// NSInteger was introduced in 10.5 -# if __LP64__ || NS_BUILD_32_LIKE_64 -typedef long NSInteger; -typedef unsigned long NSUInteger; -# else -typedef int NSInteger; -typedef unsigned int NSUInteger; -# endif -# define NSINTEGER_DEFINED 1 -#endif - -// Needed for pre-10.5 SDK -#ifndef NSAppKitVersionNumber10_4 -# define NSAppKitVersionNumber10_4 824 -#endif -#ifndef NSAppKitVersionNumber10_10_Max -# define NSAppKitVersionNumber10_10_Max 1349 -#endif - -#ifndef CGFLOAT_DEFINED - // On Leopard, CGFloat is float on 32bit and double on 64bit. On Tiger, - // we can't use this anyways, so it's just here to keep the compiler happy. - // However, when we're compiling for Tiger and running on Leopard, we - // might need the correct typedef, so this piece is copied from ATSTypes.h -# ifdef __LP64__ - typedef double CGFloat; -# else - typedef float CGFloat; -# endif -#endif - - // Logging related functions and macros. // // This is a very simplistic logging facility built on top of ASL. Two user diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index 5a15bcae5e..7477166b4b 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; }; 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; }; 1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; }; - 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; }; 1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; }; 1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; }; 1DCD00C00E50B2B700460166 /* Copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AB0E50B2B700460166 /* Copy.png */; }; @@ -190,8 +189,6 @@ 1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = ""; }; 1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = ""; }; 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = ""; }; - 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = ""; }; 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = ""; }; 1DCD00AA0E50B2B700460166 /* Attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Attention.png; path = Toolbar/Attention.png; sourceTree = ""; }; 1DCD00AB0E50B2B700460166 /* Copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Copy.png; path = Toolbar/Copy.png; sourceTree = ""; }; @@ -272,8 +269,6 @@ 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */, 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */, 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */, - 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */, - 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */, 1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */, 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */, 1D80FBD10CBBD3B700102A1C /* MMVimView.h */, @@ -611,7 +606,6 @@ 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */, 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */, 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */, - 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */, 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */, 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */, 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */, diff --git a/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj b/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj deleted file mode 100644 index b345f37a43..0000000000 --- a/src/MacVim/MacVim_legacy.xcodeproj/project.pbxproj +++ /dev/null @@ -1,720 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */; }; - 0395A8AA0D72D88B00881434 /* General.png in Resources */ = {isa = PBXBuildFile; fileRef = 0395A8A90D72D88B00881434 /* General.png */; }; - 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D09AB400C6A4D520045497E /* MMTypesetter.m */; }; - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D0E051B0BA5F83800B6049E /* Colors.plist */; }; - 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */; }; - 1D1474980C56703C0038FA2B /* MacVim.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474960C56703C0038FA2B /* MacVim.m */; }; - 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D14749E0C5673AE0038FA2B /* MMAppController.m */; }; - 1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474A80C5677450038FA2B /* MMTextStorage.m */; }; - 1D1474B00C5678370038FA2B /* MMTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474AE0C5678370038FA2B /* MMTextView.m */; }; - 1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474B40C56796D0038FA2B /* MMVimController.m */; }; - 1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D1474BA0C567A910038FA2B /* MMWindowController.m */; }; - 1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */ = {isa = PBXBuildFile; fileRef = 1D22374A0E45DF4800E6FFFF /* Advanced.png */; }; - 1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1D384A0D100D671700D3C22F /* KeyBinding.plist */; }; - 1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */; }; - 1D493D580C5247BF00AB718C /* Vim in Copy Executables */ = {isa = PBXBuildFile; fileRef = 1D493D570C5247BF00AB718C /* Vim */; }; - 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; - 1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */; }; - 1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80591D0E1185EA001699D1 /* Miscellaneous.m */; }; - 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */; }; - 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D80FBD20CBBD3B700102A1C /* MMVimView.m */; }; - 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */; }; - 1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1D8BEA73104992290069B072 /* FindAndReplace.nib */; }; - 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */; }; - 1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */ = {isa = PBXBuildFile; fileRef = 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */; }; - 1DCD00BF0E50B2B700460166 /* Attention.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AA0E50B2B700460166 /* Attention.png */; }; - 1DCD00C00E50B2B700460166 /* Copy.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AB0E50B2B700460166 /* Copy.png */; }; - 1DCD00C10E50B2B700460166 /* Cut.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AC0E50B2B700460166 /* Cut.png */; }; - 1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AD0E50B2B700460166 /* FindHelp.png */; }; - 1DCD00C30E50B2B700460166 /* FindNext.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AE0E50B2B700460166 /* FindNext.png */; }; - 1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00AF0E50B2B700460166 /* FindPrev.png */; }; - 1DCD00C50E50B2B700460166 /* Help.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B00E50B2B700460166 /* Help.png */; }; - 1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B10E50B2B700460166 /* LoadSesn.png */; }; - 1DCD00C70E50B2B700460166 /* Make.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B20E50B2B700460166 /* Make.png */; }; - 1DCD00C80E50B2B700460166 /* Open.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B30E50B2B700460166 /* Open.png */; }; - 1DCD00C90E50B2B700460166 /* Paste.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B40E50B2B700460166 /* Paste.png */; }; - 1DCD00CA0E50B2B700460166 /* Print.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B50E50B2B700460166 /* Print.png */; }; - 1DCD00CB0E50B2B700460166 /* Redo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B60E50B2B700460166 /* Redo.png */; }; - 1DCD00CC0E50B2B700460166 /* Replace.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B70E50B2B700460166 /* Replace.png */; }; - 1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B80E50B2B700460166 /* RunCtags.png */; }; - 1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00B90E50B2B700460166 /* RunScript.png */; }; - 1DCD00CF0E50B2B700460166 /* Save.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BA0E50B2B700460166 /* Save.png */; }; - 1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BB0E50B2B700460166 /* SaveAll.png */; }; - 1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BC0E50B2B700460166 /* SaveSesn.png */; }; - 1DCD00D20E50B2B700460166 /* TagJump.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BD0E50B2B700460166 /* TagJump.png */; }; - 1DCD00D30E50B2B700460166 /* Undo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCD00BE0E50B2B700460166 /* Undo.png */; }; - 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */; }; - 1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DD0C20A0C60FF9A008CD84A /* gvimrc */; }; - 1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD3D51D0D82D4C9006E4320 /* ibeam.png */; }; - 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */; }; - 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */; }; - 1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E50D50F80500052B9E /* Preferences.nib */; }; - 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */; }; - 1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DE602470C587FD10055263D /* runtime */; }; - 1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */; }; - 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */; }; - 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */; }; - 1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */ = {isa = PBXBuildFile; fileRef = 1DED785F0C6DE43D0079945F /* vimrc */; }; - 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; }; - 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; - 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; - 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; - 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 1D493DB80C52533B00AB718C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 53DF68FD067E5B5A0090B5B0; - remoteInfo = PSMTabBarControlFramework; - }; - 1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0; - remoteInfo = PSMTabBarControlFramework; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 1D0DCAD80BA3604D00B6CCFA /* Copy Executables */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 6; - files = ( - 1D493D580C5247BF00AB718C /* Vim in Copy Executables */, - ); - name = "Copy Executables"; - runOnlyForDeploymentPostprocessing = 0; - }; - 1D9EB2840C366D7B0074B739 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 1DE608B80C58807F0055263D /* Copy Vim Runtime Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = vim; - dstSubfolderSpec = 7; - files = ( - 1DED78600C6DE43D0079945F /* vimrc in Copy Vim Runtime Files */, - 1DD0C20C0C60FFB4008CD84A /* gvimrc in Copy Vim Runtime Files */, - 1DE608B40C587FDA0055263D /* runtime in Copy Vim Runtime Files */, - ); - name = "Copy Vim Runtime Files"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 0395A8310D71ED7800881434 /* DBPrefsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBPrefsWindowController.h; sourceTree = ""; }; - 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBPrefsWindowController.m; sourceTree = ""; }; - 0395A8A90D72D88B00881434 /* General.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = General.png; sourceTree = ""; }; - 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTypesetter.h; sourceTree = ""; }; - 1D09AB400C6A4D520045497E /* MMTypesetter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTypesetter.m; sourceTree = ""; }; - 1D0E051B0BA5F83800B6049E /* Colors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Colors.plist; sourceTree = ""; }; - 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMTextViewHelper.h; sourceTree = ""; }; - 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMTextViewHelper.m; sourceTree = ""; }; - 1D1474950C56703C0038FA2B /* MacVim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MacVim.h; sourceTree = ""; }; - 1D1474960C56703C0038FA2B /* MacVim.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MacVim.m; sourceTree = ""; }; - 1D14749D0C5673AE0038FA2B /* MMAppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAppController.h; sourceTree = ""; }; - 1D14749E0C5673AE0038FA2B /* MMAppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAppController.m; sourceTree = ""; }; - 1D1474A70C5677450038FA2B /* MMTextStorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextStorage.h; sourceTree = ""; }; - 1D1474A80C5677450038FA2B /* MMTextStorage.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextStorage.m; sourceTree = ""; }; - 1D1474AD0C5678370038FA2B /* MMTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMTextView.h; sourceTree = ""; }; - 1D1474AE0C5678370038FA2B /* MMTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMTextView.m; sourceTree = ""; }; - 1D1474B30C56796D0038FA2B /* MMVimController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimController.h; sourceTree = ""; }; - 1D1474B40C56796D0038FA2B /* MMVimController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimController.m; sourceTree = ""; }; - 1D1474B90C567A910038FA2B /* MMWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindowController.h; sourceTree = ""; }; - 1D1474BA0C567A910038FA2B /* MMWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindowController.m; sourceTree = ""; }; - 1D22374A0E45DF4800E6FFFF /* Advanced.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Advanced.png; sourceTree = ""; }; - 1D384A0D100D671700D3C22F /* KeyBinding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = KeyBinding.plist; sourceTree = ""; }; - 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MMCoreTextView+ToolTip.m"; sourceTree = ""; }; - 1D493D570C5247BF00AB718C /* Vim */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = Vim; path = ../Vim; sourceTree = SOURCE_ROOT; }; - 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PSMTabBarControl_legacy.xcodeproj; path = PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj; sourceTree = ""; }; - 1D6008820E96886D003763F0 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/FindAndReplace.nib; sourceTree = ""; }; - 1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMFindReplaceController.h; sourceTree = ""; }; - 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMFindReplaceController.m; sourceTree = ""; }; - 1D80591D0E1185EA001699D1 /* Miscellaneous.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Miscellaneous.m; sourceTree = ""; }; - 1D8059220E118663001699D1 /* Miscellaneous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Miscellaneous.h; sourceTree = ""; }; - 1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMFullScreenWindow.h; sourceTree = ""; }; - 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMFullScreenWindow.m; sourceTree = ""; }; - 1D80FBD10CBBD3B700102A1C /* MMVimView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMVimView.h; sourceTree = ""; }; - 1D80FBD20CBBD3B700102A1C /* MMVimView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMVimView.m; sourceTree = ""; }; - 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMAtsuiTextView.h; sourceTree = ""; }; - 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMAtsuiTextView.m; sourceTree = ""; }; - 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacVim.icns; path = icons/MacVim.icns; sourceTree = ""; }; - 1DCD00AA0E50B2B700460166 /* Attention.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Attention.png; path = Toolbar/Attention.png; sourceTree = ""; }; - 1DCD00AB0E50B2B700460166 /* Copy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Copy.png; path = Toolbar/Copy.png; sourceTree = ""; }; - 1DCD00AC0E50B2B700460166 /* Cut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Cut.png; path = Toolbar/Cut.png; sourceTree = ""; }; - 1DCD00AD0E50B2B700460166 /* FindHelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindHelp.png; path = Toolbar/FindHelp.png; sourceTree = ""; }; - 1DCD00AE0E50B2B700460166 /* FindNext.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindNext.png; path = Toolbar/FindNext.png; sourceTree = ""; }; - 1DCD00AF0E50B2B700460166 /* FindPrev.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FindPrev.png; path = Toolbar/FindPrev.png; sourceTree = ""; }; - 1DCD00B00E50B2B700460166 /* Help.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Help.png; path = Toolbar/Help.png; sourceTree = ""; }; - 1DCD00B10E50B2B700460166 /* LoadSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LoadSesn.png; path = Toolbar/LoadSesn.png; sourceTree = ""; }; - 1DCD00B20E50B2B700460166 /* Make.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Make.png; path = Toolbar/Make.png; sourceTree = ""; }; - 1DCD00B30E50B2B700460166 /* Open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Open.png; path = Toolbar/Open.png; sourceTree = ""; }; - 1DCD00B40E50B2B700460166 /* Paste.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Paste.png; path = Toolbar/Paste.png; sourceTree = ""; }; - 1DCD00B50E50B2B700460166 /* Print.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Print.png; path = Toolbar/Print.png; sourceTree = ""; }; - 1DCD00B60E50B2B700460166 /* Redo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Redo.png; path = Toolbar/Redo.png; sourceTree = ""; }; - 1DCD00B70E50B2B700460166 /* Replace.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Replace.png; path = Toolbar/Replace.png; sourceTree = ""; }; - 1DCD00B80E50B2B700460166 /* RunCtags.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunCtags.png; path = Toolbar/RunCtags.png; sourceTree = ""; }; - 1DCD00B90E50B2B700460166 /* RunScript.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = RunScript.png; path = Toolbar/RunScript.png; sourceTree = ""; }; - 1DCD00BA0E50B2B700460166 /* Save.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Save.png; path = Toolbar/Save.png; sourceTree = ""; }; - 1DCD00BB0E50B2B700460166 /* SaveAll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveAll.png; path = Toolbar/SaveAll.png; sourceTree = ""; }; - 1DCD00BC0E50B2B700460166 /* SaveSesn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SaveSesn.png; path = Toolbar/SaveSesn.png; sourceTree = ""; }; - 1DCD00BD0E50B2B700460166 /* TagJump.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TagJump.png; path = Toolbar/TagJump.png; sourceTree = ""; }; - 1DCD00BE0E50B2B700460166 /* Undo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Undo.png; path = Toolbar/Undo.png; sourceTree = ""; }; - 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; - 1DD0C20A0C60FF9A008CD84A /* gvimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gvimrc; sourceTree = ""; }; - 1DD3D51D0D82D4C9006E4320 /* ibeam.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ibeam.png; sourceTree = ""; }; - 1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMApplication.h; sourceTree = ""; }; - 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMApplication.m; sourceTree = ""; }; - 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SystemColors.plist; sourceTree = ""; }; - 1DE3F8E60D50F80500052B9E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = ""; }; - 1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMPreferenceController.h; sourceTree = ""; }; - 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMPreferenceController.m; sourceTree = ""; }; - 1DE602470C587FD10055263D /* runtime */ = {isa = PBXFileReference; lastKnownFileType = folder; name = runtime; path = ../../runtime; sourceTree = SOURCE_ROOT; }; - 1DE63FF90E71820F00959BDB /* MMCoreTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMCoreTextView.h; sourceTree = ""; }; - 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMCoreTextView.m; sourceTree = ""; }; - 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Actions.plist; sourceTree = ""; }; - 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MMWindow.h; sourceTree = ""; }; - 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = MMWindow.m; sourceTree = ""; }; - 1DED785F0C6DE43D0079945F /* vimrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vimrc; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; - 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* Info_legacy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info_legacy.plist; sourceTree = ""; }; - 8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D11072E0486CEB800E47090 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */, - 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - 1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* MacVim Source */ = { - isa = PBXGroup; - children = ( - 1D44972111FCA9B400B0630F /* MMCoreTextView+ToolTip.m */, - 1D6008890E96A0B2003763F0 /* MMFindReplaceController.h */, - 1D60088A0E96A0B2003763F0 /* MMFindReplaceController.m */, - 1DE63FF90E71820F00959BDB /* MMCoreTextView.h */, - 1DE63FFA0E71820F00959BDB /* MMCoreTextView.m */, - 1D145C7D0E5227CE00691AA0 /* MMTextViewHelper.h */, - 1D145C7E0E5227CE00691AA0 /* MMTextViewHelper.m */, - 1D8059220E118663001699D1 /* Miscellaneous.h */, - 1D80591D0E1185EA001699D1 /* Miscellaneous.m */, - 0395A8310D71ED7800881434 /* DBPrefsWindowController.h */, - 0395A8320D71ED7800881434 /* DBPrefsWindowController.m */, - 1DE3F8E80D50F84600052B9E /* MMPreferenceController.h */, - 1DE3F8E90D50F84600052B9E /* MMPreferenceController.m */, - 1DE9B94D0D341AB8008FEDD4 /* MMWindow.h */, - 1DE9B94E0D341AB8008FEDD4 /* MMWindow.m */, - 1D9918460D299F9900A96335 /* MMAtsuiTextView.h */, - 1D9918470D299F9900A96335 /* MMAtsuiTextView.m */, - 1D80FBCF0CBBD3B700102A1C /* MMFullScreenWindow.h */, - 1D80FBD00CBBD3B700102A1C /* MMFullScreenWindow.m */, - 1D80FBD10CBBD3B700102A1C /* MMVimView.h */, - 1D80FBD20CBBD3B700102A1C /* MMVimView.m */, - 1DD66ECB0C803D3600EBDAB3 /* MMApplication.h */, - 1DD66ECC0C803D3600EBDAB3 /* MMApplication.m */, - 1D09AB3F0C6A4D520045497E /* MMTypesetter.h */, - 1D09AB400C6A4D520045497E /* MMTypesetter.m */, - 1D1474B90C567A910038FA2B /* MMWindowController.h */, - 1D1474BA0C567A910038FA2B /* MMWindowController.m */, - 1D1474B30C56796D0038FA2B /* MMVimController.h */, - 1D1474B40C56796D0038FA2B /* MMVimController.m */, - 1D1474AD0C5678370038FA2B /* MMTextView.h */, - 1D1474AE0C5678370038FA2B /* MMTextView.m */, - 1D1474A70C5677450038FA2B /* MMTextStorage.h */, - 1D1474A80C5677450038FA2B /* MMTextStorage.m */, - 1D14749D0C5673AE0038FA2B /* MMAppController.h */, - 1D14749E0C5673AE0038FA2B /* MMAppController.m */, - 1D1474950C56703C0038FA2B /* MacVim.h */, - 1D1474960C56703C0038FA2B /* MacVim.m */, - 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */, - 29B97316FDCFA39411CA2CEA /* main.m */, - ); - name = "MacVim Source"; - sourceTree = ""; - }; - 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 29B97324FDCFA39411CA2CEA /* AppKit.framework */, - 29B97325FDCFA39411CA2CEA /* Foundation.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D1107320486CEB800E47090 /* MacVim.app */, - ); - name = Products; - sourceTree = ""; - }; - 1D0F11480D58C77800D5DA09 /* Font */ = { - isa = PBXGroup; - children = ( - ); - name = Font; - sourceTree = ""; - }; - 1D493D640C52482B00AB718C /* Executables */ = { - isa = PBXGroup; - children = ( - 1D493D570C5247BF00AB718C /* Vim */, - ); - name = Executables; - sourceTree = ""; - }; - 1D493DB40C52533B00AB718C /* Products */ = { - isa = PBXGroup; - children = ( - 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */, - ); - name = Products; - sourceTree = ""; - }; - 1DE602460C587F760055263D /* Vim Resources */ = { - isa = PBXGroup; - children = ( - 1DED785F0C6DE43D0079945F /* vimrc */, - 1DD0C20A0C60FF9A008CD84A /* gvimrc */, - 1DE602470C587FD10055263D /* runtime */, - ); - name = "Vim Resources"; - sourceTree = ""; - }; - 1DE9726C0C48050600F96A9F /* Toolbar */ = { - isa = PBXGroup; - children = ( - 1DCD00AA0E50B2B700460166 /* Attention.png */, - 1DCD00AB0E50B2B700460166 /* Copy.png */, - 1DCD00AC0E50B2B700460166 /* Cut.png */, - 1DCD00AD0E50B2B700460166 /* FindHelp.png */, - 1DCD00AE0E50B2B700460166 /* FindNext.png */, - 1DCD00AF0E50B2B700460166 /* FindPrev.png */, - 1DCD00B00E50B2B700460166 /* Help.png */, - 1DCD00B10E50B2B700460166 /* LoadSesn.png */, - 1DCD00B20E50B2B700460166 /* Make.png */, - 1DCD00B30E50B2B700460166 /* Open.png */, - 1DCD00B40E50B2B700460166 /* Paste.png */, - 1DCD00B50E50B2B700460166 /* Print.png */, - 1DCD00B60E50B2B700460166 /* Redo.png */, - 1DCD00B70E50B2B700460166 /* Replace.png */, - 1DCD00B80E50B2B700460166 /* RunCtags.png */, - 1DCD00B90E50B2B700460166 /* RunScript.png */, - 1DCD00BA0E50B2B700460166 /* Save.png */, - 1DCD00BB0E50B2B700460166 /* SaveAll.png */, - 1DCD00BC0E50B2B700460166 /* SaveSesn.png */, - 1DCD00BD0E50B2B700460166 /* TagJump.png */, - 1DCD00BE0E50B2B700460166 /* Undo.png */, - ); - name = Toolbar; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* MacVim */ = { - isa = PBXGroup; - children = ( - 1D493D640C52482B00AB718C /* Executables */, - 080E96DDFE201D6D7F000001 /* MacVim Source */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 1DE602460C587F760055263D /* Vim Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = MacVim; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 1D384A0D100D671700D3C22F /* KeyBinding.plist */, - 1D9C602E0EF79C0C0034AD44 /* MacVim.icns */, - 1D8BEA73104992290069B072 /* FindAndReplace.nib */, - 0395A8A90D72D88B00881434 /* General.png */, - 1D22374A0E45DF4800E6FFFF /* Advanced.png */, - 1DD3D51D0D82D4C9006E4320 /* ibeam.png */, - 1D0F11480D58C77800D5DA09 /* Font */, - 1DE9726C0C48050600F96A9F /* Toolbar */, - 1DD9F5E40C85D60500E8D5A5 /* SystemColors.plist */, - 1DE8CC610C5E2AAD003F56E3 /* Actions.plist */, - 1DD04DEB0C529C5E006CDC2B /* Credits.rtf */, - 1D0E051B0BA5F83800B6049E /* Colors.plist */, - 8D1107310486CEB800E47090 /* Info_legacy.plist */, - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, - 1DE3F8E50D50F80500052B9E /* Preferences.nib */, - 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1D8B5A52104AF9FF002E59D5 /* Carbon.framework */, - 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */, - 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, - 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 8D1107260486CEB800E47090 /* MacVim */ = { - isa = PBXNativeTarget; - buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */; - buildPhases = ( - 8D1107290486CEB800E47090 /* Resources */, - 8D11072C0486CEB800E47090 /* Sources */, - 8D11072E0486CEB800E47090 /* Frameworks */, - 1D0DCAD80BA3604D00B6CCFA /* Copy Executables */, - 1D9EB2840C366D7B0074B739 /* Copy Frameworks */, - 1DE608B80C58807F0055263D /* Copy Vim Runtime Files */, - 1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */, - ); - buildRules = ( - ); - dependencies = ( - 1D493DCD0C5254A400AB718C /* PBXTargetDependency */, - ); - name = MacVim; - productInstallPath = "$(HOME)/Applications"; - productName = MacVim; - productReference = 8D1107320486CEB800E47090 /* MacVim.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - Swedish, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* MacVim */; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 1D493DB40C52533B00AB718C /* Products */; - ProjectRef = 1D493DB30C52533B00AB718C /* PSMTabBarControl_legacy.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - 8D1107260486CEB800E47090 /* MacVim */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = PSMTabBarControl.framework; - remoteRef = 1D493DB80C52533B00AB718C /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D1107290486CEB800E47090 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */, - 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, - 1D0E051C0BA5F83800B6049E /* Colors.plist in Resources */, - 1DD04DEC0C529C5E006CDC2B /* Credits.rtf in Resources */, - 1DE8CC620C5E2AAD003F56E3 /* Actions.plist in Resources */, - 1DD9F5E50C85D60500E8D5A5 /* SystemColors.plist in Resources */, - 1DE3F8E70D50F80500052B9E /* Preferences.nib in Resources */, - 0395A8AA0D72D88B00881434 /* General.png in Resources */, - 1DD3D51E0D82D4C9006E4320 /* ibeam.png in Resources */, - 1D22374B0E45DF4800E6FFFF /* Advanced.png in Resources */, - 1DCD00BF0E50B2B700460166 /* Attention.png in Resources */, - 1DCD00C00E50B2B700460166 /* Copy.png in Resources */, - 1DCD00C10E50B2B700460166 /* Cut.png in Resources */, - 1DCD00C20E50B2B700460166 /* FindHelp.png in Resources */, - 1DCD00C30E50B2B700460166 /* FindNext.png in Resources */, - 1DCD00C40E50B2B700460166 /* FindPrev.png in Resources */, - 1DCD00C50E50B2B700460166 /* Help.png in Resources */, - 1DCD00C60E50B2B700460166 /* LoadSesn.png in Resources */, - 1DCD00C70E50B2B700460166 /* Make.png in Resources */, - 1DCD00C80E50B2B700460166 /* Open.png in Resources */, - 1DCD00C90E50B2B700460166 /* Paste.png in Resources */, - 1DCD00CA0E50B2B700460166 /* Print.png in Resources */, - 1DCD00CB0E50B2B700460166 /* Redo.png in Resources */, - 1DCD00CC0E50B2B700460166 /* Replace.png in Resources */, - 1DCD00CD0E50B2B700460166 /* RunCtags.png in Resources */, - 1DCD00CE0E50B2B700460166 /* RunScript.png in Resources */, - 1DCD00CF0E50B2B700460166 /* Save.png in Resources */, - 1DCD00D00E50B2B700460166 /* SaveAll.png in Resources */, - 1DCD00D10E50B2B700460166 /* SaveSesn.png in Resources */, - 1DCD00D20E50B2B700460166 /* TagJump.png in Resources */, - 1DCD00D30E50B2B700460166 /* Undo.png in Resources */, - 1D8BEA74104992290069B072 /* FindAndReplace.nib in Resources */, - 1D9C60520EF79C0C0034AD44 /* MacVim.icns in Resources */, - 1D384A0E100D671700D3C22F /* KeyBinding.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 1D1C31F00EFFBFD6003FE9A5 /* Make Document Icons */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Make Document Icons"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Clear deployment target, else the python script always thinks we're building on Tiger\nunset MACOSX_DEPLOYMENT_TARGET\n\n# Generate the icons (redirect stderr to ignore warnings)\ncd \"$PROJECT_DIR\"/icons/\nmake OUTDIR=\"$TARGET_BUILD_DIR\"/$UNLOCALIZED_RESOURCES_FOLDER_PATH 2> /dev/null\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D11072C0486CEB800E47090 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D11072D0486CEB800E47090 /* main.m in Sources */, - 1D1474980C56703C0038FA2B /* MacVim.m in Sources */, - 1D1474A00C5673AE0038FA2B /* MMAppController.m in Sources */, - 1D1474AA0C5677450038FA2B /* MMTextStorage.m in Sources */, - 1D1474B00C5678370038FA2B /* MMTextView.m in Sources */, - 1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */, - 1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */, - 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */, - 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */, - 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */, - 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */, - 1D9918490D299F9900A96335 /* MMAtsuiTextView.m in Sources */, - 1DE9B9500D341AB8008FEDD4 /* MMWindow.m in Sources */, - 1DE3F8EB0D50F84600052B9E /* MMPreferenceController.m in Sources */, - 0395A8330D71ED7800881434 /* DBPrefsWindowController.m in Sources */, - 1D80591F0E1185EA001699D1 /* Miscellaneous.m in Sources */, - 1D145C7F0E5227CE00691AA0 /* MMTextViewHelper.m in Sources */, - 1D60088B0E96A0B2003763F0 /* MMFindReplaceController.m in Sources */, - 1DE63FFB0E71820F00959BDB /* MMCoreTextView.m in Sources */, - 1D44972211FCA9B400B0630F /* MMCoreTextView+ToolTip.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 1D493DCD0C5254A400AB718C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = PSMTabBarControlFramework; - targetProxy = 1D493DCC0C5254A400AB718C /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C165DFE840E0CC02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 1D8BEA73104992290069B072 /* FindAndReplace.nib */ = { - isa = PBXVariantGroup; - children = ( - 1D6008820E96886D003763F0 /* English */, - ); - name = FindAndReplace.nib; - sourceTree = ""; - }; - 1DE3F8E50D50F80500052B9E /* Preferences.nib */ = { - isa = PBXVariantGroup; - children = ( - 1DE3F8E60D50F80500052B9E /* English */, - ); - name = Preferences.nib; - sourceTree = ""; - }; - 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - 29B97319FDCFA39411CA2CEA /* English */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - C01FCF4B08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_VERSION = ""; - GCC_WARN_PEDANTIC = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info_legacy.plist; - INSTALL_PATH = "$(HOME)/Applications"; - MACOSX_DEPLOYMENT_TARGET = ""; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = MacVim; - VERSIONING_SYSTEM = "apple-generic"; - WARNING_CFLAGS = "-Wall"; - WRAPPER_EXTENSION = app; - ZERO_LINK = NO; - }; - name = Debug; - }; - C01FCF4C08A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\""; - GCC_DYNAMIC_NO_PIC = YES; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = s; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info_legacy.plist; - INSTALL_PATH = "$(HOME)/Applications"; - MACOSX_DEPLOYMENT_TARGET = ""; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = MacVim; - VERSIONING_SYSTEM = "apple-generic"; - WRAPPER_EXTENSION = app; - ZERO_LINK = NO; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - GCC_VERSION = 4.2; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SYMROOT = "$(PROJECT_DIR)/build"; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - GCC_VERSION = 4.2; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SYMROOT = "$(PROJECT_DIR)/build"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "MacVim" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4B08A954540054247B /* Debug */, - C01FCF4C08A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/src/MacVim/Miscellaneous.h b/src/MacVim/Miscellaneous.h index f95fc7f1ee..da513c1b32 100644 --- a/src/MacVim/Miscellaneous.h +++ b/src/MacVim/Miscellaneous.h @@ -16,10 +16,6 @@ // TODO: Remove this when the inline IM code has been tested #define INCLUDE_OLD_IM_CODE -// Use Core Text instead of ATSUI when compiling on 10.5+. -// Note: Core Text was introduced with 10.5, ATSUI was deprecated on 10.6. -#define MM_ENABLE_ATSUI (MAC_OS_X_VERSION_MIN_REQUIRED - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - PSMTabBarControl - CFBundleIdentifier - com.positivespinmedia.PSMTabBarControlFramework - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleSignature - PSM1 - CFBundleVersion - 1.1 - NSPrincipalClass - PSMTabBarControl - - diff --git a/src/MacVim/PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj/project.pbxproj b/src/MacVim/PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj/project.pbxproj deleted file mode 100644 index 4477e4b660..0000000000 --- a/src/MacVim/PSMTabBarControl/PSMTabBarControl_legacy.xcodeproj/project.pbxproj +++ /dev/null @@ -1,703 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXAggregateTarget section */ - 53DF6901067E5B8E0090B5B0 /* All */ = { - isa = PBXAggregateTarget; - buildConfigurationList = C056398708A954F8003078D8 /* Build configuration list for PBXAggregateTarget "All" */; - buildPhases = ( - ); - dependencies = ( - 53DF6905067E5B930090B5B0 /* PBXTargetDependency */, - ); - name = All; - productName = All; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 13F8B89007B43554008AE28D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD92D38A0106425D02CA0E72 /* Cocoa.framework */; }; - 523897F415BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */; }; - 523897F515BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */; }; - 523897F615BDA9AC00498A53 /* TabClose_Front@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */; }; - 523897F715BDA9AC00498A53 /* TabNewMetal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */; }; - 523897F815BDA9AC00498A53 /* TabNewMetalPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */; }; - 523897F915BDA9AC00498A53 /* TabNewMetalRollover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */; }; - 52A57C0F15BBA230003EC59C /* TabClose_Front.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0C15BBA230003EC59C /* TabClose_Front.png */; }; - 52A57C1015BBA230003EC59C /* TabClose_Front_Pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */; }; - 52A57C1115BBA230003EC59C /* TabClose_Front_Rollover.png in Resources */ = {isa = PBXBuildFile; fileRef = 52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */; }; - 52C0B9B415BDB7A9000C268F /* overflowImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */; }; - 52C0B9B515BDB7A9000C268F /* overflowImagePressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */; }; - 52C268D015BDB72B0012FECA /* overflowImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C268CE15BDB72B0012FECA /* overflowImage.png */; }; - 52C268D115BDB72B0012FECA /* overflowImagePressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 52C268CF15BDB72B0012FECA /* overflowImagePressed.png */; }; - 546DEAF1067F63070098DCC4 /* PSMTabBarControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 0259C576FE90428111CA0C5A /* PSMTabBarControl.m */; }; - 546DEAF2067F630E0098DCC4 /* PSMTabBarControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A2082A9009EAEB34009AC8BE /* PSMTabDragAssistant.h in Headers */ = {isa = PBXBuildFile; fileRef = A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */; }; - A2082A9109EAEB34009AC8BE /* PSMTabDragAssistant.m in Sources */ = {isa = PBXBuildFile; fileRef = A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */; }; - A2129BB209AEB58F00724E6C /* PSMProgressIndicator.h in Headers */ = {isa = PBXBuildFile; fileRef = A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */; }; - A2129BB309AEB58F00724E6C /* PSMProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */; }; - A251BE850959A1B90058BC7F /* PSMOverflowPopUpButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */; }; - A251BE860959A1B90058BC7F /* PSMOverflowPopUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */; }; - A251BE870959A1B90058BC7F /* PSMTabBarCell.h in Headers */ = {isa = PBXBuildFile; fileRef = A251BE830959A1B90058BC7F /* PSMTabBarCell.h */; }; - A251BE880959A1B90058BC7F /* PSMTabBarCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A251BE840959A1B90058BC7F /* PSMTabBarCell.m */; }; - A268E80409A9822A00E082AA /* AquaTabNew.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7F809A9822900E082AA /* AquaTabNew.png */; }; - A268E80509A9822A00E082AA /* AquaTabNewPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7F909A9822900E082AA /* AquaTabNewPressed.png */; }; - A268E80609A9822A00E082AA /* AquaTabNewRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */; }; - A268E80709A9822A00E082AA /* TabNewMetal.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FB09A9822900E082AA /* TabNewMetal.png */; }; - A268E80809A9822A00E082AA /* TabNewMetalPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */; }; - A268E80909A9822A00E082AA /* TabNewMetalRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */; }; - A268EA6209A9831800E082AA /* PSMRolloverButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A268EA5F09A9831800E082AA /* PSMRolloverButton.h */; }; - A268EA6309A9831800E082AA /* PSMRolloverButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A268EA6009A9831800E082AA /* PSMRolloverButton.m */; }; - A27E47850A28EE76007BA395 /* TabIcon.tif in Resources */ = {isa = PBXBuildFile; fileRef = A20822F00959F6AA00C5F5A4 /* TabIcon.tif */; }; - A27E47880A28EE7C007BA395 /* TabControlRep.tif in Resources */ = {isa = PBXBuildFile; fileRef = A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */; }; - A2C0D99509AF870000ED379C /* pi.png in Resources */ = {isa = PBXBuildFile; fileRef = A2C0D99309AF870000ED379C /* pi.png */; }; - A2D32EDC09A634C900EC8662 /* PSMTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */; }; - A2D32EF709A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */; }; - A2D32EF809A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */; }; - A2D32EF909A63BF700EC8662 /* AquaTabClose_Front.tif in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */; }; - A2D32EFA09A63BF700EC8662 /* AquaTabsBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */; }; - A2D32EFB09A63BF700EC8662 /* AquaTabsDown.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */; }; - A2D32EFC09A63BF700EC8662 /* AquaTabsSeparator.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */; }; - A2D32EFD09A63BF700EC8662 /* AquaTabsSeparatorDown.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */; }; - A2D32F0009A63D7A00EC8662 /* PSMMetalTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */; }; - A2D32F0109A63D7A00EC8662 /* PSMMetalTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */; }; - A2D3317C09A68B7500EC8662 /* AquaTabsDownGraphite.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */; }; - A2D3317D09A68B7500EC8662 /* AquaTabsDownNonKey.png in Resources */ = {isa = PBXBuildFile; fileRef = A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */; }; - A2D98B0A0A2B432C0064C6F8 /* PSMUnifiedTabStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */; }; - A2D98B0B0A2B432C0064C6F8 /* PSMUnifiedTabStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */; }; - A2D98B120A2B43FA0064C6F8 /* NSBezierPath_AMShading.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */; }; - A2D98B130A2B43FA0064C6F8 /* NSBezierPath_AMShading.m in Sources */ = {isa = PBXBuildFile; fileRef = A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 53DF6904067E5B930090B5B0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 0259C573FE90428111CA0C5A /* Project object */; - proxyType = 1; - remoteGlobalIDString = 53DF68FC067E5B5A0090B5B0; - remoteInfo = PSMTabBarControlFramework; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 0259C576FE90428111CA0C5A /* PSMTabBarControl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControl.m; path = source/PSMTabBarControl.m; sourceTree = ""; }; - 0259C577FE90428111CA0C5A /* PSMTabBarControlInspector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControlInspector.m; path = source/PSMTabBarControlInspector.m; sourceTree = ""; }; - 0259C578FE90428111CA0C5A /* PSMTabBarControlPalette.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarControlPalette.m; path = source/PSMTabBarControlPalette.m; sourceTree = ""; }; - 0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl.h; path = source/PSMTabBarControl.h; sourceTree = ""; }; - 0259C57BFE90428111CA0C5A /* PSMTabBarControlInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControlInspector.h; path = source/PSMTabBarControlInspector.h; sourceTree = ""; }; - 0259C57CFE90428111CA0C5A /* PSMTabBarControlPalette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControlPalette.h; path = source/PSMTabBarControlPalette.h; sourceTree = ""; }; - 0259C57FFE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PSMTabBarControlInspector.nib; sourceTree = ""; }; - 0259C581FE90428111CA0C5A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/PSMTabBarControlPalette.nib; sourceTree = ""; }; - 0259C583FE90428111CA0C5A /* palette.table */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = palette.table; sourceTree = ""; }; - 13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InterfaceBuilder.framework; path = /System/Library/Frameworks/InterfaceBuilder.framework; sourceTree = ""; }; - 13F8B88807B434F6008AE28D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 13F8B88A07B434F6008AE28D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabBarControl_Prefix.pch; path = source/PSMTabBarControl_Prefix.pch; sourceTree = ""; }; - 523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front_Pressed@2x.png"; path = "images/TabClose_Front_Pressed@2x.png"; sourceTree = ""; }; - 523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front_Rollover@2x.png"; path = "images/TabClose_Front_Rollover@2x.png"; sourceTree = ""; }; - 523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabClose_Front@2x.png"; path = "images/TabClose_Front@2x.png"; sourceTree = ""; }; - 523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetal@2x.png"; path = "images/TabNewMetal@2x.png"; sourceTree = ""; }; - 523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetalPressed@2x.png"; path = "images/TabNewMetalPressed@2x.png"; sourceTree = ""; }; - 523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TabNewMetalRollover@2x.png"; path = "images/TabNewMetalRollover@2x.png"; sourceTree = ""; }; - 52A57C0C15BBA230003EC59C /* TabClose_Front.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front.png; path = images/TabClose_Front.png; sourceTree = ""; }; - 52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front_Pressed.png; path = images/TabClose_Front_Pressed.png; sourceTree = ""; }; - 52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabClose_Front_Rollover.png; path = images/TabClose_Front_Rollover.png; sourceTree = ""; }; - 52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "overflowImage@2x.png"; path = "images/overflowImage@2x.png"; sourceTree = ""; }; - 52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "overflowImagePressed@2x.png"; path = "images/overflowImagePressed@2x.png"; sourceTree = ""; }; - 52C268CE15BDB72B0012FECA /* overflowImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = overflowImage.png; path = images/overflowImage.png; sourceTree = ""; }; - 52C268CF15BDB72B0012FECA /* overflowImagePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = overflowImagePressed.png; path = images/overflowImagePressed.png; sourceTree = ""; }; - 53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PSMTabBarControl.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info_legacy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PSMTabBarControlFramework-Info_legacy.plist"; sourceTree = ""; }; - 54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PSMTabBarControl.ibclassdescription; sourceTree = ""; }; - 8D1AC9730486D14A00FE50C9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D1AC97B0486D23100FE50C9 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - A2072A2409ABD88600304BCB /* Folder.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Folder.tif; path = images/Folder.tif; sourceTree = ""; }; - A2072A2509ABD88600304BCB /* Globe.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Globe.tiff; path = images/Globe.tiff; sourceTree = ""; }; - A2072B5C09AC1FA500304BCB /* Warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Warning.png; path = images/Warning.png; sourceTree = ""; }; - A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabControlRep.tif; path = images/TabControlRep.tif; sourceTree = ""; }; - A20822F00959F6AA00C5F5A4 /* TabIcon.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = TabIcon.tif; path = images/TabIcon.tif; sourceTree = ""; }; - A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabDragAssistant.h; path = source/PSMTabDragAssistant.h; sourceTree = ""; }; - A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMTabDragAssistant.m; path = source/PSMTabDragAssistant.m; sourceTree = ""; wrapsLines = 0; }; - A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMProgressIndicator.h; path = source/PSMProgressIndicator.h; sourceTree = ""; }; - A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMProgressIndicator.m; path = source/PSMProgressIndicator.m; sourceTree = ""; }; - A246FB040A2BD6F9005BDF7B /* PSMTabBarControlDoc.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html.documentation; name = PSMTabBarControlDoc.html; path = documentation/PSMTabBarControlDoc.html; sourceTree = ""; }; - A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = PSMOverflowPopUpButton.h; path = source/PSMOverflowPopUpButton.h; sourceTree = ""; }; - A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMOverflowPopUpButton.m; path = source/PSMOverflowPopUpButton.m; sourceTree = ""; }; - A251BE830959A1B90058BC7F /* PSMTabBarCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMTabBarCell.h; path = source/PSMTabBarCell.h; sourceTree = ""; }; - A251BE840959A1B90058BC7F /* PSMTabBarCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMTabBarCell.m; path = source/PSMTabBarCell.m; sourceTree = ""; }; - A251BE890959A1EA0058BC7F /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = source/AppController.h; sourceTree = ""; }; - A251BE8A0959A1EA0058BC7F /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AppController.m; path = source/AppController.m; sourceTree = ""; }; - A251BE8B0959A1EA0058BC7F /* FakeModel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FakeModel.h; path = source/FakeModel.h; sourceTree = ""; }; - A251BE8C0959A1EA0058BC7F /* FakeModel.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FakeModel.m; path = source/FakeModel.m; sourceTree = ""; }; - A251BE8D0959A1EA0058BC7F /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = main.m; path = source/main.m; sourceTree = ""; }; - A251BE8F0959A23A0058BC7F /* 32x32cancel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 32x32cancel.png; path = images/32x32cancel.png; sourceTree = ""; }; - A251BE9B0959A2530058BC7F /* ReadMe.rtfd */ = {isa = PBXFileReference; lastKnownFileType = wrapper.rtfd; path = ReadMe.rtfd; sourceTree = ""; }; - A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TabBarControlDemo-Info.plist"; sourceTree = ""; }; - A251BEC30959BC0E0058BC7F /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; - A268E7F809A9822900E082AA /* AquaTabNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNew.png; path = images/AquaTabNew.png; sourceTree = ""; }; - A268E7F909A9822900E082AA /* AquaTabNewPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewPressed.png; path = images/AquaTabNewPressed.png; sourceTree = ""; }; - A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabNewRollover.png; path = images/AquaTabNewRollover.png; sourceTree = ""; }; - A268E7FB09A9822900E082AA /* TabNewMetal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetal.png; path = images/TabNewMetal.png; sourceTree = ""; }; - A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetalPressed.png; path = images/TabNewMetalPressed.png; sourceTree = ""; }; - A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = TabNewMetalRollover.png; path = images/TabNewMetalRollover.png; sourceTree = ""; }; - A268EA5F09A9831800E082AA /* PSMRolloverButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMRolloverButton.h; path = source/PSMRolloverButton.h; sourceTree = ""; }; - A268EA6009A9831800E082AA /* PSMRolloverButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMRolloverButton.m; path = source/PSMRolloverButton.m; sourceTree = ""; }; - A269361009A778770006911E /* 32x32_log.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = 32x32_log.tiff; path = images/32x32_log.tiff; sourceTree = ""; }; - A2A711BA09E5AE1E00D0089B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Window.nib; sourceTree = ""; }; - A2A711BD09E5BF0500D0089B /* WindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WindowController.h; path = source/WindowController.h; sourceTree = ""; }; - A2A711BE09E5BF0500D0089B /* WindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WindowController.m; path = source/WindowController.m; sourceTree = ""; }; - A2C0D99309AF870000ED379C /* pi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = pi.png; path = images/pi.png; sourceTree = ""; }; - A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMTabStyle.h; path = source/PSMTabStyle.h; sourceTree = ""; }; - A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front_Pressed.tif; path = images/AquaTabClose_Front_Pressed.tif; sourceTree = ""; }; - A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front_Rollover.tif; path = images/AquaTabClose_Front_Rollover.tif; sourceTree = ""; }; - A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AquaTabClose_Front.tif; path = images/AquaTabClose_Front.tif; sourceTree = ""; }; - A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsBackground.png; path = images/AquaTabsBackground.png; sourceTree = ""; }; - A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDown.png; path = images/AquaTabsDown.png; sourceTree = ""; }; - A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsSeparator.png; path = images/AquaTabsSeparator.png; sourceTree = ""; }; - A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsSeparatorDown.png; path = images/AquaTabsSeparatorDown.png; sourceTree = ""; }; - A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PSMMetalTabStyle.h; path = source/PSMMetalTabStyle.h; sourceTree = ""; }; - A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PSMMetalTabStyle.m; path = source/PSMMetalTabStyle.m; sourceTree = ""; }; - A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDownGraphite.png; path = images/AquaTabsDownGraphite.png; sourceTree = ""; }; - A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = AquaTabsDownNonKey.png; path = images/AquaTabsDownNonKey.png; sourceTree = ""; }; - A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PSMUnifiedTabStyle.h; path = source/PSMUnifiedTabStyle.h; sourceTree = ""; }; - A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PSMUnifiedTabStyle.m; path = source/PSMUnifiedTabStyle.m; sourceTree = ""; }; - A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSBezierPath_AMShading.h; path = source/NSBezierPath_AMShading.h; sourceTree = ""; }; - A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSBezierPath_AMShading.m; path = source/NSBezierPath_AMShading.m; sourceTree = ""; }; - DD92D38A0106425D02CA0E72 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 53DF68FB067E5B5A0090B5B0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 13F8B89007B43554008AE28D /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 0259C574FE90428111CA0C5A /* PSMTabBarControl */ = { - isa = PBXGroup; - children = ( - A251BE9B0959A2530058BC7F /* ReadMe.rtfd */, - A246FADE0A2BD446005BDF7B /* Documentation */, - 32DBCF9E0370C38000C91783 /* Palette */, - 54D33B2C06778E4400C9C163 /* Framework */, - A251BE590959A0550058BC7F /* Demo App */, - 0259C582FE90428111CA0C5A /* Resources */, - 1ED78706FE9D4A0611CA0C5A /* Products */, - 2E58F364FFB232C311CA0CBA /* Frameworks */, - ); - name = PSMTabBarControl; - sourceTree = ""; - }; - 0259C582FE90428111CA0C5A /* Resources */ = { - isa = PBXGroup; - children = ( - A251BEC20959BC0E0058BC7F /* MainMenu.nib */, - A251BE8E0959A21A0058BC7F /* Images */, - 8D1AC9730486D14A00FE50C9 /* Info.plist */, - 53DF68FE067E5B5A0090B5B0 /* PSMTabBarControlFramework-Info_legacy.plist */, - A251BEA20959BB5B0058BC7F /* TabBarControlDemo-Info.plist */, - 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */, - A2A711B909E5AE1E00D0089B /* Window.nib */, - ); - name = Resources; - sourceTree = ""; - }; - 131E8FE8067F80F40006E0CE /* Resources */ = { - isa = PBXGroup; - children = ( - A20822EF0959F6AA00C5F5A4 /* TabControlRep.tif */, - A20822F00959F6AA00C5F5A4 /* TabIcon.tif */, - 0259C57EFE90428111CA0C5A /* PSMTabBarControlInspector.nib */, - 0259C580FE90428111CA0C5A /* PSMTabBarControlPalette.nib */, - ); - name = Resources; - sourceTree = ""; - }; - 13F8B6FD07B43410008AE28D /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 13EB9DBD07DE0F1E00EB933A /* InterfaceBuilder.framework */, - DD92D38A0106425D02CA0E72 /* Cocoa.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 13F8B70407B43425008AE28D /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 13F8B88807B434F6008AE28D /* AppKit.framework */, - 13F8B88A07B434F6008AE28D /* Foundation.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 1ED78706FE9D4A0611CA0C5A /* Products */ = { - isa = PBXGroup; - children = ( - 53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */, - ); - name = Products; - sourceTree = ""; - }; - 2E58F364FFB232C311CA0CBA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 13F8B6FD07B43410008AE28D /* Linked Frameworks */, - 13F8B70407B43425008AE28D /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; - 32DBCF9E0370C38000C91783 /* Palette */ = { - isa = PBXGroup; - children = ( - 54D33B2406778DD400C9C163 /* Undo Support */, - 54D33B2506778DF000C9C163 /* Classes */, - 32DBCF9F0370C38200C91783 /* Other Sources */, - 131E8FE8067F80F40006E0CE /* Resources */, - 0259C583FE90428111CA0C5A /* palette.table */, - ); - name = Palette; - sourceTree = ""; - }; - 32DBCF9F0370C38200C91783 /* Other Sources */ = { - isa = PBXGroup; - children = ( - 32DBCF980370C29C00C91783 /* PSMTabBarControl_Prefix.pch */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 54D33B2406778DD400C9C163 /* Undo Support */ = { - isa = PBXGroup; - children = ( - 54D33B2806778E3300C9C163 /* PSMTabBarControl.ibclassdescription */, - ); - name = "Undo Support"; - sourceTree = ""; - }; - 54D33B2506778DF000C9C163 /* Classes */ = { - isa = PBXGroup; - children = ( - 0259C57BFE90428111CA0C5A /* PSMTabBarControlInspector.h */, - 0259C577FE90428111CA0C5A /* PSMTabBarControlInspector.m */, - 0259C57CFE90428111CA0C5A /* PSMTabBarControlPalette.h */, - 0259C578FE90428111CA0C5A /* PSMTabBarControlPalette.m */, - ); - name = Classes; - sourceTree = ""; - }; - 54D33B2C06778E4400C9C163 /* Framework */ = { - isa = PBXGroup; - children = ( - 0259C57AFE90428111CA0C5A /* PSMTabBarControl.h */, - 0259C576FE90428111CA0C5A /* PSMTabBarControl.m */, - A251BE830959A1B90058BC7F /* PSMTabBarCell.h */, - A251BE840959A1B90058BC7F /* PSMTabBarCell.m */, - A2D32EDA09A634C900EC8662 /* PSMTabStyle.h */, - A2D32EFE09A63D7A00EC8662 /* PSMMetalTabStyle.h */, - A2D32EFF09A63D7A00EC8662 /* PSMMetalTabStyle.m */, - A2D98B070A2B432C0064C6F8 /* PSMUnifiedTabStyle.h */, - A2D98B080A2B432C0064C6F8 /* PSMUnifiedTabStyle.m */, - A268EA5F09A9831800E082AA /* PSMRolloverButton.h */, - A268EA6009A9831800E082AA /* PSMRolloverButton.m */, - A251BE810959A1B90058BC7F /* PSMOverflowPopUpButton.h */, - A251BE820959A1B90058BC7F /* PSMOverflowPopUpButton.m */, - A2129BAF09AEB58F00724E6C /* PSMProgressIndicator.h */, - A2129BB009AEB58F00724E6C /* PSMProgressIndicator.m */, - A2082A8D09EAEB33009AC8BE /* PSMTabDragAssistant.h */, - A2082A8E09EAEB33009AC8BE /* PSMTabDragAssistant.m */, - A2D98B0F0A2B43FA0064C6F8 /* NSBezierPath_AMShading.h */, - A2D98B100A2B43FA0064C6F8 /* NSBezierPath_AMShading.m */, - ); - name = Framework; - sourceTree = ""; - }; - A246FADE0A2BD446005BDF7B /* Documentation */ = { - isa = PBXGroup; - children = ( - A246FB040A2BD6F9005BDF7B /* PSMTabBarControlDoc.html */, - ); - name = Documentation; - sourceTree = ""; - }; - A251BE590959A0550058BC7F /* Demo App */ = { - isa = PBXGroup; - children = ( - A251BE890959A1EA0058BC7F /* AppController.h */, - A251BE8A0959A1EA0058BC7F /* AppController.m */, - A2A711BD09E5BF0500D0089B /* WindowController.h */, - A2A711BE09E5BF0500D0089B /* WindowController.m */, - A251BE8B0959A1EA0058BC7F /* FakeModel.h */, - A251BE8C0959A1EA0058BC7F /* FakeModel.m */, - A251BE8D0959A1EA0058BC7F /* main.m */, - ); - name = "Demo App"; - sourceTree = ""; - }; - A251BE8E0959A21A0058BC7F /* Images */ = { - isa = PBXGroup; - children = ( - A2C0D99309AF870000ED379C /* pi.png */, - A2072B5C09AC1FA500304BCB /* Warning.png */, - A2072A2409ABD88600304BCB /* Folder.tif */, - A2072A2509ABD88600304BCB /* Globe.tiff */, - A268E7F809A9822900E082AA /* AquaTabNew.png */, - A268E7F909A9822900E082AA /* AquaTabNewPressed.png */, - A268E7FA09A9822900E082AA /* AquaTabNewRollover.png */, - A268E7FB09A9822900E082AA /* TabNewMetal.png */, - 523897F115BDA9AC00498A53 /* TabNewMetal@2x.png */, - A268E7FC09A9822900E082AA /* TabNewMetalPressed.png */, - 523897F215BDA9AC00498A53 /* TabNewMetalPressed@2x.png */, - A268E7FD09A9822900E082AA /* TabNewMetalRollover.png */, - 523897F315BDA9AC00498A53 /* TabNewMetalRollover@2x.png */, - A269361009A778770006911E /* 32x32_log.tiff */, - A2D3317A09A68B7500EC8662 /* AquaTabsDownGraphite.png */, - A2D3317B09A68B7500EC8662 /* AquaTabsDownNonKey.png */, - A2D32EF009A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif */, - A2D32EF109A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif */, - A2D32EF209A63BF700EC8662 /* AquaTabClose_Front.tif */, - A2D32EF309A63BF700EC8662 /* AquaTabsBackground.png */, - A2D32EF409A63BF700EC8662 /* AquaTabsDown.png */, - A2D32EF509A63BF700EC8662 /* AquaTabsSeparator.png */, - A2D32EF609A63BF700EC8662 /* AquaTabsSeparatorDown.png */, - A251BE8F0959A23A0058BC7F /* 32x32cancel.png */, - 52C268CE15BDB72B0012FECA /* overflowImage.png */, - 52C0B9B215BDB7A9000C268F /* overflowImage@2x.png */, - 52C268CF15BDB72B0012FECA /* overflowImagePressed.png */, - 52C0B9B315BDB7A9000C268F /* overflowImagePressed@2x.png */, - 52A57C0C15BBA230003EC59C /* TabClose_Front.png */, - 523897F015BDA9AC00498A53 /* TabClose_Front@2x.png */, - 52A57C0D15BBA230003EC59C /* TabClose_Front_Pressed.png */, - 523897EE15BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png */, - 52A57C0E15BBA230003EC59C /* TabClose_Front_Rollover.png */, - 523897EF15BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png */, - ); - name = Images; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 53DF68F8067E5B5A0090B5B0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 546DEAF2067F630E0098DCC4 /* PSMTabBarControl.h in Headers */, - A251BE850959A1B90058BC7F /* PSMOverflowPopUpButton.h in Headers */, - A251BE870959A1B90058BC7F /* PSMTabBarCell.h in Headers */, - A2D32EDC09A634C900EC8662 /* PSMTabStyle.h in Headers */, - A2D32F0009A63D7A00EC8662 /* PSMMetalTabStyle.h in Headers */, - A268EA6209A9831800E082AA /* PSMRolloverButton.h in Headers */, - A2129BB209AEB58F00724E6C /* PSMProgressIndicator.h in Headers */, - A2082A9009EAEB34009AC8BE /* PSMTabDragAssistant.h in Headers */, - A2D98B0A0A2B432C0064C6F8 /* PSMUnifiedTabStyle.h in Headers */, - A2D98B120A2B43FA0064C6F8 /* NSBezierPath_AMShading.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */ = { - isa = PBXNativeTarget; - buildConfigurationList = C056397F08A954F8003078D8 /* Build configuration list for PBXNativeTarget "PSMTabBarControlFramework" */; - buildPhases = ( - 53DF68F8067E5B5A0090B5B0 /* Headers */, - 53DF68F9067E5B5A0090B5B0 /* Resources */, - 53DF68FA067E5B5A0090B5B0 /* Sources */, - 53DF68FB067E5B5A0090B5B0 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = PSMTabBarControlFramework; - productName = PSMTabBarControlFramework; - productReference = 53DF68FD067E5B5A0090B5B0 /* PSMTabBarControl.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0259C573FE90428111CA0C5A /* Project object */ = { - isa = PBXProject; - buildConfigurationList = C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - en, - ); - mainGroup = 0259C574FE90428111CA0C5A /* PSMTabBarControl */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */, - 53DF6901067E5B8E0090B5B0 /* All */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 53DF68F9067E5B5A0090B5B0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A2D32EF709A63BF700EC8662 /* AquaTabClose_Front_Pressed.tif in Resources */, - A2D32EF809A63BF700EC8662 /* AquaTabClose_Front_Rollover.tif in Resources */, - A2D32EF909A63BF700EC8662 /* AquaTabClose_Front.tif in Resources */, - A2D32EFA09A63BF700EC8662 /* AquaTabsBackground.png in Resources */, - A2D32EFB09A63BF700EC8662 /* AquaTabsDown.png in Resources */, - A2D32EFC09A63BF700EC8662 /* AquaTabsSeparator.png in Resources */, - A2D32EFD09A63BF700EC8662 /* AquaTabsSeparatorDown.png in Resources */, - A2D3317C09A68B7500EC8662 /* AquaTabsDownGraphite.png in Resources */, - A2D3317D09A68B7500EC8662 /* AquaTabsDownNonKey.png in Resources */, - A268E80409A9822A00E082AA /* AquaTabNew.png in Resources */, - A268E80509A9822A00E082AA /* AquaTabNewPressed.png in Resources */, - A268E80609A9822A00E082AA /* AquaTabNewRollover.png in Resources */, - A268E80709A9822A00E082AA /* TabNewMetal.png in Resources */, - A268E80809A9822A00E082AA /* TabNewMetalPressed.png in Resources */, - A268E80909A9822A00E082AA /* TabNewMetalRollover.png in Resources */, - A2C0D99509AF870000ED379C /* pi.png in Resources */, - A27E47850A28EE76007BA395 /* TabIcon.tif in Resources */, - A27E47880A28EE7C007BA395 /* TabControlRep.tif in Resources */, - 52A57C0F15BBA230003EC59C /* TabClose_Front.png in Resources */, - 52A57C1015BBA230003EC59C /* TabClose_Front_Pressed.png in Resources */, - 52A57C1115BBA230003EC59C /* TabClose_Front_Rollover.png in Resources */, - 523897F415BDA9AC00498A53 /* TabClose_Front_Pressed@2x.png in Resources */, - 523897F515BDA9AC00498A53 /* TabClose_Front_Rollover@2x.png in Resources */, - 523897F615BDA9AC00498A53 /* TabClose_Front@2x.png in Resources */, - 523897F715BDA9AC00498A53 /* TabNewMetal@2x.png in Resources */, - 523897F815BDA9AC00498A53 /* TabNewMetalPressed@2x.png in Resources */, - 523897F915BDA9AC00498A53 /* TabNewMetalRollover@2x.png in Resources */, - 52C268D015BDB72B0012FECA /* overflowImage.png in Resources */, - 52C268D115BDB72B0012FECA /* overflowImagePressed.png in Resources */, - 52C0B9B415BDB7A9000C268F /* overflowImage@2x.png in Resources */, - 52C0B9B515BDB7A9000C268F /* overflowImagePressed@2x.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 53DF68FA067E5B5A0090B5B0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 546DEAF1067F63070098DCC4 /* PSMTabBarControl.m in Sources */, - A251BE860959A1B90058BC7F /* PSMOverflowPopUpButton.m in Sources */, - A251BE880959A1B90058BC7F /* PSMTabBarCell.m in Sources */, - A2D32F0109A63D7A00EC8662 /* PSMMetalTabStyle.m in Sources */, - A268EA6309A9831800E082AA /* PSMRolloverButton.m in Sources */, - A2129BB309AEB58F00724E6C /* PSMProgressIndicator.m in Sources */, - A2082A9109EAEB34009AC8BE /* PSMTabDragAssistant.m in Sources */, - A2D98B0B0A2B432C0064C6F8 /* PSMUnifiedTabStyle.m in Sources */, - A2D98B130A2B43FA0064C6F8 /* NSBezierPath_AMShading.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 53DF6905067E5B930090B5B0 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 53DF68FC067E5B5A0090B5B0 /* PSMTabBarControlFramework */; - targetProxy = 53DF6904067E5B930090B5B0 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 0259C57EFE90428111CA0C5A /* PSMTabBarControlInspector.nib */ = { - isa = PBXVariantGroup; - children = ( - 0259C57FFE90428111CA0C5A /* English */, - ); - name = PSMTabBarControlInspector.nib; - sourceTree = ""; - }; - 0259C580FE90428111CA0C5A /* PSMTabBarControlPalette.nib */ = { - isa = PBXVariantGroup; - children = ( - 0259C581FE90428111CA0C5A /* English */, - ); - name = PSMTabBarControlPalette.nib; - sourceTree = ""; - }; - 8D1AC97F0486D23B00FE50C9 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 8D1AC97B0486D23100FE50C9 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - A251BEC20959BC0E0058BC7F /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - A251BEC30959BC0E0058BC7F /* English */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; - A2A711B909E5AE1E00D0089B /* Window.nib */ = { - isa = PBXVariantGroup; - children = ( - A2A711BA09E5AE1E00D0089B /* English */, - ); - name = Window.nib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - C056398008A954F8003078D8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - GCC_VERSION = ""; - INFOPLIST_FILE = "PSMTabBarControlFramework-Info_legacy.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = PSMTabBarControl; - SYMROOT = ../build; - ZERO_LINK = NO; - }; - name = Debug; - }; - C056398108A954F8003078D8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - GCC_VERSION = ""; - INFOPLIST_FILE = "PSMTabBarControlFramework-Info_legacy.plist"; - INSTALL_PATH = "@executable_path/../Frameworks"; - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = PSMTabBarControl; - SYMROOT = ../build; - }; - name = Release; - }; - C056398808A954F8003078D8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - PRODUCT_NAME = All; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - ZERO_LINK = YES; - }; - name = Debug; - }; - C056398908A954F8003078D8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - PRODUCT_NAME = All; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); - }; - name = Release; - }; - C056398C08A954F8003078D8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SYMROOT = ../build; - }; - name = Debug; - }; - C056398D08A954F8003078D8 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - PREBINDING = NO; - SYMROOT = ../build; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - C056397F08A954F8003078D8 /* Build configuration list for PBXNativeTarget "PSMTabBarControlFramework" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C056398008A954F8003078D8 /* Debug */, - C056398108A954F8003078D8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C056398708A954F8003078D8 /* Build configuration list for PBXAggregateTarget "All" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C056398808A954F8003078D8 /* Debug */, - C056398908A954F8003078D8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C056398B08A954F8003078D8 /* Build configuration list for PBXProject "PSMTabBarControl" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C056398C08A954F8003078D8 /* Debug */, - C056398D08A954F8003078D8 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0259C573FE90428111CA0C5A /* Project object */; -} diff --git a/src/MacVim/blur.h b/src/MacVim/blur.h deleted file mode 100644 index f5129dbf47..0000000000 --- a/src/MacVim/blur.h +++ /dev/null @@ -1,3 +0,0 @@ -#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) -# define BLUR_TRANSPARENCY -#endif diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m index dc6ab2549e..84f1c118eb 100644 --- a/src/MacVim/gui_macvim.m +++ b/src/MacVim/gui_macvim.m @@ -182,6 +182,10 @@ gui_macvim_after_fork_init() keyValid = YES; val = MMRendererCoreText; } + if (val != MMRendererDefault && val != MMRendererCoreText) { + // Migrate from the old value to the Core Text Renderer. + val = MMRendererCoreText; + } if (keyValid) { ASLogInfo(@"Use renderer=%ld", val); use_gui_macvim_draw_string = (val != MMRendererCoreText); @@ -2371,12 +2375,8 @@ gui_mch_post_balloon(beval, mesg) #endif // FEAT_BEVAL -#ifdef BLUR_TRANSPARENCY - void gui_macvim_set_blur(int radius) { [[MMBackend sharedInstance] setBlurRadius:radius]; } - -#endif // BLUR_TRANSPARENCY diff --git a/src/option.c b/src/option.c index ebbe2b276c..087cedeae1 100644 --- a/src/option.c +++ b/src/option.c @@ -657,11 +657,7 @@ static struct vimoption #endif {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, {"blurradius", "blur", P_NUM|P_VIM, -#ifdef BLUR_TRANSPARENCY (char_u *)&p_blur, PV_NONE, -#else - (char_u *)NULL, PV_NONE, -#endif {(char_u *)0L, (char_u *)0L} }, {"bomb", NULL, P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT, #ifdef FEAT_MBYTE @@ -8941,7 +8937,6 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags) } #endif -#ifdef BLUR_TRANSPARENCY else if (pp == &p_blur) { if (p_blur < 0) @@ -8954,7 +8949,6 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags) gui_macvim_set_blur(p_blur); } } -#endif else if (pp == &curbuf->b_p_tw) { diff --git a/src/option.h b/src/option.h index 3e605d984d..cce95c4411 100644 --- a/src/option.h +++ b/src/option.h @@ -870,9 +870,7 @@ EXTERN char_u *p_tsr; /* 'thesaurus' */ #ifdef FEAT_TRANSPARENCY EXTERN long p_transp; /* 'transparency' */ #endif -#ifdef BLUR_TRANSPARENCY EXTERN long p_blur; /* 'blurradius' */ -#endif EXTERN int p_ttimeout; /* 'ttimeout' */ EXTERN long p_ttm; /* 'ttimeoutlen' */ EXTERN int p_tbi; /* 'ttybuiltin' */ diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro index 90d7105db6..7281dd102d 100644 --- a/src/proto/gui_macvim.pro +++ b/src/proto/gui_macvim.pro @@ -208,10 +208,7 @@ void gui_macvim_update_modified_flag(); void gui_macvim_add_to_find_pboard(char_u *pat); void gui_macvim_set_antialias(int antialias); void gui_macvim_set_ligatures(int ligatures); - -#ifdef BLUR_TRANSPARENCY void gui_macvim_set_blur(int blur); -#endif int16_t odb_buffer_close(buf_T *buf); int16_t odb_post_buffer_write(buf_T *buf); diff --git a/src/vim.h b/src/vim.h index d52cffa17f..669726d6ac 100644 --- a/src/vim.h +++ b/src/vim.h @@ -1751,11 +1751,6 @@ typedef struct timeval proftime_T; typedef int proftime_T; /* dummy for function prototypes */ #endif -/* Needs to be before option.h, which uses BLUR_TRANSPARENCY */ -#ifdef FEAT_TRANSPARENCY -# include "MacVim/blur.h" -#endif - /* Include option.h before structs.h, because the number of window-local and * buffer-local options is used there. */ #include "option.h" /* options and default values */