X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Ffbdev%2Fgfx.cc;h=1421348fccf50677f68f55425eb3b2362d6c334d;hp=7ebc656f1b13d29f69dc41be10aa433a721b3a58;hb=e2626c41c841dbbfb64ddf6341b4e23089036299;hpb=e4076629a736e957739c31cd20bbbbb70327023b
diff --git a/src/fbdev/gfx.cc b/src/fbdev/gfx.cc
index 7ebc656..1421348 100644
--- a/src/fbdev/gfx.cc
+++ b/src/fbdev/gfx.cc
@@ -1,3 +1,24 @@
+/*
+winnie - an experimental window system
+
+Copyright (C) 2013 Eleni Maria Stea
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+
+Author: Eleni Maria Stea
+*/
+
#ifdef WINNIE_FBDEV
#include
#include
@@ -20,6 +41,7 @@
static unsigned char *framebuffer;
static int dev_fd;
+static int rgb_order[3];
struct Graphics {
Rect screen_rect;
@@ -59,6 +81,10 @@ bool init_gfx()
gfx->screen_rect.height = sinfo.yres_virtual;
gfx->color_depth = sinfo.bits_per_pixel;
+ rgb_order[0] = sinfo.red.offset / 8;
+ rgb_order[1] = sinfo.green.offset / 8;
+ rgb_order[2] = sinfo.blue.offset / 8;
+
set_clipping_rect(gfx->screen_rect);
int sz = FRAMEBUFFER_SIZE(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth);
@@ -104,6 +130,7 @@ bool init_gfx()
void destroy_gfx()
{
clear_screen(0, 0, 0);
+ gfx_update(gfx->screen_rect);
if(dev_fd != -1) {
close(dev_fd);
@@ -160,9 +187,17 @@ void set_cursor_visibility(bool visible)
}
}
-void gfx_update()
+void gfx_update(const Rect &upd_rect)
{
- memcpy(framebuffer, gfx->pixmap->pixels, gfx->pixmap->width * gfx->pixmap->height * (gfx->color_depth / 8));
+ Rect rect = rect_intersection(upd_rect, gfx->screen_rect);
+ unsigned char *sptr = gfx->pixmap->pixels + (rect.y * gfx->screen_rect.width + rect.x) * 4;
+ unsigned char *dptr = framebuffer + (rect.y * gfx->screen_rect.width + rect.x) * 4;
+
+ for(int i=0; iscreen_rect.width * 4;
+ dptr += gfx->screen_rect.width * 4;
+ }
}
void wait_vsync()
@@ -173,4 +208,11 @@ void wait_vsync()
}
}
+void get_rgb_order(int *r, int *g, int *b)
+{
+ *r = rgb_order[0];
+ *g = rgb_order[1];
+ *b = rgb_order[2];
+}
+
#endif // WINNIE_FBDEV