Differences From Artifact [88e2ee5d8c]:
- File
src/OFWin32ConsoleStdIOStream.m
— part of check-in
[77bf56450b]
at
2020-05-17 10:42:49
on branch trunk
— OFWin32ConsoleStdIOStream: Use +[isWindowsNT]
This avoids the needless call to the W function first. This is safe to
do, as it's clear there won't ever be a non-NT Windows that supports
Unicode. (user: js, size: 11405) [annotate] [blame] [check-ins using]
To Artifact [c0629570e4]:
- File src/OFWin32ConsoleStdIOStream.m — part of check-in [40f58c637b] at 2020-05-24 15:54:16 on branch trunk — Add terminal control methods for Windows (user: js, size: 14837) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 | #include "config.h" #include <assert.h> #include <errno.h> #include <io.h> #import "OFWin32ConsoleStdIOStream.h" #import "OFData.h" #import "OFStdIOStream+Private.h" #import "OFString.h" #import "OFSystemInfo.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" | > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | #include "config.h" #include <assert.h> #include <errno.h> #include <io.h> #import "OFWin32ConsoleStdIOStream.h" #import "OFColor.h" #import "OFData.h" #import "OFStdIOStream+Private.h" #import "OFString.h" #import "OFSystemInfo.h" #import "OFInvalidArgumentException.h" #import "OFInvalidEncodingException.h" |
︙ | ︙ | |||
101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | - (instancetype)of_initWithFileDescriptor: (int)fd { self = [super of_initWithFileDescriptor: fd]; @try { DWORD mode; _handle = (HANDLE)_get_osfhandle(fd); if (_handle == INVALID_HANDLE_VALUE) @throw [OFInvalidArgumentException exception]; /* Not a console: Treat it as a regular OFStdIOStream */ if (!GetConsoleMode(_handle, &mode)) object_setClass(self, [OFStdIOStream class]); } @catch (id e) { [self release]; @throw e; } return self; } | > > > > | 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 | - (instancetype)of_initWithFileDescriptor: (int)fd { self = [super of_initWithFileDescriptor: fd]; @try { DWORD mode; CONSOLE_SCREEN_BUFFER_INFO csbi; _handle = (HANDLE)_get_osfhandle(fd); if (_handle == INVALID_HANDLE_VALUE) @throw [OFInvalidArgumentException exception]; /* Not a console: Treat it as a regular OFStdIOStream */ if (!GetConsoleMode(_handle, &mode)) object_setClass(self, [OFStdIOStream class]); if (GetConsoleScreenBufferInfo(_handle, &csbi)) _attributes = csbi.wAttributes; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
446 447 448 449 450 451 452 453 | /* * We do not count in bytes when writing to the Win32 console. But * since any incomplete write is an exception here anyway, we can just * return length. */ return length; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 | /* * We do not count in bytes when writing to the Win32 console. But * since any incomplete write is an exception here anyway, we can just * return length. */ return length; } - (int)columns { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return -1; return csbi.dwSize.X; } - (int)rows { /* * The buffer size returned is almost always larger than the window * size, so this is useless. */ return -1; } - (void)setForegroundColor: (OFColor *)color { CONSOLE_SCREEN_BUFFER_INFO csbi; float red, green, blue; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.wAttributes &= ~(FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY); [color getRed: &red green: &green blue: &blue alpha: NULL]; if (red >= 0.25) csbi.wAttributes |= FOREGROUND_RED; if (green >= 0.25) csbi.wAttributes |= FOREGROUND_GREEN; if (blue >= 0.25) csbi.wAttributes |= FOREGROUND_BLUE; if (red >= 0.75 || green >= 0.75 || blue >= 0.75) csbi.wAttributes |= FOREGROUND_INTENSITY; SetConsoleTextAttribute(_handle, csbi.wAttributes); } - (void)setBackgroundColor: (OFColor *)color { CONSOLE_SCREEN_BUFFER_INFO csbi; float red, green, blue; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.wAttributes &= ~(BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_INTENSITY); [color getRed: &red green: &green blue: &blue alpha: NULL]; if (red >= 0.25) csbi.wAttributes |= BACKGROUND_RED; if (green >= 0.25) csbi.wAttributes |= BACKGROUND_GREEN; if (blue >= 0.25) csbi.wAttributes |= BACKGROUND_BLUE; if (red >= 0.75 || green >= 0.75 || blue >= 0.75) csbi.wAttributes |= BACKGROUND_INTENSITY; SetConsoleTextAttribute(_handle, csbi.wAttributes); } - (void)reset { SetConsoleTextAttribute(_handle, _attributes); } - (void)clear { static COORD zero = { 0, 0 }; CONSOLE_SCREEN_BUFFER_INFO csbi; DWORD bytesWritten; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; if (!FillConsoleOutputCharacter(_handle, ' ', csbi.dwSize.X * csbi.dwSize.Y, zero, &bytesWritten)) return; if (!FillConsoleOutputAttribute(_handle, csbi.wAttributes, csbi.dwSize.X * csbi.dwSize.Y, zero, &bytesWritten)) return; SetConsoleCursorPosition(_handle, zero); } - (void)eraseLine { CONSOLE_SCREEN_BUFFER_INFO csbi; DWORD bytesWritten; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.dwCursorPosition.X = 0; if (!FillConsoleOutputCharacter(_handle, ' ', csbi.dwSize.X, csbi.dwCursorPosition, &bytesWritten)) return; FillConsoleOutputAttribute(_handle, csbi.wAttributes, csbi.dwSize.X, csbi.dwCursorPosition, &bytesWritten); } - (void)setCursorColumn: (unsigned int)column { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.dwCursorPosition.X = column; SetConsoleCursorPosition(_handle, csbi.dwCursorPosition); } - (void)setCursorPosition: (of_point_t)position { if (position.x < 0 || position.y < 0) @throw [OFInvalidArgumentException exception]; SetConsoleCursorPosition(_handle, (COORD){ position.x, position.y }); } - (void)setRelativeCursorPosition: (of_point_t)position { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.dwCursorPosition.X += position.x; csbi.dwCursorPosition.Y += position.y; SetConsoleCursorPosition(_handle, csbi.dwCursorPosition); } @end |