November 2011 - netsurf-commits - listmaster.pepperfish.net

r13162 tlsa - /trunk/netsurf/utils/nsurl.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Nov 23 10:27:20 2011 New Revision: 13162 URL: http://source.netsurf-browser.org?rev=13162&view=rev Log: Don't escape '|'. Modified: trunk/netsurf/utils/nsurl.c Modified: trunk/netsurf/utils/nsurl.c URL: http://source.netsurf-browser.org/trunk/netsurf/utils/nsurl.c?rev=13162&r... ============================================================================== --- trunk/netsurf/utils/nsurl.c (original) +++ trunk/netsurf/utils/nsurl.c Wed Nov 23 10:27:20 2011 @@ -98,7 +98,7 @@ false, true, true, true, true, true, true, true, /* 60 */ true, true, true, true, true, true, true, true, /* 68 */ true, true, true, true, true, true, true, true, /* 70 */ - true, true, true, false, false, false, true, false, /* 78 */ + true, true, true, false, true, false, true, false, /* 78 */ false, false, false, false, false, false, false, false, /* 80 */ false, false, false, false, false, false, false, false, /* 88 */ false, false, false, false, false, false, false, false, /* 90 */

11 years, 10 months

1
0
0 / 0

r13161 jmb - in /trunk/netsurf: content/urldb.c test/urldbtest.c

by netsurf＠semichrome.net

Author: jmb Date: Mon Nov 21 18:34:06 2011 New Revision: 13161 URL: http://source.netsurf-browser.org?rev=13161&view=rev Log: Fix cookie expiration Modified: trunk/netsurf/content/urldb.c trunk/netsurf/test/urldbtest.c Modified: trunk/netsurf/content/urldb.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.c?rev=13161... ============================================================================== --- trunk/netsurf/content/urldb.c (original) +++ trunk/netsurf/content/urldb.c Mon Nov 21 18:34:06 2011 @@ -120,7 +120,7 @@ char *domain; /**< Domain */ bool path_from_set; /**< Path came from Set-Cookie: header */ char *path; /**< Path */ - time_t expires; /**< Expiry timestamp, or 1 for session */ + time_t expires; /**< Expiry timestamp, or -1 for session */ time_t last_used; /**< Last used time */ bool secure; /**< Only send for HTTPS requests */ cookie_version version; /**< Specification compliance */ @@ -2505,7 +2505,7 @@ /* Consider all cookies associated with * this exact path */ for (c = q->cookies; c; c = c->next) { - if (c->expires != 1 && c->expires < now) + if (c->expires != -1 && c->expires < now) /* cookie has expired => ignore */ continue; @@ -2537,7 +2537,7 @@ continue; for (c = q->cookies; c; c = c->next) { - if (c->expires != 1 && c->expires < now) + if (c->expires != -1 && c->expires < now) /* cookie has expired => ignore */ continue; @@ -2573,7 +2573,7 @@ /* Consider p itself - may be the result of Path=/foo */ for (c = p->cookies; c; c = c->next) { - if (c->expires != 1 && c->expires < now) + if (c->expires != -1 && c->expires < now) /* cookie has expired => ignore */ continue; @@ -2604,7 +2604,7 @@ for (h = (const struct host_part *)p; h && h != &db_root; h = h->parent) { for (c = h->paths.cookies; c; c = c->next) { - if (c->expires != 1 && c->expires < now) + if (c->expires != -1 && c->expires < now) /* cookie has expired => ignore */ continue; @@ -3180,9 +3180,6 @@ c->path = path; } - if (c->expires == -1) - c->expires = 1; - /* Write back current position */ *cookie = cur; @@ -3308,6 +3305,7 @@ struct cookie_internal_data *d; const struct host_part *h; struct path_data *p; + time_t now = time(NULL); assert(c && scheme && url); @@ -3355,7 +3353,7 @@ } if (d) { - if (c->expires == 0) { + if (c->expires != -1 && c->expires < now) { /* remove cookie */ if (d->next) d->next->prev = d->prev; @@ -3856,8 +3854,8 @@ struct cookie_internal_data *c; for (c = p->cookies; c != NULL; c = c->next) { - if (c->expires < now) - /* Skip expired cookies */ + if (c->expires == -1 || c->expires < now) + /* Skip expired & session cookies */ continue; fprintf(fp, Modified: trunk/netsurf/test/urldbtest.c URL: http://source.netsurf-browser.org/trunk/netsurf/test/urldbtest.c?rev=1316... ============================================================================== --- trunk/netsurf/test/urldbtest.c (original) +++ trunk/netsurf/test/urldbtest.c Mon Nov 21 18:34:06 2011 @@ -247,6 +247,12 @@ assert(urldb_set_cookie("foo=bar; domain=.example.tld\r\n", "http://www.foo.example.tld/", "http://bar.example.tld/")); assert(strcmp(urldb_get_cookie("http://www.foo.example.tld/"), "foo=bar") == 0); + /* Test expiry */ + assert(urldb_set_cookie("foo=bar", "http://expires.com/", NULL)); + assert(strcmp(urldb_get_cookie("http://expires.com/"), "foo=bar") == 0); + assert(urldb_set_cookie("foo=bar; expires=Thu, 01-Jan-1970 00:00:01 GMT\r\n", "http://expires.com/", NULL)); + assert(urldb_get_cookie("http://expires.com/") == NULL); + urldb_dump(); printf("PASS\n");

11 years, 10 months

1
0
0 / 0

r13160 jmb - in /trunk/netsurf/desktop: textarea.c textarea.h

by netsurf＠semichrome.net

Author: jmb Date: Mon Nov 21 03:09:28 2011 New Revision: 13160 URL: http://source.netsurf-browser.org?rev=13160&view=rev Log: Committing textarea_set_dimensions patch from Ole Loots. Modified: trunk/netsurf/desktop/textarea.c trunk/netsurf/desktop/textarea.h Modified: trunk/netsurf/desktop/textarea.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textarea.c?rev=13... ============================================================================== --- trunk/netsurf/desktop/textarea.c (original) +++ trunk/netsurf/desktop/textarea.c Mon Nov 21 03:09:28 2011 @@ -1444,3 +1444,18 @@ if (height != NULL) *height = ta->vis_height; } + +/** + * Set the dimensions of a textarea, causing a reflow and + * emitting a redraw request. + * + * \param width the new width of the textarea + * \param height the new height of the textarea + */ +void textarea_set_dimensions(struct text_area *ta, int width, int height) +{ + ta->vis_width = width; + ta->vis_height = height; + textarea_reflow(ta, 0); + ta->redraw_request(ta->data, 0, 0, ta->vis_width, ta->vis_height); +} Modified: trunk/netsurf/desktop/textarea.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textarea.h?rev=13... ============================================================================== --- trunk/netsurf/desktop/textarea.h (original) +++ trunk/netsurf/desktop/textarea.h Mon Nov 21 03:09:28 2011 @@ -54,6 +54,6 @@ bool textarea_drag_end(struct text_area *ta, browser_mouse_state mouse, int x, int y); void textarea_get_dimensions(struct text_area *ta, int *width, int *height); - +void textarea_set_dimensions(struct text_area *ta, int width, int height); #endif

