r9766 tlsa - /trunk/libnsfb/src/32bpp_plotters.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Dec 29 06:32:52 2009
New Revision: 9766
URL: http://source.netsurf-browser.org?rev=9766&view=rev
Log:
Move clipping check out of conditional bit in line plotter.
Modified:
trunk/libnsfb/src/32bpp_plotters.c
Modified: trunk/libnsfb/src/32bpp_plotters.c
URL: http://source.netsurf-browser.org/trunk/libnsfb/src/32bpp_plotters.c?rev=...
==============================================================================
--- trunk/libnsfb/src/32bpp_plotters.c (original)
+++ trunk/libnsfb/src/32bpp_plotters.c Tue Dec 29 06:32:52 2009
@@ -51,12 +51,12 @@
#define SIGN(x) ((x<0) ? -1 : ((x>0) ? 1 : 0))
-static bool
-line(nsfb_t *nsfb,
- nsfb_bbox_t *line,
- int line_width,
- nsfb_colour_t c,
- bool dotted,
+static bool
+line(nsfb_t *nsfb,
+ nsfb_bbox_t *line,
+ int line_width,
+ nsfb_colour_t c,
+ bool dotted,
bool dashed)
{
int w;
@@ -72,22 +72,20 @@
ent = colour_to_pixel(c);
+ if (!nsfb_plot_clip_ctx(nsfb, line))
+ return true; /* line outside clipping */
+
if (line->y0 == line->y1) {
/* horizontal line special cased */
- if (!nsfb_plot_clip_ctx(nsfb, line))
- return true; /* line outside clipping */
-
pvideo = get_xy_loc(nsfb, line->x0, line->y0);
w = line->x1 - line->x0;
- while (w-- > 0)
+ while (w-- > 0)
*(pvideo + w) = ent;
-
+
return true;
} else {
/* standard bresenham line */
- if (!nsfb_plot_clip_line_ctx(nsfb, line))
- return true; /* line outside clipping */
/* the horizontal distance of the line */
dx = line->x1 - line->x0;
@@ -195,10 +193,10 @@
uint32_t *pvideo;
/* check point lies within clipping region */
- if ((x < nsfb->clip.x0) ||
+ if ((x < nsfb->clip.x0) ||
(x >= nsfb->clip.x1) ||
(y < nsfb->clip.y0) ||
- (y >= nsfb->clip.y1))
+ (y >= nsfb->clip.y1))
return true;
pvideo = get_xy_loc(nsfb, x, y);
@@ -320,12 +318,12 @@
return true;
}
-static bool
+static bool
bitmap(nsfb_t *nsfb,
const nsfb_bbox_t *loc,
- const nsfb_colour_t *pixel,
- int bmp_width,
- int bmp_height,
+ const nsfb_colour_t *pixel,
+ int bmp_width,
+ int bmp_height,
int bmp_stride,
bool alpha)
{
@@ -404,7 +402,7 @@
{
uint32_t *pvideo;
int xloop, yloop;
- int width;
+ int width;
if (!nsfb_plot_clip_ctx(nsfb, rect)) {
return true;
13 years, 5 months
r9765 tlsa - in /trunk/netsurf/framebuffer: fbtk.c fbtk.h
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Dec 29 05:07:16 2009
New Revision: 9765
URL: http://source.netsurf-browser.org?rev=9765&view=rev
Log:
Center scrollbars and make colours paler.
Modified:
trunk/netsurf/framebuffer/fbtk.c
trunk/netsurf/framebuffer/fbtk.h
Modified: trunk/netsurf/framebuffer/fbtk.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk.c?rev=97...
==============================================================================
--- trunk/netsurf/framebuffer/fbtk.c (original)
+++ trunk/netsurf/framebuffer/fbtk.c Tue Dec 29 05:07:16 2009
@@ -45,7 +45,7 @@
.size = 11 * FONT_SIZE_SCALE,
.weight = 400,
.flags = FONTF_NONE,
-};
+};
enum fbtk_widgettype_e {
FB_WIDGET_TYPE_ROOT = 0,
@@ -393,11 +393,11 @@
rect.x0 = bbox.x0 + 1;
rect.y0 = bbox.y0 + 2;
rect.x1 = bbox.x1 - 2;
- rect.y1 = bbox.y1 - 2;
+ rect.y1 = bbox.y1 - 3;
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->fg);
/* scroll well outline */
- nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF707070, false, false);
+ nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF999999, false, false);
hscroll = ((widget->width - 4) * widget->u.scroll.pct) / 100 ;
hpos = ((widget->width - 4) * widget->u.scroll.pos) / 100 ;
@@ -436,12 +436,12 @@
rect.x0 = bbox.x0 + 2;
rect.y0 = bbox.y0 + 1;
- rect.x1 = bbox.x1 - 2;
+ rect.x1 = bbox.x1 - 3;
rect.y1 = bbox.y1 - 2;
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->fg);
/* scroll well */
- nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF707070, false, false);
+ nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF999999, false, false);
/* scroll well outline */
vscroll = ((widget->height - 4) * widget->u.scroll.pct) / 100 ;
@@ -666,12 +666,12 @@
default:
/* allow for new character and null */
{
- char *temp = realloc(widget->u.text.text,
+ char *temp = realloc(widget->u.text.text,
widget->u.text.idx + 2);
if (temp != NULL) {
widget->u.text.text = temp;
widget->u.text.text[widget->u.text.idx] = value;
- widget->u.text.text[widget->u.text.idx + 1] =
+ widget->u.text.text[widget->u.text.idx + 1] =
'\0';
widget->u.text.idx++;
}
Modified: trunk/netsurf/framebuffer/fbtk.h
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk.h?rev=97...
==============================================================================
--- trunk/netsurf/framebuffer/fbtk.h (original)
+++ trunk/netsurf/framebuffer/fbtk.h Tue Dec 29 05:07:16 2009
@@ -1,5 +1,5 @@
-#define FB_SCROLL_COLOUR 0xFF888888
+#define FB_SCROLL_COLOUR 0xFFAAAAAA
#define FB_FRAME_COLOUR 0xFFDDDDDD
#define FB_COLOUR_BLACK 0xFF000000
#define FB_COLOUR_WHITE 0xFFFFFFFF
13 years, 5 months
r9764 tlsa - /trunk/netsurf/framebuffer/fbtk.c
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Dec 28 17:53:02 2009
New Revision: 9764
URL: http://source.netsurf-browser.org?rev=9764&view=rev
Log:
Change scrollbar rendering colours and offsets a bit. Could use some more attention.
Modified:
trunk/netsurf/framebuffer/fbtk.c
Modified: trunk/netsurf/framebuffer/fbtk.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fbtk.c?rev=97...
==============================================================================
--- trunk/netsurf/framebuffer/fbtk.c (original)
+++ trunk/netsurf/framebuffer/fbtk.c Mon Dec 28 17:53:02 2009
@@ -386,21 +386,18 @@
rect = bbox;
+ /* background */
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->bg);
+ /* scroll well */
rect.x0 = bbox.x0 + 1;
- rect.y0 = bbox.y0 + 3;
- rect.x1 = bbox.x1 - 1;
- rect.y1 = bbox.y1 - 3;
-
+ rect.y0 = bbox.y0 + 2;
+ rect.x1 = bbox.x1 - 2;
+ rect.y1 = bbox.y1 - 2;
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->fg);
- rect.x0 = bbox.x0;
- rect.y0 = bbox.y0 + 2;
- rect.x1 = bbox.x1 - 1;
- rect.y1 = bbox.y1 - 5;
-
- nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF000000, false, false);
+ /* scroll well outline */
+ nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF707070, false, false);
hscroll = ((widget->width - 4) * widget->u.scroll.pct) / 100 ;
hpos = ((widget->width - 4) * widget->u.scroll.pos) / 100 ;
@@ -434,31 +431,28 @@
rect = bbox;
+ /* background */
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->bg);
- rect.x0 = bbox.x0 + 1;
- rect.y0 = bbox.y0 + 3;
- rect.x1 = bbox.x1 - 1;
- rect.y1 = bbox.y1 - 3;
-
+ rect.x0 = bbox.x0 + 2;
+ rect.y0 = bbox.y0 + 1;
+ rect.x1 = bbox.x1 - 2;
+ rect.y1 = bbox.y1 - 2;
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->fg);
- rect.x0 = bbox.x0;
- rect.y0 = bbox.y0 + 2;
- rect.x1 = bbox.x1 - 1;
- rect.y1 = bbox.y1 - 5;
-
- nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF000000, false, false);
-
+ /* scroll well */
+ nsfb_plot_rectangle(root->u.root.fb, &rect, 1, 0xFF707070, false, false);
+
+ /* scroll well outline */
vscroll = ((widget->height - 4) * widget->u.scroll.pct) / 100 ;
vpos = ((widget->height - 4) * widget->u.scroll.pos) / 100 ;
LOG(("scroll %d",vscroll));
- rect.x0 = bbox.x0 + 3 ;
- rect.y0 = bbox.y0 + 5 + vpos;
- rect.x1 = bbox.x0 + widget->width - 3;
- rect.y1 = bbox.y0 + vscroll + vpos - 5;
+ rect.x0 = bbox.x0 + 5;
+ rect.y0 = bbox.y0 + 3 + vpos;
+ rect.x1 = bbox.x0 + widget->width - 5;
+ rect.y1 = bbox.y0 + vscroll + vpos;
nsfb_plot_rectangle_fill(root->u.root.fb, &rect, widget->bg);
13 years, 5 months
r9763 tlsa - /trunk/netsurf/framebuffer/gui.c
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Dec 28 17:13:02 2009
New Revision: 9763
URL: http://source.netsurf-browser.org?rev=9763&view=rev
Log:
Remove loads of magic numbers from gui_create_browser_window. Place toolbar icons according to their widths, rather than at fixed positions. Keep track of used width, and use that to get remaining width for URL bar. Use option_toolbar_status_width to determine scrollbar/statusbar proportion. Reduce and make consistent the spacing between toolbar icons.
Modified:
trunk/netsurf/framebuffer/gui.c
Modified: trunk/netsurf/framebuffer/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/gui.c?rev=976...
==============================================================================
--- trunk/netsurf/framebuffer/gui.c (original)
+++ trunk/netsurf/framebuffer/gui.c Mon Dec 28 17:13:02 2009
@@ -364,7 +364,7 @@
messages_load(buf);
option_core_select_menu = true;
-
+
/* load browser options */
fb_find_resource(buf, "Choices-fb", "~/.netsurf/Choices-fb");
LOG(("Using '%s' as Preferences file", buf));
@@ -813,9 +813,12 @@
struct gui_window *gw;
struct browser_widget_s *browser_widget;
fbtk_widget_t *widget;
- int top = 0;
- int bot = 0;
- int right = 0;
+ int toolbar_height = 0;
+ int furniture_width = 0;
+ int spacing_width = 0;
+ int url_bar_height = 0;
+ int statusbar_width = 0;
+ int xpos = 0;
gw = calloc(1, sizeof(struct gui_window));
@@ -832,133 +835,143 @@
case BROWSER_WINDOW_NORMAL:
gw->window = fbtk_create_window(fbtk, 0, 0, 0, 0);
- top = 30;
- bot = 20;
- right = 18;
+ /* area and widget dimensions */
+ toolbar_height = 30;
+ furniture_width = 18;
+ spacing_width = 2;
+ url_bar_height = 24;
+
+ statusbar_width = option_toolbar_status_width *
+ fbtk_get_width(gw->window) / 10000;
+
+ xpos = spacing_width;
+
LOG(("Normal window"));
/* fill toolbar background */
widget = fbtk_create_fill(gw->window,
- 0, 0, 0, 30,
+ 0, 0, 0, toolbar_height,
FB_FRAME_COLOUR);
fbtk_set_handler_move(widget, set_ptr_default_move, bw);
/* back button */
gw->back = fbtk_create_button(gw->window,
- 5, 2,
- FB_FRAME_COLOUR,
- &left_arrow_g,
- fb_leftarrow_click,
- gw);
+ xpos, (toolbar_height - left_arrow.height) / 2,
+ FB_FRAME_COLOUR, &left_arrow,
+ fb_leftarrow_click, gw);
fbtk_set_handler_move(gw->back, set_ptr_hand_move, bw);
+ xpos += left_arrow.width + spacing_width;
/* forward button */
gw->forward = fbtk_create_button(gw->window,
- 35, 2,
- FB_FRAME_COLOUR,
- &right_arrow_g,
- fb_rightarrow_click,
- gw);
+ xpos, (toolbar_height - right_arrow.height) / 2,
+ FB_FRAME_COLOUR, &right_arrow,
+ fb_rightarrow_click, gw);
fbtk_set_handler_move(gw->forward, set_ptr_hand_move, bw);
+ xpos += right_arrow.width + spacing_width;
/* reload button */
widget = fbtk_create_button(gw->window,
- 65, 2,
- FB_FRAME_COLOUR,
- &stop_image,
- fb_stop_click,
- bw);
+ xpos, (toolbar_height - stop_image.height) / 2,
+ FB_FRAME_COLOUR, &stop_image,
+ fb_stop_click, bw);
fbtk_set_handler_move(widget, set_ptr_hand_move, bw);
+ xpos += stop_image.width + spacing_width;
/* reload button */
widget = fbtk_create_button(gw->window,
- 95, 2,
- FB_FRAME_COLOUR,
- &reload,
- fb_reload_click,
- bw);
+ xpos, (toolbar_height - reload.height) / 2,
+ FB_FRAME_COLOUR, &reload,
+ fb_reload_click, bw);
fbtk_set_handler_move(widget, set_ptr_hand_move, bw);
+ xpos += reload.width + spacing_width;
/* url widget */
+ xpos += 1; /* extra spacing for url bar */
gw->url = fbtk_create_writable_text(gw->window,
- 125 , 3,
- fbtk_get_width(gw->window) - 160, 24,
- FB_COLOUR_WHITE,
- FB_COLOUR_BLACK,
- true,
- fb_url_enter,
- bw);
+ xpos, (toolbar_height - url_bar_height) / 2,
+ fbtk_get_width(gw->window) - xpos -
+ spacing_width - spacing_width -
+ throbber0.width,
+ url_bar_height,
+ FB_COLOUR_WHITE, FB_COLOUR_BLACK,
+ true, fb_url_enter, bw);
fbtk_set_handler_move(gw->url, fb_url_move, bw);
-
+ xpos += fbtk_get_width(gw->window) - xpos -
+ spacing_width - throbber0.width;
+
+ /* throbber */
gw->throbber = fbtk_create_bitmap(gw->window,
- 130 + fbtk_get_width(gw->url),
- 3,
- FB_FRAME_COLOUR,
- &throbber0);
-
-
-
- /* add status area widget, width of framebuffer less some for
- * scrollbar
- */
+ xpos, (toolbar_height - throbber0.height) / 2,
+ FB_FRAME_COLOUR, &throbber0);
+
+
+
+ /* status bar */
+ xpos = 0;
gw->status = fbtk_create_text(gw->window,
- 0 ,
- fbtk_get_height(gw->window) - bot,
- fbtk_get_width(gw->window) - 200 - right,
- bot,
- FB_FRAME_COLOUR, FB_COLOUR_BLACK,
- false);
-
+ xpos,
+ fbtk_get_height(gw->window) - furniture_width,
+ statusbar_width, furniture_width,
+ FB_FRAME_COLOUR, FB_COLOUR_BLACK,
+ false);
fbtk_set_handler_move(gw->status, set_ptr_default_move, bw);
+ xpos = statusbar_width;
/* horizontal scrollbar */
fbtk_create_button(gw->window,
- fbtk_get_width(gw->window) - 200 - right,
- fbtk_get_height(gw->window) - bot,
- FB_FRAME_COLOUR,
- &scrolll,
- fb_scrolll_click,
- gw);
+ xpos,
+ fbtk_get_height(gw->window) - furniture_width +
+ (furniture_width -
+ scrolll.height) / 2,
+ FB_FRAME_COLOUR, &scrolll,
+ fb_scrolll_click, gw);
+ xpos += scrolll.width;
+
+ gw->hscroll = fbtk_create_hscroll(gw->window,
+ xpos,
+ fbtk_get_height(gw->window) - furniture_width,
+ fbtk_get_width(gw->window) - xpos -
+ scrollr.width,
+ furniture_width,
+ FB_SCROLL_COLOUR,
+ FB_FRAME_COLOUR);
fbtk_create_button(gw->window,
- fbtk_get_width(gw->window) - 20 - right,
- fbtk_get_height(gw->window) - bot,
- FB_FRAME_COLOUR,
- &scrollr,
- fb_scrollr_click,
- gw);
-
- gw->hscroll = fbtk_create_hscroll(gw->window,
- fbtk_get_width(gw->window) - 160 - 20 - right,
- fbtk_get_height(gw->window) - bot,
- 160,
- bot,
- FB_SCROLL_COLOUR,
- FB_FRAME_COLOUR);
+ fbtk_get_width(gw->window) - scrollr.width,
+ fbtk_get_height(gw->window) - furniture_width +
+ (furniture_width -
+ scrollr.height) / 2,
+ FB_FRAME_COLOUR, &scrollr,
+ fb_scrollr_click, gw);
+
/* create vertical */
fbtk_create_button(gw->window,
- fbtk_get_width(gw->window) - right,
- top,
- FB_FRAME_COLOUR,
- &scrollu,
- fb_scrollu_click,
- gw);
+ fbtk_get_width(gw->window) - furniture_width +
+ (furniture_width -
+ scrollu.width) / 2,
+ toolbar_height,
+ FB_FRAME_COLOUR, &scrollu,
+ fb_scrollu_click, gw);
+
+ gw->vscroll = fbtk_create_vscroll(gw->window,
+ fbtk_get_width(gw->window) - furniture_width,
+ toolbar_height + scrollu.height,
+ furniture_width,
+ fbtk_get_height(gw->window) - toolbar_height -
+ furniture_width -
+ scrollu.height - scrolld.height,
+ FB_SCROLL_COLOUR,
+ FB_FRAME_COLOUR);
fbtk_create_button(gw->window,
- fbtk_get_width(gw->window) - right,
- fbtk_get_height(gw->window) - bot - 20,
- FB_FRAME_COLOUR,
- &scrolld,
- fb_scrolld_click,
- gw);
-
- gw->vscroll = fbtk_create_vscroll(gw->window,
- fbtk_get_width(gw->window) - right,
- top + 20,
- right,
- fbtk_get_height(gw->window) - top - bot - 40 ,
- FB_SCROLL_COLOUR,
- FB_FRAME_COLOUR);
+ fbtk_get_width(gw->window) - furniture_width +
+ (furniture_width -
+ scrolld.width) / 2,
+ fbtk_get_height(gw->window) - furniture_width -
+ scrolld.height,
+ FB_FRAME_COLOUR, &scrolld,
+ fb_scrolld_click, gw);
break;
@@ -975,7 +988,7 @@
browser_widget = calloc(1, sizeof(struct browser_widget_s));
- gw->browser = fbtk_create_user(gw->window, 0, top, -right, - (bot + top), browser_widget);
+ gw->browser = fbtk_create_user(gw->window, 0, toolbar_height, -furniture_width, - (furniture_width + toolbar_height), browser_widget);
fbtk_set_handler_click(gw->browser, fb_browser_window_click, bw);
fbtk_set_handler_input(gw->browser, fb_browser_window_input, gw);
@@ -1265,7 +1278,7 @@
* set favicon
*/
void gui_window_set_icon(struct gui_window *g, struct content *icon)
-{
+{
}
/**
13 years, 5 months
r9761 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages
by netsurf＠semichrome.net
Author: chris_y
Date: Mon Dec 28 09:28:32 2009
New Revision: 9761
URL: http://source.netsurf-browser.org?rev=9761&view=rev
Log:
Updated Italian translation from Samir Hawamdeh
Modified:
trunk/netsurf/!NetSurf/Resources/it/Messages
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Mon Dec 28 09:28:32 2009
@@ -1,6 +1,6 @@
-# Italian messages for NetSurf 3.0 Development (Revision 9601)
+# Italian messages for NetSurf 3.0 Development (Revision 9757)
# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture)
-# 30.09.2009
+# 24.12.2009
# =========================================================================
#
# Description
@@ -319,7 +319,7 @@
TreePath:Percorso: %s%s
TreeExpires:Scomparsi: %s
TreeLastUsed:Ultimi usati: %s
-TreeSecure:Solo Host sicuri: %s
+TreeSecure:Solo host sicuri: %s
TreeVersion:Versione: %s
TreePersistent:Persistenza: %s
TreeHeaders: (da intestazioni)
@@ -328,7 +328,7 @@
TreeVersion2:RFC 2965
TreeSession:Fine sessione
TreeUnused:Inutilizzato
-TreeImport:URL Importati
+TreeImport:URL importati
TreeNewFolder:Nuova cartella
TreeLaunch:Visita URL
TreeDelete:Cancella
@@ -433,123 +433,123 @@
gtkOverwriteTitle:Il file è già esistente
gtkOverwriteInfo:Il file è già esistente in "%s". Sostituirlo comporterà la sovrascrittura del file.
gtkFailed:Scaricamento fallito
-gtkFileError:Errore File: %s
+gtkFileError:Errore file: %s
gtkInfo:%s da %s è %s come dimensione
gtkSave:Salva file come...
gtkSourceSave:Salva sorgente
-gtkSourceTabError:Error handling source data
-gtkPlainSave:Save as text
-gtkFullSave:Save webpage complete - select an empty directory
+gtkSourceTabError:Errore di modifica sul sorgente
+gtkPlainSave:Salva come testo
+gtkFullSave:Salva pagina web completa - seleziona una directory vuota
gtkSaveConfirm:File salvato
gtkSaveCancelled:File non salvato
-gtkUnknownHost:un Host sconosciuto
+gtkUnknownHost:un host sconosciuto
gtkUnknownFile:
gtkUnknownSize:sconosciuto
# gtk Menu / Button labels
#
-gtkNewTab:New _Tab
+gtkNewTab:Nuova _scheda
gtkNewTabAccel:<ctrl>t
-gtkNewWindow:_New Window
+gtkNewWindow:_Nuova finestra
gtkNewWindowAccel:<ctrl>n
-gtkOpenFile:_Open File
+gtkOpenFile:_Apri file
gtkOpenFileAccel:<ctrl>o
-gtkCloseWindow:_Close Window
+gtkCloseWindow:_Chiudi finestra
gtkCloseWindowAccel:<ctrl><shift>w
-gtkSavePage:Save Page..
+gtkSavePage:Salva pagina...
gtkSavePageAccel:<ctrl>s
-gtkExport:Export
-gtkPlainText:Plain Text..
-gtkDrawFile:Drawfile..
-gtkPostScript:PostScript..
-gtkPDF:PDF..
-gtkPrintPreview:Print Preview..
+gtkExport:Esporta
+gtkPlainText:Testo normale...
+gtkDrawFile:Drawfile...
+gtkPostScript:PostScript...
+gtkPDF:PDF...
+gtkPrintPreview:Stampa Anteprima...
gtkPrintPreviewAccel:<ctrl><shift>p
-gtkPrint:Print..
+gtkPrint:Stampa...
gtkPrintAccel:<ctrl>p
-gtkQuit:_Quit
+gtkQuit:_Esci
gtkQuitAccel:<ctrl>q
-gtkCut:Cu_t
+gtkCut:Ta_glia
gtkCutAccel:<ctrl>x
-gtkCopy:_Copy
+gtkCopy:_Copia
gtkCopyAccel:<ctrl>c
-gtkPaste:_Paste
+gtkPaste:_Incolla
gtkPasteAccel:<ctrl>v
-gtkDelete:_Delete
-gtkSelectAll:Select _All
+gtkDelete:_Cancella
+gtkSelectAll:Seleziona _Tutto
gtkSelectAllAccel:<ctrl>a
-gtkFind:_Find..
+gtkFind:_Trova...
gtkFindAccel:<ctrl>f
-gtkPreferences:P_references
+gtkPreferences:P_referenze
gtkStop:_Stop
gtkStopAccel:Escape
-gtkReload:_Reload
+gtkReload:_Ricarica
gtkReloadAccel:F5
-gtkScaleView:_Scale View
-gtkZoomPlus:Zoom _in
+gtkScaleView:_Scala
+gtkZoomPlus:_Incrementa zoom
gtkZoomPlusAccel:<ctrl>plus
-gtkZoomMinus:Zoom _out
+gtkZoomMinus:_Decrementa zoom
gtkZoomMinusAccel:<ctrl>minus
-gtkZoomNormal:_Normal size
+gtkZoomNormal:Dimensione _normale
gtkZoomNormalAccel:<ctrl>0
-gtkFullScreen:_Fullscreen
+gtkFullScreen:_Tutto schermo
gtkFullScreenAccel:F11
-gtkViewSource:View S_ource
+gtkViewSource:Mostra s_orgente
gtkViewSourceAccel:F8
-gtkImages:_Images
-gtkForegroundImages:_Foreground Images
-gtkBackgroundImages:_Background Images
-gtkToolbars:_Toolbars
-gtkMenuBar:_Menu Bar
-gtkToolBar:_Button Bar
-gtkStatusBar:_Status Bar
-gtkDownloads:_Downloads
+gtkImages:_Immagini
+gtkForegroundImages:Immagini in _primo piano
+gtkBackgroundImages:Immagini in _sottofondo
+gtkToolbars:_Barre strumenti
+gtkMenuBar:Barra _menu
+gtkToolBar:Barra p_ulsanti
+gtkStatusBar:Barra di s_tato
+gtkDownloads:_Trasferimenti
gtkDownloadsAccel:<ctrl>d
-gtkSaveWindowSize:S_ave Window Size
+gtkSaveWindowSize:S_alva dimensione finestra
gtkDebugging:De_bugging
-gtkToggleDebugging:T_oggle debug rendering
-gtkSaveBoxTree:_Save box tree
-gtkSaveDomTree:Save DOM tree
-
-gtkBack:_Back
-gtkBackAccel:<alt>Left
-gtkForward:_Forward
-gtkForwardAccel:<alt>Right
+gtkToggleDebugging:In_verti debug rendering
+gtkSaveBoxTree:_Salva box tree
+gtkSaveDomTree:Salva DOM tree
+
+gtkBack:_Indietro
+gtkBackAccel:<alt>Sinistra
+gtkForward:_Avanti
+gtkForwardAccel:<alt>Destra
gtkHome:_Home
-gtkHomeAccel:<alt>Down
-gtkLocalHistory:_Local History
+gtkHomeAccel:<alt>Giù
+gtkLocalHistory:Cronologia _locale
gtkLocalHistoryAccel:<ctrl>h
-gtkGlobalHistory:_Global History
+gtkGlobalHistory:Cronologia _globale
gtkGlobalHistoryAccel:<ctrl><shift>h
-gtkAddBookMarks:_Add to Bookmarks..
-gtkShowBookMarks:_Show Bookmarks..
+gtkAddBookMarks:_Aggiungi ai segnalibri...
+gtkShowBookMarks:_Mostra segnalibri...
gtkShowBookMarksAccel:F6
-gtkOpenLocation:_Open Location..
+gtkOpenLocation:_Apri indirizzo...
gtkOpenLocationAccel:<ctrl>l
-gtkNextTab:_Next tab
-gtkNextTabAccel:<ctrl>Right
-gtkPrevTab:_Previous tab
-gtkPrevTabAccel:<ctrl>Left
-gtkCloseTab:_Close tab
+gtkNextTab:Scheda _successiva
+gtkNextTabAccel:<ctrl>Destra
+gtkPrevTab:Scheda _precedente
+gtkPrevTabAccel:<ctrl>Sinistra
+gtkCloseTab:_Chiudi scheda
gtkCloseTabAccel:<ctrl>w
-gtkContents:_Contents
-gtkGuide:User _guide
-gtkUserInformation:User _information
-gtkAbout:_About
-
-
-gtkToolBarTitle:Toolbar custom button store
-gtkAddThemeTitle:Select folder containing theme images
-
-gtkThemeFolderInstructions:To Install a theme, create a directory full of appropriately-named images as a subdirectory of gtk/res/themes/
-gtkThemeFolderSub:Select a subdirectory of the themes folder
-gtkThemeDup:Theme is already included
-gtkThemeAdd:Theme added successfully
+gtkContents:_Contenuti
+gtkGuide:_Guida in linea
+gtkUserInformation:Informazioni _utente
+gtkAbout:_Informazioni
+
+
+gtkToolBarTitle:Pulsanti della barra strumenti
+gtkAddThemeTitle:Seleziona una cartella contenente le immagini del tema
+
+gtkThemeFolderInstructions:Per installare un nuovo tema, crea una directory con delle immagini appropriate ed inseriscile come sotto-directory di gtk/res/themes/
+gtkThemeFolderSub:Seleziona una sotto-directory della cartella temi
+gtkThemeDup:Il tema è già incluso
+gtkThemeAdd:Il tema è stato aggiunto con successo
# Printing user interface tokens
# ==============================
@@ -574,8 +574,8 @@
NotFound:Non trovato
Next:Successivo
Prev:Precedente
-ShowAll:Show All
-CaseSens:Case Sensitive
+ShowAll:Mostra tutto
+CaseSens:Maiuscole/Minuscole
# 401 login user interface tokens
# ===============================
@@ -597,17 +597,17 @@
# This section contains tokens which are used in the
# SSL certificate verification dialog box.
#
-SSLCerts:SSL certificates
-SSLError:NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below.
-Subject:Subject
-Issuer:Issuer
-Version:Version
-ValidFrom:Valid from
-ValidTo:Valid until
-Type:Type
-Serial:Serial
-Accept:Accept
-Reject:Reject
+SSLCerts:Certificati SSL
+SSLError:NetSurf non è stato in grado di verificare l'autenticità di questo certificato SSL. Per favore verifica i dettagli presentati di seguito.
+Subject:Oggetto
+Issuer:Emittente
+Version:Versione
+ValidFrom:Valido da
+ValidTo:Valido fino a
+Type:Tipo
+Serial:Seriale
+Accept:Accetta
+Reject:Rifiuta
# Content
@@ -631,7 +631,7 @@
FormButton:Attenzione: il pulsante non può essere attivato
FormTextarea:Clicca per editare il testo
FormTextbox:Clicca per editare il campo di testo
-FormReset:Resetta form (non ancora implementato)
+FormReset:Resetta form
FormFile:Inserisci un file da inviare qui
SelectMenu:Seleziona
@@ -693,14 +693,14 @@
MiscError:Si è verificato un errore inatteso:
FileError:Il file è inesistente:
PrintError:Si è verificato un errore durante la stampa:
-AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova ancora.
-EncNotRec:Encoding type not recognised.
-FileOpenError:could not open file '%s'
-DirectoryError:directory '%s' already exists
+AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova nuovamente.
+EncNotRec:Tipo di codifica sconosciuta.
+FileOpenError:impossibile aprire il file '%s'
+DirectoryError:directory '%s' già esistente
# Specific errors - displayed in a dialog box
#
-NoMemory:Memoria insufficiente per l'esecuzione di NetSurf. Per favore liberane un pò e riprova ancora.
+NoMemory:Memoria insufficiente per l'esecuzione di NetSurf. Per favore liberane un pò e riprova nuovamente.
FontBadInst:Si è verificato un errore durante l'inizializzazione dei font a causa della presenza di una copia obsoleta dei font ROM nel disco. NetSurf verrà ora chiuso e si cercherà di lanciare un programma in grado di risolvere questo problema.
FontError:Impossibile aprire il font "Homerton.Medium" (%s).
Resolvers:Non è stato configurato nessun nome per i domini dei server, perciò sarà possibile effettuare la navigazione dei file solo in modalità locale. Usa "Configura" per impostare il nome (o i nomi) del/dei server.
@@ -708,15 +708,15 @@
Template:Una finestra di template risulta mancante. Per favore reinstalla NetSurf.
HotlistSaveError:Non è stato possibile salvare correttamente i segnalibri.
HotlistLoadError:Non è stato possibile caricare correttamente i segnalibri.
-NoDirError:%s is not a directory
+NoDirError:%s non è una directory
NoPathError:Per salvare, trascinare l'icona in una directory di visualizzazione.
NoNameError:Inserisci un nome
NoURLError:Inserisci un URL
URIError:NetSurf non è stato in grado di processare questo file URI a causa di un errore di sintassi.
-SearchError:Invalid Search.
+SearchError:Ricerca non valida.
EmptyError:Il file è vuoto.
PrintErrorRO2:Sembra che la stampante sia occupata.
-AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova ancora.
+AWNotSeen:Per favore imposta l'applicazione AWViewer e riprova nuovamente.
EncNotRec:Tipo di codifica sconosciuta.
# Error messages for Amiga version only
@@ -758,7 +758,7 @@
BadRedirect:Errata redirezione dell'URL
FetchFailed:Impossibile ottenere il documento
NotCSS:Attenzione: "Foglio di stile" non ha nulla a che spartire con i CSS
-NotFavIco:Favicon not supported
+NotFavIco:Favicon non supportata
BadObject:Attenzione: errato tipo di oggetto
ObjError:Errore di caricamento dell'oggetto: %s
ParsingFail:Analisi del documento fallita.
@@ -1329,7 +1329,7 @@
Proxy:Proxy HTTP
Fetching:Connessioni ottenibili
FetchesMax:Massime ottenibili
-FetchesHost:Ottenibili per Host
+FetchesHost:Ottenibili per host
FetchesCached:Connessioni su cache
# Rendering tab
@@ -1351,7 +1351,7 @@
FontFamilies:Famiglia Font
FontSans:Sans-serif
FontSerif:Serif
-FontMono:Mono-spaziato
+FontMono:Monospaziato
FontCursive:Corsivo
FontFantasy:Fantasia
Default:Predefinito
@@ -1376,11 +1376,11 @@
TabbedBrowsing:Navigazione a schede
TabActive:Apri nuove schede in sottofondo
TabMiddle:Tasto centrale del mouse per l'apertura delle schede (Tab)
-DownloadNotify:Notify on completion
-SearchWeb:Web search
-SearchURL:Search from URL bar
-SearchProvider:Search provider
-OptionDocky:Show in AmiDock
+DownloadNotify:Notifica al completamento
+SearchWeb:Ricerca Web
+SearchURL:Ricerca da barra URL
+SearchProvider:Ricerca provider
+OptionDocky:Mostra su AmiDock
Clipboard:Clipboard
ClipboardUTF8:Scrivi testo come UTF-8
ContextMenu:Menu contestuali
13 years, 5 months
r9760 jmb - /trunk/netsurf/render/favicon.c
by netsurf＠semichrome.net
Author: jmb
Date: Sat Dec 26 10:47:30 2009
New Revision: 9760
URL: http://source.netsurf-browser.org?rev=9760&view=rev
Log:
Only attempt to fall back to /favicon.ico if the document's base URI points to
an http(s) location.
Modified:
trunk/netsurf/render/favicon.c
Modified: trunk/netsurf/render/favicon.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/favicon.c?rev=9760...
==============================================================================
--- trunk/netsurf/render/favicon.c (original)
+++ trunk/netsurf/render/favicon.c Sat Dec 26 10:47:30 2009
@@ -103,6 +103,23 @@
}
}
if (url2 == NULL) {
+ char *scheme;
+
+ /* There was no icon link defined in the HTML source data.
+ * If the HTML document's base URL uses either the HTTP or
+ * HTTPS schemes, then try using "<scheme>://host/favicon.ico"
+ */
+ if (url_scheme(c->data.html.base_url, &scheme) != URL_FUNC_OK)
+ return NULL;
+
+ if (strcasecmp(scheme, "http") != 0 &&
+ strcasecmp(scheme, "https") != 0) {
+ free(scheme);
+ return NULL;
+ }
+
+ free(scheme);
+
if (url_join("/favicon.ico", c->data.html.base_url, &url2)
!= URL_FUNC_OK)
return NULL;
13 years, 5 months
r9759 bursa - /trunk/netsurf/content/fetchers/fetch_curl.c
by netsurf＠semichrome.net
Author: bursa
Date: Fri Dec 25 13:27:22 2009
New Revision: 9759
URL: http://source.netsurf-browser.org?rev=9759&view=rev
Log:
Don't set proxy option for file: URLs to workaround some versions of libcurl attempting to use it (fixed in latest libcurl). Also unset curl proxy option if it's disabled so the previous xfer's setting isn't retained.
Modified:
trunk/netsurf/content/fetchers/fetch_curl.c
Modified: trunk/netsurf/content/fetchers/fetch_curl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu...
==============================================================================
--- trunk/netsurf/content/fetchers/fetch_curl.c (original)
+++ trunk/netsurf/content/fetchers/fetch_curl.c Fri Dec 25 13:27:22 2009
@@ -567,7 +567,8 @@
SETOPT(CURLOPT_USERPWD, NULL);
}
- if (option_http_proxy && option_http_proxy_host) {
+ if (option_http_proxy && option_http_proxy_host &&
+ strncmp(f->url, "file:", 5) != 0) {
SETOPT(CURLOPT_PROXY, option_http_proxy_host);
SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port);
if (option_http_proxy_auth != OPTION_HTTP_PROXY_AUTH_NONE) {
@@ -583,6 +584,8 @@
option_http_proxy_auth_pass);
SETOPT(CURLOPT_PROXYUSERPWD, fetch_proxy_userpwd);
}
+ } else {
+ SETOPT(CURLOPT_PROXY, NULL);
}
if (urldb_get_cert_permissions(f->url)) {
13 years, 5 months
r9758 vince - in /trunk/libnsfb: src/frontend_linux.c src/frontend_sdl.c test/plottest.c
by netsurf＠semichrome.net
Author: vince
Date: Fri Dec 25 04:01:27 2009
New Revision: 9758
URL: http://source.netsurf-browser.org?rev=9758&view=rev
Log:
make the test app compile again
Modified:
trunk/libnsfb/src/frontend_linux.c
trunk/libnsfb/src/frontend_sdl.c
trunk/libnsfb/test/plottest.c
Modified: trunk/libnsfb/src/frontend_linux.c
URL: http://source.netsurf-browser.org/trunk/libnsfb/src/frontend_linux.c?rev=...
==============================================================================
--- trunk/libnsfb/src/frontend_linux.c (original)
+++ trunk/libnsfb/src/frontend_linux.c Fri Dec 25 04:01:27 2009
@@ -13,17 +13,21 @@
#include "libnsfb_event.h"
#include "nsfb.h"
#include "frontend.h"
+#include "plotters.h"
#define UNUSED(x) ((x) = (x))
static int linux_set_geometry(nsfb_t *nsfb, int width, int height, int bpp)
{
if (nsfb->frontend_priv != NULL)
- return -1; /* if were already initialised fail */
+ return -1; /* if we are already initialised fail */
nsfb->width = width;
nsfb->height = height;
nsfb->bpp = bpp;
+
+ /* select default sw plotters for bpp */
+ select_plotters(nsfb);
return 0;
}
Modified: trunk/libnsfb/src/frontend_sdl.c
URL: http://source.netsurf-browser.org/trunk/libnsfb/src/frontend_sdl.c?rev=97...
==============================================================================
--- trunk/libnsfb/src/frontend_sdl.c (original)
+++ trunk/libnsfb/src/frontend_sdl.c Fri Dec 25 04:01:27 2009
@@ -386,6 +386,7 @@
nsfb_plot_add_rect(srcbox, dstbox, &allbox);
+ /* clear the cursor if its within the region to be altered */
if ((cursor != NULL) &&
(cursor->plotted == true) &&
(nsfb_plot_bbox_intersect(&allbox, &cursor->loc))) {
Modified: trunk/libnsfb/test/plottest.c
URL: http://source.netsurf-browser.org/trunk/libnsfb/test/plottest.c?rev=9758&...
==============================================================================
--- trunk/libnsfb/test/plottest.c (original)
+++ trunk/libnsfb/test/plottest.c Fri Dec 25 04:01:27 2009
@@ -1,3 +1,5 @@
+/* libnsfb plotetr test program */
+
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -21,22 +23,22 @@
unsigned char data[16];
} Mglyph1 = {
8, 16, {
- 0x00, /* 00000000 */
- 0x00, /* 00000000 */
- 0xc6, /* 11000110 */
- 0xee, /* 11101110 */
- 0xfe, /* 11111110 */
- 0xfe, /* 11111110 */
- 0xd6, /* 11010110 */
- 0xc6, /* 11000110 */
- 0xc6, /* 11000110 */
- 0xc6, /* 11000110 */
- 0xc6, /* 11000110 */
- 0xc6, /* 11000110 */
- 0x00, /* 00000000 */
- 0x00, /* 00000000 */
- 0x00, /* 00000000 */
- 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0xc6, /* 11000110 */
+ 0xee, /* 11101110 */
+ 0xfe, /* 11111110 */
+ 0xfe, /* 11111110 */
+ 0xd6, /* 11010110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0xc6, /* 11000110 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
+ 0x00, /* 00000000 */
}
};
@@ -46,22 +48,22 @@
unsigned char data[16 * 8];
} Mglyph8 = {
8, 16, {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
- 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, /* 00000000 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0xaa, 0xff, 0xff, 0x00, 0xff, 0xff, 0xaa, 0x00, /* 11101110 */
- 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0x00, /* 11111110 */
- 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0x00, /* 11111110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11010110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
+ 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, /* 00000000 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0xaa, 0xff, 0xff, 0x00, 0xff, 0xff, 0xaa, 0x00, /* 11101110 */
+ 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0x00, /* 11111110 */
+ 0xaa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaa, 0x00, /* 11111110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11010110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0xaa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xaa, 0x00, /* 11000110 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 00000000 */
}
};
@@ -100,7 +102,7 @@
/* claim the whole screen for update */
nsfb_claim(nsfb, &box);
- /* first test, repeatedly clear the graphics area, should result in teh
+ /* first test, repeatedly clear the graphics area, should result in the
* same operation as a single clear to the final colour
*/
for (loop = 0; loop < 256;loop++) {
@@ -190,7 +192,17 @@
nsfb_plot_ellipse(nsfb, &box3, 0xffff0000);
- nsfb_plot_copy(nsfb,400,400,100,100,600,200);
+ box2.x0 = 400;
+ box2.y0 = 400;
+ box2.x1 = 500;
+ box2.y1 = 500;
+
+ box3.x0 = 600;
+ box3.y0 = 200;
+ box3.x1 = 700;
+ box3.y1 = 300;
+
+ nsfb_plot_copy(nsfb, &box2, &box3);
box3.x0 = 50;
box3.x1 = 200;
@@ -219,7 +231,7 @@
nsfb_plot_glyph8(nsfb, &box3, Mglyph8.data, Mglyph8.w, 0xff000000);
}
- nsfb_release(nsfb, &box);
+ nsfb_update(nsfb, &box);
/* random rectangles in clipped area*/
box2.x0 = 400;
@@ -232,18 +244,18 @@
srand(1234);
for (loop=0; loop < 10000; loop++) {
- nsfb_claim(nsfb, &box2);
+ nsfb_claim(nsfb, &box2);
box3.x0 = rand() / (RAND_MAX / box.x1);
box3.y0 = rand() / (RAND_MAX / box.y1);
box3.x1 = rand() / (RAND_MAX / 400);
box3.y1 = rand() / (RAND_MAX / 400);
nsfb_plot_rectangle_fill(nsfb, &box3, 0xff000000 | rand());
- nsfb_release(nsfb, &box2);
+ nsfb_update(nsfb, &box2);
}
while (event.type != NSFB_EVENT_CONTROL)
- nsfb_input(nsfb, &event, -1);
+ nsfb_event(nsfb, &event, -1);
return 0;
}
13 years, 5 months
r9757 chris_y - /trunk/netsurf/amiga/gui_options.c
by netsurf＠semichrome.net
Author: chris_y
Date: Wed Dec 23 07:47:50 2009
New Revision: 9757
URL: http://source.netsurf-browser.org?rev=9757&view=rev
Log:
It helps to allocate enough memory for 40 LONGs, and that memory needs to be returned
regardless as passing a NULL to chooser.gadget crashes it.
Modified:
trunk/netsurf/amiga/gui_options.c
Modified: trunk/netsurf/amiga/gui_options.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=9...
==============================================================================
--- trunk/netsurf/amiga/gui_options.c (original)
+++ trunk/netsurf/amiga/gui_options.c Wed Dec 23 07:47:50 2009
@@ -1748,12 +1748,12 @@
ULONG ref = 0;
STRPTR *websearchlist;
- if (option_search_engines_file == NULL) return NULL;
+ websearchlist = AllocVec(200, MEMF_CLEAR);
+
+ if (option_search_engines_file == NULL) return websearchlist;
FILE *f = fopen(option_search_engines_file, "r");
- if (f == NULL) return NULL;
-
- websearchlist = AllocVec(40, MEMF_CLEAR);
+ if (f == NULL) return websearchlist;
while (fgets(buf, sizeof(buf), f) != NULL) {
if (buf[0] == '\0') continue;
13 years, 5 months
