Differences From Artifact [730550a384]:
- File
src/OFStdIOStream.m
— part of check-in
[3b43d51006]
at
2020-01-14 00:16:04
on branch trunk
— More consistent -[close] behavior
This means refusing to close twice, calling -[close] from -[dealloc] and
not calling -[cancelAsyncRequests].Calling -[cancelAsyncRequests] in -[close] is too dangerous, as -[close]
gets called by -[dealloc]: If the queue is the last reference to the
object, at the point where -[cancelAsyncRequests] removes it from the
queue, the object will start to deallocate and call into
-[cancelAsyncRequests] again, which is still in the middle of removing
it and now finds itself with an inconsistent state. (user: js, size: 7419) [annotate] [blame] [check-ins using] [more...]
To Artifact [d3ca10c178]:
- File src/OFStdIOStream.m — part of check-in [30d639a494] at 2020-05-21 17:58:14 on branch trunk — OFStdIOStream: Add support for setting fg/bg color (user: js, size: 8888) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #endif #ifdef HAVE_SYS_TTYCOM_H # include <sys/ttycom.h> #endif #import "OFStdIOStream.h" #import "OFStdIOStream+Private.h" #import "OFDate.h" #import "OFApplication.h" #ifdef OF_WINDOWS # include "OFWin32ConsoleStdIOStream.h" #endif #import "OFInitializationFailedException.h" | > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #endif #ifdef HAVE_SYS_TTYCOM_H # include <sys/ttycom.h> #endif #import "OFStdIOStream.h" #import "OFStdIOStream+Private.h" #import "OFColor.h" #import "OFDate.h" #import "OFApplication.h" #ifdef OF_WINDOWS # include "OFWin32ConsoleStdIOStream.h" #endif #import "OFInitializationFailedException.h" |
| ︙ | ︙ | |||
91 92 93 94 95 96 97 98 99 100 101 102 103 104 |
va_end(arguments);
[of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
date.microsecond / 1000, me, getpid(), msg];
objc_autoreleasePoolPop(pool);
}
@implementation OFStdIOStream
#ifndef OF_WINDOWS
+ (void)load
{
if (self != [OFStdIOStream class])
return;
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 |
va_end(arguments);
[of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
date.microsecond / 1000, me, getpid(), msg];
objc_autoreleasePoolPop(pool);
}
#ifdef HAVE_ISATTY
static int
colorToANSI(OFColor *color)
{
if ([color isEqual: [OFColor black]])
return 30;
if ([color isEqual: [OFColor maroon]])
return 31;
if ([color isEqual: [OFColor green]])
return 32;
if ([color isEqual: [OFColor olive]])
return 33;
if ([color isEqual: [OFColor navy]])
return 34;
if ([color isEqual: [OFColor purple]])
return 35;
if ([color isEqual: [OFColor teal]])
return 36;
if ([color isEqual: [OFColor silver]])
return 37;
if ([color isEqual: [OFColor grey]])
return 90;
if ([color isEqual: [OFColor red]])
return 91;
if ([color isEqual: [OFColor lime]])
return 92;
if ([color isEqual: [OFColor yellow]])
return 93;
if ([color isEqual: [OFColor blue]])
return 94;
if ([color isEqual: [OFColor fuchsia]])
return 95;
if ([color isEqual: [OFColor aqua]])
return 96;
if ([color isEqual: [OFColor white]])
return 97;
return -1;
}
#endif
@implementation OFStdIOStream
#ifndef OF_WINDOWS
+ (void)load
{
if (self != [OFStdIOStream class])
return;
|
| ︙ | ︙ | |||
366 367 368 369 370 371 372 373 | return -1; return ws.ws_row; #else return -1; #endif } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 |
return -1;
return ws.ws_row;
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
#ifdef HAVE_ISATTY
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code];
#endif
}
- (void)setBackgroundColor: (OFColor *)color
{
#ifdef HAVE_ISATTY
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code + 10];
#endif
}
- (void)resetColor
{
#ifdef HAVE_ISATTY
if (!isatty(_fd))
return;
[self writeString: @"\033[0m"];
#endif
}
@end
|