Accessor for CSI params.

jtnord · May 30, 2018 · 4111e10 · 4111e10
1 parent b79406f
commit 4111e10
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/clink/terminal/include/terminal/ecma48_iter.h b/clink/terminal/include/terminal/ecma48_iter.h
@@ -45,12 +45,17 @@ class ecma48_code
         char                intermediate;
         bool                private_use;
         unsigned char       param_count;
+        int                 params[1];
+        int                 get_param(int index, int fallback=0) const;
     };
 
     template <int PARAM_N>
     struct csi : public csi_base
     {
-        int                 params[PARAM_N];
+        static const int    max_param_count = PARAM_N;
+
+    private:
+        int                 buffer[PARAM_N - 1];
     };
 
     const char*             get_pointer() const { return m_str; }
@@ -74,6 +79,15 @@ class ecma48_code
     unsigned char           m_code;
 };
 
+//------------------------------------------------------------------------------
+inline int ecma48_code::csi_base::get_param(int index, int fallback) const
+{
+    if (unsigned(index) < unsigned(param_count))
+        return *(params + index);
+
+    return fallback;
+}
+
 //------------------------------------------------------------------------------
 template <int S>
 bool ecma48_code::decode_csi(csi<S>& csi) const

diff --git a/clink/terminal/test/ecma48.cpp b/clink/terminal/test/ecma48.cpp
@@ -174,11 +174,11 @@ TEST_CASE("ecma48 c1 csi params")
     REQUIRE(code->get_length() == 25);
 
     REQUIRE(code->decode_csi(csi));
-    REQUIRE(csi.param_count == sizeof_array(csi.params));
+    REQUIRE(csi.param_count == decltype(csi)::max_param_count);
 
     new (&iter) ecma48_iter("\x1b[1;2;3;4;5;6;7;8;1;2;3;4;5;6;7;8m", g_state);
     REQUIRE(code->decode_csi(csi));
-    REQUIRE(csi.param_count == sizeof_array(csi.params));
+    REQUIRE(csi.param_count == decltype(csi)::max_param_count);
 }
 
 //------------------------------------------------------------------------------