11 years, 10 months

1
0
0 / 0

r13159 vince - in /trunk/netsurf/framebuffer: ./ fbtk/

by netsurf＠semichrome.net

Author: vince Date: Mon Nov 21 02:45:08 2011 New Revision: 13159 URL: http://source.netsurf-browser.org?rev=13159&view=rev Log: Update for modified libnsfb API Make thumbnailing work Removed: trunk/netsurf/framebuffer/bitmap.h Modified: trunk/netsurf/framebuffer/Makefile.target trunk/netsurf/framebuffer/bitmap.c trunk/netsurf/framebuffer/convert_image.c trunk/netsurf/framebuffer/fbtk.h trunk/netsurf/framebuffer/fbtk/bitmap.c trunk/netsurf/framebuffer/fbtk/event.c trunk/netsurf/framebuffer/fbtk/fbtk.c trunk/netsurf/framebuffer/fbtk/osk.c trunk/netsurf/framebuffer/fbtk/scroll.c trunk/netsurf/framebuffer/fbtk/user.c trunk/netsurf/framebuffer/fbtk/widget.h trunk/netsurf/framebuffer/framebuffer.c trunk/netsurf/framebuffer/framebuffer.h trunk/netsurf/framebuffer/gui.c trunk/netsurf/framebuffer/image_data.h trunk/netsurf/framebuffer/localhistory.c trunk/netsurf/framebuffer/thumbnail.c Modified: trunk/netsurf/framebuffer/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/Makefile.targ... ============================================================================== --- trunk/netsurf/framebuffer/Makefile.target (original) +++ trunk/netsurf/framebuffer/Makefile.target Mon Nov 21 02:45:08 2011 @@ -74,7 +74,7 @@ # We make convert_image depend on fb_bitmap.h so that if we change # that header, we get new images built just in case. -$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/bitmap.h +$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/fbtk.h $(VQ)echo " HOST CC: $@" $(Q)$(HOST_CC) -o $@ framebuffer/convert_image.c -lpng Modified: trunk/netsurf/framebuffer/bitmap.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/bitmap.c?rev=... ============================================================================== --- trunk/netsurf/framebuffer/bitmap.c (original) +++ trunk/netsurf/framebuffer/bitmap.c Mon Nov 21 02:45:08 2011 @@ -18,11 +18,12 @@ #include <inttypes.h> #include <sys/types.h> - -#include "assert.h" +#include <stdbool.h> +#include <assert.h> + +#include <libnsfb.h> + #include "image/bitmap.h" -#include "framebuffer/bitmap.h" - #include "utils/log.h" /** @@ -36,26 +37,29 @@ void *bitmap_create(int width, int height, unsigned int state) { - struct bitmap *bitmap; + nsfb_t *bm; LOG(("width %d, height %d, state %u",width,height,state)); - bitmap = calloc(1 , sizeof(struct bitmap)); - if (bitmap) { - bitmap->pixdata = calloc(4, width * height); - if (bitmap->pixdata != NULL) { - bitmap->width = width; - bitmap->height = height; - bitmap->opaque = (state & BITMAP_OPAQUE) != 0; - } else { - free(bitmap); - bitmap=NULL; - } - } - - LOG(("bitmap %p", bitmap)); - - return bitmap; + bm = nsfb_new(NSFB_SURFACE_RAM); + if (bm == NULL) { + return NULL; + } + + if ((state & BITMAP_OPAQUE) == 0) { + nsfb_set_geometry(bm, width, height, NSFB_FMT_ABGR8888); + } else { + nsfb_set_geometry(bm, width, height, NSFB_FMT_XBGR8888); + } + + if (nsfb_init(bm) == -1) { + nsfb_free(bm); + return NULL; + } + + LOG(("bitmap %p", bm)); + + return bm; } @@ -71,14 +75,14 @@ unsigned char *bitmap_get_buffer(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return NULL; - } - - return bm->pixdata; + nsfb_t *bm = bitmap; + unsigned char *bmpptr; + + assert(bm != NULL); + + nsfb_get_buffer(bm, &bmpptr, NULL); + + return bmpptr; } @@ -91,14 +95,14 @@ size_t bitmap_get_rowstride(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return 0; - } - - return (bm->width) * 4; + nsfb_t *bm = bitmap; + int bmpstride; + + assert(bm != NULL); + + nsfb_get_buffer(bm, NULL, &bmpstride); + + return bmpstride; } @@ -110,15 +114,11 @@ void bitmap_destroy(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return; - } - - free(bm->pixdata); - free(bm); + nsfb_t *bm = bitmap; + + assert(bm != NULL); + + nsfb_free(bm); } @@ -158,22 +158,24 @@ } /** - * Sets whether a bitmap should be plotted opaque + * Sets wether a bitmap should be plotted opaque * * \param bitmap a bitmap, as returned by bitmap_create() * \param opaque whether the bitmap should be plotted opaque */ void bitmap_set_opaque(void *bitmap, bool opaque) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return; - } + nsfb_t *bm = bitmap; + + assert(bm != NULL); LOG(("setting bitmap %p to %s", bm, opaque?"opaque":"transparent")); - bm->opaque = opaque; + + if (opaque) { + nsfb_set_geometry(bm, 0, 0, NSFB_FMT_XBGR8888); + } else { + nsfb_set_geometry(bm, 0, 0, NSFB_FMT_ABGR8888); + } } @@ -186,17 +188,21 @@ bool bitmap_test_opaque(void *bitmap) { int tst; - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return false; - } - - tst = bm->width * bm->height; + nsfb_t *bm = bitmap; + unsigned char *bmpptr; + int width; + int height; + + assert(bm != NULL); + + nsfb_get_buffer(bm, &bmpptr, NULL); + + nsfb_get_geometry(bm, &width, &height, NULL); + + tst = width * height; while (tst-- > 0) { - if (bm->pixdata[(tst << 2) + 3] != 0xff) { + if (bmpptr[(tst << 2) + 3] != 0xff) { LOG(("bitmap %p has transparency",bm)); return false; } @@ -207,46 +213,50 @@ /** - * Gets whether a bitmap should be plotted opaque + * Gets weather a bitmap should be plotted opaque * * \param bitmap a bitmap, as returned by bitmap_create() */ bool bitmap_get_opaque(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return false; - } - - return bm->opaque; + nsfb_t *bm = bitmap; + enum nsfb_format_e format; + + assert(bm != NULL); + + nsfb_get_geometry(bm, NULL, NULL, &format); + + if (format == NSFB_FMT_ABGR8888) + return false; + + return true; } int bitmap_get_width(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return 0; - } - - return(bm->width); + nsfb_t *bm = bitmap; + int width; + + assert(bm != NULL); + + nsfb_get_geometry(bm, &width, NULL, NULL); + + return(width); } int bitmap_get_height(void *bitmap) { - struct bitmap *bm = bitmap; - - if (bitmap == NULL) { - LOG(("NULL bitmap!")); - return 0; - } - - return(bm->height); -} - + nsfb_t *bm = bitmap; + int height; + + assert(bm != NULL); + + nsfb_get_geometry(bm, NULL, &height, NULL); + + return(height); +} + +/* get bytes per pixel */ size_t bitmap_get_bpp(void *bitmap) { return 4; Removed: trunk/netsurf/framebuffer/bitmap.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/bitmap.h?rev=... ============================================================================== --- trunk/netsurf/framebuffer/bitmap.h (original) +++ trunk/netsurf/framebuffer/bitmap.h (removed) @@ -1,33 +1,0 @@ -/* - * Copyright 2008 Vincent Sanders <vince(a)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/>. - */ - -#ifndef FRAMEBUFFER_BITMAP_H -#define FRAMEBUFFER_BITMAP_H - -struct bitmap { - int width; - int height; - uint8_t *pixdata; - bool opaque; - - /* The following two are only used for cursors */ - int hot_x; - int hot_y; -}; - -#endif Modified: trunk/netsurf/framebuffer/convert_image.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/convert_image... ============================================================================== --- trunk/netsurf/framebuffer/convert_image.c (original) +++ trunk/netsurf/framebuffer/convert_image.c Mon Nov 21 02:45:08 2011 @@ -177,7 +177,10 @@ fprintf(f, "#include <sys/types.h>\n\n"); fprintf(f, "#include <stdint.h>\n\n"); fprintf(f, "#include <stdbool.h>\n\n"); - fprintf(f, "#include \"framebuffer/bitmap.h\"\n\n"); + fprintf(f, "#include <libnsfb.h>\n\n"); + fprintf(f, "#include \"desktop/plot_style.h\"\n"); + fprintf(f, "#include \"framebuffer/gui.h\"\n"); + fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n"); fprintf(f, "static uint8_t %s_pixdata[] = {\n", argv[3]); for (y = 0; y < HEIGHT; ++y) { @@ -197,7 +200,7 @@ } fprintf(f, "};\n\n"); - fprintf(f, "struct bitmap %s = {\n", argv[3]); + fprintf(f, "struct fbtk_bitmap %s = {\n", argv[3]); fprintf(f, "\t.width\t\t= %d,\n", WIDTH); fprintf(f, "\t.height\t\t= %d,\n", HEIGHT); fprintf(f, "\t.hot_x\t\t= %d,\n", HOT_X); Modified: trunk/netsurf/framebuffer/fbtk.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk.h?rev=13... ============================================================================== --- trunk/netsurf/framebuffer/fbtk.h (original) +++ trunk/netsurf/framebuffer/fbtk.h Mon Nov 21 02:45:08 2011 @@ -61,6 +61,18 @@ fbtk_widget_t *widget; } fbtk_callback_info; +/* structure for framebuffer toolkit bitmaps */ +struct fbtk_bitmap { + int width; + int height; + uint8_t *pixdata; + bool opaque; + + /* The following two are only used for cursors */ + int hot_x; + int hot_y; +}; + typedef int (*fbtk_callback)(fbtk_widget_t *widget, fbtk_callback_info *cbi); /* enter pressed on writable icon */ @@ -349,9 +361,9 @@ * @param window The window to add the bitmap widget to. * @return new widget handle or NULL on error. */ -fbtk_widget_t *fbtk_create_bitmap(fbtk_widget_t *window, int x, int y, int width, int height, colour c,struct bitmap *image); - -void fbtk_set_bitmap(fbtk_widget_t *widget, struct bitmap *image); +fbtk_widget_t *fbtk_create_bitmap(fbtk_widget_t *window, int x, int y, int width, int height, colour c,struct fbtk_bitmap *image); + +void fbtk_set_bitmap(fbtk_widget_t *widget, struct fbtk_bitmap *image); /** Create a button widget. * @@ -361,7 +373,7 @@ * @param window The window to add the button widget to. * @return new widget handle or NULL on error. */ -fbtk_widget_t *fbtk_create_button(fbtk_widget_t *window, int x, int y, int width, int height, colour c, struct bitmap *image, fbtk_callback click, void *pw); +fbtk_widget_t *fbtk_create_button(fbtk_widget_t *window, int x, int y, int width, int height, colour c, struct fbtk_bitmap *image, fbtk_callback click, void *pw); Modified: trunk/netsurf/framebuffer/fbtk/bitmap.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/bitmap.c... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/bitmap.c (original) +++ trunk/netsurf/framebuffer/fbtk/bitmap.c Mon Nov 21 02:45:08 2011 @@ -28,7 +28,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -#include "framebuffer/bitmap.h" #include "framebuffer/image_data.h" #include "widget.h" @@ -70,7 +69,7 @@ /* exported function documented in fbtk.h */ void -fbtk_set_bitmap(fbtk_widget_t *widget, struct bitmap *image) +fbtk_set_bitmap(fbtk_widget_t *widget, struct fbtk_bitmap *image) { if ((widget == NULL) || (widget->type != FB_WIDGET_TYPE_BITMAP)) return; @@ -88,7 +87,7 @@ int width, int height, colour c, - struct bitmap *image) + struct fbtk_bitmap *image) { fbtk_widget_t *neww; @@ -111,7 +110,7 @@ int width, int height, colour c, - struct bitmap *image, + struct fbtk_bitmap *image, fbtk_callback click, void *pw) { Modified: trunk/netsurf/framebuffer/fbtk/event.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/event.c?... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/event.c (original) +++ trunk/netsurf/framebuffer/fbtk/event.c Mon Nov 21 02:45:08 2011 @@ -37,7 +37,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -#include "framebuffer/bitmap.h" #include "framebuffer/image_data.h" #include "widget.h" Modified: trunk/netsurf/framebuffer/fbtk/fbtk.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/fbtk.c?r... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/fbtk.c (original) +++ trunk/netsurf/framebuffer/fbtk/fbtk.c Mon Nov 21 02:45:08 2011 @@ -38,7 +38,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -#include "framebuffer/bitmap.h" #include "framebuffer/image_data.h" #include "widget.h" @@ -337,7 +336,7 @@ fbtk_set_ptr(fbtk_widget_t *widget, fbtk_callback_info *cbi) { fbtk_widget_t *root = fbtk_get_root_widget(widget); - struct bitmap *bm = cbi->context; + struct fbtk_bitmap *bm = cbi->context; nsfb_cursor_set(root->u.root.fb, (nsfb_colour_t *)bm->pixdata, Modified: trunk/netsurf/framebuffer/fbtk/osk.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/osk.c?re... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/osk.c (original) +++ trunk/netsurf/framebuffer/fbtk/osk.c Mon Nov 21 02:45:08 2011 @@ -31,7 +31,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -#include "framebuffer/bitmap.h" #include "framebuffer/image_data.h" #include "widget.h" Modified: trunk/netsurf/framebuffer/fbtk/scroll.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/scroll.c... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/scroll.c (original) +++ trunk/netsurf/framebuffer/fbtk/scroll.c Mon Nov 21 02:45:08 2011 @@ -30,7 +30,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -#include "framebuffer/bitmap.h" #include "framebuffer/image_data.h" #include "widget.h" Modified: trunk/netsurf/framebuffer/fbtk/user.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/user.c?r... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/user.c (original) +++ trunk/netsurf/framebuffer/fbtk/user.c Mon Nov 21 02:45:08 2011 @@ -19,7 +19,7 @@ */ #include <stdlib.h> - +#include <stdbool.h> #include <libnsfb.h> #include "desktop/plotters.h" Modified: trunk/netsurf/framebuffer/fbtk/widget.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk/widget.h... ============================================================================== --- trunk/netsurf/framebuffer/fbtk/widget.h (original) +++ trunk/netsurf/framebuffer/fbtk/widget.h Mon Nov 21 02:45:08 2011 @@ -165,7 +165,7 @@ /* bitmap */ struct { - struct bitmap *bitmap; + struct fbtk_bitmap *bitmap; } bitmap; /* text */ Modified: trunk/netsurf/framebuffer/framebuffer.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/framebuffer.c... ============================================================================== --- trunk/netsurf/framebuffer/framebuffer.c (original) +++ trunk/netsurf/framebuffer/framebuffer.c Mon Nov 21 02:45:08 2011 @@ -30,11 +30,11 @@ #include "utils/log.h" #include "desktop/browser.h" +#include "image/bitmap.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" #include "framebuffer/framebuffer.h" -#include "framebuffer/bitmap.h" #include "framebuffer/font.h" /* netsurf framebuffer library handle */ @@ -175,8 +175,10 @@ nsfb_bbox_t clipbox; bool repeat_x = (flags & BITMAPF_REPEAT_X); bool repeat_y = (flags & BITMAPF_REPEAT_Y); - - nsfb_plot_get_clip(nsfb, &clipbox); + int bmwidth; + int bmheight; + unsigned char *bmptr; + nsfb_t *bm = (nsfb_t *)bitmap; /* x and y define coordinate of top left of of the initial explicitly * placed tile. The width and height are the image scaling and the @@ -191,26 +193,19 @@ loc.x1 = loc.x0 + width; loc.y1 = loc.y0 + height; - if ((bitmap->width == 1) && (bitmap->height == 1)) { - if ((*(nsfb_colour_t *)bitmap->pixdata & 0xff000000) == 0) { - return true; - } - return nsfb_plot_rectangle_fill(nsfb, &loc, *(nsfb_colour_t *)bitmap->pixdata); - - } else { - return nsfb_plot_bitmap(nsfb, &loc, - (nsfb_colour_t *)bitmap->pixdata, - bitmap->width, bitmap->height, - bitmap->width, !bitmap->opaque); - } - } + return nsfb_plot_copy(bm, NULL, nsfb, &loc); + } + + nsfb_plot_get_clip(nsfb, &clipbox); + nsfb_get_geometry(bm, &bmwidth, &bmheight, NULL); + nsfb_get_buffer(bm, &bmptr, NULL); /* Optimise tiled plots of 1x1 bitmaps by replacing with a flat fill * of the area. Can only be done when image is fully opaque. */ - if ((bitmap->width == 1) && (bitmap->height == 1)) { - if ((*(nsfb_colour_t *)bitmap->pixdata & 0xff000000) != 0) { + if ((bmwidth == 1) && (bmheight == 1)) { + if ((*(nsfb_colour_t *)bmptr & 0xff000000) != 0) { return nsfb_plot_rectangle_fill(nsfb, &clipbox, - *(nsfb_colour_t *)bitmap->pixdata); + *(nsfb_colour_t *)bmptr); } } @@ -218,11 +213,11 @@ * a flat fill of the area. Can only be done when image is fully * opaque. */ if ((width == 1) && (height == 1)) { - if (bitmap->opaque) { + if (bitmap_get_opaque(bm)) { /** TODO: Currently using top left pixel. Maybe centre * pixel or average value would be better. */ return nsfb_plot_rectangle_fill(nsfb, &clipbox, - *(nsfb_colour_t *)bitmap->pixdata); + *(nsfb_colour_t *)bmptr); } } @@ -243,10 +238,8 @@ loc.x1 = loc.x0 + width; loc.y1 = loc.y0 + height; - nsfb_plot_bitmap(nsfb, &loc, - (nsfb_colour_t *)bitmap->pixdata, - bitmap->width, bitmap->height, - bitmap->width, !bitmap->opaque); + nsfb_plot_copy(bm, NULL, nsfb, &loc); + if (!repeat_y) break; } @@ -359,31 +352,63 @@ nsfb_t * framebuffer_initialise(const char *fename, int width, int height, int bpp) { - enum nsfb_frontend_e fetype; - - fetype = nsfb_frontend_from_name(fename); - if (fetype == NSFB_FRONTEND_NONE) { - LOG(("The %s frontend is not available from libnsfb\n", fename)); + enum nsfb_type_e fbtype; + enum nsfb_format_e fbfmt; + + /* bpp is a proxy for the framebuffer format */ + switch (bpp) { + case 32: + fbfmt = NSFB_FMT_XRGB8888; + break; + + case 24: + fbfmt = NSFB_FMT_RGB888; + break; + + case 16: + fbfmt = NSFB_FMT_RGB565; + break; + + case 8: + fbfmt = NSFB_FMT_I8; + break; + + case 4: + fbfmt = NSFB_FMT_I4; + break; + + case 1: + fbfmt = NSFB_FMT_I1; + break; + + default: + LOG(("Bad bits per pixel (%d)\n", bpp)); + return NULL; + } + + fbtype = nsfb_type_from_name(fename); + if (fbtype == NSFB_SURFACE_NONE) { + LOG(("The %s surface is not available from libnsfb\n", fename)); return NULL; } - nsfb = nsfb_init(fetype); + nsfb = nsfb_new(fbtype); if (nsfb == NULL) { - LOG(("Unable to initialise nsfb with %s frontend\n", fename)); + LOG(("Unable to create %s fb surface\n", fename)); return NULL; } - if (nsfb_set_geometry(nsfb, width, height, bpp) == -1) { - LOG(("Unable to set geometry\n")); - nsfb_finalise(nsfb); + if (nsfb_set_geometry(nsfb, width, height, fbfmt) == -1) { + LOG(("Unable to set surface geometry\n")); + nsfb_free(nsfb); return NULL; } nsfb_cursor_init(nsfb); - if (nsfb_init_frontend(nsfb) == -1) { - LOG(("Unable to initialise nsfb frontend\n")); - nsfb_finalise(nsfb); + if (nsfb_init(nsfb) == -1) { + LOG(("Unable to initialise nsfb surface\n")); + nsfb_free(nsfb); return NULL; } @@ -394,11 +419,19 @@ void framebuffer_finalise(void) { - nsfb_finalise(nsfb); + nsfb_free(nsfb); } bool -framebuffer_set_cursor(struct bitmap *bm) +framebuffer_set_cursor(struct fbtk_bitmap *bm) { return nsfb_cursor_set(nsfb, (nsfb_colour_t *)bm->pixdata, bm->width, bm->height, bm->width); } + +nsfb_t *framebuffer_set_surface(nsfb_t *new_nsfb) +{ + nsfb_t *old_nsfb; + old_nsfb = nsfb; + nsfb = new_nsfb; + return old_nsfb; +} Modified: trunk/netsurf/framebuffer/framebuffer.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/framebuffer.h... ============================================================================== --- trunk/netsurf/framebuffer/framebuffer.h (original) +++ trunk/netsurf/framebuffer/framebuffer.h Mon Nov 21 02:45:08 2011 @@ -4,4 +4,10 @@ nsfb_t *framebuffer_initialise(const char *fename, int width, int height, int bpp); void framebuffer_finalise(void); -bool framebuffer_set_cursor(struct bitmap *bm); +bool framebuffer_set_cursor(struct fbtk_bitmap *bm); + +/** Set framebuffer surface to render into + * + * @return return old surface + */ +nsfb_t *framebuffer_set_surface(nsfb_t *new_nsfb); Modified: trunk/netsurf/framebuffer/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/gui.c?rev=131... ============================================================================== --- trunk/netsurf/framebuffer/gui.c (original) +++ trunk/netsurf/framebuffer/gui.c Mon Nov 21 02:45:08 2011 @@ -49,7 +49,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" #include "framebuffer/framebuffer.h" -#include "framebuffer/bitmap.h" #include "framebuffer/schedule.h" #include "framebuffer/findfile.h" #include "framebuffer/image_data.h" @@ -222,7 +221,7 @@ dstbox.y1 = dstbox.y0 + height + bwidget->pany; /* move part that remains visible up */ - nsfb_plot_copy(nsfb, &srcbox, &dstbox); + nsfb_plot_copy(nsfb, &srcbox, nsfb, &dstbox); /* redraw newly exposed area */ bwidget->scrolly += bwidget->pany; @@ -242,7 +241,7 @@ dstbox.y1 = dstbox.y0 + height - bwidget->pany; /* move part that remains visible down */ - nsfb_plot_copy(nsfb, &srcbox, &dstbox); + nsfb_plot_copy(nsfb, &srcbox, nsfb, &dstbox); /* redraw newly exposed area */ bwidget->scrolly += bwidget->pany; @@ -262,7 +261,7 @@ dstbox.y1 = dstbox.y0 + height; /* move part that remains visible left */ - nsfb_plot_copy(nsfb, &srcbox, &dstbox); + nsfb_plot_copy(nsfb, &srcbox, nsfb, &dstbox); /* redraw newly exposed area */ bwidget->scrollx += bwidget->panx; @@ -282,7 +281,7 @@ dstbox.y1 = dstbox.y0 + height; /* move part that remains visible right */ - nsfb_plot_copy(nsfb, &srcbox, &dstbox); + nsfb_plot_copy(nsfb, &srcbox, nsfb, &dstbox); /* redraw newly exposed area */ bwidget->scrollx += bwidget->panx; @@ -1391,7 +1390,7 @@ throbber_advance(void *pw) { struct gui_window *g = pw; - struct bitmap *image; + struct fbtk_bitmap *image; switch (g->throbber_index) { case 0: Modified: trunk/netsurf/framebuffer/image_data.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/image_data.h?... ============================================================================== --- trunk/netsurf/framebuffer/image_data.h (original) +++ trunk/netsurf/framebuffer/image_data.h Mon Nov 21 02:45:08 2011 @@ -19,39 +19,39 @@ #ifndef FB_IMAGE_DATA #define FB_IMAGE_DATA -#include "framebuffer/bitmap.h" +#include "framebuffer/fbtk.h" -extern struct bitmap left_arrow; -extern struct bitmap right_arrow; -extern struct bitmap reload; -extern struct bitmap stop_image; -extern struct bitmap history_image; +extern struct fbtk_bitmap left_arrow; +extern struct fbtk_bitmap right_arrow; +extern struct fbtk_bitmap reload; +extern struct fbtk_bitmap stop_image; +extern struct fbtk_bitmap history_image; -extern struct bitmap left_arrow_g; -extern struct bitmap right_arrow_g; -extern struct bitmap reload_g; -extern struct bitmap stop_image_g; -extern struct bitmap history_image_g; +extern struct fbtk_bitmap left_arrow_g; +extern struct fbtk_bitmap right_arrow_g; +extern struct fbtk_bitmap reload_g; +extern struct fbtk_bitmap stop_image_g; +extern struct fbtk_bitmap history_image_g; -extern struct bitmap scrolll; -extern struct bitmap scrollr; -extern struct bitmap scrollu; -extern struct bitmap scrolld; +extern struct fbtk_bitmap scrolll; +extern struct fbtk_bitmap scrollr; +extern struct fbtk_bitmap scrollu; +extern struct fbtk_bitmap scrolld; -extern struct bitmap pointer_image; -extern struct bitmap hand_image; -extern struct bitmap caret_image; -extern struct bitmap menu_image; -extern struct bitmap progress_image; +extern struct fbtk_bitmap pointer_image; +extern struct fbtk_bitmap hand_image; +extern struct fbtk_bitmap caret_image; +extern struct fbtk_bitmap menu_image; +extern struct fbtk_bitmap progress_image; -extern struct bitmap throbber0; -extern struct bitmap throbber1; -extern struct bitmap throbber2; -extern struct bitmap throbber3; -extern struct bitmap throbber4; -extern struct bitmap throbber5; -extern struct bitmap throbber6; -extern struct bitmap throbber7; -extern struct bitmap throbber8; +extern struct fbtk_bitmap throbber0; +extern struct fbtk_bitmap throbber1; +extern struct fbtk_bitmap throbber2; +extern struct fbtk_bitmap throbber3; +extern struct fbtk_bitmap throbber4; +extern struct fbtk_bitmap throbber5; +extern struct fbtk_bitmap throbber6; +extern struct fbtk_bitmap throbber7; +extern struct fbtk_bitmap throbber8; #endif /* FB_IMAGE_DATA */ Modified: trunk/netsurf/framebuffer/localhistory.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/localhistory.... ============================================================================== --- trunk/netsurf/framebuffer/localhistory.c (original) +++ trunk/netsurf/framebuffer/localhistory.c Mon Nov 21 02:45:08 2011 @@ -45,7 +45,6 @@ #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" #include "framebuffer/framebuffer.h" -#include "framebuffer/bitmap.h" #include "framebuffer/schedule.h" #include "framebuffer/findfile.h" #include "framebuffer/image_data.h" Modified: trunk/netsurf/framebuffer/thumbnail.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/thumbnail.c?r... ============================================================================== --- trunk/netsurf/framebuffer/thumbnail.c (original) +++ trunk/netsurf/framebuffer/thumbnail.c Mon Nov 21 02:45:08 2011 @@ -16,14 +16,80 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <stdbool.h> + +#include <libnsfb.h> +#include <libnsfb_plot.h> + +#include "utils/log.h" #include "desktop/thumbnail.h" #include "content/urldb.h" -bool -thumbnail_create(struct hlcache_handle *content, +#include "framebuffer/gui.h" +#include "framebuffer/fbtk.h" +#include "framebuffer/framebuffer.h" + +bool +thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap, const char *url) { + nsfb_t *tbm = (nsfb_t *)bitmap; /* target bitmap */ + nsfb_t *bm; /* temporary bitmap */ + nsfb_t *current; /* current main fb */ + int width, height; /* target bitmap width height */ + int cwidth, cheight;/* content width /height */ + nsfb_bbox_t loc; + + struct redraw_context ctx = { + .interactive = false, + .plot = &fb_plotters + }; + + + nsfb_get_geometry(tbm, &width, &height, NULL); + + LOG(("width %d, height %d", width, height)); + + /* Calculate size of buffer to render the content into */ + /* We get the width from the content width, unless it exceeds 1024, + * in which case we use 1024. This means we never create excessively + * large render buffers for huge contents, which would eat memory and + * cripple performance. */ + cwidth = min(content_get_width(content), 1024); + /* The height is set in proportion with the width, according to the + * aspect ratio of the required thumbnail. */ + cheight = ((cwidth * height) + (width / 2)) / width; + + /* create temporary surface */ + bm = nsfb_new(NSFB_SURFACE_RAM); + if (bm == NULL) { + return false; + } + + nsfb_set_geometry(bm, cwidth, cheight, NSFB_FMT_XBGR8888); + + if (nsfb_init(bm) == -1) { + nsfb_free(bm); + return false; + } + + current = framebuffer_set_surface(bm); + + /* render the content into temporary surface */ + thumbnail_redraw(content, cwidth, cheight, &ctx); + + framebuffer_set_surface(current); + + loc.x0 = 0; + loc.y0 = 0; + loc.x1 = width; + loc.y1 = height; + + nsfb_plot_copy(bm, NULL, tbm, &loc); + + nsfb_free(bm); + /* register the thumbnail with the URL */ if (url != NULL) urldb_set_thumbnail(url, bitmap);

