[vte/wip/sixels: 24/111] sixels: freezed -> frozen

[Christian Persch <chpe src gnome org>]

commit e1e10653d8de503b01c6e2b2ad3d736883d4b948
Author: Hans Petter Jansson <hpj cl no>
Date:   Sat Aug 8 20:42:48 2020 +0200

    sixels: freezed -> frozen

 src/image.cc          | 12 ++++++------
 src/image.hh          |  2 +-
 src/ring.cc           |  8 ++++----
 src/vte.cc            | 28 ++++++++++++++--------------
 src/vte/vteterminal.h |  6 +++---
 src/vtedefines.hh     |  2 +-
 src/vtegtk.cc         | 28 ++++++++++++++--------------
 src/vtegtk.hh         |  2 +-
 src/vteinternal.hh    |  4 ++--
 9 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/src/image.cc b/src/image.cc
index 8e43f989..ef0b15a9 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -75,7 +75,7 @@ Image::get_stream_position() const
 
 /* Indicate whether the image is serialized to the stream */
 bool
-Image::is_freezed() const
+Image::is_frozen() const
 {
        return (m_surface == NULL);
 }
@@ -97,7 +97,7 @@ Image::resource_size() const
 {
        size_t result_size;
 
-       if (is_freezed()) {
+       if (is_frozen()) {
                /* If frozen, return the size sent to VteBoa. */
                result_size = m_nwrite;
        } else {
@@ -169,11 +169,11 @@ Image::combine(Image *other, gulong char_width, gulong char_height)
        gulong offsetx = (other->m_left - m_left) * char_width;
        gulong offsety = (other->m_top - m_top) * char_height;
 
-       if (is_freezed())
+       if (is_frozen())
                if (!thaw())
                        return false;
 
-       if (other->is_freezed())
+       if (other->is_frozen())
                if (!other->thaw())
                        return false;
 
@@ -190,7 +190,7 @@ Image::combine(Image *other, gulong char_width, gulong char_height)
 bool
 Image::unite(Image *other, gulong char_width, gulong char_height)
 {
-       if (is_freezed())
+       if (is_frozen())
                if (!thaw())
                        return false;
 
@@ -228,7 +228,7 @@ Image::unite(Image *other, gulong char_width, gulong char_height)
 bool
 Image::paint(cairo_t *cr, gint offsetx, gint offsety)
 {
-       if (is_freezed())
+       if (is_frozen())
                if (!thaw())
                        return false;
 
diff --git a/src/image.hh b/src/image.hh
index d9778c9d..b28b558b 100644
--- a/src/image.hh
+++ b/src/image.hh
@@ -43,7 +43,7 @@ public:
        glong get_top() const;
        glong get_bottom() const;
        gulong get_stream_position() const;
-       bool is_freezed() const;
+       bool is_frozen() const;
        bool includes(const Image *rhs) const;
        size_t resource_size() const;
        void freeze();
diff --git a/src/ring.cc b/src/ring.cc
index 9bf6b3b3..df5589ad 100644
--- a/src/ring.cc
+++ b/src/ring.cc
@@ -1549,7 +1549,7 @@ Ring::append_image (cairo_surface_t *surface, gint pixelwidth, gint pixelheight,
                         *  | :.........:  |
                         *  +--------------+
                         */
-                       if (current->is_freezed())
+                       if (current->is_frozen())
                                m_image_offscreen_resource_counter -= current->resource_size ();
                        else
                                m_image_onscreen_resource_counter -= current->resource_size ();
@@ -1569,7 +1569,7 @@ Ring::append_image (cairo_surface_t *surface, gint pixelwidth, gint pixelheight,
                         *  |    current   |
                         *  +--------------+
                         */
-                       if (current->is_freezed()) {
+                       if (current->is_frozen()) {
                                m_image_offscreen_resource_counter -= current->resource_size ();
                                current->thaw ();
                        } else {
@@ -1608,7 +1608,7 @@ Ring::append_image (cairo_surface_t *surface, gint pixelwidth, gint pixelheight,
                         */
                        image->unite (image, char_width, char_height);
                        m_image_map->erase (current->get_bottom ());
-                       if (current->is_freezed())
+                       if (current->is_frozen())
                                m_image_offscreen_resource_counter -= current->resource_size ();
                        else
                                m_image_onscreen_resource_counter -= current->resource_size ();
@@ -1645,7 +1645,7 @@ Ring::shrink_image_stream ()
 
        first_image = m_image_map->begin()->second;
 
-       if (first_image->is_freezed ())
+       if (first_image->is_frozen ())
                if (first_image->get_stream_position () > _vte_stream_tail (m_image_stream))
                        _vte_stream_advance_tail (m_image_stream, first_image->get_stream_position ());
 }
diff --git a/src/vte.cc b/src/vte.cc
index ee5dbc99..596b70ce 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -4251,7 +4251,7 @@ Terminal::maybe_remove_images ()
                        break;
 
                /* otherwise, delete it */
-               if (image->is_freezed ())
+               if (image->is_frozen ())
                        ring->m_image_offscreen_resource_counter -= image->resource_size ();
                else
                        ring->m_image_onscreen_resource_counter -= image->resource_size ();
@@ -4262,21 +4262,21 @@ Terminal::maybe_remove_images ()
                                  ring->m_image_offscreen_resource_counter);
        }
 
-       /* step 2. If the resource amount of freezed images (serialized into VteBoa)
+       /* 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_freezed_image_limit) {
+       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_freezed_image_limit);
+                                 m_frozen_image_limit);
                while (it != image_map->end()) {
                        image = it->second;
                        ++it;
 
                        /* remove */
                        image_map->erase (image->get_bottom ());
-                       if (image->is_freezed ())
+                       if (image->is_frozen ())
                                ring->m_image_offscreen_resource_counter -= image->resource_size ();
                        else
                                ring->m_image_onscreen_resource_counter -= image->resource_size ();
@@ -4286,7 +4286,7 @@ Terminal::maybe_remove_images ()
                        delete image;
 
                        /* break if the resource amount becomes less than limit */
-                       if (ring->m_image_offscreen_resource_counter <= m_freezed_image_limit)
+                       if (ring->m_image_offscreen_resource_counter <= m_frozen_image_limit)
                                break;
                }
        }
@@ -4310,12 +4310,12 @@ Terminal::freeze_hidden_images_before_view_area (double start_pos, double end_po
                vte::image::Image *image = it->second;
                if (image->get_bottom () + 1 < end_pos)
                        break;
-               if (! image->is_freezed ()) {
+               if (! image->is_frozen ()) {
                        ring->m_image_onscreen_resource_counter -= image->resource_size ();
                        image->freeze ();
                        ring->m_image_offscreen_resource_counter += image->resource_size ();
                        _vte_debug_print (VTE_DEBUG_IMAGE,
-                                         "freezed, onscreen: %zu, offscreen: %zu\n",
+                                         "frozen, onscreen: %zu, offscreen: %zu\n",
                                          ring->m_image_onscreen_resource_counter,
                                          ring->m_image_offscreen_resource_counter);
                }
@@ -4334,12 +4334,12 @@ Terminal::freeze_hidden_images_after_view_area (double start_pos, double end_pos
                vte::image::Image *image = it->second;
                if (image->get_top () < end_pos + m_row_count)
                        break;
-               if (image->get_top () > bottom_of_view && ! image->is_freezed ()) {
+               if (image->get_top () > bottom_of_view && ! image->is_frozen ()) {
                        ring->m_image_onscreen_resource_counter -= image->resource_size ();
                        image->freeze ();
                        ring->m_image_offscreen_resource_counter += image->resource_size ();
                        _vte_debug_print (VTE_DEBUG_IMAGE,
-                                         "freezed, onscreen: %zu, offscreen: %zu\n",
+                                         "frozen, onscreen: %zu, offscreen: %zu\n",
                                          ring->m_image_onscreen_resource_counter,
                                          ring->m_image_offscreen_resource_counter);
                }
@@ -7507,9 +7507,9 @@ Terminal::set_cell_height_scale(double scale)
 }
 
 bool
-Terminal::set_freezed_image_limit(gulong limit)
+Terminal::set_frozen_image_limit(gulong limit)
 {
-        m_freezed_image_limit = limit;
+        m_frozen_image_limit = limit;
 
         return true;
 }
@@ -7857,7 +7857,7 @@ Terminal::Terminal(vte::platform::Widget* w,
         m_regex_underline_position = 1;
 
         /* Image */
-        m_freezed_image_limit = VTE_DEFAULT_FREEZED_IMAGE_LIMIT;
+        m_frozen_image_limit = VTE_DEFAULT_FROZEN_IMAGE_LIMIT;
         m_sixel_enabled = TRUE;
 
         reset_default_attributes(true);
@@ -9381,7 +9381,7 @@ Terminal::widget_draw(cairo_t *cr)
                        vte::image::Image *image = it->second;
                        if (image->get_top () > bottom_row)
                                break;
-                       if (image->is_freezed ()) {
+                       if (image->is_frozen ()) {
                                ring->m_image_offscreen_resource_counter -= image->resource_size ();
                                image->thaw ();
                                ring->m_image_onscreen_resource_counter += image->resource_size ();
diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h
index 25cd0f0a..5c414fb9 100644
--- a/src/vte/vteterminal.h
+++ b/src/vte/vteterminal.h
@@ -505,13 +505,13 @@ gboolean vte_terminal_write_contents_sync (VteTerminal *terminal,
 
 /* Images */
 
-/* Set or get maximum storage size for offscreen freezed images */
+/* Set or get maximum storage size for offscreen frozen images */
 _VTE_PUBLIC
-void vte_terminal_set_freezed_image_limit(VteTerminal *terminal,
+void vte_terminal_set_frozen_image_limit(VteTerminal *terminal,
                                           gulong limit) _VTE_GNUC_NONNULL(1);
 
 _VTE_PUBLIC
-gulong vte_terminal_get_freezed_image_limit(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+gulong vte_terminal_get_frozen_image_limit(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
 
 /* Set or get whether the SIXEL graphics feature is enabled */
 _VTE_PUBLIC
diff --git a/src/vtedefines.hh b/src/vtedefines.hh
index 8f130eac..883d38b8 100644
--- a/src/vtedefines.hh
+++ b/src/vtedefines.hh
@@ -88,7 +88,7 @@
 #define VTE_MAX_PROCESS_TIME           100
 #define VTE_CELL_BBOX_SLACK            1
 #define VTE_DEFAULT_UTF8_AMBIGUOUS_WIDTH 1
-#define VTE_DEFAULT_FREEZED_IMAGE_LIMIT (16 * 1024 * 1024)  /* 16 MB */
+#define VTE_DEFAULT_FROZEN_IMAGE_LIMIT  (16 * 1024 * 1024)  /* 16 MB */
 
 #define VTE_UTF8_BPC                    (4) /* Maximum number of bytes used per UTF-8 character */
 
diff --git a/src/vtegtk.cc b/src/vtegtk.cc
index 1ce4000b..f61667ed 100644
--- a/src/vtegtk.cc
+++ b/src/vtegtk.cc
@@ -1825,13 +1825,13 @@ vte_terminal_class_init(VteTerminalClass *klass)
                                      (GParamFlags) (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | 
G_PARAM_EXPLICIT_NOTIFY));
 
         /**
-         * VteTerminal:freezed-image-limit:
+         * VteTerminal:frozen-image-limit:
          *
-         * This property indicates allowed max storage size for offscreen freezed images
+         * This property indicates allowed max storage size for offscreen frozen images
          */
-        pspecs[PROP_FREEZED_IMAGE_LIMIT] =
-                g_param_spec_ulong ("freezed-image-limit", NULL, NULL,
-                                    0, G_MAXULONG, VTE_DEFAULT_FREEZED_IMAGE_LIMIT,
+        pspecs[PROP_FROZEN_IMAGE_LIMIT] =
+                g_param_spec_ulong ("frozen-image-limit", NULL, NULL,
+                                    0, G_MAXULONG, VTE_DEFAULT_FROZEN_IMAGE_LIMIT,
                                     (GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | 
G_PARAM_EXPLICIT_NOTIFY));
 
 
@@ -5687,33 +5687,33 @@ catch (...)
 } // namespace vte
 
 /**
- * vte_terminal_set_freezed_image_limit:
+ * vte_terminal_set_frozen_image_limit:
  * @terminal: a #VteTerminal
  * @limit: 0 to G_MAXINT
  *
- * Set allowed max storage size for offscreen freezed images
+ * Set allowed max storage size for offscreen frozen images
  */
 void
-vte_terminal_set_freezed_image_limit(VteTerminal *terminal, gulong limit)
+vte_terminal_set_frozen_image_limit(VteTerminal *terminal, gulong limit)
 {
         g_return_if_fail(VTE_IS_TERMINAL(terminal));
 
-        if (IMPL(terminal)->set_freezed_image_limit(limit))
-                g_object_notify_by_pspec(G_OBJECT(terminal), pspecs[PROP_FREEZED_IMAGE_LIMIT]);
+        if (IMPL(terminal)->set_frozen_image_limit(limit))
+                g_object_notify_by_pspec(G_OBJECT(terminal), pspecs[PROP_FROZEN_IMAGE_LIMIT]);
 }
 
 /**
- * vte_terminal_get_freezed_image_limit:
+ * vte_terminal_get_frozen_image_limit:
  * @terminal: a #VteTerminal
  *
- * Get allowed max storage size for offscreen freezed images
+ * Get allowed max storage size for offscreen frozen images
  */
 gulong
-vte_terminal_get_freezed_image_limit(VteTerminal *terminal)
+vte_terminal_get_frozen_image_limit(VteTerminal *terminal)
 {
         g_return_val_if_fail(VTE_IS_TERMINAL(terminal), 0);
 
-        return IMPL(terminal)->m_freezed_image_limit;
+        return IMPL(terminal)->m_frozen_image_limit;
 }
 
 /**
diff --git a/src/vtegtk.hh b/src/vtegtk.hh
index 2ebe22bc..68cd7f9e 100644
--- a/src/vtegtk.hh
+++ b/src/vtegtk.hh
@@ -81,7 +81,7 @@ enum {
         PROP_ENCODING,
         PROP_FONT_DESC,
         PROP_FONT_SCALE,
-        PROP_FREEZED_IMAGE_LIMIT,
+        PROP_FROZEN_IMAGE_LIMIT,
         PROP_HYPERLINK_HOVER_URI,
         PROP_ICON_TITLE,
         PROP_INPUT_ENABLED,
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 6fc4b923..7c1bbaab 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -758,7 +758,7 @@ public:
         gboolean m_sixel_scrolls_right;
         gboolean m_sixel_use_private_register;
         sixel_state_t m_sixel_state;
-        gulong m_freezed_image_limit;
+        gulong m_frozen_image_limit;
         gboolean m_sixel_enabled;
 
        /* State variables for handling match checks. */
@@ -1512,7 +1512,7 @@ public:
                           GError** error);
         bool set_font_desc(PangoFontDescription const* desc);
         bool set_font_scale(double scale);
-        bool set_freezed_image_limit(gulong limit);
+        bool set_frozen_image_limit(gulong limit);
         bool set_input_enabled(bool enabled);
         bool set_mouse_autohide(bool autohide);
         bool set_rewrap_on_resize(bool rewrap);