Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9260107f37a92ecca316aa5a35d9ff3a469cc06d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9260107f37a92ecca316aa5a35d9ff3a469cc06d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9260107f37a92ecca316aa5a35d9ff3a469cc06d
The branch, ashmew2/nskolibrios has been updated
via 9260107f37a92ecca316aa5a35d9ff3a469cc06d (commit)
via 1c27937898d7626fe0a0a8ffd4243e7a76a2cada (commit)
from a1ee078701a1815bafaafa235d2361c45adfdeb6 (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=9260107f37a92ecca316aa5a35d9ff3a469cc06d
commit 9260107f37a92ecca316aa5a35d9ff3a469cc06d
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Add HOME and END key handling in framebuffer
diff --git a/content/fetch.c b/content/fetch.c
index 2887d3a..64e639c 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -615,6 +615,7 @@ void fetch_abort(struct fetch *f)
/* exported interface documented in content/fetch.h */
void fetch_free(struct fetch *f)
{
+ debug_board_printf("-- Finished for url = %s\n", nsurl_access(f->url));
NSLOG(fetch, DEBUG,
"Freeing fetch %p, fetcher %p",
f,
diff --git a/frontends/kolibrios/fb/fbtk/text.c
b/frontends/kolibrios/fb/fbtk/text.c
index 948c5ff..f20c26c 100644
--- a/frontends/kolibrios/fb/fbtk/text.c
+++ b/frontends/kolibrios/fb/fbtk/text.c
@@ -388,6 +388,22 @@ text_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
}
break;
+ case NSFB_KEY_HOME:
+ if (widget->u.text.idx > 0) {
+ widget->u.text.idx = 0;
+
+ caret_moved = true;
+ }
+ break;
+
+ case NSFB_KEY_END:
+ if (widget->u.text.idx < widget->u.text.len) {
+ widget->u.text.idx = widget->u.text.len;
+
+ caret_moved = true;
+ }
+ break;
+
case NSFB_KEY_PAGEUP:
case NSFB_KEY_PAGEDOWN:
case NSFB_KEY_UP:
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1c27937898d7626fe0a0a8ffd4243e7a76a2cada
commit 1c27937898d7626fe0a0a8ffd4243e7a76a2cada
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Fix debug. When rebasing, do not preserve
diff --git a/content/fetchers/httplib_kolibri.c
b/content/fetchers/httplib_kolibri.c
index 1aae7e5..25e5a10 100644
--- a/content/fetchers/httplib_kolibri.c
+++ b/content/fetchers/httplib_kolibri.c
@@ -276,7 +276,6 @@ bool abort_fetch(void *httpf) {
bool free_fetch(void *httpf) {
LOG("free_fetch called for 0x%x", ((struct httpfetcher *)httpf)->owner);
- debug_board_printf("Closing http connection in free_fetch\n");
http_disconnect_asm((((struct httpfetcher *)httpf)->handle));
LOG("Freeing fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
@@ -399,10 +398,11 @@ void poll_fetch(lwc_string *scheme) {
}
else if(ret == -1) {
/* If data was received send it to netsurf core with FETCH_DATA */
- LOG("Doing a data callback; so far : %u vs %u!", t->datalen_cb_done,
t->handle->content_received);
+ LOG("Calledback vs received : %u vs %u!", t->datalen_cb_done,
t->handle->content_received);
if(t->handle->content_received > t->datalen_cb_done) {
fetch_msg msg;
+ LOG("Doing a data callback\n");
msg.type = FETCH_DATA;
msg.data.header_or_data.buf = (const uint8_t *)
(t->handle->content_ptr + t->datalen_cb_done);
msg.data.header_or_data.len = t->handle->content_received -
t->datalen_cb_done;
diff --git a/frontends/kolibrios/browser_table.h
b/frontends/kolibrios/browser_table.h
deleted file mode 100644
index 2ee1182..0000000
--- a/frontends/kolibrios/browser_table.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ------------------------------ */
-/* Part about Browser table. Will contain all functions required as well. */
-/* ------------------------------ */
-nserror kolibri_schedule_cb(int t, void (*callback)(void *p), void *p);
-void kolibri_browser_quit(void);
-
-struct kolibri_callback {
- void (*cb)(void *p);
- void *arg;
- struct kolibri_callback *next_cb;
-} head_dummy;
-
-struct kolibri_callback *kcb_head = &head_dummy;
-struct kolibri_callback *kcb_tail = &head_dummy;
-
-static struct gui_browser_table kolibri_browser_table = {
- .schedule = kolibri_schedule_cb,
- .quit = kolibri_browser_quit,
- };
-
-nserror kolibri_schedule_cb(int t, void (*callback)(void *p), void *p)
-{
- /* debug_board_write_str("kolibri_schedule_cb called!\n"); */
- struct kolibri_callback *new_cb = malloc(sizeof(struct kolibri_callback));
- new_cb->arg = p;
- new_cb->cb = callback;
- new_cb->next_cb = NULL;
-
- kcb_tail -> next_cb = new_cb;
- kcb_tail = new_cb;
-
- return NSERROR_OK;
-}
-
-bool kolibri_schedule_run(void)
-{
- if(kcb_head != kcb_tail)
- return false;
-
- struct kolibri_callback *runner = kcb_head -> next_cb;
-
- while(runner != NULL)
- {
- runner->cb(runner->arg);
- runner = runner -> next_cb;
- }
-
- return true;
- /* TODO: Free the whole list of callbacks */
-}
-
-void kolibri_browser_quit(void)
-{
- debug_board_write_str("Netsurf is shutting down Normally..GoodBye.");
- /* TODO: Do the actual killing of process with mcall -1 */
- /* Maybe set Kolibri_quit = 1 here */
-}
-----------------------------------------------------------------------
Summary of changes:
content/fetch.c | 1 +
content/fetchers/httplib_kolibri.c | 4 +--
frontends/kolibrios/browser_table.h | 57 -----------------------------------
frontends/kolibrios/fb/fbtk/text.c | 16 ++++++++++
4 files changed, 19 insertions(+), 59 deletions(-)
delete mode 100644 frontends/kolibrios/browser_table.h
diff --git a/content/fetch.c b/content/fetch.c
index 2887d3a..64e639c 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -615,6 +615,7 @@ void fetch_abort(struct fetch *f)
/* exported interface documented in content/fetch.h */
void fetch_free(struct fetch *f)
{
+ debug_board_printf("-- Finished for url = %s\n", nsurl_access(f->url));
NSLOG(fetch, DEBUG,
"Freeing fetch %p, fetcher %p",
f,
diff --git a/content/fetchers/httplib_kolibri.c
b/content/fetchers/httplib_kolibri.c
index 1aae7e5..25e5a10 100644
--- a/content/fetchers/httplib_kolibri.c
+++ b/content/fetchers/httplib_kolibri.c
@@ -276,7 +276,6 @@ bool abort_fetch(void *httpf) {
bool free_fetch(void *httpf) {
LOG("free_fetch called for 0x%x", ((struct httpfetcher *)httpf)->owner);
- debug_board_printf("Closing http connection in free_fetch\n");
http_disconnect_asm((((struct httpfetcher *)httpf)->handle));
LOG("Freeing fetch 0x%x", ((struct httpfetcher *)httpf)->owner);
@@ -399,10 +398,11 @@ void poll_fetch(lwc_string *scheme) {
}
else if(ret == -1) {
/* If data was received send it to netsurf core with FETCH_DATA */
- LOG("Doing a data callback; so far : %u vs %u!", t->datalen_cb_done,
t->handle->content_received);
+ LOG("Calledback vs received : %u vs %u!", t->datalen_cb_done,
t->handle->content_received);
if(t->handle->content_received > t->datalen_cb_done) {
fetch_msg msg;
+ LOG("Doing a data callback\n");
msg.type = FETCH_DATA;
msg.data.header_or_data.buf = (const uint8_t *)
(t->handle->content_ptr + t->datalen_cb_done);
msg.data.header_or_data.len = t->handle->content_received -
t->datalen_cb_done;
diff --git a/frontends/kolibrios/browser_table.h
b/frontends/kolibrios/browser_table.h
deleted file mode 100644
index 2ee1182..0000000
--- a/frontends/kolibrios/browser_table.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ------------------------------ */
-/* Part about Browser table. Will contain all functions required as well. */
-/* ------------------------------ */
-nserror kolibri_schedule_cb(int t, void (*callback)(void *p), void *p);
-void kolibri_browser_quit(void);
-
-struct kolibri_callback {
- void (*cb)(void *p);
- void *arg;
- struct kolibri_callback *next_cb;
-} head_dummy;
-
-struct kolibri_callback *kcb_head = &head_dummy;
-struct kolibri_callback *kcb_tail = &head_dummy;
-
-static struct gui_browser_table kolibri_browser_table = {
- .schedule = kolibri_schedule_cb,
- .quit = kolibri_browser_quit,
- };
-
-nserror kolibri_schedule_cb(int t, void (*callback)(void *p), void *p)
-{
- /* debug_board_write_str("kolibri_schedule_cb called!\n"); */
- struct kolibri_callback *new_cb = malloc(sizeof(struct kolibri_callback));
- new_cb->arg = p;
- new_cb->cb = callback;
- new_cb->next_cb = NULL;
-
- kcb_tail -> next_cb = new_cb;
- kcb_tail = new_cb;
-
- return NSERROR_OK;
-}
-
-bool kolibri_schedule_run(void)
-{
- if(kcb_head != kcb_tail)
- return false;
-
- struct kolibri_callback *runner = kcb_head -> next_cb;
-
- while(runner != NULL)
- {
- runner->cb(runner->arg);
- runner = runner -> next_cb;
- }
-
- return true;
- /* TODO: Free the whole list of callbacks */
-}
-
-void kolibri_browser_quit(void)
-{
- debug_board_write_str("Netsurf is shutting down Normally..GoodBye.");
- /* TODO: Do the actual killing of process with mcall -1 */
- /* Maybe set Kolibri_quit = 1 here */
-}
diff --git a/frontends/kolibrios/fb/fbtk/text.c
b/frontends/kolibrios/fb/fbtk/text.c
index 948c5ff..f20c26c 100644
--- a/frontends/kolibrios/fb/fbtk/text.c
+++ b/frontends/kolibrios/fb/fbtk/text.c
@@ -388,6 +388,22 @@ text_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
}
break;
+ case NSFB_KEY_HOME:
+ if (widget->u.text.idx > 0) {
+ widget->u.text.idx = 0;
+
+ caret_moved = true;
+ }
+ break;
+
+ case NSFB_KEY_END:
+ if (widget->u.text.idx < widget->u.text.len) {
+ widget->u.text.idx = widget->u.text.len;
+
+ caret_moved = true;
+ }
+ break;
+
case NSFB_KEY_PAGEUP:
case NSFB_KEY_PAGEDOWN:
case NSFB_KEY_UP:
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