11 years, 10 months

1
0
0 / 0

r13158 vince - in /trunk/libnsfb: ./ include/ src/ src/plot/ src/surface/ test/

by netsurf＠semichrome.net

Author: vince Date: Mon Nov 21 02:44:10 2011 New Revision: 13158 URL: http://source.netsurf-browser.org?rev=13158&view=rev Log: Improve API to allow for RAM surfaces instead of direct blitting Improve and update tests Fix RAM surface Fix VNC surface Added: trunk/libnsfb/include/surface.h - copied, changed from r13146, trunk/libnsfb/include/frontend.h trunk/libnsfb/src/dump.c trunk/libnsfb/test/bitmap.c Removed: trunk/libnsfb/include/frontend.h Modified: trunk/libnsfb/Makefile trunk/libnsfb/include/libnsfb.h trunk/libnsfb/include/libnsfb_event.h trunk/libnsfb/include/libnsfb_plot.h trunk/libnsfb/include/nsfb.h trunk/libnsfb/src/Makefile trunk/libnsfb/src/cursor.c trunk/libnsfb/src/libnsfb.c trunk/libnsfb/src/plot/api.c trunk/libnsfb/src/plot/generic.c trunk/libnsfb/src/surface/Makefile trunk/libnsfb/src/surface/able.c trunk/libnsfb/src/surface/linux.c trunk/libnsfb/src/surface/ram.c trunk/libnsfb/src/surface/sdl.c trunk/libnsfb/src/surface/surface.c trunk/libnsfb/src/surface/vnc.c trunk/libnsfb/src/surface/x.c trunk/libnsfb/test/Makefile trunk/libnsfb/test/bezier.c trunk/libnsfb/test/frontend.c trunk/libnsfb/test/path.c trunk/libnsfb/test/plottest.c trunk/libnsfb/test/polygon.c trunk/libnsfb/test/polystar.c trunk/libnsfb/test/polystar2.c trunk/libnsfb/test/runtest.sh [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/libnsfb/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/Makefile?rev=13158&r1=131... Removed: trunk/libnsfb/include/frontend.h URL: http://source.netsurf-browser.org/trunk/libnsfb/include/frontend.h?rev=13... Modified: trunk/libnsfb/include/libnsfb.h URL: http://source.netsurf-browser.org/trunk/libnsfb/include/libnsfb.h?rev=131... Modified: trunk/libnsfb/include/libnsfb_event.h URL: http://source.netsurf-browser.org/trunk/libnsfb/include/libnsfb_event.h?r... Modified: trunk/libnsfb/include/libnsfb_plot.h URL: http://source.netsurf-browser.org/trunk/libnsfb/include/libnsfb_plot.h?re... Modified: trunk/libnsfb/include/nsfb.h URL: http://source.netsurf-browser.org/trunk/libnsfb/include/nsfb.h?rev=13158&... Copied: trunk/libnsfb/include/surface.h (from r13146, trunk/libnsfb/include/frontend.h) URL: http://source.netsurf-browser.org/trunk/libnsfb/include/surface.h?p2=trun... Modified: trunk/libnsfb/src/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/src/Makefile?rev=13158&r1... Modified: trunk/libnsfb/src/cursor.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/cursor.c?rev=13158&r1... Added: trunk/libnsfb/src/dump.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/dump.c?rev=13158&view... Modified: trunk/libnsfb/src/libnsfb.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/libnsfb.c?rev=13158&r... Modified: trunk/libnsfb/src/plot/api.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/plot/api.c?rev=13158&... Modified: trunk/libnsfb/src/plot/generic.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/plot/generic.c?rev=13... Modified: trunk/libnsfb/src/surface/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/Makefile?rev=... Modified: trunk/libnsfb/src/surface/able.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/able.c?rev=13... Modified: trunk/libnsfb/src/surface/linux.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/linux.c?rev=1... Modified: trunk/libnsfb/src/surface/ram.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/ram.c?rev=131... Modified: trunk/libnsfb/src/surface/sdl.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/sdl.c?rev=131... Modified: trunk/libnsfb/src/surface/surface.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/surface.c?rev... Modified: trunk/libnsfb/src/surface/vnc.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/vnc.c?rev=131... Modified: trunk/libnsfb/src/surface/x.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/surface/x.c?rev=13158... Modified: trunk/libnsfb/test/Makefile URL: http://source.netsurf-browser.org/trunk/libnsfb/test/Makefile?rev=13158&r... Modified: trunk/libnsfb/test/bezier.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/bezier.c?rev=13158&r... Added: trunk/libnsfb/test/bitmap.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/bitmap.c?rev=13158&v... Modified: trunk/libnsfb/test/frontend.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/frontend.c?rev=13158... Modified: trunk/libnsfb/test/path.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/path.c?rev=13158&r1=... Modified: trunk/libnsfb/test/plottest.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/plottest.c?rev=13158... Modified: trunk/libnsfb/test/polygon.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/polygon.c?rev=13158&... Modified: trunk/libnsfb/test/polystar.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/polystar.c?rev=13158... Modified: trunk/libnsfb/test/polystar2.c URL: http://source.netsurf-browser.org/trunk/libnsfb/test/polystar2.c?rev=1315... Modified: trunk/libnsfb/test/runtest.sh URL: http://source.netsurf-browser.org/trunk/libnsfb/test/runtest.sh?rev=13158...

