March 2007 - netsurf-commits - listmaster.pepperfish.net

r3208 jmb - /trunk/netsurf/riscos/save.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Mar 17 14:18:11 2007 New Revision: 3208 URL: http://svn.semichrome.net?rev=3208&view=rev Log: Fix pasting into writables via IcnClipBrd (fixes 1582072) Modified: trunk/netsurf/riscos/save.c Modified: trunk/netsurf/riscos/save.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/save.c?rev=3208&r1=3207&r2... ============================================================================== --- trunk/netsurf/riscos/save.c (original) +++ trunk/netsurf/riscos/save.c Sat Mar 17 14:18:11 2007 @@ -587,10 +587,10 @@ /* Ack successful save with message_DATA_LOAD */ message->action = message_DATA_LOAD; message->your_ref = message->my_ref; - error = xwimp_send_message_to_window(wimp_USER_MESSAGE, message, - message->data.data_xfer.w, message->data.data_xfer.i, 0); + error = xwimp_send_message(wimp_USER_MESSAGE, message, + message->sender); if (error) { - LOG(("xwimp_send_message_to_window: 0x%x: %s", + LOG(("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess)); warn_user("SaveError", error->errmess); }

16 years

1
0
0 / 0

r3207 tlsa - in /trunk/netsurfweb/builds: top.de top.en top.fr

by netsurf＠semichrome.net

Author: tlsa Date: Sat Mar 17 11:57:18 2007 New Revision: 3207 URL: http://svn.semichrome.net?rev=3207&view=rev Log: Update package file URL. Modified: trunk/netsurfweb/builds/top.de trunk/netsurfweb/builds/top.en trunk/netsurfweb/builds/top.fr Modified: trunk/netsurfweb/builds/top.de URL: http://svn.semichrome.net/trunk/netsurfweb/builds/top.de?rev=3207&r1=3206... ============================================================================== --- trunk/netsurfweb/builds/top.de (original) +++ trunk/netsurfweb/builds/top.de Sat Mar 17 11:57:18 2007 @@ -38,7 +38,7 @@ </tr> </table> -<p>Eine <a href="http://www.riscpkg.org/">RiscPkg</a> Paketversion von NetSurf ist verfügbar. Um sie zu verwenden, muß die Zeile <code>pkg http://netsurf-browser.org/builds/riscpkg/packages</code> in die Datei <code>Choices:RiscPkg.Sources</code> eingefügt werden. Näheres dazu steht in der RiscPkg Dokumentation.</p> +<p>Eine <a href="http://www.riscpkg.org/">RiscPkg</a> Paketversion von NetSurf ist verfügbar. Um sie zu verwenden, muß die Zeile <code>pkg http://www.netsurf-browser.org/builds/riscpkg/packages</code> in die Datei <code>Choices:RiscPkg.Sources</code> eingefügt werden. Näheres dazu steht in der RiscPkg Dokumentation.</p> <p><a href="netsurf.log">Logfile des letzten Builderlaufes</a> (nur für Entwickler von Interesse).</p> Modified: trunk/netsurfweb/builds/top.en URL: http://svn.semichrome.net/trunk/netsurfweb/builds/top.en?rev=3207&r1=3206... ============================================================================== --- trunk/netsurfweb/builds/top.en (original) +++ trunk/netsurfweb/builds/top.en Sat Mar 17 11:57:18 2007 @@ -41,7 +41,7 @@ </tr> </table> -<p>A <a href="http://www.riscpkg.org/">RiscPkg</a> package of NetSurf is available. To use it, add the line <code>pkg http://netsurf-browser.org/builds/riscpkg/packages</code> to <code>Choices:RiscPkg.Sources</code>. See the RiscPkg documentation for more information.</p> +<p>A <a href="http://www.riscpkg.org/">RiscPkg</a> package of NetSurf is available. To use it, add the line <code>pkg http://www.netsurf-browser.org/builds/riscpkg/packages</code> to <code>Choices:RiscPkg.Sources</code>. See the RiscPkg documentation for more information.</p> <p><a href="netsurf.log">Last build attempt log</a> (only of interest to developers).</p> Modified: trunk/netsurfweb/builds/top.fr URL: http://svn.semichrome.net/trunk/netsurfweb/builds/top.fr?rev=3207&r1=3206... ============================================================================== --- trunk/netsurfweb/builds/top.fr (original) +++ trunk/netsurfweb/builds/top.fr Sat Mar 17 11:57:18 2007 @@ -40,7 +40,7 @@ </tr> </table> -<p>Un package <a href="http://www.riscpkg.org/">RiscPkg</a> de NetSurf est disponible. Pour s'en servir, ajouter la ligne <code>pkg http://netsurf-browser.org/builds/riscpkg/packages</code> à <code>Choices:RiscPkg.Sources</code>. Voir la documentation RiscPkg pour plus d'information.</p> +<p>Un package <a href="http://www.riscpkg.org/">RiscPkg</a> de NetSurf est disponible. Pour s'en servir, ajouter la ligne <code>pkg http://www.netsurf-browser.org/builds/riscpkg/packages</code> à <code>Choices:RiscPkg.Sources</code>. Voir la documentation RiscPkg pour plus d'information.</p> <p><a href="netsurf.log">Fichier journal de la dernière compilation</a> (n'a d'intérêt que pour les développeurs).</p>

