r11887 tlsa - in /trunk/netsurf/render: box.c box.h
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 2 12:27:41 2011
New Revision: 11887
URL: http://source.netsurf-browser.org?rev=11887&view=rev
Log:
Move style_owned to box flags.
Modified:
trunk/netsurf/render/box.c
trunk/netsurf/render/box.h
Modified: trunk/netsurf/render/box.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.c?rev=11887&r1...
==============================================================================
--- trunk/netsurf/render/box.c (original)
+++ trunk/netsurf/render/box.c Wed Mar 2 12:27:41 2011
@@ -85,7 +85,7 @@
static int
free_box_style(struct box *b)
{
- if (b->style_owned && b->style != NULL) {
+ if ((b->flags & STYLE_OWNED) && b->style != NULL) {
css_computed_style_destroy(b->style);
b->style = NULL;
}
@@ -132,9 +132,9 @@
box->type = BOX_INLINE;
box->flags = 0;
+ box->flags = style_owned ? box->flags | STYLE_OWNED : box->flags;
box->styles = styles;
box->style = style;
- box->style_owned = style_owned;
box->x = box->y = 0;
box->width = UNKNOWN_WIDTH;
box->height = 0;
Modified: trunk/netsurf/render/box.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.h?rev=11887&r1...
==============================================================================
--- trunk/netsurf/render/box.h (original)
+++ trunk/netsurf/render/box.h Wed Mar 2 12:27:41 2011
@@ -118,7 +118,8 @@
/** Type of a struct box. */
typedef enum {
- NEW_LINE = 1 << 0 /* first inline on a new line */
+ NEW_LINE = 1 << 0, /* first inline on a new line */
+ STYLE_OWNED = 1 << 1 /* style is owned by this box */
} box_flags;
/* Sides of a box */
@@ -149,8 +150,6 @@
* a box's 'styles' select results, except for implied boxes, where it
* is a pointer to an owned computed style. */
css_computed_style *style;
- /** Whether the style is owned by this box. */
- bool style_owned;
/** Coordinate of left padding edge relative to parent box, or relative
* to ancestor that contains this box in float_children for FLOAT_. */
12 years, 6 months
r11886 tlsa - in /trunk/netsurf/render: box.c box.h html_redraw.c layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Mar 2 11:50:51 2011
New Revision: 11886
URL: http://source.netsurf-browser.org?rev=11886&view=rev
Log:
Make box flags and move new line indicator to it.
Modified:
trunk/netsurf/render/box.c
trunk/netsurf/render/box.h
trunk/netsurf/render/html_redraw.c
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/box.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.c?rev=11886&r1...
==============================================================================
--- trunk/netsurf/render/box.c (original)
+++ trunk/netsurf/render/box.c Wed Mar 2 11:50:51 2011
@@ -131,6 +131,7 @@
talloc_set_destructor(box, free_box_style);
box->type = BOX_INLINE;
+ box->flags = 0;
box->styles = styles;
box->style = style;
box->style_owned = style_owned;
@@ -156,7 +157,6 @@
box->columns = 1;
box->rows = 1;
box->start_column = 0;
- box->inline_new_line = false;
box->printed = false;
box->next = NULL;
box->prev = NULL;
Modified: trunk/netsurf/render/box.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.h?rev=11886&r1...
==============================================================================
--- trunk/netsurf/render/box.h (original)
+++ trunk/netsurf/render/box.h Wed Mar 2 11:50:51 2011
@@ -115,6 +115,12 @@
BOX_INLINE_END, BOX_NONE
} box_type;
+
+/** Type of a struct box. */
+typedef enum {
+ NEW_LINE = 1 << 0 /* first inline on a new line */
+} box_flags;
+
/* Sides of a box */
enum box_side { TOP, RIGHT, BOTTOM, LEFT };
@@ -131,6 +137,9 @@
struct box {
/** Type of box. */
box_type type;
+
+ /** Box flags */
+ box_flags flags;
/** Computed styles for elements and their pseudo elements. NULL on
* non-element boxes. */
@@ -219,7 +228,6 @@
/** INLINE_END box corresponding to this INLINE box, or INLINE box
* corresponding to this INLINE_END box. */
struct box *inline_end;
- bool inline_new_line;
/** First float child box, or 0. Float boxes are in the tree twice, in
* this list for the block box which defines the area for floats, and
Modified: trunk/netsurf/render/html_redraw.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_redraw.c?rev=...
==============================================================================
--- trunk/netsurf/render/html_redraw.c (original)
+++ trunk/netsurf/render/html_redraw.c Wed Mar 2 11:50:51 2011
@@ -528,7 +528,7 @@
ib_b_right = ib->border[RIGHT].width * scale;
}
- if (ib->inline_new_line && ib != box) {
+ if ((ib->flags & NEW_LINE) && ib != box) {
/* inline element has wrapped, plot background
* and borders */
if (!html_redraw_inline_background(
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=11886...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Wed Mar 2 11:50:51 2011
@@ -2560,7 +2560,7 @@
}
for (d = first; d != b; d = d->next) {
- d->inline_new_line = false;
+ d->flags &= ~NEW_LINE;
if (d->type == BOX_INLINE_BLOCK &&
(css_computed_position(d->style) ==
@@ -2601,7 +2601,7 @@
}
}
- first->inline_new_line = true;
+ first->flags |= NEW_LINE;
assert(b != first || (move_y && 0 < used_height && (left || right)));
12 years, 6 months
r11885 swdr - /trunk/netsurf/cocoa/BrowserView.m
by netsurf＠semichrome.net
Author: swdr
Date: Wed Mar 2 09:05:26 2011
New Revision: 11885
URL: http://source.netsurf-browser.org?rev=11885&view=rev
Log:
More keyboard shortcuts: scroll down with space bar and go back with backspace key.
Modified:
trunk/netsurf/cocoa/BrowserView.m
Modified: trunk/netsurf/cocoa/BrowserView.m
URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserView.m?rev=1...
==============================================================================
--- trunk/netsurf/cocoa/BrowserView.m (original)
+++ trunk/netsurf/cocoa/BrowserView.m Wed Mar 2 09:05:26 2011
@@ -285,7 +285,10 @@
{
for (NSUInteger i = 0, length = [string length]; i < length; i++) {
unichar ch = [string characterAtIndex: i];
- browser_window_key_press( browser, ch );
+ if (!browser_window_key_press( browser, ch )) {
+ if (ch == ' ') [self scrollPageDown: self];
+ break;
+ }
}
}
@@ -315,7 +318,9 @@
- (void) deleteBackward: (id)sender;
{
- browser_window_key_press( browser, KEY_DELETE_LEFT );
+ if (!browser_window_key_press( browser, KEY_DELETE_LEFT )) {
+ [NSApp sendAction: @selector( goBack: ) to: nil from: self];
+ }
}
- (void) deleteForward: (id)sender;
12 years, 6 months
r11884 jmb - /trunk/netsurf/Makefile
by netsurf＠semichrome.net
Author: jmb
Date: Wed Mar 2 07:49:07 2011
New Revision: 11884
URL: http://source.netsurf-browser.org?rev=11884&view=rev
Log:
Fix install-gtk some more
Modified:
trunk/netsurf/Makefile
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=11884&r1=118...
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Wed Mar 2 07:49:07 2011
@@ -610,6 +610,7 @@
@cp -RL gtk/res/it $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/nl $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@# Install glade templates
+ gzip -9v < gtk/res/cookies.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)cookies.glade
gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade
gzip -9v < gtk/res/history.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)history.glade
gzip -9v < gtk/res/hotlist.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)hotlist.glade
12 years, 6 months
r11883 jmb - /trunk/netsurf/Makefile
by netsurf＠semichrome.net
Author: jmb
Date: Wed Mar 2 07:27:02 2011
New Revision: 11883
URL: http://source.netsurf-browser.org?rev=11883&view=rev
Log:
Fix install-gtk
Modified:
trunk/netsurf/Makefile
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=11883&r1=118...
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Wed Mar 2 07:27:02 2011
@@ -590,8 +590,9 @@
@cp -RL gtk/res/default.ico $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/favicon.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/gtkdefault.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/icons $(DESTDIR)$(NETSURF_GTK_RESOURCES)
+ @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/license $(DESTDIR)$(NETSURF_GTK_RESOURCES)
- @cp -RL gtk/res/languages $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/netsurf.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/netsurf-16x16.xpm $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@cp -RL gtk/res/quirks.css $(DESTDIR)$(NETSURF_GTK_RESOURCES)
@@ -611,6 +612,7 @@
@# Install glade templates
gzip -9v < gtk/res/downloads.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)downloads.glade
gzip -9v < gtk/res/history.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)history.glade
+ gzip -9v < gtk/res/hotlist.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)hotlist.glade
gzip -9v < gtk/res/login.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)login.glade
gzip -9v < gtk/res/netsurf.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)netsurf.glade
gzip -9v < gtk/res/options.glade > $(DESTDIR)$(NETSURF_GTK_RESOURCES)options.glade
12 years, 6 months
r11882 dsilvers - /trunk/netsurf/test-nsgtk
by netsurf＠semichrome.net
Author: dsilvers
Date: Wed Mar 2 06:10:06 2011
New Revision: 11882
URL: http://source.netsurf-browser.org?rev=11882&view=rev
Log:
Allow ./test-nsgtk --gdb [http://blahblahblah/]
Modified:
trunk/netsurf/test-nsgtk
Modified: trunk/netsurf/test-nsgtk
URL: http://source.netsurf-browser.org/trunk/netsurf/test-nsgtk?rev=11882&r1=1...
==============================================================================
--- trunk/netsurf/test-nsgtk (original)
+++ trunk/netsurf/test-nsgtk Wed Mar 2 06:10:06 2011
@@ -22,4 +22,17 @@
NETSURFRES=`dirname $0`/gtk/res/
export NETSURFRES
+
+if [ "x$1" = "x--gdb" ]; then
+ GDB="gdb --args -x"
+ echo
+ echo
+ echo "**********************************************************"
+ echo "Remember to type 'run' and press ENTER once gdb has loaded"
+ echo "**********************************************************"
+ echo
+ echo
+ shift
+fi
+
exec $GDB `dirname $0`/nsgtk -v "$@" 2>&1 | tee $LOG
12 years, 6 months
r11881 tlsa - /trunk/netsurf/render/layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Mar 1 16:14:02 2011
New Revision: 11881
URL: http://source.netsurf-browser.org?rev=11881&view=rev
Log:
When wrapping text, don't duplicate strings. Special case for text inside textareas, since they require it.
Modified:
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=11881...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Tue Mar 1 16:14:02 2011
@@ -1922,6 +1922,7 @@
struct box *c2;
const struct font_functions *font_func = content->data.html.font_func;
+ /* Find the width of a space, using fstyle, if currently unknown */
if (split_box->space == 0 || split_box->space == UNKNOWN_WIDTH) {
font_func->font_width(fstyle, " ", 1, &split_box->space);
}
@@ -1933,11 +1934,19 @@
return false;
c2->clone = 1;
- /* Add copy of the split text to c2 */
- c2->text = talloc_strndup(content, split_box->text + new_length + 1,
- split_box->length - (new_length + 1));
- if (!c2->text)
- return false;
+ /* Set remaining text in c2 */
+ if (split_box->parent->parent->gadget != NULL) {
+ /* Inside a form text input / textarea, special case */
+ /* TODO: Move text inputs to core textarea widget and remove
+ * this */
+ c2->text = talloc_strndup(content,
+ split_box->text + new_length + 1,
+ split_box->length - (new_length + 1));
+ if (!c2->text)
+ return false;
+ } else {
+ c2->text += new_length + 1;
+ }
/* Set c2 according to the remaining text */
c2->width -= new_width + space_width;
12 years, 6 months
r11880 tlsa - /trunk/netsurf/render/layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Mar 1 15:48:38 2011
New Revision: 11880
URL: http://source.netsurf-browser.org?rev=11880&view=rev
Log:
More useful assert and remove box_dump call.
Modified:
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=11880...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Tue Mar 1 15:48:38 2011
@@ -4603,14 +4603,8 @@
{
struct box *child;
- if ((box->width == UNKNOWN_WIDTH) || (box->height == AUTO) /*||
- box->width < 0 || box->height < 0*/) {
- LOG(("%p has bad width or height", box));
- /*while (box->parent)
- box = box->parent;
- box_dump(box, 0);*/
- assert(0);
- }
+ assert((box->width != UNKNOWN_WIDTH) && (box->height != AUTO));
+ /* assert((box->width >= 0) && (box->height >= 0)); */
/* Initialise box's descendant box to border edge box */
layout_get_box_bbox(box, &box->descendant_x0, &box->descendant_y0,
12 years, 6 months
r11879 chris_y - /trunk/netsurf/amiga/context_menu.c
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Mar 1 14:27:49 2011
New Revision: 11879
URL: http://source.netsurf-browser.org?rev=11879&view=rev
Log:
Don't trap RMB over gadgets if those gadgets are disabled
Modified:
trunk/netsurf/amiga/context_menu.c
Modified: trunk/netsurf/amiga/context_menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.c?rev=...
==============================================================================
--- trunk/netsurf/amiga/context_menu.c (original)
+++ trunk/netsurf/amiga/context_menu.c Tue Mar 1 14:27:49 2011
@@ -130,11 +130,13 @@
if((option_kiosk_mode == false) && (trap == FALSE) &&
(gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL))
{
- if(ami_gadget_hit(gwin->objects[GID_BACK],
+ if(browser_window_back_available(gwin->bw) &&
+ ami_gadget_hit(gwin->objects[GID_BACK],
gwin->win->MouseX, gwin->win->MouseY))
trap = TRUE;
- if(ami_gadget_hit(gwin->objects[GID_FORWARD],
+ if(browser_window_forward_available(gwin->bw) &&
+ ami_gadget_hit(gwin->objects[GID_FORWARD],
gwin->win->MouseX, gwin->win->MouseY))
trap = TRUE;
}
@@ -169,7 +171,6 @@
TAG_DONE);
if(gwin->bw && gwin->bw->history &&
- browser_window_back_available(gwin->bw) &&
ami_gadget_hit(gwin->objects[GID_BACK],
gwin->win->MouseX, gwin->win->MouseY))
{
@@ -193,7 +194,6 @@
menuhascontent = true;
}
else if(gwin->bw && gwin->bw->history &&
- browser_window_forward_available(gwin->bw) &&
ami_gadget_hit(gwin->objects[GID_FORWARD],
gwin->win->MouseX, gwin->win->MouseY))
{
12 years, 6 months
r11878 chris_y - /trunk/netsurf/amiga/pkg/makepackage
by netsurf＠semichrome.net
Author: chris_y
Date: Tue Mar 1 14:16:33 2011
New Revision: 11878
URL: http://source.netsurf-browser.org?rev=11878&view=rev
Log:
Copy our updated working libpng.so; this fixes the cyan boxes on Wikipedia
Modified:
trunk/netsurf/amiga/pkg/makepackage
Modified: trunk/netsurf/amiga/pkg/makepackage
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/pkg/makepackage?rev...
==============================================================================
--- trunk/netsurf/amiga/pkg/makepackage (original)
+++ trunk/netsurf/amiga/pkg/makepackage Tue Mar 1 14:16:33 2011
@@ -24,5 +24,5 @@
copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs
; libs:css.library libs:wapcaplet.library
makedir ram:NetSurf/SObjs
-copy sobjs:libjpeg.so.8 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libvpx.so.0.9.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 ram:NetSurf/SObjs clone
+copy sobjs:libjpeg.so.8 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libvpx.so.0.9.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so ram:NetSurf/SObjs clone
;sobjs:libhpdf-2.2.0.so.0.0
12 years, 6 months