11 years, 10 months

1
0
0 / 0

r13157 stevef - in /trunk/netsurf/riscos: toolbar.c window.c

by netsurf＠semichrome.net

Author: stevef Date: Sun Nov 20 12:38:33 2011 New Revision: 13157 URL: http://source.netsurf-browser.org?rev=13157&view=rev Log: Don't pass already handled keys to the URL Complete code. Don't scroll browser windows when the toolbar has focus. Modified: trunk/netsurf/riscos/toolbar.c trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/toolbar.c?rev=1315... ============================================================================== --- trunk/netsurf/riscos/toolbar.c (original) +++ trunk/netsurf/riscos/toolbar.c Sun Nov 20 12:38:33 2011 @@ -1153,6 +1153,12 @@ if (toolbar == NULL) return false; + /* Pass the keypress on to the client and stop if they handle it. */ + + if (toolbar->callbacks->key_press != NULL && + toolbar->callbacks->key_press(toolbar->client_data, key)) + return true; + /* If the caret is in the URL bar, ask the URL Complete module if it * wants to handle the keypress. * @@ -1165,11 +1171,6 @@ toolbar->url, key) && ro_gui_url_complete_keypress(toolbar, key->c)) return true; - - /* Otherwsie, pass the keypress on to the client. */ - - if (toolbar->callbacks->key_press != NULL) - return toolbar->callbacks->key_press(toolbar->client_data, key); return false; } Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=13157... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Sun Nov 20 12:38:33 2011 @@ -2036,9 +2036,6 @@ case IS_WIMP_KEY | wimp_KEY_RIGHT: case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_LEFT: case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_RIGHT: - if (is_toolbar) - return false; - break; case IS_WIMP_KEY + wimp_KEY_UP: case IS_WIMP_KEY + wimp_KEY_DOWN: case IS_WIMP_KEY + wimp_KEY_PAGE_UP: @@ -2046,6 +2043,8 @@ case wimp_KEY_HOME: case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_UP: case IS_WIMP_KEY + wimp_KEY_END: + if (is_toolbar) + return false; break; default: return false; /* This catches any keys we don't want to claim */

