From 38d59d25c224fa62f0c1bbc158fbbf9c23c7dcd2 Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl Date: Thu, 7 Dec 2023 12:00:00 +0100 Subject: [PATCH] Setup the terminal and convert to/from ISO-8859-1 if setup by the user Signed-off-by: Bernhard Kaindl --- XSConsoleCurses.py | 54 ++++++++++++++++++++++++++++++++++++++++------ XSConsoleLang.py | 7 +++--- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/XSConsoleCurses.py b/XSConsoleCurses.py index 367cc3a..b64bfc1 100644 --- a/XSConsoleCurses.py +++ b/XSConsoleCurses.py @@ -13,13 +13,19 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import curses, sys +import curses +import locale +import sys from XSConsoleBases import * from XSConsoleConfig import * from XSConsoleLang import * from XSConsoleState import * + +class Terminal: + charset_encoding = "utf-8" # global: Charset encoding of the terminal: We encode to/from this charset + class CursesPalette: pairIndex = 1 colours = {} @@ -174,10 +180,19 @@ def ClippedAddStr(self, inString, inX, inY, inColour): # Internal use if len(clippedStr) > 0: try: encodedStr = clippedStr - if not isinstance(clippedStr, str): - encodedStr = convert_anything_to_str(clippedStr) + if sys.version_info >= (3, 0) and isinstance(clippedStr, str): + # encode the string into bytes using the terminal's charset encoding + encodedStr = clippedStr.encode(Terminal.charset_encoding) + elif not isinstance(encodedStr, str): + # encode the Python2 unicode string into bytes using the terminal's charset encoding: + encodedStr = convert_anything_to_str(clippedStr, Terminal.charset_encoding) # Clear field here since addstr will clear len(encodedStr)-len(clippedStr) too few spaces - self.win.addstr(inY, xPos, len(clippedStr)*' ', CursesPalette.ColourAttr(FirstValue(inColour, self.defaultColour))) + self.win.addstr( + inY, + xPos, + " " * len(encodedStr), + CursesPalette.ColourAttr(FirstValue(inColour, self.defaultColour)), + ) self.win.refresh() self.win.addstr(inY, xPos, encodedStr, CursesPalette.ColourAttr(FirstValue(inColour, self.defaultColour))) except Exception as e: @@ -277,12 +292,13 @@ def Snapshot(self): retVal = [] if self.title != "": retVal.append(self.title) + # When reading bytes from the termial, decode the input bytes in the Terinal's charset encoding to str: if self.hasBox: for i in range(1, self.ySize - 1): - retVal.append(convert_anything_to_str(self.win.instr(i, 1, self.xSize - 2))) # instr() -> bytes -> str + retVal.append(convert_anything_to_str(self.win.instr(i, 1, self.xSize - 2), Terminal.charset_encoding)) else: for i in range(self.ySize): - retVal.append(convert_anything_to_str(self.win.instr(i, 0, self.xSize))) # win.instr() -> bytes -> str + retVal.append(convert_anything_to_str(self.win.instr(i, 0, self.xSize), Terminal.charset_encoding)) return retVal @@ -305,9 +321,35 @@ def Delete(self): class CursesScreen(CursesPane): def __init__(self): + # Set the locale for all categories to the user's default settings (specified in the + # LANG and LC_* environment variables) and get the user's preferred charset encoding: + # Needed by python2-curses to support more of UTF-8 than just lower-case latin chars: + + preferred_charset_encoding_by_user = locale.getpreferredencoding() + if preferred_charset_encoding_by_user != "UTF-8": + locale.setlocale(locale.LC_ALL, 'en_US') + else: + locale.setlocale(locale.LC_ALL, "") self.win = curses.initscr() + # XTerm (and it's the clones, that's nearly all major other terminal emuluations) + # follows the ISO 2022 standard for character set switching. Traditionally, xsconsole + # switched XTerm-compatibles unto ISO-8859-1 mode, which is not a perfect match for + # Xen-API names which are exclusively UTF-8. Default to UTF-8 mode, unless the users's + # locale charset environment is configured to use an ISO-8809-1 or -15(1 plus Euro sign): + + if preferred_charset_encoding_by_user in ("ISO-8859-1", "ISO-8859-15"): + sys.stdout.write("\033%@") # Put the terminal into ISO 8859-1 mode + Terminal.charset_encoding = preferred_charset_encoding_by_user + else: + sys.stdout.write("\033%G") # Put the terminal into UTF-8 mode (default enconding) + Terminal.charset_encoding = "utf-8" + + # Helpful for clarity when debugging: + # self.win.addstr(Terminal.charset_encoding) + # self.win.refresh() + (ySize, xSize) = self.win.getmaxyx() CursesPane.__init__(self, 0, 0, xSize, ySize, 0, 0) curses.noecho() diff --git a/XSConsoleLang.py b/XSConsoleLang.py index bffabe9..0ee5d2b 100644 --- a/XSConsoleLang.py +++ b/XSConsoleLang.py @@ -27,7 +27,7 @@ text_type = unicode # pyright:ignore[reportUndefinedVariable] # pylint: disable=unicode-builtin -def convert_anything_to_str(arg): +def convert_anything_to_str(arg, encoding="utf-8"): """Converts anything into the native "str" type of the Python version, without u'str' or b'str'""" if arg is None or isinstance(arg, str): return arg # Already str or None (checked by some callers), return it as-is: @@ -36,10 +36,9 @@ def convert_anything_to_str(arg): if isinstance(arg, (text_type, bytes)): if sys.version_info > (3, 0): # Python3: Decode UTF-8 bytes into the native Python3 Unicode string: - return arg.decode("utf-8") + return arg.decode(encoding) else: - # Python2: Encode the unicode text into the stream of UTF-8 bytes: - return arg.encode("utf-8") + return arg.encode(encoding) # Not string-like (a number or object): Get a "str" of it using str(arg): return str(arg)