April 2012 - netsurf-commits - listmaster.pepperfish.net

r13839 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 17:03:18 2012 New Revision: 13839 URL: http://source.netsurf-browser.org?rev=13839&view=rev Log: Fix mem leaks on unterminated items. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 17:03:18 2012 @@ -771,6 +771,11 @@ } } + /* unfinished item, cleanup */ + for (i = FIELD_NAME; i < FIELD_COUNT; i++) { + free(fields[i]); + fields[i] = NULL; + } return false; }

11 years, 7 months

1
0
0 / 0

r13838 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 17:00:49 2012 New Revision: 13838 URL: http://source.netsurf-browser.org?rev=13838&view=rev Log: Fix a case where \r is the last char in a buffer and \n is in the next, and was mistaken as an item type. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 17:00:49 2012 @@ -28,7 +28,7 @@ * gopher://sdf.org/1/sdf/historical images * gopher://sdf.org/1/sdf/classes binaries * gopher://sdf.org/1/users/ long page - * gopher://gopher.floodgap.com/1/gopher empty line with broken link! + * gopher://gopher.floodgap.com/1/gopher empty+broken link - fixed 2012/04/08 * gopher://sdf.org/1/maps/m missing lines - fixed 2012/04/08 */ @@ -712,6 +712,8 @@ type = *p; if (!type || type == '\n' || type == '\r') { LOG(("warning: invalid gopher item type 0x%02x", type)); + /* force reparsing the type */ + type = 0; } s++; continue; @@ -723,7 +725,9 @@ } /* FALLTHROUGH */ case '\r': - if (sz < 1 || p[1] != '\n') { + if (sz < 2) + continue; /* \n should be in the next buffer */ + if (p[1] != '\n') { LOG(("warning: CR without LF in gopher item '%c'", type)); } if (field < FIELD_PORT && type != '.') {

11 years, 7 months

1
0
0 / 0

r13837 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 16:21:58 2012 New Revision: 13837 URL: http://source.netsurf-browser.org?rev=13837&view=rev Log: Do use \n in the generated HTML now since the mentionned bug seems to have been fixed. Avoid splitting items over multiple lines though. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 16:21:58 2012 @@ -422,11 +422,7 @@ /* escape html special characters */ nice_text = html_escape_string(fields[FIELD_NAME]); - /* XXX: outputting \n generates better looking html code, - * but currently screws up indentation due to a bug. - */ -#define HTML_LF -/*#define HTML_LF "\n"*/ +#define HTML_LF "\n" switch (type) { case GOPHER_TYPE_ENDOFPAGE: @@ -435,8 +431,8 @@ break; case GOPHER_TYPE_TEXTPLAIN: error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -448,8 +444,8 @@ case GOPHER_TYPE_BINARCHIVE: case GOPHER_TYPE_UUENCODED: error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -461,8 +457,8 @@ * directory link */ error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -480,12 +476,12 @@ * as it seems at least Veronica-2 ignores the = but it's unclean. */ error = snprintf(buffer, buffer_length, - "<form method=\"get\" action=\"gopher://%s%s%s/%c%s\">"HTML_LF + "<form method=\"get\" action=\"gopher://%s%s%s/%c%s\">" "" "<label>%s " "<input name=\"\" type=\"text\" align=\"right\" />" "</label>" - "</form>"HTML_LF + "</form>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -505,8 +501,8 @@ if (username) username++; error = snprintf(buffer, buffer_length, - "<a href=\"telnet://%s%s%s%s%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"telnet://%s%s%s%s%s\">" + "%s</a>" " "HTML_LF, username ? username : "", username ? "@" : "", @@ -525,8 +521,8 @@ if (username) username++; error = snprintf(buffer, buffer_length, - "<a href=\"tn3270://%s%s%s%s%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"tn3270://%s%s%s%s%s\">" + "%s</a>" " "HTML_LF, username ? username : "", username ? "@" : "", @@ -545,8 +541,8 @@ strcmp(fields[FIELD_PORT], "105")) alt_port = true; error = snprintf(buffer, buffer_length, - "<a href=\"cso://%s%s%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"cso://%s%s%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -560,10 +556,10 @@ /* quite dangerous, cf. gopher://namcub.accela-labs.com/1/pics */ if (nsoption_bool(gopher_inline_images)) { error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s"HTML_LF /* */ - /*""HTML_LF*/ - "<img src=\"gopher://%s%s%s/%c%s\" alt=\"%s\"/>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s" /* */ + /*""*/ + "<img src=\"gopher://%s%s%s/%c%s\" alt=\"%s\"/>" "" "</a>" " "HTML_LF, @@ -581,8 +577,8 @@ } /* fallback to default, link them */ error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -601,16 +597,16 @@ if (redirect_url) { error = snprintf(buffer, buffer_length, - "<a href=\"%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"%s\">" + "%s</a>" " "HTML_LF, redirect_url, nice_text); } else { /* cf. gopher://sdf.org/1/sdf/classes/ */ error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -633,10 +629,10 @@ case GOPHER_TYPE_AUDIO: case GOPHER_TYPE_SOUND: error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" "<audio src=\"gopher://%s%s%s/%c%s\" controls=\"controls\">" - "[player]</audio>"HTML_LF + "[player]</audio>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -651,8 +647,8 @@ case GOPHER_TYPE_PDF_ALT: /* generic case for known-to-work items */ error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "", @@ -666,8 +662,8 @@ /* yet to be tested items, please report when you see them! */ LOG(("warning: unknown gopher item type 0x%02x '%c'", type, type)); error = snprintf(buffer, buffer_length, - "<a href=\"gopher://%s%s%s/%c%s\">"HTML_LF - "%s</a>"HTML_LF + "<a href=\"gopher://%s%s%s/%c%s\">" + "%s</a>" " "HTML_LF, fields[FIELD_HOST], alt_port ? ":" : "",

