From a7f1893834d79678b3aea9c376e936e854eeb4c4 Mon Sep 17 00:00:00 2001
From: Will <will@mon.im>
Date: Wed, 15 Jul 2020 15:18:28 +1000
Subject: [PATCH 1/2] Handle colours in menu item names

---
 consolemenu/menu_component.py | 7 ++++---
 requirements.txt              | 1 +
 setup.py                      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/consolemenu/menu_component.py b/consolemenu/menu_component.py
index 09e0205..79dbbf0 100644
--- a/consolemenu/menu_component.py
+++ b/consolemenu/menu_component.py
@@ -1,4 +1,4 @@
-import textwrap
+import ansiwrap
 
 from consolemenu.format import MenuStyle
 
@@ -187,11 +187,12 @@ def _alignment_char(align):
             return '<'
 
     def _format_content(self, content='', align='left'):
+        invisible_chars = len(content) - ansiwrap.ansilen(content)
         return '{lp}{text:{al}{width}}{rp}'.format(lp=' ' * self.padding.left,
                                                    rp=' ' * self.padding.right,
                                                    text=content, al=self._alignment_char(align),
                                                    width=(self.calculate_border_width() - self.padding.left -
-                                                          self.padding.right - 2))
+                                                          self.padding.right - 2 + invisible_chars))
 
 
 class MenuHeader(MenuComponent):
@@ -247,7 +248,7 @@ def generate(self):
         for x in range(0, self.padding.top):
             yield self.row()
         if self.text is not None and self.text != '':
-            for line in textwrap.wrap(self.text, width=self.calculate_content_width()):
+            for line in ansiwrap.wrap(self.text, width=self.calculate_content_width()):
                 yield self.row(content=line, align=self.text_align)
         for x in range(0, self.padding.bottom):
             yield self.row()
diff --git a/requirements.txt b/requirements.txt
index 7fa295b..89dedd4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ pycodestyle>=2.3.1
 pytest>=2.8.7
 six
 mock
+ansiwrap
diff --git a/setup.py b/setup.py
index e2ac61a..b9a25ee 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def read(*filenames, **kwargs):
     description='A simple console menu system',
     long_description=read("README.rst", "CHANGELOG.rst"),
     packages=find_packages(),
-    install_requires=['six'],
+    install_requires=['six', 'ansiwrap'],
     # setup_requires=['pytest-runner'],
     # tests_require=['tox'],
     # cmdclass={'test': Tox},

From cb554350e213d7193e494df9655e9f3be78cb931 Mon Sep 17 00:00:00 2001
From: Will <will@mon.im>
Date: Mon, 20 Jul 2020 16:27:51 +1000
Subject: [PATCH 2/2] Gracefully handle Ctrl+D (EOF) to exit menu

---
 consolemenu/console_menu.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/consolemenu/console_menu.py b/consolemenu/console_menu.py
index 487364b..e8d5fdc 100644
--- a/consolemenu/console_menu.py
+++ b/consolemenu/console_menu.py
@@ -303,7 +303,12 @@ def process_user_input(self):
         """
         Gets the next single character and decides what to do with it
         """
-        user_input = self.get_input()
+
+        try:
+            user_input = self.get_input()
+        except EOFError:
+            self.should_exit = True
+            return
 
         try:
             num = int(user_input)