aboutsummaryrefslogtreecommitdiff
path: root/csi.c
diff options
context:
space:
mode:
Diffstat (limited to 'csi.c')
-rw-r--r--csi.c115
1 files changed, 64 insertions, 51 deletions
diff --git a/csi.c b/csi.c
index a737022f..a57b1a7f 100644
--- a/csi.c
+++ b/csi.c
@@ -16,29 +16,29 @@
#define min(x, y) ((x) < (y) ? (x) : (y))
-static const struct rgba colors_regular[] = {
- {0.000000, 0.000000, 0.000000, 1.000000}, /* 0x000000ff */
- {0.800000, 0.576471, 0.576471, 1.000000}, /* 0xcc9393ff */
- {0.498039, 0.623529, 0.498039, 1.000000}, /* 0x7f9f7fff */
- {0.815686, 0.749020, 0.560784, 1.000000}, /* 0xd0bf8fff */
- {0.423529, 0.627451, 0.639216, 1.000000}, /* 0x6ca0a3ff */
- {0.862745, 0.549020, 0.764706, 1.000000}, /* 0xdc8cc3ff */
- {0.576471, 0.878431, 0.890196, 1.000000}, /* 0x93e0e3ff */
- {0.862745, 0.862745, 0.800000, 1.000000}, /* 0xdcdcccff */
+static const struct rgb colors_regular[] = {
+ {0.000000, 0.000000, 0.000000}, /* 0x000000 */
+ {0.800000, 0.576471, 0.576471}, /* 0xcc9393 */
+ {0.498039, 0.623529, 0.498039}, /* 0x7f9f7f */
+ {0.815686, 0.749020, 0.560784}, /* 0xd0bf8f */
+ {0.423529, 0.627451, 0.639216}, /* 0x6ca0a3 */
+ {0.862745, 0.549020, 0.764706}, /* 0xdc8cc3 */
+ {0.576471, 0.878431, 0.890196}, /* 0x93e0e3 */
+ {0.862745, 0.862745, 0.800000}, /* 0xdcdccc */
};
-static const struct rgba colors_bright[] = {
- {0.000000, 0.000000, 0.000000, 1.000000}, /* 0x000000ff */
- {0.862745, 0.639216, 0.639216, 1.000000}, /* 0xdca3a3ff */
- {0.749020, 0.921569, 0.749020, 1.000000}, /* 0xbfebbfff */
- {0.941176, 0.874510, 0.686275, 1.000000}, /* 0xf0dfafff */
- {0.549020, 0.815686, 0.827451, 1.000000}, /* 0x8cd0d3ff */
- {0.862745, 0.549020, 0.764706, 1.000000}, /* 0xdc8cc3ff */
- {0.576471, 0.878431, 0.890196, 1.000000}, /* 0x93e0e3ff */
- {1.000000, 1.000000, 1.000000, 1.000000}, /* 0xffffffff */
+static const struct rgb colors_bright[] = {
+ {0.000000, 0.000000, 0.000000}, /* 0x000000 */
+ {0.862745, 0.639216, 0.639216}, /* 0xdca3a3 */
+ {0.749020, 0.921569, 0.749020}, /* 0xbfebbf */
+ {0.941176, 0.874510, 0.686275}, /* 0xf0dfaf */
+ {0.549020, 0.815686, 0.827451}, /* 0x8cd0d3 */
+ {0.862745, 0.549020, 0.764706}, /* 0xdc8cc3 */
+ {0.576471, 0.878431, 0.890196}, /* 0x93e0e3 */
+ {1.000000, 1.000000, 1.000000}, /* 0xffffff */
};
-static struct rgba colors256[256];
+static struct rgb colors256[256];
static void __attribute__((constructor))
initialize_colors256(void)
@@ -51,22 +51,20 @@ initialize_colors256(void)
for (size_t r = 0; r < 6; r++) {
for (size_t g = 0; g < 6; g++) {
for (size_t b = 0; b < 6; b++) {
- colors256[16 + r * 6 * 6 + g * 6 + b] = (struct rgba) {
+ colors256[16 + r * 6 * 6 + g * 6 + b] = (struct rgb) {
r * 51 / 255.0,
g * 51 / 255.0,
b * 51 / 255.0,
- 1.0,
};
}
}
}
for (size_t i = 0; i < 24; i++){
- colors256[232 + i] = (struct rgba) {
+ colors256[232 + i] = (struct rgb) {
i * 11 / 255.0,
i * 11 / 255.0,
i * 11 / 255.0,
- 1.0
};
}
}
@@ -152,11 +150,10 @@ csi_sgr(struct terminal *term)
uint8_t r = term->vt.params.v[i + 2].value;
uint8_t g = term->vt.params.v[i + 3].value;
uint8_t b = term->vt.params.v[i + 4].value;
- term->vt.attrs.foreground = (struct rgba) {
+ term->vt.attrs.foreground = (struct rgb) {
r / 255.0,
g / 255.0,
b / 255.0,
- 1.0,
};
term->vt.attrs.have_foreground = true;
i += 4;
@@ -199,11 +196,10 @@ csi_sgr(struct terminal *term)
uint8_t r = term->vt.params.v[i + 2].value;
uint8_t g = term->vt.params.v[i + 3].value;
uint8_t b = term->vt.params.v[i + 4].value;
- term->vt.attrs.background = (struct rgba) {
+ term->vt.attrs.background = (struct rgb) {
r / 255.0,
g / 255.0,
b / 255.0,
- 1.0
};
term->vt.attrs.have_background = true;
i += 4;
@@ -338,25 +334,26 @@ csi_dispatch(struct terminal *term, uint8_t final)
/* Erase screen */
int param = param_get(term, 0, 0);
- int start = -1;
- int end = -1;
switch (param) {
case 0:
/* From cursor to end of screen */
- start = term->cursor.linear;
- end = term->cols * term->rows;
+ term_erase(
+ term,
+ &term->cursor,
+ &(struct coord){term->cols - 1, term->rows - 1});
break;
case 1:
/* From start of screen to cursor */
- start = 0;
- end = term->cursor.linear;
+ term_erase(term, &(struct coord){0, 0}, &term->cursor);
break;
case 2:
/* Erase entire screen */
- start = 0;
- end = term->cols * term->rows;
+ term_erase(
+ term,
+ &(struct coord){0, 0},
+ &(struct coord){term->cols - 1, term->rows - 1});
break;
default:
@@ -365,8 +362,6 @@ csi_dispatch(struct terminal *term, uint8_t final)
abort();
break;
}
-
- term_erase(term, start, end);
break;
}
@@ -374,25 +369,27 @@ csi_dispatch(struct terminal *term, uint8_t final)
/* Erase line */
int param = param_get(term, 0, 0);
- int start = -1;
- int end = -1;
switch (param) {
case 0:
/* From cursor to end of line */
- start = term->cursor.linear;
- end = term_cursor_linear(term, term->cursor.row, term->cols);
+ term_erase(
+ term,
+ &term->cursor,
+ &(struct coord){term->cols - 1, term->cursor.row});
break;
case 1:
/* From start of line to cursor */
- start = term_cursor_linear(term, term->cursor.row, 0);
- end = term->cursor.linear;
+ term_erase(
+ term, &(struct coord){0, term->cursor.row}, &term->cursor);
break;
case 2:
/* Entire line */
- start = term_cursor_linear(term, term->cursor.row, 0);
- end = term_cursor_linear(term, term->cursor.row, term->cols);
+ term_erase(
+ term,
+ &(struct coord){0, term->cursor.row},
+ &(struct coord){term->cols - 1, term->cursor.row});
break;
default:
@@ -402,7 +399,6 @@ csi_dispatch(struct terminal *term, uint8_t final)
break;
}
- term_erase(term, start, end);
break;
}
@@ -453,15 +449,25 @@ csi_dispatch(struct terminal *term, uint8_t final)
int remaining = term->cols - (term->cursor.col + count);
/* 'Delete' characters by moving the remaining ones */
- memmove(&term->grid->cur_line[term->cursor.col],
- &term->grid->cur_line[term->cursor.col + count],
- remaining * sizeof(term->grid->cur_line[0]));
+ memmove(&term->grid->cur_row->cells[term->cursor.col],
+ &term->grid->cur_row->cells[term->cursor.col + count],
+ remaining * sizeof(term->grid->cur_row->cells[0]));
+#if 0
term_damage_update(term, term->cursor.linear, remaining);
+#else
+ term->grid->cur_row->dirty = true;
+#endif
/* Erase the remainder of the line */
term_erase(
+ term,
+ &(struct coord){term->cursor.col + remaining, term->cursor.row},
+ &(struct coord){term->cols - 1, term->cursor.row});
+#if 0
+ term_erase(
term, term->cursor.linear + remaining,
term->cursor.linear + remaining + count);
+#endif
break;
}
@@ -478,9 +484,16 @@ csi_dispatch(struct terminal *term, uint8_t final)
int count = min(
param_get(term, 0, 1), term->cols - term->cursor.col);
+ term_erase(
+ term,
+ &term->cursor,
+ &(struct coord){term->cursor.col + count, term->cursor.row});
+
+#if 0
memset(&term->grid->cur_line[term->cursor.col],
0, count * sizeof(term->grid->cur_line[0]));
term_damage_erase(term, term->cursor.linear, count);
+#endif
break;
}
@@ -630,8 +643,8 @@ csi_dispatch(struct terminal *term, uint8_t final)
tll_free(term->alt.damage);
tll_free(term->alt.scroll_damage);
- grid_memclear(term->grid, 0, term->rows * term->cols);
- term_damage_erase(term, 0, term->rows * term->cols);
+ //grid_memclear(term->grid, 0, term->rows * term->cols);
+ //term_damage_erase(term, 0, term->rows * term->cols);
}
break;