11 years, 7 months

1
0
0 / 0

r13836 mmu_man - /branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 16:13:04 2012 New Revision: 13836 URL: http://source.netsurf-browser.org?rev=13836&view=rev Log: Set the content-type for the generated HTML, the comment isn't valid anymore with the fetcher approach. Note we aren't really sure about the encoding though, the gopher protocol doesn't have a way to advertise it (except maybe gopher+). Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 16:13:04 2012 @@ -354,10 +354,7 @@ "<html>\n" "<head>\n" /*"\n"*//* XXX: needs the content url */ - /* Don't do that: - * seems to trigger a reparsing of the gopher data itself as html... - * "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" - */ + "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" "<link rel=\"stylesheet\" title=\"Standard\" " "type=\"text/css\" href=\"resource:internal.css\">\n" "<link rel=\"icon\" type=\"image/png\" href=\"resource:icons/directory.png\">\n");

11 years, 7 months

1
0
0 / 0

r13835 mmu_man - in /branches/mmu_man/netsurf-gopher-support-v3: !NetSurf/Resources/internal.css, f79 content/gopher.c

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 15:15:15 2012 New Revision: 13835 URL: http://source.netsurf-browser.org?rev=13835&view=rev Log: Add [up] and [home] links to gopher directories. They use position: fixed, but it doesn't seem to work yet. Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Modified: branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 (original) +++ branches/mmu_man/netsurf-gopher-support-v3/!NetSurf/Resources/internal.css,f79 Sun Apr 8 15:15:15 2012 @@ -201,6 +201,13 @@ font-size: 100%; padding-bottom: 2em; } +body#gopher div.uplink { + padding: 0; + margin: 0; + position: fixed; + top: 5px; + right: 5px; } + body#gopher h1 { padding: 5mm; margin: 0; Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 15:15:15 2012 @@ -27,6 +27,7 @@ * tests: * gopher://sdf.org/1/sdf/historical images * gopher://sdf.org/1/sdf/classes binaries + * gopher://sdf.org/1/users/ long page * gopher://gopher.floodgap.com/1/gopher empty line with broken link! * gopher://sdf.org/1/maps/m missing lines - fixed 2012/04/08 */ @@ -390,6 +391,10 @@ "<title>%s</title>\n" "</head>\n" "<body id=\"gopher\">\n" + "<div class=\"uplink dontprint\">\n" + "<a href=\"..\">[up]</a>\n" + "<a href=\"/\">[top]</a>\n" + "</div>\n" "<h1>%s</h1>\n", title, title); if (error < 0 || error >= buffer_length)

