aboutsummaryrefslogtreecommitdiff
path: root/vt.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2021-05-10 09:23:06 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2021-05-13 06:47:32 +0000
commite4ff8d83d1628c2fc92b14c7b0845215962fcbfc (patch)
treefe07314f74dd518bd82dc6895e6b77e45b0b7c9c /vt.c
parentvt: clean up handling of "anywhere" actions (diff)
vt: make anywhere() function return `term->vt.state` by default
Instead of passing a `default_return` parameter, which is always just the current state anyway.
Diffstat (limited to 'vt.c')
-rw-r--r--vt.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/vt.c b/vt.c
index 5d8dc2b7..6ef993c3 100644
--- a/vt.c
+++ b/vt.c
@@ -763,7 +763,7 @@ action_utf8_44(struct terminal *term, uint8_t c)
IGNORE_WARNING("-Wpedantic")
static enum state
-anywhere(struct terminal *term, uint8_t data, enum state default_return)
+anywhere(struct terminal *term, uint8_t data)
{
switch (data) {
/* exit current enter new state */
@@ -782,7 +782,7 @@ anywhere(struct terminal *term, uint8_t data, enum state default_return)
case 0x9e ... 0x9f: return STATE_SOS_PM_APC_STRING;
}
- return default_return;
+ return term->vt.state;
}
static enum state
@@ -802,7 +802,7 @@ state_ground_switch(struct terminal *term, uint8_t data)
case 0xf0 ... 0xf4: action_utf8_41(term, data); return STATE_UTF8_41;
}
- return anywhere(term, data, STATE_GROUND);
+ return anywhere(term, data);
}
static enum state
@@ -829,7 +829,7 @@ state_escape_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_ESCAPE;
}
- return anywhere(term, data, STATE_ESCAPE);
+ return anywhere(term, data);
}
static enum state
@@ -846,7 +846,7 @@ state_escape_intermediate_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_ESCAPE_INTERMEDIATE;
}
- return anywhere(term, data, STATE_ESCAPE_INTERMEDIATE);
+ return anywhere(term, data);
}
static enum state
@@ -866,7 +866,7 @@ state_csi_entry_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_CSI_ENTRY;
}
- return anywhere(term, data, STATE_CSI_ENTRY);
+ return anywhere(term, data);
}
static enum state
@@ -888,7 +888,7 @@ state_csi_param_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_CSI_PARAM;
}
- return anywhere(term, data, STATE_CSI_PARAM);
+ return anywhere(term, data);
}
static enum state
@@ -906,7 +906,7 @@ state_csi_intermediate_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_CSI_INTERMEDIATE;
}
- return anywhere(term, data, STATE_CSI_INTERMEDIATE);
+ return anywhere(term, data);
}
static enum state
@@ -923,7 +923,7 @@ state_csi_ignore_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_CSI_IGNORE;
}
- return anywhere(term, data, STATE_CSI_IGNORE);
+ return anywhere(term, data);
}
static enum state
@@ -968,7 +968,7 @@ state_dcs_entry_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_DCS_ENTRY;
}
- return anywhere(term, data, STATE_DCS_ENTRY);
+ return anywhere(term, data);
}
static enum state
@@ -989,7 +989,7 @@ state_dcs_param_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_DCS_PARAM;
}
- return anywhere(term, data, STATE_DCS_PARAM);
+ return anywhere(term, data);
}
static enum state
@@ -1007,7 +1007,7 @@ state_dcs_intermediate_switch(struct terminal *term, uint8_t data)
case 0x7f: action_ignore(term); return STATE_DCS_INTERMEDIATE;
}
- return anywhere(term, data, STATE_DCS_INTERMEDIATE);
+ return anywhere(term, data);
}
static enum state
@@ -1021,7 +1021,7 @@ state_dcs_ignore_switch(struct terminal *term, uint8_t data)
case 0x20 ... 0x7f: action_ignore(term); return STATE_DCS_IGNORE;
}
- return anywhere(term, data, STATE_DCS_IGNORE);
+ return anywhere(term, data);
}
static enum state
@@ -1064,7 +1064,7 @@ state_sos_pm_apc_string_switch(struct terminal *term, uint8_t data)
case 0x1c ... 0x7f: action_ignore(term); return STATE_SOS_PM_APC_STRING;
}
- return anywhere(term, data, STATE_SOS_PM_APC_STRING);
+ return anywhere(term, data);
}
static enum state