Merged revisions 5309-5406,5409-5422 via svnmerge from

svn://svn.netsurf-browser.org/branches/vince/netsurf-fb

........
  r5309 | vince | 2008-09-13 10:59:10 +0100 (Sat, 13 Sep 2008) | 2 lines
  
  first stab at framebuffer frontend
........
  r5313 | vince | 2008-09-14 15:08:52 +0100 (Sun, 14 Sep 2008) | 2 lines
  
  add line plotters
........
  r5314 | vince | 2008-09-14 15:28:12 +0100 (Sun, 14 Sep 2008) | 2 lines
  
  add rectangle plot to 16bpp plotters
........
  r5315 | vince | 2008-09-14 19:58:57 +0100 (Sun, 14 Sep 2008) | 2 lines
  
  improve 16bpp image plot
........
  r5316 | vince | 2008-09-15 00:35:32 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  abstract the os specific framebuffer init
........
  r5317 | vince | 2008-09-15 11:18:51 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  first cut of linux frontend
........
  r5318 | vince | 2008-09-15 12:01:00 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  remove junk includes
........
  r5319 | vince | 2008-09-15 12:09:02 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  make plotters OS agnostic again
........
  r5322 | vince | 2008-09-15 15:55:01 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  Linux frontend operates
........
  r5323 | vince | 2008-09-15 16:32:47 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  abstract out OS specific input
........
  r5326 | vince | 2008-09-15 19:21:01 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  Improve linux mode setting
........
  r5329 | vince | 2008-09-15 21:13:33 +0100 (Mon, 15 Sep 2008) | 2 lines
  
  improve text clipping
........
  r5339 | vince | 2008-09-16 00:07:57 +0100 (Tue, 16 Sep 2008) | 2 lines
  
  possibly fix text clipping issue
........
  r5342 | vince | 2008-09-16 00:39:36 +0100 (Tue, 16 Sep 2008) | 2 lines
  
  consolidate polygon plotters
........
  r5344 | dsilvers | 2008-09-16 10:21:06 +0100 (Tue, 16 Sep 2008) | 1 line
  
  Fix up the framebuffer target makefile a bit more, add some config options for it
........
  r5345 | dsilvers | 2008-09-16 10:22:19 +0100 (Tue, 16 Sep 2008) | 1 line
  
  Ensure the appropriate frontend is selected when building framebuffer
........
  r5346 | dsilvers | 2008-09-16 10:27:16 +0100 (Tue, 16 Sep 2008) | 1 line
  
  Update build system to support targetting separate framebuffer frontends in different build trees, update executable to be nsfb-blah
........
  r5350 | vince | 2008-09-16 17:15:04 +0100 (Tue, 16 Sep 2008) | 1 line
  
  Add -g to provide symbols for framebuffer link
........
  r5351 | vince | 2008-09-16 17:17:09 +0100 (Tue, 16 Sep 2008) | 1 line
  
  framebuffer scheduler now works, plotters tweaked, gui tracks window redraw requirements better, keypresses not duplicated under linux fb
........
  r5352 | dsilvers | 2008-09-16 17:38:53 +0100 (Tue, 16 Sep 2008) | 1 line
  
  Ensure we only allow one fetcher at a time
........
  r5361 | vince | 2008-09-17 11:48:44 +0100 (Wed, 17 Sep 2008) | 2 lines
  
  initial cursor support
........
  r5362 | vince | 2008-09-17 13:56:47 +0100 (Wed, 17 Sep 2008) | 2 lines
  
  add mouse handling
........
  r5363 | vince | 2008-09-17 14:14:44 +0100 (Wed, 17 Sep 2008) | 2 lines
  
  add framebuffer resources
........
  r5364 | vince | 2008-09-17 17:12:21 +0100 (Wed, 17 Sep 2008) | 2 lines
  
  add reasonable pointer
........
  r5366 | vince | 2008-09-17 17:17:25 +0100 (Wed, 17 Sep 2008) | 2 lines
  
  fix pointer alpha
