mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-08 08:20:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename: vt_to_slave() -> term_to_slave()

Browse source
This commit is contained in:
Daniel Eklöf 2019-11-03 00:27:39 +01:00
parent 79c3121aa3
commit 9f1525aef7
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
8 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
csi.c
View file

@ -325,7 +325,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
case 0: { case 0: {
switch (final) { switch (final) {
case 'c': case 'c':
vt_to_slave(term, "\033[?6c", 5); term_to_slave(term, "\033[?6c", 5);
break; break;
case 'd': { case 'd': {
@ -690,7 +690,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
snprintf(reply, sizeof(reply), "\x1b[%d;%dR", snprintf(reply, sizeof(reply), "\x1b[%d;%dR",
term->cursor.row + 1, term->cursor.row + 1,
term->cursor.col + 1); term->cursor.col + 1);
vt_to_slave(term, reply, strlen(reply)); term_to_slave(term, reply, strlen(reply));
break; break;
} }
@ -910,7 +910,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
*/ */
char reply[32]; char reply[32];
snprintf(reply, sizeof(reply), "\033[?%u;2$y", param); snprintf(reply, sizeof(reply), "\033[?%u;2$y", param);
vt_to_slave(term, reply, strlen(reply)); term_to_slave(term, reply, strlen(reply));
break; break;
} }
@ -965,7 +965,7 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
} }
vt_to_slave(term, "\033[>41;347;0c", 12); term_to_slave(term, "\033[>41;347;0c", 12);
break; break;
} }

8
input.c
View file

@ -258,7 +258,7 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
info->keypad_keys_mode != term->keypad_keys_mode) info->keypad_keys_mode != term->keypad_keys_mode)
continue; continue;
vt_to_slave(term, info->seq, strlen(info->seq)); term_to_slave(term, info->seq, strlen(info->seq));
found_map = true; found_map = true;
term_reset_view(term); term_reset_view(term);
@ -314,14 +314,14 @@ keyboard_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
char reply[1024]; char reply[1024];
snprintf(reply, sizeof(reply), "\x1b[27;%d;%d~", modify_param, sym); snprintf(reply, sizeof(reply), "\x1b[27;%d;%d~", modify_param, sym);
vt_to_slave(term, reply, strlen(reply)); term_to_slave(term, reply, strlen(reply));
} }
else { else {
if (effective_mods & alt) if (effective_mods & alt)
vt_to_slave(term, "\x1b", 1); term_to_slave(term, "\x1b", 1);
vt_to_slave(term, buf, count); term_to_slave(term, buf, count);
} }
term_reset_view(term); term_reset_view(term);

18
osc.c
View file

@ -78,7 +78,7 @@ from_clipboard_cb(const char *text, size_t size, void *user)
assert(chunk != NULL); assert(chunk != NULL);
assert(strlen(chunk) == 4); assert(strlen(chunk) == 4);
vt_to_slave(term, chunk, 4); term_to_slave(term, chunk, 4);
free(chunk); free(chunk);
ctx->idx = 0; ctx->idx = 0;
@ -98,7 +98,7 @@ from_clipboard_cb(const char *text, size_t size, void *user)
char *chunk = base64_encode((const uint8_t *)t, left / 3 * 3); char *chunk = base64_encode((const uint8_t *)t, left / 3 * 3);
assert(chunk != NULL); assert(chunk != NULL);
assert(strlen(chunk) % 4 == 0); assert(strlen(chunk) % 4 == 0);
vt_to_slave(term, chunk, strlen(chunk)); term_to_slave(term, chunk, strlen(chunk));
free(chunk); free(chunk);
} }
@ -120,9 +120,9 @@ osc_from_clipboard(struct terminal *term, const char *source)
if (src == 0) if (src == 0)
return; return;
vt_to_slave(term, "\033]52;", 5); term_to_slave(term, "\033]52;", 5);
vt_to_slave(term, &src, 1); term_to_slave(term, &src, 1);
vt_to_slave(term, ";", 1); term_to_slave(term, ";", 1);
struct clip_context ctx = { struct clip_context ctx = {
.term = term, .term = term,
@ -141,10 +141,10 @@ osc_from_clipboard(struct terminal *term, const char *source)
if (ctx.idx > 0) { if (ctx.idx > 0) {
char res[4]; char res[4];
base64_encode_final(ctx.buf, ctx.idx, res); base64_encode_final(ctx.buf, ctx.idx, res);
vt_to_slave(term, res, 4); term_to_slave(term, res, 4);
} }
vt_to_slave(term, "\033\\", 2); term_to_slave(term, "\033\\", 2);
} }
static void static void
@ -343,7 +343,7 @@ osc_dispatch(struct terminal *term)
char reply[32]; char reply[32];
snprintf(reply, sizeof(reply), "\033]4;%u;rgb:%02x/%02x/%02x\033\\", snprintf(reply, sizeof(reply), "\033]4;%u;rgb:%02x/%02x/%02x\033\\",
idx, r, g, b); idx, r, g, b);
vt_to_slave(term, reply, strlen(reply)); term_to_slave(term, reply, strlen(reply));
break; break;
} }
@ -377,7 +377,7 @@ osc_dispatch(struct terminal *term)
reply, sizeof(reply), "\033]%u;rgb:%02x/%02x/%02x\033\\", reply, sizeof(reply), "\033]%u;rgb:%02x/%02x/%02x\033\\",
param, r, g, b); param, r, g, b);
vt_to_slave(term, reply, strlen(reply)); term_to_slave(term, reply, strlen(reply));
break; break;
} }