11 years, 10 months

1
0
0 / 0

r13156 stevef - /trunk/netsurf/riscos/window.c

by netsurf＠semichrome.net

Author: stevef Date: Sun Nov 20 12:18:30 2011 New Revision: 13156 URL: http://source.netsurf-browser.org?rev=13156&view=rev Log: Revert r13155 and re-implement fix properly. Modified: trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=13156... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Sun Nov 20 12:18:30 2011 @@ -177,8 +177,6 @@ static wimp_menu *ro_gui_browser_window_menu = NULL; /** Menu of options for form select controls. */ static wimp_menu *gui_form_select_menu = NULL; -/** Page under menu, or 0 if no page. */ -static hlcache_handle *current_menu_page = 0; /** Object under menu, or 0 if no object. */ static hlcache_handle *current_menu_object = 0; /** URL of link under menu, or 0 if no link. */ @@ -2131,12 +2129,14 @@ struct browser_window *bw; struct toolbar *toolbar; struct contextual_content cont; + hlcache_handle *h = NULL; bool export_sprite, export_draw; os_coord pos; g = (struct gui_window *) ro_gui_wimp_event_get_user_data(w); toolbar = g->toolbar; bw = g->bw; + h = g->bw->current_content; /* If this is the form select menu, handle it now and then exit. * Otherwise, carry on to the main browser window menu. @@ -2165,7 +2165,6 @@ browser_window_get_contextual_content(bw, pos.x, pos.y, &cont); - current_menu_page = cont.main; current_menu_object = cont.object; current_menu_url = cont.link_url; } @@ -2199,48 +2198,32 @@ /* Page Submenu */ - ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, - current_menu_page == NULL || - (content_get_type(current_menu_page) != CONTENT_HTML && - content_get_type(current_menu_page) != - CONTENT_TEXTPLAIN)); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, - current_menu_page == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_PRINT, - current_menu_page == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, - current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, h == NULL || + (content_get_type(h) != CONTENT_HTML && + content_get_type(h) != CONTENT_TEXTPLAIN)); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, h == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_PRINT, h == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, h == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_FIND_TEXT, - current_menu_page == NULL || - (content_get_type(current_menu_page) != CONTENT_HTML && - content_get_type(current_menu_page) != - CONTENT_TEXTPLAIN)); - - - ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, - current_menu_page == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URI, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URL, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_TEXT, - current_menu_page == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_COMPLETE, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_DRAW, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_PDF, - current_menu_page == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_TEXT, - current_menu_page == NULL); + h == NULL || (content_get_type(h) != CONTENT_HTML && + content_get_type(h) != CONTENT_TEXTPLAIN)); + + + ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, h == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URI, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URL, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_TEXT, h == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_COMPLETE, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_DRAW, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_PDF, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_TEXT, h == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_LINK_SAVE_URI, !current_menu_url); @@ -2284,30 +2267,27 @@ ro_gui_window_content_export_types(current_menu_object, &export_draw, &export_sprite); else - ro_gui_window_content_export_types(current_menu_page, + ro_gui_window_content_export_types(h, &export_draw, &export_sprite); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT, - (current_menu_page == NULL && - current_menu_object == NULL) - || !(export_sprite || export_draw)); + (h == NULL && current_menu_object == NULL) + || !(export_sprite || export_draw)); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT_SPRITE, - (current_menu_page == NULL && - current_menu_object == NULL) || !export_sprite); + (h == NULL && current_menu_object == NULL) + || !export_sprite); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT_DRAW, - (current_menu_page == NULL && - current_menu_object == NULL) || !export_draw); + (h == NULL && current_menu_object == NULL) + || !export_draw); /* Selection Submenu */ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION, - current_menu_page == NULL || - (content_get_type(current_menu_page) != CONTENT_HTML && - content_get_type(current_menu_page) != - CONTENT_TEXTPLAIN)); + h == NULL || (content_get_type(h) != CONTENT_HTML && + content_get_type(h) != CONTENT_TEXTPLAIN)); /* make menu available if there's anything that /could/ * be selected */ @@ -2322,8 +2302,7 @@ selection_read_only(browser_window_get_selection(bw))); ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_PASTE, - current_menu_page == NULL || - bw->paste_callback == NULL); + h == NULL || bw->paste_callback == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CLEAR, !browser_window_has_selection(bw)); @@ -2367,8 +2346,7 @@ ro_gui_menu_set_entry_ticked(menu, BROWSER_BUFFER_ALL, g != NULL && g->option.buffer_everything); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SCALE_VIEW, - current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SCALE_VIEW, h == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_WINDOW_STAGGER, option_window_screen_width == 0); @@ -2385,13 +2363,11 @@ /* Utilities Submenu */ - ro_gui_menu_set_entry_shaded(menu, HOTLIST_ADD_URL, - current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, HOTLIST_ADD_URL, h == NULL); ro_gui_menu_set_entry_shaded(menu, HISTORY_SHOW_LOCAL, (bw == NULL || (bw->history == NULL) || - !(current_menu_page != NULL || - history_back_available(bw->history) || + !(h != NULL || history_back_available(bw->history) || history_forward_available(bw->history))));