11 years, 7 months

1
0
0 / 0

r13834 mmu_man - in /branches/mmu_man/netsurf-gopher-support-v3/content: gopher.c gopher.h

by netsurf＠semichrome.net

Author: mmu_man Date: Sun Apr 8 13:06:24 2012 New Revision: 13834 URL: http://source.netsurf-browser.org?rev=13834&view=rev Log: Add some links to interesting docs and test pages. Fix the input buffering to use dynamic allocation. This both fixes missing parts in some pages and when testing locally where the socket can read more than 2kB at once. Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.c Sun Apr 8 13:06:24 2012 @@ -18,6 +18,17 @@ /** \file * Generate HTML content for displaying gopher directory listings (implementation). + */ + +/* + * docs: + * gopher://gopher.floodgap.com/0/overbite/dbrowse?pluginm%201 + * + * tests: + * gopher://sdf.org/1/sdf/historical images + * gopher://sdf.org/1/sdf/classes binaries + * gopher://gopher.floodgap.com/1/gopher empty line with broken link! + * gopher://sdf.org/1/maps/m missing lines - fixed 2012/04/08 */ #include <errno.h> @@ -89,6 +100,7 @@ ctx->fetch_handle = fetch_handle; ctx->head_done = false; ctx->cached = 0; + ctx->input = NULL; return ctx; } @@ -98,6 +110,7 @@ void gopher_state_free(struct gopher_state *s) { + free(s->input); nsurl_unref(s->url); free(s); } @@ -121,8 +134,7 @@ { char buffer[1024]; const char *p = data; - size_t remaining = size; - size_t left; + size_t left = size; fetch_msg msg; LOG(("gopher %p, (,, %d)", s, size)); @@ -143,22 +155,17 @@ return 0; } - /* XXX: should we loop there until remaining is 0 ? Seems not needed. */ - /* XXX: note there is a possibility of endless loop if a line is larger - * than the input buffer... - */ - - LOG(("iteration: cached %d remaining %d", s->cached, remaining)); - - p = s->input; - left = MIN(sizeof(s->input) - s->cached, remaining); - memcpy(s->input + s->cached, data, left); - remaining -= left; - data += left; - s->cached += left; - left = s->cached; - - LOG(("copied: cached %d remaining %d", s->cached, remaining)); + LOG(("iteration: cached %d left %d", s->cached, left)); + + if (s->cached) { + s->input = realloc(s->input, s->cached + left); + memcpy(s->input + s->cached, data, left); + p = s->input; + left += s->cached; + s->cached = left; + } + + LOG(("copied: cached %d left %d", s->cached, left)); if (!s->head_done) { @@ -202,9 +209,13 @@ LOG(("last row, left %d", left)); /* move the remainder to the beginning of the buffer */ - if (left) - memmove(s->input, s->input + s->cached - left, left); + if (left) { + if (!s->input) + s->input = malloc(left); + memmove(s->input, p, left); + } s->cached = left; + /* no need to realloc, either we will again right away or free. */ return size; Modified: branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h URL: http://source.netsurf-browser.org/branches/mmu_man/netsurf-gopher-support... ============================================================================== --- branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h (original) +++ branches/mmu_man/netsurf-gopher-support-v3/content/gopher.h Sun Apr 8 13:06:24 2012 @@ -74,7 +74,7 @@ struct fetch *fetch_handle; /**< Copy of the fetch handle */ bool head_done; /**< We already sent the <head> part */ size_t cached; /**< Amount of cached data in the input buffer */ - char input[2048]; /**< input buffer */ + char *input; /**< input buffer */ };

