- Dillo-dev - lists.mailman3.com

missing occasional messages on dillo-dev
by place＠gobigwest.com March 21, 2008

March 21, 2008

I've been missing the occasional message lately. I do not have any spam filtering. Does whoever admins the list have any insight?

3 5

multiple-scan images consume a lot of CPU
by Johannes.Hofmann＠gmx.de March 20, 2008

March 20, 2008

Hi, I really like the multiple-scan image feature added to dillo recently, but it uses quite some CPU and makes it drag slow when going back and forth on pages with a lot of images. So as the "TODO" comment in jpeg.c already suggests, we need some way to switch off multiple-scan when the image is readily available either from cache, from disk, or from a fast network connection. I think some sort of rate limiting would be best that restricts rescans to - say - once a second. What do you think? Cheers, Johannes

3 7

Re: patch: cookies string leak
by jcid＠dillo.org March 20, 2008

March 20, 2008

On Fri, Feb 01, 2008 at 06:26:56PM +0000, place wrote: > Also, what would you think of me either > > - stuffing the "Cookie2: $Version=\"1\"\r\n" header into a_Cookies_get(url) OK. Basically the same way referer is handled. > or > - adding a function to http.c to accomplish the same thing? > ...with a_Cookies_get() changed to show a distinction between > don't-want-cookies and don't-have-cookies. > > I almost never have any cookies enabled, so I'd prefer not to send > the Cookie2 header all of the time when I don't want their cookies. No problem. Leak patch committed. -- Cheers Jorge.-

4 7

[patch] don't allocate tagnames on stack
by Johannes.Hofmann＠gmx.de March 20, 2008

March 20, 2008