11 years, 10 months

1
0
0 / 0

r13155 stevef - /trunk/netsurf/riscos/window.c

by netsurf＠semichrome.net

Author: stevef Date: Sun Nov 20 08:39:49 2011 New Revision: 13155 URL: http://source.netsurf-browser.org?rev=13155&view=rev Log: Remember page content handle when refreshing browser menu (bug #3420985). Modified: trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=13155... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Sun Nov 20 08:39:49 2011 @@ -177,6 +177,8 @@ static wimp_menu *ro_gui_browser_window_menu = NULL; /** Menu of options for form select controls. */ static wimp_menu *gui_form_select_menu = NULL; +/** Page under menu, or 0 if no page. */ +static hlcache_handle *current_menu_page = 0; /** Object under menu, or 0 if no object. */ static hlcache_handle *current_menu_object = 0; /** URL of link under menu, or 0 if no link. */ @@ -2129,7 +2131,6 @@ struct browser_window *bw; struct toolbar *toolbar; struct contextual_content cont; - hlcache_handle *h = NULL; bool export_sprite, export_draw; os_coord pos; @@ -2163,8 +2164,8 @@ pointer->pos.y, &pos)) { browser_window_get_contextual_content(bw, pos.x, pos.y, &cont); - h = cont.main; - + + current_menu_page = cont.main; current_menu_object = cont.object; current_menu_url = cont.link_url; } @@ -2198,32 +2199,48 @@ /* Page Submenu */ - ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, h == NULL || - (content_get_type(h) != CONTENT_HTML && - content_get_type(h) != CONTENT_TEXTPLAIN)); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, h == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_PRINT, h == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE, + current_menu_page == NULL || + (content_get_type(current_menu_page) != CONTENT_HTML && + content_get_type(current_menu_page) != + CONTENT_TEXTPLAIN)); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_PAGE_INFO, + current_menu_page == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_PRINT, + current_menu_page == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_NEW_WINDOW, + current_menu_page == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_FIND_TEXT, - h == NULL || (content_get_type(h) != CONTENT_HTML && - content_get_type(h) != CONTENT_TEXTPLAIN)); - - - ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, h == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URI, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URL, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_TEXT, h == NULL); - - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_COMPLETE, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_DRAW, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_PDF, h == NULL); - ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_TEXT, h == NULL); + current_menu_page == NULL || + (content_get_type(current_menu_page) != CONTENT_HTML && + content_get_type(current_menu_page) != + CONTENT_TEXTPLAIN)); + + + ro_gui_menu_set_entry_shaded(menu, BROWSER_VIEW_SOURCE, + current_menu_page == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URI, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_URL, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_URL_TEXT, + current_menu_page == NULL); + + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SAVE_COMPLETE, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_DRAW, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_PDF, + current_menu_page == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_EXPORT_TEXT, + current_menu_page == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_LINK_SAVE_URI, !current_menu_url); @@ -2267,27 +2284,30 @@ ro_gui_window_content_export_types(current_menu_object, &export_draw, &export_sprite); else - ro_gui_window_content_export_types(h, + ro_gui_window_content_export_types(current_menu_page, &export_draw, &export_sprite); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT, - (h == NULL && current_menu_object == NULL) - || !(export_sprite || export_draw)); + (current_menu_page == NULL && + current_menu_object == NULL) + || !(export_sprite || export_draw)); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT_SPRITE, - (h == NULL && current_menu_object == NULL) - || !export_sprite); + (current_menu_page == NULL && + current_menu_object == NULL) || !export_sprite); ro_gui_menu_set_entry_shaded(menu, BROWSER_OBJECT_EXPORT_DRAW, - (h == NULL && current_menu_object == NULL) - || !export_draw); + (current_menu_page == NULL && + current_menu_object == NULL) || !export_draw); /* Selection Submenu */ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION, - h == NULL || (content_get_type(h) != CONTENT_HTML && - content_get_type(h) != CONTENT_TEXTPLAIN)); + current_menu_page == NULL || + (content_get_type(current_menu_page) != CONTENT_HTML && + content_get_type(current_menu_page) != + CONTENT_TEXTPLAIN)); /* make menu available if there's anything that /could/ * be selected */ @@ -2302,7 +2322,8 @@ selection_read_only(browser_window_get_selection(bw))); ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_PASTE, - h == NULL || bw->paste_callback == NULL); + current_menu_page == NULL || + bw->paste_callback == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CLEAR, !browser_window_has_selection(bw)); @@ -2346,7 +2367,8 @@ ro_gui_menu_set_entry_ticked(menu, BROWSER_BUFFER_ALL, g != NULL && g->option.buffer_everything); - ro_gui_menu_set_entry_shaded(menu, BROWSER_SCALE_VIEW, h == NULL); + ro_gui_menu_set_entry_shaded(menu, BROWSER_SCALE_VIEW, + current_menu_page == NULL); ro_gui_menu_set_entry_shaded(menu, BROWSER_WINDOW_STAGGER, option_window_screen_width == 0); @@ -2363,11 +2385,13 @@ /* Utilities Submenu */ - ro_gui_menu_set_entry_shaded(menu, HOTLIST_ADD_URL, h == NULL); + ro_gui_menu_set_entry_shaded(menu, HOTLIST_ADD_URL, + current_menu_page == NULL); ro_gui_menu_set_entry_shaded(menu, HISTORY_SHOW_LOCAL, (bw == NULL || (bw->history == NULL) || - !(h != NULL || history_back_available(bw->history) || + !(current_menu_page != NULL || + history_back_available(bw->history) || history_forward_available(bw->history))));