11 years, 7 months

1
0
0 / 0

r13833 mono - /trunk/netsurf/atari/browser.c

by netsurf＠semichrome.net

Author: mono Date: Sat Apr 7 16:24:37 2012 New Revision: 13833 URL: http://source.netsurf-browser.org?rev=13833&view=rev Log: Optimize redraw when window is on-top: do not intersect redraw areas with visible window rectangles. Modified: trunk/netsurf/atari/browser.c Modified: trunk/netsurf/atari/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser.c?rev=13833... ============================================================================== --- trunk/netsurf/atari/browser.c (original) +++ trunk/netsurf/atari/browser.c Sat Apr 7 16:24:37 2012 @@ -708,8 +708,6 @@ v_hide_c ( app.graf.handle); /* copy screen image */ vro_cpyfm ( app.graf.handle, S_ONLY, pxy, &screen, &b->caret.background); - /* restore the mouse */ - v_show_c ( app.graf.handle, 1); /* draw caret: */ caret.g_x -= area->g_x; caret.g_y -= area->g_y; @@ -725,6 +723,8 @@ plot_style_caret ); /* restore old clip area: */ plot_clip( &old_clip ); + /* restore the mouse */ + v_show_c ( app.graf.handle, 1); b->caret.current.g_x = caret.g_x + gw->browser->scroll.current.x; b->caret.current.g_y = caret.g_y + gw->browser->scroll.current.y; b->caret.current.g_w = caret.g_w; @@ -763,19 +763,27 @@ } if ((b->redraw.areas_used > 0) && b->bw->current_content != NULL ) { - if( (plotter->flags & PLOT_FLAG_OFFSCREEN) == 0 ) { + if( (plotter->flags & PLOT_FLAG_OFFSCREEN) == 0 ) { + int i; GRECT area; - GRECT fbwork; + GRECT fbwork; + short wf_top[4]; todo[0] = bwrect.g_x; todo[1] = bwrect.g_y; todo[2] = todo[0] + bwrect.g_w-1; todo[3] = todo[1] + bwrect.g_h-1; - vs_clip(plotter->vdi_handle, 1, (short*)&todo[0]); - if( wind_get(gw->root->handle->handle, WF_FIRSTXYWH, - &todo[0], &todo[1], &todo[2], &todo[3] )!=0 ) { - while (todo[2] && todo[3]) { - /* convert screen to framebuffer coords: */ + vs_clip(plotter->vdi_handle, 1, (short*)&todo[0]); + + wind_get( 0, WF_TOP, &wf_top[0], &wf_top[1], + &wf_top[2], &wf_top[3] ); + + if( wf_top[0] == gw->root->handle->handle + && wf_top[1] == _AESapid ){ + printf("top redraw"); + /* The window is on top, so there is no need to walk the */ + /* AES rectangle list. */ + for( i=0; i<b->redraw.areas_used; i++ ){ fbwork.g_x = todo[0] - bwrect.g_x; fbwork.g_y = todo[1] - bwrect.g_y; if( fbwork.g_x < 0 ){ @@ -790,35 +798,91 @@ } else { fbwork.g_h = todo[3]; } - /* walk the redraw requests: */ - for( i=0; i<b->redraw.areas_used; i++ ){ - area.g_x = b->redraw.areas[i].x0; - area.g_y = b->redraw.areas[i].y0; - area.g_w = b->redraw.areas[i].x1 - b->redraw.areas[i].x0; - area.g_h = b->redraw.areas[i].y1 - b->redraw.areas[i].y0; - if (rc_intersect((GRECT *)&fbwork,(GRECT *)&area)) { - redraw_area.x0 = area.g_x; - redraw_area.y0 = area.g_y; - redraw_area.x1 = area.g_x + area.g_w; - redraw_area.y1 = area.g_y + area.g_h; - browser_redraw_content( gw, 0, 0, &redraw_area ); + area.g_x = b->redraw.areas[i].x0; + area.g_y = b->redraw.areas[i].y0; + area.g_w = b->redraw.areas[i].x1 - b->redraw.areas[i].x0; + area.g_h = b->redraw.areas[i].y1 - b->redraw.areas[i].y0; + if (rc_intersect((GRECT *)&fbwork,(GRECT *)&area)) { + redraw_area.x0 = area.g_x; + redraw_area.y0 = area.g_y; + redraw_area.x1 = area.g_x + area.g_w; + redraw_area.y1 = area.g_y + area.g_h; + browser_redraw_content( gw, 0, 0, &redraw_area ); + } else { + /* the area should be kept scheduled for later redraw,*/ + /* but because this is onscreen plotter, it doesn't */ + /* make much sense anyway... */ + } + } + } else { + /* walk the AES rectangle list: */ + if( wind_get(gw->root->handle->handle, WF_FIRSTXYWH, + &todo[0], &todo[1], &todo[2], &todo[3] )!=0 ) { + while (todo[2] && todo[3]) { + /* convert screen to framebuffer coords: */ + fbwork.g_x = todo[0] - bwrect.g_x; + fbwork.g_y = todo[1] - bwrect.g_y; + if( fbwork.g_x < 0 ){ + fbwork.g_w = todo[2] + todo[0]; + fbwork.g_x = 0; } else { - /* - the area should be kept scheduled for later redraw, but because this - is onscreen plotter, it doesn't make much sense anyway... - */ + fbwork.g_w = todo[2]; } - + if( fbwork.g_y < 0 ){ + fbwork.g_h = todo[3] + todo[1]; + fbwork.g_y = 0; + } else { + fbwork.g_h = todo[3]; + } + /* walk the redraw requests: */ + for( i=0; i<b->redraw.areas_used; i++ ){ + area.g_x = b->redraw.areas[i].x0; + area.g_y = b->redraw.areas[i].y0; + area.g_w = b->redraw.areas[i].x1 - b->redraw.areas[i].x0; + area.g_h = b->redraw.areas[i].y1 - b->redraw.areas[i].y0; + if (rc_intersect((GRECT *)&fbwork,(GRECT *)&area)) { + redraw_area.x0 = area.g_x; + redraw_area.y0 = area.g_y; + redraw_area.x1 = area.g_x + area.g_w; + redraw_area.y1 = area.g_y + area.g_h; + browser_redraw_content( gw, 0, 0, &redraw_area ); + } else { + /* the area should be kept scheduled for later redraw,*/ + /* but because this is onscreen plotter, it doesn't */ + /* make much sense anyway... */ + } + + } + if (wind_get(gw->root->handle->handle, WF_NEXTXYWH, + &todo[0], &todo[1], &todo[2], &todo[3])==0) { + break; + } } - if (wind_get(gw->root->handle->handle, WF_NEXTXYWH, - &todo[0], &todo[1], &todo[2], &todo[3])==0) { - break; - } - } - } + } + } + + vs_clip(plotter->vdi_handle, 0, (short*)&todo); - } else { - /* its save to do a complete redraw :) */ + } else { + + /* its save to do a complete redraw without knowledge about GEM windows :) */ + /* walk the redraw requests: */ + int i; + for( i=0; i<b->redraw.areas_used; i++ ){ + struct redraw_context ctx = { + .interactive = true, + .background_images = true, + .plot = &atari_plotters + }; + browser_window_redraw( b->bw, -b->scroll.current.x, + -b->scroll.current.y, &b->redraw.areas[i], &ctx ); + } + GRECT area; + area.g_x = bwrect.g_x; + area.g_y = bwrect.g_y; + area.g_w = bwrect.g_w; + area.g_h = bwrect.g_h; + //plotter->blit( plotter, &area ); } b->redraw.areas_used = 0; }

