Skip to content

Fix WSL support: filter-out SI/SO in case of WSL #656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 5, 2023
Merged

Fix WSL support: filter-out SI/SO in case of WSL #656

merged 1 commit into from
Dec 5, 2023

Conversation

penguinolog
Copy link
Collaborator

Checklist
  • I've ensured that similar functionality has not already been implemented
  • I've ensured that similar functionality has not earlier been proposed and declined
  • I've branched off the master or python-dual-support branch
  • I've merged fresh upstream into my branch recently
  • I've ran tox successfully in local environment
  • I've included docstrings and/or documentation and/or examples for my code (if this is a new feature)

Fix: #264

@penguinolog penguinolog added bug Windows Windows support labels Oct 2, 2023
@penguinolog penguinolog requested review from wardi and ulidtko October 2, 2023 12:07
@coveralls
Copy link

coveralls commented Oct 2, 2023 •
edited
Loading

Pull Request Test Coverage Report for Build 7015530099

  • 2 of 4 (50.0%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.01%) to 74.15%
Changes Missing Coverage Covered Lines Changed/Added Lines %
urwid/raw_display.py 2 4 50.0%
Files with Coverage Reduction New Missed Lines %
urwid/raw_display.py 1 18.19%
Totals Coverage Status
Change from base Build 7015514000: -0.01%
Covered Lines: 7519
Relevant Lines: 10284
💛 - Coveralls

@wardi
Copy link
Collaborator

wardi commented Oct 2, 2023

IIRC SO/SI are used for some graphics characters when not in UTF-8 mode:
https://github.com/urwid/urwid/blob/671ba131114cf86e79ebf76cd10d01c553e6054a/urwid/escape.py#L47C1-L47C55

instead of stripping these control characters at the last minute it's probably better to disable all the graphics character handling before sending it to the screen (graphics all get converted to ? or some other placeholder on WSL)

@penguinolog
Copy link
Collaborator Author

penguinolog commented Nov 27, 2023 •
edited
Loading

IIRC SO/SI are used for some graphics characters when not in UTF-8 mode:
https://github.com/urwid/urwid/blob/671ba131114cf86e79ebf76cd10d01c553e6054a/urwid/escape.py#L47C1-L47C55

instead of stripping these control characters at the last minute it's probably better to disable all the graphics character handling before sending it to the screen (graphics all get converted to ? or some other placeholder on WSL)

WSL is in UTF8. I validated on real windows.
All characters displayed correctly (added also Cyrillic raw as sample):

image_2023-11-27_10-52-37.png

@penguinolog
Copy link
Collaborator Author

rebased from latest master

@penguinolog
Copy link
Collaborator Author

Validated that changes are not needed for curses display under WSL

@penguinolog penguinolog merged commit 09f6c3b into urwid:master Dec 5, 2023
@penguinolog penguinolog deleted the wsl_fix branch December 5, 2023 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wardi wardi Awaiting requested review from wardi

@ulidtko ulidtko Awaiting requested review from ulidtko

Assignees
No one assigned
Labels
bug Windows Windows support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

urwid WSL alignment and symbols
3 participants
@penguinolog @coveralls @wardi