r13503 tlsa - /trunk/libnsfb/src/plot/api.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Feb 29 13:35:29 2012
New Revision: 13503
URL: http://source.netsurf-browser.org?rev=13503&view=rev
Log:
A couple of casts through void to avoid pointer alignement warnings on ARM.
Modified:
trunk/libnsfb/src/plot/api.c
Modified: trunk/libnsfb/src/plot/api.c
URL: http://source.netsurf-browser.org/trunk/libnsfb/src/plot/api.c?rev=13503&...
==============================================================================
--- trunk/libnsfb/src/plot/api.c (original)
+++ trunk/libnsfb/src/plot/api.c Wed Feb 29 13:35:29 2012
@@ -148,7 +148,7 @@
}
if ((srcfb->width == 1) && (srcfb->height == 1)) {
- srccol = *(nsfb_colour_t *)(srcfb->ptr);
+ srccol = *(nsfb_colour_t *)(void *)(srcfb->ptr);
/* check for completely transparent */
if ((srccol & 0xff000000) == 0)
@@ -159,7 +159,7 @@
return dstfb->plotter_fns->fill(dstfb, dstbox, srccol);
}
- return dstfb->plotter_fns->bitmap(dstfb, dstbox, (const nsfb_colour_t *)srcfb->ptr, srcfb->width, srcfb->height, (srcfb->linelen * 8) / srcfb->bpp, trans);
+ return dstfb->plotter_fns->bitmap(dstfb, dstbox, (const nsfb_colour_t *)(void *)srcfb->ptr, srcfb->width, srcfb->height, (srcfb->linelen * 8) / srcfb->bpp, trans);
}
11 years, 6 months
r13502 chris_y - in /trunk/netsurf/amiga: gui.c options.h plotters.c thumbnail.c tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Wed Feb 29 13:09:55 2012
New Revision: 13502
URL: http://source.netsurf-browser.org?rev=13502&view=rev
Log:
allow both x and y dimensions of redraw tiles to be configured
Modified:
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/options.h
trunk/netsurf/amiga/plotters.c
trunk/netsurf/amiga/thumbnail.c
trunk/netsurf/amiga/tree.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13502&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Wed Feb 29 13:09:55 2012
@@ -3251,15 +3251,15 @@
//printf("%ld %ld %ld %ld\n",left, top, width, height);
- for(y = top; y < (top + height); y += option_redraw_tile_size) {
+ for(y = top; y < (top + height); y += option_redraw_tile_size_y) {
clip.y0 = 0;
- clip.y1 = option_redraw_tile_size;
- if(((top + height) - y) < option_redraw_tile_size) clip.y1 = (top + height) - y;
-
- for(x = left; x < (left + width); x += option_redraw_tile_size) {
+ clip.y1 = option_redraw_tile_size_y;
+ if(((top + height) - y) < option_redraw_tile_size_y) clip.y1 = (top + height) - y;
+
+ for(x = left; x < (left + width); x += option_redraw_tile_size_x) {
clip.x0 = 0;
- clip.x1 = option_redraw_tile_size;
- if(((left + width) - x) < option_redraw_tile_size) clip.x1 = (left + width) - x;
+ clip.x1 = option_redraw_tile_size_x;
+ if(((left + width) - x) < option_redraw_tile_size_x) clip.x1 = (left + width) - x;
//printf("%ld %ld -> %ld %ld\n",clip.x0 - (int)(x / gwin->bw->scale), clip.y0 - (int)(y / gwin->bw->scale), clip.x1, clip.y1);
Modified: trunk/netsurf/amiga/options.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=13502...
==============================================================================
--- trunk/netsurf/amiga/options.h (original)
+++ trunk/netsurf/amiga/options.h Wed Feb 29 13:09:55 2012
@@ -1,5 +1,5 @@
/*
- * Copyright 2008 - 2011 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
+ * Copyright 2008 - 2012 Chris Young <chris(a)unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -65,7 +65,8 @@
extern int option_cairo_renderer;
extern bool option_direct_render;
extern int option_amiga_ydpi;
-extern int option_redraw_tile_size;
+extern int option_redraw_tile_size_x;
+extern int option_redraw_tile_size_y;
extern int option_monitor_aspect_x;
extern int option_monitor_aspect_y;
extern bool option_accept_lang_locale;
@@ -117,7 +118,8 @@
int option_cairo_renderer = 1; \
bool option_direct_render = false; \
int option_amiga_ydpi = 72; \
-int option_redraw_tile_size = 300; \
+int option_redraw_tile_size_x = 0; \
+int option_redraw_tile_size_y = 100; \
int option_monitor_aspect_x = 0; \
int option_monitor_aspect_y = 0; \
bool option_accept_lang_locale = true; \
@@ -169,7 +171,8 @@
{ "cairo_renderer", OPTION_INTEGER, &option_cairo_renderer}, \
{ "direct_render", OPTION_BOOL, &option_direct_render}, \
{ "amiga_ydpi", OPTION_INTEGER, &option_amiga_ydpi}, \
-{ "redraw_tile_size", OPTION_INTEGER, &option_redraw_tile_size}, \
+{ "redraw_tile_size_x", OPTION_INTEGER, &option_redraw_tile_size_x}, \
+{ "redraw_tile_size_y", OPTION_INTEGER, &option_redraw_tile_size_y}, \
{ "monitor_aspect_x", OPTION_INTEGER, &option_monitor_aspect_x}, \
{ "monitor_aspect_y", OPTION_INTEGER, &option_monitor_aspect_y}, \
{ "accept_lang_locale", OPTION_BOOL, &option_accept_lang_locale}, \
Modified: trunk/netsurf/amiga/plotters.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=1350...
==============================================================================
--- trunk/netsurf/amiga/plotters.c (original)
+++ trunk/netsurf/amiga/plotters.c Wed Feb 29 13:09:55 2012
@@ -121,9 +121,10 @@
struct BitMap *friend = NULL; /* Required to be NULL for Cairo and ARGB bitmaps */
- if(option_redraw_tile_size <= 0) option_redraw_tile_size = scrn->Width;
- if(!width) width = option_redraw_tile_size;
- if(!height) height = option_redraw_tile_size;
+ if(option_redraw_tile_size_x <= 0) option_redraw_tile_size_x = scrn->Width;
+ if(option_redraw_tile_size_y <= 0) option_redraw_tile_size_y = scrn->Height;
+ if(!width) width = option_redraw_tile_size_x;
+ if(!height) height = option_redraw_tile_size_y;
gg->layerinfo = NewLayerInfo();
gg->areabuf = AllocVec(100,MEMF_PRIVATE | MEMF_CLEAR);
Modified: trunk/netsurf/amiga/thumbnail.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/thumbnail.c?rev=135...
==============================================================================
--- trunk/netsurf/amiga/thumbnail.c (original)
+++ trunk/netsurf/amiga/thumbnail.c Wed Feb 29 13:09:55 2012
@@ -42,13 +42,17 @@
struct BitScaleArgs bsa;
int plot_width;
int plot_height;
+ int redraw_tile_size = option_redraw_tile_size_x;
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &amiplot
};
- plot_width = MIN(content_get_width(content), option_redraw_tile_size);
+ if(option_redraw_tile_size_y < option_redraw_tile_size_x)
+ redraw_tile_size = option_redraw_tile_size_y;
+
+ plot_width = MIN(content_get_width(content), redraw_tile_size);
plot_height = ((plot_width * bitmap->height) + (bitmap->width / 2)) /
bitmap->width;
Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=13502&r1...
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Wed Feb 29 13:09:55 2012
@@ -1248,14 +1248,14 @@
y = pos_y;
}
- for(tile_y = y; tile_y < (y + height); tile_y += option_redraw_tile_size) {
- tile_h = option_redraw_tile_size;
- if(((y + height) - tile_y) < option_redraw_tile_size)
+ for(tile_y = y; tile_y < (y + height); tile_y += option_redraw_tile_size_y) {
+ tile_h = option_redraw_tile_size_y;
+ if(((y + height) - tile_y) < option_redraw_tile_size_y)
tile_h = (y + height) - tile_y;
- for(tile_x = x; tile_x < (x + width); tile_x += option_redraw_tile_size) {
- tile_w = option_redraw_tile_size;
- if(((x + width) - tile_x) < option_redraw_tile_size)
+ for(tile_x = x; tile_x < (x + width); tile_x += option_redraw_tile_size_x) {
+ tile_w = option_redraw_tile_size_x;
+ if(((x + width) - tile_x) < option_redraw_tile_size_x)
tile_w = (x + width) - tile_x;
tree_draw(twin->tree, - tile_x, - tile_y,
11 years, 6 months
r13501 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Feb 28 14:00:38 2012
New Revision: 13501
URL: http://source.netsurf-browser.org?rev=13501&view=rev
Log:
Translation of previously-missing strings (credit: 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 Tue Feb 28 14:00:38 2012
@@ -3,7 +3,7 @@
#
# ==============================================================================
# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture) for ATO Italia
-# 8.01.2012
+# 28.02.2012
# ==============================================================================
#
# Description
@@ -215,7 +215,7 @@
# Other menus
#
# URL suggestion menu
-URLSuggest:URL Recenti
+URLSuggest:URL recenti
# Menus within the choices system
#
@@ -392,7 +392,7 @@
#
GlobalHistory:Cronologia globale
-DomainAll:(All domains)
+DomainAll:(Tutti i domini)
DateToday:Oggi
DateYesterday:Ieri
Date1Week:Ultima settimana
@@ -486,11 +486,11 @@
#
gtkFile:_File
-gtkEdit:_Edit
-gtkView:_View
-gtkNavigate:_Navigate
-gtkTabs:_Tabs
-gtkHelp:_Help
+gtkEdit:Mo_difica
+gtkView:_Mostra
+gtkNavigate:_Visualizza
+gtkTabs:_Schede
+gtkHelp:_Aiuto
gtkNewTab:Nuova _scheda
gtkNewTabAccel:<ctrl>t
@@ -570,7 +570,7 @@
gtkAddBookMarks:_Aggiungi ai segnalibri...
gtkShowBookMarks:_Mostra segnalibri...
gtkShowBookMarksAccel:F6
-gtkShowCookies:Show _Cookiesâ¦
+gtkShowCookies:Mostra _cookie...
gtkShowCookiesAccel:F9
gtkOpenLocation:_Apri indirizzo...
gtkOpenLocationAccel:<ctrl>l
@@ -587,10 +587,10 @@
gtkUserInformation:Informazioni _utente
gtkAbout:_Informazioni
-gtkCustomize:Customiseâ¦
-gtkOpentab:Open Link in _New Tab
-gtkOpenwin:Open Link in New Window
-gtkSavelink:Save Link
+gtkCustomize:Personalizza...
+gtkOpentab:Apri in una _nuova scheda
+gtkOpenwin:Apri in una nuova finestra
+gtkSavelink:Salva Link
gtkToolBarTitle:Pulsanti della barra strumenti
gtkAddThemeTitle:Seleziona una cartella contenente le immagini del tema in questione
11 years, 6 months
r13500 chris_y - /branches/release/netsurf/2.9/amiga/dist/netsurf.readme
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Feb 28 13:03:11 2012
New Revision: 13500
URL: http://source.netsurf-browser.org?rev=13500&view=rev
Log:
Readme for 2.9
Modified:
branches/release/netsurf/2.9/amiga/dist/netsurf.readme
Modified: branches/release/netsurf/2.9/amiga/dist/netsurf.readme
URL: http://source.netsurf-browser.org/branches/release/netsurf/2.9/amiga/dist...
==============================================================================
--- branches/release/netsurf/2.9/amiga/dist/netsurf.readme (original)
+++ branches/release/netsurf/2.9/amiga/dist/netsurf.readme Tue Feb 28 13:03:11 2012
@@ -2,21 +2,11 @@
Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
-Version: 3.0 development (SVN 10866)
+Version: 2.9
Architecture: ppc-amigaos >= 4.1.0
-Install manually with Installer script only -
-INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE
-
-This is a preview release of NetSurf 3.0 for AmigaOS 4.
-It is beta software, which means it is unstable and missing
-features - use at your own risk!
-
-This is provided for testing purposes only. For the latest
-stable version, visit http://www.netsurf-browser.org
-
-Please report bugs to chris(a)unsatisfactorysoftware.co.uk,
-on the Amigans.net forums or on the NetSurf mailing list.
+NetSurf is a small, fast OS4 native web browser. It does not
+require AmiCygnix and has a fully native Reaction-based GUI.
See http://www.netsurf-browser.org for more information about NetSurf.
11 years, 7 months
r13499 chris_y - /trunk/netsurf/amiga/dist/netsurf.readme
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Feb 28 13:02:16 2012
New Revision: 13499
URL: http://source.netsurf-browser.org?rev=13499&view=rev
Log:
revert r13281, meant to put it in 2.9 branch
Modified:
trunk/netsurf/amiga/dist/netsurf.readme
Modified: trunk/netsurf/amiga/dist/netsurf.readme
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/netsurf.readme...
==============================================================================
--- trunk/netsurf/amiga/dist/netsurf.readme (original)
+++ trunk/netsurf/amiga/dist/netsurf.readme Tue Feb 28 13:02:16 2012
@@ -2,11 +2,21 @@
Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
-Version: 2.9
+Version: 3.0 development (SVN 10866)
Architecture: ppc-amigaos >= 4.1.0
-NetSurf is a small, fast OS4 native web browser. It does not
-require AmiCygnix and has a fully native Reaction-based GUI.
+Install manually with Installer script only -
+INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE
+
+This is a preview release of NetSurf 3.0 for AmigaOS 4.
+It is beta software, which means it is unstable and missing
+features - use at your own risk!
+
+This is provided for testing purposes only. For the latest
+stable version, visit http://www.netsurf-browser.org
+
+Please report bugs to chris(a)unsatisfactorysoftware.co.uk,
+on the Amigans.net forums or on the NetSurf mailing list.
See http://www.netsurf-browser.org for more information about NetSurf.
11 years, 7 months
r13498 chris_y - /trunk/netsurf/amiga/dist/netsurf.readme
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Feb 28 12:54:34 2012
New Revision: 13498
URL: http://source.netsurf-browser.org?rev=13498&view=rev
Log:
Readme for 2.9
Modified:
trunk/netsurf/amiga/dist/netsurf.readme
Modified: trunk/netsurf/amiga/dist/netsurf.readme
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/netsurf.readme...
==============================================================================
--- trunk/netsurf/amiga/dist/netsurf.readme (original)
+++ trunk/netsurf/amiga/dist/netsurf.readme Tue Feb 28 12:54:34 2012
@@ -2,21 +2,11 @@
Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young)
Author: NetSurf contributors (OS4 port by Chris Young)
Type: comm/www
-Version: 3.0 development (SVN 10866)
+Version: 2.9
Architecture: ppc-amigaos >= 4.1.0
-Install manually with Installer script only -
-INTENTIONALLY NOT AVAILABLE VIA AMIUPDATE
-
-This is a preview release of NetSurf 3.0 for AmigaOS 4.
-It is beta software, which means it is unstable and missing
-features - use at your own risk!
-
-This is provided for testing purposes only. For the latest
-stable version, visit http://www.netsurf-browser.org
-
-Please report bugs to chris(a)unsatisfactorysoftware.co.uk,
-on the Amigans.net forums or on the NetSurf mailing list.
+NetSurf is a small, fast OS4 native web browser. It does not
+require AmiCygnix and has a fully native Reaction-based GUI.
See http://www.netsurf-browser.org for more information about NetSurf.
11 years, 7 months
r13496 tlsa - /trunk/netsurf/render/html_interaction.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Feb 28 06:54:00 2012
New Revision: 13496
URL: http://source.netsurf-browser.org?rev=13496&view=rev
Log:
Set/get drag type via API.
Modified:
trunk/netsurf/render/html_interaction.c
Modified: trunk/netsurf/render/html_interaction.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_interaction.c...
==============================================================================
--- trunk/netsurf/render/html_interaction.c (original)
+++ trunk/netsurf/render/html_interaction.c Tue Feb 28 06:54:00 2012
@@ -194,8 +194,9 @@
plot_font_style_t fstyle;
int scroll_mouse_x = 0, scroll_mouse_y = 0;
int padding_left, padding_right, padding_top, padding_bottom;
-
- if (bw->drag_type != DRAGGING_NONE && !mouse &&
+ browser_drag_type drag_type = browser_window_get_drag_type(bw);
+
+ if (drag_type != DRAGGING_NONE && !mouse &&
html->visible_select_menu != NULL) {
/* drag end: select menu */
form_select_mouse_drag_end(html->visible_select_menu,
@@ -449,7 +450,9 @@
text_box->byte_offset + idx);
if (selection_dragging(&html->sel)) {
- bw->drag_type = DRAGGING_SELECTION;
+ browser_window_set_drag_type(bw,
+ DRAGGING_SELECTION,
+ NULL);
status = messages_get("Selecting");
} else
status = content_get_status_message(h);
@@ -494,7 +497,9 @@
text_box->byte_offset + idx);
if (selection_dragging(&html->sel))
- bw->drag_type = DRAGGING_SELECTION;
+ browser_window_set_drag_type(bw,
+ DRAGGING_SELECTION,
+ NULL);
}
else if (mouse & BROWSER_MOUSE_PRESS_1)
selection_clear(&html->sel, true);
@@ -611,8 +616,9 @@
* operations ignored */
if (selection_dragging(&html->sel)) {
- bw->drag_type =
- DRAGGING_SELECTION;
+ browser_window_set_drag_type(bw,
+ DRAGGING_SELECTION,
+ NULL);
status =
messages_get("Selecting");
} else
11 years, 7 months
r13495 tlsa - /trunk/netsurf/render/html_interaction.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Feb 28 06:21:36 2012
New Revision: 13495
URL: http://source.netsurf-browser.org?rev=13495&view=rev
Log:
Check drag type via accessor.
Modified:
trunk/netsurf/render/html_interaction.c
Modified: trunk/netsurf/render/html_interaction.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_interaction.c...
==============================================================================
--- trunk/netsurf/render/html_interaction.c (original)
+++ trunk/netsurf/render/html_interaction.c Tue Feb 28 06:21:36 2012
@@ -95,8 +95,9 @@
browser_mouse_state mouse, int x, int y)
{
html_content *html = (html_content*) c;
-
- if (bw->drag_type == DRAGGING_SELECTION && !mouse) {
+ browser_drag_type drag_type = browser_window_get_drag_type(bw);
+
+ if (drag_type == DRAGGING_SELECTION && !mouse) {
int dir = -1;
size_t idx;
@@ -111,7 +112,7 @@
browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
}
- switch (bw->drag_type) {
+ switch (drag_type) {
case DRAGGING_SELECTION: {
struct box *box;
int dir = -1;
11 years, 7 months
r13494 tlsa - in /trunk/netsurf/desktop: browser.c browser.h
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Feb 28 06:20:49 2012
New Revision: 13494
URL: http://source.netsurf-browser.org?rev=13494&view=rev
Log:
Add browser_window drag type accessor.
Modified:
trunk/netsurf/desktop/browser.c
trunk/netsurf/desktop/browser.h
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=134...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Tue Feb 28 06:20:49 2012
@@ -405,6 +405,12 @@
gui_window_drag_start(top_bw->window, gtype, rect);
}
+}
+
+/* exported interface, documented in browser.h */
+browser_drag_type browser_window_get_drag_type(struct browser_window *bw)
+{
+ return bw->drag_type;
}
/* exported interface, documented in browser.h */
Modified: trunk/netsurf/desktop/browser.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=134...
==============================================================================
--- trunk/netsurf/desktop/browser.h (original)
+++ trunk/netsurf/desktop/browser.h Tue Feb 28 06:20:49 2012
@@ -410,8 +410,7 @@
void browser_window_set_scroll(struct browser_window *bw, int x, int y);
/*
- * Set the position of the current browser window with respect to the parent
- * browser window
+ * Set drag type for a browser window, and inform front end
*
* \param bw browser window to set the type of the current drag for
* \param type drag type
@@ -419,6 +418,14 @@
*/
void browser_window_set_drag_type(struct browser_window *bw,
browser_drag_type type, const struct rect *rect);
+
+/*
+ * Get type of any current drag for a browser window
+ *
+ * \param bw browser window to set the type of the current drag for
+ * \return drag type
+ */
+browser_drag_type browser_window_get_drag_type(struct browser_window *bw);
/*
* Get the root level browser window
11 years, 7 months