From 8d3053bd93db2e976f49a3a32038712083d411a7 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Sun, 29 May 2011 00:35:11 +0200
Subject: =?UTF-8?q?fixes=20#2164.=20Restore=20multiline=20messages=20on=20?=
 =?UTF-8?q?paste=20of=20big=20text.=20That=E2=80=99s=20now=20faster=20and?=
 =?UTF-8?q?=20works=20~100%=20of=20the=20time=20(no=20more=20message=20cut?=
 =?UTF-8?q?=20in=20two=20part=20for=20no=20reason,=20I=20think)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core.py | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'src/core.py')

diff --git a/src/core.py b/src/core.py
index 14cb4857..f4cca7e3 100644
--- a/src/core.py
+++ b/src/core.py
@@ -670,23 +670,31 @@ class Core(object):
         """
         # curses.ungetch(0)    # FIXME
         while self.running:
-            char = self.read_keyboard()
+            char_list = self.read_keyboard()
             # Special case for M-x where x is a number
-            if char.startswith('M-') and len(char) == 3:
-                try:
-                    nb = int(char[2])
-                except ValueError:
-                    pass
-                else:
-                    if self.current_tab().nb == nb:
-                        self.go_to_previous_tab()
+            if len(char_list) == 1:
+                char = char_list[0]
+                if char.startswith('M-') and len(char) == 3:
+                    try:
+                        nb = int(char[2])
+                    except ValueError:
+                        pass
                     else:
-                        self.command_win('%d' % nb)
-            # search for keyboard shortcut
-            if char in self.key_func:
-                self.key_func[char]()
+                        if self.current_tab().nb == nb:
+                            self.go_to_previous_tab()
+                        else:
+                            self.command_win('%d' % nb)
+                    # search for keyboard shortcut
+                if char in self.key_func:
+                    self.key_func[char]()
+                else:
+                    res = self.do_command(char)
+                    if res:
+                        self.refresh_window()
             else:
-                self.do_command(char)
+                for char in char_list:
+                    self.do_command(char)
+                self.refresh_window()
             self.doupdate()
 
     def current_tab(self):
@@ -1419,9 +1427,7 @@ class Core(object):
     def do_command(self, key):
         if not key:
             return
-        res = self.current_tab().on_input(key)
-        if res:
-            self.refresh_window()
+        return self.current_tab().on_input(key)
 
     def on_roster_enter_key(self, roster_row):
         """
-- 
cgit v1.2.3