11 years, 7 months

1
0
0 / 0

r13832 mono - /trunk/netsurf/atari/gui.c

by netsurf＠semichrome.net

Author: mono Date: Sat Apr 7 16:22:19 2012 New Revision: 13832 URL: http://source.netsurf-browser.org?rev=13832&view=rev Log: Added missing include. Modified: trunk/netsurf/atari/gui.c Modified: trunk/netsurf/atari/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.c?rev=13832&r1=... ============================================================================== --- trunk/netsurf/atari/gui.c (original) +++ trunk/netsurf/atari/gui.c Sat Apr 7 16:22:19 2012 @@ -46,9 +46,10 @@ #include "desktop/selection.h" #include "desktop/textinput.h" #include "desktop/browser.h" -#include "desktop/mouse.h" +#include "desktop/mouse.h" #include "render/html.h" #include "render/font.h" +#include "render/box.h" #include "utils/schedule.h" #include "utils/url.h" #include "utils/log.h"

11 years, 7 months

1
0
0 / 0

r13831 mono - /trunk/netsurf/atari/Makefile.target

by netsurf＠semichrome.net

Author: mono Date: Sat Apr 7 16:21:45 2012 New Revision: 13831 URL: http://source.netsurf-browser.org?rev=13831&view=rev Log: Added linkage to libdom. Modified: trunk/netsurf/atari/Makefile.target Modified: trunk/netsurf/atari/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/atari/Makefile.target?rev... ============================================================================== --- trunk/netsurf/atari/Makefile.target (original) +++ trunk/netsurf/atari/Makefile.target Sat Apr 7 16:21:45 2012 @@ -3,6 +3,7 @@ # ---------------------------------------------------------------------------- $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng))) +$(eval $(call feature_enabled,GD_PLOTTER,-DWITH_GD_PLOTTER,-lgd,GD Plotter (libgd) )) $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) CFLAGS += -DATARI_USE_FREETYPE $(shell freetype-config --cflags) @@ -27,17 +28,20 @@ $(shell $(PKG_CONFIG) --cflags libcurl ) LDFLAGS += -lcurl -LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet +LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub LDFLAGS += -lssl -lcrypto -LDFLAGS += -lxml2 -lz -liconv -lHermes -lwindom -lgem -lm +LDFLAGS += -lxml2 -lz -liconv -lcares -lHermes -lwindom -lgem -lm # S_ATARI are sources purely for the Atari FreeMiNT build S_ATARI := gui.c findfile.c filetype.c misc.c bitmap.c schedule.c \ download.c thumbnail.c login.c verify_ssl.c treeview.c hotlist.c history.c\ search.c font.c \ - plot.c plot/plotter.c plot/plotter_vdi.c plot/eddi.s \ + plot.c plot/plotter.c \ + plot/plotter_vdi.c \ + plot/plotter_gd.c \ plot/font_vdi.c plot/font_freetype.c plot/font_internal.c \ + plot/eddi.s \ redrawslots.c encoding.c \ browser_win.c toolbar.c statusbar.c browser.c \ global_evnt.c osspec.c dragdrop.c system_colour.c \

11 years, 7 months

1
0
0 / 0

r13830 mono - /trunk/netsurf/atari/global_evnt.c

by netsurf＠semichrome.net

Author: mono Date: Sat Apr 7 16:19:10 2012 New Revision: 13830 URL: http://source.netsurf-browser.org?rev=13830&view=rev Log: Added missing declaration of "html_redraw_debug". Modified: trunk/netsurf/atari/global_evnt.c Modified: trunk/netsurf/atari/global_evnt.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/global_evnt.c?rev=1... ============================================================================== --- trunk/netsurf/atari/global_evnt.c (original) +++ trunk/netsurf/atari/global_evnt.c Sat Apr 7 16:19:10 2012 @@ -58,7 +58,8 @@ extern int mouse_hold_start[3]; extern browser_mouse_state bmstate; extern short last_drag_x; -extern short last_drag_y; +extern short last_drag_y; +extern bool html_redraw_debug; /* Zero based resource tree ids: */ #define T_ABOUT 0

11 years, 7 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2012