diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-07-21 16:22:26 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-07-21 16:22:26 +0000 |
| commit | 2096753b522b16f6faafc91eca66fe98ad5b9757 (patch) | |
| tree | 337152e216a1d9c1d846a8539bd273527f4b10b1 | |
| parent | conf: remove debug logging (diff) | |
dcs: we have no parent terminal to pass through to
| -rw-r--r-- | dcs.c | 32 | ||||
| -rw-r--r-- | dcs.h | 7 | ||||
| -rw-r--r-- | main.c | 1 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | terminal.h | 5 | ||||
| -rw-r--r-- | vt.c | 14 |
6 files changed, 1 insertions, 59 deletions
@@ -1,32 +0,0 @@ -#include "dcs.h" - -#define LOG_MODULE "dcs" -#define LOG_ENABLE_DBG 0 -#include "log.h" - -void -dcs_passthrough(struct terminal *term) -{ - LOG_DBG("DCS passthrough: %.*s (%zu bytes)", - (int)term->vt.dcs.idx, term->vt.dcs.data, term->vt.dcs.idx); -} - -bool -dcs_ensure_size(struct terminal *term, size_t required_size) -{ - if (required_size <= term->vt.dcs.size) - return true; - - size_t new_size = (required_size + 127) / 128 * 128; - assert(new_size > 0); - - uint8_t *new_data = realloc(term->vt.dcs.data, new_size); - if (new_data == NULL) { - LOG_ERRNO("failed to increase size of DCS buffer"); - return false; - } - - term->vt.dcs.data = new_data; - term->vt.dcs.size = new_size; - return true; -} @@ -1,7 +0,0 @@ -#pragma once - -#include <stdbool.h> -#include "terminal.h" - -void dcs_passthrough(struct terminal *term); -bool dcs_ensure_size(struct terminal *term, size_t required_size); @@ -842,7 +842,6 @@ out: xkb_context_unref(term.kbd.xkb); free(term.vt.osc.data); - free(term.vt.dcs.data); for (int row = 0; row < term.normal.num_rows; row++) grid_row_free(term.normal.rows[row]); free(term.normal.rows); diff --git a/meson.build b/meson.build index 9b1aa679..5d1bd058 100644 --- a/meson.build +++ b/meson.build @@ -63,7 +63,6 @@ executable( 'config.c', 'config.h', 'commands.c', 'commands.h', 'csi.c', 'csi.h', - 'dcs.c', 'dcs.h', 'font.c', 'font.h', 'grid.c', 'grid.h', 'input.c', 'input.h', @@ -130,11 +130,6 @@ struct vt { size_t idx; } osc; struct { - uint8_t *data; - size_t size; - size_t idx; - } dcs; - struct { uint8_t data[4]; size_t idx; size_t left; @@ -9,7 +9,6 @@ #define LOG_ENABLE_DBG 0 #include "log.h" #include "csi.h" -#include "dcs.h" #include "grid.h" #include "osc.h" @@ -931,20 +930,9 @@ action(struct terminal *term, enum action _action, uint8_t c) break; case ACTION_HOOK: - term->vt.dcs.idx = 0; - break; - case ACTION_PUT: - if (!dcs_ensure_size(term, term->vt.dcs.idx + 1)) - break; - term->vt.dcs.data[term->vt.dcs.idx++] = c; - break; - case ACTION_UNHOOK: - if (!dcs_ensure_size(term, term->vt.dcs.idx + 1)) - break; - term->vt.dcs.data[term->vt.dcs.idx] = '\0'; - dcs_passthrough(term); + /* We have no parent terminal to pass through to */ break; case ACTION_UTF8_2_ENTRY: |
