r6415 vince - in /trunk/netsurf: Makefile Makefile.config
Makefile.sources
framebuffer/fb_frontend.h framebuffer/fb_frontend_sdl.c framebuffer/fb_gui.c
netsurf at semichrome.net
netsurf at semichrome.net
Wed Feb 11 00:20:03 GMT 2009
Author: vince
Date: Tue Feb 10 18:20:02 2009
New Revision: 6415
URL: http://source.netsurf-browser.org?rev=6415&view=rev
Log:
add SDL frontend for framebuffer port
Added:
trunk/netsurf/framebuffer/fb_frontend_sdl.c
Modified:
trunk/netsurf/Makefile
trunk/netsurf/Makefile.config
trunk/netsurf/Makefile.sources
trunk/netsurf/framebuffer/fb_frontend.h
trunk/netsurf/framebuffer/fb_gui.c
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=6415&r1=6414&r2=6415&view=diff
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Tue Feb 10 18:20:02 2009
@@ -515,6 +515,26 @@
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
SUBTARGET := -dummy
endif
+
+ ifeq ($(NETSURF_FB_FRONTEND),sdl)
+ $(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG rendering))
+ $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,RISC OS sprite rendering))
+ $(eval $(call pkg_config_find_and_add,HUBBUB,libhubbub,Hubbub HTML parser))
+ $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,NetSurf BMP decoder))
+ $(eval $(call pkg_config_find_and_add,GIF,libnsgif,NetSurf GIF decoder))
+# $(eval $(call pkg_config_find_and_add,SDL,libSDL,SDL Library))
+
+
+ CFLAGS += -std=c99 -g -I. $(WARNFLAGS) \
+ $(shell xml2-config --cflags) \
+ -D_BSD_SOURCE \
+ -D_XOPEN_SOURCE=600 \
+ -D_POSIX_C_SOURCE=200112L
+
+ LDFLAGS += -lxml2 -lz -ljpeg -lcurl -lm -lSDL
+ LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
+ SUBTARGET := -sdl
+ endif
endif
# ----------------------------------------------------------------------------
Modified: trunk/netsurf/Makefile.config
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.config?rev=6415&r1=6414&r2=6415&view=diff
==============================================================================
--- trunk/netsurf/Makefile.config (original)
+++ trunk/netsurf/Makefile.config Tue Feb 10 18:20:02 2009
@@ -213,10 +213,12 @@
NETSURF_FB_RESPATH_linux := /usr/share/netsurf/
NETSURF_FB_RESPATH_able := (tftpboot)/
NETSURF_FB_RESPATH_dummy := ./
+ NETSURF_FB_RESPATH_sdl := ./
NETSURF_FB_HOMEPATH_linux := ~/.netsurf/
NETSURF_FB_HOMEPATH_able := (tftpboot)/
NETSURF_FB_HOMEPATH_dummy := ./
+ NETSURF_FB_HOMEPATH_sdl := ~/.netsurf/
endif
Modified: trunk/netsurf/Makefile.sources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=6415&r1=6414&r2=6415&view=diff
==============================================================================
--- trunk/netsurf/Makefile.sources (original)
+++ trunk/netsurf/Makefile.sources Tue Feb 10 18:20:02 2009
@@ -110,6 +110,9 @@
endif
ifeq ($(NETSURF_FB_FRONTEND),dummy)
S_FRAMEBUFFER += fb_frontend_dummy.c
+endif
+ifeq ($(NETSURF_FB_FRONTEND),sdl)
+S_FRAMEBUFFER += fb_frontend_sdl.c
endif
S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER))
Modified: trunk/netsurf/framebuffer/fb_frontend.h
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_frontend.h?rev=6415&r1=6414&r2=6415&view=diff
==============================================================================
--- trunk/netsurf/framebuffer/fb_frontend.h (original)
+++ trunk/netsurf/framebuffer/fb_frontend.h Tue Feb 10 18:20:02 2009
@@ -23,5 +23,6 @@
extern void fb_os_quit(framebuffer_t *fb);
extern void fb_os_input(struct gui_window *g);
extern void fb_os_option_override(void);
+extern void fb_os_redraw(struct gui_window *g, struct bbox_s *box);
#endif /* NETSURF_FB_FRONTEND_H */
Added: trunk/netsurf/framebuffer/fb_frontend_sdl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_frontend_sdl.c?rev=6415&view=auto
==============================================================================
--- trunk/netsurf/framebuffer/fb_frontend_sdl.c (added)
+++ trunk/netsurf/framebuffer/fb_frontend_sdl.c Tue Feb 10 18:20:02 2009
@@ -1,0 +1,119 @@
+/*
+ * Copyright 2008 Vincent Sanders <vince at 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 <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <SDL/SDL.h>
+
+#include "css/css.h"
+#include "desktop/options.h"
+#include "desktop/gui.h"
+#include "desktop/options.h"
+#include "utils/messages.h"
+
+#include "framebuffer/fb_gui.h"
+#include "framebuffer/fb_plotters.h"
+#include "framebuffer/fb_frontend.h"
+
+#include "utils/log.h"
+
+#define FILE_PFX "/home/vince/netsurf/netsurf/framebuffer/res/"
+
+static SDL_Surface *sdl_screen;
+
+framebuffer_t *fb_os_init(int argc, char** argv)
+{
+ framebuffer_t *newfb;
+
+ newfb = calloc(1, sizeof(framebuffer_t));
+ if (newfb == NULL)
+ return NULL;
+
+ if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
+ fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
+ return NULL;
+ }
+ atexit(SDL_Quit);
+
+ newfb->width = 800;
+ newfb->height = 600;
+ newfb->bpp = 16;
+
+ sdl_screen = SDL_SetVideoMode(newfb->width,
+ newfb->height,
+ newfb->bpp,
+ SDL_SWSURFACE);
+
+ if ( sdl_screen == NULL ) {
+ fprintf(stderr,
+ "Unable to set video: %s\n", SDL_GetError());
+ free(newfb);
+ return NULL;
+ }
+
+ newfb->ptr = sdl_screen->pixels;
+ newfb->linelen = sdl_screen->pitch;
+
+ return newfb;
+}
+
+void fb_os_quit(framebuffer_t *fb)
+{
+ free(fb->ptr);
+}
+
+void fb_os_input(struct gui_window *g)
+{
+ SDL_Event event;
+
+ SDL_PollEvent(&event);//SDL_WaitEvent(&event);
+
+ switch (event.type) {
+ case SDL_KEYDOWN:
+ printf("The %s key was pressed!\n",
+ SDL_GetKeyName(event.key.keysym.sym));
+ break;
+
+ case SDL_QUIT:
+ browser_window_destroy(g->bw);
+ }
+
+}
+
+void
+fb_os_option_override(void)
+{
+}
+
+void
+fb_os_redraw(struct gui_window *g, struct bbox_s *box)
+{
+ SDL_UpdateRect(sdl_screen, box->x0, box->y0, box->x1, box->y1);
+}
+
+/*
+ * Local Variables:
+ * c-basic-offset:8
+ * End:
+ */
+
Modified: trunk/netsurf/framebuffer/fb_gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_gui.c?rev=6415&r1=6414&r2=6415&view=diff
==============================================================================
--- trunk/netsurf/framebuffer/fb_gui.c (original)
+++ trunk/netsurf/framebuffer/fb_gui.c Tue Feb 10 18:20:02 2009
@@ -124,6 +124,8 @@
content_redraw(c, 0, -g->scrolly, g->width, g->height,
g->redraw_box.x0, g->redraw_box.y0, g->redraw_box.x1, g->redraw_box.y1,
g->bw->scale, 0xFFFFFF);
+
+ fb_os_redraw(g, &g->redraw_box);
g->redraw_required = false;
g->redraw_box.y0 = g->redraw_box.x0 = INT_MAX;
More information about the netsurf-commits
mailing list