aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-06-18 19:55:39 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-06-18 19:55:39 +0000
commit3bd77bceb1345d36fa7c4ce1c32942509ed01f99 (patch)
treeff26325164de0df16de3753e88f1f39d80381c11
parentvt: fix utf-8 bug: re-load 'current state' after processing a utf8 byte (diff)
csi: CSI log messages are now single line
-rw-r--r--csi.c29
1 files changed, 24 insertions, 5 deletions
diff --git a/csi.c b/csi.c
index 50951781..ed223f55 100644
--- a/csi.c
+++ b/csi.c
@@ -5,6 +5,10 @@
#include <unistd.h>
#include <assert.h>
+#if defined(_DEBUG)
+ #include <stdio.h>
+#endif
+
#define LOG_MODULE "csi"
#define LOG_ENABLE_DBG 1
#include "log.h"
@@ -78,13 +82,28 @@ csi_sgr(struct terminal *term)
bool
csi_dispatch(struct terminal *term, uint8_t final)
{
- LOG_DBG("CSI: %zu paramaters, final = %c", term->vt.params.idx, final);
- for (size_t i = 0; i < term->vt.params.idx; i++) {
- LOG_DBG(" #%zu: %u", i, term->vt.params.v[i].value);
- for (size_t j = 0; j < term->vt.params.v[i].sub.idx; j++)
- LOG_DBG(" #%zu: %u", j, term->vt.params.v[i].sub.value[j]);
+#if defined(_DEBUG)
+ char log[1024];
+ int c = snprintf(log, sizeof(log), "CSI: ");
+
+ for (size_t i = 0; i < term->vt.params.idx; i++){
+ c += snprintf(&log[c], sizeof(log) - c, "%d",
+ term->vt.params.v[i].value);
+
+ for (size_t j = 0; i < term->vt.params.v[i].sub.idx; j++) {
+ c += snprintf(&log[c], sizeof(log) - c, ":%d",
+ term->vt.params.v[i].sub.value[j]);
+ }
+
+ c += snprintf(&log[c], sizeof(log) - c, "%s",
+ i == term->vt.params.idx - 1 ? "" : ";");
}
+ c += snprintf(&log[c], sizeof(log) - c, "%c (%zu parameters)",
+ final, term->vt.params.idx);
+ LOG_DBG("%s", log);
+#endif
+
if (term->vt.intermediates.idx == 0) {
switch (final) {
case 'c':