Overview
| Comment: | Fix build on AmigaOS and devkitPro |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f3aa57bcc6fb4723fa6a024e3207d643 |
| User & Date: | js on 2020-05-22 22:25:44 |
| Other Links: | manifest | tags |
Context
|
2020-05-23
| ||
| 16:50 | .gitignore: Add .fslckout and _FOSSIL_ check-in: 3b9d093715 user: js tags: trunk | |
|
2020-05-22
| ||
| 22:25 | Fix build on AmigaOS and devkitPro check-in: f3aa57bcc6 user: js tags: trunk | |
| 02:28 | OFCharacterSet: Better singleton initialization check-in: ca8c67fb83 user: js tags: trunk | |
Changes
Modified src/OFStdIOStream.m from [8f827abbc3] to [a1f25bd1bf].
| ︙ | ︙ | |||
93 94 95 96 97 98 99 | [of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString, date.microsecond / 1000, me, getpid(), msg]; objc_autoreleasePoolPop(pool); } | | | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 |
[of_stderr writeFormat: @"[%@.%03d %@(%d)] %@\n", dateString,
date.microsecond / 1000, me, getpid(), msg];
objc_autoreleasePoolPop(pool);
}
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
static int
colorToANSI(OFColor *color)
{
if ([color isEqual: [OFColor black]])
return 30;
if ([color isEqual: [OFColor maroon]])
return 31;
|
| ︙ | ︙ | |||
411 412 413 414 415 416 417 |
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
| | | | | | | | | | 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 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 |
#else
return -1;
#endif
}
- (void)setForegroundColor: (OFColor *)color
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code];
#endif
}
- (void)setBackgroundColor: (OFColor *)color
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
int code;
if (!isatty(_fd))
return;
if ((code = colorToANSI(color)) == -1)
return;
[self writeFormat: @"\033[%um", code + 10];
#endif
}
- (void)reset
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
[self writeString: @"\033[0m"];
#endif
}
- (void)clear
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
[self writeString: @"\033[2J"];
#endif
}
- (void)eraseLine
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
[self writeString: @"\033[2K"];
#endif
}
- (void)setCursorColumn: (unsigned int)column
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
[self writeFormat: @"\033[%uG", column + 1];
#endif
}
- (void)setCursorPosition: (of_point_t)position
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
[self writeFormat: @"\033[%u;%uH",
(unsigned)position.y + 1, (unsigned)position.x + 1];
#endif
}
- (void)setRelativeCursorPosition: (of_point_t)position
{
#if defined(HAVE_ISATTY) && !defined(OF_AMIGAOS)
if (!isatty(_fd))
return;
if (position.x > 0)
[self writeFormat: @"\033[%uC", (unsigned)position.x];
else if (position.x < 0)
[self writeFormat: @"\033[%uD", (unsigned)-position.x];
|
| ︙ | ︙ |
Modified tests/TestsAppDelegate.m from [eb5fcaa32b] to [c6d20d4842].
| ︙ | ︙ | |||
143 144 145 146 147 148 149 |
#if defined(OF_WII) || defined(OF_PSP) || defined(OF_NINTENDO_DS) || \
defined(OF_NINTENDO_3DS)
@try {
return of_application_main(&argc, &argv,
[[TestsAppDelegate alloc] init]);
} @catch (id e) {
| < < | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 |
#if defined(OF_WII) || defined(OF_PSP) || defined(OF_NINTENDO_DS) || \
defined(OF_NINTENDO_3DS)
@try {
return of_application_main(&argc, &argv,
[[TestsAppDelegate alloc] init]);
} @catch (id e) {
OFString *string = [OFString stringWithFormat:
@"\nRuntime error: Unhandled exception:\n%@\n", e];
OFString *backtrace = [OFString stringWithFormat:
@"\nBacktrace:\n %@\n\n",
[[e backtrace] componentsJoinedByString: @"\n "]];
of_stdout.foregroundColor = [OFColor red];
|
| ︙ | ︙ |