16 years

1
0
0 / 0

r3206 jmb - /trunk/netsurfbuild/autobuild.pl

by netsurf＠semichrome.net

Author: jmb Date: Fri Mar 16 00:22:09 2007 New Revision: 3206 URL: http://svn.semichrome.net?rev=3206&view=rev Log: Depend on Iconv (>=0.0.8), RiscPkg(>=0.3.1.1). Modified: trunk/netsurfbuild/autobuild.pl Modified: trunk/netsurfbuild/autobuild.pl URL: http://svn.semichrome.net/trunk/netsurfbuild/autobuild.pl?rev=3206&r1=320... ============================================================================== --- trunk/netsurfbuild/autobuild.pl (original) +++ trunk/netsurfbuild/autobuild.pl Fri Mar 16 00:22:09 2007 @@ -159,7 +159,7 @@ Section: Web Maintainer: NetSurf developers <netsurf-develop(a)lists.sourceforge.net> Version: $pkg_version -Depends: SharedUnixLibrary (>=1.0.7), Tinct (>=0.1.3) +Depends: SharedUnixLibrary (>=1.0.7), Tinct (>=0.1.3), Iconv (>=0.0.8), RiscPkg (>=0.3.1.1) Licence: Free Standards-Version: 0.1.0 Description: Web browser

16 years

1
0
0 / 0

r3205 jmb - in /trunk/netsurf/render: box_construct.c form.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 11 23:48:29 2007 New Revision: 3205 URL: http://svn.semichrome.net?rev=3205&view=rev Log: Default form field maxlength to UINT_MAX (fixes 1620540) Modified: trunk/netsurf/render/box_construct.c trunk/netsurf/render/form.c Modified: trunk/netsurf/render/box_construct.c URL: http://svn.semichrome.net/trunk/netsurf/render/box_construct.c?rev=3205&r... ============================================================================== --- trunk/netsurf/render/box_construct.c (original) +++ trunk/netsurf/render/box_construct.c Sun Mar 11 23:48:29 2007 @@ -2171,7 +2171,6 @@ return 0; box->gadget->box = box; - box->gadget->maxlength = 100; if ((s = (char *) xmlGetProp(n, (const xmlChar *) "maxlength"))) { box->gadget->maxlength = atoi(s); xmlFree(s); Modified: trunk/netsurf/render/form.c URL: http://svn.semichrome.net/trunk/netsurf/render/form.c?rev=3205&r1=3204&r2... ============================================================================== --- trunk/netsurf/render/form.c (original) +++ trunk/netsurf/render/form.c Sun Mar 11 23:48:29 2007 @@ -14,6 +14,7 @@ #define _GNU_SOURCE /* for strndup */ #include <assert.h> #include <ctype.h> +#include <limits.h> #include <stdbool.h> #include <stdio.h> #include <string.h> @@ -83,7 +84,8 @@ control->caret_inline_container = NULL; control->caret_text_box = NULL; control->caret_box_offset = control->caret_form_offset = 0; - control->length = control->maxlength = 0; + control->length = 0; + control->maxlength = UINT_MAX; control->selected = false; control->prev = NULL; control->next = NULL;

16 years

1
0
0 / 0

