Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/304c14ea282d39b2ea00cecc086a9772f10870aa
...commit
http://git.netsurf-browser.org/netsurf.git/commit/304c14ea282d39b2ea00cecc086a9772f10870aa
...tree
http://git.netsurf-browser.org/netsurf.git/tree/304c14ea282d39b2ea00cecc086a9772f10870aa
The branch, ashmew2/netsurf-kolibrios has been updated
via 304c14ea282d39b2ea00cecc086a9772f10870aa (commit)
via 72523e1f7a50e734cfeca81f492d654098497a79 (commit)
from 2d091e49e4518b1718e9c80b60fa0ff24f1f1ee8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=304c14ea282d39b2ea00cecc086a9772f10870aa
commit 304c14ea282d39b2ea00cecc086a9772f10870aa
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Properly initialize heap to avoid malloc failures
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index ffff14f..997eb51 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -259,8 +259,6 @@ bool nscss_process_data(struct content *c, const char
*data, unsigned int size)
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
}
- debug_board_printf("Processing css_data of size : %u\n", size);
-
return (error == CSS_OK || error == CSS_NEEDDATA);
}
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index dcc5c93..f875ba1 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -129,8 +129,8 @@ $(warning $(foreach V,$(filter
KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARI
# $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
# $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-#S_KOLIBRIOS := main.c kolibri_misc.c kolibri_debug.c kolibri_filesystem.c
kolibri_regex.c kolibri_http.c
-S_KOLIBRIOS :=
+#S_KOLIBRIOS := main.c kolibri_misc.c kolibri_debug.c kolibri_filesystem.c
kolibri_regex.c
+S_KOLIBRIOS := kolibri_http.c
S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c findfile.c
localhistory.c clipboard.c
S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c text.c
scroll.c osk.c
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index fbaf36f..d12bdfc 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -492,7 +492,7 @@ process_cmdline(int argc, char** argv)
/* Remove me! */
feurl = "http://www.kolibrios.org";;
-
+
/* NS on KolibriOS does not support option parsing (yet) */
/* while((opt = getopt_long(argc, argv, "f:b:w:h:", */
@@ -2139,15 +2139,16 @@ MKARGV(ARGC, "\0");
char *respath = strdup(argv[0]);
for(int i = strlen(respath) - 1; i > 0; i--) {
if(respath[i] == '/') {
- strcpy((respath+i), "res");
+ strcpy((respath+i+1), "res");
break;
}
}
+ /* Skip the encoding bytes */
+ respath+=2;
ret = netsurf_register(&framebuffer_table);
if (ret != NSERROR_OK)
die("NetSurf operation table failed registration");
-
respaths = fb_init_resource(respath);
/* initialise logging. Abort on failure for KolibriOS. */
@@ -2160,6 +2161,8 @@ MKARGV(ARGC, "\0");
if (ret != NSERROR_OK)
die("Options failed to initialise");
+ LOG("Resources are at : %s", respath);
+
options = filepath_find(respaths, "Choices");
nsoption_read(options, nsoptions);
free(options);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=72523e1f7a50e734cfeca81f492d654098497a79
commit 72523e1f7a50e734cfeca81f492d654098497a79
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Update kolibrios frontend to use invalidate window area API (Applied change
becd386)
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index 469c064..fbaf36f 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -1815,21 +1815,33 @@ gui_window_destroy(struct gui_window *gw)
free(gw);
}
-static void
-gui_window_redraw_window(struct gui_window *g)
-{
- fb_queue_redraw(g->browser, 0, 0, fbtk_get_width(g->browser),
fbtk_get_height(g->browser) );
-}
-static void
-gui_window_update_box(struct gui_window *g, const struct rect *rect)
+/**
+ * Invalidates an area of a framebuffer browser window
+ *
+ * \param gw The netsurf window being invalidated.
+ * \param rect area to redraw or NULL for the entire window area
+ * \return NSERROR_OK on success or appropriate error code
+ */
+static nserror
+fb_window_invalidate_area(struct gui_window *g, const struct rect *rect)
{
struct browser_widget_s *bwidget = fbtk_get_userpw(g->browser);
- fb_queue_redraw(g->browser,
- rect->x0 - bwidget->scrollx,
- rect->y0 - bwidget->scrolly,
- rect->x1 - bwidget->scrollx,
- rect->y1 - bwidget->scrolly);
+
+ if (rect != NULL) {
+ fb_queue_redraw(g->browser,
+ rect->x0 - bwidget->scrollx,
+ rect->y0 - bwidget->scrolly,
+ rect->x1 - bwidget->scrollx,
+ rect->y1 - bwidget->scrolly);
+ } else {
+ fb_queue_redraw(g->browser,
+ 0,
+ 0,
+ fbtk_get_width(g->browser),
+ fbtk_get_height(g->browser));
+ }
+ return NSERROR_OK;
}
static bool
@@ -2063,8 +2075,7 @@ static void framebuffer_window_reformat(struct gui_window
*gw)
static struct gui_window_table framebuffer_window_table = {
.create = gui_window_create,
.destroy = gui_window_destroy,
- .redraw = gui_window_redraw_window,
- .update = gui_window_update_box,
+ .invalidate = fb_window_invalidate_area,
.get_scroll = gui_window_get_scroll,
.set_scroll = gui_window_set_scroll,
.get_dimensions = gui_window_get_dimensions,
@@ -2120,7 +2131,6 @@ int main(int argc, char** argv)
MKARGV(1, "-V");
MKARGV(2, "/tmp0/1/netsurf.log");
MKARGV(ARGC, "\0");
-
argc = ARGC;
/* args fixed */
-----------------------------------------------------------------------
Summary of changes:
content/handlers/css/css.c | 2 --
frontends/kolibrios/Makefile | 4 ++--
frontends/kolibrios/fb/gui.c | 49 ++++++++++++++++++++++++++----------------
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index ffff14f..997eb51 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -259,8 +259,6 @@ bool nscss_process_data(struct content *c, const char
*data, unsigned int size)
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
}
- debug_board_printf("Processing css_data of size : %u\n", size);
-
return (error == CSS_OK || error == CSS_NEEDDATA);
}
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index dcc5c93..f875ba1 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -129,8 +129,8 @@ $(warning $(foreach V,$(filter
KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARI
# $(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript))
# $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
-#S_KOLIBRIOS := main.c kolibri_misc.c kolibri_debug.c kolibri_filesystem.c
kolibri_regex.c kolibri_http.c
-S_KOLIBRIOS :=
+#S_KOLIBRIOS := main.c kolibri_misc.c kolibri_debug.c kolibri_filesystem.c
kolibri_regex.c
+S_KOLIBRIOS := kolibri_http.c
S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c findfile.c
localhistory.c clipboard.c
S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c text.c
scroll.c osk.c
diff --git a/frontends/kolibrios/fb/gui.c b/frontends/kolibrios/fb/gui.c
index 469c064..d12bdfc 100644
--- a/frontends/kolibrios/fb/gui.c
+++ b/frontends/kolibrios/fb/gui.c
@@ -492,7 +492,7 @@ process_cmdline(int argc, char** argv)
/* Remove me! */
feurl = "http://www.kolibrios.org";;
-
+
/* NS on KolibriOS does not support option parsing (yet) */
/* while((opt = getopt_long(argc, argv, "f:b:w:h:", */
@@ -1815,21 +1815,33 @@ gui_window_destroy(struct gui_window *gw)
free(gw);
}
-static void
-gui_window_redraw_window(struct gui_window *g)
-{
- fb_queue_redraw(g->browser, 0, 0, fbtk_get_width(g->browser),
fbtk_get_height(g->browser) );
-}
-static void
-gui_window_update_box(struct gui_window *g, const struct rect *rect)
+/**
+ * Invalidates an area of a framebuffer browser window
+ *
+ * \param gw The netsurf window being invalidated.
+ * \param rect area to redraw or NULL for the entire window area
+ * \return NSERROR_OK on success or appropriate error code
+ */
+static nserror
+fb_window_invalidate_area(struct gui_window *g, const struct rect *rect)
{
struct browser_widget_s *bwidget = fbtk_get_userpw(g->browser);
- fb_queue_redraw(g->browser,
- rect->x0 - bwidget->scrollx,
- rect->y0 - bwidget->scrolly,
- rect->x1 - bwidget->scrollx,
- rect->y1 - bwidget->scrolly);
+
+ if (rect != NULL) {
+ fb_queue_redraw(g->browser,
+ rect->x0 - bwidget->scrollx,
+ rect->y0 - bwidget->scrolly,
+ rect->x1 - bwidget->scrollx,
+ rect->y1 - bwidget->scrolly);
+ } else {
+ fb_queue_redraw(g->browser,
+ 0,
+ 0,
+ fbtk_get_width(g->browser),
+ fbtk_get_height(g->browser));
+ }
+ return NSERROR_OK;
}
static bool
@@ -2063,8 +2075,7 @@ static void framebuffer_window_reformat(struct gui_window
*gw)
static struct gui_window_table framebuffer_window_table = {
.create = gui_window_create,
.destroy = gui_window_destroy,
- .redraw = gui_window_redraw_window,
- .update = gui_window_update_box,
+ .invalidate = fb_window_invalidate_area,
.get_scroll = gui_window_get_scroll,
.set_scroll = gui_window_set_scroll,
.get_dimensions = gui_window_get_dimensions,
@@ -2120,7 +2131,6 @@ int main(int argc, char** argv)
MKARGV(1, "-V");
MKARGV(2, "/tmp0/1/netsurf.log");
MKARGV(ARGC, "\0");
-
argc = ARGC;
/* args fixed */
@@ -2129,15 +2139,16 @@ MKARGV(ARGC, "\0");
char *respath = strdup(argv[0]);
for(int i = strlen(respath) - 1; i > 0; i--) {
if(respath[i] == '/') {
- strcpy((respath+i), "res");
+ strcpy((respath+i+1), "res");
break;
}
}
+ /* Skip the encoding bytes */
+ respath+=2;
ret = netsurf_register(&framebuffer_table);
if (ret != NSERROR_OK)
die("NetSurf operation table failed registration");
-
respaths = fb_init_resource(respath);
/* initialise logging. Abort on failure for KolibriOS. */
@@ -2150,6 +2161,8 @@ MKARGV(ARGC, "\0");
if (ret != NSERROR_OK)
die("Options failed to initialise");
+ LOG("Resources are at : %s", respath);
+
options = filepath_find(respaths, "Choices");
nsoption_read(options, nsoptions);
free(options);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
