summaryrefslogtreecommitdiff
path: root/userland/windowserver/draw.c
diff options
context:
space:
mode:
Diffstat (limited to 'userland/windowserver/draw.c')
-rw-r--r--userland/windowserver/draw.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/userland/windowserver/draw.c b/userland/windowserver/draw.c
index caa16a2..1794378 100644
--- a/userland/windowserver/draw.c
+++ b/userland/windowserver/draw.c
@@ -1,8 +1,6 @@
#include "draw.h"
#include <string.h>
-#define BPP 4
-
#define place_pixel(_p, _w, _h) \
{ *(uint32_t *)(disp->back_buffer + BPP * (_w) + (WIDTH * BPP * (_h))) = _p; }
@@ -24,9 +22,7 @@ void update_display(DISPLAY *disp) {
}
void draw_wallpaper(DISPLAY *disp) {
- for (int i = 0; i < disp->size / BPP; i++) {
- place_pixel_pos(0xFF00FF, i);
- }
+memcpy(disp->back_buffer, disp->wallpaper_buffer, disp->size);
}
void draw_mouse(DISPLAY *disp, int mouse_x, int mouse_y) {
@@ -45,11 +41,11 @@ void draw_window(DISPLAY *disp, const WINDOW *w) {
x = px;
y = py;
for (int i = 0; i < sy; i++) {
- if((i+py)*WIDTH + px > HEIGHT*WIDTH)
- break;
+ if ((i + py) * WIDTH + px > HEIGHT * WIDTH)
+ break;
uint32_t *ptr = disp->back_buffer + BPP * ((i + py) * WIDTH) + px * BPP;
- if(i*sx > HEIGHT*WIDTH)
- break;
+ if (i * sx > HEIGHT * WIDTH)
+ break;
uint32_t *bm = &w->bitmap_ptr[i * sx];
// ((uint8_t *)w->bitmap_ptr) + BPP * ((i + py) * WIDTH) + px * BPP;
for (int j = 0; j < sx; j++) {