r3204 jmb - in /trunk/netsurf: Docs/01-content content/content.c css/css.c desktop/browser.c image/bmp.c image/gif.c image/ico.c image/jpeg.c render/html.c render/textplain.c riscos/artworks.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 11 22:08:57 2007 New Revision: 3204 URL: http://svn.semichrome.net?rev=3204&view=rev Log: Content handlers should not call warn_user - they should broadcast the error using content_broadcast and leave it to the content owner(s) to decide what to do about it. Only use warn_user for top-level contents. Modified: trunk/netsurf/Docs/01-content trunk/netsurf/content/content.c trunk/netsurf/css/css.c trunk/netsurf/desktop/browser.c trunk/netsurf/image/bmp.c trunk/netsurf/image/gif.c trunk/netsurf/image/ico.c trunk/netsurf/image/jpeg.c trunk/netsurf/render/html.c trunk/netsurf/render/textplain.c trunk/netsurf/riscos/artworks.c Modified: trunk/netsurf/Docs/01-content URL: http://svn.semichrome.net/trunk/netsurf/Docs/01-content?rev=3204&r1=3203&... ============================================================================== --- trunk/netsurf/Docs/01-content (original) +++ trunk/netsurf/Docs/01-content Sun Mar 11 22:08:57 2007 @@ -85,8 +85,8 @@ Optional. If an error occurs in type_create(), type_process_data(), type_convert(), -CONTENT_MSG_ERROR must be broadcast and false returned. Optionally use -warn_user() for serious errors. The _destroy function will be called soon after. +CONTENT_MSG_ERROR must be broadcast and false returned. The _destroy function +will be called soon after. Memory allocation ----------------- Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3204&r1=320... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Sun Mar 11 22:08:57 2007 @@ -535,7 +535,6 @@ c->status = CONTENT_STATUS_ERROR; msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -556,7 +555,6 @@ msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -574,7 +572,6 @@ msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } content_remove_user(c, callback, p1, p2); @@ -682,7 +679,6 @@ c->status = CONTENT_STATUS_ERROR; msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } c->source_data = source_data; Modified: trunk/netsurf/css/css.c URL: http://svn.semichrome.net/trunk/netsurf/css/css.c?rev=3204&r1=3203&r2=320... ============================================================================== --- trunk/netsurf/css/css.c (original) +++ trunk/netsurf/css/css.c Sun Mar 11 22:08:57 2007 @@ -404,7 +404,6 @@ msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -445,7 +444,6 @@ if (param.memory_error) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } Modified: trunk/netsurf/desktop/browser.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.c?rev=3204&r1=320... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Sun Mar 11 22:08:57 2007 @@ -458,7 +458,11 @@ case CONTENT_MSG_ERROR: browser_window_set_status(bw, data.error); - warn_user(data.error, 0); + + /* Only warn the user about errors in top-level windows */ + if (bw->browser_window_type == BROWSER_WINDOW_NORMAL) + warn_user(data.error, 0); + if (c == bw->loading_content) bw->loading_content = 0; else if (c == bw->current_content) { Modified: trunk/netsurf/image/bmp.c URL: http://svn.semichrome.net/trunk/netsurf/image/bmp.c?rev=3204&r1=3203&r2=3... ============================================================================== --- trunk/netsurf/image/bmp.c (original) +++ trunk/netsurf/image/bmp.c Sun Mar 11 22:08:57 2007 @@ -28,7 +28,6 @@ if (!c->data.bmp.bmp) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } return true; @@ -53,7 +52,6 @@ case BMP_INSUFFICIENT_MEMORY: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; case BMP_INSUFFICIENT_DATA: case BMP_DATA_ERROR: Modified: trunk/netsurf/image/gif.c URL: http://svn.semichrome.net/trunk/netsurf/image/gif.c?rev=3204&r1=3203&r2=3... ============================================================================== --- trunk/netsurf/image/gif.c (original) +++ trunk/netsurf/image/gif.c Sun Mar 11 22:08:57 2007 @@ -48,7 +48,6 @@ if (!c->data.gif.gif) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } return true; @@ -74,7 +73,6 @@ case GIF_INSUFFICIENT_MEMORY: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; case GIF_INSUFFICIENT_DATA: case GIF_DATA_ERROR: Modified: trunk/netsurf/image/ico.c URL: http://svn.semichrome.net/trunk/netsurf/image/ico.c?rev=3204&r1=3203&r2=3... ============================================================================== --- trunk/netsurf/image/ico.c (original) +++ trunk/netsurf/image/ico.c Sun Mar 11 22:08:57 2007 @@ -28,7 +28,6 @@ if (!c->data.ico.ico) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } return true; @@ -54,7 +53,6 @@ case BMP_INSUFFICIENT_MEMORY: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; case BMP_INSUFFICIENT_DATA: case BMP_DATA_ERROR: Modified: trunk/netsurf/image/jpeg.c URL: http://svn.semichrome.net/trunk/netsurf/image/jpeg.c?rev=3204&r1=3203&r2=... ============================================================================== --- trunk/netsurf/image/jpeg.c (original) +++ trunk/netsurf/image/jpeg.c Sun Mar 11 22:08:57 2007 @@ -104,7 +104,6 @@ msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } Modified: trunk/netsurf/render/html.c URL: http://svn.semichrome.net/trunk/netsurf/render/html.c?rev=3204&r1=3203&r2... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Sun Mar 11 22:08:57 2007 @@ -136,7 +136,6 @@ no_memory: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -1358,7 +1357,13 @@ * containers */ ic = box_create(0, 0, 0, 0, 0, content); if (!ic) { - warn_user("NoMemory", 0); + union content_msg_data msg_data; + + msg_data.error = + messages_get("NoMemory"); + content_broadcast(content, + CONTENT_MSG_ERROR, + msg_data); return; } ic->type = BOX_INLINE_CONTAINER; Modified: trunk/netsurf/render/textplain.c URL: http://svn.semichrome.net/trunk/netsurf/render/textplain.c?rev=3204&r1=32... ============================================================================== --- trunk/netsurf/render/textplain.c (original) +++ trunk/netsurf/render/textplain.c Sun Mar 11 22:08:57 2007 @@ -76,9 +76,14 @@ iconv_cd = iconv_open("utf-8", "iso-8859-1"); } if (iconv_cd == (iconv_t)(-1)) { - msg_data.error = strerror(errno); + char buf[300]; + + snprintf(buf, sizeof buf, "IconvFailed %s", strerror(errno)); + buf[sizeof buf - 1] = 0; + + msg_data.error = buf; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("IconvFailed", strerror(errno)); + return false; } @@ -97,7 +102,6 @@ no_memory: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -137,9 +141,15 @@ c->data.textplain.utf8_data = utf8_data; c->data.textplain.utf8_data_allocated = allocated; } else if (count == (size_t)(-1) && errno != EINVAL) { - msg_data.error = strerror(errno); + char buf[300]; + + snprintf(buf, sizeof buf, "IconvFailed %s", + strerror(errno)); + buf[sizeof buf - 1] = 0; + + msg_data.error = buf; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("IconvFailed", strerror(errno)); + return false; } @@ -152,7 +162,6 @@ no_memory: msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - warn_user("NoMemory", 0); return false; } @@ -266,7 +275,6 @@ no_memory: LOG(("out of memory (line_count %lu)", line_count)); - warn_user("NoMemory", 0); return; } Modified: trunk/netsurf/riscos/artworks.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/artworks.c?rev=3204&r1=320... ============================================================================== --- trunk/netsurf/riscos/artworks.c (original) +++ trunk/netsurf/riscos/artworks.c Sun Mar 11 22:08:57 2007 @@ -168,7 +168,8 @@ c->data.artworks.block = malloc(INITIAL_BLOCK_SIZE); if (!c->data.artworks.block) { LOG(("failed to create block for ArtworksRenderer")); - warn_user("NoMemory", 0); + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; }

