diff options
| -rw-r--r-- | dpi/bookmarks.c | 4 | ||||
| -rw-r--r-- | dpi/ftp.c | 2 | ||||
| -rw-r--r-- | dw/textblock.cc | 2 | ||||
| -rw-r--r-- | src/IO/http.c | 2 | ||||
| -rw-r--r-- | src/css.cc | 4 | ||||
| -rw-r--r-- | src/cssparser.cc | 4 | ||||
| -rw-r--r-- | src/html.cc | 4 | ||||
| -rw-r--r-- | src/jpeg.c | 2 | ||||
| -rw-r--r-- | src/keysrc | 2 | ||||
| -rw-r--r-- | src/paths.cc | 2 | ||||
| -rw-r--r-- | src/prefsparser.cc | 2 | ||||
| -rw-r--r-- | src/styleengine.cc | 6 | ||||
| -rw-r--r-- | src/uicmd.cc | 4 | ||||
| -rw-r--r-- | src/xembed.cc | 2 | ||||
| -rw-r--r-- | test/dw_anchors_test.cc | 6 | ||||
| -rw-r--r-- | test/dw_border_test.cc | 4 | ||||
| -rw-r--r-- | test/dw_example.cc | 2 | ||||
| -rw-r--r-- | test/dw_find_test.cc | 2 | ||||
| -rw-r--r-- | test/dw_images_scaled.cc | 14 | ||||
| -rw-r--r-- | test/dw_images_scaled2.cc | 8 | ||||
| -rw-r--r-- | test/dw_images_simple.cc | 14 | ||||
| -rw-r--r-- | test/dw_imgbuf_mem_test.cc | 12 | ||||
| -rw-r--r-- | test/dw_links.cc | 8 | ||||
| -rw-r--r-- | test/dw_links2.cc | 8 | ||||
| -rw-r--r-- | test/dw_lists.cc | 2 | ||||
| -rw-r--r-- | test/dw_resource_test.cc | 2 | ||||
| -rw-r--r-- | test/dw_table_aligned.cc | 4 | ||||
| -rw-r--r-- | test/fltk_browser.cc | 2 | ||||
| -rw-r--r-- | test/form.cc | 8 | ||||
| -rw-r--r-- | test/form.hh | 4 |
30 files changed, 71 insertions, 71 deletions
diff --git a/dpi/bookmarks.c b/dpi/bookmarks.c index afa70814..648b5f82 100644 --- a/dpi/bookmarks.c +++ b/dpi/bookmarks.c @@ -698,7 +698,7 @@ static void Bms_check_import(void) if (rc == 127) { MSG("Bookmarks: /bin/sh could not be executed\n"); } else if (rc == -1) { - MSG("Bookmarks: process creation failure: %s\n", + MSG("Bookmarks: process creation failure: %s\n", dStrerror(errno)); } dStr_sprintf(dstr, cmd2, OldBmFile, BmFile); @@ -706,7 +706,7 @@ static void Bms_check_import(void) if (rc == 127) { MSG("Bookmarks: /bin/sh could not be executed\n"); } else if (rc == -1) { - MSG("Bookmarks: process creation failure: %s\n", + MSG("Bookmarks: process creation failure: %s\n", dStrerror(errno)); } @@ -279,7 +279,7 @@ int main(int argc, char **argv) /* wget may need to write a temporary file... */ rc = chdir("/tmp"); if (rc == -1) { - MSG("paths: error changing directory to /tmp: %s\n", + MSG("paths: error changing directory to /tmp: %s\n", dStrerror(errno)); } diff --git a/dw/textblock.cc b/dw/textblock.cc index c1886e0a..c1f0c2b4 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -1486,7 +1486,7 @@ int Textblock::findWord (int x, int y) word = words->getRef (wordIndex); lastXCursor = xCursor; xCursor += word->size.width + word->effSpace; - if (lastXCursor <= x && xCursor > x && + if (lastXCursor <= x && xCursor > x && y > yWidgetBase - word->size.ascent && y <= yWidgetBase + word->size.descent) { return wordIndex; diff --git a/src/IO/http.c b/src/IO/http.c index dd6ed3ca..195fd155 100644 --- a/src/IO/http.c +++ b/src/IO/http.c @@ -447,7 +447,7 @@ char *a_Http_make_connect_str(const DilloUrl *url) "Host: %s\r\n" "%s" "\r\n", - auth2, + auth2, auth2, proxy_auth); @@ -397,7 +397,7 @@ void CssStyleSheet::addRule (CssRule *rule) { * * The properties are set as defined by the rules in the stylesheet that * match at the given node in the document tree. - */ + */ void CssStyleSheet::apply (CssPropertyList *props, Doctree *docTree, const DoctreeNode *node) { static const int maxLists = 32; @@ -544,7 +544,7 @@ void CssContext::addRule (CssSelector *sel, CssPropertyList *props, /** * \brief Create the user agent style. * - * The user agent style defines how dillo renders HTML in the absence of + * The user agent style defines how dillo renders HTML in the absence of * author or user styles. */ void CssContext::buildUserAgentStyle () { diff --git a/src/cssparser.cc b/src/cssparser.cc index 2550e74e..5ef53dcf 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -685,9 +685,9 @@ bool CssParser::parseRgbColorComponent(int32_t *cc, int *percentage) { MSG_CSS("expected integer not found in %s color\n", "rgb"); return false; } - + *cc = strtol(tval, NULL, 10); - + nextToken(); if (ttype == CSS_TK_CHAR && tval[0] == '%') { if (*percentage == 0) { diff --git a/src/html.cc b/src/html.cc index 7243b7b3..b2a3c543 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1750,7 +1750,7 @@ static void Html_tag_open_body(DilloHtml *html, const char *tag, int tagsize) html->styleEngine->startElement (tag_index_a); html->styleEngine->setPseudoVisited (); if (html->non_css_visited_color != -1) { - CssPropertyList vprops; + CssPropertyList vprops; vprops.set (CSS_PROPERTY_COLOR, CSS_TYPE_COLOR, html->non_css_visited_color); html->styleEngine->setNonCssHints (&vprops); @@ -2009,7 +2009,7 @@ DilloImage *a_Html_image_new(DilloHtml *html, const char *tag, CSS_LENGTH_VALUE(l_h) : 0); } /* Check for suspicious image size request that would cause - * an excessive amount of memory to be allocated for the + * an excessive amount of memory to be allocated for the * image buffer. * Be careful to avoid integer overflows during the checks. * There is an additional check in dw/image.cc to catch cases @@ -286,7 +286,7 @@ static void Jpeg_write(DilloJpeg *jpeg, void *Buf, uint_t BufSize) /* check max image size */ if (jpeg->cinfo.image_width <= 0 || jpeg->cinfo.image_height <= 0 || - jpeg->cinfo.image_width > + jpeg->cinfo.image_width > IMAGE_MAX_AREA / jpeg->cinfo.image_height) { MSG("Jpeg_write: suspicious image size request %ux%u\n", (uint_t)jpeg->cinfo.image_width, @@ -67,7 +67,7 @@ # "goto" goes to the location bar at the top of the window. #<ctrl>l = goto -# "stop" loading the page. +# "stop" loading the page. #(stop has no default binding) # "save" the current page. diff --git a/src/paths.cc b/src/paths.cc index 9d0abda0..6fccb89a 100644 --- a/src/paths.cc +++ b/src/paths.cc @@ -38,7 +38,7 @@ void Paths::init(void) oldWorkingDir = dGetcwd(); rc = chdir("/tmp"); if (rc == -1) { - MSG("paths: error changing directory to /tmp: %s\n", + MSG("paths: error changing directory to /tmp: %s\n", dStrerror(errno)); } diff --git a/src/prefsparser.cc b/src/prefsparser.cc index a3bbaef0..e77aecf6 100644 --- a/src/prefsparser.cc +++ b/src/prefsparser.cc @@ -48,7 +48,7 @@ int PrefsParser::parseOption(char *name, char *value) { "allow_white_bg", &prefs.allow_white_bg, PREFS_BOOL }, { "buffered_drawing", &prefs.buffered_drawing, PREFS_INT32 }, { "contrast_visited_color", &prefs.contrast_visited_color, PREFS_BOOL }, - { "enterpress_forces_submit", &prefs.enterpress_forces_submit, + { "enterpress_forces_submit", &prefs.enterpress_forces_submit, PREFS_BOOL }, { "focus_new_tab", &prefs.focus_new_tab, PREFS_BOOL }, { "font_cursive", &prefs.font_cursive, PREFS_STRING }, diff --git a/src/styleengine.cc b/src/styleengine.cc index 8bf78635..a54fdeb3 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -516,10 +516,10 @@ bool StyleEngine::computeLength (dw::core::style::Length *dest, * \brief Similar to StyleEngine::style(), but with backgroundColor set. * A normal style might have backgroundColor == NULL to indicate a transparent * background. This method ensures that backgroundColor is set. - */ + */ Style * StyleEngine::backgroundStyle () { StyleAttrs attrs = *style (); - + for (int i = stack->size () - 1; i >= 0 && ! attrs.backgroundColor; i--) attrs.backgroundColor = stack->getRef (i)->style->backgroundColor; @@ -542,7 +542,7 @@ Style * StyleEngine::style0 (CssPropertyList *nonCssProperties) { // Ensure that StyleEngine::style0() has not been called before for // this element. // Style computation is expensive so limit it as much as possible. - // If this assertion is hit, you need to rearrange the code that is + // If this assertion is hit, you need to rearrange the code that is // doing styleEngine calls to call setNonCssHints() before calling // style() or wordStyle() for each new element. assert (stack->getRef (stack->size () - 1)->style == NULL); diff --git a/src/uicmd.cc b/src/uicmd.cc index d9cce163..7ea523d0 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -314,7 +314,7 @@ public: if (e == PUSH) { /* WORKAROUND: FLTK raises the window on unhandled clicks, * which we do not want. - */ + */ ret = 1; } return ret; @@ -1129,7 +1129,7 @@ void a_UIcmd_scroll(BrowserWindow *bw, int icmd) } } } - + /* * Get location's text */ diff --git a/src/xembed.cc b/src/xembed.cc index 83143e8b..04a4362a 100644 --- a/src/xembed.cc +++ b/src/xembed.cc @@ -21,7 +21,7 @@ #if USE_X11 -typedef enum { +typedef enum { XEMBED_EMBEDDED_NOTIFY = 0, XEMBED_WINDOW_ACTIVATE = 1, XEMBED_WINDOW_DEACTIVATE = 2, diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc index 69001d9b..964b5838 100644 --- a/test/dw_anchors_test.cc +++ b/test/dw_anchors_test.cc @@ -56,7 +56,7 @@ static void textTimeout (void *data) { Textblock *oldTop = topTextblock; topTextblock = new Textblock (false); - + if (oldTop) { oldTop->addLinebreak (wordStyle); oldTop->addWidget (topTextblock, widgetStyle); @@ -72,7 +72,7 @@ static void textTimeout (void *data) buf[0] = toupper (buf[0]); topTextblock->addText (buf, headingStyle); topTextblock->addParbreak (5, headingStyle); - + for (int i = 0; i < 30; i++) { strcpy (buf, numbers[textblockNo]); if (i == 0) @@ -84,7 +84,7 @@ static void textTimeout (void *data) } topTextblock->flush (); - + textblockNo++; if (textblockNo < 10) ::fltk::repeat_timeout (1, textTimeout, NULL); diff --git a/test/dw_border_test.cc b/test/dw_border_test.cc index 39b9d3aa..008c6229 100644 --- a/test/dw_border_test.cc +++ b/test/dw_border_test.cc @@ -88,7 +88,7 @@ int main(int argc, char **argv) const char *words1[] = { "Some", "random", "text.", NULL }; const char *words2[] = { "A", "nested", "paragraph.", NULL }; - + for(int i = 0; words1[i]; i++) { if(i != 0) textblock1->addSpace (wordStyle); @@ -97,7 +97,7 @@ int main(int argc, char **argv) for(int i = 0; i < 1; i++) { textblock1->addParbreak(0, wordStyle); - + Textblock *textblock2 = new Textblock (false); textblock1->addWidget (textblock2, widgetStyle2); diff --git a/test/dw_example.cc b/test/dw_example.cc index b3f46b5f..ba551b91 100644 --- a/test/dw_example.cc +++ b/test/dw_example.cc @@ -56,7 +56,7 @@ int main(int argc, char **argv) styleAttrs.backgroundColor = dw::core::style::Color::create (layout, 0xffffff); - dw::core::style::Style *widgetStyle = + dw::core::style::Style *widgetStyle = dw::core::style::Style::create (layout, &styleAttrs); dw::Textblock *textblock = new dw::Textblock (false); diff --git a/test/dw_find_test.cc b/test/dw_find_test.cc index c82ec535..39f7b4c5 100644 --- a/test/dw_find_test.cc +++ b/test/dw_find_test.cc @@ -47,7 +47,7 @@ static void findCallback (::fltk::Widget *widget, void *data) case FindtextState::SUCCESS: resultLabel->label("SUCCESS"); break; - + case FindtextState::RESTART: resultLabel->label("RESTART"); break; diff --git a/test/dw_images_scaled.cc b/test/dw_images_scaled.cc index 3c32d3ba..da4e8735 100644 --- a/test/dw_images_scaled.cc +++ b/test/dw_images_scaled.cc @@ -57,13 +57,13 @@ static void imageDrawTimeout (void *data) buf[4 * x + 2] = imgRow * 255 / 199; buf[4 * x + 3] = (199 - imgRow) * 255 / 199; } - + imgbuf->copyRow (imgRow, buf); - image->drawRow (imgRow); + image->drawRow (imgRow); imgRow++; } } - + if(imgRow < 200) ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL); } @@ -79,13 +79,13 @@ static void imageDrawTimeout (void *data) buf[3 * x + 1] = (399 - x) * 255 / 399; buf[3 * x + 2] = imgRow * 255 / 199; } - + imgbuf->copyRow (imgRow, buf); - image->drawRow (imgRow); + image->drawRow (imgRow); imgRow++; } } - + if(imgRow < 200) ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL); } @@ -132,7 +132,7 @@ int main(int argc, char **argv) image = new dw::Image (""); textblock->addWidget (image, imageStyle); - textblock->addSpace (imageStyle); + textblock->addSpace (imageStyle); imageStyle->unref(); diff --git a/test/dw_images_scaled2.cc b/test/dw_images_scaled2.cc index 70028a47..6d1bcd80 100644 --- a/test/dw_images_scaled2.cc +++ b/test/dw_images_scaled2.cc @@ -55,14 +55,14 @@ static void imageDrawTimeout (void *data) buf[3 * x + 1] = (399 - x) * 255 / 399; buf[3 * x + 2] = imgRow * 255 / 199; } - + imgbuf->copyRow (imgRow, buf); - image1->drawRow (imgRow); - image2->drawRow (imgRow); + image1->drawRow (imgRow); + image2->drawRow (imgRow); imgRow++; } } - + if(imgRow < 200) ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL); } diff --git a/test/dw_images_simple.cc b/test/dw_images_simple.cc index d448ae92..3fb3c49e 100644 --- a/test/dw_images_simple.cc +++ b/test/dw_images_simple.cc @@ -57,13 +57,13 @@ static void imageDrawTimeout (void *data) buf[4 * x + 2] = imgRow * 255 / 199; buf[4 * x + 3] = (199 - imgRow) * 255 / 199; } - + imgbuf->copyRow (imgRow, buf); - image->drawRow (imgRow); + image->drawRow (imgRow); imgRow++; } } - + if(imgRow < 200) ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL); } @@ -79,13 +79,13 @@ static void imageDrawTimeout (void *data) buf[3 * x + 1] = (399 - x) * 255 / 399; buf[3 * x + 2] = imgRow * 255 / 199; } - + imgbuf->copyRow (imgRow, buf); - image->drawRow (imgRow); + image->drawRow (imgRow); imgRow++; } } - + if(imgRow < 200) ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL); } @@ -130,7 +130,7 @@ int main(int argc, char **argv) image = new dw::Image (""); textblock->addWidget (image, imageStyle); - textblock->addSpace (imageStyle); + textblock->addSpace (imageStyle); imageStyle->unref(); diff --git a/test/dw_imgbuf_mem_test.cc b/test/dw_imgbuf_mem_test.cc index e2c332e0..33131134 100644 --- a/test/dw_imgbuf_mem_test.cc +++ b/test/dw_imgbuf_mem_test.cc @@ -33,7 +33,7 @@ void solution1 () { FltkPlatform *platform = new FltkPlatform (); Layout *layout = new Layout (platform); - + Imgbuf *rootbuf = layout->createImgbuf (Imgbuf::RGB, 100, 100); rootbuf->ref (); // Extra reference by the dicache. printf ("=== Can be deleted? %s.\n", @@ -48,7 +48,7 @@ void solution1 () printf ("=== Can be deleted? %s.\n", rootbuf->lastReference () ? "Yes" : "No"); rootbuf->unref (); // Extra reference by the dicache. - + delete layout; } @@ -56,7 +56,7 @@ void solution2 () { FltkPlatform *platform = new FltkPlatform (); Layout *layout = new Layout (platform); - + Imgbuf *rootbuf = layout->createImgbuf (Imgbuf::RGB, 100, 100); rootbuf->setDeleteOnUnref (false); printf ("=== Can be deleted? %s.\n", @@ -71,7 +71,7 @@ void solution2 () printf ("=== Can be deleted? %s.\n", !rootbuf->isReferred () ? "Yes" : "No"); delete rootbuf; - + delete layout; } @@ -90,13 +90,13 @@ void solution3 () { FltkPlatform *platform = new FltkPlatform (); Layout *layout = new Layout (platform); - + Imgbuf *rootbuf = layout->createImgbuf (Imgbuf::RGB, 100, 100); rootbuf->connectDeletion (new RootbufDeletionReceiver ()); Imgbuf *scaledbuf = rootbuf->getScaledBuf (50, 50); rootbuf->unref (); scaledbuf->unref (); - + delete layout; } diff --git a/test/dw_links.cc b/test/dw_links.cc index c2384d1e..ada9c49f 100644 --- a/test/dw_links.cc +++ b/test/dw_links.cc @@ -115,7 +115,7 @@ int main(int argc, char **argv) styleAttrs.color = Color::create (layout, 0x0000ff); styleAttrs.textDecoration = TEXT_DECORATION_UNDERLINE; styleAttrs.cursor = CURSOR_POINTER; - + for(int i = 1; i <= 10; i++) { char buf[4]; sprintf(buf, "%d.", i); @@ -132,15 +132,15 @@ int main(int argc, char **argv) textblock->addText(words1[j], wordStyle); textblock->addSpace(wordStyle); } - + styleAttrs.x_link = i; Style *linkStyle = Style::create (layout, &styleAttrs); - + for(int j = 0; words2[j]; j++) { textblock->addText(words2[j], linkStyle); textblock->addSpace(wordStyle); } - + linkStyle->unref (); textblock->addParbreak(10, wordStyle); diff --git a/test/dw_links2.cc b/test/dw_links2.cc index 4205a768..7aede1c8 100644 --- a/test/dw_links2.cc +++ b/test/dw_links2.cc @@ -143,7 +143,7 @@ int main(int argc, char **argv) styleAttrs.color = Color::create (layout, 0x0000ff); styleAttrs.textDecoration = TEXT_DECORATION_UNDERLINE; styleAttrs.cursor = CURSOR_POINTER; - + for(int i = 1; i <= 30; i++) { char buf[4]; sprintf(buf, "%d.", i); @@ -160,15 +160,15 @@ int main(int argc, char **argv) textblock->addText (words1[j], wordStyle); textblock->addSpace(wordStyle); } - + styleAttrs.x_link = i; Style *linkStyle = Style::create (layout, &styleAttrs); - + for(int j = 0; words2[j]; j++) { textblock->addText (words2[j], linkStyle); textblock->addSpace(wordStyle); } - + linkStyle->unref (); textblock->addParbreak(10, wordStyle); diff --git a/test/dw_lists.cc b/test/dw_lists.cc index 09b85b2c..a87c6ddc 100644 --- a/test/dw_lists.cc +++ b/test/dw_lists.cc @@ -89,7 +89,7 @@ int main(int argc, char **argv) "comes", "some", "more", "text", "to", "demonstrate", "word", "wrapping.", NULL }; - + for(int i = 0; wordsPar[i]; i++) { if(i != 0) textblock->addSpace (wordStyle); diff --git a/test/dw_resource_test.cc b/test/dw_resource_test.cc index 75104f87..e399d958 100644 --- a/test/dw_resource_test.cc +++ b/test/dw_resource_test.cc @@ -74,7 +74,7 @@ int main(int argc, char **argv) (ListResource::SELECTION_AT_MOST_ONE, 4); //SelectionResource *res = // layout->getResourceFactory()->createOptionMenuResource (); - + Embed *embed = new Embed (res); textblock->addWidget (embed, widgetStyle); textblock->addSpace (widgetStyle); diff --git a/test/dw_table_aligned.cc b/test/dw_table_aligned.cc index 87d990da..23c6b745 100644 --- a/test/dw_table_aligned.cc +++ b/test/dw_table_aligned.cc @@ -73,7 +73,7 @@ int main(int argc, char **argv) styleAttrs.borderWidth.setVal (1); styleAttrs.setBorderStyle (BORDER_INSET); - + Style *cellStyle = Style::create (layout, &styleAttrs); styleAttrs.borderWidth.setVal (0); @@ -103,7 +103,7 @@ int main(int argc, char **argv) cell->addText (buf, wordStyle); cell->flush (); - } + } wordStyle->unref(); cellStyle->unref(); diff --git a/test/fltk_browser.cc b/test/fltk_browser.cc index 0115907b..11dfcbeb 100644 --- a/test/fltk_browser.cc +++ b/test/fltk_browser.cc @@ -39,7 +39,7 @@ int main (int argc, char *argv[]) new Item ("second"); new Item ("third"); } - + window->resizable(browser); window->show(); return run(); diff --git a/test/form.cc b/test/form.cc index 9e212ed6..4bebd520 100644 --- a/test/form.cc +++ b/test/form.cc @@ -49,7 +49,7 @@ const char *Form::TextResourceDecorator::getValue () Form::RadioButtonResourceDecorator::RadioButtonResourceDecorator (const char *name, RadioButtonResource *resource, const char **values): - Form::ResourceDecorator (name) + Form::ResourceDecorator (name) { this->resource = resource; @@ -99,7 +99,7 @@ const char *Form::CheckButtonResourceDecorator::getValue () Form::SelectionResourceDecorator::SelectionResourceDecorator (const char *name, SelectionResource *resource, const char **values): - Form::ResourceDecorator (name) + Form::ResourceDecorator (name) { this->resource = resource; @@ -162,7 +162,7 @@ Form::FormClickedReceiver::~FormClickedReceiver () delete name; delete[] value; } - + void Form::FormClickedReceiver::clicked (Resource *resource, dw::core::EventButton *event) { @@ -173,7 +173,7 @@ Form::Form () { resources = new lout::container::typed::List <ResourceDecorator> (true); activateReceiver = new FormActivateReceiver (this); - clickedReceivers = + clickedReceivers = new lout::container::typed::List <FormClickedReceiver> (true); } diff --git a/test/form.hh b/test/form.hh index 72f0164b..6235c6cc 100644 --- a/test/form.hh +++ b/test/form.hh @@ -113,7 +113,7 @@ private: public: inline FormActivateReceiver (Form *form) { this->form = form; } - + void activate (dw::core::ui::Resource *resource); void enter (dw::core::ui::Resource *resource); void leave (dw::core::ui::Resource *resource); @@ -129,7 +129,7 @@ private: public: FormClickedReceiver (Form *form, const char *name, const char *value); ~FormClickedReceiver (); - + void clicked(dw::core::ui::Resource *resource, dw::core::EventButton *event); }; |