From 4604f293b768aa806f951e260518c62b3f4367c1 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 12 Mar 2012 21:20:18 +0000 Subject: Removed unused plotter members. svn path=/trunk/netsurf/; revision=13511 --- atari/plot/plotter.h | 24 ++++++------ atari/plot/plotter_vdi.c | 99 ------------------------------------------------ 2 files changed, 12 insertions(+), 111 deletions(-) (limited to 'atari') diff --git a/atari/plot/plotter.h b/atari/plot/plotter.h index cf07d434f..838451572 100755 --- a/atari/plot/plotter.h +++ b/atari/plot/plotter.h @@ -48,14 +48,20 @@ #endif #define MAX_FRAMEBUFS 0x010 -#define C2P (1<<0) /* C2P convert buffer 1 to buffer 2 */ +#define C2P (1<<0) /* C2P convert buffer 1 to buffer 2 */ /* TODO: implement offscreen buffer switch */ -/* Plotter Flags: */ -#define PLOT_FLAG_OFFSCREEN 0x01 /* offsreen plotter should set/accept this flag */ -#define PLOT_FLAG_LOCKED 0x02 /* plotter should set this flag during screen updates */ -#define PLOT_FLAG_DITHER 0x04 /* true if the plotter shall dither images */ -#define PLOT_FLAG_TRANS 0x08 /* true if the plotter supports transparent operations */ +/* Plotter Option Flags: */ +#define PLOT_FLAG_DITHER 0x04 /* true if the plotter shall dither images */ +#define PLOT_FLAG_TRANS 0x08 /* true if the plotter supports transparent operations */ + +/* Plotter "feature" flags */ +#define PLOT_FLAG_HAS_DITHER 0x0400 +#define PLOT_FLAG_HAS_ALPHA 0x0800 +#define PLOT_FLAG_OFFSCREEN 0x1000 /* offsreen plotter should set this flag */ + +/* Plotter "internal" flags */ +#define PLOT_FLAG_LOCKED 0x08000 /* plotter should set this flag during screen updates */ /* Font Plotter flags: */ #define FONTPLOT_FLAG_MONOGLYPH 0x01 @@ -159,9 +165,6 @@ typedef void * (*_pmf_create_framebuffer)(GEM_PLOTTER self); typedef void * (*_pmf_switch_to_framebuffer)(GEM_PLOTTER self); typedef int (*_pmf_lock)(GEM_PLOTTER self); typedef int (*_pmf_unlock)(GEM_PLOTTER self); -typedef int (*_pmf_update_region)(GEM_PLOTTER self, GRECT region); -typedef int (*_pmf_update_screen_region)( GEM_PLOTTER self, GRECT region ); -typedef int (*_pmf_update_screen)(GEM_PLOTTER self); typedef int (*_pmf_put_pixel)(GEM_PLOTTER self, int x, int y, int color ); typedef int (*_pmf_copy_rect)(GEM_PLOTTER self, GRECT src, GRECT dst ); typedef int (*_pmf_clip)(GEM_PLOTTER self, const struct rect * clip ); @@ -205,9 +208,6 @@ struct s_gem_plotter _pmf_unlock unlock; _pmf_create_framebuffer create_framebuffer; _pmf_switch_to_framebuffer switch_to_framebuffer; - _pmf_update_region update_region; - _pmf_update_screen update_screen; - _pmf_update_screen_region update_screen_region; _pmf_put_pixel put_pixel; _pmf_copy_rect copy_rect; _pmf_clip clip; diff --git a/atari/plot/plotter_vdi.c b/atari/plot/plotter_vdi.c index 33eb8857f..f9b488d71 100755 --- a/atari/plot/plotter_vdi.c +++ b/atari/plot/plotter_vdi.c @@ -50,9 +50,6 @@ static int resize( GEM_PLOTTER self, int w, int h ); static int move( GEM_PLOTTER self, short x, short y ); static int lock( GEM_PLOTTER self ); static int unlock( GEM_PLOTTER self ); -static int update_region( GEM_PLOTTER self, GRECT region ); -static int update_screen_region( GEM_PLOTTER self, GRECT region ); -static int update_screen( GEM_PLOTTER self ); static int put_pixel(GEM_PLOTTER self, int x, int y, int color ); static int copy_rect( GEM_PLOTTER self, GRECT src, GRECT dst ); static int arc(GEM_PLOTTER self,int x, int y, int radius, int angle1, int angle2, const plot_style_t * pstyle); @@ -131,9 +128,6 @@ int ctor_plotter_vdi(GEM_PLOTTER self ) self->move = move; self->lock = lock; self->unlock = unlock; - self->update_region = update_region; - self->update_screen_region = update_screen_region; - self->update_screen = update_screen; self->put_pixel = put_pixel; self->copy_rect = copy_rect; self->clip = plotter_std_clip; @@ -347,99 +341,6 @@ static int unlock( GEM_PLOTTER self ) return( 1 ); } -/* - region specifies an rectangle within the framebuffer - calculation of screen coords is done automatically. -*/ -static int update_region( GEM_PLOTTER self, GRECT region ) -{ - int src_offs; - GRECT screen_area, tmp, visible; - short pxy[10]; - plotter_get_visible_grect( self, &visible ); - -/* - LOG(("%s: %s %d\n", (char*)__FILE__, __FUNCTION__, __LINE__)); - LOG(("region: x:%d, y:%d, w:%d, h:%d\n", region.g_x, region.g_y, region.g_w, region.g_h )); - LOG(("visible: x:%d, y:%d, w:%d, h:%d\n", visible.g_x, visible.g_y, visible.g_w, visible.g_h )); -*/ - /* sanitize region: */ - tmp = region; - if( !rc_intersect(&visible, &tmp) ) - return( 0 ); -/* - region is partially out of bottom or left: - if( region.g_x < self->visible.g_x ) - { - region.g_w = self->visible.g_x - region.g_x; - region.g_x = self->visible.g_x; - } - if( region.g_y < self->visible.g_y ) - { - region.g_h = self->visible.g_y - region.g_y; - region.g_y = self->visible.g_y; - } - region is partially out of top or right: - if( region.g_x + region.g_w > self->visible.g_x + self->visible.g_w ) - { - region.g_w = self->visible.g_w - region.g_x; - } - if( region.g_y + region.g_h > self->visible.g_y + self->visible.g_h ) - { - region.g_h = self->visible.g_h - region.g_y; - } - now region contains coords of framebuffer that needs redraw. -*/ - if( fbrect_to_screen( self, tmp, &screen_area) ) { - pxy[0] = screen_area.g_x; - pxy[1] = screen_area.g_y; - pxy[2] = screen_area.g_x + screen_area.g_w; - pxy[3] = screen_area.g_y; - pxy[4] = screen_area.g_x + screen_area.g_w; - pxy[5] = screen_area.g_y + screen_area.g_h; - pxy[6] = screen_area.g_x; - pxy[7] = screen_area.g_y + screen_area.g_h; - pxy[8] = screen_area.g_x; - pxy[9] = screen_area.g_y; - } - return( 1 ); -} - -/* - region specifies an rectangle within the screen, - calculation of framebuffer coords is done automatically. -*/ -static int update_screen_region( GEM_PLOTTER self, GRECT region ) -{ - LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__)); - - return( 1 ); -} - -/* Updates all visible parts of the framebuffer */ -static int update_screen( GEM_PLOTTER self ) -{ - GRECT target, src; - int src_offset; - int i,x; - LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__)); - if( !(PLOT_FLAG_OFFSCREEN & self->flags) ) - return( 0 ); - target.g_x = src.g_x = 0; - target.g_y = src.g_y = 0; - target.g_w = src.g_w = CURFB(self).w; - target.g_h = src.g_h = CURFB(self).h; - if( !fbrect_to_screen( self, target, &target ) ) - return( -1 ); - src_offset = get_pixel_offset( CURFB(self).vis_x, CURFB(self).vis_y, CURFB(self).w, self->bpp_virt ); - LOG(("area: x:%d ,y:%d ,w:%d ,h:%d, from: %p (offset: %d) \n", - target.g_x, target.g_y, - target.g_w, target.g_h, - ((char*)CURFB(self).mem)+src_offset, src_offset - )); - - return( 1 ); -} static int put_pixel(GEM_PLOTTER self, int x, int y, int color ) { LOG(("%s: %s\n", (char*)__FILE__, __FUNCTION__)); -- cgit v1.2.3