From e5675e9537cd7a0dfe54c10c857a0e63fd664662 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 10 Nov 2023 23:05:56 +0530
Subject: [PATCH] Simplify API

---
 kitty/screen.c    | 8 ++++----
 kitty/screen.h    | 2 +-
 kitty/vt-parser.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kitty/screen.c b/kitty/screen.c
index b114745f7..ae36373f3 100644
--- a/kitty/screen.c
+++ b/kitty/screen.c
@@ -691,8 +691,8 @@ draw_codepoint(Screen *self, char_type ch, bool from_input_stream) {
 }
 
 void
-screen_draw(Screen *self, uint32_t och, bool from_input_stream) {
-    draw_codepoint(self, och, from_input_stream);
+screen_draw(Screen *self, uint32_t och) {
+    draw_codepoint(self, och, true);
 }
 
 void
@@ -1855,7 +1855,7 @@ screen_repeat_character(Screen *self, unsigned int count) {
     if (self->last_graphic_char) {
         if (count == 0) count = 1;
         unsigned int num = MIN(count, CSI_REP_MAX_REPETITIONS);
-        while (num-- > 0) screen_draw(self, self->last_graphic_char, false);
+        while (num-- > 0) draw_codepoint(self, self->last_graphic_char, false);
     }
 }
 
@@ -3483,7 +3483,7 @@ draw(Screen *self, PyObject *src) {
     int kind = PyUnicode_KIND(src);
     void *buf = PyUnicode_DATA(src);
     Py_ssize_t sz = PyUnicode_GET_LENGTH(src);
-    for (Py_ssize_t i = 0; i < sz; i++) screen_draw(self, PyUnicode_READ(kind, buf, i), true);
+    for (Py_ssize_t i = 0; i < sz; i++) draw_codepoint(self, PyUnicode_READ(kind, buf, i), true);
     Py_RETURN_NONE;
 }
 
diff --git a/kitty/screen.h b/kitty/screen.h
index cd511bb04..502d8c23c 100644
--- a/kitty/screen.h
+++ b/kitty/screen.h
@@ -166,7 +166,7 @@ void screen_cursor_position(Screen*, unsigned int, unsigned int);
 void screen_cursor_back(Screen *self, unsigned int count/*=1*/, int move_direction/*=-1*/);
 void screen_erase_in_line(Screen *, unsigned int, bool);
 void screen_erase_in_display(Screen *, unsigned int, bool);
-void screen_draw(Screen *screen, uint32_t codepoint, bool);
+void screen_draw(Screen *screen, uint32_t codepoint);
 void screen_ensure_bounds(Screen *self, bool use_margins, bool cursor_was_within_margins);
 void screen_toggle_screen_buffer(Screen *self, bool, bool);
 void screen_normal_keypad_mode(Screen *self);
diff --git a/kitty/vt-parser.c b/kitty/vt-parser.c
index 06e923f8f..82964bad5 100644
--- a/kitty/vt-parser.c
+++ b/kitty/vt-parser.c
@@ -222,13 +222,13 @@ draw_byte(PS *self, const uint8_t b) {
     switch (decode_utf8(&self->utf8.state, &self->utf8.codep, b)) {
         case UTF8_ACCEPT:
             REPORT_DRAW(self->utf8.codep);
-            screen_draw(self->screen, self->utf8.codep, true);
+            screen_draw(self->screen, self->utf8.codep);
             break;
         case UTF8_REJECT: {
             bool prev_was_accept = self->utf8.prev == UTF8_ACCEPT;
             zero_at_ptr(&self->utf8);
             REPORT_DRAW(0xfffd);
-            screen_draw(self->screen, 0xfffd, true);
+            screen_draw(self->screen, 0xfffd);
             if (!prev_was_accept) {
                 draw_byte(self, b);
                 return;  // so that prev is correct
@@ -274,7 +274,7 @@ static void
 dispatch_printable_ascii(PS *self, const size_t sz) {
     for (const size_t limit = self->read.pos + sz; self->read.pos < limit; self->read.pos++) {
         REPORT_DRAW(self->buf[self->read.pos]);
-        screen_draw(self->screen, self->buf[self->read.pos], true);
+        screen_draw(self->screen, self->buf[self->read.pos]);
     }
 }