d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

loader: cursor off should restore display content

Browse Source 
When drawing cursor, we should store original display
content because there may be image data we would like to restore
when the cursor is removed.

PR:		254054
Reported by:	Jose Luis Duran
MFC after:	3 days
This commit is contained in:
Toomas Soome 2021-03-06 12:19:43 +02:00
parent 9d3b2bcf76
commit d708f23ebb
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
stand/common/gfx_fb.c
View File

@ -978,6 +978,7 @@ gfx_fb_fill(void *arg, const teken_rect_t *r, teken_char_t c,
static void static void
gfx_fb_cursor_draw(teken_gfx_t *state, const teken_pos_t *p, bool on) gfx_fb_cursor_draw(teken_gfx_t *state, const teken_pos_t *p, bool on)
{ {
unsigned x, y, width, height;
const uint8_t *glyph; const uint8_t *glyph;
int idx; int idx;
@ -985,10 +986,47 @@ gfx_fb_cursor_draw(teken_gfx_t *state, const teken_pos_t *p, bool on)
if (idx >= state->tg_tp.tp_col * state->tg_tp.tp_row) if (idx >= state->tg_tp.tp_col * state->tg_tp.tp_row)
return; return;
width = state->tg_font.vf_width;
height = state->tg_font.vf_height;
x = state->tg_origin.tp_col + p->tp_col * width;
y = state->tg_origin.tp_row + p->tp_row * height;
/*
* Save original display content to preserve image data.
*/
if (on) {
if (state->tg_cursor_image == NULL ||
state->tg_cursor_size != width * height * 4) {
free(state->tg_cursor_image);
state->tg_cursor_size = width * height * 4;
state->tg_cursor_image = malloc(state->tg_cursor_size);
}
if (state->tg_cursor_image != NULL) {
if (gfxfb_blt(state->tg_cursor_image,
GfxFbBltVideoToBltBuffer, x, y, 0, 0,
width, height, 0) != 0) {
free(state->tg_cursor_image);
state->tg_cursor_image = NULL;
}
}
} else {
/*
* Restore display from tg_cursor_image.
* If there is no image, restore char from screen_buffer.
*/
if (state->tg_cursor_image != NULL &&
gfxfb_blt(state->tg_cursor_image, GfxFbBltBufferToVideo,
0, 0, x, y, width, height, 0) == 0) {
state->tg_cursor = *p;
return;
}
}
glyph = font_lookup(&state->tg_font, screen_buffer[idx].c, glyph = font_lookup(&state->tg_font, screen_buffer[idx].c,
&screen_buffer[idx].a); &screen_buffer[idx].a);
gfx_bitblt_bitmap(state, glyph, &screen_buffer[idx].a, 0xff, on); gfx_bitblt_bitmap(state, glyph, &screen_buffer[idx].a, 0xff, on);
gfx_fb_printchar(state, p); gfx_fb_printchar(state, p);
state->tg_cursor = *p; state->tg_cursor = *p;
} }

2
stand/common/gfx_fb.h
View File

@ -210,6 +210,8 @@ typedef struct teken_gfx {
teken_t tg_teken; /* Teken core */ teken_t tg_teken; /* Teken core */
teken_pos_t tg_cursor; /* Where cursor was drawn */ teken_pos_t tg_cursor; /* Where cursor was drawn */
bool tg_cursor_visible; bool tg_cursor_visible;
uint8_t *tg_cursor_image; /* Memory for cursor */
size_t tg_cursor_size;
teken_pos_t tg_tp; /* Terminal dimensions */ teken_pos_t tg_tp; /* Terminal dimensions */
teken_pos_t tg_origin; /* Point of origin in pixels */ teken_pos_t tg_origin; /* Point of origin in pixels */
uint8_t *tg_glyph; /* Memory for glyph */ uint8_t *tg_glyph; /* Memory for glyph */