16 years

1
0
0 / 0

r3203 jmb - in /trunk/netsurf: !NetSurf/!Run,feb render/form.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 11 13:58:15 2007 New Revision: 3203 URL: http://svn.semichrome.net?rev=3203&view=rev Log: Transliterate form submissions (requires an iconv implementation that understands //TRANSLIT - both glibc & libiconv's do, as do Iconv modules >= 0.08) Require Iconv 0.08 Modified: trunk/netsurf/!NetSurf/!Run,feb trunk/netsurf/render/form.c Modified: trunk/netsurf/!NetSurf/!Run,feb URL: http://svn.semichrome.net/trunk/netsurf/%21NetSurf/%21Run%2Cfeb?rev=3203&... ============================================================================== --- trunk/netsurf/!NetSurf/!Run,feb (original) +++ trunk/netsurf/!NetSurf/!Run,feb Sun Mar 11 13:58:15 2007 @@ -78,9 +78,9 @@ RMEnsure Tinct 0.13 Error NetSurf requires Tinct 0.13 or later. This can be downloaded from http://www.tinct.net/ | Ensure Iconv -| http://netsurf.sourceforge.net/iconv/ -RMEnsure Iconv 0.07 NetSurfRMLoad System:Modules.Iconv -RMEnsure Iconv 0.07 Error NetSurf requires Iconv 0.07 or later. This can be downloaded from http://netsurf.sourceforge.net/iconv/ +| http://www.netsurf-browser.org/iconv/ +RMEnsure Iconv 0.08 NetSurfRMLoad System:Modules.Iconv +RMEnsure Iconv 0.08 Error NetSurf requires Iconv 0.08 or later. This can be downloaded from http://www.netsurf-browser.org/iconv/ | Disable SpecialFX, if present Set NetSurf$SpecialFX 1 Modified: trunk/netsurf/render/form.c URL: http://svn.semichrome.net/trunk/netsurf/render/form.c?rev=3203&r1=3202&r2... ============================================================================== --- trunk/netsurf/render/form.c (original) +++ trunk/netsurf/render/form.c Sun Mar 11 13:58:15 2007 @@ -685,39 +685,24 @@ { utf8_convert_ret err; char *ret = NULL; + char cset[256]; if (!item || !charset) return NULL; - /** \todo utf8_to_enc isn't entirely helpful here, as it strips - * unrepresentable characters completely. A more correct solution - * would be for it to insert '?' or U+FFFD or a human-readable - * transliteration instead. To do this requires: - * - * 1) The Iconv module to take some flag or other indicating that - * transliteration / placeholder characters is / are required. - * (I suggest following libiconv's //TRANSLIT for the former and - * introducing something like //REPLACE for the latter). The - * latter maps pretty easily to using UnicodeLib's ENCODING_WRITE - * functionality (as opposed to ENCODING_WRITE_STRICT). It would - * appear there's an issue with UnicodeLib when converting to - * ISO-8859-{1,2} (at least), in that unrepresentable characters - * don't get detected - they're converted to some other garbage - * that I've not worked out yet. - * //REPLACE would break on platforms other than RO, however. - * Therefore, if libiconv's //TRANSLIT handling is any good, it'd - * probably be best to try to emulate that. - * 2) Reflect these options in the utf8_* API(s) - */ - - err = utf8_to_enc(item, charset, 0, &ret); + snprintf(cset, sizeof cset, "%s//TRANSLIT", charset); + + err = utf8_to_enc(item, cset, 0, &ret); if (err == UTF8_CONVERT_BADENC) { /* charset not understood, try fallback charset (if any) */ - if (fallback) - err = utf8_to_enc(item, fallback, 0, &ret); + if (fallback) { + snprintf(cset, sizeof cset, "%s//TRANSLIT", fallback); + err = utf8_to_enc(item, cset, 0, &ret); + } if (err == UTF8_CONVERT_BADENC) /* that also failed, use 8859-1 */ - err = utf8_to_enc(item, "ISO-8859-1", 0, &ret); + err = utf8_to_enc(item, "ISO-8859-1//TRANSLIT", + 0, &ret); } if (err == UTF8_CONVERT_NOMEM) { return NULL;

