Changeset 1515
- Timestamp:
- 08/21/04 13:45:31 (4 years ago)
- Files:
-
- WiredClient/trunk/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
- WiredClient/trunk/English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
- WiredClient/trunk/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
- WiredClient/trunk/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
- WiredClient/trunk/WCMain.h (modified) (2 diffs)
- WiredClient/trunk/WCMain.m (modified) (4 diffs)
- WiredClient/trunk/WiredClient.xcode/project.pbxproj (modified) (3 diffs)
- WiredClient/trunk/prefix.pch (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
WiredClient/trunk/English.lproj/MainMenu.nib/classes.nib
r1382 r1515 65 65 "_deleteMenuItem" = NSMenuItem; 66 66 "_disconnectMenuItem" = NSMenuItem; 67 "_exceptionPanel" = NSPanel; 68 "_exceptionTextView" = NSTextView; 67 69 "_filesMenu" = NSMenu; 68 70 "_filesMenuItem" = NSMenuItem; WiredClient/trunk/English.lproj/MainMenu.nib/info.nib
r1382 r1515 4 4 <dict> 5 5 <key>IBDocumentLocation</key> 6 <string> 789 372412 357 0 0 1280 1002 </string>6 <string>395 406 412 357 0 0 1280 1002 </string> 7 7 <key>IBEditorPositions</key> 8 8 <dict> … … 18 18 <key>IBOpenObjects</key> 19 19 <array> 20 <integer>701</integer> 20 21 <integer>29</integer> 21 22 </array> 22 23 <key>IBSystem Version</key> 23 <string>7 H63</string>24 <string>7M34</string> 24 25 </dict> 25 26 </plist> WiredClient/trunk/WCMain.h
r1383 r1515 1 /* $Id: WCMain.h,v 1.1 0 2004/07/28 08:00:26morris Exp $ */1 /* $Id: WCMain.h,v 1.11 2004/08/21 11:45:08 morris Exp $ */ 2 2 3 3 /* … … 73 73 IBOutlet NSProgressIndicator *_progressIndicator; 74 74 75 IBOutlet NSPanel *_exceptionPanel; 76 IBOutlet NSTextView *_exceptionTextView; 77 75 78 unsigned int _connections; 76 79 WCConnection *_connection; WiredClient/trunk/WCMain.m
r1505 r1515 1 /* $Id: WCMain.m,v 1. 39 2004/08/16 17:38:18 morris Exp $ */1 /* $Id: WCMain.m,v 1.40 2004/08/21 11:45:08 morris Exp $ */ 2 2 3 3 /* … … 96 96 kCFCoreFoundationVersionNumber, 97 97 NSAppKitVersionNumber]; 98 99 // --- set exception handler 100 [[NSExceptionHandler defaultExceptionHandler] setExceptionHandlingMask:NSLogAndHandleEveryExceptionMask]; 101 [[NSExceptionHandler defaultExceptionHandler] setDelegate:self]; 98 102 99 103 // --- subscribe to these … … 274 278 postNotificationName:WCApplicationDidChangeStatus 275 279 object:NULL]; 280 } 281 282 283 284 - (BOOL)exceptionHandler:(NSExceptionHandler *)exceptionHandler shouldLogException:(NSException *)exception mask:(unsigned int)mask { 285 NSString *trace, *command; 286 FILE *fp; 287 char buffer[BUFSIZ]; 288 int n; 289 290 trace = [[exception userInfo] objectForKey:NSStackTraceKey]; 291 292 if(trace) { 293 command = [NSString stringWithFormat:@"/usr/bin/atos -p %d %@ | cat -n", 294 getpid(), trace]; 295 fp = popen([command UTF8String], "r"); 296 297 if(fp) { 298 [_exceptionTextView setFont:[NSFont fontWithName:@"Monaco" size:9.0]]; 299 [_exceptionTextView setString:[NSString stringWithFormat: 300 @"%@: %@\n\nStack trace:\n", 301 [exception name], 302 [exception reason]]]; 303 304 while((n = fread(buffer, 1, sizeof(buffer), fp))) { 305 [[[_exceptionTextView textStorage] mutableString] 306 appendString:[NSString stringWithCString:buffer length:n]]; 307 } 308 309 [_exceptionPanel center]; 310 [_exceptionPanel makeKeyAndOrderFront:self]; 311 312 pclose(fp); 313 } 314 } 315 316 return YES; 276 317 } 277 318 … … 699 740 - (IBAction)connect:(id)sender { 700 741 [self showConnect:NULL]; 742 743 NSArray *array = [NSArray array]; 744 [array objectAtIndex:5]; 701 745 } 702 746 WiredClient/trunk/WiredClient.xcode/project.pbxproj
r1497 r1515 10 10 1058C7A1FEA54F0111CA2CBB, 11 11 A509AD1105F7FBFF00E6AE2D, 12 A5D4F27F06D75DA4002A33D0, 12 13 ); 13 14 isa = PBXGroup; … … 571 572 8D11072F0486CEB800E47090, 572 573 A509AD1205F7FBFF00E6AE2D, 574 A5D4F28006D75DA4002A33D0, 573 575 ); 574 576 isa = PBXFrameworksBuildPhase; … … 1917 1919 targetProxy = A5D4EF0006CD3A58002A33D0; 1918 1920 }; 1921 A5D4F27F06D75DA4002A33D0 = { 1922 isa = PBXFileReference; 1923 lastKnownFileType = wrapper.framework; 1924 name = ExceptionHandling.framework; 1925 path = /System/Library/Frameworks/ExceptionHandling.framework; 1926 refType = 0; 1927 sourceTree = "<absolute>"; 1928 }; 1929 A5D4F28006D75DA4002A33D0 = { 1930 fileRef = A5D4F27F06D75DA4002A33D0; 1931 isa = PBXBuildFile; 1932 settings = { 1933 }; 1934 }; 1919 1935 A5DC7E2A057AA99B00736BBF = { 1920 1936 buildActionMask = 2147483647; WiredClient/trunk/prefix.pch
r1206 r1515 1 /* $Id: prefix.pch,v 1. 3 2004/05/17 16:46:32morris Exp $ */1 /* $Id: prefix.pch,v 1.4 2004/08/21 11:45:08 morris Exp $ */ 2 2 3 3 /* … … 31 31 #import <Carbon/Carbon.h> 32 32 #import <Cocoa/Cocoa.h> 33 #import <ExceptionHandling/NSExceptionHandler.h> 33 34 34 35 #import <sys/types.h> … … 48 49 #import <openssl/ssl.h> 49 50 50 #define NSStrikethroughStyleAttributeName @"NSStrikethrough"51 #define NSCursorAttributeName @"NSCursor"51 #define NSStrikethroughStyleAttributeName @"NSStrikethrough" 52 #define NSCursorAttributeName @"NSCursor"
