diff --git a/src/font_pango.c b/src/font_pango.c index cc1804a..871b04c 100644 --- a/src/font_pango.c +++ b/src/font_pango.c @@ -771,11 +771,11 @@ int font_screen_draw_perform(struct font_screen *screen, float *m) static const float ver[] = { -1, -1, 1, -1, -1, 1, 1, -1, 1, 1, -1, 1 }; static const float tex[] = { 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1 }; const struct uterm_video_buffer buf = { - .data = (void*)screen->buf->data, .width = screen->buf->width, .height = screen->buf->height, .stride = screen->buf->stride, - .bpp = 4, + .format = UTERM_FORMAT_XRGB32, + .data = (void*)screen->buf->data, }; if (!screen) diff --git a/src/uterm.h b/src/uterm.h index c014c4b..89a89bb 100644 --- a/src/uterm.h +++ b/src/uterm.h @@ -158,12 +158,18 @@ struct uterm_video_hotplug { int action; }; +enum uterm_video_format { + UTERM_FORMAT_MONO, + UTERM_FORMAT_GREY, + UTERM_FORMAT_XRGB32, +}; + struct uterm_video_buffer { - uint8_t *data; unsigned int width; unsigned int height; unsigned int stride; - unsigned int bpp; + unsigned int format; + uint8_t *data; }; typedef void (*uterm_video_cb) (struct uterm_video *video, diff --git a/src/uterm_video_dumb.c b/src/uterm_video_dumb.c index 11ba722..44f9e67 100644 --- a/src/uterm_video_dumb.c +++ b/src/uterm_video_dumb.c @@ -376,7 +376,7 @@ static int display_blit(struct uterm_display *disp, return -EINVAL; if (!buf || !video_is_awake(disp->video)) return -EINVAL; - if (buf->bpp != 4) + if (buf->format != UTERM_FORMAT_XRGB32) return -EINVAL; tmp = x + width; @@ -394,10 +394,10 @@ static int display_blit(struct uterm_display *disp, dst = rb->map; dst = &dst[y * rb->stride + x * 4]; - src = &buf->data[y * buf->stride + x * buf->bpp]; + src = &buf->data[y * buf->stride + x * 4]; while (--height) { - memcpy(dst, src, buf->bpp * width); + memcpy(dst, src, 4 * width); dst += rb->stride; src += buf->stride; } diff --git a/src/uterm_video_fbdev.c b/src/uterm_video_fbdev.c index 2f87620..16785ec 100644 --- a/src/uterm_video_fbdev.c +++ b/src/uterm_video_fbdev.c @@ -359,7 +359,7 @@ static int display_blit(struct uterm_display *disp, return -EINVAL; if (!buf || !video_is_awake(disp->video)) return -EINVAL; - if (buf->bpp != disp->fbdev.bpp) + if (buf->format != UTERM_FORMAT_XRGB32) return -EINVAL; tmp = x + width; @@ -378,10 +378,10 @@ static int display_blit(struct uterm_display *disp, else dst = &disp->fbdev.map[disp->fbdev.yres * disp->fbdev.stride]; dst = &dst[y * disp->fbdev.stride + x * disp->fbdev.bpp]; - src = &buf->data[y * buf->stride + x * buf->bpp]; + src = &buf->data[y * buf->stride + x * 4]; while (--height) { - memcpy(dst, src, buf->bpp * width); + memcpy(dst, src, 4 * width); dst += disp->fbdev.stride; src += buf->stride; }