Mercurial > dillo_port1.3
changeset 1770:4779a3d891a1
trim some spaces
| author | corvid <corvid@lavabit.com> |
|---|---|
| date | Wed, 24 Nov 2010 19:26:45 +0000 |
| parents | c43a79252d10 |
| children | 47ae467a64e0 |
| files | doc/README doc/dillo.1 doc/user_help.html dw/fltkplatform.cc dw/fltkviewbase.cc dw/types.cc src/cache.c src/capi.c src/css.hh src/html.cc src/styleengine.cc src/styleengine.hh src/table.cc |
| diffstat | 13 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/README Wed Nov 24 19:14:22 2010 +0000 +++ b/doc/README Wed Nov 24 19:26:45 2010 +0000 @@ -47,5 +47,5 @@ * Please submit your patches with 'hg diff'. - Happy coding! + Happy coding! --Jcid
--- a/doc/dillo.1 Wed Nov 24 19:14:22 2010 +0000 +++ b/doc/dillo.1 Wed Nov 24 19:26:45 2010 +0000 @@ -61,38 +61,38 @@ URL of proxy to send HTTP traffic through. .SH FILES .TP -.I dpid +.I dpid Dillo plugin daemon .TP -.I dpidc +.I dpidc Control program for dpid. .TP -.I ~/.dillo/bm.txt +.I ~/.dillo/bm.txt User bookmarks .TP .I ~/.dillo/certs/ Saved certificates for HTTPS. .TP -.I ~/.dillo/cookies.txt +.I ~/.dillo/cookies.txt Stored cookies .TP -.I ~/.dillo/cookiesrc +.I ~/.dillo/cookiesrc Cookie settings .TP -.I ~/.dillo/dillorc +.I ~/.dillo/dillorc Configuration file. .TP .I ~/.dillo/dpid_comm_keys Keys used in dpi daemon communication. .TP -.I ~/.dillo/dpidrc +.I ~/.dillo/dpidrc Contains name of directory containing dpis, and associates dpi files with protocols. .TP -.I ~/.dillo/keysrc +.I ~/.dillo/keysrc Keybindings. .TP -.I ~/.dillo/style.css +.I ~/.dillo/style.css User style sheet .SH SEE ALSO .BR wget (1)
--- a/doc/user_help.html Wed Nov 24 19:14:22 2010 +0000 +++ b/doc/user_help.html Wed Nov 24 19:26:45 2010 +0000 @@ -41,7 +41,7 @@ </ul> </td></tr> </table> - + <table WIDTH="100%" BORDER=1 CELLSPACING=0 CELLPADDING=3> <tr ALIGN=LEFT VALIGN=TOP><td bgcolor="wheat"> <h4><font color="green">Usage:</font></h4> @@ -61,8 +61,8 @@ <li> <b>Configuration:</b> If you want to change Dillo's appearance or behaviour, look at the options in your <b><font color="#5040a0">dillorc</font></b> - file (if you don't have a copy in your ~/.dillo/ directory, get it - <a href='http://www.dillo.org/dillorc'>here</a>). + file (if you don't have a copy in your ~/.dillo/ directory, get it + <a href='http://www.dillo.org/dillorc'>here</a>). <li> Clicking the "Reload" button always requests an end-to-end reload of the page currently viewed, but it will *not* reload embedded images during this process. @@ -224,7 +224,7 @@ (<a href='http://www.dillo.org/dpi1.html'>dpi</a>) framework. This should be transparent to the end user. Please note that: <ul> - <li>It is a good idea to keep a backup of your + <li>It is a good idea to keep a backup of your <code>~/.dillo/bm.txt</code> <li>The server will stay alive after closing dillo. <li>You can stop the server by sending it a KILL signal. Dillo
--- a/dw/fltkplatform.cc Wed Nov 24 19:14:22 2010 +0000 +++ b/dw/fltkplatform.cc Wed Nov 24 19:26:45 2010 +0000 @@ -358,7 +358,7 @@ int width = 0; FltkFont *ff = (FltkFont*) font; int curr = 0, next = 0, nb; - + if (font->fontVariant == 1) { int sc_fontsize = lout::misc::roundInt(ff->size * 0.78); for (curr = 0; next < len; curr = next) { @@ -380,10 +380,10 @@ } else { setfont (ff->font, ff->size); width = (int) getwidth (text, len); - + if (font->letterSpacing) { int curr = 0, next = 0; - + while (next < len) { next = nextGlyph(text, curr); width += font->letterSpacing;
--- a/dw/fltkviewbase.cc Wed Nov 24 19:14:22 2010 +0000 +++ b/dw/fltkviewbase.cc Wed Nov 24 19:26:45 2010 +0000 @@ -422,7 +422,7 @@ int x2 = translateCanvasXToViewX (x + width); int y2 = translateCanvasYToViewY (y + height); - // We only support rectangles with line width 1px, so we clip with + // We only support rectangles with line width 1px, so we clip with // a rectangle 1px wider and higher than what we actually expose. // This is only really necessary for non-filled rectangles. clipPoint (&x1, &y1, 1); @@ -554,7 +554,7 @@ while (next < len) { next = theLayout->nextGlyph(text, curr); drawtext(text + curr, next - curr, viewX, viewY); - viewX += font->letterSpacing + + viewX += font->letterSpacing + (int)getwidth(text + curr,next - curr); curr = next; }
--- a/dw/types.cc Wed Nov 24 19:14:22 2010 +0000 +++ b/dw/types.cc Wed Nov 24 19:26:45 2010 +0000 @@ -69,7 +69,7 @@ dest->x = dest->y = dest->width = dest->height = 0; } - return doIntersect; + return doIntersect; } /* @@ -180,7 +180,7 @@ int z1 = zOfVectorProduct (ax1 - bx1, ay1 - by1, bx2 - bx1, by2 - by1); int z2 = zOfVectorProduct (ax2 - bx1, ay2 - by1, bx2 - bx1, by2 - by1); - return (z1 <= 0 && z2 >= 0) || (z1 >= 0 && z2 <= 0); + return (z1 <= 0 && z2 >= 0) || (z1 >= 0 && z2 <= 0); } /**
--- a/src/cache.c Wed Nov 24 19:14:22 2010 +0000 +++ b/src/cache.c Wed Nov 24 19:26:45 2010 +0000 @@ -516,7 +516,7 @@ ((!major || !*major) && (!minor || !*minor))) { /* META only gives charset; use detected MIME type too */ entry->TypeNorm = dStrconcat(entry->TypeDet, ctype, NULL); - } else if (*from == 'm' && + } else if (*from == 'm' && !dStrncasecmp(ctype, "text/xhtml", 10)) { /* WORKAROUND: doxygen uses "text/xhtml" in META */ entry->TypeNorm = dStrdup(entry->TypeDet);
--- a/src/capi.c Wed Nov 24 19:14:22 2010 +0000 +++ b/src/capi.c Wed Nov 24 19:26:45 2010 +0000 @@ -362,7 +362,7 @@ * For a user request, the action will be permitted. * For an automatic request, permission to load depends on the filter set * by the user. - */ + */ static bool_t Capi_filters_test(const DilloUrl *wanted, const DilloUrl *requester) {
--- a/src/css.hh Wed Nov 24 19:14:22 2010 +0000 +++ b/src/css.hh Wed Nov 24 19:26:45 2010 +0000 @@ -462,7 +462,7 @@ static CssStyleSheet *userStyle; static CssStyleSheet *userImportantStyle; CssStyleSheet *sheet[CSS_PRIMARY_USER_IMPORTANT + 1]; - int pos; + int pos; void buildUserAgentStyle (); void buildUserStyle ();
--- a/src/html.cc Wed Nov 24 19:14:22 2010 +0000 +++ b/src/html.cc Wed Nov 24 19:26:45 2010 +0000 @@ -1760,7 +1760,7 @@ bgColor = html->styleEngine->backgroundColor (); if (bgColor) - HT2LT(html)->setBgColor(bgColor); + HT2LT(html)->setBgColor(bgColor); /* Determine a color for visited links. * This color is computed once per page and used for immediate feedback
--- a/src/styleengine.cc Wed Nov 24 19:14:22 2010 +0000 +++ b/src/styleengine.cc Wed Nov 24 19:26:45 2010 +0000 @@ -743,7 +743,7 @@ /** * \brief Recompute all style information from scratch - * This is used to take into account CSS styles for the HTML-element. + * This is used to take into account CSS styles for the HTML-element. * The CSS data is only completely available after parsing the HEAD-section * and thereby after the HTML-element has been opened. * Note that restyle() does not change any styles in the widget tree.
--- a/src/styleengine.hh Wed Nov 24 19:14:22 2010 +0000 +++ b/src/styleengine.hh Wed Nov 24 19:26:45 2010 +0000 @@ -43,7 +43,7 @@ if (!n->nonCssProperties) n->nonCssProperties = new CssPropertyList (true); - n->nonCssProperties->set(name, type, value); + n->nonCssProperties->set(name, type, value); } void preprocessAttrs (dw::core::style::StyleAttrs *attrs); void postprocessAttrs (dw::core::style::StyleAttrs *attrs);