Hi, here is another patch that avoids some malloc/free calls. Cheers, Johannes diff --git a/src/html.cc b/src/html.cc --- a/src/html.cc +++ b/src/html.cc @@ -194,7 +194,7 @@ struct _DilloLinkImage { }; struct _DilloHtmlState { - char *tag_name; + const char *tag_name; dw::core::style::Style *style, *table_cell_style; DilloHtmlParseMode parse_mode; DilloHtmlTableMode table_mode; @@ -815,7 +815,7 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw stack = new misc::SimpleVector <DilloHtmlState> (16); stack->increase(); - stack->getRef(0)->tag_name = dStrdup("none"); + stack->getRef(0)->tag_name = "none"; stack->getRef(0)->style = NULL; stack->getRef(0)->table_cell_style = NULL; stack->getRef(0)->parse_mode = DILLO_HTML_PARSE_MODE_INIT; @@ -1014,7 +1014,6 @@ void DilloHtml::closeParser(int ClientKe Html_tag_cleanup_at_close(this, stack->getRef(si)->tag_idx); } } - dFree(stack->getRef(0)->tag_name); /* "none" */ (stack->getRef(0)->style)->unref (); /* template style */ delete (stack); @@ -1596,18 +1595,14 @@ static void Html_eventually_pop_dw(Dillo */ static void Html_push_tag(DilloHtml *html, int tag_idx) { - char *tagstr; int n_items; - - /* Save the element's name (no parameters) into tagstr. */ - tagstr = dStrdup(Tags[tag_idx].name); n_items = html->stack->size (); html->stack->increase (); /* We'll copy the former stack item and just change the tag and its index * instead of copying all fields except for tag. --Jcid */ *html->stack->getRef(n_items) = *html->stack->getRef(n_items - 1); - html->stack->getRef(n_items)->tag_name = tagstr; + html->stack->getRef(n_items)->tag_name = Tags[tag_idx].name; html->stack->getRef(n_items)->tag_idx = tag_idx; /* proper memory management, may be unref'd later */ (S_TOP(html)->style)->ref (); @@ -1635,7 +1630,6 @@ static void Html_real_pop_tag(DilloHtml (S_TOP(html)->style)->unref (); if (S_TOP(html)->table_cell_style) (S_TOP(html)->table_cell_style)->unref (); - dFree(S_TOP(html)->tag_name); hand_over_break = S_TOP(html)->hand_over_break; html->stack->setSize (html->stack->size() - 1); Html_eventually_pop_dw(html, hand_over_break); @@ -5582,7 +5576,7 @@ static int Html_write_raw(DilloHtml *htm DILLO_HTML_PARSE_MODE_VERBATIM) { /* Non HTML code here, let's skip until closing tag */ do { - char *tag = S_TOP(html)->tag_name; + const char *tag = S_TOP(html)->tag_name; buf_index += strcspn(buf + buf_index, "<"); if (buf_index + (int)strlen(tag) + 3 > bufsize) { buf_index = bufsize;

2 3

[jcid@dillo.org: Re: [Dillo-dev] Re: patch: concatenate Dstrs]
by jcid＠dillo.org March 19, 2008

March 19, 2008

-- Cheers Jorge.-

1 0

[patch] further reduce redraws from resizing tables
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is another patch to reduce the redraws caused by resizing tables. A new method Layout::queueDrawExcept(), that requests the drawing of a rectangle except another rectangle is added. It is then used in widget.cc to redraw the area that was previously occupied by a widget, but is no longer occupied after a resize or move. This makes it possible to redraw less when a table resizes. All in all it should reduce the flicker a bit when loading table based pages. Cheers, Johannes diff --git a/dw/layout.cc b/dw/layout.cc --- a/dw/layout.cc +++ b/dw/layout.cc @@ -610,11 +610,36 @@ void Layout::queueDraw (int x, int y, in area.width = width; area.height = height; + if (area.isEmpty ()) return; + for (container::typed::Iterator <View> it = views->iterator (); it.hasNext (); ) { View *view = it.getNext (); view->queueDraw (&area); } +} + +void Layout::queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight) { + + if (x == ex && y == ey && width == ewidth && height == eheight) + return; + + // queueDraw() the four rectangles within rectangle (x, y, width, height) + // around rectangle (ex, ey, ewidth, eheight). + // Some or all of these may be empty. + + // upper left corner of the intersection rectangle + int ix1 = misc::max (x, ex); + int iy1 = misc::max (y, ey); + // lower right corner of the intersection rectangle + int ix2 = misc::min (x + width, ex + ewidth); + int iy2 = misc::min (y + height, ey + eheight); + + queueDraw (x, y, width, iy1 - y); + queueDraw (x, iy2, width, y + height - iy2); + queueDraw (x, iy1, ix1 - x, iy2 - iy1); + queueDraw (ix2, iy1, x + width - ix2, iy2 - iy1); } void Layout::queueResize (bool asap) diff --git a/dw/layout.hh b/dw/layout.hh --- a/dw/layout.hh +++ b/dw/layout.hh @@ -133,6 +133,8 @@ private: void updateCursor (); void updateBgColor (); void queueDraw (int x, int y, int width, int height); + void queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight); void queueResize (bool asap); void removeWidget (); diff --git a/dw/table.cc b/dw/table.cc --- a/dw/table.cc +++ b/dw/table.cc @@ -61,6 +61,7 @@ Table::Table(bool limitTextWidth) hasColPercent = 0; colPercents = new misc::SimpleVector <float> (8); + redrawX = 0; redrawY = 0; } @@ -191,10 +192,11 @@ void Table::sizeAllocateImpl (core::Allo void Table::resizeDrawImpl () { + queueDrawArea (redrawX, 0, allocation.width - redrawX, getHeight ()); queueDrawArea (0, redrawY, allocation.width, getHeight () - redrawY); + redrawX = allocation.width; redrawY = getHeight (); } - void Table::setWidth (int width) { diff --git a/dw/table.hh b/dw/table.hh --- a/dw/table.hh +++ b/dw/table.hh @@ -378,7 +378,7 @@ private: int numRows, numCols, curRow, curCol; misc::SimpleVector<Child*> *children; - int redrawY; + int redrawX, redrawY; /** * \brief The extremes of all columns. @@ -437,11 +437,7 @@ private: void setCumHeight (int row, int value) { if (value != cumHeight->get (row)) { - if (row > 0) { - redrawY = misc::min ( redrawY, cumHeight->get (row - 1) ); - } else { - redrawY = 0; - } + redrawY = misc::min ( redrawY, value ); cumHeight->set (row, value); } } @@ -449,7 +445,7 @@ private: inline void setColWidth (int col, int value) { if (value != colWidths->get (col)) { - redrawY = 0; + redrawX = misc::min (redrawX, value); colWidths->set (col, value); } } diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -71,6 +71,7 @@ public: bool intersectsWith (Rectangle *otherRect, Rectangle *dest); bool isSubsetOf (Rectangle *otherRect); bool isPointWithin (int x, int y); + bool isEmpty () { return width <= 0 || height <= 0; }; }; /** diff --git a/dw/widget.cc b/dw/widget.cc --- a/dw/widget.cc +++ b/dw/widget.cc @@ -418,6 +418,18 @@ void Widget::sizeAllocate (Allocation *a // widget->allocation.x, widget->allocation.y, // widget->allocation.width, widget->allocation.ascent, // widget->allocation.descent); + + if (wasAllocated ()) { + layout->queueDrawExcept ( + this->allocation.x, + this->allocation.y, + this->allocation.width, + this->allocation.ascent + this->allocation.descent, + allocation->x, + allocation->y, + allocation->width, + allocation->ascent + allocation->descent); + } sizeAllocateImpl (allocation);

2 4

saving files under recent fltk snapshots?
by place＠gobigwest.com March 18, 2008

March 18, 2008

I moved to snapshot 6066 (I'd been on 5990) the other day, and now I notice that dillo is unresponsive after I save a file. Seen in the 6059 announcement (http://fltk.org/articles.php?L791) "+ Changed the modal event loop of file_chooser() and dir_chooser() to use a new exec() method that delegates to Window::exec() internally. This exec() method should handle unpleasant side effects with other modal windows when closing the file_chooser dialog window. + Updated FileChooser.fl to reflect modifications made in the cxx/h files. Please do not edit these files directly (except the include header) Thanks." If anybody's tried a recent snapshot: Does it work for you?

3 2

[patch] don't restart scanning from start in Html_parse_entities ()
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is a small optinization to Html_parse_entities (). Cheers, Johannes diff -r bd486ec2a522 src/html.cc --- a/src/html.cc Sat Mar 15 19:41:01 2008 +0100 +++ b/src/html.cc Sat Mar 15 20:23:03 2008 +0100 @@ -1397,13 +1397,14 @@ static char * { const char *esc_set = "&\xE2\xC2"; char *new_str, buf[4]; - int i, j, k, n, isocode, entsize; + int i, j, k, n, s, isocode, entsize; new_str = dStrndup(token, toksize); - if (new_str[strcspn(new_str, esc_set)] == 0) + s = strcspn(new_str, esc_set); + if (new_str[s] == 0) return new_str; - for (i = j = 0; i < toksize; i++) { + for (i = j = s; i < toksize; i++) { if (token[i] == '&' && (isocode = Html_parse_entity(html, token+i, toksize-i, &entsize)) >= 0) {

3 3

patch: multipart/form-data CRLF
by place＠gobigwest.com March 17, 2008

March 17, 2008

Happened to notice in the RFC that multipart types must use CRLF between body parts. PS It was a bit annoying to figure out that http.c needed to be changed, which suggests that it would have been better for me to store the boundary string in DilloUrl somewhere after all.

2 1

patch: meta charset changes decoder
by place＠gobigwest.com March 16, 2008

March 16, 2008

This is no sort of proper fix whatsoever, but I was tired of seeing the "would set charset" message. It's actually surprisingly useful for remote files, since they're generally still at the javascript-and-css point at the end of the first packet.

3 9

libiconv fix for OpenBSD
by Christian.Kellermann＠nefkom.net March 16, 2008

March 16, 2008

Dear List, let me again thank you for your great efforts! One minor thing I stumbled upon today's update: My System has the following iconv signature: size_t iconv (iconv_t cd, const char* * inbuf, size_t * inbytesleft, char* * outbuf, size_t * outbytesleft); I therefore need something like the following to make dillo compile (an work) again: Index: src/html.cc =================================================================== RCS file: /sfhome/cvs/dillo/dillo2/src/html.cc,v retrieving revision 1.48 diff -b -u -p -r1.48 html.cc --- src/html.cc 13 Mar 2008 14:58:44 -0000 1.48 +++ src/html.cc 13 Mar 2008 21:43:26 -0000 @@ -3844,7 +3844,8 @@ static Dstr *Html_encode_text(iconv_t en int rc = 0; Dstr *output; const int bufsize = 128; - char *buffer, *inPtr, *outPtr; + const char *inPtr; + char *buffer, *outPtr; size_t inLeft, outRoom; bool bad_chars = false; I hope this does not break other systems. Kind regards, Christian -- You may use my gpg key for replies: pub 1024D/47F79788 2005/02/02 Christian Kellermann (C-Keen)

2 7

[PATCH]: a_Dpiapi_dialog should call a_Dialog_choice3 with 3 parameters
by onepoint＠starurchin.org March 15, 2008

March 15, 2008

a_Dpiapi_dialog() calls a_Dialog_choice3() with 2 parameters instead of 3. This causes the dialog to pop up a third button with a garbage label, and valgrind reports 'Conditional jump or move depends on uninitialised value(s)' from inside FLTK. Patch attached. This bug slipped through because dpiapi.c does not include dialog.hh to get the prototype of a_Dialog_choice3() . I'm not sure how to fix this: should a C source file be including a C++ header? If not, how else can dpiapi.c get the prototype? Regards, Jeremy Henty

2 3

[PATCH]: send the https dpi plugin debug messages to the right place
by onepoint＠starurchin.org March 15, 2008

March 15, 2008

The https DPI plugin sends its debug messages to stdin. This is wrong because the DPI daemon dups the plugin's stdin to the DPI socket. This patch redirects the debug messages to stderr. Jeremy Henty

1 0

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Thu, Mar 13, 2008 at 04:42:04PM +0000, place wrote: > > It'd be good to keep the suggested ordering then. > > Attached. Committed. -- Cheers Jorge.-

1 0

[patch] reduce malloc/free use a bit
by Johannes.Hofmann＠gmx.de March 13, 2008

March 13, 2008

Hi, the patch below reduces the use of malloc/free a bit. For loading http://www.w3.org/TR/xslt for example it reduces the number of calls to dMalloc() from 76735 to 50478 (according to gprof). I have removed the SPCBuf member of html, as it seems not to be used. Please correct me if I'm wrong or it is intended to be used for in the future. Cheers, Johannes diff --git a/src/html.cc b/src/html.cc --- a/src/html.cc +++ b/src/html.cc @@ -295,8 +295,6 @@ public: //BUG: for now everything is pu Dstr *Stash; bool_t StashSpace; - - char *SPCBuf; /* Buffer for white space */ int pre_column; /* current column, used in PRE tags with tabs */ bool_t PreFirstChar; /* used to skip the first CR or CRLF in PRE tags */ @@ -823,8 +821,6 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw Stash = dStr_new(""); StashSpace = FALSE; - SPCBuf = NULL; - pre_column = 0; PreFirstChar = FALSE; PrevWasCR = FALSE; @@ -1011,7 +1007,6 @@ void DilloHtml::closeParser(int ClientKe delete (stack); dStr_free(Stash, TRUE); - dFree(SPCBuf); dStr_free(attr_data, TRUE); /* Fit the UTF-8 buffer */ @@ -1430,9 +1425,7 @@ static void Html_process_space(DilloHtml html->SPCPending = FALSE; } else if (parse_mode == DILLO_HTML_PARSE_MODE_VERBATIM) { - char *Pword = dStrndup(space, spacesize); - dStr_append(html->Stash, Pword); - dFree(Pword); + dStr_append_l(html->Stash, space, spacesize); html->SPCPending = FALSE; } else if (parse_mode == DILLO_HTML_PARSE_MODE_PRE) { @@ -1475,8 +1468,6 @@ static void Html_process_space(DilloHtml /* SGML_SPCDEL ignores white space inmediately after an open tag */ html->SPCPending = FALSE; } else { - dFree(html->SPCBuf); - html->SPCBuf = dStrndup(space, spacesize); html->SPCPending = TRUE; } @@ -1510,9 +1501,7 @@ static void Html_process_word(DilloHtml } else if (parse_mode == DILLO_HTML_PARSE_MODE_VERBATIM) { /* word goes in untouched, it is not processed here. */ - Pword = dStrndup(word, size); - dStr_append(html->Stash, Pword); - dFree(Pword); + dStr_append_l(html->Stash, word, size); } if (parse_mode == DILLO_HTML_PARSE_MODE_STASH ||

2 1

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Wed, Mar 12, 2008 at 03:51:24PM +0000, place wrote: > My idea of what seems like a good ordering, for what that's worth :) > When I watch the headers, I always wonder why I didn't put Accept-Encoding > next to Accept-Charset, for one thing... AFAIR headers are ordered as they appear in the RFC. I'm not sure whether this is relevant, please check. -- Cheers Jorge.-

2 2

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Wed, Mar 12, 2008 at 03:51:24PM +0000, place wrote: > [...] > BTW, I sent a User-Agent patch long ago and never heard anything. > I could send another... I seem to remember that you finally didn't think of it as a very helpful idea, but don't find any email saying so... -- Cheers Jorge.-

3 2

Re: patch: rm ^F shortcut from menu.cc
by jcid＠dillo.org March 12, 2008

March 12, 2008

Committed. -- Cheers Jorge.-

1 0

[patch] allow drag scrolling on images without link
by Johannes.Hofmann＠gmx.de March 11, 2008

March 11, 2008

Hi, the patch below allows drag scrolling on images that don't have a link. Cheers, Johannes diff -r 2d5370131f9f dw/image.cc --- a/dw/image.cc Sat Mar 08 16:56:13 2008 +0100 +++ b/dw/image.cc Mon Mar 10 22:06:20 2008 +0100 @@ -157,12 +157,15 @@ void Image::leaveNotifyImpl (core::Event bool Image::buttonPressImpl (core::EventButton *event) { - if (event->button == 3){ + if (event->button == 3) { (void)emitLinkPress(getStyle()->x_link, getStyle()->x_img, -1,-1,event); + return true; + } else if (getStyle()->x_link != -1) { + clicking = true; + return true; } else { - clicking = true; + return false; } - return true; } bool Image::buttonReleaseImpl (core::EventButton *event) @@ -170,8 +173,10 @@ bool Image::buttonReleaseImpl (core::Eve if (clicking) { clicking = false; emitLinkClick (getStyle()->x_link, getStyle()->x_img, -1, -1, event); + return true; + } else { + return false; } - return true; } void Image::draw (core::View *view, core::Rectangle *area)

2 3

From the FLTK devs: [dejan.lekic@gmail.com: Re: [fltk.development] This year GSOC]
by onepoint＠starurchin.org March 8, 2008

March 8, 2008

Just to make sure no-one misses this, some love from the FLTK guys! Jeremy Henty ----- Forwarded message from Dejan Lekic <dejan.lekic(a)gmail.com> ----- From: Dejan Lekic <dejan.lekic(a)gmail.com> To: fltk-dev(a)easysw.com Subject: Re: [fltk.development] This year GSOC Date: Thu, 28 Feb 2008 08:25:55 -0800 Personally, the thing I most anticipate and would like to see improved, which is related to FLTK, is the Dillo port to FLTK2. Seriously, if Dillo2 could be done as a library, and provide a Group widget which is directly embeddable into any FLTK2 application, that would be IMHO a huuuuuge thing. So, I hope someone would help Dillo guys either via GSoC, or other way(s). More information: http://www.dillo.org . Get the fresh FLTK2 port of Dillo from CVS: :pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo Kind regards _______________________________________________ fltk-dev mailing list fltk-dev(a)easysw.com http://lists.easysw.com/mailman/listinfo/fltk-dev ----- End forwarded message -----

3 2

patch: entities in options
by place＠gobigwest.com March 7, 2008

March 7, 2008

I was getting crashes on the dFree(tok) in Html_parse_entity() on a page that I whittled down to: <html> <head> <title></title> </head> <body> <form> <select> <option>&Someword </select> </form> </body> </html> It turns out that strchr(":_.-", '\0') finds the null terminator in the string. diff -pur dillo2/src/html.cc dillo2-cur/src/html.cc --- dillo2/src/html.cc 2008-03-06 14:58:56.000000000 +0000 +++ dillo2-cur/src/html.cc 2008-03-07 05:46:52.000000000 +0000 @@ -1350,7 +1350,7 @@ static int Html_parse_entity(DilloHtml * } else if (isalpha(*s)) { /* character entity reference */ - while (isalnum(*++s) || strchr(":_.-", *s)); + while (*++s && (isalnum(*s) || strchr(":_.-", *s))); c = *s; *s = 0;

2 1

patch: form data character encoding
by place＠gobigwest.com March 6, 2008

March 6, 2008

It seems to be working well. For example, you can go to www.google.gr and paste in ????????. Instead of 2530 hits of gibberish, you now get 57,400,000 of Greek. I ran it through various tests, but of course it'll get better testing from those of you who routinely use ?'s and ?'s and so on. It's an annoyance that fltk won't allow normal X character composing. I don't want to learn their special rules, so I have to paste anything non-ascii from an xterm.

3 3

[patch] simplify Region::addRectangle ()
by Johannes.Hofmann＠gmx.de March 6, 2008

March 6, 2008

Hi, the patch below simplifies Region::addRectangle () quite a bit. It now simply tries to minimize the sum of the areas of all rectangles in the Region while still covering all rectangles that have been added with addRectangle (). For example if we have Thereby the total area that is actually redrawn is reduced and the code gets much simpler. However it may now happen that small parts of the screen are drawn that were not requested to be drawn. This patch does not reduce any flickering. Cheers, Johannes diff --git a/dw/types.cc b/dw/types.cc --- a/dw/types.cc +++ b/dw/types.cc @@ -240,40 +240,22 @@ void Region::addRectangle (Rectangle *rP for (it = rectangleList->iterator (); it.hasNext (); ) { Rectangle *ownRect = it.getNext (); - /* check if r an ownRect can be combined vertically */ - if (r->x == ownRect->x && r->width == ownRect->width) { - int combinedHeight = - misc::max(r->y + r->height, ownRect->y + ownRect->height) - - misc::min(r->y, ownRect->y); + int combinedHeight = + misc::max(r->y + r->height, ownRect->y + ownRect->height) - + misc::min(r->y, ownRect->y); + int combinedWidth = + misc::max(r->x + r->width, ownRect->x + ownRect->width) - + misc::min(r->x, ownRect->x); - if (combinedHeight <= r->height + ownRect->height) { + if (combinedWidth * combinedHeight <= + ownRect->width * ownRect->height + r->width * r->height) { + + r->x = misc::min(r->x, ownRect->x); r->y = misc::min(r->y, ownRect->y); + r->width = combinedWidth; r->height = combinedHeight; + rectangleList->removeRef (ownRect); - } - - /* check if r an ownRect can be combined horizontally */ - } else if (r->y == ownRect->y && r->height == ownRect->height) { - int combinedWidth = - misc::max(r->x + r->width, ownRect->x + ownRect->width) - - misc::min(r->x, ownRect->x); - - if (combinedWidth <= r->width + ownRect->width) { - r->x = misc::min(r->x, ownRect->x); - r->width = combinedWidth; - rectangleList->removeRef (ownRect); - } - } - } - - for (it = rectangleList->iterator (); it.hasNext (); ) { - Rectangle *ownRect = it.getNext (); - - if (r->isSubsetOf (ownRect)) { - delete r; - return; - } else if (ownRect->isSubsetOf (r)) { - rectangleList->removeRef (ownRect); } } diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -121,6 +121,8 @@ public: * \brief dw::core::Shape implementation for a point set. * Currently represented as a set of rectangles not containing * each other. + * It is guaranteed that the rectangles returned by rectangles () + * cover all rectangles that were added with addRectangle (). */ class Region: public Shape {

2 3

patch: choose charset for form submission
by place＠gobigwest.com March 4, 2008

March 4, 2008

It picks a charset, but doesn't actually do any translation. I have to decide whether to distort the charset decoder to handle encoding. It's nice to have all of the iconv stuff in one place, but it's not nice to have something that's shaped to decode dbufs reused for just any purpose...

2 3

two warnings in table.cc
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

Hi, here are two more warnings like this: table.cc: In member function 'void dw::Table::forceCalcColumnExtremes()': table.cc:778: warning: 'wMin' may be used uninitialized in this function table.cc: In member function 'void dw::Table::forceCalcCellSizes()': table.cc:483: warning: 'totalWidth' may be used uninitialized in this function Cheers, Johannes

2 1

segfault in Html_submit_form2()
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

Hi, after updating to latest CVS, I got the following segfault when submitting a simple form: Program terminated with signal 11, Segmentation fault. #0 0x0805de09 in a_Html_form_event_handler (data=0x28794400, form_receiver=0x28835620, v_resource=0x28841000) at html.cc:4006 4006 input->name, val->str); (gdb) bt #0 0x0805de09 in a_Html_form_event_handler (data=0x28794400, form_receiver=0x28835620, v_resource=0x28841000) at html.cc:4006 #1 0x0805b301 in form::Form::activate (this=0x28835620, resource=0x28841000) at form.cc:100 #2 0x0808e6f7 in dw::core::ui::Resource::ActivateEmitter::emitToReceiver ( this=0x28841008, receiver=0x28835628, signalNo=0, argc=2, argv=0xbfbff15c) at ui.cc:101 #3 0x08093886 in loutsignal::Emitter::emitVoid (this=0x28841008, signalNo=0, argc=2, argv=0xbfbff15c) at signal.cc:81 #4 0x0808e727 in dw::core::ui::Resource::ActivateEmitter::emitActivate (this=0x28841008, resource=0x28841000) at ui.cc:109 #5 0x080aa945 in fltk::Input::handle_key () #6 0x080aadde in fltk::Input::handle () #7 0x080ab0d4 in fltk::Input::handle () #8 0x080ceddb in fltk::Widget::send () #9 0x080b67e4 in fltk::handle () #10 0x080b9bfb in fltk::handle () #11 0x080bb16b in do_queued_events () #12 0x080bb3ad in fltk::wait () #13 0x080bb55d in fltk::run () I think the problem is, that boundary only gets initialized if form->enc == DILLO_HTML_ENC_MULTIPART. Cheers, Johannes

3 8

dw::Table valgrind-friendliness
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

On Sun, Mar 02, 2008 at 03:45:09PM +0000, Jeremy Henty wrote: > On Sun, Mar 02, 2008 at 04:14:00PM +0100, Johannes Hofmann wrote: > > > I think your proposed fix is fine. It's just that I don't like the > > wrapper methods too much in the first place and now we need even > > more code to support it... > > I'm not particularly attached to my proposed fix, my real concern is > being valgrind clean because anything that makes valgrind harder to > use is bad news. My patch was just the simplest way I could see to > achieve that. If there's a better way to do it then that's great! > ok, here is my proposal. It reduces the additional code in table.cc a bit. Thanks to Jeremy for testing with valgrind. Johannes diff -r 4582dc80e696 dw/table.cc --- a/dw/table.cc Sun Mar 02 13:40:23 2008 +0100 +++ b/dw/table.cc Sun Mar 02 21:21:17 2008 +0100 @@ -516,8 +516,8 @@ void Table::forceCalcCellSizes () printf(" totalWidth2 = %d curCol=%d\n", totalWidth,curCol); #endif - colWidths->setSize (numCols); - cumHeight->setSize (numRows + 1); + colWidths->setSize (numCols, 0); + cumHeight->setSize (numRows + 1, 0); rowSpanCells->setSize (0); baseline->setSize (numRows); #ifdef DBG @@ -857,7 +857,7 @@ void Table::apportion2 (int totalWidth, if (!maxAutoWidth) // no LEN_AUTO cols! return; - colWidths->setSize (colExtremes->size ()); + colWidths->setSize (colExtremes->size (), 0); if (!forceTotalWidth && maxAutoWidth < availAutoWidth) { // Enough space for the maximum table, don't widen past max. diff -r 4582dc80e696 lout/misc.hh --- a/lout/misc.hh Sun Mar 02 13:40:23 2008 +0100 +++ b/lout/misc.hh Sun Mar 02 21:21:17 2008 +0100 @@ -161,6 +161,18 @@ public: inline void setSize(int newSize) { this->num = newSize; this->resize (); } /** + * \brief Set the size explicitely and initialize new values. + * + * May be necessary before called before misc::SimpleVector::set. + */ + inline void setSize (int newSize, T t) { + int oldSize = this->num; + setSize (newSize); + for (int i = oldSize; i < newSize; i++) + set (i, t); + } + + /** * \brief Return the reference of one element. * * \sa misc::SimpleVector::get

2 1

Re: patch: boundary for multipart/form-data submission with zero parts
by jcid＠dillo.org March 3, 2008

March 3, 2008

Hi, On Sun, Mar 02, 2008 at 07:05:08PM +0000, place wrote: > Looking again at rfc 2046, I notice that an empty boundary string is not legal. > > As for what to do in the body in that case, it's conceivable that a lifetime > of digging through RFCs would yield a definitive answer for a weird > corner case, but it's far from being worth the trouble... > (Firefox sends a body consisting of an ending boundary line "--[boundary]--") Committed. -- Cheers Jorge.-

1 0

patch: multipart/form-data encoding for form submission
by jcid＠dillo.org March 3, 2008

March 3, 2008

Hi, On Sun, Mar 02, 2008 at 09:20:53PM +0000, place wrote: > > For: > > > > > + // BUG: strstr stops at NULL. Cannot use for file inputs. > > > + success = !strstr(DataStr->str, boundary->str); > > > > please use memcmp(). > > How about if I make a separate patch for that at some point with > a Dstr_memmem() or something like that? OK. > > Some basic testing would be welcomed, but the main probe will > > be done by usage when committed. > > I added some comments, > changed the size of my dList_new() because the old value -- a holdover > from when I thought I'd do it differently -- could mislead the unwary, > and moved the dStr_free(boundary) down a little, > but this version should have no functional changes from the > version sent to the list yesterday. Committed. -- Cheers Jorge.-

1 0

dw::Table valgrind-friendliness
by onepoint＠starurchin.org March 2, 2008

March 2, 2008

Dillo has been neglecting its valgrind cleanliness recently and it turns out the culprit is dw::Table, which resizes its internal vectors without initialising any new values that appear. If you valgrind dillo and immediately close the splash window, valgrind reports 121 "Conditional jump or move depends on uninitialised value" errors! This patch reduces that number to 2! Regards, Jeremy Henty

3 7

Fixed a mistake in the CSS-box-model PNG image (style-box-model.png).
by jcid＠dillo.org March 2, 2008

March 2, 2008

Hi, I just committed this fix. The wrong documentation image mislead me a lot while working on the redraw problems. Now it's accurate (CSS box model in namespacedw_1_1core_1_1style.html). -- Cheers Jorge.-

1 0

a drawing segfault
by place＠gobigwest.com March 2, 2008

March 2, 2008

I was just opening file:///tmp/, which is not normally a problem... *** [unknown] Assertion failed! *** Array index out of bounds: 28 >= 28 Program received signal SIGABRT, Aborted. [Switching to Thread 16384 (LWP 31812)] 0x40344c81 in kill () from /lib/libc.so.6 (gdb) bt #0 0x40344c81 in kill () from /lib/libc.so.6 #1 0x401b04a1 in pthread_kill () from /lib/libpthread.so.0 #2 0x401b087b in raise () from /lib/libpthread.so.0 #3 0x403448f8 in raise () from /lib/libc.so.6 #4 0x40345f00 in abort () from /lib/libc.so.6 #5 0x0806e0ac in misc::assert (cond=false, format=0x8109030 "Array index out of bounds: %d >= %d") at ../lout/misc.hh:46 #6 0x0807ca1e in misc::SimpleVector<int>::get (this=0x81f1ff0, i=28) at ../lout/misc.hh:183 #7 0x0807b3d7 in dw::Table::draw (this=0x81b1128, view=0x8152d68, area=0xbffff414) at table.cc:242 #8 0x0807f708 in dw::Textblock::drawLine (this=0x8238228, line=0x8221594, view=0x8152d68, area=0xbffff4c8) at textblock.cc:1364 #9 0x0807f827 in dw::Textblock::draw (this=0x8238228, view=0x8152d68, area=0xbffff4c8) at textblock.cc:1500 #10 0x0809c2aa in dw::core::Layout::draw (this=0x8152808, view=0x8152d68, area=0xbffff568) at layout.cc:402 #11 0x08096b55 in dw::core::Layout::expose (this=0x8152808, view=0x8152d68, area=0xbffff568) at layout.hh:163 #12 0x08095fc0 in dw::fltk::FltkViewBase::draw (this=0x8152d68) at fltkviewbase.cc:113 #13 0x08090c4f in dw::fltk::FltkViewport::draw_area (data=0x8152d68, ---Type <return> to continue, or q <return> to quit--- cr=@0xbffff728) at fltkviewport.cc:168 #14 0x080d7167 in fltk::scrollrect (r=@0xbffff728, dx=0, dy=2526, draw_area=0x8090c28 <dw::fltk::FltkViewport::draw_area(void*, fltk::Rectangl e const&)>, data=0x8152d68) at scrollrect.cxx:115 #15 0x08090dfe in dw::fltk::FltkViewport::draw (this=0x8152d68) at fltkviewport.cc:189 #16 0x080bbc4b in fltk::Group::update_child (this=0x8140b40, w=@0x8152d6c) at Group.cxx:769 #17 0x080bc85a in fltk::Group::draw (this=0x8140b40) at Group.cxx:697 #18 0x080bbc4b in fltk::Group::update_child (this=0x81416d0, w=@0x8140b40) at Group.cxx:769 #19 0x080bc85a in fltk::Group::draw (this=0x81416d0) at Group.cxx:697 #20 0x080d3ed0 in fltk::Window::flush (this=0x81416d0) at x11/run.cxx:2559 #21 0x080d13ac in fl_window_flush (window=0x81416d0) at run.cxx:651 #22 0x080d146c in fltk::flush () at run.cxx:685 #23 0x080d6297 in fltk::wait (time_to_wait=0) at run.cxx:480 #24 0x080d62fd in fltk::run () at run.cxx:393 #25 0x0804ef03 in main (argc=1, argv=0xbffffb44) at dillo.cc:110

3 2

patch: multipart/form-data encoding for form submission
by place＠gobigwest.com March 2, 2008

March 2, 2008

Currently, dillo always submits forms using url encoding regardless of the encoding specified by the form. Wikipedia, for example, specifies multipart/form-data because the user may submit huge blocks of text in languages where url encoding will be very inefficient. - This patch always uses the same boundary, but a different one REALLY should be used for every form submission. At the least, the string should be scrambled up somehow. - It adds a URL_MultipartEnc flag. - For the Content-type header, I pull the boundary out of URL_DATA because I didn't want to clutter up the URL with a field for something not commonly used. ----------------------------------------------------------- For multipart/form-data, a submission goes like: [headers] Content-type: multipart/form-data; boundary="[boundary]" --[boundary] Content-Disposition: form-data; name="[name1]" [value1] --[boundary] Content-Disposition: form-data; name="[name2]" [value2] --[boundary] ...and eventually... Content-Disposition: form-data; name="[namen]" [valuen] --[boundary]--

2 7

What shall we do with the buggy RFC?
by onepoint＠starurchin.org March 1, 2008

March 1, 2008

Dillo is buggy because RFC2396 is buggy! An outrageous claim, I know, but hear me out! The problem appears when resolving a relative URI reference such as "?foo=bar" relative to a URI such as "http://a.b.c/e/f". Dillo resolves this to "http://a.b.c/e?foo=bar" ie. it loses the last path component. This is clearly wrong, and it breaks pages such as http://www.guardian.co.uk/business/gallery/2008/jan/18/1?picture=332092597 (trying clicking on the big picture - you won't get the next one in the gallery). Clearly Dillo should only lose the last path component of the base URI when the path of the relative is non-empty. Nevertheless, this broken behaviour *is* RFC compliant! If we study the 7 steps in "5.2. Resolving Relative References to Absolute Form" of RFC2396 we see a problem in step 6, which begins: a) All but the last segment of the base URI's path component is copied to the buffer. In other words, any characters after the last (right-most) slash character, if any, are excluded. So we are instructed to lose the last path component in all cases. Unfortunately we get to step 6 if the URI reference is "?foo=bar". Hence the breakage. Patch attached. Jeremy Henty

2 5

[patch] redraw optimization now including tables
by Johannes.Hofmann＠gmx.de Feb. 29, 2008

Feb. 29, 2008

Hello, below is an improved version of the redraw optimization. It now also covers table based pages - at least to some point. The challenge is to make the already commited optimization work recursively. Other than I originally thought topLevel is always a Textblock. Table based pages simply consist of a Textblock with a huge Table as child widget. Textblock now needs to avoid redrawing the child area when the table size increases. The redrawing is left to the Table-code, which then can be optimized. Please test carefully and report any anomalies you find. Regards, Johannes

2 3

[patch] use CURSOR_MOVE when drag scrolling
by jcid＠dillo.org Feb. 29, 2008

Feb. 29, 2008

Hi, > the patch below disallows drag scrolling over links where the middle > mouse button is used to open the link in a new window. It also > changes the cursor to CURSOR_MOVE when drag scrolling. Committed. -- Cheers Jorge.-

1 0

Re: patch: not-a-png message
by jcid＠dillo.org Feb. 29, 2008

Feb. 29, 2008

On Fri, Feb 29, 2008 at 04:42:05PM +0000, place wrote: > Just noticed this in my tree while making multipart diffs. I'd forgotten > about it... Committed. -- Cheers Jorge.-

1 0

[patch] add ctrl-f shortcut for findText
by Johannes.Hofmann＠gmx.de Feb. 29, 2008

Feb. 29, 2008

Hi, patch below adds ctrl-f shortcut for findText. BTW, shouldn't ctrl-b open the bookmarks page as it did in dillo1? Cheers, Johannes diff -r 44838cc1f38d src/ui.cc --- a/src/ui.cc Sun Feb 24 23:15:53 2008 +0100 +++ b/src/ui.cc Thu Feb 28 22:43:22 2008 +0100 @@ -702,7 +702,10 @@ int UI::handle(int event) // Handle these shortcuts here. if (event == SHORTCUT) { if (event_state(CTRL)) { - if (k == 'l') { + if (k == 'f') { + a_UIcmd_findtext_dialog((BrowserWindow*) user_data ()); + ret = 1; + } else if (k == 'l') { a_UIcmd_open_url_dialog(user_data()); ret = 1; } else if (k == 'n') {

2 1

[patch] use CURSOR_MOVE when drag scrolling
by Johannes.Hofmann＠gmx.de Feb. 28, 2008

Feb. 28, 2008

Hi, the patch below disallows drag scrolling over links where the middle mouse button is used to open the link in a new window. It also changes the cursor to CURSOR_MOVE when drag scrolling. Cheers, Johannes diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -233,11 +233,13 @@ int FltkViewport::handle (int event) case ::fltk::PUSH: take_focus(); if (::fltk::event_button() == ::fltk::MiddleButton) { - dragScrolling = 1; - dragX = ::fltk::event_x(); - dragY = ::fltk::event_y(); /* pass event so that middle click can open link in new window */ - FltkWidgetView::handle (event); + if (FltkWidgetView::handle (event) == 0) { + dragScrolling = 1; + dragX = ::fltk::event_x(); + dragY = ::fltk::event_y(); + setCursor (core::style::CURSOR_MOVE); + } return 1; } break; @@ -260,6 +262,7 @@ int FltkViewport::handle (int event) case ::fltk::RELEASE: if (::fltk::event_button() == ::fltk::MiddleButton) { dragScrolling = 0; + setCursor (core::style::CURSOR_DEFAULT); } break;

1 0

PATCH: small improvement to the "can't start dpid daemon" error message
by onepoint＠starurchin.org Feb. 24, 2008

Feb. 24, 2008

A common cause of the "can't start dpid daemon" error is clicking on a link with a typo'ed HREF that has an invalid URL scheme (eg. 'ttp://' instead of 'http://', to cite the real-life example that prompted this patch). But the error message gives *no* context that would help to diagnose the problem. If it cited the URL scheme it would save a lot of time. (I had to start Firefox before I realised what the problem was!) Here's a patch to do that. Jeremy Henty

2 1

[patch] fix redraw problem with findText
by Johannes.Hofmann＠gmx.de Feb. 24, 2008

Feb. 24, 2008

Hello, the patch below fixes the redraw problem with findText found by place that was introduced with my textblock optimization. Partial redraws were interfering with scrolling. The findText method is a nice test for this code path! I'm now experimenting with a redraw optimization that covers table based pages too. It's looking promising, but it needs some more work. Cheers, Johannes diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -85,6 +85,7 @@ void FltkViewBase::draw () } } + drawRegion.clear (); d &= ~DAMAGE_VALUE; } @@ -110,9 +111,12 @@ void FltkViewBase::draw () area.width = rect.w(); area.height = rect.h(); theLayout->expose (this, &area); + + if (! (d & DAMAGE_SCROLL)) { + drawRegion.clear (); + } } - drawRegion.clear (); } void FltkViewBase::drawChildWidgets () { diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -185,6 +185,7 @@ void FltkViewport::draw () int d = damage(); if (d & DAMAGE_SCROLL) { + set_damage (DAMAGE_SCROLL); scrollrect(cr, -scrollDX, -scrollDY, draw_area, this); d &= ~DAMAGE_SCROLL; set_damage (d);

2 1

[patch] optimize redraw after resize for textblocks
by Johannes.Hofmann＠gmx.de Feb. 21, 2008

Feb. 21, 2008

Hello, here comes my attempt to avoid unnecessary redraws caused by images that are not visible. The first patch makes some minor optimizations to the drawing code and disables the use of the asap parameter for better testing. The second patch replaces the general queueDrawTotal() in Layout::resizeIdle () with more specific redraw calls in widgets that can be topLevel. Currently only Textblock is optimized. The idea is that resizing child widgets in a textblock don't affect the layout of the textblock above the resizing widget. So only the area below needs to be redrawn. I think that does not hold for tables, but perhaps other optimizations are possible here? Ideas anyone? The effect is visible e.g. on http://chlamydia.fs.ei.tum.de/pub/DragonFly/packages/stable/DragonFly-1.10.… but not on table based pages. Cheers, Johannes

2 1

[patch] optimize redraw after resize for textblocks
by Johannes.Hofmann＠gmx.de Feb. 21, 2008

Feb. 21, 2008

Hi, On Thu, Feb 21, 2008 at 04:57:29AM +0000, place wrote: > Hi Johannes, > > I finally got around to applying this today... > Are you seeing any problems with text highlighting? > > If I repeat searches so that the page scrolls some -- but not far enough > for the previous instance to scroll off screen -- the previous instance > stays highlighted and the current instance isn't highlighted. > > It's entirely possible that I screwed something up, but when I > diffed my trees, I didn't notice anything wrong... No, I'm seeing this too now. I will try to fix it. Thanks for testing, Johannes

1 0

Dillo screenshot on my ipaq
by akemnade＠tzi.de Feb. 18, 2008

Feb. 18, 2008

Hi, I have finally taken the time to make dillo run on my ipaq. Screenshot: http://www.tzi.de/~akemnade/dillo-ipaq.png The big pitfall here is if you don't enable Xft/freetype in your fltk build, you can screw up things. fltk does not get the default fonts from the xserver on the ipaq, so due to missing error checking in fltk, dillo crashes when the first label gets rendered. But I guess, without freetype you won't get nice fonts anyway... dillo/dw does not need to be patched for that. fltk needs a bit of tweaking, I'll look if it is solved in the current version (I'm still using that r5917 snapshot). Greetings Andreas Kemnade

3 3

New table layout rocks!
by onepoint＠starurchin.org Feb. 14, 2008

Feb. 14, 2008

I've been collecting web pages that Dillo misrendered: truncated images, overlapping text, pages clipped at the right, etc. I'm really pleased to announce that the latest Dillo handles them all. This is a major improvement! I'm assuming this is the new table layout code at work. Regards, Jeremy Henty

5 31

[patch] fix HomeKey/EndKey behaviour
by Johannes.Hofmann＠gmx.de Feb. 7, 2008

Feb. 7, 2008

Hi the patch below makes HomeKey and EndKey work as it did in dillo1. I think I had introduced the current behaviour that also adjusts the x-position but it is pretty annoying on wide pages. Cheers, Johannes diff -r 1c41f9a73971 dw/fltkviewport.cc --- a/dw/fltkviewport.cc Sun Feb 03 21:13:11 2008 +0100 +++ b/dw/fltkviewport.cc Wed Feb 06 18:16:41 2008 +0100 @@ -292,11 +292,11 @@ int FltkViewport::handle (int event) return 1; case HomeKey: - scrollTo (0, 0); + scrollTo (scrollX, 0); return 1; case EndKey: - scrollTo (canvasWidth, canvasHeight); /* gets adjusted in scroll() */ + scrollTo (scrollX, canvasHeight); /* gets adjusted in scroll() */ return 1; } }

2 1

[PATCH]: Table::apportionRowSpan()
by onepoint＠starurchin.org Feb. 5, 2008

Feb. 5, 2008

OK, please ignore my previous attempt at reworking Dillo's ROWSPAN handling. I have a simple fix for the bugs I reported at http://starurchin.singularity/dillo/bugs/table_rowspan.html . This patch tweaks dw::Table::apportionRowSpan() to handle the special case where all the rows being spanned have zero height. This fixes the special cases that were breaking without changing the behaviour in any other case. (BTW, I still think there is a case for reworking Dillo's ROWSPAN algorithms along the lines I suggested, but it's nice to fix bugs without such efforts.) Regards, Jeremy Henty

2 4

[patch] fix size of select widgets
by Johannes.Hofmann＠gmx.de Feb. 5, 2008

Feb. 5, 2008

Here is a small patch to compute the size of select widgets similar to the way it is computed for text input widgets. The width is hardcoded to 10 * size of 'M' in the current font. Regards, Johannes PS: The colored widgets are nice! diff -r 68ee0a55704c dw/fltkui.cc --- a/dw/fltkui.cc Sat Feb 02 18:36:32 2008 +0100 +++ b/dw/fltkui.cc Sat Feb 02 19:20:16 2008 +0100 @@ -1048,10 +1048,21 @@ void FltkOptionMenuResource::widgetCallb void FltkOptionMenuResource::sizeRequest (core::Requisition *requisition) { - /** \bug Random values. */ - requisition->width = 100; - requisition->ascent = 18; - requisition->descent = 5; + if (style) { + FltkFont *font = (FltkFont*)style->font; + ::fltk::setfont(font->font,font->size); + requisition->width = + (int)::fltk::getwidth ("M", 1) * 10 + + 2 * RELIEF_X_THICKNESS; + requisition->ascent = + font->ascent + RELIEF_Y_THICKNESS; + requisition->descent = + font->descent + RELIEF_Y_THICKNESS; + } else { + requisition->width = 1; + requisition->ascent = 1; + requisition->descent = 0; + } }

2 4

an experiment in widget coloring (with code)
by place＠gobigwest.com Feb. 5, 2008

Feb. 5, 2008

With my color settings, my buttons were light grey with unreadable white labels. Well, that's no good. And standard gui widget colors scream "I'm using a Windows Office Productivity Suite!" to me. So here is something to play with. I currently have the widgets using background color and the labels/text either black or white. fltk_black to make black work right widget_colors.dillo to set backgroundColor in Style. widget_colors.dw where you set the widget colors.

3 16

a_Dialog_text_window() dimensions
by place＠gobigwest.com Feb. 3, 2008

Feb. 3, 2008

(speaking of my ancient computer... [it keeps not dying, so I keep not buying a new one]) a_Dialog_text_window() dimensions were recently increased to int wh = 600, ww = 650, bh = 30; but my display is small enough that this puts the close button below the bottom of the screen. Perhaps it should be limited by screen dimensions. Or something based on prefs.height and prefs.width...

2 1