screen: remove prepare/render callbacks

Again, some leftovers from kmscon. There's no reason to provide these
callbacks. Users can just call the, before/after calling into TSM.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

diff --git a/src/libtsm.h b/src/libtsm.h
index a1e12e3..d8a238e 100644 (file)
--- a/src/libtsm.h
+++ b/src/libtsm.h
@@ -140,8 +140,6 @@ struct tsm_screen_attr {
        unsigned int blink : 1;         /* blinking character */
 };
 
-typedef int (*tsm_screen_prepare_cb) (struct tsm_screen *con,
-                                     void *data);
 typedef int (*tsm_screen_draw_cb) (struct tsm_screen *con,
                                   uint32_t id,
                                   const uint32_t *ch,
@@ -151,8 +149,6 @@ typedef int (*tsm_screen_draw_cb) (struct tsm_screen *con,
                                   unsigned int posy,
                                   const struct tsm_screen_attr *attr,
                                   void *data);
-typedef int (*tsm_screen_render_cb) (struct tsm_screen *con,
-                                    void *data);
 
 int tsm_screen_new(struct tsm_screen **out, tsm_log_t log, void *log_data);
 void tsm_screen_ref(struct tsm_screen *con);
@@ -235,10 +231,7 @@ void tsm_screen_selection_target(struct tsm_screen *con,
                                 unsigned int posy);
 int tsm_screen_selection_copy(struct tsm_screen *con, char **out);
 
-void tsm_screen_draw(struct tsm_screen *con,
-                    tsm_screen_prepare_cb prepare_cb,
-                    tsm_screen_draw_cb draw_cb,
-                    tsm_screen_render_cb render_cb,
+void tsm_screen_draw(struct tsm_screen *con, tsm_screen_draw_cb draw_cb,
                     void *data);
 
 /* available character sets */

diff --git a/src/tsm_screen.c b/src/tsm_screen.c
index 1de998d..2f1f9a4 100644 (file)
--- a/src/tsm_screen.c
+++ b/src/tsm_screen.c
@@ -1763,11 +1763,8 @@ int tsm_screen_selection_copy(struct tsm_screen *con, char **out)
 }
 
 SHL_EXPORT
-void tsm_screen_draw(struct tsm_screen *con,
-                        tsm_screen_prepare_cb prepare_cb,
-                        tsm_screen_draw_cb draw_cb,
-                        tsm_screen_render_cb render_cb,
-                        void *data)
+void tsm_screen_draw(struct tsm_screen *con, tsm_screen_draw_cb draw_cb,
+                    void *data)
 {
        unsigned int cur_x, cur_y;
        unsigned int i, j, k;
@@ -1794,17 +1791,6 @@ void tsm_screen_draw(struct tsm_screen *con,
        if (con->cursor_y >= con->size_y)
                cur_y = con->size_y - 1;
 
-       /* render preparation */
-
-       if (prepare_cb) {
-               ret = prepare_cb(con, data);
-               if (ret) {
-                       llog_warning(con,
-                                    "cannot prepare text-renderer for rendering");
-                       return;
-               }
-       }
-
        /* push each character into rendering pipeline */
 
        iter = con->sb_pos;
@@ -1914,13 +1900,4 @@ void tsm_screen_draw(struct tsm_screen *con,
                        }
                }
        }
-
-       /* perform final rendering steps */
-
-       if (render_cb) {
-               ret = render_cb(con, data);
-               if (ret)
-                       llog_warning(con,
-                                    "cannot render via text-renderer");
-       }
 }