11 years, 10 months

1
0
0 / 0

r13154 stevef - /trunk/netsurf/riscos/search.c

by netsurf＠semichrome.net

Author: stevef Date: Sun Nov 20 08:01:08 2011 New Revision: 13154 URL: http://source.netsurf-browser.org?rev=13154&view=rev Log: Remove unused variable declaration. Modified: trunk/netsurf/riscos/search.c Modified: trunk/netsurf/riscos/search.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/search.c?rev=13154... ============================================================================== --- trunk/netsurf/riscos/search.c (original) +++ trunk/netsurf/riscos/search.c Sun Nov 20 08:01:08 2011 @@ -247,7 +247,6 @@ bool ro_gui_search_prepare_menu(void) { - os_error *error; int i; int suggestions = 0;

11 years, 10 months

1
0
0 / 0

r13153 stevef - /trunk/netsurf/riscos/search.c

by netsurf＠semichrome.net

Author: stevef Date: Sun Nov 20 07:26:21 2011 New Revision: 13153 URL: http://source.netsurf-browser.org?rev=13153&view=rev Log: Remove unnecessary duplicate call to Wimp_OpenMenu. Modified: trunk/netsurf/riscos/search.c Modified: trunk/netsurf/riscos/search.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/search.c?rev=13153... ============================================================================== --- trunk/netsurf/riscos/search.c (original) +++ trunk/netsurf/riscos/search.c Sun Nov 20 07:26:21 2011 @@ -268,14 +268,6 @@ recent_search_menu->entries[suggestions - 1].menu_flags |= wimp_MENU_LAST; - if ((current_menu_open) && (current_menu == recent_search_menu)) { - error = xwimp_create_menu(current_menu, 0, 0); - if (error) { - LOG(("xwimp_create_menu: 0x%x: %s", - error->errnum, error->errmess)); - warn_user("MenuError", error->errmess); - } - } return true; }

11 years, 10 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits November 2011