Skip to content

Commit

Permalink
Merge v2 in
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnachman
gnachman committed May 6, 2013
2 parents 47d3a88 + dcc988f commit 094bdea
Show file tree
Hide file tree
Showing 29 changed files with 928 additions and 575 deletions.
72 changes: 57 additions & 15 deletions English.lproj/MainMenu.xib
View file
Expand Up @@ -272,7 +272,7 @@
</object>
<object class="NSMenuItem" id="39047848">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">New Tab (Default Profile)</string>
<string key="NSTitle">New Tab</string>
<string key="NSKeyEquiv">t</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand All @@ -281,7 +281,7 @@
</object>
<object class="NSMenuItem" id="813546322">
<reference key="NSMenu" ref="360861402"/>
<string key="NSTitle">New Tab (Current Profile)</string>
<string key="NSTitle">New Tab with Current Profile</string>
<string key="NSKeyEquiv">T</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -1110,7 +1110,7 @@
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="640558134">
<reference key="NSMenu" ref="203853260"/>
<string key="NSTitle">Show Toolbar</string>
<string key="NSTitle">Toggle Toolbar</string>
<string key="NSKeyEquiv">t</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
Expand Down Expand Up @@ -1731,14 +1731,15 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="813030389">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="198376688">
<reference key="NSNextResponder" ref="813030389"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{211, 117}, {90, 27}}</string>
<reference key="NSSuperview" ref="813030389"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="949675429"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="26136141">
Expand Down Expand Up @@ -1785,7 +1786,8 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{165, 92}</string>
<reference key="NSSuperview" ref="829948544"/>
<reference key="NSNextKeyView" ref="770850232"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<object class="NSTextContainer" key="NSTextContainer" id="700346087">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
Expand All @@ -1805,7 +1807,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67111781</int>
<int key="NSFlags">2917</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="178467331"/>
Expand Down Expand Up @@ -1836,6 +1838,7 @@
</array>
<string key="NSFrameSize">{165, 92}</string>
<reference key="NSSuperview" ref="949675429"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="637673380"/>
<reference key="NSDocView" ref="637673380"/>
<reference key="NSBGColor" ref="178467331"/>
Expand Down Expand Up @@ -1870,6 +1873,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 54}}</string>
<reference key="NSSuperview" ref="949675429"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="607292965"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
Expand All @@ -1882,6 +1886,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="949675429"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="829948544"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
Expand All @@ -1893,7 +1898,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</array>
<string key="NSFrame">{{169, 20}, {165, 92}}</string>
<reference key="NSSuperview" ref="813030389"/>
<reference key="NSNextKeyView" ref="829948544"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="770850232"/>
<int key="NSsFlags">133120</int>
<reference key="NSVScroller" ref="770850232"/>
<reference key="NSHScroller" ref="607292965"/>
Expand All @@ -1915,6 +1921,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</set>
<string key="NSFrame">{{20, 32}, {128, 128}}</string>
<reference key="NSSuperview" ref="813030389"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="198376688"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="423045545">
Expand All @@ -1934,6 +1941,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</array>
<string key="NSFrameSize">{354, 164}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="174023371"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
Expand Down Expand Up @@ -3025,14 +3034,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<int key="connectionID">1475</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">toggleToolbar</string>
<reference key="source" ref="608955146"/>
<reference key="destination" ref="640558134"/>
</object>
<int key="connectionID">1481</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">pasteFaster:</string>
Expand Down Expand Up @@ -4825,6 +4826,47 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSDocument</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="printDocument:">id</string>
<string key="revertDocumentToSaved:">id</string>
<string key="runPageLayout:">id</string>
<string key="saveDocument:">id</string>
<string key="saveDocumentAs:">id</string>
<string key="saveDocumentTo:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="printDocument:">
<string key="name">printDocument:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="revertDocumentToSaved:">
<string key="name">revertDocumentToSaved:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="runPageLayout:">
<string key="name">runPageLayout:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="saveDocument:">
<string key="name">saveDocument:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="saveDocumentAs:">
<string key="name">saveDocumentAs:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="saveDocumentTo:">
<string key="name">saveDocumentTo:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSDocument.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">PTYTextView</string>
<string key="superclassName">NSView</string>
Expand Down
2 changes: 1 addition & 1 deletion English.lproj/PreferencePanel.xib
View file
Expand Up @@ -10066,7 +10066,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="896498167">
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<int key="NSCellFlags2">306185216</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="599268235"/>
Expand Down
19 changes: 19 additions & 0 deletions FutureMethods.h
View file
Expand Up @@ -48,6 +48,25 @@

#endif

// From proc_info.h, available on 10.7 and 10.8 only.
#define FUTURE_PROC_PIDT_SHORTBSDINFO 13
#define FUTURE_MAXCOMLEN 16
struct future_proc_bsdshortinfo {
uint32_t pbsi_pid; /* process id */
uint32_t pbsi_ppid; /* process parent id */
uint32_t pbsi_pgid; /* process perp id */
int32_t pbsi_status; /* p_stat value, SZOMB, SRUN, etc */
char pbsi_comm[FUTURE_MAXCOMLEN]; /* upto 16 characters of process name */
uint32_t pbsi_flags; /* 64bit; emulated etc */
uid_t pbsi_uid; /* current uid on process */
gid_t pbsi_gid; /* current gid on process */
uid_t pbsi_ruid; /* current ruid on process */
gid_t pbsi_rgid; /* current tgid on process */
uid_t pbsi_svuid; /* current svuid on process */
gid_t pbsi_svgid; /* current svgid on process */
uint32_t pbsi_rfu; /* reserved for future use*/
};

extern const int FutureNSWindowCollectionBehaviorStationary;

@interface NSView (Future)
Expand Down

0 comments on commit 094bdea

Please sign in to comment.