diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | Makefile.config | 2 | ||||
| -rw-r--r-- | Makefile.sources | 3 | ||||
| -rw-r--r-- | framebuffer/fb_frontend.h | 1 | ||||
| -rw-r--r-- | framebuffer/fb_frontend_sdl.c | 119 | ||||
| -rw-r--r-- | framebuffer/fb_gui.c | 2 |
6 files changed, 147 insertions, 0 deletions
@@ -515,6 +515,26 @@ ifeq ($(TARGET),framebuffer) 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 # ---------------------------------------------------------------------------- diff --git a/Makefile.config b/Makefile.config index fe693dd4d..76aab6547 100644 --- a/Makefile.config +++ b/Makefile.config @@ -213,10 +213,12 @@ ifeq ($(TARGET),framebuffer) 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 diff --git a/Makefile.sources b/Makefile.sources index b5e8a58aa..c6cff38ac 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -111,6 +111,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)) diff --git a/framebuffer/fb_frontend.h b/framebuffer/fb_frontend.h index b202f09b1..cbb53d061 100644 --- a/framebuffer/fb_frontend.h +++ b/framebuffer/fb_frontend.h @@ -23,5 +23,6 @@ extern framebuffer_t *fb_os_init(int argc, char** argv); 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 */ diff --git a/framebuffer/fb_frontend_sdl.c b/framebuffer/fb_frontend_sdl.c new file mode 100644 index 000000000..42b327dff --- /dev/null +++ b/framebuffer/fb_frontend_sdl.c @@ -0,0 +1,119 @@ +/* + * 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 <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: + */ + diff --git a/framebuffer/fb_gui.c b/framebuffer/fb_gui.c index 04ae9a7df..32d399876 100644 --- a/framebuffer/fb_gui.c +++ b/framebuffer/fb_gui.c @@ -125,6 +125,8 @@ static void fb_redraw(struct gui_window *g) 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; g->redraw_box.y1 = g->redraw_box.x1 = -(INT_MAX); |