16 years

1
0
0 / 0

r3202 tlsa - /trunk/netsurfweb/iconv/index.en

by netsurf＠semichrome.net

Author: tlsa Date: Sun Mar 11 13:40:28 2007 New Revision: 3202 URL: http://svn.semichrome.net?rev=3202&view=rev Log: Update iconv page for 0.08 release by JMB. Modified: trunk/netsurfweb/iconv/index.en Modified: trunk/netsurfweb/iconv/index.en URL: http://svn.semichrome.net/trunk/netsurfweb/iconv/index.en?rev=3202&r1=320... ============================================================================== --- trunk/netsurfweb/iconv/index.en (original) +++ trunk/netsurfweb/iconv/index.en Sun Mar 11 13:40:28 2007 @@ -36,9 +36,7 @@ <h2>Download</h2> -<p>Please <a href="iconv_latest.zip">download iconv</a> and follow the <strong>two installation steps</strong> above.</p> - -<p>Separate <a href="iconv007g.zip">A9home version of iconv</a> available.</p> +<p>Please <a href="iconv_latest.zip">download iconv</a> and follow the <strong>two</strong> installation steps above.</p> <h2>Contact</h2>

16 years

1
0
0 / 0

r3201 rjek - in /trunk/netsurf/desktop: browser.h textinput.c

by netsurf＠semichrome.net

