From 6e7f537850adbe63754125416ece758002a88ab2 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 19 Nov 2016 15:06:56 +0530
Subject: [PATCH] DRYer

---
 kitty/boss.py  |  2 +-
 kitty/parser.c | 41 ++++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/kitty/boss.py b/kitty/boss.py
index 833715fde..8ad4b5ec0 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -202,7 +202,7 @@ class Boss(Thread):
         if self.shutting_down:
             return
         try:
-            data = os.read(self.child_fd, io.DEFAULT_BUFFER_SIZE)
+            data = os.read(self.child_fd, 100 * io.DEFAULT_BUFFER_SIZE)
         except BlockingIOError:
             return
         except EnvironmentError:
diff --git a/kitty/parser.c b/kitty/parser.c
index 2ecee1261..4b9444873 100644
--- a/kitty/parser.c
+++ b/kitty/parser.c
@@ -512,30 +512,15 @@ HANDLER(dcs) {
 }
 // }}}
 
-PyObject*
-#ifdef DUMP_COMMANDS
-parse_bytes_dump(PyObject UNUSED *self, PyObject *args) {
-    PyObject *dump_callback = NULL;
-#else
-parse_bytes(PyObject UNUSED *self, PyObject *args) {
-#endif
-    Py_buffer pybuf;
-    Screen *screen;
-#ifdef DUMP_COMMANDS
-    if (!PyArg_ParseTuple(args, "OO!y*", &dump_callback, &Screen_Type, &screen, &pybuf)) return NULL;
-    if (!PyCallable_Check(dump_callback)) { PyErr_SetString(PyExc_TypeError, "The dump callback must be a callable object"); return NULL; }
-#else
-    if (!PyArg_ParseTuple(args, "O!y*", &Screen_Type, &screen, &pybuf)) return NULL;
-#endif
-    uint8_t *buf = pybuf.buf;
+static inline void _parse_bytes(Screen *screen, uint8_t *buf, Py_ssize_t len, PyObject UNUSED *dump_callback) {
     unsigned int i = 0;
 #ifdef DUMP_COMMANDS
-#define CALL_HANDLER(name) read_##name(screen, buf, pybuf.len, &i, dump_callback); break;
+#define CALL_HANDLER(name) read_##name(screen, buf, len, &i, dump_callback); break;
 #else
-#define CALL_HANDLER(name) read_##name(screen, buf, pybuf.len, &i); break;
+#define CALL_HANDLER(name) read_##name(screen, buf, len, &i); break;
 #endif
         
-    while (i < pybuf.len) {
+    while (i < len) {
         switch(screen->parser_state) {
             case ESC_STATE:
                 CALL_HANDLER(esc);
@@ -549,5 +534,23 @@ parse_bytes(PyObject UNUSED *self, PyObject *args) {
                 CALL_HANDLER(text);
         }
     }
+}
+
+PyObject*
+#ifdef DUMP_COMMANDS
+parse_bytes_dump(PyObject UNUSED *self, PyObject *args) {
+#else
+parse_bytes(PyObject UNUSED *self, PyObject *args) {
+#endif
+    PyObject *dump_callback = NULL;
+    Py_buffer pybuf;
+    Screen *screen;
+#ifdef DUMP_COMMANDS
+    if (!PyArg_ParseTuple(args, "OO!y*", &dump_callback, &Screen_Type, &screen, &pybuf)) return NULL;
+    if (!PyCallable_Check(dump_callback)) { PyErr_SetString(PyExc_TypeError, "The dump callback must be a callable object"); return NULL; }
+#else
+    if (!PyArg_ParseTuple(args, "O!y*", &Screen_Type, &screen, &pybuf)) return NULL;
+#endif
+    _parse_bytes(screen, pybuf.buf, pybuf.len, dump_callback);
     Py_RETURN_NONE;
 }