........
  r5370 | vince | 2008-09-18 13:43:53 +0100 (Thu, 18 Sep 2008) | 2 lines
  
  warning squash and cleanup ready for trunk merge
........
  r5375 | vince | 2008-09-19 14:58:43 +0100 (Fri, 19 Sep 2008) | 2 lines
  
  Working mouse navigation
........
  r5377 | vince | 2008-09-20 14:06:22 +0100 (Sat, 20 Sep 2008) | 2 lines
  
  Improve scrolling
........
  r5378 | vince | 2008-09-20 14:46:46 +0100 (Sat, 20 Sep 2008) | 2 lines
  
  fix redraw issues with scrolling
........
  r5380 | vince | 2008-09-20 17:08:43 +0100 (Sat, 20 Sep 2008) | 3 lines
  
  Alter panning to use its own flag so it doesnt cause invalid redraw 
  operations 
........
  r5381 | vince | 2008-09-20 21:52:45 +0100 (Sat, 20 Sep 2008) | 2 lines
  
  add dummy framebuffer
........
  r5383 | vince | 2008-09-21 00:00:15 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  fix segfault when cursor is off teh bottom of teh screen
........
  r5384 | vince | 2008-09-21 00:06:08 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  fix off by one in pointer fix
........
  r5385 | vince | 2008-09-21 00:25:09 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  when fixing bloody silly off by one errors remember to fix *both* references
........
  r5387 | vince | 2008-09-21 00:38:13 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  last try at stopping the pointer segfault
........
  r5388 | vince | 2008-09-21 16:24:18 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  improve vertical text clipping
........
  r5392 | vince | 2008-09-21 23:11:51 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  Improve text plotters
........
  r5393 | vince | 2008-09-21 23:34:38 +0100 (Sun, 21 Sep 2008) | 2 lines
  
  fix 32bpp line plotting
........
  r5394 | vince | 2008-09-22 00:00:03 +0100 (Mon, 22 Sep 2008) | 2 lines
  
  Fix off by one error in line plotting clipping
........
  r5397 | vince | 2008-09-22 13:46:22 +0100 (Mon, 22 Sep 2008) | 2 lines
  
  Fix bitmap tileing
........
  r5398 | vince | 2008-09-22 17:46:02 +0100 (Mon, 22 Sep 2008) | 2 lines
  
  enable knockout renderer
........
  r5399 | vince | 2008-09-22 18:43:48 +0100 (Mon, 22 Sep 2008) | 2 lines
  
  ensure clipping region lies within window, caused by knockout renderer
........
  r5400 | vince | 2008-09-22 19:20:25 +0100 (Mon, 22 Sep 2008) | 2 lines
  
  update cursor to one swiped from X windows
........
  r5405 | vince | 2008-09-23 09:09:05 +0100 (Tue, 23 Sep 2008) | 2 lines
  
  fix vertical scroll limit
........
  r5412 | dsilvers | 2008-09-23 10:53:14 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Revert noisy fetcher patch
........
  r5413 | dsilvers | 2008-09-23 10:58:00 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Add header guards
........
  r5414 | dsilvers | 2008-09-23 11:31:31 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Tidy the region clipping slightly
........
  r5416 | dsilvers | 2008-09-23 12:05:00 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Rationalise how the framebuffer frontend finds resources and options
........
  r5418 | dsilvers | 2008-09-23 13:59:00 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Ensure options are overridden after load, and squash an fb_gui.c warning
........
  r5419 | dsilvers | 2008-09-23 14:20:07 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Support fb_mode and fb_device options
........
  r5420 | dsilvers | 2008-09-23 14:21:48 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Support option_fb_device in the able frontend
........
  r5421 | dsilvers | 2008-09-23 14:25:17 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Ensure target_blank is disabled
........
  r5422 | dsilvers | 2008-09-23 14:39:00 +0100 (Tue, 23 Sep 2008) | 1 line
  
  Rework linux fb frontend to support scanning and opening all event devices for input
........

svn path=/trunk/netsurf/; revision=5423

1 files changed, 266 insertions, 0 deletions

