[vte/wip/sixels: 42/82] terminal: Remove vestiges of old freeze/thaw code



commit 9970f734b279fd3d787f9c083a60b7a9561e1fcd
Author: Hans Petter Jansson <hpj cl no>
Date:   Wed Jun 10 15:00:31 2020 +0200

    terminal: Remove vestiges of old freeze/thaw code

 src/vte.cc         | 61 ------------------------------------------------------
 src/vteinternal.hh |  5 -----
 2 files changed, 66 deletions(-)
---
diff --git a/src/vte.cc b/src/vte.cc
index ab7f786d..f937cde2 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -3887,9 +3887,6 @@ Terminal::process_incoming_pcterm()
         /* After processing some data, do a hyperlink GC. The multiplier is totally arbitrary, feel free to 
fine tune. */
         _vte_ring_hyperlink_maybe_gc(m_screen->row_data, bytes_processed * 8);
 
-       if (m_sixel_enabled)
-               maybe_remove_images ();
-
        _vte_debug_print (VTE_DEBUG_WORK, ")");
        _vte_debug_print (VTE_DEBUG_IO,
                           "%" G_GSIZE_FORMAT " bytes in %" G_GSIZE_FORMAT " chunks left to process.\n",
@@ -4230,64 +4227,6 @@ Terminal::feed_child_binary(std::string_view const& data)
         connect_pty_write();
 }
 
-void
-Terminal::maybe_remove_images ()
-{
-       VteRing *ring = m_screen->row_data;
-       auto image_map = ring->m_image_map;
-       vte::image::Image *image;
-
-       auto it = image_map->begin();
-
-       /* step 1. collect images out of scroll-back area */
-       while (it != image_map->end()) {
-               /* image_map is sorted from oldest to new */
-               image = it->second;
-
-               /* break if the image is still in scrollback area */
-               if (image->get_bottom () >= (glong) ring->m_start)
-                       break;
-
-               /* otherwise, delete it */
-                ring->m_image_onscreen_resource_counter -= image->resource_size ();
-               image_map->erase (image->get_bottom ());
-               delete image;
-               _vte_debug_print (VTE_DEBUG_IMAGE,
-                                 "deleted, offscreen: %zu\n",
-                                 ring->m_image_offscreen_resource_counter);
-       }
-
-       /* step 2. If the resource amount of frozen images (serialized into VteBoa)
-        * exceeds the upper limit, remove images from oldest.
-        */
-       if (ring->m_image_offscreen_resource_counter > m_frozen_image_limit) {
-               _vte_debug_print (VTE_DEBUG_IMAGE,
-                                 "checked, offscreen: %zu, max: %zu\n",
-                                 ring->m_image_offscreen_resource_counter,
-                                 m_frozen_image_limit);
-               while (it != image_map->end()) {
-                       image = it->second;
-                       ++it;
-
-                       /* remove */
-                       image_map->erase (image->get_bottom ());
-                        ring->m_image_onscreen_resource_counter -= image->resource_size ();
-                       _vte_debug_print (VTE_DEBUG_IMAGE,
-                                         "deleted, offscreen: %zu\n",
-                                         ring->m_image_offscreen_resource_counter);
-                       delete image;
-
-                       /* break if the resource amount becomes less than limit */
-                       if (ring->m_image_offscreen_resource_counter <= m_frozen_image_limit)
-                               break;
-               }
-       }
-
-       /* step 3. shrink image stream with calling _vte_stream_advance_tail() */
-       if (ring->m_has_streams)
-               ring->shrink_image_stream ();
-}
-
 void
 Terminal::send(vte::parser::u8SequenceBuilder const& builder,
                          bool c1,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 7c1bbaab..36088602 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -1680,11 +1680,6 @@ public:
 #include "parser-cmd.hh"
 #undef _VTE_CMD
 #undef _VTE_NOP
-
-private:
-        void freeze_hidden_images_before_view_area(double start_pos, double end_pos);
-        void freeze_hidden_images_after_view_area(double start_pos, double end_pos);
-        void maybe_remove_images();
 };
 
 } // namespace terminal


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]