10
selection.c
View file

@ -533,7 +533,7 @@ static void
from_clipboard_cb(const char *data, size_t size, void *user) from_clipboard_cb(const char *data, size_t size, void *user)
{ {
struct terminal *term = user; struct terminal *term = user;
vt_to_slave(term, data, size); term_to_slave(term, data, size);
} }
void void
@ -544,12 +544,12 @@ selection_from_clipboard(struct terminal *term, uint32_t serial)
return; return;
if (term->bracketed_paste) if (term->bracketed_paste)
vt_to_slave(term, "\033[200~", 6); term_to_slave(term, "\033[200~", 6);
text_from_clipboard(term, serial, &from_clipboard_cb, term); text_from_clipboard(term, serial, &from_clipboard_cb, term);
if (term->bracketed_paste) if (term->bracketed_paste)
vt_to_slave(term, "\033[201~", 6); term_to_slave(term, "\033[201~", 6);
} }
bool bool
@ -675,12 +675,12 @@ selection_from_primary(struct terminal *term)
return; return;
if (term->bracketed_paste) if (term->bracketed_paste)
vt_to_slave(term, "\033[200~", 6); term_to_slave(term, "\033[200~", 6);
text_from_primary(term, &from_clipboard_cb, term); text_from_primary(term, &from_clipboard_cb, term);
if (term->bracketed_paste) if (term->bracketed_paste)
vt_to_slave(term, "\033[201~", 6); term_to_slave(term, "\033[201~", 6);
} }
#if 0 #if 0

26
terminal.c
View file

@ -768,6 +768,26 @@ term_reset(struct terminal *term, bool hard)
term_damage_all(term); term_damage_all(term);
} }
bool
term_to_slave(struct terminal *term, const void *_data, size_t len)
{
const uint8_t *data = _data;
size_t left = len;
while (left > 0) {
ssize_t ret = write(term->ptmx, data, left);
if (ret < 0) {
LOG_ERRNO("failed to write to client");
return false;
}
data += ret;
left -= ret;
}
return true;
}
void void
term_damage_rows(struct terminal *term, int start, int end) term_damage_rows(struct terminal *term, int start, int end)
{ {
@ -1056,7 +1076,7 @@ term_focus_in(struct terminal *term)
{ {
if (!term->focus_events) if (!term->focus_events)
return; return;
vt_to_slave(term, "\033[I", 3); term_to_slave(term, "\033[I", 3);
} }
void void
@ -1064,7 +1084,7 @@ term_focus_out(struct terminal *term)
{ {
if (!term->focus_events) if (!term->focus_events)
return; return;
vt_to_slave(term, "\033[O", 3); term_to_slave(term, "\033[O", 3);
} }
static int static int
@ -1138,7 +1158,7 @@ report_mouse_click(struct terminal *term, int encoded_button, int row, int col,
return; return;
} }
vt_to_slave(term, response, strlen(response)); term_to_slave(term, response, strlen(response));
} }
static void static void

1
terminal.h
View file

@ -303,6 +303,7 @@ bool term_shutdown(struct terminal *term);
int term_destroy(struct terminal *term); int term_destroy(struct terminal *term);
void term_reset(struct terminal *term, bool hard); void term_reset(struct terminal *term, bool hard);
bool term_to_slave(struct terminal *term, const void *data, size_t len);
void term_damage_rows(struct terminal *term, int start, int end); void term_damage_rows(struct terminal *term, int start, int end);
void term_damage_rows_in_view(struct terminal *term, int start, int end); void term_damage_rows_in_view(struct terminal *term, int start, int end);

20
vt.c
View file

@ -1015,23 +1015,3 @@ vt_from_slave(struct terminal *term, const uint8_t *data, size_t len)
} }
} }
} }
bool
vt_to_slave(struct terminal *term, const void *_data, size_t len)
{
const uint8_t *data = _data;
size_t left = len;
while (left > 0) {
ssize_t ret = write(term->ptmx, data, left);
if (ret < 0) {
LOG_ERRNO("failed to write to client");
return false;
}
data += ret;
left -= ret;
}
return true;
}

1
vt.h
View file

@ -6,7 +6,6 @@
#include "terminal.h" #include "terminal.h"
void vt_from_slave(struct terminal *term, const uint8_t *data, size_t len); void vt_from_slave(struct terminal *term, const uint8_t *data, size_t len);
bool vt_to_slave(struct terminal *term, const void *data, size_t len);
static inline int static inline int
vt_param_get(const struct terminal *term, size_t idx, int default_value) vt_param_get(const struct terminal *term, size_t idx, int default_value)