Author: rjek Date: Tue Mar 6 23:50:06 2007 New Revision: 3201 URL: http://svn.semichrome.net?rev=3201&view=rev Log: Apply Darren Salt's keypress callbacl claiming patch, with addition of doc comment updates Modified: trunk/netsurf/desktop/browser.h trunk/netsurf/desktop/textinput.c Modified: trunk/netsurf/desktop/browser.h URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.h?rev=3201&r1=320... ============================================================================== --- trunk/netsurf/desktop/browser.h (original) +++ trunk/netsurf/desktop/browser.h Tue Mar 6 23:50:06 2007 @@ -32,7 +32,7 @@ struct _gesturer_state; -typedef void (*browser_caret_callback)(struct browser_window *bw, +typedef bool (*browser_caret_callback)(struct browser_window *bw, wchar_t key, void *p); typedef bool (*browser_paste_callback)(struct browser_window *bw, const char *utf8, unsigned utf8_len, bool last, void *p); Modified: trunk/netsurf/desktop/textinput.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=3201&r1=3... ============================================================================== --- trunk/netsurf/desktop/textinput.c (original) +++ trunk/netsurf/desktop/textinput.c Tue Mar 6 23:50:06 2007 @@ -37,9 +37,9 @@ struct caret ghost_caret; -static void browser_window_textarea_callback(struct browser_window *bw, +static bool browser_window_textarea_callback(struct browser_window *bw, wchar_t key, void *p); -static void browser_window_input_callback(struct browser_window *bw, +static bool browser_window_input_callback(struct browser_window *bw, wchar_t key, void *p); static void browser_window_place_caret(struct browser_window *bw, int x, int y, int height, @@ -283,8 +283,11 @@ * \param bw The browser window containing the text area * \param key The ucs4 character codepoint * \param p The text area box - */ -void browser_window_textarea_callback(struct browser_window *bw, + * \return true if the keypress is dealt with, false otherwise. It can + * return true even if it ran out of memory; this just means that + * it would have claimed it if it could. + */ +bool browser_window_textarea_callback(struct browser_window *bw, wchar_t key, void *p) { struct box *textarea = p; @@ -312,7 +315,7 @@ utf8_len = utf8_from_ucs4(key, utf8); if (!textbox_insert(bw, text_box, char_offset, utf8, utf8_len)) - return; + return true; char_offset += utf8_len; reflow = true; @@ -330,7 +333,7 @@ if (!text_box->prev) /* at very beginning of text area: ignore */ - return; + return true; /* delete space by merging with previous text box */ prev = text_box->prev; @@ -341,7 +344,7 @@ if (!textbox_insert(bw, prev, prev->length, text_box->text, text_box->length)) - return; + return true; box_unlink_and_free(text_box); @@ -383,7 +386,7 @@ if (!text_box->next) /* at very end of text area: ignore */ - return; + return true; /* delete space by merging with next text box */ @@ -393,7 +396,7 @@ if (!textbox_insert(bw, text_box, text_box->length, next->text, next->length)) - return; + return true; box_unlink_and_free(next); @@ -413,7 +416,8 @@ case 10: case 13: /* paragraph break */ new_text = textarea_insert_break(bw, text_box, char_offset); - if (!new_text) return; + if (!new_text) + return true; /* place caret at start of new text box */ text_box = new_text; @@ -440,7 +444,7 @@ box_y + inline_container->y + text_box->y); /* screen updated and caret repositioned already */ - return; + return true; case 24: { /* Ctrl + X */ int start_idx, end_idx; @@ -464,7 +468,7 @@ } else { if (!text_box->next) /* at end of text area: ignore */ - return; + return true; text_box = text_box->next; if (text_box->type == BOX_BR) @@ -479,7 +483,7 @@ } else { if (!text_box->prev) /* at start of text area: ignore */ - return; + return true; text_box = text_box->prev; if (text_box->type == BOX_BR) @@ -494,7 +498,7 @@ box_x, box_y, text_box->x + pixel_offset, inline_container->y + text_box->y - 1); - return; + return true; case KEY_DOWN: browser_window_textarea_click(bw, BROWSER_MOUSE_CLICK_1, @@ -503,7 +507,7 @@ text_box->x + pixel_offset, inline_container->y + text_box->y + text_box->height + 1); - return; + return true; case KEY_LINE_START: text_box = line_start(text_box); @@ -624,7 +628,7 @@ break; default: - return; + return false; } /* @@ -690,6 +694,8 @@ if (scrolled || reflow) browser_redraw_box(bw->current_content, textarea); + + return true; } @@ -780,8 +786,11 @@ * \param bw The browser window containing the input box * \param key The UCS4 character codepoint * \param p The input box - */ -void browser_window_input_callback(struct browser_window *bw, + * \return true if the keypress is dealt with, false otherwise. It can + * return true even if it ran out of memory; this just means that + * it would have claimed it if it could. + */ +bool browser_window_input_callback(struct browser_window *bw, wchar_t key, void *p) { struct box *input = (struct box *)p; @@ -804,7 +813,7 @@ /* have we exceeded max length of input? */ utf8_len = utf8_length(input->gadget->value); if (utf8_len >= input->gadget->maxlength) - return; + return true; /* normal character insertion */ @@ -815,7 +824,7 @@ input->gadget->length + utf8_len + 1); if (!value) { warn_user("NoMemory", 0); - return; + return true; } input->gadget->value = value; @@ -835,7 +844,7 @@ utf8); if (!textbox_insert(bw, text_box, box_offset, utf8, utf8_len)) - return; + return true; box_offset += utf8_len; changed = true; @@ -844,7 +853,8 @@ case KEY_DELETE_LEFT: { int prev_offset; - if (box_offset <= 0) return; + if (box_offset <= 0) + return true; /* Gadget */ prev_offset = form_offset; @@ -873,7 +883,7 @@ unsigned next_offset; if (box_offset >= text_box->length) - return; + return true; /* Gadget */ /* Go to the next valid UTF-8 character */ @@ -908,7 +918,7 @@ next_input = next_input->next) ; if (!next_input) - return; + return true; input = next_input->box; text_box = input->children->children; @@ -921,7 +931,7 @@ case 13: /* Return/Enter hit */ if (form) browser_form_submit(bw, 0, form, 0); - return; + return true; case 11: { /* Shift + Tab */ struct form_control *prev_input; @@ -933,7 +943,7 @@ prev_input = prev_input->prev) ; if (!prev_input) - return; + return true; input = prev_input->box; text_box = input->children->children; @@ -959,7 +969,7 @@ box_y + input->children->y + text_box->y); /* screen updated and caret repositioned already */ - return; + return true; case KEY_RIGHT: @@ -1023,7 +1033,8 @@ break; case KEY_DELETE_LINE_START: - if (box_offset <= 0) return; + if (box_offset <= 0) + return true; /* Text box */ textbox_delete(bw, text_box, 0, box_offset); @@ -1040,7 +1051,7 @@ case KEY_DELETE_LINE_END: if (box_offset >= text_box->length) - return; + return true; /* Text box */ textbox_delete(bw, text_box, box_offset, text_box->length - box_offset); @@ -1051,13 +1062,15 @@ break; default: - return; + return false; } input->gadget->caret_form_offset = form_offset; input_update_display(bw, input, form_offset, box_offset, to_textarea, changed); + + return true; } @@ -1138,8 +1151,7 @@ /* pass on to the appropriate field */ if (!bw->caret_callback) return false; - bw->caret_callback(bw, key, bw->caret_p); - return true; + return bw->caret_callback(bw, key, bw->caret_p); }

