mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

yaft/terminal.h: fix compile with g++, remove DRCS stuff

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd6aa98f13
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-15 (Mon, 15 Jan 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2018-01-15 19:54:51 +01:00
committed by vanhofen
parent 8e59237a63
commit 0eecc56140
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/widget/yaft/terminal.h
View File

@@ -53,7 +53,7 @@ int set_cell(struct terminal_t *term, int y, int x, const struct glyph_t *glyphp
} }
cell.attribute = term->attribute; cell.attribute = term->attribute;
cell.width = glyphp->width; cell.width = (glyph_width)glyphp->width;
cell.has_pixmap = false; cell.has_pixmap = false;
cellp = &term->cells[y][x]; cellp = &term->cells[y][x];
@@ -170,6 +170,7 @@ void set_cursor(struct terminal_t *term, int y, int x)
term->wrap_occured = false; term->wrap_occured = false;
} }
#if 0
const struct glyph_t *drcs_glyph(struct terminal_t *term, uint32_t code) const struct glyph_t *drcs_glyph(struct terminal_t *term, uint32_t code)
{ {
/* DRCSMMv1 /* DRCSMMv1
@@ -188,6 +189,7 @@ const struct glyph_t *drcs_glyph(struct terminal_t *term, uint32_t code)
else else
return term->glyph[SUBSTITUTE_HALF]; return term->glyph[SUBSTITUTE_HALF];
} }
#endif
void addch(struct terminal_t *term, uint32_t code) void addch(struct terminal_t *term, uint32_t code)
{ {
@@ -201,7 +203,10 @@ void addch(struct terminal_t *term, uint32_t code)
if (width <= 0) /* zero width: not support comibining character */ if (width <= 0) /* zero width: not support comibining character */
return; return;
else if (0x100000 <= code && code <= 0x10FFFD) /* unicode private area: plane 16 (DRCSMMv1) */ else if (0x100000 <= code && code <= 0x10FFFD) /* unicode private area: plane 16 (DRCSMMv1) */
#if 0
glyphp = drcs_glyph(term, code); glyphp = drcs_glyph(term, code);
#endif
glyphp = term->glyph[SUBSTITUTE_HALF];
else if (code >= UCS2_CHARS /* yaft support only UCS2 */ else if (code >= UCS2_CHARS /* yaft support only UCS2 */
|| term->glyph[code] == NULL /* missing glyph */ || term->glyph[code] == NULL /* missing glyph */
|| term->glyph[code]->width != width) /* width unmatch */ || term->glyph[code]->width != width) /* width unmatch */
@@ -234,7 +239,7 @@ bool push_esc(struct terminal_t *term, uint8_t ch)
if ((term->esc.bp - term->esc.buf) >= term->esc.size) { /* buffer limit */ if ((term->esc.bp - term->esc.buf) >= term->esc.size) { /* buffer limit */
logging(DEBUG, "escape sequence length >= %d, term.esc.buf reallocated\n", term->esc.size); logging(DEBUG, "escape sequence length >= %d, term.esc.buf reallocated\n", term->esc.size);
offset = term->esc.bp - term->esc.buf; offset = term->esc.bp - term->esc.buf;
term->esc.buf = erealloc(term->esc.buf, term->esc.size * 2); term->esc.buf = (char *)erealloc(term->esc.buf, term->esc.size * 2);
term->esc.bp = term->esc.buf + offset; term->esc.bp = term->esc.buf + offset;
term->esc.size *= 2; term->esc.size *= 2;
} }
@@ -335,7 +340,9 @@ void term_die(struct terminal_t *term)
free(term->line_dirty); free(term->line_dirty);
free(term->tabstop); free(term->tabstop);
free(term->esc.buf); free(term->esc.buf);
#if 0
free(term->sixel.pixmap); free(term->sixel.pixmap);
#endif
for (int i = 0; i < term->lines; i++) for (int i = 0; i < term->lines; i++)
free(term->cells[i]); free(term->cells[i]);
@@ -360,14 +367,16 @@ bool term_init(struct terminal_t *term, int width, int height)
term->line_dirty = (bool *) ecalloc(term->lines, sizeof(bool)); term->line_dirty = (bool *) ecalloc(term->lines, sizeof(bool));
term->tabstop = (bool *) ecalloc(term->cols, sizeof(bool)); term->tabstop = (bool *) ecalloc(term->cols, sizeof(bool));
term->esc.buf = (char *) ecalloc(1, term->esc.size); term->esc.buf = (char *) ecalloc(1, term->esc.size);
#if 0
term->sixel.pixmap = (uint8_t *) ecalloc(width * height, BYTES_PER_PIXEL); term->sixel.pixmap = (uint8_t *) ecalloc(width * height, BYTES_PER_PIXEL);
#endif
term->cells = (struct cell_t **) ecalloc(term->lines, sizeof(struct cell_t *)); term->cells = (struct cell_t **) ecalloc(term->lines, sizeof(struct cell_t *));
for (int i = 0; i < term->lines; i++) for (int i = 0; i < term->lines; i++)
term->cells[i] = (struct cell_t *) ecalloc(term->cols, sizeof(struct cell_t)); term->cells[i] = (struct cell_t *) ecalloc(term->cols, sizeof(struct cell_t));
if (!term->line_dirty || !term->tabstop || !term->cells if (!term->line_dirty || !term->tabstop || !term->cells
|| !term->esc.buf || !term->sixel.pixmap) { || !term->esc.buf /*|| !term->sixel.pixmap*/) {
term_die(term); term_die(term);
return false; return false;
} }