mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-10 19:44:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove use of legacy plot interface

Browse Source 
svn path=/trunk/netsurf/; revision=9799
This commit is contained in:
Vincent Sanders 2010-01-09 00:12:23 +00:00
parent 44a834a08d
commit f7cc98752f
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
framebuffer/framebuffer.c
View File

@ -25,7 +25,6 @@
#include <libnsfb.h> #include <libnsfb.h>
#include <libnsfb_plot.h> #include <libnsfb_plot.h>
#include <libnsfb_legacy_plot.h>
#include <libnsfb_event.h> #include <libnsfb_event.h>
#include <libnsfb_cursor.h> #include <libnsfb_cursor.h>
@ -274,8 +273,7 @@ static bool
framebuffer_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style) framebuffer_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style)
{ {
nsfb_bbox_t rect; nsfb_bbox_t rect;
bool dotted = false; nsfb_plot_pen_t pen;
bool dashed = false;
rect.x0 = x0; rect.x0 = x0;
rect.y0 = y0; rect.y0 = y0;
@ -283,13 +281,20 @@ framebuffer_plot_line(int x0, int y0, int x1, int y1, const plot_style_t *style)
rect.y1 = y1; rect.y1 = y1;
if (style->stroke_type != PLOT_OP_TYPE_NONE) { if (style->stroke_type != PLOT_OP_TYPE_NONE) {
if (style->stroke_type == PLOT_OP_TYPE_DOT)
dotted = true;
if (style->stroke_type == PLOT_OP_TYPE_DASH) if (style->stroke_type == PLOT_OP_TYPE_DOT) {
dashed = true; pen.stroke_type = NFSB_PLOT_OPTYPE_PATTERN;
pen.stroke_pattern = 0xAAAAAAAA;
} else if (style->stroke_type == PLOT_OP_TYPE_DASH) {
pen.stroke_type = NFSB_PLOT_OPTYPE_PATTERN;
pen.stroke_pattern = 0xF0F0F0F0;
} else {
pen.stroke_type = NFSB_PLOT_OPTYPE_SOLID;
}
nsfb_plot_line(nsfb, &rect, style->stroke_width, style->stroke_colour, dotted, dashed); pen.stroke_colour = style->stroke_colour;
pen.stroke_width = style->stroke_width;
nsfb_plot_line(nsfb, &rect, &pen);
} }
return true; return true;
@ -308,8 +313,20 @@ framebuffer_plot_path(const float *p,
return true; return true;
} }
static bool
framebuffer_plot_clip(int x0, int y0, int x1, int y1)
{
nsfb_bbox_t clip;
clip.x0 = x0;
clip.y0 = y0;
clip.x1 = x1;
clip.y1 = y1;
return nsfb_plot_set_clip(nsfb, &clip);
}
struct plotter_table plot = { struct plotter_table plot = {
.clip = nsfb_lplot_clip, .clip = framebuffer_plot_clip,
.arc = framebuffer_plot_arc, .arc = framebuffer_plot_arc,
.disc = framebuffer_plot_disc, .disc = framebuffer_plot_disc,
.line = framebuffer_plot_line, .line = framebuffer_plot_line,
@ -370,8 +387,6 @@ framebuffer_initialise(int argc, char** argv)
return NULL; return NULL;
} }
nsfb_lplot_ctx(nsfb);
return nsfb; return nsfb;
} }