diff --git a/framebuffer/fb_1bpp_plotters.c b/framebuffer/fb_1bpp_plotters.c
new file mode 100644
index 000000000..f0abfef85
--- /dev/null
+++ b/framebuffer/fb_1bpp_plotters.c
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2008 Vincent Sanders <vince@simtec.co.uk>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf 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; version 2 of the License.
+ *
+ * NetSurf 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <string.h>
+#include <limits.h>
+
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "desktop/plotters.h"
+
+#include "framebuffer/fb_gui.h"
+#include "framebuffer/fb_plotters.h"
+#include "framebuffer/fb_bitmap.h"
+#include "framebuffer/fb_font.h"
+
+extern struct fb_info_s *fbinfo;
+
+
+static bool fb_1bpp_rectangle(int x0, int y0, int width, int height,
+			int line_width, colour c, bool dotted, bool dashed)
+{
+        LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, 
+             x0,y0,width,height,line_width,c,dotted,dashed));
+	return true;
+}
+
+static bool fb_1bpp_line(int x0, int y0, int x1, int y1, int width,
+			colour c, bool dotted, bool dashed)
+{
+        LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, 
+             x0,y0,x1,y1,width,c,dotted,dashed));
+
+	return true;
+}
+
+static bool fb_1bpp_polygon(int *p, unsigned int n, colour fill)
+{
+        LOG(("%s(%p, %d, 0x%lx)\n", __func__, p,n,fill));
+	return true;
+}
+
+
+static bool fb_1bpp_fill(int x0, int y0, int x1, int y1, colour c)
+{
+        int x;
+        int y;
+        int pent;
+
+        LOG(("%s(%d, %d, %d, %d, 0x%lx)\n", __func__, 
+             x0,y0,x1,y1,c));
+
+        if (c != 0)
+                pent = 0xff;
+        else
+                pent = 0;
+
+        fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1);
+     
+        x = x1 - x0;
+        for (y = y0; y < y1; y++) {
+                memset(fb_plotters_get_xy_loc(x0, y, fbinfo), pent, x);
+        }
+	return true;
+}
+
+static bool fb_1bpp_clg(colour c)
+{
+        LOG(("%s(%lx)\n", __func__, c));
+        fb_1bpp_fill(fb_plot_ctx.x0, 
+                     fb_plot_ctx.y0, 
+                     fb_plot_ctx.x1, 
+                     fb_plot_ctx.y1, 
+                     c);
+	return true;
+}
+
+
+static bool fb_1bpp_text(int x, int y, const struct css_style *style,
+                  const char *text, size_t length, colour bg, colour c)
+{
+        const struct fb_font_desc* fb_font = fb_get_font(style);
+        u8_t *video_char_start;
+        const u8_t *font_data;
+        int yloop;
+        unsigned char row;
+        int chr;
+
+        LOG(("%s(%d, %d, %p, %.*s , %d, 0x%lx, 0x%lx)\n", __func__, 
+             x,y,style,length,text,length,bg,c));
+
+        for (chr=0; chr < length; chr++) {
+                video_char_start = fb_plotters_get_xy_loc(x + (chr * (fb_font->width)), y, fbinfo);
+
+                /* move our font-data to the correct position */
+                font_data = fb_font->data + (text[chr] * fb_font->height);
+
+                for (yloop = 0; yloop < fb_font->height; yloop++) {
+                        row = font_data[yloop];
+                        *video_char_start = row;
+                        video_char_start += fbinfo->line_len;
+                }
+        }
+        return true;
+
+
+        /* copied from css/css.h - need to open the correct font here
+         * font properties *
+         css_font_family font_family;
+         struct {
+         css_font_size_type size;
+         union {
+         struct css_length length;
+         float absolute;
+         float percent;
+         } value;
+         } font_size;
+         css_font_style font_style;
+         css_font_variant font_variant;
+         css_font_weight font_weight;
+        */
+	return true;
+}
+
+static bool fb_1bpp_disc(int x, int y, int radius, colour c, bool filled)
+{
+        LOG(("%s(%d, %d, %d, 0x%lx, %d)\n", __func__, 
+             x, y, radius, c, filled));
+	return true;
+}
+
+static bool fb_1bpp_arc(int x, int y, int radius, int angle1, int angle2,
+	    		colour c)
+{
+        LOG(("x %d, y %d, radius %d, angle1 %d, angle2 %d, c 0x%lx",
+             x, y, radius, angle1, angle2, c));
+	return true;
+}
+
+static inline colour ablend(colour pixel)
+{
+        return pixel;
+}
+
+
+static bool fb_1bpp_bitmap(int x, int y, int width, int height,
+			struct bitmap *bitmap, colour bg, 
+                        struct content *content)
+{
+        u8_t *video_char_start;
+        colour *pixel = (colour *)bitmap->pixdata;
+        colour abpixel; /* alphablended pixel */
+        int xloop,yloop;
+
+        video_char_start = fb_plotters_get_xy_loc(x, y, fbinfo);
+
+        for (yloop = 0; yloop < height; yloop++) {
+                for (xloop = 0; xloop < width; xloop++) {
+                        abpixel = pixel[(yloop * bitmap->width) + xloop];
+                        if ((abpixel & 0xFF000000) != 0) {
+                                if ((abpixel & 0xFF000000) != 0xFF)
+                                        abpixel = ablend(abpixel);
+                                if (abpixel == 0)
+                                        video_char_start[xloop] |= (1 << (xloop % 8));
+                                else
+                                        video_char_start[xloop] &= ~(1 << (xloop % 8));
+
+                        }
+                }
+                video_char_start += fbinfo->line_len;
+        }
+
+	return true;
+}
+
+static bool fb_1bpp_bitmap_tile(int x, int y, int width, int height,
+			struct bitmap *bitmap, colour bg,
+			bool repeat_x, bool repeat_y, 
+                             struct content *content)
+{
+	unsigned long xf,yf,wf,hf;
+
+	if (!(repeat_x || repeat_y)) {
+		/* Not repeating at all, so just pass it on */
+		return fb_1bpp_bitmap(x,y,width,height,bitmap,bg,content);
+	}
+
+	for (xf = 0; xf < width; xf += bitmap->width) {
+		for(yf = 0;yf < height; yf += bitmap->height) {
+			if(width > xf+bitmap->width)
+			{
+				wf = width-(xf+bitmap->width);
+			}
+			else
+			{
+				wf=bitmap->width;
+			}
+
+			if(height > yf+bitmap->height)
+			{
+				hf = height-(yf+bitmap->height);
+			}
+			else
+			{
+				hf=bitmap->height;
+			}
+
+                        fb_1bpp_bitmap(x+xf, y+yf, wf, hf, bitmap, bg, content);
+
+		}
+	}
+
+	return true;
+}
+
+static bool fb_1bpp_flush(void)
+{
+        LOG(("%s()\n", __func__));
+	return true;
+}
+
+static bool fb_1bpp_path(float *p, unsigned int n, colour fill, float width,
+			colour c, float *transform)
+{
+        LOG(("%s(%f, %d, 0x%lx, %f, 0x%lx, %f)\n", __func__, 
+             *p, n, fill, width, c, *transform));
+	return true;
+}
+
+const struct plotter_table framebuffer_1bpp_plot = {
+	.clg = fb_1bpp_clg,
+	.rectangle = fb_1bpp_rectangle,
+	.line = fb_1bpp_line,
+	.polygon = fb_1bpp_polygon,
+	.fill = fb_1bpp_fill,
+	.clip = fb_clip,
+	.text = fb_1bpp_text,
+	.disc = fb_1bpp_disc,
+	.arc = fb_1bpp_arc,
+	.bitmap = fb_1bpp_bitmap,
+	.bitmap_tile = fb_1bpp_bitmap_tile,
+	.flush = fb_1bpp_flush, 
+	.path = fb_1bpp_path
+};
+
+/*
+ * Local Variables:
+ * c-basic-offset:8
+ * End:
+ */