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

yaft: simplify pointer arithmetics

Browse Source 
Origin commit data
------------------
Commit: c3cd2f68c6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-14 (Sun, 14 Jan 2018)
This commit is contained in:
Stefan Seyfried
2018-01-14 20:39:10 +01:00
committed by vanhofen
parent 8353fb83ba
commit 8779161383
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/widget/yaft/fb/common.h
View File

@@ -69,7 +69,7 @@ struct fb_info_t {
struct framebuffer_t { struct framebuffer_t {
int fd; /* file descriptor of framebuffer */ int fd; /* file descriptor of framebuffer */
uint8_t *buf; /* copy of framebuffer */ uint32_t *buf; /* copy of framebuffer */
#if 0 #if 0
uint8_t *fp; /* pointer of framebuffer */ uint8_t *fp; /* pointer of framebuffer */
uint8_t *wall; /* buffer for wallpaper */ uint8_t *wall; /* buffer for wallpaper */
@@ -333,7 +333,7 @@ bool fb_init(struct framebuffer_t *fb)
return false; return false;
#endif #endif
fb->buf = (uint8_t *)fb->info.cfb->getBackBufferPointer(); fb->buf = (uint32_t *)fb->info.cfb->getBackBufferPointer();
/* os dependent initialize */ /* os dependent initialize */
if (!set_fbinfo(fb->fd, &fb->info)) if (!set_fbinfo(fb->fd, &fb->info))
return false; //goto set_fbinfo_failed; return false; //goto set_fbinfo_failed;
@@ -476,8 +476,8 @@ static inline void draw_line(struct framebuffer_t *fb, struct terminal_t *term,
color_pair.bg = color_pair.fg; color_pair.bg = color_pair.fg;
for (w = 0; w < CELL_WIDTH; w++) { for (w = 0; w < CELL_WIDTH; w++) {
pos = (term->width - 1 - margin_right - w) * fb->info.bytes_per_pixel pos = (term->width - 1 - margin_right - w)
+ (line * CELL_HEIGHT + h) * fb->info.line_length; + (line * CELL_HEIGHT + h) * fb->info.width;
/* set color palette */ /* set color palette */
if (cellp->glyphp->bitmap[h] & (0x01 << (bdf_padding + w))) if (cellp->glyphp->bitmap[h] & (0x01 << (bdf_padding + w)))
@@ -490,7 +490,8 @@ static inline void draw_line(struct framebuffer_t *fb, struct terminal_t *term,
pixel = fb->real_palette[color_pair.bg]; pixel = fb->real_palette[color_pair.bg];
/* update copy buffer only */ /* update copy buffer only */
memcpy(fb->buf + pos, &pixel, fb->info.bytes_per_pixel); //memcpy(fb->buf + pos, &pixel, fb->info.bytes_per_pixel);
fb->buf[pos] = pixel;
} }
} }
} }