16 years

1
0
0 / 0

r3200 rjek - in /trunk/netsurf/gtk: gtk_scaffolding.c res/netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Tue Mar 6 23:33:05 2007 New Revision: 3200 URL: http://svn.semichrome.net?rev=3200&view=rev Log: Apply Darren Salt's patch to implement Open Location/Ctrl-L in nsgtk Modified: trunk/netsurf/gtk/gtk_scaffolding.c trunk/netsurf/gtk/res/netsurf.glade Modified: trunk/netsurf/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_scaffolding.c?rev=3200&r1... ============================================================================== --- trunk/netsurf/gtk/gtk_scaffolding.c (original) +++ trunk/netsurf/gtk/gtk_scaffolding.c Tue Mar 6 23:33:05 2007 @@ -104,6 +104,7 @@ /* prototypes for menu handlers */ /* file menu */ MENUPROTO(new_window); +MENUPROTO(open_location); MENUPROTO(close_window); MENUPROTO(quit); @@ -135,6 +136,7 @@ static struct menu_events menu_events[] = { /* file menu */ MENUEVENT(new_window), + MENUEVENT(open_location), MENUEVENT(close_window), MENUEVENT(quit), @@ -340,6 +342,15 @@ MENUHANDLER(new_window) { + return TRUE; +} + +MENUHANDLER(open_location) +{ + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; + + gtk_widget_grab_focus(gw->url_bar); + return TRUE; } Modified: trunk/netsurf/gtk/res/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/res/netsurf.glade?rev=3200&r1... ============================================================================== --- trunk/netsurf/gtk/res/netsurf.glade (original) +++ trunk/netsurf/gtk/res/netsurf.glade Tue Mar 6 23:33:05 2007 @@ -64,7 +64,7 @@ <child> <widget class="GtkMenuItem" id="open_location"> <property name="visible">True</property> - <property name="sensitive">False</property> + <property name="sensitive">True</property> <property name="tooltip" translatable="yes">Open an address into this browser window.</property> <property name="label" translatable="yes">Open _location...</property> <property name="use_underline">True</property>

16 years

1
0
0 / 0

r3199 rjek - in /trunk/netsurf/gtk: gtk_scaffolding.c gtk_window.c

by netsurf＠semichrome.net

