gfx: move over memory pointer

4 files changed, 7 insertions, 6 deletions

diff --git a/fb-gui.c b/fb-gui.c
index 091254a..ac6e2d8 100644
--- a/fb-gui.c
+++ b/fb-gui.c
@@ -100,7 +100,7 @@ void shadow_render(gfxstate *gfx)
     for (i = 0; i < sheight; i++, offset += gfx->stride) {
 	if (0 == sdirty[i])
 	    continue;
-	shadow_render_line(gfx, i, fb_mem + offset, shadow[i]);
+	shadow_render_line(gfx, i, gfx->mem + offset, shadow[i]);
 	sdirty[i] = 0;
     }
 }
@@ -566,5 +566,5 @@ FT_Face font_open(char *fcname)
 void fb_clear_screen(gfxstate *gfx)
 {
     if (visible)
-	fb_memset(fb_mem,0,gfx->stride * gfx->vdisplay);
+	fb_memset(gfx->mem, 0, gfx->stride * gfx->vdisplay);
 }
diff --git a/fbtools.c b/fbtools.c
index 49afb2c..9618e7a 100644
--- a/fbtools.c
+++ b/fbtools.c
@@ -34,8 +34,6 @@ static const char *strsignal(int signr)
 /* -------------------------------------------------------------------- */
 /* exported stuff                                                       */
 
-unsigned char             *fb_mem;
-int			   fb_mem_offset = 0;
 int                        fb_switch_state = FB_ACTIVE;
 
 /* -------------------------------------------------------------------- */
@@ -43,6 +41,8 @@ int                        fb_switch_state = FB_ACTIVE;
 
 static struct fb_fix_screeninfo  fb_fix;
 static struct fb_var_screeninfo  fb_var;
+static unsigned char             *fb_mem;
+static int			 fb_mem_offset = 0;
 
 static int                       fb,tty;
 
@@ -524,6 +524,8 @@ gfxstate* fb_init(char *device, char *mode, int vt)
     gfx->hdisplay        = fb_var.xres;
     gfx->vdisplay        = fb_var.yres;
     gfx->stride          = fb_fix.line_length;
+    gfx->mem             = fb_mem;
+
     gfx->rlen            = fb_var.red.length;
     gfx->glen            = fb_var.green.length;
     gfx->blen            = fb_var.blue.length;
diff --git a/fbtools.h b/fbtools.h
index ae53231..363a163 100644
--- a/fbtools.h
+++ b/fbtools.h
@@ -6,8 +6,6 @@
 #define FB_ACQ_REQ   3
 
 /* info about videomode - yes I know, quick & dirty... */
-extern unsigned char             *fb_mem;
-extern int			  fb_mem_offset;
 extern int                        fb_switch_state;
 
 /* init + cleanup */
diff --git a/gfx.h b/gfx.h
index 77ab172..817664c 100644
--- a/gfx.h
+++ b/gfx.h
@@ -7,6 +7,7 @@ struct gfxstate {
     uint32_t hdisplay;
     uint32_t vdisplay;
     uint32_t stride;
+    uint8_t  *mem;
 
     uint32_t bits_per_pixel;
     uint32_t rlen, glen, blen, tlen;