Author: rjek Date: Tue Mar 6 21:29:51 2007 New Revision: 3199 URL: http://svn.semichrome.net?rev=3199&view=rev Log: Reformat and apply Darren Salt's scrollwheel and keyboard scrolling patch, although I still can't get the keyboard scrolling to work. Modified: trunk/netsurf/gtk/gtk_scaffolding.c trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_scaffolding.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_scaffolding.c?rev=3199&r1... ============================================================================== --- trunk/netsurf/gtk/gtk_scaffolding.c (original) +++ trunk/netsurf/gtk/gtk_scaffolding.c Tue Mar 6 21:29:51 2007 @@ -511,20 +511,47 @@ #define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x)) +static gboolean do_scroll_event(GtkWidget *widget, GdkEventScroll *ev, + gpointer data) +{ + switch (ev->direction) + { + case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: + gtk_widget_event(g_object_get_data( + G_OBJECT(widget), "vScroll"), ev); + break; + default: + gtk_widget_event(g_object_get_data( + G_OBJECT(widget), "hScroll"), ev); + } + + return TRUE; +} + void nsgtk_attach_toplevel_viewport(nsgtk_scaffolding *g, GtkViewport *vp) { + GtkWidget *scrollbar; + /* Insert the viewport into the right part of our table */ GtkTable *table = GTK_TABLE(GET_WIDGET("centreTable")); LOG(("Attaching viewport to scaffolding %p", g)); gtk_table_attach_defaults(table, GTK_WIDGET(vp), 0, 1, 0, 1); /* connect our scrollbars to the viewport */ + scrollbar = GET_WIDGET("coreScrollHorizontal"); gtk_viewport_set_hadjustment(vp, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("coreScrollHorizontal")))); + gtk_range_get_adjustment(GTK_RANGE(scrollbar))); + g_object_set_data(G_OBJECT(vp), "hScroll", scrollbar); + scrollbar = GET_WIDGET("coreScrollVertical"); gtk_viewport_set_vadjustment(vp, - gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("coreScrollVertical")))); - + gtk_range_get_adjustment(GTK_RANGE(scrollbar))); + g_object_set_data(G_OBJECT(vp), "vScroll", scrollbar); + g_signal_connect(G_OBJECT(vp), "scroll_event", do_scroll_event, NULL); + + gdk_window_set_accept_focus (GTK_WIDGET(vp)->window, TRUE); + /* And set the size-request to zero to cause it to get its act together */ gtk_widget_set_size_request(GTK_WIDGET(vp), 0, 0); Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=3199&r1=3198... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Tue Mar 6 21:29:51 2007 @@ -360,7 +360,97 @@ struct gui_window *g = data; wchar_t nskey = gdkkey_to_nskey(event); - browser_window_key_press(g->bw, nskey); + if (browser_window_key_press(g->bw, nskey)) + return TRUE; + + if (event->state == 0) { + double value; + GtkAdjustment *vscroll = gtk_range_get_adjustment( + g_object_get_data(G_OBJECT(g->viewport), "vScroll")); + + GtkAdjustment *hscroll = gtk_range_get_adjustment( + g_object_get_data(G_OBJECT(g->viewport), "hScroll")); + + GtkAdjustment *scroll; + + const GtkAllocation *const alloc = + &GTK_WIDGET(g->viewport)->allocation; + + switch (event->keyval) { + default: + return TRUE; + + case GDK_Home: + case GDK_KP_Home: + scroll = vscroll; + value = scroll->lower; + break; + + case GDK_End: + case GDK_KP_End: + scroll = vscroll; + value = scroll->upper - alloc->height; + if (value < scroll->lower) + value = scroll->lower; + break; + + case GDK_Left: + case GDK_KP_Left: + scroll = hscroll; + value = gtk_adjustment_get_value(scroll) - + scroll->step_increment; + if (value < scroll->lower) + value = scroll->lower; + break; + + case GDK_Up: + case GDK_KP_Up: + scroll = vscroll; + value = gtk_adjustment_get_value(scroll) - + scroll->step_increment; + if (value < scroll->lower) + value = scroll->lower; + break; + + case GDK_Right: + case GDK_KP_Right: + scroll = hscroll; + value = gtk_adjustment_get_value(scroll) + + scroll->step_increment; + if (value > scroll->upper - alloc->width) + value = scroll->upper - alloc->width; + break; + + case GDK_Down: + case GDK_KP_Down: + scroll = vscroll; + value = gtk_adjustment_get_value(scroll) + + scroll->step_increment; + if (value > scroll->upper - alloc->height) + value = scroll->upper - alloc->height; + break; + + case GDK_Page_Up: + case GDK_KP_Page_Up: + scroll = vscroll; + value = gtk_adjustment_get_value(scroll) - + scroll->page_increment; + if (value < scroll->lower) + value = scroll->lower; + break; + + case GDK_Page_Down: + case GDK_KP_Page_Down: + scroll = vscroll; + value = gtk_adjustment_get_value(scroll) + + scroll->page_increment; + if (value > scroll->upper - alloc->height) + value = scroll->upper - alloc->height; + break; + } + + gtk_adjustment_set_value(scroll, value); + } return TRUE; }

16 years

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits March 2007