2003-06-30 16:44:03 +04:00
|
|
|
/*
|
2005-01-11 00:35:34 +03:00
|
|
|
* Copyright 2005 Richard Wilson <info@tinct.net>
|
2006-01-16 01:25:40 +03:00
|
|
|
* Copyright 2006 James Bursa <bursa@users.sourceforge.net>
|
2008-03-09 22:39:17 +03:00
|
|
|
* Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
|
2003-06-30 16:44:03 +04:00
|
|
|
* Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
|
2007-08-08 20:16:03 +04:00
|
|
|
*
|
|
|
|
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
|
|
|
*
|
|
|
|
* NetSurf is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; version 2 of the License.
|
|
|
|
*
|
|
|
|
* NetSurf is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
2002-05-04 23:57:18 +04:00
|
|
|
*/
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
/** \file
|
|
|
|
* HTML layout (implementation).
|
|
|
|
*
|
2005-07-02 22:17:51 +04:00
|
|
|
* Layout is carried out in two stages:
|
|
|
|
*
|
|
|
|
* - calculation of minimum / maximum box widths
|
|
|
|
* - layout (position and dimensions)
|
|
|
|
*
|
|
|
|
* In most cases the functions for the two stages are a corresponding pair
|
|
|
|
* layout_minmax_X() and layout_X().
|
2004-02-11 20:15:36 +03:00
|
|
|
*/
|
|
|
|
|
2005-01-13 23:29:24 +03:00
|
|
|
#define _GNU_SOURCE /* for strndup */
|
2002-05-04 23:57:18 +04:00
|
|
|
#include <assert.h>
|
2003-07-18 21:08:39 +04:00
|
|
|
#include <limits.h>
|
2004-02-02 01:42:40 +03:00
|
|
|
#include <stdbool.h>
|
2002-05-04 23:57:18 +04:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2008-07-29 00:32:51 +04:00
|
|
|
#include <math.h>
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "css/css.h"
|
2009-07-24 03:05:34 +04:00
|
|
|
#include "css/utils.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "content/content.h"
|
|
|
|
#include "desktop/gui.h"
|
|
|
|
#include "desktop/options.h"
|
2009-08-14 14:37:33 +04:00
|
|
|
#include "desktop/scroll.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "render/box.h"
|
|
|
|
#include "render/font.h"
|
2008-02-11 20:53:00 +03:00
|
|
|
#include "render/form.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "render/layout.h"
|
2009-07-24 03:05:34 +04:00
|
|
|
#include "render/table.h"
|
2008-02-03 17:29:07 +03:00
|
|
|
#define NDEBUG
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "utils/log.h"
|
2009-05-28 14:39:53 +04:00
|
|
|
#undef NDEBUG
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "utils/talloc.h"
|
|
|
|
#include "utils/utils.h"
|
2002-08-06 00:34:45 +04:00
|
|
|
|
2004-02-02 03:22:59 +03:00
|
|
|
|
|
|
|
#define AUTO INT_MIN
|
|
|
|
|
2002-05-04 23:57:18 +04:00
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
static bool layout_block_context(struct box *block, int viewport_height,
|
|
|
|
struct content *content);
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
static void layout_minmax_block(struct box *block,
|
|
|
|
const struct font_functions *font_func);
|
2006-09-17 01:48:28 +04:00
|
|
|
static bool layout_block_object(struct box *block);
|
2009-05-07 20:22:38 +04:00
|
|
|
static void layout_block_find_dimensions(int available_width,
|
|
|
|
int viewport_height, int lm, int rm,
|
2009-01-26 03:15:25 +03:00
|
|
|
struct box *box);
|
2008-10-13 23:22:16 +04:00
|
|
|
static bool layout_apply_minmax_height(struct box *box, struct box *container);
|
2007-03-25 03:47:44 +04:00
|
|
|
static void layout_block_add_scrollbar(struct box *box, int which);
|
2009-08-31 14:39:32 +04:00
|
|
|
static int layout_solve_width(struct box *box, int available_width, int width,
|
2009-08-21 21:05:22 +04:00
|
|
|
int lm, int rm, int max_width, int min_width);
|
2004-02-11 20:15:36 +03:00
|
|
|
static void layout_float_find_dimensions(int available_width,
|
2009-07-24 03:05:34 +04:00
|
|
|
const css_computed_style *style, struct box *box);
|
2009-05-07 20:22:38 +04:00
|
|
|
static void layout_find_dimensions(int available_width, int viewport_height,
|
2009-07-24 03:05:34 +04:00
|
|
|
struct box *box, const css_computed_style *style,
|
2008-09-28 00:19:46 +04:00
|
|
|
int *width, int *height, int *max_width, int *min_width,
|
2009-07-24 03:05:34 +04:00
|
|
|
int margin[4], int padding[4], struct box_border border[4]);
|
2009-05-06 15:16:06 +04:00
|
|
|
static void layout_tweak_form_dimensions(struct box *box, bool percentage,
|
|
|
|
int available_width, bool setwidth, int *dimension);
|
2009-08-02 23:19:43 +04:00
|
|
|
static int layout_clear(struct box *fl, enum css_clear_e clear);
|
2004-02-11 20:15:36 +03:00
|
|
|
static void find_sides(struct box *fl, int y0, int y1,
|
|
|
|
int *x0, int *x1, struct box **left, struct box **right);
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
static void layout_minmax_inline_container(struct box *inline_container,
|
|
|
|
const struct font_functions *font_func);
|
2009-07-24 03:05:34 +04:00
|
|
|
static int line_height(const css_computed_style *style);
|
2006-09-10 17:27:08 +04:00
|
|
|
static bool layout_line(struct box *first, int *width, int *y,
|
2004-06-03 01:21:13 +04:00
|
|
|
int cx, int cy, struct box *cont, bool indent,
|
2006-08-13 05:00:22 +04:00
|
|
|
bool has_text_children,
|
2005-04-09 13:47:37 +04:00
|
|
|
struct content *content, struct box **next_box);
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
static struct box *layout_minmax_line(struct box *first, int *min, int *max,
|
|
|
|
const struct font_functions *font_func);
|
2009-07-24 03:05:34 +04:00
|
|
|
static int layout_text_indent(const css_computed_style *style, int width);
|
2005-04-09 13:47:37 +04:00
|
|
|
static bool layout_float(struct box *b, int width, struct content *content);
|
2004-04-22 02:27:49 +04:00
|
|
|
static void place_float_below(struct box *c, int width, int cx, int y,
|
2004-02-11 20:15:36 +03:00
|
|
|
struct box *cont);
|
2005-04-09 13:47:37 +04:00
|
|
|
static bool layout_table(struct box *box, int available_width,
|
|
|
|
struct content *content);
|
2005-01-11 00:35:34 +03:00
|
|
|
static void layout_move_children(struct box *box, int x, int y);
|
2009-07-24 04:08:23 +04:00
|
|
|
static void calculate_mbp_width(const css_computed_style *style,
|
2009-07-24 03:05:34 +04:00
|
|
|
unsigned int side, bool margin, bool border, bool padding,
|
2005-07-03 03:37:41 +04:00
|
|
|
int *fixed, float *frac);
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
static void layout_lists(struct box *box,
|
|
|
|
const struct font_functions *font_func);
|
2008-09-21 23:18:27 +04:00
|
|
|
static void layout_position_relative(struct box *root, struct box *fp,
|
|
|
|
int fx, int fy);
|
2005-07-31 03:32:48 +04:00
|
|
|
static void layout_compute_relative_offset(struct box *box, int *x, int *y);
|
2006-10-11 02:00:10 +04:00
|
|
|
static bool layout_position_absolute(struct box *box,
|
|
|
|
struct box *containing_block,
|
|
|
|
int cx, int cy,
|
|
|
|
struct content *content);
|
|
|
|
static bool layout_absolute(struct box *box, struct box *containing_block,
|
|
|
|
int cx, int cy,
|
2006-06-26 08:52:34 +04:00
|
|
|
struct content *content);
|
|
|
|
static void layout_compute_offsets(struct box *box,
|
|
|
|
struct box *containing_block,
|
|
|
|
int *top, int *right, int *bottom, int *left);
|
2004-07-17 05:36:21 +04:00
|
|
|
|
2002-05-04 23:57:18 +04:00
|
|
|
|
|
|
|
/**
|
2004-02-02 03:22:59 +03:00
|
|
|
* Calculate positions of boxes in a document.
|
2002-06-19 01:24:21 +04:00
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param doc content of type CONTENT_HTML
|
2005-07-02 22:17:51 +04:00
|
|
|
* \param width available width
|
|
|
|
* \param height available height
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2002-06-19 01:24:21 +04:00
|
|
|
*/
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
bool layout_document(struct content *content, int width, int height)
|
2002-05-28 03:21:11 +04:00
|
|
|
{
|
2004-08-01 17:08:19 +04:00
|
|
|
bool ret;
|
2005-04-09 13:47:37 +04:00
|
|
|
struct box *doc = content->data.html.layout;
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
const struct font_functions *font_func = content->data.html.font_func;
|
2005-04-09 13:47:37 +04:00
|
|
|
|
|
|
|
assert(content->type == CONTENT_HTML);
|
2004-08-01 17:08:19 +04:00
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(doc, font_func);
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_block_find_dimensions(width, height, 0, 0, doc);
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->x = doc->margin[LEFT] + doc->border[LEFT].width;
|
|
|
|
doc->y = doc->margin[TOP] + doc->border[TOP].width;
|
2009-07-24 04:08:23 +04:00
|
|
|
width -= doc->margin[LEFT] + doc->border[LEFT].width +
|
|
|
|
doc->padding[LEFT] + doc->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->border[RIGHT].width + doc->margin[RIGHT];
|
2005-07-02 22:17:51 +04:00
|
|
|
if (width < 0)
|
|
|
|
width = 0;
|
2004-04-12 04:00:47 +04:00
|
|
|
doc->width = width;
|
2004-08-01 17:08:19 +04:00
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
ret = layout_block_context(doc, height, content);
|
2004-08-01 17:08:19 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* make <html> and <body> fill available height */
|
|
|
|
if (doc->y + doc->padding[TOP] + doc->height + doc->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->border[BOTTOM].width + doc->margin[BOTTOM] <
|
2005-07-02 22:17:51 +04:00
|
|
|
height) {
|
|
|
|
doc->height = height - (doc->y + doc->padding[TOP] +
|
2009-07-24 04:08:23 +04:00
|
|
|
doc->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->border[BOTTOM].width +
|
2005-07-02 22:17:51 +04:00
|
|
|
doc->margin[BOTTOM]);
|
|
|
|
if (doc->children)
|
|
|
|
doc->children->height = doc->height -
|
|
|
|
(doc->children->margin[TOP] +
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->children->border[TOP].width +
|
2005-07-02 22:17:51 +04:00
|
|
|
doc->children->padding[TOP] +
|
|
|
|
doc->children->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
doc->children->border[BOTTOM].width +
|
2005-07-02 22:17:51 +04:00
|
|
|
doc->children->margin[BOTTOM]);
|
|
|
|
}
|
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_lists(doc, font_func);
|
2006-10-11 02:00:10 +04:00
|
|
|
layout_position_absolute(doc, doc, 0, 0, content);
|
2008-09-21 23:18:27 +04:00
|
|
|
layout_position_relative(doc, doc, 0, 0);
|
2005-07-31 15:21:46 +04:00
|
|
|
|
2004-08-01 17:08:19 +04:00
|
|
|
layout_calculate_descendant_bboxes(doc);
|
|
|
|
|
|
|
|
return ret;
|
2002-05-28 03:21:11 +04:00
|
|
|
}
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2004-02-02 03:22:59 +03:00
|
|
|
/**
|
2004-04-12 04:00:47 +04:00
|
|
|
* Layout a block formatting context.
|
2004-02-02 03:22:59 +03:00
|
|
|
*
|
2009-05-07 20:22:38 +04:00
|
|
|
* \param block BLOCK, INLINE_BLOCK, or TABLE_CELL to layout
|
|
|
|
* \param viewport_height Height of viewport in pixels or -ve if unknown
|
|
|
|
* \param content Memory pool for any new boxes
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2002-06-19 01:24:21 +04:00
|
|
|
*
|
2004-04-12 04:00:47 +04:00
|
|
|
* This function carries out layout of a block and its children, as described
|
|
|
|
* in CSS 2.1 9.4.1.
|
2002-06-19 01:24:21 +04:00
|
|
|
*/
|
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
bool layout_block_context(struct box *block, int viewport_height,
|
|
|
|
struct content *content)
|
2002-05-04 23:57:18 +04:00
|
|
|
{
|
2004-04-12 04:00:47 +04:00
|
|
|
struct box *box;
|
2006-09-17 01:48:28 +04:00
|
|
|
int cx, cy; /**< current coordinates */
|
2004-04-12 04:00:47 +04:00
|
|
|
int max_pos_margin = 0;
|
|
|
|
int max_neg_margin = 0;
|
2006-10-09 02:46:25 +04:00
|
|
|
int y = 0;
|
2009-01-26 03:15:25 +03:00
|
|
|
int lm, rm;
|
2004-04-12 04:00:47 +04:00
|
|
|
struct box *margin_box;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed gadget_size;
|
|
|
|
css_unit gadget_unit; /* Checkbox / radio buttons */
|
2004-04-12 04:00:47 +04:00
|
|
|
|
|
|
|
assert(block->type == BOX_BLOCK ||
|
|
|
|
block->type == BOX_INLINE_BLOCK ||
|
2006-11-05 15:58:24 +03:00
|
|
|
block->type == BOX_TABLE_CELL);
|
|
|
|
assert(block->width != UNKNOWN_WIDTH);
|
|
|
|
assert(block->width != AUTO);
|
2004-04-12 04:00:47 +04:00
|
|
|
|
2008-03-21 03:14:01 +03:00
|
|
|
#ifdef riscos
|
|
|
|
/* Why the ifdef? You don't really want to know. If you do, read on.
|
|
|
|
*
|
|
|
|
* So, the only way into this function is through the rest of the
|
|
|
|
* layout code. The only external entry points into the layout code
|
|
|
|
* are layout_document and layout_inline_container. The latter is only
|
|
|
|
* ever called when editing text in form textareas, so we can ignore it
|
|
|
|
* for the purposes of this discussion.
|
|
|
|
*
|
|
|
|
* layout_document is only ever called from html_reformat, which itself
|
2008-04-20 19:49:25 +04:00
|
|
|
* is only ever called from content_reformat. content_reformat locks
|
2008-03-21 03:14:01 +03:00
|
|
|
* the content structure while reformatting is taking place.
|
|
|
|
*
|
|
|
|
* If we call gui_multitask here, then any pending UI events will get
|
|
|
|
* processed. This includes window expose/redraw events. Upon receipt
|
2008-04-20 19:49:25 +04:00
|
|
|
* of these events, the UI code will call content_redraw for the
|
2008-03-21 03:14:01 +03:00
|
|
|
* window's content. content_redraw will return immediately if the
|
|
|
|
* content is currently locked (which it will be if we're still doing
|
|
|
|
* layout).
|
|
|
|
*
|
|
|
|
* On RISC OS, this isn't a problem as the UI code's window redraw
|
|
|
|
* handler explicitly checks for locked contents and does nothing
|
|
|
|
* in that case. This effectively means that the window contents
|
|
|
|
* aren't updated, so whatever's already in the window will remain
|
|
|
|
* on-screen. On GTK, however, redraw is not direct-to-screen, but
|
2008-04-20 19:49:25 +04:00
|
|
|
* to a pixmap which is then blitted to screen. If we perform no
|
|
|
|
* redraw, then the pixmap will be flat white. When this is
|
2008-03-21 03:14:01 +03:00
|
|
|
* subsequently blitted, the user gets greeted with an unsightly
|
|
|
|
* flicker to white (and then back to the document when the content
|
|
|
|
* is redrawn when unlocked).
|
|
|
|
*
|
|
|
|
* In the long term, this upcall into the GUI event dispatch code needs
|
|
|
|
* to disappear. It needs to remain for the timebeing, however, as
|
|
|
|
* document reflow can be fairly time consuming and we need to remain
|
|
|
|
* responsive to user input.
|
|
|
|
*/
|
2004-04-14 03:20:23 +04:00
|
|
|
gui_multitask();
|
2008-03-21 03:14:01 +03:00
|
|
|
#endif
|
2004-04-14 03:20:23 +04:00
|
|
|
|
2009-05-30 16:22:22 +04:00
|
|
|
block->float_children = NULL;
|
2008-04-23 22:49:11 +04:00
|
|
|
block->clear_level = 0;
|
2005-11-06 14:00:33 +03:00
|
|
|
|
2006-09-17 01:48:28 +04:00
|
|
|
/* special case if the block contains an object */
|
2006-12-27 00:51:08 +03:00
|
|
|
if (block->object) {
|
|
|
|
if (!layout_block_object(block))
|
|
|
|
return false;
|
|
|
|
if (block->height == AUTO) {
|
|
|
|
if (block->object->width)
|
|
|
|
block->height = block->object->height *
|
|
|
|
(float) block->width /
|
|
|
|
block->object->width;
|
|
|
|
else
|
|
|
|
block->height = block->object->height;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2005-10-31 00:23:24 +03:00
|
|
|
|
2008-09-21 03:25:37 +04:00
|
|
|
/* special case if the block contains an radio button or checkbox */
|
|
|
|
if (block->gadget && (block->gadget->type == GADGET_RADIO ||
|
|
|
|
block->gadget->type == GADGET_CHECKBOX)) {
|
|
|
|
/* form checkbox or radio button
|
|
|
|
* if width or height is AUTO, set it to 1em */
|
2009-07-24 03:05:34 +04:00
|
|
|
gadget_unit = CSS_UNIT_EM;
|
|
|
|
gadget_size = INTTOFIX(1);
|
2008-09-21 03:25:37 +04:00
|
|
|
if (block->height == AUTO)
|
2009-07-24 04:08:23 +04:00
|
|
|
block->height = FIXTOINT(nscss_len2px(gadget_size,
|
2009-07-24 03:05:34 +04:00
|
|
|
gadget_unit, block->style));
|
2008-09-21 03:25:37 +04:00
|
|
|
}
|
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
box = margin_box = block->children;
|
2006-09-17 01:48:28 +04:00
|
|
|
/* set current coordinates to top-left of the block */
|
2005-07-24 18:29:32 +04:00
|
|
|
cx = 0;
|
2008-09-23 23:38:16 +04:00
|
|
|
y = cy = block->padding[TOP];
|
2004-04-12 04:00:47 +04:00
|
|
|
if (box)
|
|
|
|
box->y = block->padding[TOP];
|
|
|
|
|
2006-09-17 01:48:28 +04:00
|
|
|
/* Step through the descendants of the block in depth-first order, but
|
|
|
|
* not into the children of boxes which aren't blocks. For example, if
|
|
|
|
* the tree passed to this function looks like this (box->type shown):
|
|
|
|
*
|
|
|
|
* block -> BOX_BLOCK
|
|
|
|
* BOX_BLOCK * (1)
|
|
|
|
* BOX_INLINE_CONTAINER * (2)
|
|
|
|
* BOX_INLINE
|
|
|
|
* BOX_TEXT
|
|
|
|
* ...
|
|
|
|
* BOX_BLOCK * (3)
|
|
|
|
* BOX_TABLE * (4)
|
|
|
|
* BOX_TABLE_ROW
|
|
|
|
* BOX_TABLE_CELL
|
|
|
|
* ...
|
|
|
|
* BOX_TABLE_CELL
|
|
|
|
* ...
|
|
|
|
* BOX_BLOCK * (5)
|
|
|
|
* BOX_INLINE_CONTAINER * (6)
|
|
|
|
* BOX_TEXT
|
|
|
|
* ...
|
|
|
|
* then the while loop will visit each box marked with *, setting box
|
|
|
|
* to each in the order shown. */
|
2004-04-12 04:00:47 +04:00
|
|
|
while (box) {
|
|
|
|
assert(box->type == BOX_BLOCK || box->type == BOX_TABLE ||
|
2006-11-05 15:58:24 +03:00
|
|
|
box->type == BOX_INLINE_CONTAINER);
|
2004-04-12 04:00:47 +04:00
|
|
|
assert(margin_box);
|
|
|
|
|
|
|
|
/* Tables are laid out before being positioned, because the
|
|
|
|
* position depends on the width which is calculated in
|
|
|
|
* table layout. Blocks and inline containers are positioned
|
|
|
|
* before being laid out, because width is not dependent on
|
|
|
|
* content, and the position is required during layout for
|
|
|
|
* correct handling of floats.
|
|
|
|
*/
|
|
|
|
|
2006-10-10 01:34:34 +04:00
|
|
|
if (box->style &&
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_position(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_FIXED)) {
|
2006-10-09 02:46:25 +04:00
|
|
|
box->x = box->parent->padding[LEFT];
|
2008-06-06 18:54:19 +04:00
|
|
|
/* absolute positioned; this element will establish
|
|
|
|
* its own block context when it gets laid out later,
|
|
|
|
* so no need to look at its children now. */
|
2006-10-09 02:46:25 +04:00
|
|
|
goto advance_to_next_box;
|
2009-01-19 13:17:44 +03:00
|
|
|
}
|
2006-10-09 02:46:25 +04:00
|
|
|
|
2009-01-22 18:39:06 +03:00
|
|
|
/* Clearance. */
|
|
|
|
y = 0;
|
2009-07-24 04:08:23 +04:00
|
|
|
if (box->style && css_computed_clear(box->style) !=
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_CLEAR_NONE)
|
2009-01-22 18:39:06 +03:00
|
|
|
y = layout_clear(block->float_children,
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_clear(box->style));
|
2009-01-30 00:23:48 +03:00
|
|
|
|
|
|
|
/* Get top margin */
|
2009-01-30 01:57:32 +03:00
|
|
|
if (box->style) {
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(box->parent->width,
|
|
|
|
viewport_height, box, box->style,
|
|
|
|
NULL, NULL, NULL, NULL,
|
2009-01-30 01:57:32 +03:00
|
|
|
box->margin, NULL, NULL);
|
2009-01-30 00:23:48 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (max_pos_margin < box->margin[TOP])
|
|
|
|
max_pos_margin = box->margin[TOP];
|
|
|
|
else if (max_neg_margin < -box->margin[TOP])
|
|
|
|
max_neg_margin = -box->margin[TOP];
|
|
|
|
|
|
|
|
/* no /required/ margins if box doesn't establish a new block
|
2009-01-26 03:15:25 +03:00
|
|
|
* formatting context */
|
|
|
|
lm = rm = 0;
|
2009-01-22 18:39:06 +03:00
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
if (box->type == BOX_BLOCK || box->object) {
|
2009-01-19 13:17:44 +03:00
|
|
|
if (!box->object && box->style &&
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_overflow(box->style) !=
|
2009-01-19 13:17:44 +03:00
|
|
|
CSS_OVERFLOW_VISIBLE) {
|
|
|
|
/* box establishes new block formatting context
|
|
|
|
* so available width may be diminished due to
|
|
|
|
* floats. */
|
2009-01-22 18:39:06 +03:00
|
|
|
int x0, x1, top;
|
2009-01-19 13:17:44 +03:00
|
|
|
struct box *left, *right;
|
2009-01-22 18:39:06 +03:00
|
|
|
top = cy > y ? cy : y;
|
2009-01-30 00:23:48 +03:00
|
|
|
top += max_pos_margin - max_neg_margin;
|
2009-01-26 19:32:19 +03:00
|
|
|
x0 = cx;
|
2009-01-26 03:15:25 +03:00
|
|
|
x1 = cx + box->parent->width -
|
2009-01-26 19:32:19 +03:00
|
|
|
box->parent->padding[LEFT] -
|
2009-01-26 03:15:25 +03:00
|
|
|
box->parent->padding[RIGHT];
|
2009-01-22 18:39:06 +03:00
|
|
|
find_sides(block->float_children, top, top,
|
2009-01-19 13:17:44 +03:00
|
|
|
&x0, &x1, &left, &right);
|
2009-01-26 03:15:25 +03:00
|
|
|
/* calculate min required left & right margins
|
|
|
|
* needed to avoid floats */
|
2009-01-26 19:32:19 +03:00
|
|
|
lm = x0 - cx;
|
|
|
|
rm = cx + box->parent->width -
|
|
|
|
box->parent->padding[LEFT] -
|
|
|
|
box->parent->padding[RIGHT] -
|
|
|
|
x1;
|
2009-01-19 13:17:44 +03:00
|
|
|
}
|
2009-01-26 03:15:25 +03:00
|
|
|
layout_block_find_dimensions(box->parent->width,
|
2009-05-07 20:22:38 +04:00
|
|
|
viewport_height, lm, rm, box);
|
2009-06-24 19:43:24 +04:00
|
|
|
if (box->type == BOX_BLOCK) {
|
|
|
|
layout_block_add_scrollbar(box, RIGHT);
|
|
|
|
layout_block_add_scrollbar(box, BOTTOM);
|
|
|
|
}
|
2007-03-25 03:47:44 +04:00
|
|
|
} else if (box->type == BOX_TABLE) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed width = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
wtype = css_computed_width(box->style, &width, &unit);
|
|
|
|
|
|
|
|
if (wtype == CSS_WIDTH_AUTO) {
|
2009-01-26 03:15:25 +03:00
|
|
|
/* max available width may be diminished due to
|
|
|
|
* floats. */
|
2009-01-22 18:39:06 +03:00
|
|
|
int x0, x1, top;
|
2009-01-22 02:01:59 +03:00
|
|
|
struct box *left, *right;
|
2009-01-22 18:39:06 +03:00
|
|
|
top = cy > y ? cy : y;
|
2009-01-30 00:23:48 +03:00
|
|
|
top += max_pos_margin - max_neg_margin;
|
2009-01-22 02:01:59 +03:00
|
|
|
x0 = cx;
|
2009-01-26 19:32:19 +03:00
|
|
|
x1 = cx + box->parent->width -
|
|
|
|
box->parent->padding[LEFT] -
|
|
|
|
box->parent->padding[RIGHT];
|
2009-01-22 18:39:06 +03:00
|
|
|
find_sides(block->float_children, top, top,
|
2009-01-22 02:01:59 +03:00
|
|
|
&x0, &x1, &left, &right);
|
2009-01-26 03:15:25 +03:00
|
|
|
/* calculate min required left & right margins
|
|
|
|
* needed to avoid floats */
|
2009-01-26 19:32:19 +03:00
|
|
|
lm = x0 - cx;
|
|
|
|
rm = cx + box->parent->width -
|
|
|
|
box->parent->padding[LEFT] -
|
|
|
|
box->parent->padding[RIGHT] -
|
|
|
|
x1;
|
2009-01-22 02:01:59 +03:00
|
|
|
}
|
2009-01-26 03:15:25 +03:00
|
|
|
if (!layout_table(box, box->parent->width - lm - rm,
|
|
|
|
content))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2009-08-21 21:05:22 +04:00
|
|
|
layout_solve_width(box, box->parent->width, box->width,
|
|
|
|
lm, rm, -1, -1);
|
2006-11-05 15:58:24 +03:00
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
/* Position box: horizontal. */
|
|
|
|
box->x = box->parent->padding[LEFT] + box->margin[LEFT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[LEFT].width;
|
2004-04-12 04:00:47 +04:00
|
|
|
cx += box->x;
|
|
|
|
|
2009-01-30 00:23:48 +03:00
|
|
|
/* Position box: vertical. */
|
2004-04-12 04:00:47 +04:00
|
|
|
if (box->type != BOX_BLOCK || y ||
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[TOP].width || box->padding[TOP]) {
|
2004-04-12 04:00:47 +04:00
|
|
|
margin_box->y += max_pos_margin - max_neg_margin;
|
|
|
|
cy += max_pos_margin - max_neg_margin;
|
|
|
|
max_pos_margin = max_neg_margin = 0;
|
|
|
|
margin_box = 0;
|
2009-07-24 03:05:34 +04:00
|
|
|
box->y += box->border[TOP].width;
|
|
|
|
cy += box->border[TOP].width;
|
2004-04-12 04:00:47 +04:00
|
|
|
if (cy < y) {
|
|
|
|
box->y += y - cy;
|
|
|
|
cy = y;
|
|
|
|
}
|
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2008-06-06 18:54:19 +04:00
|
|
|
/* Unless the box has an overflow style of visible, the box
|
|
|
|
* establishes a new block context. */
|
2008-08-24 22:55:55 +04:00
|
|
|
if (box->type == BOX_BLOCK && box->style &&
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_overflow(box->style) !=
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_OVERFLOW_VISIBLE) {
|
2008-06-30 19:53:28 +04:00
|
|
|
cy += max_pos_margin - max_neg_margin;
|
|
|
|
box->y += max_pos_margin - max_neg_margin;
|
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_block_context(box, viewport_height, content);
|
2008-06-06 18:54:19 +04:00
|
|
|
|
|
|
|
if (box->type == BOX_BLOCK || box->object)
|
|
|
|
cy += box->padding[TOP];
|
|
|
|
|
|
|
|
if (box->type == BOX_BLOCK && box->height == AUTO) {
|
|
|
|
box->height = 0;
|
|
|
|
layout_block_add_scrollbar(box, BOTTOM);
|
|
|
|
}
|
|
|
|
|
2009-01-26 19:32:19 +03:00
|
|
|
cx -= box->x;
|
2008-06-06 18:54:19 +04:00
|
|
|
cy += box->height + box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2008-06-06 18:54:19 +04:00
|
|
|
max_pos_margin = max_neg_margin = 0;
|
|
|
|
if (max_pos_margin < box->margin[BOTTOM])
|
|
|
|
max_pos_margin = box->margin[BOTTOM];
|
|
|
|
else if (max_neg_margin < -box->margin[BOTTOM])
|
|
|
|
max_neg_margin = -box->margin[BOTTOM];
|
|
|
|
y = box->y + box->padding[TOP] + box->height +
|
|
|
|
box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2008-06-06 18:54:19 +04:00
|
|
|
/* Skip children, because they are done in the new
|
|
|
|
* block context */
|
|
|
|
goto advance_to_next_box;
|
|
|
|
}
|
|
|
|
|
2005-08-07 03:34:30 +04:00
|
|
|
LOG(("box %p, cx %i, cy %i", box, cx, cy));
|
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
/* Layout (except tables). */
|
2005-10-31 00:23:24 +03:00
|
|
|
if (box->object) {
|
2006-09-17 01:48:28 +04:00
|
|
|
if (!layout_block_object(box))
|
|
|
|
return false;
|
2005-10-31 00:23:24 +03:00
|
|
|
} else if (box->type == BOX_INLINE_CONTAINER) {
|
2004-04-12 04:00:47 +04:00
|
|
|
box->width = box->parent->width;
|
2004-06-03 01:21:13 +04:00
|
|
|
if (!layout_inline_container(box, box->width, block,
|
2005-04-09 13:47:37 +04:00
|
|
|
cx, cy, content))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2004-04-12 04:00:47 +04:00
|
|
|
} else if (box->type == BOX_TABLE) {
|
2004-04-14 03:20:23 +04:00
|
|
|
/* Move down to avoid floats if necessary. */
|
|
|
|
int x0, x1;
|
|
|
|
struct box *left, *right;
|
|
|
|
y = cy;
|
|
|
|
while (1) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed width = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
wtype = css_computed_width(box->style,
|
|
|
|
&width, &unit);
|
|
|
|
|
2004-04-14 03:20:23 +04:00
|
|
|
x0 = cx;
|
|
|
|
x1 = cx + box->parent->width;
|
|
|
|
find_sides(block->float_children, y,
|
|
|
|
y + box->height,
|
|
|
|
&x0, &x1, &left, &right);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (wtype == CSS_WIDTH_AUTO)
|
2009-01-22 02:01:59 +03:00
|
|
|
break;
|
2004-04-14 03:20:23 +04:00
|
|
|
if (box->width <= x1 - x0)
|
|
|
|
break;
|
|
|
|
if (!left && !right)
|
|
|
|
break;
|
|
|
|
else if (!left)
|
|
|
|
y = right->y + right->height + 1;
|
|
|
|
else if (!right)
|
|
|
|
y = left->y + left->height + 1;
|
|
|
|
else if (left->y + left->height <
|
|
|
|
right->y + right->height)
|
|
|
|
y = left->y + left->height + 1;
|
|
|
|
else
|
|
|
|
y = right->y + right->height + 1;
|
2004-06-14 11:28:27 +04:00
|
|
|
}
|
|
|
|
box->x += x0 - cx;
|
|
|
|
cx = x0;
|
|
|
|
box->y += y - cy;
|
|
|
|
cy = y;
|
2004-04-12 04:00:47 +04:00
|
|
|
}
|
2002-08-06 00:34:45 +04:00
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
/* Advance to next box. */
|
2005-10-31 00:23:24 +03:00
|
|
|
if (box->type == BOX_BLOCK && !box->object && box->children) {
|
2006-07-02 21:36:27 +04:00
|
|
|
/* Down into children. */
|
2004-04-12 04:00:47 +04:00
|
|
|
y = box->padding[TOP];
|
|
|
|
box = box->children;
|
|
|
|
box->y = y;
|
|
|
|
cy += y;
|
|
|
|
if (!margin_box) {
|
|
|
|
max_pos_margin = max_neg_margin = 0;
|
|
|
|
margin_box = box;
|
|
|
|
}
|
|
|
|
continue;
|
2005-10-31 00:23:24 +03:00
|
|
|
} else if (box->type == BOX_BLOCK || box->object)
|
2005-08-07 03:34:30 +04:00
|
|
|
cy += box->padding[TOP];
|
2007-03-25 03:47:44 +04:00
|
|
|
|
|
|
|
if (box->type == BOX_BLOCK && box->height == AUTO) {
|
2004-04-12 21:32:45 +04:00
|
|
|
box->height = 0;
|
2007-03-25 03:47:44 +04:00
|
|
|
layout_block_add_scrollbar(box, BOTTOM);
|
|
|
|
}
|
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
cy += box->height + box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2004-04-12 04:00:47 +04:00
|
|
|
max_pos_margin = max_neg_margin = 0;
|
|
|
|
if (max_pos_margin < box->margin[BOTTOM])
|
|
|
|
max_pos_margin = box->margin[BOTTOM];
|
|
|
|
else if (max_neg_margin < -box->margin[BOTTOM])
|
|
|
|
max_neg_margin = -box->margin[BOTTOM];
|
2006-10-09 02:46:25 +04:00
|
|
|
cx -= box->x;
|
|
|
|
y = box->y + box->padding[TOP] + box->height +
|
2009-07-24 04:08:23 +04:00
|
|
|
box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2006-10-09 02:46:25 +04:00
|
|
|
advance_to_next_box:
|
2004-04-12 04:00:47 +04:00
|
|
|
if (!box->next) {
|
2008-04-20 19:49:25 +04:00
|
|
|
/* No more siblings:
|
|
|
|
* up to first ancestor with a sibling. */
|
2004-04-12 21:32:45 +04:00
|
|
|
do {
|
2004-04-12 04:00:47 +04:00
|
|
|
box = box->parent;
|
2004-12-02 00:48:11 +03:00
|
|
|
if (box == block)
|
|
|
|
break;
|
2007-03-25 03:47:44 +04:00
|
|
|
if (box->height == AUTO) {
|
2004-04-12 04:00:47 +04:00
|
|
|
box->height = y - box->padding[TOP];
|
2008-03-10 02:41:08 +03:00
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
if (box->type == BOX_BLOCK)
|
2008-03-09 22:39:17 +03:00
|
|
|
layout_block_add_scrollbar(box,
|
|
|
|
BOTTOM);
|
2007-03-25 03:47:44 +04:00
|
|
|
} else
|
2006-05-07 21:20:18 +04:00
|
|
|
cy += box->height -
|
|
|
|
(y - box->padding[TOP]);
|
2008-03-21 02:07:55 +03:00
|
|
|
|
2009-05-28 15:14:32 +04:00
|
|
|
/* Apply any min-height and max-height to
|
|
|
|
* boxes in normal flow */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (box->style &&
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_position(box->style) !=
|
2009-05-28 15:14:32 +04:00
|
|
|
CSS_POSITION_ABSOLUTE &&
|
|
|
|
layout_apply_minmax_height(box,
|
|
|
|
NULL)) {
|
2008-03-21 02:07:55 +03:00
|
|
|
/* Height altered */
|
|
|
|
/* Set current cy */
|
|
|
|
cy += box->height -
|
|
|
|
(y - box->padding[TOP]);
|
|
|
|
}
|
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
cy += box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2004-04-12 04:00:47 +04:00
|
|
|
if (max_pos_margin < box->margin[BOTTOM])
|
|
|
|
max_pos_margin = box->margin[BOTTOM];
|
|
|
|
else if (max_neg_margin < -box->margin[BOTTOM])
|
|
|
|
max_neg_margin = -box->margin[BOTTOM];
|
2006-10-09 02:46:25 +04:00
|
|
|
cx -= box->x;
|
|
|
|
y = box->y + box->padding[TOP] + box->height +
|
|
|
|
box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width;
|
2004-04-12 21:32:45 +04:00
|
|
|
} while (box != block && !box->next);
|
2004-04-12 04:00:47 +04:00
|
|
|
if (box == block)
|
|
|
|
break;
|
|
|
|
}
|
2006-07-02 21:36:27 +04:00
|
|
|
/* To next sibling. */
|
2004-04-12 04:00:47 +04:00
|
|
|
box = box->next;
|
|
|
|
box->y = y;
|
|
|
|
margin_box = box;
|
2004-02-02 03:22:59 +03:00
|
|
|
}
|
2004-04-17 02:29:10 +04:00
|
|
|
|
|
|
|
/* Increase height to contain any floats inside (CSS 2.1 10.6.7). */
|
|
|
|
for (box = block->float_children; box; box = box->next_float) {
|
|
|
|
y = box->y + box->height + box->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[BOTTOM].width + box->margin[BOTTOM];
|
2004-04-17 02:29:10 +04:00
|
|
|
if (cy < y)
|
|
|
|
cy = y;
|
|
|
|
}
|
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
if (block->height == AUTO) {
|
2004-04-17 02:29:10 +04:00
|
|
|
block->height = cy - block->padding[TOP];
|
2007-03-25 03:47:44 +04:00
|
|
|
if (block->type == BOX_BLOCK)
|
|
|
|
layout_block_add_scrollbar(block, BOTTOM);
|
|
|
|
}
|
2009-05-28 15:14:32 +04:00
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
if (block->style && css_computed_position(block->style) !=
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE) {
|
2009-05-28 15:14:32 +04:00
|
|
|
/* Block is in normal flow */
|
|
|
|
layout_apply_minmax_height(block, NULL);
|
|
|
|
}
|
2004-06-03 01:21:13 +04:00
|
|
|
|
|
|
|
return true;
|
2004-02-02 03:22:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/**
|
|
|
|
* Calculate minimum and maximum width of a block.
|
|
|
|
*
|
2006-11-05 15:58:24 +03:00
|
|
|
* \param block box of type BLOCK, INLINE_BLOCK, or TABLE_CELL
|
2005-07-22 01:48:41 +04:00
|
|
|
* \post block->min_width and block->max_width filled in,
|
|
|
|
* 0 <= block->min_width <= block->max_width
|
2005-07-02 22:17:51 +04:00
|
|
|
*/
|
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
void layout_minmax_block(struct box *block,
|
|
|
|
const struct font_functions *font_func)
|
2005-07-02 22:17:51 +04:00
|
|
|
{
|
|
|
|
struct box *child;
|
|
|
|
int min = 0, max = 0;
|
|
|
|
int extra_fixed = 0;
|
|
|
|
float extra_frac = 0;
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed width = 0;
|
|
|
|
css_unit wunit = CSS_UNIT_PX;
|
2005-07-02 22:17:51 +04:00
|
|
|
|
|
|
|
assert(block->type == BOX_BLOCK ||
|
|
|
|
block->type == BOX_INLINE_BLOCK ||
|
2006-11-05 15:58:24 +03:00
|
|
|
block->type == BOX_TABLE_CELL);
|
2005-07-02 22:17:51 +04:00
|
|
|
|
|
|
|
/* check if the widths have already been calculated */
|
|
|
|
if (block->max_width != UNKNOWN_MAX_WIDTH)
|
|
|
|
return;
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
wtype = css_computed_width(block->style, &width, &wunit);
|
|
|
|
|
2008-04-25 18:15:18 +04:00
|
|
|
if (block->gadget && (block->gadget->type == GADGET_TEXTBOX ||
|
|
|
|
block->gadget->type == GADGET_PASSWORD ||
|
|
|
|
block->gadget->type == GADGET_FILE ||
|
2008-04-25 18:57:36 +04:00
|
|
|
block->gadget->type == GADGET_TEXTAREA) &&
|
2009-07-24 03:05:34 +04:00
|
|
|
block->style && wtype == CSS_WIDTH_AUTO) {
|
|
|
|
css_fixed size = INTTOFIX(10);
|
|
|
|
css_unit unit = CSS_UNIT_EM;
|
|
|
|
|
|
|
|
min = max = FIXTOINT(nscss_len2px(size, unit, block->style));
|
2008-04-25 18:15:18 +04:00
|
|
|
}
|
|
|
|
|
2008-09-21 03:25:37 +04:00
|
|
|
if (block->gadget && (block->gadget->type == GADGET_RADIO ||
|
|
|
|
block->gadget->type == GADGET_CHECKBOX) &&
|
2009-07-24 03:05:34 +04:00
|
|
|
block->style && wtype == CSS_WIDTH_AUTO) {
|
|
|
|
css_fixed size = INTTOFIX(1);
|
|
|
|
css_unit unit = CSS_UNIT_EM;
|
|
|
|
|
2008-09-21 03:25:37 +04:00
|
|
|
/* form checkbox or radio button
|
|
|
|
* if width is AUTO, set it to 1em */
|
2009-07-24 03:05:34 +04:00
|
|
|
min = max = FIXTOINT(nscss_len2px(size, unit, block->style));
|
2008-09-21 03:25:37 +04:00
|
|
|
}
|
|
|
|
|
2005-10-31 00:23:24 +03:00
|
|
|
if (block->object) {
|
|
|
|
if (block->object->type == CONTENT_HTML) {
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(block->object->data.html.layout,
|
|
|
|
font_func);
|
2005-10-31 00:23:24 +03:00
|
|
|
min = block->object->data.html.layout->min_width;
|
|
|
|
max = block->object->data.html.layout->max_width;
|
|
|
|
} else {
|
|
|
|
min = max = block->object->width;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* recurse through children */
|
|
|
|
for (child = block->children; child; child = child->next) {
|
|
|
|
switch (child->type) {
|
|
|
|
case BOX_BLOCK:
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(child, font_func);
|
2005-10-31 00:23:24 +03:00
|
|
|
break;
|
|
|
|
case BOX_INLINE_CONTAINER:
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_inline_container(child,
|
|
|
|
font_func);
|
2005-10-31 00:23:24 +03:00
|
|
|
break;
|
|
|
|
case BOX_TABLE:
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_table(child, font_func);
|
2005-10-31 00:23:24 +03:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
assert(child->max_width != UNKNOWN_MAX_WIDTH);
|
2009-07-13 19:37:54 +04:00
|
|
|
|
|
|
|
if (child->style &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_position(child->style) ==
|
2009-07-13 19:37:54 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_position(child->style) ==
|
2009-07-13 19:37:54 +04:00
|
|
|
CSS_POSITION_FIXED)) {
|
|
|
|
/* This child is positioned out of normal flow,
|
|
|
|
* so it will have no affect on width */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-10-31 00:23:24 +03:00
|
|
|
if (min < child->min_width)
|
|
|
|
min = child->min_width;
|
|
|
|
if (max < child->max_width)
|
|
|
|
max = child->max_width;
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (max < min) {
|
2007-08-20 06:39:49 +04:00
|
|
|
box_dump(stderr, block, 0);
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* fixed width takes priority */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (block->type != BOX_TABLE_CELL && wtype == CSS_WIDTH_SET &&
|
|
|
|
wunit != CSS_UNIT_PCT) {
|
|
|
|
min = max = FIXTOINT(nscss_len2px(width, wunit, block->style));
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2005-07-02 22:17:51 +04:00
|
|
|
|
|
|
|
/* add margins, border, padding to min, max widths */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (block->gadget && wtype == CSS_WIDTH_SET &&
|
2009-05-01 22:00:01 +04:00
|
|
|
(block->gadget->type == GADGET_SUBMIT ||
|
|
|
|
block->gadget->type == GADGET_RESET ||
|
2009-07-24 03:05:34 +04:00
|
|
|
block->gadget->type == GADGET_BUTTON)) {
|
2009-05-01 22:00:01 +04:00
|
|
|
/* some gadgets with specified width already include border and
|
|
|
|
* padding, so just get margin */
|
|
|
|
calculate_mbp_width(block->style, LEFT, true, false, false,
|
|
|
|
&extra_fixed, &extra_frac);
|
|
|
|
calculate_mbp_width(block->style, RIGHT, true, false, false,
|
|
|
|
&extra_fixed, &extra_frac);
|
|
|
|
} else {
|
|
|
|
calculate_mbp_width(block->style, LEFT, true, true, true,
|
|
|
|
&extra_fixed, &extra_frac);
|
|
|
|
calculate_mbp_width(block->style, RIGHT, true, true, true,
|
|
|
|
&extra_fixed, &extra_frac);
|
|
|
|
}
|
2005-07-22 01:48:41 +04:00
|
|
|
if (extra_fixed < 0)
|
|
|
|
extra_fixed = 0;
|
|
|
|
if (extra_frac < 0)
|
|
|
|
extra_frac = 0;
|
2005-07-02 22:17:51 +04:00
|
|
|
if (1.0 <= extra_frac)
|
|
|
|
extra_frac = 0.9;
|
|
|
|
block->min_width = (min + extra_fixed) / (1.0 - extra_frac);
|
|
|
|
block->max_width = (max + extra_fixed) / (1.0 - extra_frac);
|
2005-07-22 01:48:41 +04:00
|
|
|
|
|
|
|
assert(0 <= block->min_width && block->min_width <= block->max_width);
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-09-17 01:48:28 +04:00
|
|
|
/**
|
|
|
|
* Layout a block which contains an object.
|
|
|
|
*
|
|
|
|
* \param block box of type BLOCK, INLINE_BLOCK, TABLE, or TABLE_CELL
|
|
|
|
* \return true on success, false on memory exhaustion
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool layout_block_object(struct box *block)
|
|
|
|
{
|
|
|
|
assert(block);
|
|
|
|
assert(block->type == BOX_BLOCK ||
|
|
|
|
block->type == BOX_INLINE_BLOCK ||
|
|
|
|
block->type == BOX_TABLE ||
|
|
|
|
block->type == BOX_TABLE_CELL);
|
|
|
|
assert(block->object);
|
|
|
|
|
|
|
|
LOG(("block %p, object %s, width %i", block, block->object->url,
|
|
|
|
block->width));
|
|
|
|
|
|
|
|
if (block->object->type == CONTENT_HTML) {
|
|
|
|
content_reformat(block->object, block->width, 1);
|
|
|
|
block->height = block->object->height;
|
|
|
|
} else {
|
|
|
|
/* this case handled already in
|
|
|
|
* layout_block_find_dimensions() */
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-02 03:22:59 +03:00
|
|
|
/**
|
2004-02-11 20:15:36 +03:00
|
|
|
* Compute dimensions of box, margins, paddings, and borders for a block-level
|
|
|
|
* element.
|
2004-05-21 18:26:59 +04:00
|
|
|
*
|
2008-09-07 14:05:23 +04:00
|
|
|
* \param available_width Max width available in pixels
|
2009-05-07 20:22:38 +04:00
|
|
|
* \param viewport_height Height of viewport in pixels or -ve if unknown
|
2009-01-26 03:15:25 +03:00
|
|
|
* \param lm min left margin required to avoid floats in px.
|
|
|
|
* zero if not applicable
|
|
|
|
* \param rm min right margin required to avoid floats in px.
|
|
|
|
* zero if not applicable
|
2008-09-07 14:05:23 +04:00
|
|
|
* \param box box to find dimensions of. updated with new width,
|
|
|
|
* height, margins, borders and paddings
|
|
|
|
*
|
2004-05-21 18:26:59 +04:00
|
|
|
* See CSS 2.1 10.3.3, 10.3.4, 10.6.2, and 10.6.3.
|
2004-02-02 03:22:59 +03:00
|
|
|
*/
|
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
void layout_block_find_dimensions(int available_width, int viewport_height,
|
|
|
|
int lm, int rm, struct box *box)
|
2004-02-02 03:22:59 +03:00
|
|
|
{
|
2008-09-28 00:19:46 +04:00
|
|
|
int width, max_width, min_width;
|
|
|
|
int height;
|
2004-02-11 20:15:36 +03:00
|
|
|
int *margin = box->margin;
|
|
|
|
int *padding = box->padding;
|
2009-07-24 03:05:34 +04:00
|
|
|
struct box_border *border = box->border;
|
|
|
|
const css_computed_style *style = box->style;
|
2004-02-02 03:22:59 +03:00
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(available_width, viewport_height, box, style,
|
|
|
|
&width, &height, &max_width, &min_width,
|
|
|
|
margin, padding, border);
|
2004-04-12 21:32:45 +04:00
|
|
|
|
2005-10-31 00:23:24 +03:00
|
|
|
if (box->object && box->object->type != CONTENT_HTML) {
|
2004-05-21 18:26:59 +04:00
|
|
|
/* block-level replaced element, see 10.3.4 and 10.6.2 */
|
2006-06-26 08:52:34 +04:00
|
|
|
if (width == AUTO && height == AUTO) {
|
2004-05-21 18:26:59 +04:00
|
|
|
width = box->object->width;
|
2008-09-28 14:00:32 +04:00
|
|
|
height = box->object->height;
|
2004-05-21 18:26:59 +04:00
|
|
|
} else if (width == AUTO) {
|
|
|
|
if (box->object->height)
|
|
|
|
width = box->object->width *
|
2006-06-26 08:52:34 +04:00
|
|
|
(float) height /
|
2004-05-21 18:26:59 +04:00
|
|
|
box->object->height;
|
|
|
|
else
|
|
|
|
width = box->object->width;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (height == AUTO) {
|
2004-05-21 18:26:59 +04:00
|
|
|
if (box->object->width)
|
2006-06-26 08:52:34 +04:00
|
|
|
height = box->object->height *
|
2004-05-21 18:26:59 +04:00
|
|
|
(float) width /
|
|
|
|
box->object->width;
|
|
|
|
else
|
2006-06-26 08:52:34 +04:00
|
|
|
height = box->object->height;
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-21 21:05:22 +04:00
|
|
|
box->width = layout_solve_width(box, available_width, width, lm, rm,
|
|
|
|
max_width, min_width);
|
2006-06-26 08:52:34 +04:00
|
|
|
box->height = height;
|
2004-05-21 18:26:59 +04:00
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
if (margin[TOP] == AUTO)
|
|
|
|
margin[TOP] = 0;
|
|
|
|
if (margin[BOTTOM] == AUTO)
|
|
|
|
margin[BOTTOM] = 0;
|
|
|
|
}
|
|
|
|
|
2008-03-09 22:39:17 +03:00
|
|
|
/**
|
|
|
|
* Manimpulate box height according to CSS min-height and max-height properties
|
|
|
|
*
|
|
|
|
* \param box block to modify with any min-height or max-height
|
2008-10-13 23:22:16 +04:00
|
|
|
* \param container containing block for absolutely positioned elements, or
|
|
|
|
* NULL for non absolutely positioned elements.
|
2008-03-10 02:41:08 +03:00
|
|
|
* \return whether the height has been changed
|
2008-03-09 22:39:17 +03:00
|
|
|
*/
|
|
|
|
|
2008-10-13 23:22:16 +04:00
|
|
|
bool layout_apply_minmax_height(struct box *box, struct box *container)
|
|
|
|
{
|
2008-03-09 22:39:17 +03:00
|
|
|
int h;
|
2008-10-13 23:22:16 +04:00
|
|
|
struct box *containing_block = NULL;
|
2008-03-10 02:41:08 +03:00
|
|
|
bool updated = false;
|
2008-03-09 22:39:17 +03:00
|
|
|
|
2008-10-13 23:22:16 +04:00
|
|
|
/* Find containing block for percentage heights */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (css_computed_position(box->style) == CSS_POSITION_ABSOLUTE) {
|
2008-10-13 23:22:16 +04:00
|
|
|
/* Box is absolutely positioned */
|
2009-05-27 23:43:03 +04:00
|
|
|
assert(container);
|
2008-10-13 23:22:16 +04:00
|
|
|
containing_block = container;
|
|
|
|
} else if (box->float_container &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_float(box->style) == CSS_FLOAT_LEFT ||
|
|
|
|
css_computed_float(box->style) == CSS_FLOAT_RIGHT)) {
|
2008-10-13 23:22:16 +04:00
|
|
|
/* Box is a float */
|
|
|
|
assert(box->parent && box->parent->parent &&
|
|
|
|
box->parent->parent->parent);
|
|
|
|
containing_block = box->parent->parent->parent;
|
|
|
|
} else if (box->parent && box->parent->type != BOX_INLINE_CONTAINER) {
|
|
|
|
/* Box is a block level element */
|
|
|
|
containing_block = box->parent;
|
|
|
|
} else if (box->parent && box->parent->type == BOX_INLINE_CONTAINER) {
|
|
|
|
/* Box is an inline block */
|
|
|
|
assert(box->parent->parent);
|
|
|
|
containing_block = box->parent->parent;
|
|
|
|
}
|
|
|
|
|
2008-03-09 22:39:17 +03:00
|
|
|
if (box->style) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_height_e htype = CSS_HEIGHT_AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed length = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
if (containing_block) {
|
2009-07-24 04:08:23 +04:00
|
|
|
htype = css_computed_height(containing_block->style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&length, &unit);
|
|
|
|
}
|
|
|
|
|
2008-03-09 22:39:17 +03:00
|
|
|
/* max-height */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (css_computed_max_height(box->style, &length, &unit) ==
|
|
|
|
CSS_MAX_HEIGHT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
if (containing_block &&
|
2009-05-28 15:14:32 +04:00
|
|
|
containing_block->height != AUTO &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_position(box->style) ==
|
2009-05-28 15:14:32 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 03:05:34 +04:00
|
|
|
htype == CSS_HEIGHT_SET)) {
|
|
|
|
/* Box is absolutely positioned or its
|
2009-07-24 04:08:23 +04:00
|
|
|
* containing block has a valid
|
|
|
|
* specified height. (CSS 2.1
|
2009-07-24 03:05:34 +04:00
|
|
|
* Section 10.5) */
|
|
|
|
h = FIXTOFLT(length) *
|
2008-10-13 23:22:16 +04:00
|
|
|
containing_block->height / 100;
|
2009-07-24 03:05:34 +04:00
|
|
|
if (h < box->height) {
|
|
|
|
box->height = h;
|
|
|
|
updated = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
h = FIXTOINT(nscss_len2px(length, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-10-13 23:22:16 +04:00
|
|
|
if (h < box->height) {
|
|
|
|
box->height = h;
|
|
|
|
updated = true;
|
|
|
|
}
|
|
|
|
}
|
2008-03-09 22:39:17 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* min-height */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (css_computed_min_height(box->style, &length, &unit) ==
|
|
|
|
CSS_MIN_HEIGHT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
if (containing_block &&
|
2009-05-28 15:14:32 +04:00
|
|
|
containing_block->height != AUTO &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_position(box->style) ==
|
2009-05-28 15:14:32 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 03:05:34 +04:00
|
|
|
htype == CSS_HEIGHT_SET)) {
|
|
|
|
/* Box is absolutely positioned or its
|
2009-07-24 04:08:23 +04:00
|
|
|
* containing block has a valid
|
|
|
|
* specified height. (CSS 2.1
|
2009-07-24 03:05:34 +04:00
|
|
|
* Section 10.5) */
|
|
|
|
h = FIXTOFLT(length) *
|
2008-10-13 23:22:16 +04:00
|
|
|
containing_block->height / 100;
|
2009-07-24 03:05:34 +04:00
|
|
|
if (h > box->height) {
|
|
|
|
box->height = h;
|
|
|
|
updated = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
h = FIXTOINT(nscss_len2px(length, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-10-13 23:22:16 +04:00
|
|
|
if (h > box->height) {
|
|
|
|
box->height = h;
|
|
|
|
updated = true;
|
|
|
|
}
|
|
|
|
}
|
2008-03-09 22:39:17 +03:00
|
|
|
}
|
|
|
|
}
|
2008-03-10 02:41:08 +03:00
|
|
|
return updated;
|
2008-03-09 22:39:17 +03:00
|
|
|
}
|
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
/**
|
|
|
|
* Manipulate a block's [RB]padding/height/width to accommodate scrollbars
|
2009-04-15 17:22:28 +04:00
|
|
|
*
|
|
|
|
* \param box Box to apply scrollbar space too. Must be BOX_BLOCK.
|
|
|
|
* \param which Which scrollbar to make space for. Must be RIGHT or BOTTOM.
|
2007-03-25 03:47:44 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_block_add_scrollbar(struct box *box, int which)
|
|
|
|
{
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_overflow_e overflow;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
2007-03-25 03:47:44 +04:00
|
|
|
assert(box->type == BOX_BLOCK && (which == RIGHT || which == BOTTOM));
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
if (box->style == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
overflow = css_computed_overflow(box->style);
|
|
|
|
|
|
|
|
if (overflow == CSS_OVERFLOW_SCROLL || overflow == CSS_OVERFLOW_AUTO) {
|
2007-03-25 03:47:44 +04:00
|
|
|
/* make space for scrollbars, unless height/width are AUTO */
|
|
|
|
if (which == BOTTOM && box->height != AUTO &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(overflow == CSS_OVERFLOW_SCROLL ||
|
2007-03-25 03:47:44 +04:00
|
|
|
box_hscrollbar_present(box))) {
|
2006-09-10 17:27:08 +04:00
|
|
|
box->padding[BOTTOM] += SCROLLBAR_WIDTH;
|
|
|
|
}
|
2007-03-25 03:47:44 +04:00
|
|
|
if (which == RIGHT && box->width != AUTO &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(overflow == CSS_OVERFLOW_SCROLL ||
|
2007-03-25 03:47:44 +04:00
|
|
|
box_vscrollbar_present(box))) {
|
2006-09-10 17:27:08 +04:00
|
|
|
box->width -= SCROLLBAR_WIDTH;
|
|
|
|
box->padding[RIGHT] += SCROLLBAR_WIDTH;
|
|
|
|
}
|
2004-10-18 01:10:19 +04:00
|
|
|
}
|
2004-04-12 04:00:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Solve the width constraint as given in CSS 2.1 section 10.3.3.
|
2008-06-11 02:00:12 +04:00
|
|
|
*
|
2009-08-21 21:05:22 +04:00
|
|
|
* \param box Box to solve constraint for
|
2009-01-26 03:15:25 +03:00
|
|
|
* \param available_width Max width available in pixels
|
|
|
|
* \param width Current box width
|
|
|
|
* \param lm Min left margin required to avoid floats in px.
|
|
|
|
* zero if not applicable
|
|
|
|
* \param rm Min right margin required to avoid floats in px.
|
|
|
|
* zero if not applicable
|
|
|
|
* \param max_width Box max-width ( -ve means no max-width to apply)
|
|
|
|
* \param min_width Box min-width ( <=0 means no min-width to apply)
|
|
|
|
* \return New box width
|
2009-08-21 21:05:22 +04:00
|
|
|
*
|
|
|
|
* \post \a box's left/right margins will be updated.
|
2004-04-12 04:00:47 +04:00
|
|
|
*/
|
|
|
|
|
2009-08-31 14:39:32 +04:00
|
|
|
int layout_solve_width(struct box *box, int available_width, int width,
|
2009-08-21 21:05:22 +04:00
|
|
|
int lm, int rm, int max_width, int min_width)
|
2004-04-12 04:00:47 +04:00
|
|
|
{
|
2008-09-28 00:19:46 +04:00
|
|
|
bool auto_width = false;
|
|
|
|
|
2009-01-26 03:15:25 +03:00
|
|
|
/* Increase specified left/right margins */
|
2009-08-31 14:39:32 +04:00
|
|
|
if (box->margin[LEFT] != AUTO && box->margin[LEFT] < lm &&
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[LEFT] >= 0)
|
|
|
|
box->margin[LEFT] = lm;
|
2009-08-31 14:39:32 +04:00
|
|
|
if (box->margin[RIGHT] != AUTO && box->margin[RIGHT] < rm &&
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[RIGHT] >= 0)
|
|
|
|
box->margin[RIGHT] = rm;
|
2009-01-26 03:15:25 +03:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
/* Find width */
|
2004-02-11 20:15:36 +03:00
|
|
|
if (width == AUTO) {
|
2009-01-26 03:15:25 +03:00
|
|
|
/* any other 'auto' become 0 or the minimum required values */
|
2009-08-21 21:05:22 +04:00
|
|
|
if (box->margin[LEFT] == AUTO)
|
|
|
|
box->margin[LEFT] = lm;
|
|
|
|
if (box->margin[RIGHT] == AUTO)
|
|
|
|
box->margin[RIGHT] = rm;
|
2008-09-28 00:19:46 +04:00
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
width = available_width -
|
2009-08-21 21:05:22 +04:00
|
|
|
(box->margin[LEFT] + box->border[LEFT].width +
|
|
|
|
box->padding[LEFT] + box->padding[RIGHT] +
|
|
|
|
box->border[RIGHT].width + box->margin[RIGHT]);
|
2009-01-26 03:15:25 +03:00
|
|
|
width = width < 0 ? 0 : width;
|
2008-09-28 00:19:46 +04:00
|
|
|
auto_width = true;
|
|
|
|
}
|
2009-08-21 21:05:22 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
if (max_width >= 0 && width > max_width) {
|
|
|
|
/* max-width is admissable and width exceeds max-width */
|
|
|
|
width = max_width;
|
|
|
|
auto_width = false;
|
|
|
|
}
|
2009-08-21 21:05:22 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
if (min_width > 0 && width < min_width) {
|
|
|
|
/* min-width is admissable and width is less than max-width */
|
|
|
|
width = min_width;
|
|
|
|
auto_width = false;
|
|
|
|
}
|
|
|
|
|
2009-08-21 21:05:22 +04:00
|
|
|
/* Width was auto, and unconstrained by min/max width, so we're done */
|
|
|
|
if (auto_width)
|
|
|
|
return width;
|
|
|
|
|
|
|
|
/* Width was not auto, or was constrained by min/max width
|
|
|
|
* Need to compute left/right margins */
|
|
|
|
|
2009-08-22 13:56:41 +04:00
|
|
|
/* HTML alignment (only applies to over-constrained boxes) */
|
2009-08-21 21:05:22 +04:00
|
|
|
if (box->margin[LEFT] != AUTO && box->margin[RIGHT] != AUTO &&
|
2009-08-22 13:56:41 +04:00
|
|
|
box->parent != NULL && box->parent->style != NULL) {
|
|
|
|
switch (css_computed_text_align(box->parent->style)) {
|
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_RIGHT:
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[LEFT] = AUTO;
|
|
|
|
box->margin[RIGHT] = 0;
|
|
|
|
break;
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_CENTER:
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[LEFT] = box->margin[RIGHT] = AUTO;
|
|
|
|
break;
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_LEFT:
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[LEFT] = 0;
|
|
|
|
box->margin[RIGHT] = AUTO;
|
|
|
|
break;
|
2009-08-22 13:56:41 +04:00
|
|
|
default:
|
|
|
|
/* Leave it alone; no HTML alignment */
|
2009-08-21 21:17:47 +04:00
|
|
|
break;
|
2009-08-21 21:05:22 +04:00
|
|
|
}
|
|
|
|
}
|
2009-01-26 03:15:25 +03:00
|
|
|
|
2009-08-21 21:05:22 +04:00
|
|
|
if (box->margin[LEFT] == AUTO && box->margin[RIGHT] == AUTO) {
|
|
|
|
/* make the margins equal, centering the element */
|
2009-08-31 14:39:32 +04:00
|
|
|
box->margin[LEFT] = box->margin[RIGHT] =
|
2009-08-21 21:05:22 +04:00
|
|
|
(available_width - lm - rm -
|
2009-08-31 14:39:32 +04:00
|
|
|
(box->border[LEFT].width + box->padding[LEFT] +
|
|
|
|
width + box->padding[RIGHT] +
|
2009-08-21 21:05:22 +04:00
|
|
|
box->border[RIGHT].width)) / 2;
|
|
|
|
|
|
|
|
if (box->margin[LEFT] < 0) {
|
|
|
|
box->margin[RIGHT] += box->margin[LEFT];
|
|
|
|
box->margin[LEFT] = 0;
|
2004-08-01 17:08:19 +04:00
|
|
|
}
|
2009-01-26 03:15:25 +03:00
|
|
|
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[LEFT] += lm;
|
2009-01-26 03:15:25 +03:00
|
|
|
|
2009-08-21 21:05:22 +04:00
|
|
|
} else if (box->margin[LEFT] == AUTO) {
|
|
|
|
box->margin[LEFT] = available_width - lm -
|
2009-08-31 14:39:32 +04:00
|
|
|
(box->border[LEFT].width + box->padding[LEFT] +
|
|
|
|
width + box->padding[RIGHT] +
|
2009-08-21 21:05:22 +04:00
|
|
|
box->border[RIGHT].width + box->margin[RIGHT]);
|
2009-08-31 14:39:32 +04:00
|
|
|
box->margin[LEFT] = box->margin[LEFT] < lm
|
2009-08-21 21:05:22 +04:00
|
|
|
? lm : box->margin[LEFT];
|
|
|
|
} else {
|
2005-07-31 03:32:48 +04:00
|
|
|
/* margin-right auto or "over-constrained" */
|
2009-08-21 21:05:22 +04:00
|
|
|
box->margin[RIGHT] = available_width - rm -
|
|
|
|
(box->margin[LEFT] + box->border[LEFT].width +
|
2009-08-31 14:39:32 +04:00
|
|
|
box->padding[LEFT] + width +
|
|
|
|
box->padding[RIGHT] +
|
2009-08-21 21:05:22 +04:00
|
|
|
box->border[RIGHT].width);
|
2004-02-11 20:15:36 +03:00
|
|
|
}
|
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
return width;
|
2004-02-11 20:15:36 +03:00
|
|
|
}
|
|
|
|
|
2006-05-07 21:20:18 +04:00
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
/**
|
|
|
|
* Compute dimensions of box, margins, paddings, and borders for a floating
|
2009-04-15 17:22:28 +04:00
|
|
|
* element using shrink-to-fit. Also used for inline-blocks.
|
|
|
|
*
|
|
|
|
* \param available_width Max width available in pixels
|
|
|
|
* \param style Box's style
|
|
|
|
* \param box Box for which to find dimensions
|
|
|
|
* Box margins, borders, paddings, width and
|
|
|
|
* height are updated.
|
2004-02-11 20:15:36 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_float_find_dimensions(int available_width,
|
2009-07-24 03:05:34 +04:00
|
|
|
const css_computed_style *style, struct box *box)
|
2004-02-11 20:15:36 +03:00
|
|
|
{
|
2008-09-28 00:19:46 +04:00
|
|
|
int width, height, max_width, min_width;
|
2006-06-26 08:52:34 +04:00
|
|
|
int *margin = box->margin;
|
|
|
|
int *padding = box->padding;
|
2009-07-24 03:05:34 +04:00
|
|
|
struct box_border *border = box->border;
|
2009-07-24 04:08:23 +04:00
|
|
|
int scrollbar_width =
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_overflow(style) == CSS_OVERFLOW_SCROLL ||
|
|
|
|
css_computed_overflow(style) == CSS_OVERFLOW_AUTO) ?
|
2004-10-18 01:10:19 +04:00
|
|
|
SCROLLBAR_WIDTH : 0;
|
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(available_width, -1, box, style, &width, &height,
|
2008-09-28 00:19:46 +04:00
|
|
|
&max_width, &min_width, margin, padding, border);
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
if (margin[LEFT] == AUTO)
|
|
|
|
margin[LEFT] = 0;
|
|
|
|
if (margin[RIGHT] == AUTO)
|
|
|
|
margin[RIGHT] = 0;
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
padding[RIGHT] += scrollbar_width;
|
|
|
|
padding[BOTTOM] += scrollbar_width;
|
2004-10-18 01:10:19 +04:00
|
|
|
|
2005-10-31 00:23:24 +03:00
|
|
|
if (box->object && box->object->type != CONTENT_HTML) {
|
2008-04-25 18:15:18 +04:00
|
|
|
/* Floating replaced element, with intrinsic width or height.
|
|
|
|
* See 10.3.6 and 10.6.2 */
|
2006-06-26 08:52:34 +04:00
|
|
|
if (width == AUTO && height == AUTO) {
|
|
|
|
width = box->object->width;
|
|
|
|
height = box->object->height;
|
|
|
|
} else if (width == AUTO)
|
|
|
|
width = box->object->width * (float) height /
|
2004-05-21 18:26:59 +04:00
|
|
|
box->object->height;
|
2006-06-26 08:52:34 +04:00
|
|
|
else if (height == AUTO)
|
|
|
|
height = box->object->height * (float) width /
|
2004-05-21 18:26:59 +04:00
|
|
|
box->object->width;
|
2008-04-25 18:15:18 +04:00
|
|
|
} else if (box->gadget && (box->gadget->type == GADGET_TEXTBOX ||
|
|
|
|
box->gadget->type == GADGET_PASSWORD ||
|
|
|
|
box->gadget->type == GADGET_FILE ||
|
|
|
|
box->gadget->type == GADGET_TEXTAREA)) {
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed size = 0;
|
|
|
|
css_unit unit = CSS_UNIT_EM;
|
|
|
|
|
2008-04-25 18:15:18 +04:00
|
|
|
/* Give sensible dimensions to gadgets, with auto width/height,
|
|
|
|
* that don't shrink to fit contained text. */
|
|
|
|
assert(box->style);
|
|
|
|
|
|
|
|
if (box->gadget->type == GADGET_TEXTBOX ||
|
|
|
|
box->gadget->type == GADGET_PASSWORD ||
|
|
|
|
box->gadget->type == GADGET_FILE) {
|
|
|
|
if (width == AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
size = INTTOFIX(10);
|
2009-07-24 04:08:23 +04:00
|
|
|
width = FIXTOINT(nscss_len2px(size, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-04-25 18:15:18 +04:00
|
|
|
}
|
|
|
|
if (box->gadget->type == GADGET_FILE &&
|
|
|
|
height == AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
size = FLTTOFIX(1.5);
|
2009-07-24 04:08:23 +04:00
|
|
|
height = FIXTOINT(nscss_len2px(size, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-04-25 18:15:18 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (box->gadget->type == GADGET_TEXTAREA) {
|
|
|
|
if (width == AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
size = INTTOFIX(10);
|
2009-07-24 04:08:23 +04:00
|
|
|
width = FIXTOINT(nscss_len2px(size, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-04-25 18:57:36 +04:00
|
|
|
} else {
|
|
|
|
width -= scrollbar_width;
|
2008-04-25 18:15:18 +04:00
|
|
|
}
|
|
|
|
if (height == AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
size = INTTOFIX(4);
|
2009-07-24 04:08:23 +04:00
|
|
|
height = FIXTOINT(nscss_len2px(size, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
2008-04-25 18:15:18 +04:00
|
|
|
}
|
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (width == AUTO) {
|
2004-05-21 18:26:59 +04:00
|
|
|
/* CSS 2.1 section 10.3.5 */
|
2008-04-25 18:15:18 +04:00
|
|
|
width = min(max(box->min_width, available_width),
|
|
|
|
box->max_width);
|
2009-07-24 03:05:34 +04:00
|
|
|
width -= box->margin[LEFT] + box->border[LEFT].width +
|
2005-07-03 03:37:41 +04:00
|
|
|
box->padding[LEFT] + box->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[RIGHT].width + box->margin[RIGHT];
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
if (max_width >= 0 && width > max_width) width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width) width = min_width;
|
|
|
|
|
2004-10-18 01:10:19 +04:00
|
|
|
} else {
|
2008-09-28 00:43:45 +04:00
|
|
|
if (max_width >= 0 && width > max_width) width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width) width = min_width;
|
2006-06-26 08:52:34 +04:00
|
|
|
width -= scrollbar_width;
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
box->width = width;
|
|
|
|
box->height = height;
|
|
|
|
|
|
|
|
if (margin[TOP] == AUTO)
|
|
|
|
margin[TOP] = 0;
|
|
|
|
if (margin[BOTTOM] == AUTO)
|
|
|
|
margin[BOTTOM] = 0;
|
2004-02-11 20:15:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2006-06-26 08:52:34 +04:00
|
|
|
* Calculate width, height, and thickness of margins, paddings, and borders.
|
2004-12-02 00:48:11 +03:00
|
|
|
*
|
|
|
|
* \param available_width width of containing block
|
2009-05-07 20:22:38 +04:00
|
|
|
* \param viewport_height height of viewport in pixels or -ve if unknown
|
2008-02-17 21:22:06 +03:00
|
|
|
* \param box current box
|
2006-06-26 08:52:34 +04:00
|
|
|
* \param style style giving width, height, margins, paddings,
|
|
|
|
* and borders
|
|
|
|
* \param width updated to width, may be NULL
|
|
|
|
* \param height updated to height, may be NULL
|
2008-09-28 00:19:46 +04:00
|
|
|
* \param max_width updated to max-width, may be NULL
|
|
|
|
* \param min_width updated to min-width, may be NULL
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param margin[4] filled with margins, may be NULL
|
2008-10-13 01:22:28 +04:00
|
|
|
* \param padding[4] filled with paddings, may be NULL
|
|
|
|
* \param border[4] filled with border widths, may be NULL
|
2004-02-11 20:15:36 +03:00
|
|
|
*/
|
|
|
|
|
2009-05-07 20:22:38 +04:00
|
|
|
void layout_find_dimensions(int available_width, int viewport_height,
|
2009-07-24 03:05:34 +04:00
|
|
|
struct box *box, const css_computed_style *style,
|
2008-09-28 00:19:46 +04:00
|
|
|
int *width, int *height, int *max_width, int *min_width,
|
2009-07-24 03:05:34 +04:00
|
|
|
int margin[4], int padding[4], struct box_border border[4])
|
2004-02-11 20:15:36 +03:00
|
|
|
{
|
2008-10-13 01:22:28 +04:00
|
|
|
struct box *containing_block = NULL;
|
2004-02-11 20:15:36 +03:00
|
|
|
unsigned int i;
|
2009-05-06 15:16:06 +04:00
|
|
|
bool percentage;
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
if (width) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
wtype = css_computed_width(style, &value, &unit);
|
|
|
|
|
|
|
|
if (wtype == CSS_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*width = (FIXTOFLT(value) * available_width)
|
2009-07-24 03:05:34 +04:00
|
|
|
/ 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*width = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
|
|
|
}
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
*width = AUTO;
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
|
|
|
|
/* specified gadget widths include borders and padding in some
|
|
|
|
* cases */
|
2009-05-06 15:16:06 +04:00
|
|
|
if (box->gadget && *width != AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
percentage = unit == CSS_UNIT_PCT;
|
2009-05-06 15:16:06 +04:00
|
|
|
|
|
|
|
layout_tweak_form_dimensions(box, percentage,
|
|
|
|
available_width, true, width);
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (height) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_height_e htype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
htype = css_computed_height(style, &value, &unit);
|
|
|
|
|
|
|
|
if (htype == CSS_HEIGHT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_height_e cbhtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
if (css_computed_position(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE) {
|
|
|
|
/* Box is absolutely positioned */
|
|
|
|
assert(box->float_container);
|
|
|
|
containing_block = box->float_container;
|
|
|
|
} else if (box->float_container &&
|
|
|
|
css_computed_position(box->style) !=
|
|
|
|
CSS_POSITION_ABSOLUTE &&
|
|
|
|
(css_computed_float(box->style) ==
|
|
|
|
CSS_FLOAT_LEFT ||
|
|
|
|
css_computed_float(box->style) ==
|
|
|
|
CSS_FLOAT_RIGHT)) {
|
|
|
|
/* Box is a float */
|
2009-07-24 04:08:23 +04:00
|
|
|
assert(box->parent &&
|
2009-07-24 03:05:34 +04:00
|
|
|
box->parent->parent &&
|
2008-10-13 14:50:46 +04:00
|
|
|
box->parent->parent->parent);
|
2009-07-24 03:05:34 +04:00
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
containing_block =
|
2009-07-24 03:05:34 +04:00
|
|
|
box->parent->parent->parent;
|
|
|
|
} else if (box->parent && box->parent->type !=
|
|
|
|
BOX_INLINE_CONTAINER) {
|
|
|
|
/* Box is a block level element */
|
|
|
|
containing_block = box->parent;
|
|
|
|
} else if (box->parent && box->parent->type ==
|
|
|
|
BOX_INLINE_CONTAINER) {
|
|
|
|
/* Box is an inline block */
|
|
|
|
assert(box->parent->parent);
|
|
|
|
containing_block = box->parent->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (containing_block) {
|
|
|
|
css_fixed f = 0;
|
|
|
|
css_unit u = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
cbhtype = css_computed_height(
|
|
|
|
containing_block->style,
|
|
|
|
&f, &u);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (containing_block &&
|
2009-05-28 15:14:32 +04:00
|
|
|
containing_block->height != AUTO &&
|
2009-07-24 03:05:34 +04:00
|
|
|
(css_computed_position(box->style) ==
|
2009-05-28 15:14:32 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 03:05:34 +04:00
|
|
|
cbhtype == CSS_HEIGHT_SET)) {
|
|
|
|
/* Box is absolutely positioned or its
|
2009-07-24 04:08:23 +04:00
|
|
|
* containing block has a valid
|
|
|
|
* specified height.
|
2009-07-24 03:05:34 +04:00
|
|
|
* (CSS 2.1 Section 10.5) */
|
|
|
|
*height = FIXTOFLT(value) *
|
2009-07-24 04:08:23 +04:00
|
|
|
containing_block->height /
|
2009-07-24 03:05:34 +04:00
|
|
|
100;
|
2009-07-24 04:08:23 +04:00
|
|
|
} else if ((!box->parent ||
|
2009-07-24 03:05:34 +04:00
|
|
|
!box->parent->parent) &&
|
|
|
|
viewport_height >= 0) {
|
|
|
|
/* If root element or it's child
|
|
|
|
* (HTML or BODY) */
|
|
|
|
*height = FIXTOFLT(value) *
|
|
|
|
viewport_height / 100;
|
|
|
|
} else {
|
|
|
|
/* precentage height not permissible
|
|
|
|
* treat height as auto */
|
|
|
|
*height = AUTO;
|
|
|
|
}
|
2008-10-13 01:22:28 +04:00
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*height = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
2008-10-13 01:22:28 +04:00
|
|
|
}
|
2009-07-24 03:05:34 +04:00
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
*height = AUTO;
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
|
2009-05-06 15:16:06 +04:00
|
|
|
/* specified gadget heights include borders and padding in
|
2009-05-01 22:00:01 +04:00
|
|
|
* some cases */
|
2009-05-06 15:16:06 +04:00
|
|
|
if (box->gadget && *height != AUTO) {
|
2009-07-24 03:05:34 +04:00
|
|
|
percentage = unit == CSS_UNIT_PCT;
|
2009-05-06 15:16:06 +04:00
|
|
|
|
|
|
|
layout_tweak_form_dimensions(box, percentage,
|
|
|
|
available_width, false, height);
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
if (max_width) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_max_width_e type;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
type = css_computed_max_width(style, &value, &unit);
|
|
|
|
|
|
|
|
if (type == CSS_MAX_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*max_width = (FIXTOFLT(value) *
|
2009-07-24 03:05:34 +04:00
|
|
|
available_width) / 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*max_width = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
|
|
|
}
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
/* Inadmissible */
|
|
|
|
*max_width = -1;
|
2008-09-28 00:19:46 +04:00
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
|
|
|
|
/* specified gadget widths include borders and padding in some
|
|
|
|
* cases */
|
2009-05-06 15:16:06 +04:00
|
|
|
if (box->gadget && *max_width != -1) {
|
2009-07-24 03:05:34 +04:00
|
|
|
percentage = unit == CSS_UNIT_PCT;
|
|
|
|
|
2009-05-06 15:16:06 +04:00
|
|
|
layout_tweak_form_dimensions(box, percentage,
|
|
|
|
available_width, true, max_width);
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2008-09-28 00:19:46 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (min_width) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_min_width_e type;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
type = css_computed_min_width(style, &value, &unit);
|
|
|
|
|
|
|
|
if (type == CSS_MIN_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
*min_width = (FIXTOFLT(value) *
|
2008-10-12 19:34:43 +04:00
|
|
|
available_width) / 100;
|
2009-07-24 03:05:34 +04:00
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*min_width = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
|
|
|
}
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
/* Inadmissible */
|
|
|
|
*min_width = 0;
|
2008-09-28 00:19:46 +04:00
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
|
|
|
|
/* specified gadget widths include borders and padding in some
|
|
|
|
* cases */
|
2009-05-06 15:16:06 +04:00
|
|
|
if (box->gadget && *min_width != 0) {
|
2009-07-24 03:05:34 +04:00
|
|
|
percentage = unit == CSS_UNIT_PCT;
|
|
|
|
|
2009-05-06 15:16:06 +04:00
|
|
|
layout_tweak_form_dimensions(box, percentage,
|
|
|
|
available_width, true, min_width);
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2008-09-28 00:19:46 +04:00
|
|
|
}
|
|
|
|
|
2004-02-02 03:22:59 +03:00
|
|
|
for (i = 0; i != 4; i++) {
|
2004-12-02 00:48:11 +03:00
|
|
|
if (margin) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_margin_e type = CSS_MARGIN_AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
switch (i) {
|
|
|
|
case TOP:
|
2009-07-24 04:08:23 +04:00
|
|
|
type = css_computed_margin_top(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&value, &unit);
|
2004-02-02 03:22:59 +03:00
|
|
|
break;
|
2009-07-24 03:05:34 +04:00
|
|
|
case RIGHT:
|
|
|
|
type = css_computed_margin_right(style,
|
|
|
|
&value, &unit);
|
2004-02-02 03:22:59 +03:00
|
|
|
break;
|
2009-07-24 03:05:34 +04:00
|
|
|
case BOTTOM:
|
|
|
|
type = css_computed_margin_bottom(style,
|
|
|
|
&value, &unit);
|
|
|
|
break;
|
|
|
|
case LEFT:
|
|
|
|
type = css_computed_margin_left(style,
|
|
|
|
&value, &unit);
|
2004-02-02 03:22:59 +03:00
|
|
|
break;
|
2004-12-02 00:48:11 +03:00
|
|
|
}
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
if (type == CSS_MARGIN_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
margin[i] = available_width *
|
|
|
|
FIXTOFLT(value) / 100;
|
|
|
|
} else {
|
|
|
|
margin[i] = FIXTOINT(nscss_len2px(value,
|
|
|
|
unit, style));
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
margin[i] = AUTO;
|
|
|
|
}
|
2004-02-02 03:22:59 +03:00
|
|
|
}
|
|
|
|
|
2008-10-13 01:22:28 +04:00
|
|
|
if (padding) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_padding_e type;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
switch (i) {
|
|
|
|
case TOP:
|
2009-07-24 04:08:23 +04:00
|
|
|
type = css_computed_padding_top(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&value, &unit);
|
2008-10-13 01:22:28 +04:00
|
|
|
break;
|
2009-07-24 03:05:34 +04:00
|
|
|
case RIGHT:
|
|
|
|
type = css_computed_padding_right(style,
|
|
|
|
&value, &unit);
|
|
|
|
break;
|
|
|
|
case BOTTOM:
|
|
|
|
type = css_computed_padding_bottom(style,
|
|
|
|
&value, &unit);
|
2008-10-13 01:22:28 +04:00
|
|
|
break;
|
2009-07-24 03:05:34 +04:00
|
|
|
case LEFT:
|
|
|
|
type = css_computed_padding_left(style,
|
|
|
|
&value, &unit);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
padding[i] = available_width *
|
|
|
|
FIXTOFLT(value) / 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
padding[i] = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
2008-10-13 01:22:28 +04:00
|
|
|
}
|
2004-02-02 03:22:59 +03:00
|
|
|
}
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
/* Table cell borders are populated in table.c */
|
|
|
|
if (border && box->type != BOX_TABLE_CELL) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_border_width_e wtype;
|
|
|
|
enum css_border_style_e bstyle = CSS_BORDER_STYLE_NONE;
|
|
|
|
enum css_border_color_e bcolor =
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_BORDER_COLOR_TRANSPARENT;
|
|
|
|
css_color color = 0;
|
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
switch (i) {
|
|
|
|
case TOP:
|
2009-07-24 04:08:23 +04:00
|
|
|
wtype = css_computed_border_top_width(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&value, &unit);
|
|
|
|
bstyle = css_computed_border_top_style(style);
|
2009-07-24 04:08:23 +04:00
|
|
|
bcolor = css_computed_border_top_color(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&color);
|
|
|
|
break;
|
|
|
|
case RIGHT:
|
|
|
|
wtype = css_computed_border_right_width(style,
|
|
|
|
&value, &unit);
|
|
|
|
bstyle = css_computed_border_right_style(style);
|
2009-07-24 04:08:23 +04:00
|
|
|
bcolor = css_computed_border_right_color(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&color);
|
|
|
|
break;
|
|
|
|
case BOTTOM:
|
|
|
|
wtype = css_computed_border_bottom_width(style,
|
|
|
|
&value, &unit);
|
|
|
|
bstyle = css_computed_border_bottom_style(
|
|
|
|
style);
|
|
|
|
bcolor = css_computed_border_bottom_color(style,
|
|
|
|
&color);
|
|
|
|
break;
|
|
|
|
case LEFT:
|
|
|
|
wtype = css_computed_border_left_width(style,
|
|
|
|
&value, &unit);
|
|
|
|
bstyle = css_computed_border_left_style(style);
|
2009-07-24 04:08:23 +04:00
|
|
|
bcolor = css_computed_border_left_color(style,
|
2009-07-24 03:05:34 +04:00
|
|
|
&color);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
border[i].style = bstyle;
|
|
|
|
border[i].color = bcolor;
|
|
|
|
border[i].c = color;
|
|
|
|
|
|
|
|
if (bstyle == CSS_BORDER_STYLE_HIDDEN ||
|
|
|
|
bstyle == CSS_BORDER_STYLE_NONE)
|
2008-10-13 01:22:28 +04:00
|
|
|
/* spec unclear: following Mozilla */
|
2009-07-24 03:05:34 +04:00
|
|
|
border[i].width = 0;
|
2008-10-13 01:22:28 +04:00
|
|
|
else
|
2009-07-24 04:08:23 +04:00
|
|
|
border[i].width = FIXTOINT(nscss_len2px(value,
|
2009-07-24 03:05:34 +04:00
|
|
|
unit, style));
|
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
/* Special case for border-collapse: make all borders
|
2009-07-24 03:05:34 +04:00
|
|
|
* on table/table-row-group/table-row zero width. */
|
|
|
|
if (css_computed_border_collapse(style) ==
|
|
|
|
CSS_BORDER_COLLAPSE_COLLAPSE &&
|
|
|
|
(box->type == BOX_TABLE ||
|
|
|
|
box->type == BOX_TABLE_ROW_GROUP ||
|
|
|
|
box->type == BOX_TABLE_ROW))
|
|
|
|
border[i].width = 0;
|
2008-10-13 01:22:28 +04:00
|
|
|
}
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2009-05-06 15:16:06 +04:00
|
|
|
/**
|
|
|
|
* Under some circumstances, specified dimensions for form elements include
|
|
|
|
* borders and padding.
|
|
|
|
*
|
|
|
|
* \param box gadget to adjust dimensions of
|
|
|
|
* \param percentage whether the gadget has its dimension specified as a
|
|
|
|
* percentage
|
|
|
|
* \param available_width width of containing block
|
|
|
|
* \param setwidth set true if the dimension to be tweaked is a width,
|
|
|
|
* else set false for a height
|
|
|
|
* \param dimension current value for given width/height dimension.
|
|
|
|
* updated to new value after consideration of
|
|
|
|
* gadget properties.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_tweak_form_dimensions(struct box *box, bool percentage,
|
|
|
|
int available_width, bool setwidth, int *dimension)
|
|
|
|
{
|
|
|
|
int fixed = 0;
|
|
|
|
float frac = 0;
|
|
|
|
|
|
|
|
assert(box && box->gadget);
|
|
|
|
|
|
|
|
/* specified gadget widths include borders and padding in some
|
|
|
|
* cases */
|
|
|
|
if (percentage || box->gadget->type == GADGET_SUBMIT ||
|
|
|
|
box->gadget->type == GADGET_RESET ||
|
|
|
|
box->gadget->type == GADGET_BUTTON) {
|
|
|
|
calculate_mbp_width(box->style, setwidth ? LEFT : TOP,
|
|
|
|
false, true, true, &fixed, &frac);
|
|
|
|
calculate_mbp_width(box->style, setwidth ? RIGHT : BOTTOM,
|
|
|
|
false, true, true, &fixed, &frac);
|
|
|
|
*dimension -= frac * available_width + fixed;
|
|
|
|
*dimension = *dimension > 0 ? *dimension : 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-13 19:10:28 +03:00
|
|
|
/**
|
|
|
|
* Find y coordinate which clears all floats on left and/or right.
|
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param fl first float in float list
|
2004-02-13 19:10:28 +03:00
|
|
|
* \param clear type of clear
|
|
|
|
* \return y coordinate relative to ancestor box for floats
|
|
|
|
*/
|
|
|
|
|
2009-08-02 23:19:43 +04:00
|
|
|
int layout_clear(struct box *fl, enum css_clear_e clear)
|
2004-02-13 19:10:28 +03:00
|
|
|
{
|
|
|
|
int y = 0;
|
|
|
|
for (; fl; fl = fl->next_float) {
|
|
|
|
if ((clear == CSS_CLEAR_LEFT || clear == CSS_CLEAR_BOTH) &&
|
|
|
|
fl->type == BOX_FLOAT_LEFT)
|
2008-03-09 04:34:49 +03:00
|
|
|
if (y < fl->y + fl->height)
|
|
|
|
y = fl->y + fl->height;
|
2004-02-13 19:10:28 +03:00
|
|
|
if ((clear == CSS_CLEAR_RIGHT || clear == CSS_CLEAR_BOTH) &&
|
|
|
|
fl->type == BOX_FLOAT_RIGHT)
|
2008-03-09 04:34:49 +03:00
|
|
|
if (y < fl->y + fl->height)
|
|
|
|
y = fl->y + fl->height;
|
2004-02-13 19:10:28 +03:00
|
|
|
}
|
|
|
|
return y;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
/**
|
2004-02-11 20:15:36 +03:00
|
|
|
* Find left and right edges in a vertical range.
|
2002-06-19 01:24:21 +04:00
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param fl first float in float list
|
|
|
|
* \param y0 start of y range to search
|
|
|
|
* \param y1 end of y range to search
|
|
|
|
* \param x0 start left edge, updated to available left edge
|
|
|
|
* \param x1 start right edge, updated to available right edge
|
|
|
|
* \param left returns float on left if present
|
2004-02-11 20:15:36 +03:00
|
|
|
* \param right returns float on right if present
|
2002-06-19 01:24:21 +04:00
|
|
|
*/
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
void find_sides(struct box *fl, int y0, int y1,
|
|
|
|
int *x0, int *x1, struct box **left, struct box **right)
|
2002-05-28 03:21:11 +04:00
|
|
|
{
|
2004-02-11 20:15:36 +03:00
|
|
|
int fy0, fy1, fx0, fx1;
|
|
|
|
LOG(("y0 %i, y1 %i, x0 %i, x1 %i", y0, y1, *x0, *x1));
|
2002-06-19 01:24:21 +04:00
|
|
|
*left = *right = 0;
|
2002-05-28 03:21:11 +04:00
|
|
|
for (; fl; fl = fl->next_float) {
|
2004-02-11 20:15:36 +03:00
|
|
|
fy0 = fl->y;
|
|
|
|
fy1 = fl->y + fl->height;
|
2008-02-03 21:44:24 +03:00
|
|
|
if (y0 < fy1 && fy0 <= y1) {
|
2004-02-11 20:15:36 +03:00
|
|
|
if (fl->type == BOX_FLOAT_LEFT) {
|
|
|
|
fx1 = fl->x + fl->width;
|
|
|
|
if (*x0 < fx1) {
|
|
|
|
*x0 = fx1;
|
|
|
|
*left = fl;
|
|
|
|
}
|
|
|
|
} else if (fl->type == BOX_FLOAT_RIGHT) {
|
|
|
|
fx0 = fl->x;
|
|
|
|
if (fx0 < *x1) {
|
|
|
|
*x1 = fx0;
|
|
|
|
*right = fl;
|
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2002-05-28 03:21:11 +04:00
|
|
|
}
|
|
|
|
}
|
2004-02-11 20:15:36 +03:00
|
|
|
LOG(("x0 %i, x1 %i, left %p, right %p", *x0, *x1, *left, *right));
|
2002-05-28 03:21:11 +04:00
|
|
|
}
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
|
|
|
|
/**
|
2004-02-11 20:15:36 +03:00
|
|
|
* Layout lines of text or inline boxes with floats.
|
2002-06-19 01:24:21 +04:00
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param box inline container
|
2004-02-11 20:15:36 +03:00
|
|
|
* \param width horizontal space available
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param cont ancestor box which defines horizontal space, for floats
|
|
|
|
* \param cx box position relative to cont
|
|
|
|
* \param cy box position relative to cont
|
2005-04-09 13:47:37 +04:00
|
|
|
* \param content memory pool for any new boxes
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2002-06-19 01:24:21 +04:00
|
|
|
*/
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
bool layout_inline_container(struct box *inline_container, int width,
|
2005-04-09 13:47:37 +04:00
|
|
|
struct box *cont, int cx, int cy, struct content *content)
|
2002-05-04 23:57:18 +04:00
|
|
|
{
|
2004-02-11 20:15:36 +03:00
|
|
|
bool first_line = true;
|
2006-08-13 05:00:22 +04:00
|
|
|
bool has_text_children;
|
2004-06-03 01:21:13 +04:00
|
|
|
struct box *c, *next;
|
2004-02-11 20:15:36 +03:00
|
|
|
int y = 0;
|
2006-09-10 17:27:08 +04:00
|
|
|
int curwidth,maxwidth = width;
|
2002-05-04 23:57:18 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(inline_container->type == BOX_INLINE_CONTAINER);
|
2002-05-28 03:21:11 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
LOG(("inline_container %p, width %i, cont %p, cx %i, cy %i",
|
|
|
|
inline_container, width, cont, cx, cy));
|
2002-08-06 00:34:45 +04:00
|
|
|
|
2006-08-13 05:00:22 +04:00
|
|
|
has_text_children = false;
|
2007-12-23 17:15:11 +03:00
|
|
|
for (c = inline_container->children; c; c = c->next) {
|
2008-10-13 16:30:23 +04:00
|
|
|
bool is_pre = false;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
if (c->style) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_white_space_e whitespace;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
whitespace = css_computed_white_space(c->style);
|
|
|
|
|
|
|
|
is_pre = (whitespace == CSS_WHITE_SPACE_PRE ||
|
|
|
|
whitespace == CSS_WHITE_SPACE_PRE_LINE ||
|
|
|
|
whitespace == CSS_WHITE_SPACE_PRE_WRAP);
|
|
|
|
}
|
|
|
|
|
2008-10-13 16:30:23 +04:00
|
|
|
if ((!c->object && c->text && (c->length || is_pre)) ||
|
|
|
|
c->type == BOX_BR)
|
|
|
|
has_text_children = true;
|
|
|
|
}
|
2006-09-10 17:27:08 +04:00
|
|
|
|
2008-03-21 02:07:55 +03:00
|
|
|
/** \todo fix wrapping so that a box with horizontal scrollbar will
|
|
|
|
* shrink back to 'width' if no word is wider than 'width' (Or just set
|
|
|
|
* curwidth = width and have the multiword lines wrap to the min width)
|
|
|
|
*/
|
2005-07-02 22:17:51 +04:00
|
|
|
for (c = inline_container->children; c; ) {
|
2004-02-28 20:23:07 +03:00
|
|
|
LOG(("c %p", c));
|
2006-09-10 17:27:08 +04:00
|
|
|
curwidth = inline_container->width;
|
|
|
|
if (!layout_line(c, &curwidth, &y, cx, cy + y, cont, first_line,
|
2006-08-13 05:00:22 +04:00
|
|
|
has_text_children, content, &next))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2006-09-10 17:27:08 +04:00
|
|
|
maxwidth = max(maxwidth,curwidth);
|
2004-06-03 01:21:13 +04:00
|
|
|
c = next;
|
2004-02-11 20:15:36 +03:00
|
|
|
first_line = false;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
|
|
|
|
2006-09-10 17:27:08 +04:00
|
|
|
inline_container->width = maxwidth;
|
2005-07-02 22:17:51 +04:00
|
|
|
inline_container->height = y;
|
2004-06-03 01:21:13 +04:00
|
|
|
|
|
|
|
return true;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/**
|
|
|
|
* Calculate minimum and maximum width of an inline container.
|
|
|
|
*
|
|
|
|
* \param inline_container box of type INLINE_CONTAINER
|
2005-07-22 01:48:41 +04:00
|
|
|
* \post inline_container->min_width and inline_container->max_width filled in,
|
|
|
|
* 0 <= inline_container->min_width <= inline_container->max_width
|
2005-07-02 22:17:51 +04:00
|
|
|
*/
|
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
void layout_minmax_inline_container(struct box *inline_container,
|
|
|
|
const struct font_functions *font_func)
|
2005-07-02 22:17:51 +04:00
|
|
|
{
|
|
|
|
struct box *child;
|
|
|
|
int line_min = 0, line_max = 0;
|
|
|
|
int min = 0, max = 0;
|
|
|
|
|
|
|
|
assert(inline_container->type == BOX_INLINE_CONTAINER);
|
|
|
|
|
|
|
|
/* check if the widths have already been calculated */
|
|
|
|
if (inline_container->max_width != UNKNOWN_MAX_WIDTH)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (child = inline_container->children; child; ) {
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
child = layout_minmax_line(child,
|
|
|
|
&line_min, &line_max,
|
|
|
|
font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
if (min < line_min)
|
|
|
|
min = line_min;
|
|
|
|
if (max < line_max)
|
|
|
|
max = line_max;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline_container->min_width = min;
|
|
|
|
inline_container->max_width = max;
|
2005-07-22 01:48:41 +04:00
|
|
|
|
|
|
|
assert(0 <= inline_container->min_width &&
|
|
|
|
inline_container->min_width <=
|
|
|
|
inline_container->max_width);
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
/**
|
|
|
|
* Calculate line height from a style.
|
|
|
|
*/
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
int line_height(const css_computed_style *style)
|
2002-06-19 01:24:21 +04:00
|
|
|
{
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_line_height_e lhtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed lhvalue = 0;
|
|
|
|
css_unit lhunit = CSS_UNIT_PX;
|
|
|
|
css_fixed line_height;
|
2004-04-15 20:18:19 +04:00
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
assert(style);
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
lhtype = css_computed_line_height(style, &lhvalue, &lhunit);
|
|
|
|
if (lhtype == CSS_LINE_HEIGHT_NORMAL) {
|
|
|
|
/* Normal => use a constant of 1.3 * font-size */
|
|
|
|
lhvalue = FLTTOFIX(1.3);
|
|
|
|
lhtype = CSS_LINE_HEIGHT_NUMBER;
|
|
|
|
}
|
2004-04-15 20:18:19 +04:00
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
if (lhtype == CSS_LINE_HEIGHT_NUMBER ||
|
|
|
|
lhunit == CSS_UNIT_PCT) {
|
2009-07-25 17:20:12 +04:00
|
|
|
line_height = nscss_len2px(lhvalue, CSS_UNIT_EM, style);
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2009-07-25 17:20:12 +04:00
|
|
|
if (lhtype != CSS_LINE_HEIGHT_NUMBER)
|
|
|
|
line_height = FDIVI(line_height, 100);
|
2009-07-24 03:05:34 +04:00
|
|
|
} else {
|
|
|
|
assert(lhunit != CSS_UNIT_PCT);
|
|
|
|
|
|
|
|
line_height = nscss_len2px(lhvalue, lhunit, style);
|
2004-02-11 20:15:36 +03:00
|
|
|
}
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
return FIXTOINT(line_height);
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
/**
|
|
|
|
* Position a line of boxes in inline formatting context.
|
|
|
|
*
|
|
|
|
* \param first box at start of line
|
2006-09-10 17:27:08 +04:00
|
|
|
* \param width available width on input, updated with actual width on output
|
|
|
|
* (may be incorrect if the line gets split?)
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param y coordinate of top of line, updated on exit to bottom
|
|
|
|
* \param cx coordinate of left of line relative to cont
|
|
|
|
* \param cy coordinate of top of line relative to cont
|
|
|
|
* \param cont ancestor box which defines horizontal space, for floats
|
2004-02-11 20:15:36 +03:00
|
|
|
* \param indent apply any first-line indent
|
2006-08-13 05:00:22 +04:00
|
|
|
* \param has_text_children at least one TEXT in the inline_container
|
2004-06-03 01:21:13 +04:00
|
|
|
* \param next_box updated to first box for next line, or 0 at end
|
2005-04-09 13:47:37 +04:00
|
|
|
* \param content memory pool for any new boxes
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2004-02-11 20:15:36 +03:00
|
|
|
*/
|
|
|
|
|
2006-09-10 17:27:08 +04:00
|
|
|
bool layout_line(struct box *first, int *width, int *y,
|
2004-06-03 01:21:13 +04:00
|
|
|
int cx, int cy, struct box *cont, bool indent,
|
2006-08-13 05:00:22 +04:00
|
|
|
bool has_text_children,
|
2005-04-09 13:47:37 +04:00
|
|
|
struct content *content, struct box **next_box)
|
2002-06-19 01:24:21 +04:00
|
|
|
{
|
2004-02-11 20:15:36 +03:00
|
|
|
int height, used_height;
|
|
|
|
int x0 = 0;
|
2006-09-10 17:27:08 +04:00
|
|
|
int x1 = *width;
|
2004-02-11 20:15:36 +03:00
|
|
|
int x, h, x_previous;
|
2008-03-09 17:10:05 +03:00
|
|
|
int fy;
|
2004-02-28 20:23:07 +03:00
|
|
|
struct box *left;
|
|
|
|
struct box *right;
|
|
|
|
struct box *b;
|
|
|
|
struct box *split_box = 0;
|
|
|
|
struct box *d;
|
2005-08-08 01:28:48 +04:00
|
|
|
struct box *br_box = 0;
|
2004-04-18 19:19:53 +04:00
|
|
|
bool move_y = false;
|
2009-01-27 16:21:50 +03:00
|
|
|
bool place_below = false;
|
2004-02-11 20:15:36 +03:00
|
|
|
int space_before = 0, space_after = 0;
|
2004-03-26 04:35:35 +03:00
|
|
|
unsigned int inline_count = 0;
|
2005-05-24 02:14:09 +04:00
|
|
|
unsigned int i;
|
2008-08-09 00:12:38 +04:00
|
|
|
const struct font_functions *font_func = content->data.html.font_func;
|
2009-07-21 14:59:53 +04:00
|
|
|
plot_font_style_t fstyle;
|
2008-08-09 00:12:38 +04:00
|
|
|
|
2005-07-24 18:29:32 +04:00
|
|
|
LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i",
|
2006-09-10 17:27:08 +04:00
|
|
|
first, (int) first->length, first->text, *width,
|
2005-07-24 18:29:32 +04:00
|
|
|
*y, cx, cy));
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
/* find sides at top of line */
|
2004-02-11 20:15:36 +03:00
|
|
|
x0 += cx;
|
|
|
|
x1 += cx;
|
2002-06-19 01:24:21 +04:00
|
|
|
find_sides(cont->float_children, cy, cy, &x0, &x1, &left, &right);
|
2004-02-11 20:15:36 +03:00
|
|
|
x0 -= cx;
|
|
|
|
x1 -= cx;
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2006-03-27 01:41:18 +04:00
|
|
|
if (indent)
|
2006-09-10 17:27:08 +04:00
|
|
|
x0 += layout_text_indent(first->parent->parent->style, *width);
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2005-03-08 00:30:28 +03:00
|
|
|
if (x1 < x0)
|
|
|
|
x1 = x0;
|
|
|
|
|
2008-02-02 03:13:19 +03:00
|
|
|
/* get minimum line height from containing block.
|
|
|
|
* this is the line-height if there are text children and also in the
|
|
|
|
* case of an initially empty text input */
|
|
|
|
if (has_text_children || first->parent->parent->gadget)
|
2008-04-25 18:15:18 +04:00
|
|
|
used_height = height =
|
|
|
|
line_height(first->parent->parent->style);
|
2006-08-13 05:00:22 +04:00
|
|
|
else
|
|
|
|
/* inline containers with no text are usually for layout and
|
|
|
|
* look better with no minimum line-height */
|
|
|
|
used_height = height = 0;
|
2006-03-27 01:41:18 +04:00
|
|
|
|
2005-03-08 00:30:28 +03:00
|
|
|
/* pass 1: find height of line assuming sides at top of line: loop
|
2005-07-02 22:17:51 +04:00
|
|
|
* body executed at least once
|
|
|
|
* keep in sync with the loop in layout_minmax_line() */
|
2006-03-27 01:41:18 +04:00
|
|
|
LOG(("x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0));
|
2004-06-19 02:54:07 +04:00
|
|
|
for (x = 0, b = first; x <= x1 - x0 && b != 0; b = b->next) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
|
|
|
enum css_height_e htype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
2003-09-22 02:47:08 +04:00
|
|
|
assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK ||
|
2004-02-28 20:23:07 +03:00
|
|
|
b->type == BOX_FLOAT_LEFT ||
|
2004-04-18 19:19:53 +04:00
|
|
|
b->type == BOX_FLOAT_RIGHT ||
|
2005-06-06 00:54:37 +04:00
|
|
|
b->type == BOX_BR || b->type == BOX_TEXT ||
|
|
|
|
b->type == BOX_INLINE_END);
|
2006-03-27 01:41:18 +04:00
|
|
|
LOG(("pass 1: b %p, x %i", b, x));
|
2004-03-26 04:35:35 +03:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
if (b->type == BOX_BR)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT)
|
|
|
|
continue;
|
2006-11-04 22:17:11 +03:00
|
|
|
if (b->type == BOX_INLINE_BLOCK &&
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_position(b->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(b->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_FIXED))
|
2006-11-04 22:17:11 +03:00
|
|
|
continue;
|
2005-07-02 22:17:51 +04:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
assert(b->style != NULL);
|
|
|
|
font_plot_style_from_css(b->style, &fstyle);
|
|
|
|
|
2006-03-26 23:59:15 +04:00
|
|
|
x += space_after;
|
|
|
|
|
2004-03-26 04:35:35 +03:00
|
|
|
if (b->type == BOX_INLINE_BLOCK) {
|
2008-01-28 01:25:11 +03:00
|
|
|
if (b->max_width != UNKNOWN_WIDTH)
|
2006-09-10 17:27:08 +04:00
|
|
|
if (!layout_float(b, *width, content))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2009-07-24 03:05:34 +04:00
|
|
|
h = b->border[TOP].width + b->padding[TOP] + b->height +
|
2009-07-24 04:08:23 +04:00
|
|
|
b->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
b->border[BOTTOM].width;
|
2004-03-26 04:35:35 +03:00
|
|
|
if (height < h)
|
|
|
|
height = h;
|
2009-07-24 03:05:34 +04:00
|
|
|
x += b->margin[LEFT] + b->border[LEFT].width +
|
2004-03-26 04:35:35 +03:00
|
|
|
b->padding[LEFT] + b->width +
|
2009-07-24 04:08:23 +04:00
|
|
|
b->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
b->border[RIGHT].width +
|
2004-03-26 04:35:35 +03:00
|
|
|
b->margin[RIGHT];
|
2005-04-02 22:24:47 +04:00
|
|
|
space_after = 0;
|
2004-02-28 20:23:07 +03:00
|
|
|
continue;
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
2004-02-28 20:23:07 +03:00
|
|
|
|
2005-05-24 02:14:09 +04:00
|
|
|
if (b->type == BOX_INLINE) {
|
|
|
|
/* calculate borders, margins, and padding */
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(*width, -1, b, b->style, 0, 0,
|
2006-06-26 08:52:34 +04:00
|
|
|
0, 0, b->margin, b->padding, b->border);
|
2005-05-24 02:14:09 +04:00
|
|
|
for (i = 0; i != 4; i++)
|
|
|
|
if (b->margin[i] == AUTO)
|
|
|
|
b->margin[i] = 0;
|
2009-07-24 03:05:34 +04:00
|
|
|
x += b->margin[LEFT] + b->border[LEFT].width +
|
2006-01-16 01:25:40 +03:00
|
|
|
b->padding[LEFT];
|
2005-06-06 00:54:37 +04:00
|
|
|
if (b->inline_end) {
|
|
|
|
b->inline_end->margin[RIGHT] = b->margin[RIGHT];
|
|
|
|
b->inline_end->padding[RIGHT] =
|
|
|
|
b->padding[RIGHT];
|
|
|
|
b->inline_end->border[RIGHT] =
|
|
|
|
b->border[RIGHT];
|
2006-01-16 01:25:40 +03:00
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
x += b->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
b->border[RIGHT].width +
|
2006-01-16 01:25:40 +03:00
|
|
|
b->margin[RIGHT];
|
2005-06-06 00:54:37 +04:00
|
|
|
}
|
|
|
|
} else if (b->type == BOX_INLINE_END) {
|
|
|
|
b->width = 0;
|
|
|
|
if (b->space) {
|
|
|
|
/** \todo optimize out */
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, " ", 1,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
&space_after);
|
2005-06-06 00:54:37 +04:00
|
|
|
} else {
|
|
|
|
space_after = 0;
|
|
|
|
}
|
2009-07-24 03:05:34 +04:00
|
|
|
x += b->padding[RIGHT] + b->border[RIGHT].width +
|
2006-01-16 01:25:40 +03:00
|
|
|
b->margin[RIGHT];
|
2005-06-06 00:54:37 +04:00
|
|
|
continue;
|
2005-05-24 02:14:09 +04:00
|
|
|
}
|
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
if (!b->object && !b->gadget) {
|
|
|
|
/* inline non-replaced, 10.3.1 and 10.6.1 */
|
|
|
|
b->height = line_height(b->style ? b->style :
|
2004-02-28 20:23:07 +03:00
|
|
|
b->parent->parent->style);
|
2004-05-21 18:26:59 +04:00
|
|
|
if (height < b->height)
|
|
|
|
height = b->height;
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
if (!b->text) {
|
2004-05-21 18:26:59 +04:00
|
|
|
b->width = 0;
|
2005-04-02 22:24:47 +04:00
|
|
|
space_after = 0;
|
2005-07-02 22:17:51 +04:00
|
|
|
continue;
|
2005-04-02 22:24:47 +04:00
|
|
|
}
|
2003-01-07 02:53:40 +03:00
|
|
|
|
2008-02-11 20:53:00 +03:00
|
|
|
if (b->width == UNKNOWN_WIDTH) {
|
2008-10-13 16:30:23 +04:00
|
|
|
/** \todo handle errors */
|
2008-02-11 20:53:00 +03:00
|
|
|
|
|
|
|
/* If it's a select element, we must use the
|
|
|
|
* width of the widest option text */
|
|
|
|
if (b->parent->parent->gadget &&
|
|
|
|
b->parent->parent->gadget->type
|
|
|
|
== GADGET_SELECT) {
|
|
|
|
int opt_maxwidth = 0;
|
|
|
|
struct form_option *o;
|
|
|
|
|
|
|
|
for (o = b->parent->parent->gadget->
|
|
|
|
data.select.items; o;
|
|
|
|
o = o->next) {
|
|
|
|
int opt_width;
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
o->text,
|
2008-02-11 20:53:00 +03:00
|
|
|
strlen(o->text),
|
|
|
|
&opt_width);
|
|
|
|
|
|
|
|
if (opt_maxwidth < opt_width)
|
|
|
|
opt_maxwidth =opt_width;
|
|
|
|
}
|
|
|
|
b->width = opt_maxwidth;
|
2009-08-14 14:37:33 +04:00
|
|
|
if (option_core_select_menu)
|
|
|
|
b->width += SCROLLBAR_WIDTH;
|
2008-02-11 20:53:00 +03:00
|
|
|
} else {
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, b->text,
|
2008-02-11 20:53:00 +03:00
|
|
|
b->length, &b->width);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
x += b->width;
|
|
|
|
if (b->space)
|
|
|
|
/** \todo optimize out */
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, " ", 1,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
&space_after);
|
2005-07-02 22:17:51 +04:00
|
|
|
else
|
|
|
|
space_after = 0;
|
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-04-02 22:24:47 +04:00
|
|
|
space_after = 0;
|
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
/* inline replaced, 10.3.2 and 10.6.2 */
|
|
|
|
assert(b->style);
|
|
|
|
|
|
|
|
/* calculate box width */
|
2009-07-24 03:05:34 +04:00
|
|
|
wtype = css_computed_width(b->style, &value, &unit);
|
|
|
|
if (wtype == CSS_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
b->width = *width * FIXTOFLT(value) / 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
b->width = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
b->style));
|
|
|
|
}
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
b->width = AUTO;
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* height */
|
2009-07-24 03:05:34 +04:00
|
|
|
htype = css_computed_height(b->style, &value, &unit);
|
|
|
|
if (htype == CSS_HEIGHT_SET) {
|
2009-07-24 04:08:23 +04:00
|
|
|
b->height = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
b->style));
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
b->height = AUTO;
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
2009-07-24 04:08:23 +04:00
|
|
|
|
2004-06-03 01:21:13 +04:00
|
|
|
if (b->object) {
|
|
|
|
if (b->width == AUTO && b->height == AUTO) {
|
2004-05-21 18:26:59 +04:00
|
|
|
b->width = b->object->width;
|
|
|
|
b->height = b->object->height;
|
2004-06-03 01:21:13 +04:00
|
|
|
} else if (b->width == AUTO) {
|
|
|
|
if (b->object->height)
|
|
|
|
b->width = b->object->width *
|
|
|
|
(float) b->height /
|
|
|
|
b->object->height;
|
|
|
|
else
|
|
|
|
b->width = b->object->width;
|
|
|
|
} else if (b->height == AUTO) {
|
|
|
|
if (b->object->width)
|
|
|
|
b->height = b->object->height *
|
|
|
|
(float) b->width /
|
|
|
|
b->object->width;
|
|
|
|
else
|
|
|
|
b->height = b->object->height;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* form control with no object */
|
|
|
|
if (b->width == AUTO)
|
2009-07-24 04:08:23 +04:00
|
|
|
b->width = FIXTOINT(nscss_len2px(INTTOFIX(1),
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_UNIT_EM, b->style));
|
2004-06-03 01:21:13 +04:00
|
|
|
if (b->height == AUTO)
|
2009-07-24 04:08:23 +04:00
|
|
|
b->height = FIXTOINT(nscss_len2px(INTTOFIX(1),
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_UNIT_EM, b->style));
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (b->object && b->object->type == CONTENT_HTML &&
|
|
|
|
b->width != b->object->available_width) {
|
2009-07-24 03:05:34 +04:00
|
|
|
htype = css_computed_height(b->style, &value, &unit);
|
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
content_reformat(b->object, b->width, b->height);
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
if (htype == CSS_HEIGHT_AUTO)
|
2004-05-21 18:26:59 +04:00
|
|
|
b->height = b->object->height;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (height < b->height)
|
|
|
|
height = b->height;
|
|
|
|
|
|
|
|
x += b->width;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
/* find new sides using this height */
|
2004-02-11 20:15:36 +03:00
|
|
|
x0 = cx;
|
2006-09-10 17:27:08 +04:00
|
|
|
x1 = cx + *width;
|
2004-02-28 20:23:07 +03:00
|
|
|
find_sides(cont->float_children, cy, cy + height, &x0, &x1,
|
|
|
|
&left, &right);
|
2004-02-11 20:15:36 +03:00
|
|
|
x0 -= cx;
|
|
|
|
x1 -= cx;
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
if (indent)
|
2006-09-10 17:27:08 +04:00
|
|
|
x0 += layout_text_indent(first->parent->parent->style, *width);
|
2004-02-02 01:42:40 +03:00
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
if (x1 < x0)
|
|
|
|
x1 = x0;
|
2004-02-28 20:23:07 +03:00
|
|
|
|
2005-04-02 22:24:47 +04:00
|
|
|
space_after = space_before = 0;
|
|
|
|
|
2004-02-28 20:23:07 +03:00
|
|
|
/* pass 2: place boxes in line: loop body executed at least once */
|
2006-03-27 01:41:18 +04:00
|
|
|
LOG(("x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0));
|
2004-02-28 20:23:07 +03:00
|
|
|
for (x = x_previous = 0, b = first; x <= x1 - x0 && b; b = b->next) {
|
2006-03-27 01:41:18 +04:00
|
|
|
LOG(("pass 2: b %p, x %i", b, x));
|
2006-11-04 22:17:11 +03:00
|
|
|
if (b->type == BOX_INLINE_BLOCK &&
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_position(b->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(b->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_FIXED)) {
|
2006-11-04 22:17:11 +03:00
|
|
|
b->x = x + space_after;
|
|
|
|
|
|
|
|
} else if (b->type == BOX_INLINE ||
|
|
|
|
b->type == BOX_INLINE_BLOCK ||
|
2005-06-06 00:54:37 +04:00
|
|
|
b->type == BOX_TEXT ||
|
|
|
|
b->type == BOX_INLINE_END) {
|
2005-04-09 17:25:54 +04:00
|
|
|
assert(b->width != UNKNOWN_WIDTH);
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
x_previous = x;
|
|
|
|
x += space_after;
|
|
|
|
b->x = x;
|
|
|
|
|
2005-06-06 00:54:37 +04:00
|
|
|
if ((b->type == BOX_INLINE && !b->inline_end) ||
|
|
|
|
b->type == BOX_INLINE_BLOCK) {
|
2009-07-24 03:05:34 +04:00
|
|
|
b->x += b->margin[LEFT] + b->border[LEFT].width;
|
2004-03-26 04:35:35 +03:00
|
|
|
x = b->x + b->padding[LEFT] + b->width +
|
|
|
|
b->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
b->border[RIGHT].width +
|
2004-03-26 04:35:35 +03:00
|
|
|
b->margin[RIGHT];
|
2005-06-06 00:54:37 +04:00
|
|
|
} else if (b->type == BOX_INLINE) {
|
2009-07-24 03:05:34 +04:00
|
|
|
b->x += b->margin[LEFT] + b->border[LEFT].width;
|
2005-06-06 00:54:37 +04:00
|
|
|
x = b->x + b->padding[LEFT] + b->width;
|
|
|
|
} else if (b->type == BOX_INLINE_END) {
|
2009-08-07 19:52:00 +04:00
|
|
|
b->height = b->inline_end->height;
|
2009-07-24 04:08:23 +04:00
|
|
|
x += b->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
b->border[RIGHT].width +
|
2005-06-06 00:54:37 +04:00
|
|
|
b->margin[RIGHT];
|
|
|
|
} else {
|
2004-02-11 20:15:36 +03:00
|
|
|
x += b->width;
|
2005-06-06 00:54:37 +04:00
|
|
|
}
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2002-12-27 20:28:19 +03:00
|
|
|
space_before = space_after;
|
2003-09-10 01:43:44 +04:00
|
|
|
if (b->object)
|
|
|
|
space_after = 0;
|
2005-06-06 00:54:37 +04:00
|
|
|
else if (b->text || b->type == BOX_INLINE_END) {
|
2005-02-20 16:18:21 +03:00
|
|
|
space_after = 0;
|
2009-07-21 14:59:53 +04:00
|
|
|
if (b->space) {
|
2009-07-23 06:29:12 +04:00
|
|
|
font_plot_style_from_css(b->style,
|
2009-07-21 14:59:53 +04:00
|
|
|
&fstyle);
|
2005-02-20 16:18:21 +03:00
|
|
|
/** \todo handle errors, optimize */
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, " ", 1,
|
2005-02-20 16:18:21 +03:00
|
|
|
&space_after);
|
2009-07-21 14:59:53 +04:00
|
|
|
}
|
2005-02-20 16:18:21 +03:00
|
|
|
} else
|
2002-12-30 01:27:35 +03:00
|
|
|
space_after = 0;
|
2004-02-28 20:23:07 +03:00
|
|
|
split_box = b;
|
2004-04-18 19:19:53 +04:00
|
|
|
move_y = true;
|
2004-03-26 04:35:35 +03:00
|
|
|
inline_count++;
|
2004-04-18 19:19:53 +04:00
|
|
|
} else if (b->type == BOX_BR) {
|
|
|
|
b->x = x;
|
|
|
|
b->width = 0;
|
2005-08-08 01:28:48 +04:00
|
|
|
br_box = b;
|
2004-04-18 19:19:53 +04:00
|
|
|
b = b->next;
|
|
|
|
split_box = 0;
|
|
|
|
move_y = true;
|
|
|
|
break;
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
} else {
|
2003-04-13 16:50:10 +04:00
|
|
|
/* float */
|
2005-11-06 14:00:33 +03:00
|
|
|
LOG(("float %p", b));
|
2002-06-29 00:14:04 +04:00
|
|
|
d = b->children;
|
|
|
|
d->float_children = 0;
|
2008-10-13 01:45:38 +04:00
|
|
|
b->float_container = d->float_container = cont;
|
2004-02-11 20:15:36 +03:00
|
|
|
|
2006-09-10 17:27:08 +04:00
|
|
|
if (!layout_float(d, *width, content))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2009-07-24 04:08:23 +04:00
|
|
|
LOG(("%p : %d %d", d, d->margin[TOP],
|
2009-07-24 03:05:34 +04:00
|
|
|
d->border[TOP].width));
|
|
|
|
d->x = d->margin[LEFT] + d->border[LEFT].width;
|
|
|
|
d->y = d->margin[TOP] + d->border[TOP].width;
|
|
|
|
b->width = d->margin[LEFT] + d->border[LEFT].width +
|
2004-02-11 20:15:36 +03:00
|
|
|
d->padding[LEFT] + d->width +
|
2009-07-24 04:08:23 +04:00
|
|
|
d->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
d->border[RIGHT].width +
|
2004-02-11 20:15:36 +03:00
|
|
|
d->margin[RIGHT];
|
2009-07-24 03:05:34 +04:00
|
|
|
b->height = d->margin[TOP] + d->border[TOP].width +
|
2004-02-11 20:15:36 +03:00
|
|
|
d->padding[TOP] + d->height +
|
2009-07-24 04:08:23 +04:00
|
|
|
d->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
d->border[BOTTOM].width +
|
2004-02-11 20:15:36 +03:00
|
|
|
d->margin[BOTTOM];
|
2008-03-09 17:10:05 +03:00
|
|
|
|
2009-01-27 16:21:50 +03:00
|
|
|
if (b->width > (x1 - x0) - x)
|
|
|
|
place_below = true;
|
2009-07-24 04:08:23 +04:00
|
|
|
if (d->style && (css_computed_clear(d->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_CLEAR_NONE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_clear(d->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_CLEAR_LEFT && left == 0) ||
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_clear(d->style) ==
|
|
|
|
CSS_CLEAR_RIGHT &&
|
2009-07-24 03:05:34 +04:00
|
|
|
right == 0) ||
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_clear(d->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_CLEAR_BOTH &&
|
|
|
|
left == 0 && right == 0)) &&
|
2009-01-27 16:21:50 +03:00
|
|
|
(!place_below ||
|
2008-04-23 22:49:11 +04:00
|
|
|
(left == 0 && right == 0 && x == 0)) &&
|
|
|
|
cy >= cont->clear_level) {
|
2008-09-23 03:45:51 +04:00
|
|
|
/* + not cleared or,
|
|
|
|
* cleared and there are no floats to clear
|
2009-01-27 16:21:50 +03:00
|
|
|
* + fits without needing to be placed below or,
|
2008-09-23 23:38:16 +04:00
|
|
|
* this line is empty with no floats
|
2008-09-23 03:45:51 +04:00
|
|
|
* + current y, cy, is below the clear level
|
|
|
|
*
|
|
|
|
* Float affects current line */
|
2002-06-29 00:14:04 +04:00
|
|
|
if (b->type == BOX_FLOAT_LEFT) {
|
2004-04-22 02:27:49 +04:00
|
|
|
b->x = cx + x0;
|
2009-01-21 00:36:54 +03:00
|
|
|
if (b->width > 0) {
|
|
|
|
x0 += b->width;
|
|
|
|
left = b;
|
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
} else {
|
2004-04-22 02:27:49 +04:00
|
|
|
b->x = cx + x1 - b->width;
|
2009-01-21 00:36:54 +03:00
|
|
|
if (b->width > 0) {
|
|
|
|
x1 -= b->width;
|
|
|
|
right = b;
|
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2008-04-25 18:15:18 +04:00
|
|
|
b->y = cy;
|
2002-06-19 01:24:21 +04:00
|
|
|
} else {
|
2008-09-23 03:45:51 +04:00
|
|
|
/* cleared or doesn't fit on line */
|
2008-03-09 17:10:05 +03:00
|
|
|
/* place below into next available space */
|
2008-04-23 22:49:11 +04:00
|
|
|
fy = (cy > cont->clear_level) ? cy :
|
|
|
|
cont->clear_level;
|
|
|
|
|
2006-09-10 17:27:08 +04:00
|
|
|
place_float_below(b, *width,
|
2008-04-23 22:49:11 +04:00
|
|
|
cx, fy + height, cont);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (d->style && css_computed_clear(d->style) !=
|
2008-03-09 17:10:05 +03:00
|
|
|
CSS_CLEAR_NONE) {
|
|
|
|
/* to be cleared below existing
|
|
|
|
* floats */
|
2009-02-02 15:56:15 +03:00
|
|
|
if (b->type == BOX_FLOAT_LEFT)
|
2008-03-09 17:10:05 +03:00
|
|
|
b->x = cx;
|
2009-02-02 15:56:15 +03:00
|
|
|
else
|
2008-03-09 17:10:05 +03:00
|
|
|
b->x = cx + *width - b->width;
|
2009-02-02 15:56:15 +03:00
|
|
|
|
2008-03-09 17:10:05 +03:00
|
|
|
fy = layout_clear(cont->float_children,
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_clear(d->style));
|
2008-04-23 22:49:11 +04:00
|
|
|
if (fy > cont->clear_level)
|
|
|
|
cont->clear_level = fy;
|
2008-03-09 17:10:05 +03:00
|
|
|
if (b->y < fy)
|
|
|
|
b->y = fy;
|
|
|
|
}
|
2009-02-02 15:56:15 +03:00
|
|
|
if (b->type == BOX_FLOAT_LEFT)
|
|
|
|
left = b;
|
|
|
|
else
|
|
|
|
right = b;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2005-11-06 14:00:33 +03:00
|
|
|
if (cont->float_children == b) {
|
|
|
|
LOG(("float %p already placed", b));
|
2007-08-20 06:39:49 +04:00
|
|
|
box_dump(stderr, cont, 0);
|
2005-11-06 14:00:33 +03:00
|
|
|
assert(0);
|
|
|
|
}
|
2002-06-19 01:24:21 +04:00
|
|
|
b->next_float = cont->float_children;
|
|
|
|
cont->float_children = b;
|
2004-02-28 20:23:07 +03:00
|
|
|
split_box = 0;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-02-28 20:23:07 +03:00
|
|
|
if (x1 - x0 < x && split_box) {
|
2002-06-19 01:24:21 +04:00
|
|
|
/* the last box went over the end */
|
2004-02-28 20:23:07 +03:00
|
|
|
unsigned int i;
|
2005-02-20 16:18:21 +03:00
|
|
|
size_t space = 0;
|
2004-02-11 20:15:36 +03:00
|
|
|
int w;
|
2002-06-19 01:24:21 +04:00
|
|
|
struct box * c2;
|
|
|
|
|
2002-12-27 20:28:19 +03:00
|
|
|
x = x_previous;
|
|
|
|
|
2005-05-23 01:50:14 +04:00
|
|
|
if ((split_box->type == BOX_INLINE ||
|
|
|
|
split_box->type == BOX_TEXT) &&
|
|
|
|
!split_box->object &&
|
2004-03-26 04:35:35 +03:00
|
|
|
!split_box->gadget && split_box->text) {
|
2008-03-21 02:07:55 +03:00
|
|
|
/* skip leading spaces, otherwise code gets fooled into
|
|
|
|
* thinking it's all one long word */
|
2004-02-28 20:23:07 +03:00
|
|
|
for (i = 0; i != split_box->length &&
|
2006-09-10 17:59:19 +04:00
|
|
|
split_box->text[i] == ' '; i++)
|
|
|
|
;
|
|
|
|
/* find end of word */
|
|
|
|
for (; i != split_box->length &&
|
2004-02-28 20:23:07 +03:00
|
|
|
split_box->text[i] != ' '; i++)
|
|
|
|
;
|
2004-03-15 01:49:14 +03:00
|
|
|
if (i != split_box->length)
|
2004-02-28 20:23:07 +03:00
|
|
|
space = i;
|
|
|
|
}
|
2002-12-27 20:28:19 +03:00
|
|
|
|
2004-02-28 20:23:07 +03:00
|
|
|
/* space != 0 implies split_box->text != 0 */
|
2003-01-07 02:53:40 +03:00
|
|
|
|
2002-06-21 22:16:24 +04:00
|
|
|
if (space == 0)
|
2004-02-28 20:23:07 +03:00
|
|
|
w = split_box->width;
|
2009-07-21 14:59:53 +04:00
|
|
|
else {
|
|
|
|
font_plot_style_from_css(split_box->style, &fstyle);
|
2005-02-20 16:18:21 +03:00
|
|
|
/** \todo handle errors */
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, split_box->text,
|
2005-02-20 16:18:21 +03:00
|
|
|
space, &w);
|
2009-07-21 14:59:53 +04:00
|
|
|
}
|
2002-06-21 22:16:24 +04:00
|
|
|
|
2006-04-09 22:59:07 +04:00
|
|
|
LOG(("splitting: split_box %p \"%.*s\", space %zu, w %i, "
|
|
|
|
"left %p, right %p, inline_count %u",
|
|
|
|
split_box, (int) split_box->length,
|
|
|
|
split_box->text, space, w,
|
|
|
|
left, right, inline_count));
|
|
|
|
|
2004-03-26 04:35:35 +03:00
|
|
|
if ((space == 0 || x1 - x0 <= x + space_before + w) &&
|
|
|
|
!left && !right && inline_count == 1) {
|
2006-04-09 22:59:07 +04:00
|
|
|
/* first word of box doesn't fit, but no floats and
|
|
|
|
* first box on line so force in */
|
2002-06-21 22:16:24 +04:00
|
|
|
if (space == 0) {
|
2003-01-07 02:53:40 +03:00
|
|
|
/* only one word in this box or not text */
|
2004-02-28 20:23:07 +03:00
|
|
|
b = split_box->next;
|
2002-06-21 22:16:24 +04:00
|
|
|
} else {
|
2002-12-27 20:28:19 +03:00
|
|
|
/* cut off first word for this line */
|
2005-04-09 13:47:37 +04:00
|
|
|
c2 = talloc_memdup(content, split_box,
|
|
|
|
sizeof *c2);
|
2004-06-03 01:21:13 +04:00
|
|
|
if (!c2)
|
|
|
|
return false;
|
2005-04-09 13:47:37 +04:00
|
|
|
c2->text = talloc_strndup(content,
|
|
|
|
split_box->text + space + 1,
|
|
|
|
split_box->length -(space + 1));
|
2004-06-03 01:21:13 +04:00
|
|
|
if (!c2->text)
|
|
|
|
return false;
|
2004-02-28 20:23:07 +03:00
|
|
|
c2->length = split_box->length - (space + 1);
|
2002-09-19 23:54:43 +04:00
|
|
|
c2->width = UNKNOWN_WIDTH;
|
2003-09-10 01:43:44 +04:00
|
|
|
c2->clone = 1;
|
2004-02-28 20:23:07 +03:00
|
|
|
split_box->length = space;
|
|
|
|
split_box->width = w;
|
|
|
|
split_box->space = 1;
|
|
|
|
c2->next = split_box->next;
|
|
|
|
split_box->next = c2;
|
|
|
|
c2->prev = split_box;
|
2003-09-24 01:48:22 +04:00
|
|
|
if (c2->next)
|
|
|
|
c2->next->prev = c2;
|
|
|
|
else
|
2003-09-23 22:35:44 +04:00
|
|
|
c2->parent->last = c2;
|
2002-06-21 22:16:24 +04:00
|
|
|
b = c2;
|
|
|
|
}
|
2002-12-27 20:28:19 +03:00
|
|
|
x += space_before + w;
|
2006-04-09 22:59:07 +04:00
|
|
|
LOG(("forcing"));
|
|
|
|
} else if ((space == 0 || x1 - x0 <= x + space_before + w) &&
|
|
|
|
inline_count == 1) {
|
|
|
|
/* first word of first box doesn't fit, but a float is
|
|
|
|
* taking some of the width so move below it */
|
|
|
|
assert(left || right);
|
|
|
|
used_height = 0;
|
|
|
|
if (left) {
|
|
|
|
LOG(("cy %i, left->y %i, left->height %i",
|
|
|
|
cy, left->y, left->height));
|
|
|
|
used_height = left->y + left->height - cy + 1;
|
|
|
|
LOG(("used_height %i", used_height));
|
|
|
|
}
|
|
|
|
if (right && used_height <
|
|
|
|
right->y + right->height - cy + 1)
|
|
|
|
used_height = right->y + right->height - cy + 1;
|
|
|
|
assert(0 < used_height);
|
|
|
|
b = split_box;
|
|
|
|
LOG(("moving below float"));
|
|
|
|
} else if (space == 0 || x1 - x0 <= x + space_before + w) {
|
|
|
|
/* first word of box doesn't fit so leave box for next
|
|
|
|
* line */
|
2004-02-28 20:23:07 +03:00
|
|
|
b = split_box;
|
2006-04-09 22:59:07 +04:00
|
|
|
LOG(("leaving for next line"));
|
2003-01-07 02:53:40 +03:00
|
|
|
} else {
|
2002-06-19 01:24:21 +04:00
|
|
|
/* fit as many words as possible */
|
2002-06-21 22:16:24 +04:00
|
|
|
assert(space != 0);
|
2009-07-21 14:59:53 +04:00
|
|
|
font_plot_style_from_css(split_box->style, &fstyle);
|
2005-02-20 16:18:21 +03:00
|
|
|
/** \todo handle errors */
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_split(&fstyle,
|
2005-02-20 16:18:21 +03:00
|
|
|
split_box->text, split_box->length,
|
|
|
|
x1 - x0 - x - space_before, &space, &w);
|
2005-07-24 18:29:32 +04:00
|
|
|
LOG(("'%.*s' %i %zu %i", (int) split_box->length,
|
2004-02-28 20:23:07 +03:00
|
|
|
split_box->text, x1 - x0, space, w));
|
|
|
|
if (space == 0)
|
|
|
|
space = 1;
|
2005-02-20 16:18:21 +03:00
|
|
|
if (space != split_box->length) {
|
2005-04-09 13:47:37 +04:00
|
|
|
c2 = talloc_memdup(content, split_box,
|
|
|
|
sizeof *c2);
|
2005-02-20 16:18:21 +03:00
|
|
|
if (!c2)
|
|
|
|
return false;
|
2005-04-09 13:47:37 +04:00
|
|
|
c2->text = talloc_strndup(content,
|
|
|
|
split_box->text + space + 1,
|
|
|
|
split_box->length -(space + 1));
|
2005-02-20 16:18:21 +03:00
|
|
|
if (!c2->text)
|
|
|
|
return false;
|
|
|
|
c2->length = split_box->length - (space + 1);
|
|
|
|
c2->width = UNKNOWN_WIDTH;
|
|
|
|
c2->clone = 1;
|
|
|
|
split_box->length = space;
|
|
|
|
split_box->width = w;
|
|
|
|
split_box->space = 1;
|
|
|
|
c2->next = split_box->next;
|
|
|
|
split_box->next = c2;
|
|
|
|
c2->prev = split_box;
|
|
|
|
if (c2->next)
|
|
|
|
c2->next->prev = c2;
|
|
|
|
else
|
|
|
|
c2->parent->last = c2;
|
|
|
|
b = c2;
|
|
|
|
}
|
2002-12-27 20:28:19 +03:00
|
|
|
x += space_before + w;
|
2006-04-09 22:59:07 +04:00
|
|
|
LOG(("fitting words"));
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2004-04-18 19:19:53 +04:00
|
|
|
move_y = true;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
/* set positions */
|
2009-07-24 03:05:34 +04:00
|
|
|
switch (css_computed_text_align(first->parent->parent->style)) {
|
2008-10-12 19:34:43 +04:00
|
|
|
case CSS_TEXT_ALIGN_RIGHT:
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_RIGHT:
|
2008-10-12 19:34:43 +04:00
|
|
|
x0 = x1 - x;
|
|
|
|
break;
|
|
|
|
case CSS_TEXT_ALIGN_CENTER:
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_CENTER:
|
2008-10-12 19:34:43 +04:00
|
|
|
x0 = (x0 + (x1 - x)) / 2;
|
|
|
|
break;
|
2009-08-21 21:05:22 +04:00
|
|
|
case CSS_TEXT_ALIGN_LEFT:
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_TEXT_ALIGN_LIBCSS_LEFT:
|
2009-08-21 21:05:22 +04:00
|
|
|
case CSS_TEXT_ALIGN_JUSTIFY:
|
2008-10-12 19:34:43 +04:00
|
|
|
/* leave on left */
|
|
|
|
break;
|
2009-08-21 21:05:22 +04:00
|
|
|
case CSS_TEXT_ALIGN_DEFAULT:
|
2009-08-22 13:56:41 +04:00
|
|
|
/* None; consider text direction */
|
|
|
|
switch (css_computed_direction(first->parent->parent->style)) {
|
|
|
|
case CSS_DIRECTION_LTR:
|
2009-08-21 21:05:22 +04:00
|
|
|
/* leave on left */
|
|
|
|
break;
|
2009-08-22 13:56:41 +04:00
|
|
|
case CSS_DIRECTION_RTL:
|
|
|
|
x0 = x1 - x;
|
2009-08-21 21:05:22 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2002-06-19 19:17:45 +04:00
|
|
|
}
|
2004-02-02 01:42:40 +03:00
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
for (d = first; d != b; d = d->next) {
|
2008-12-21 18:51:23 +03:00
|
|
|
d->inline_new_line = false;
|
2008-01-27 14:59:01 +03:00
|
|
|
if (d->type == BOX_INLINE || d->type == BOX_BR ||
|
|
|
|
d->type == BOX_TEXT ||
|
2005-06-06 00:54:37 +04:00
|
|
|
d->type == BOX_INLINE_END) {
|
2002-06-19 01:24:21 +04:00
|
|
|
d->x += x0;
|
2005-05-24 02:14:09 +04:00
|
|
|
d->y = *y - d->padding[TOP];
|
|
|
|
}
|
2008-01-28 03:58:31 +03:00
|
|
|
if ((d->type == BOX_INLINE && (d->object || d->gadget)) ||
|
|
|
|
d->type == BOX_INLINE_BLOCK) {
|
2009-07-24 03:05:34 +04:00
|
|
|
d->y = *y + d->border[TOP].width + d->margin[TOP];
|
2008-01-27 14:59:01 +03:00
|
|
|
}
|
2008-01-28 05:01:04 +03:00
|
|
|
if (d->type == BOX_INLINE_BLOCK) {
|
|
|
|
d->x += x0;
|
|
|
|
}
|
2006-11-04 22:17:11 +03:00
|
|
|
if (d->type == BOX_INLINE_BLOCK &&
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_position(d->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(d->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_FIXED))
|
2006-11-04 22:17:11 +03:00
|
|
|
continue;
|
2005-05-24 02:14:09 +04:00
|
|
|
if ((d->type == BOX_INLINE && (d->object || d->gadget)) ||
|
|
|
|
d->type == BOX_INLINE_BLOCK) {
|
2009-07-24 04:08:23 +04:00
|
|
|
h = d->margin[TOP] + d->border[TOP].width +
|
|
|
|
d->padding[TOP] + d->height +
|
|
|
|
d->padding[BOTTOM] +
|
|
|
|
d->border[BOTTOM].width +
|
2009-07-24 03:05:34 +04:00
|
|
|
d->margin[BOTTOM];
|
2004-03-26 04:35:35 +03:00
|
|
|
if (used_height < h)
|
|
|
|
used_height = h;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2009-02-02 16:54:48 +03:00
|
|
|
if (d->type == BOX_TEXT && d->height > used_height)
|
|
|
|
used_height = d->height;
|
2009-01-31 16:26:28 +03:00
|
|
|
|
2009-02-02 16:54:48 +03:00
|
|
|
}
|
2009-01-31 16:26:28 +03:00
|
|
|
|
2008-12-21 18:51:23 +03:00
|
|
|
first->inline_new_line = true;
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2004-03-26 04:35:35 +03:00
|
|
|
assert(b != first || (move_y && 0 < used_height && (left || right)));
|
2005-08-01 01:57:07 +04:00
|
|
|
|
2009-08-07 17:00:28 +04:00
|
|
|
/* handle vertical-align by adjusting box y values */
|
|
|
|
/** \todo proper vertical alignment handling */
|
2009-07-23 06:29:12 +04:00
|
|
|
for (d = first; d != b; d = d->next) {
|
2009-07-24 04:08:23 +04:00
|
|
|
if ((d->type == BOX_INLINE && d->inline_end) ||
|
|
|
|
d->type == BOX_BR ||
|
2009-07-23 06:29:12 +04:00
|
|
|
d->type == BOX_TEXT ||
|
|
|
|
d->type == BOX_INLINE_END) {
|
2009-08-07 17:00:28 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
switch (css_computed_vertical_align(d->style, &value,
|
|
|
|
&unit)) {
|
|
|
|
case CSS_VERTICAL_ALIGN_SUPER:
|
|
|
|
case CSS_VERTICAL_ALIGN_TOP:
|
|
|
|
case CSS_VERTICAL_ALIGN_TEXT_TOP:
|
|
|
|
/* already at top */
|
|
|
|
break;
|
|
|
|
case CSS_VERTICAL_ALIGN_SUB:
|
|
|
|
case CSS_VERTICAL_ALIGN_BOTTOM:
|
|
|
|
case CSS_VERTICAL_ALIGN_TEXT_BOTTOM:
|
|
|
|
d->y += used_height - d->height;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
case CSS_VERTICAL_ALIGN_BASELINE:
|
|
|
|
d->y += 0.75 * (used_height - d->height);
|
|
|
|
break;
|
|
|
|
}
|
2009-07-23 06:29:12 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-01 01:57:07 +04:00
|
|
|
/* handle clearance for br */
|
2009-07-24 03:05:34 +04:00
|
|
|
if (br_box && css_computed_clear(br_box->style) != CSS_CLEAR_NONE) {
|
2005-08-01 01:57:07 +04:00
|
|
|
int clear_y = layout_clear(cont->float_children,
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_clear(br_box->style));
|
2005-08-01 01:57:07 +04:00
|
|
|
if (used_height < clear_y - cy)
|
|
|
|
used_height = clear_y - cy;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (move_y)
|
|
|
|
*y += used_height;
|
2004-06-03 01:21:13 +04:00
|
|
|
*next_box = b;
|
2006-09-10 17:27:08 +04:00
|
|
|
*width = x; /* return actual width */
|
2004-06-03 01:21:13 +04:00
|
|
|
return true;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
|
|
|
|
2002-06-19 01:24:21 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/**
|
|
|
|
* Calculate minimum and maximum width of a line.
|
|
|
|
*
|
|
|
|
* \param first a box in an inline container
|
|
|
|
* \param line_min updated to minimum width of line starting at first
|
|
|
|
* \param line_max updated to maximum width of line starting at first
|
|
|
|
* \return first box in next line, or 0 if no more lines
|
2005-07-22 01:48:41 +04:00
|
|
|
* \post 0 <= *line_min <= *line_max
|
2005-07-02 22:17:51 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
struct box *layout_minmax_line(struct box *first,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
int *line_min, int *line_max,
|
|
|
|
const struct font_functions *font_func)
|
2005-07-02 22:17:51 +04:00
|
|
|
{
|
2005-07-03 03:37:41 +04:00
|
|
|
int min = 0, max = 0, width, height, fixed;
|
|
|
|
float frac;
|
2005-07-02 22:17:51 +04:00
|
|
|
size_t i, j;
|
|
|
|
struct box *b;
|
2009-07-21 14:59:53 +04:00
|
|
|
plot_font_style_t fstyle;
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* corresponds to the pass 1 loop in layout_line() */
|
|
|
|
for (b = first; b; b = b->next) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
|
|
|
enum css_height_e htype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK ||
|
|
|
|
b->type == BOX_FLOAT_LEFT ||
|
|
|
|
b->type == BOX_FLOAT_RIGHT ||
|
|
|
|
b->type == BOX_BR || b->type == BOX_TEXT ||
|
|
|
|
b->type == BOX_INLINE_END);
|
|
|
|
|
2005-07-03 03:37:41 +04:00
|
|
|
LOG(("%p: min %i, max %i", b, min, max));
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
if (b->type == BOX_BR) {
|
|
|
|
b = b->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) {
|
|
|
|
assert(b->children);
|
|
|
|
if (b->children->type == BOX_BLOCK)
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(b->children, font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
else
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_table(b->children, font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
b->min_width = b->children->min_width;
|
|
|
|
b->max_width = b->children->max_width;
|
|
|
|
if (min < b->min_width)
|
|
|
|
min = b->min_width;
|
|
|
|
max += b->max_width;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (b->type == BOX_INLINE_BLOCK) {
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(b, font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
if (min < b->min_width)
|
|
|
|
min = b->min_width;
|
|
|
|
max += b->max_width;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
assert(b->style);
|
|
|
|
font_plot_style_from_css(b->style, &fstyle);
|
|
|
|
|
2008-02-03 17:24:46 +03:00
|
|
|
if (b->type == BOX_INLINE && !b->object) {
|
2005-07-03 03:37:41 +04:00
|
|
|
fixed = frac = 0;
|
2009-05-01 22:00:01 +04:00
|
|
|
calculate_mbp_width(b->style, LEFT, true, true, true,
|
|
|
|
&fixed, &frac);
|
2005-07-03 03:37:41 +04:00
|
|
|
if (!b->inline_end)
|
|
|
|
calculate_mbp_width(b->style, RIGHT,
|
2009-05-01 22:00:01 +04:00
|
|
|
true, true, true,
|
2005-07-03 03:37:41 +04:00
|
|
|
&fixed, &frac);
|
2005-07-21 02:08:56 +04:00
|
|
|
if (0 < fixed)
|
|
|
|
max += fixed;
|
2005-07-03 03:37:41 +04:00
|
|
|
/* \todo update min width, consider fractional extra */
|
2005-07-02 22:17:51 +04:00
|
|
|
} else if (b->type == BOX_INLINE_END) {
|
2005-07-03 03:37:41 +04:00
|
|
|
fixed = frac = 0;
|
|
|
|
calculate_mbp_width(b->inline_end->style, RIGHT,
|
2009-05-01 22:00:01 +04:00
|
|
|
true, true, true,
|
2005-07-03 03:37:41 +04:00
|
|
|
&fixed, &frac);
|
2005-07-21 02:08:56 +04:00
|
|
|
if (0 < fixed)
|
|
|
|
max += fixed;
|
2005-07-03 03:37:41 +04:00
|
|
|
if (b->next && b->space) {
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, " ", 1, &width);
|
2005-07-03 03:37:41 +04:00
|
|
|
max += width;
|
|
|
|
}
|
2005-07-02 22:17:51 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!b->object && !b->gadget) {
|
|
|
|
/* inline non-replaced, 10.3.1 and 10.6.1 */
|
|
|
|
if (!b->text)
|
|
|
|
continue;
|
|
|
|
|
2008-02-11 20:53:00 +03:00
|
|
|
if (b->width == UNKNOWN_WIDTH) {
|
2008-10-13 16:30:23 +04:00
|
|
|
/** \todo handle errors */
|
2008-02-11 20:53:00 +03:00
|
|
|
|
|
|
|
/* If it's a select element, we must use the
|
|
|
|
* width of the widest option text */
|
|
|
|
if (b->parent->parent->gadget &&
|
|
|
|
b->parent->parent->gadget->type
|
|
|
|
== GADGET_SELECT) {
|
|
|
|
int opt_maxwidth = 0;
|
|
|
|
struct form_option *o;
|
|
|
|
|
|
|
|
for (o = b->parent->parent->gadget->
|
|
|
|
data.select.items; o;
|
|
|
|
o = o->next) {
|
|
|
|
int opt_width;
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle,
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
o->text,
|
2008-02-11 20:53:00 +03:00
|
|
|
strlen(o->text),
|
|
|
|
&opt_width);
|
|
|
|
|
|
|
|
if (opt_maxwidth < opt_width)
|
|
|
|
opt_maxwidth =opt_width;
|
|
|
|
}
|
|
|
|
|
|
|
|
b->width = opt_maxwidth;
|
2009-08-14 14:37:33 +04:00
|
|
|
if (option_core_select_menu)
|
|
|
|
b->width += SCROLLBAR_WIDTH;
|
2009-08-31 14:39:32 +04:00
|
|
|
|
2008-02-11 20:53:00 +03:00
|
|
|
} else {
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, b->text,
|
2008-02-11 20:53:00 +03:00
|
|
|
b->length, &b->width);
|
|
|
|
}
|
|
|
|
}
|
2005-07-02 22:17:51 +04:00
|
|
|
max += b->width;
|
|
|
|
if (b->next && b->space) {
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, " ", 1, &width);
|
2005-07-02 22:17:51 +04:00
|
|
|
max += width;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* min = widest word */
|
|
|
|
i = 0;
|
|
|
|
do {
|
|
|
|
for (j = i; j != b->length &&
|
|
|
|
b->text[j] != ' '; j++)
|
|
|
|
;
|
2009-07-21 14:59:53 +04:00
|
|
|
font_func->font_width(&fstyle, b->text + i,
|
2005-07-02 22:17:51 +04:00
|
|
|
j - i, &width);
|
|
|
|
if (min < width)
|
|
|
|
min = width;
|
|
|
|
i = j + 1;
|
|
|
|
} while (j != b->length);
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* inline replaced, 10.3.2 and 10.6.2 */
|
|
|
|
assert(b->style);
|
|
|
|
|
|
|
|
/* calculate box width */
|
2009-07-24 03:05:34 +04:00
|
|
|
wtype = css_computed_width(b->style, &value, &unit);
|
|
|
|
if (wtype == CSS_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
/*
|
|
|
|
b->width = width * FIXTOFLT(value) / 100
|
|
|
|
*/
|
2009-07-27 14:22:44 +04:00
|
|
|
|
|
|
|
width = AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
width = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
b->style));
|
|
|
|
if (width < 0)
|
|
|
|
width = 0;
|
|
|
|
}
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
width = AUTO;
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* height */
|
2009-07-24 03:05:34 +04:00
|
|
|
htype = css_computed_height(b->style, &value, &unit);
|
|
|
|
if (htype == CSS_HEIGHT_SET) {
|
|
|
|
height = FIXTOINT(nscss_len2px(value, unit, b->style));
|
|
|
|
} else {
|
2008-10-12 19:34:43 +04:00
|
|
|
height = AUTO;
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (b->object) {
|
|
|
|
if (width == AUTO && height == AUTO) {
|
|
|
|
width = b->object->width;
|
|
|
|
} else if (width == AUTO) {
|
|
|
|
if (b->object->height)
|
|
|
|
width = b->object->width *
|
|
|
|
(float) height /
|
|
|
|
b->object->height;
|
|
|
|
else
|
|
|
|
width = b->object->width;
|
|
|
|
}
|
2008-02-03 17:24:46 +03:00
|
|
|
fixed = frac = 0;
|
2009-05-01 22:00:01 +04:00
|
|
|
calculate_mbp_width(b->style, LEFT, true, true, true,
|
|
|
|
&fixed, &frac);
|
|
|
|
calculate_mbp_width(b->style, RIGHT, true, true, true,
|
|
|
|
&fixed, &frac);
|
2009-08-01 04:26:02 +04:00
|
|
|
|
|
|
|
if (0 < width + fixed)
|
|
|
|
width += fixed;
|
2005-07-02 22:17:51 +04:00
|
|
|
} else {
|
|
|
|
/* form control with no object */
|
|
|
|
if (width == AUTO)
|
2009-07-24 04:08:23 +04:00
|
|
|
width = FIXTOINT(nscss_len2px(INTTOFIX(1),
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_UNIT_EM, b->style));
|
2005-07-02 22:17:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (min < width)
|
|
|
|
min = width;
|
|
|
|
max += width;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* \todo first line text-indent */
|
|
|
|
|
|
|
|
*line_min = min;
|
|
|
|
*line_max = max;
|
2005-07-03 03:37:41 +04:00
|
|
|
LOG(("line_min %i, line_max %i", min, max));
|
2005-07-02 22:17:51 +04:00
|
|
|
|
|
|
|
assert(b != first);
|
2005-07-22 01:48:41 +04:00
|
|
|
assert(0 <= *line_min && *line_min <= *line_max);
|
2005-07-02 22:17:51 +04:00
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-28 20:23:07 +03:00
|
|
|
/**
|
|
|
|
* Calculate the text-indent length.
|
|
|
|
*
|
|
|
|
* \param style style of block
|
|
|
|
* \param width width of containing block
|
|
|
|
* \return length of indent
|
|
|
|
*/
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
int layout_text_indent(const css_computed_style *style, int width)
|
2004-02-28 20:23:07 +03:00
|
|
|
{
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
css_computed_text_indent(style, &value, &unit);
|
|
|
|
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
return width * FIXTOFLT(value) / 100;
|
|
|
|
} else {
|
|
|
|
return FIXTOINT(nscss_len2px(value, unit, style));
|
2004-02-28 20:23:07 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-26 04:35:35 +03:00
|
|
|
/**
|
|
|
|
* Layout the contents of a float or inline block.
|
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param b float or inline block box
|
2004-03-26 04:35:35 +03:00
|
|
|
* \param width available width
|
2005-04-09 13:47:37 +04:00
|
|
|
* \param content memory pool for any new boxes
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2004-03-26 04:35:35 +03:00
|
|
|
*/
|
|
|
|
|
2005-04-09 13:47:37 +04:00
|
|
|
bool layout_float(struct box *b, int width, struct content *content)
|
2004-03-26 04:35:35 +03:00
|
|
|
{
|
2006-11-05 15:58:24 +03:00
|
|
|
assert(b->type == BOX_TABLE || b->type == BOX_BLOCK ||
|
|
|
|
b->type == BOX_INLINE_BLOCK);
|
2004-03-26 04:35:35 +03:00
|
|
|
layout_float_find_dimensions(width, b->style, b);
|
2004-04-12 04:00:47 +04:00
|
|
|
if (b->type == BOX_TABLE) {
|
2005-04-09 13:47:37 +04:00
|
|
|
if (!layout_table(b, width, content))
|
2004-06-03 01:21:13 +04:00
|
|
|
return false;
|
2004-04-12 04:00:47 +04:00
|
|
|
if (b->margin[LEFT] == AUTO)
|
|
|
|
b->margin[LEFT] = 0;
|
|
|
|
if (b->margin[RIGHT] == AUTO)
|
|
|
|
b->margin[RIGHT] = 0;
|
2007-03-25 00:03:36 +03:00
|
|
|
if (b->margin[TOP] == AUTO)
|
|
|
|
b->margin[TOP] = 0;
|
|
|
|
if (b->margin[BOTTOM] == AUTO)
|
|
|
|
b->margin[BOTTOM] = 0;
|
2004-04-12 04:00:47 +04:00
|
|
|
} else
|
2009-05-07 20:22:38 +04:00
|
|
|
return layout_block_context(b, -1, content);
|
2004-06-03 01:21:13 +04:00
|
|
|
return true;
|
2004-03-26 04:35:35 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-11 20:15:36 +03:00
|
|
|
/**
|
|
|
|
* Position a float in the first available space.
|
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param c float box to position
|
2004-02-11 20:15:36 +03:00
|
|
|
* \param width available width
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param cx x coordinate relative to cont to place float right of
|
|
|
|
* \param y y coordinate relative to cont to place float below
|
|
|
|
* \param cont ancestor box which defines horizontal space, for floats
|
2004-02-11 20:15:36 +03:00
|
|
|
*/
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2004-04-22 02:27:49 +04:00
|
|
|
void place_float_below(struct box *c, int width, int cx, int y,
|
2004-02-11 20:15:36 +03:00
|
|
|
struct box *cont)
|
2002-06-19 01:24:21 +04:00
|
|
|
{
|
2004-02-11 20:15:36 +03:00
|
|
|
int x0, x1, yy = y;
|
2009-01-27 16:21:50 +03:00
|
|
|
struct box *left;
|
|
|
|
struct box *right;
|
2005-08-07 03:34:30 +04:00
|
|
|
LOG(("c %p, width %i, cx %i, y %i, cont %p", c, width, cx, y, cont));
|
2002-06-19 01:24:21 +04:00
|
|
|
do {
|
|
|
|
y = yy;
|
2004-04-22 02:27:49 +04:00
|
|
|
x0 = cx;
|
|
|
|
x1 = cx + width;
|
2009-01-27 16:21:50 +03:00
|
|
|
find_sides(cont->float_children, y, y + c->height, &x0, &x1,
|
|
|
|
&left, &right);
|
2002-06-19 01:24:21 +04:00
|
|
|
if (left != 0 && right != 0) {
|
2005-07-02 22:17:51 +04:00
|
|
|
yy = (left->y + left->height <
|
|
|
|
right->y + right->height ?
|
|
|
|
left->y + left->height :
|
2008-03-07 21:36:04 +03:00
|
|
|
right->y + right->height);
|
2002-06-19 01:24:21 +04:00
|
|
|
} else if (left == 0 && right != 0) {
|
2008-03-07 21:36:04 +03:00
|
|
|
yy = right->y + right->height;
|
2002-06-19 01:24:21 +04:00
|
|
|
} else if (left != 0 && right == 0) {
|
2008-03-07 21:36:04 +03:00
|
|
|
yy = left->y + left->height;
|
2002-06-19 01:24:21 +04:00
|
|
|
}
|
2008-03-08 00:39:06 +03:00
|
|
|
} while (!((left == 0 && right == 0) || (c->width <= x1 - x0)));
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2002-06-29 00:14:04 +04:00
|
|
|
if (c->type == BOX_FLOAT_LEFT) {
|
2002-06-19 01:24:21 +04:00
|
|
|
c->x = x0;
|
|
|
|
} else {
|
|
|
|
c->x = x1 - c->width;
|
|
|
|
}
|
|
|
|
c->y = y;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-04 23:57:18 +04:00
|
|
|
/**
|
2004-05-21 18:26:59 +04:00
|
|
|
* Layout a table.
|
2004-06-03 01:21:13 +04:00
|
|
|
*
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param table table to layout
|
2004-12-02 00:48:11 +03:00
|
|
|
* \param available_width width of containing block
|
2005-04-14 23:54:24 +04:00
|
|
|
* \param content memory pool for any new boxes
|
2004-06-03 01:21:13 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
2002-05-04 23:57:18 +04:00
|
|
|
*/
|
|
|
|
|
2004-06-03 01:21:13 +04:00
|
|
|
bool layout_table(struct box *table, int available_width,
|
2005-04-09 13:47:37 +04:00
|
|
|
struct content *content)
|
2002-05-04 23:57:18 +04:00
|
|
|
{
|
2002-09-18 23:36:28 +04:00
|
|
|
unsigned int columns = table->columns; /* total columns */
|
2003-09-12 22:30:44 +04:00
|
|
|
unsigned int i;
|
2004-02-11 20:15:36 +03:00
|
|
|
unsigned int *row_span;
|
|
|
|
int *excess_y;
|
|
|
|
int table_width, min_width = 0, max_width = 0;
|
|
|
|
int required_width = 0;
|
2005-04-09 13:47:37 +04:00
|
|
|
int x, remainder = 0, count = 0;
|
2004-02-11 20:15:36 +03:00
|
|
|
int table_height = 0;
|
2009-05-08 15:43:38 +04:00
|
|
|
int min_height = 0;
|
2004-02-11 20:15:36 +03:00
|
|
|
int *xs; /* array of column x positions */
|
2004-04-12 04:00:47 +04:00
|
|
|
int auto_width;
|
2004-05-21 18:26:59 +04:00
|
|
|
int spare_width;
|
|
|
|
int relative_sum = 0;
|
2004-12-02 00:48:11 +03:00
|
|
|
int border_spacing_h = 0, border_spacing_v = 0;
|
2005-01-11 00:35:34 +03:00
|
|
|
int spare_height;
|
2008-04-20 19:49:25 +04:00
|
|
|
int positioned_columns = 0;
|
2009-05-08 15:43:38 +04:00
|
|
|
struct box *containing_block = NULL;
|
2002-08-18 20:46:45 +04:00
|
|
|
struct box *c;
|
|
|
|
struct box *row;
|
|
|
|
struct box *row_group;
|
2003-07-07 01:10:12 +04:00
|
|
|
struct box **row_span_cell;
|
2004-06-03 01:21:13 +04:00
|
|
|
struct column *col;
|
2009-07-24 03:05:34 +04:00
|
|
|
const css_computed_style *style = table->style;
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
|
|
|
enum css_height_e htype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
2002-05-04 23:57:18 +04:00
|
|
|
|
|
|
|
assert(table->type == BOX_TABLE);
|
2004-04-12 04:00:47 +04:00
|
|
|
assert(style);
|
|
|
|
assert(table->children && table->children->children);
|
|
|
|
assert(columns);
|
2002-08-06 00:34:45 +04:00
|
|
|
|
2004-12-02 00:48:11 +03:00
|
|
|
/* allocate working buffers */
|
2004-06-03 01:21:13 +04:00
|
|
|
col = malloc(columns * sizeof col[0]);
|
|
|
|
excess_y = malloc(columns * sizeof excess_y[0]);
|
|
|
|
row_span = malloc(columns * sizeof row_span[0]);
|
|
|
|
row_span_cell = malloc(columns * sizeof row_span_cell[0]);
|
|
|
|
xs = malloc((columns + 1) * sizeof xs[0]);
|
|
|
|
if (!col || !xs || !row_span || !excess_y || !row_span_cell) {
|
|
|
|
free(col);
|
|
|
|
free(excess_y);
|
|
|
|
free(row_span);
|
|
|
|
free(row_span_cell);
|
|
|
|
free(xs);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2003-09-12 22:30:44 +04:00
|
|
|
memcpy(col, table->col, sizeof(col[0]) * columns);
|
2002-09-18 23:36:28 +04:00
|
|
|
|
2004-12-02 00:48:11 +03:00
|
|
|
/* find margins, paddings, and borders for table and cells */
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(available_width, -1, table, style, 0, 0, 0, 0,
|
2008-02-17 21:22:06 +03:00
|
|
|
table->margin, table->padding, table->border);
|
2004-12-02 00:48:11 +03:00
|
|
|
for (row_group = table->children; row_group;
|
|
|
|
row_group = row_group->next) {
|
|
|
|
for (row = row_group->children; row; row = row->next) {
|
|
|
|
for (c = row->children; c; c = c->next) {
|
|
|
|
assert(c->style);
|
2009-07-24 03:05:34 +04:00
|
|
|
table_used_border_for_cell(c);
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(available_width, -1,
|
2008-09-28 00:19:46 +04:00
|
|
|
c, c->style, 0, 0, 0, 0, 0,
|
2004-12-02 00:48:11 +03:00
|
|
|
c->padding, c->border);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (css_computed_overflow(c->style) ==
|
2004-12-06 00:42:08 +03:00
|
|
|
CSS_OVERFLOW_SCROLL ||
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_overflow(c->style) ==
|
2004-12-06 00:42:08 +03:00
|
|
|
CSS_OVERFLOW_AUTO) {
|
|
|
|
c->padding[RIGHT] += SCROLLBAR_WIDTH;
|
|
|
|
c->padding[BOTTOM] += SCROLLBAR_WIDTH;
|
|
|
|
}
|
2004-12-02 00:48:11 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* border-spacing is used in the separated borders model */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (css_computed_border_collapse(style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_BORDER_COLLAPSE_SEPARATE) {
|
|
|
|
css_fixed h = 0, v = 0;
|
|
|
|
css_unit hu = CSS_UNIT_PX, vu = CSS_UNIT_PX;
|
2002-05-04 23:57:18 +04:00
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_border_spacing(style, &h, &hu, &v, &vu);
|
2009-01-26 19:32:19 +03:00
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
border_spacing_h = FIXTOINT(nscss_len2px(h, hu, style));
|
|
|
|
border_spacing_v = FIXTOINT(nscss_len2px(v, vu, style));
|
|
|
|
}
|
2009-01-26 19:32:19 +03:00
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
/* find specified table width, or available width if auto-width */
|
|
|
|
wtype = css_computed_width(style, &value, &unit);
|
|
|
|
if (wtype == CSS_WIDTH_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
table_width = ceil(available_width *
|
|
|
|
FIXTOFLT(value) / 100);
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
table_width =
|
2009-07-24 03:05:34 +04:00
|
|
|
FIXTOINT(nscss_len2px(value, unit, style));
|
|
|
|
}
|
2009-01-26 19:32:19 +03:00
|
|
|
|
|
|
|
/* specified width includes border */
|
2009-07-24 04:08:23 +04:00
|
|
|
table_width -= table->border[LEFT].width +
|
2009-07-24 03:05:34 +04:00
|
|
|
table->border[RIGHT].width;
|
2009-01-26 19:32:19 +03:00
|
|
|
table_width = table_width < 0 ? 0 : table_width;
|
|
|
|
|
2004-12-02 00:48:11 +03:00
|
|
|
auto_width = table_width;
|
2009-07-24 03:05:34 +04:00
|
|
|
} else {
|
2004-12-02 00:48:11 +03:00
|
|
|
table_width = AUTO;
|
|
|
|
auto_width = available_width -
|
|
|
|
((table->margin[LEFT] == AUTO ? 0 :
|
|
|
|
table->margin[LEFT]) +
|
2009-07-24 03:05:34 +04:00
|
|
|
table->border[LEFT].width +
|
2004-12-02 00:48:11 +03:00
|
|
|
table->padding[LEFT] +
|
|
|
|
table->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
table->border[RIGHT].width +
|
2004-12-02 00:48:11 +03:00
|
|
|
(table->margin[RIGHT] == AUTO ? 0 :
|
2005-04-14 23:54:24 +04:00
|
|
|
table->margin[RIGHT]));
|
2004-04-12 04:00:47 +04:00
|
|
|
}
|
2002-08-06 00:34:45 +04:00
|
|
|
|
2009-05-08 15:43:38 +04:00
|
|
|
/* Find any table height specified within CSS/HTML */
|
2009-07-24 03:05:34 +04:00
|
|
|
htype = css_computed_height(style, &value, &unit);
|
|
|
|
if (htype == CSS_HEIGHT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
/* This is the minimum height for the table
|
2009-07-24 03:05:34 +04:00
|
|
|
* (see 17.5.3) */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (css_computed_position(table->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE) {
|
|
|
|
/* Table is absolutely positioned */
|
|
|
|
assert(table->float_container);
|
|
|
|
containing_block = table->float_container;
|
|
|
|
} else if (table->float_container &&
|
|
|
|
css_computed_position(table->style) !=
|
|
|
|
CSS_POSITION_ABSOLUTE &&
|
|
|
|
(css_computed_float(table->style) ==
|
|
|
|
CSS_FLOAT_LEFT ||
|
|
|
|
css_computed_float(table->style) ==
|
|
|
|
CSS_FLOAT_RIGHT)) {
|
|
|
|
/* Table is a float */
|
|
|
|
assert(table->parent && table->parent->parent &&
|
|
|
|
table->parent->parent->parent);
|
2009-07-24 04:08:23 +04:00
|
|
|
containing_block =
|
2009-07-24 03:05:34 +04:00
|
|
|
table->parent->parent->parent;
|
|
|
|
} else if (table->parent && table->parent->type !=
|
|
|
|
BOX_INLINE_CONTAINER) {
|
|
|
|
/* Table is a block level element */
|
|
|
|
containing_block = table->parent;
|
|
|
|
} else if (table->parent && table->parent->type ==
|
|
|
|
BOX_INLINE_CONTAINER) {
|
|
|
|
/* Table is an inline block */
|
|
|
|
assert(table->parent->parent);
|
|
|
|
containing_block = table->parent->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (containing_block) {
|
|
|
|
css_fixed ignored = 0;
|
|
|
|
|
|
|
|
htype = css_computed_height(
|
|
|
|
containing_block->style,
|
|
|
|
&ignored, &unit);
|
|
|
|
}
|
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
if (containing_block &&
|
2009-07-24 03:05:34 +04:00
|
|
|
containing_block->height != AUTO &&
|
|
|
|
(css_computed_position(table->style) ==
|
|
|
|
CSS_POSITION_ABSOLUTE ||
|
|
|
|
htype == CSS_HEIGHT_SET)) {
|
|
|
|
/* Table is absolutely positioned or its
|
|
|
|
* containing block has a valid specified
|
|
|
|
* height. (CSS 2.1 Section 10.5) */
|
|
|
|
min_height = FIXTOFLT(value) *
|
2009-05-08 15:43:38 +04:00
|
|
|
containing_block->height / 100;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
/* This is the minimum height for the table
|
2009-07-24 03:05:34 +04:00
|
|
|
* (see 17.5.3) */
|
|
|
|
min_height = FIXTOINT(nscss_len2px(value, unit, style));
|
2009-05-08 15:43:38 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-12-02 00:48:11 +03:00
|
|
|
/* calculate width required by cells */
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i != columns; i++) {
|
2005-07-24 18:29:32 +04:00
|
|
|
LOG(("table %p, column %u: type %s, width %i, min %i, max %i",
|
|
|
|
table, i,
|
|
|
|
((const char *[]) {"UNKNOWN", "FIXED", "AUTO",
|
|
|
|
"PERCENT", "RELATIVE"})[col[i].type],
|
|
|
|
col[i].width, col[i].min, col[i].max));
|
2008-04-20 19:49:25 +04:00
|
|
|
if (col[i].positioned) {
|
|
|
|
positioned_columns++;
|
|
|
|
continue;
|
|
|
|
} else if (col[i].type == COLUMN_WIDTH_FIXED) {
|
2004-05-28 02:13:20 +04:00
|
|
|
if (col[i].width < col[i].min)
|
|
|
|
col[i].width = col[i].max = col[i].min;
|
|
|
|
else
|
|
|
|
col[i].min = col[i].max = col[i].width;
|
2003-09-15 00:32:05 +04:00
|
|
|
required_width += col[i].width;
|
2004-05-28 02:13:20 +04:00
|
|
|
} else if (col[i].type == COLUMN_WIDTH_PERCENT) {
|
2004-04-12 04:00:47 +04:00
|
|
|
int width = col[i].width * auto_width / 100;
|
2004-12-02 00:48:11 +03:00
|
|
|
required_width += col[i].min < width ? width :
|
|
|
|
col[i].min;
|
2003-09-15 00:32:05 +04:00
|
|
|
} else
|
|
|
|
required_width += col[i].min;
|
2005-07-24 18:29:32 +04:00
|
|
|
LOG(("required_width %i", required_width));
|
2003-09-12 22:30:44 +04:00
|
|
|
}
|
2008-04-20 19:49:25 +04:00
|
|
|
required_width += (columns + 1 - positioned_columns) *
|
|
|
|
border_spacing_h;
|
2003-09-12 22:30:44 +04:00
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
LOG(("width %i, min %i, max %i, auto %i, required %i",
|
|
|
|
table_width, table->min_width, table->max_width,
|
|
|
|
auto_width, required_width));
|
|
|
|
|
|
|
|
if (auto_width < required_width) {
|
2003-09-12 22:30:44 +04:00
|
|
|
/* table narrower than required width for columns:
|
|
|
|
* treat percentage widths as maximums */
|
|
|
|
for (i = 0; i != columns; i++) {
|
2004-05-21 18:26:59 +04:00
|
|
|
if (col[i].type == COLUMN_WIDTH_RELATIVE)
|
|
|
|
continue;
|
2003-09-12 22:30:44 +04:00
|
|
|
if (col[i].type == COLUMN_WIDTH_PERCENT) {
|
2004-04-12 04:00:47 +04:00
|
|
|
col[i].max = auto_width * col[i].width / 100;
|
2003-09-12 22:30:44 +04:00
|
|
|
if (col[i].max < col[i].min)
|
|
|
|
col[i].max = col[i].min;
|
|
|
|
}
|
|
|
|
min_width += col[i].min;
|
|
|
|
max_width += col[i].max;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* take percentages exactly */
|
|
|
|
for (i = 0; i != columns; i++) {
|
2004-05-21 18:26:59 +04:00
|
|
|
if (col[i].type == COLUMN_WIDTH_RELATIVE)
|
|
|
|
continue;
|
2003-09-12 22:30:44 +04:00
|
|
|
if (col[i].type == COLUMN_WIDTH_PERCENT) {
|
2004-04-12 04:00:47 +04:00
|
|
|
int width = auto_width * col[i].width / 100;
|
2003-09-12 22:30:44 +04:00
|
|
|
if (width < col[i].min)
|
|
|
|
width = col[i].min;
|
|
|
|
col[i].min = col[i].width = col[i].max = width;
|
|
|
|
col[i].type = COLUMN_WIDTH_FIXED;
|
|
|
|
}
|
|
|
|
min_width += col[i].min;
|
|
|
|
max_width += col[i].max;
|
2002-09-19 23:54:43 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-21 18:26:59 +04:00
|
|
|
/* allocate relative widths */
|
|
|
|
spare_width = auto_width;
|
|
|
|
for (i = 0; i != columns; i++) {
|
|
|
|
if (col[i].type == COLUMN_WIDTH_RELATIVE)
|
|
|
|
relative_sum += col[i].width;
|
2004-05-28 03:45:26 +04:00
|
|
|
else if (col[i].type == COLUMN_WIDTH_FIXED)
|
2004-05-21 18:26:59 +04:00
|
|
|
spare_width -= col[i].width;
|
2004-05-28 03:45:26 +04:00
|
|
|
else
|
|
|
|
spare_width -= col[i].min;
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
2004-12-02 00:48:11 +03:00
|
|
|
spare_width -= (columns + 1) * border_spacing_h;
|
2004-06-14 11:28:27 +04:00
|
|
|
if (relative_sum != 0) {
|
|
|
|
if (spare_width < 0)
|
|
|
|
spare_width = 0;
|
|
|
|
for (i = 0; i != columns; i++) {
|
|
|
|
if (col[i].type == COLUMN_WIDTH_RELATIVE) {
|
2005-07-02 22:17:51 +04:00
|
|
|
col[i].min = ceil(col[i].max =
|
|
|
|
(float) spare_width
|
2004-06-14 11:28:27 +04:00
|
|
|
* (float) col[i].width
|
2005-03-22 19:29:16 +03:00
|
|
|
/ relative_sum);
|
2004-06-14 11:28:27 +04:00
|
|
|
min_width += col[i].min;
|
|
|
|
max_width += col[i].max;
|
|
|
|
}
|
2004-05-21 18:26:59 +04:00
|
|
|
}
|
|
|
|
}
|
2004-12-02 00:48:11 +03:00
|
|
|
min_width += (columns + 1) * border_spacing_h;
|
|
|
|
max_width += (columns + 1) * border_spacing_h;
|
2004-05-21 18:26:59 +04:00
|
|
|
|
2004-04-12 04:00:47 +04:00
|
|
|
if (auto_width <= min_width) {
|
2002-09-18 23:36:28 +04:00
|
|
|
/* not enough space: minimise column widths */
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i < columns; i++) {
|
2003-09-12 02:02:06 +04:00
|
|
|
col[i].width = col[i].min;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2003-09-12 18:37:26 +04:00
|
|
|
table_width = min_width;
|
2004-04-12 04:00:47 +04:00
|
|
|
} else if (max_width <= auto_width) {
|
2002-12-28 01:29:45 +03:00
|
|
|
/* more space than maximum width */
|
2004-04-12 04:00:47 +04:00
|
|
|
if (table_width == AUTO) {
|
2002-12-28 01:29:45 +03:00
|
|
|
/* for auto-width tables, make columns max width */
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i < columns; i++) {
|
2003-09-12 02:02:06 +04:00
|
|
|
col[i].width = col[i].max;
|
2002-12-28 01:29:45 +03:00
|
|
|
}
|
|
|
|
table_width = max_width;
|
|
|
|
} else {
|
2008-10-13 19:06:19 +04:00
|
|
|
/* for fixed-width tables, distribute the extra space
|
|
|
|
* too */
|
2003-07-09 00:54:19 +04:00
|
|
|
unsigned int flexible_columns = 0;
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i != columns; i++)
|
2003-09-12 02:02:06 +04:00
|
|
|
if (col[i].type != COLUMN_WIDTH_FIXED)
|
2003-07-09 00:54:19 +04:00
|
|
|
flexible_columns++;
|
|
|
|
if (flexible_columns == 0) {
|
2004-02-11 20:15:36 +03:00
|
|
|
int extra = (table_width - max_width) / columns;
|
2008-10-13 19:06:19 +04:00
|
|
|
remainder = (table_width - max_width) -
|
|
|
|
(extra * columns);
|
2005-03-22 19:29:16 +03:00
|
|
|
for (i = 0; i != columns; i++) {
|
2003-09-12 02:02:06 +04:00
|
|
|
col[i].width = col[i].max + extra;
|
2005-03-22 19:29:16 +03:00
|
|
|
count -= remainder;
|
|
|
|
if (count < 0) {
|
|
|
|
col[i].width++;
|
|
|
|
count += columns;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-07-09 00:54:19 +04:00
|
|
|
} else {
|
2008-10-13 19:06:19 +04:00
|
|
|
int extra = (table_width - max_width) /
|
|
|
|
flexible_columns;
|
|
|
|
remainder = (table_width - max_width) -
|
|
|
|
(extra * flexible_columns);
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i != columns; i++)
|
2005-03-22 19:29:16 +03:00
|
|
|
if (col[i].type != COLUMN_WIDTH_FIXED) {
|
2008-10-13 19:06:19 +04:00
|
|
|
col[i].width = col[i].max +
|
|
|
|
extra;
|
2005-03-22 19:29:16 +03:00
|
|
|
count -= remainder;
|
|
|
|
if (count < 0) {
|
|
|
|
col[i].width++;
|
|
|
|
count += flexible_columns;
|
|
|
|
}
|
|
|
|
}
|
2002-12-28 01:29:45 +03:00
|
|
|
}
|
2002-09-18 23:36:28 +04:00
|
|
|
}
|
2003-01-04 01:19:39 +03:00
|
|
|
} else {
|
|
|
|
/* space between min and max: fill it exactly */
|
2004-04-12 04:00:47 +04:00
|
|
|
float scale = (float) (auto_width - min_width) /
|
2003-09-12 18:37:26 +04:00
|
|
|
(float) (max_width - min_width);
|
2004-04-14 03:20:23 +04:00
|
|
|
/* fprintf(stderr, "filling, scale %f\n", scale); */
|
2003-09-12 22:30:44 +04:00
|
|
|
for (i = 0; i < columns; i++) {
|
2004-04-14 03:20:23 +04:00
|
|
|
col[i].width = col[i].min + (int) (0.5 +
|
|
|
|
(col[i].max - col[i].min) * scale);
|
2002-09-18 23:36:28 +04:00
|
|
|
}
|
2004-04-12 04:00:47 +04:00
|
|
|
table_width = auto_width;
|
2003-01-04 01:19:39 +03:00
|
|
|
}
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2004-12-02 00:48:11 +03:00
|
|
|
xs[0] = x = border_spacing_h;
|
2003-07-07 01:10:12 +04:00
|
|
|
for (i = 0; i != columns; i++) {
|
2008-04-20 19:49:25 +04:00
|
|
|
if (!col[i].positioned)
|
|
|
|
x += col[i].width + border_spacing_h;
|
2002-09-18 23:36:28 +04:00
|
|
|
xs[i + 1] = x;
|
2003-07-07 01:10:12 +04:00
|
|
|
row_span[i] = 0;
|
|
|
|
excess_y[i] = 0;
|
|
|
|
row_span_cell[i] = 0;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2003-07-08 00:30:51 +04:00
|
|
|
|
2002-05-04 23:57:18 +04:00
|
|
|
/* position cells */
|
2004-12-02 00:48:11 +03:00
|
|
|
table_height = border_spacing_v;
|
|
|
|
for (row_group = table->children; row_group;
|
|
|
|
row_group = row_group->next) {
|
2004-02-11 20:15:36 +03:00
|
|
|
int row_group_height = 0;
|
2004-12-02 00:48:11 +03:00
|
|
|
for (row = row_group->children; row; row = row->next) {
|
2007-10-11 00:33:15 +04:00
|
|
|
int row_height = 0;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
htype = css_computed_height(row->style, &value, &unit);
|
|
|
|
if (htype == CSS_HEIGHT_SET && unit != CSS_UNIT_PCT) {
|
|
|
|
row_height = FIXTOINT(nscss_len2px(value, unit,
|
|
|
|
row->style));
|
2009-04-29 00:13:10 +04:00
|
|
|
}
|
2004-12-02 00:48:11 +03:00
|
|
|
for (c = row->children; c; c = c->next) {
|
|
|
|
assert(c->style);
|
|
|
|
c->width = xs[c->start_column + c->columns] -
|
|
|
|
xs[c->start_column] -
|
|
|
|
border_spacing_h -
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[LEFT].width -
|
2004-12-02 00:48:11 +03:00
|
|
|
c->padding[LEFT] -
|
|
|
|
c->padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[RIGHT].width;
|
2002-08-18 20:46:45 +04:00
|
|
|
c->float_children = 0;
|
2004-04-12 21:32:45 +04:00
|
|
|
|
|
|
|
c->height = AUTO;
|
2009-05-07 20:22:38 +04:00
|
|
|
if (!layout_block_context(c, -1, content)) {
|
2004-06-03 01:21:13 +04:00
|
|
|
free(col);
|
|
|
|
free(excess_y);
|
|
|
|
free(row_span);
|
|
|
|
free(row_span_cell);
|
|
|
|
free(xs);
|
|
|
|
return false;
|
|
|
|
}
|
2008-10-12 19:34:43 +04:00
|
|
|
/* warning: c->descendant_y0 and
|
|
|
|
* c->descendant_y1 used as temporary storage
|
|
|
|
* until after vertical alignment is complete */
|
2005-01-11 17:16:40 +03:00
|
|
|
c->descendant_y0 = c->height;
|
2005-01-11 00:35:34 +03:00
|
|
|
c->descendant_y1 = c->padding[BOTTOM];
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
htype = css_computed_height(c->style,
|
|
|
|
&value, &unit);
|
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
if (htype == CSS_HEIGHT_SET &&
|
2009-07-24 03:05:34 +04:00
|
|
|
unit != CSS_UNIT_PCT) {
|
2004-12-02 00:48:11 +03:00
|
|
|
/* some sites use height="1" or similar
|
|
|
|
* to attempt to make cells as small as
|
|
|
|
* possible, so treat it as a minimum */
|
2009-07-24 04:08:23 +04:00
|
|
|
int h = FIXTOINT(nscss_len2px(value,
|
2009-07-24 03:05:34 +04:00
|
|
|
unit, c->style));
|
2004-04-12 21:32:45 +04:00
|
|
|
if (c->height < h)
|
2003-03-09 00:25:56 +03:00
|
|
|
c->height = h;
|
|
|
|
}
|
2009-04-29 00:13:10 +04:00
|
|
|
/* specified row height is treated as a minimum
|
|
|
|
*/
|
|
|
|
if (c->height < row_height)
|
|
|
|
c->height = row_height;
|
2009-07-24 04:08:23 +04:00
|
|
|
c->x = xs[c->start_column] +
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[LEFT].width;
|
|
|
|
c->y = c->border[TOP].width;
|
2003-07-07 01:10:12 +04:00
|
|
|
for (i = 0; i != c->columns; i++) {
|
|
|
|
row_span[c->start_column + i] = c->rows;
|
2004-12-02 00:48:11 +03:00
|
|
|
excess_y[c->start_column + i] =
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[TOP].width +
|
2004-12-02 00:48:11 +03:00
|
|
|
c->padding[TOP] +
|
|
|
|
c->height +
|
|
|
|
c->padding[BOTTOM] +
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[BOTTOM].width;
|
2003-07-07 01:10:12 +04:00
|
|
|
row_span_cell[c->start_column + i] = 0;
|
|
|
|
}
|
|
|
|
row_span_cell[c->start_column] = c;
|
2005-01-11 00:35:34 +03:00
|
|
|
c->padding[BOTTOM] = -border_spacing_v -
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[TOP].width -
|
2004-12-02 00:48:11 +03:00
|
|
|
c->padding[TOP] -
|
2005-01-11 00:35:34 +03:00
|
|
|
c->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
c->border[BOTTOM].width;
|
2003-07-07 01:10:12 +04:00
|
|
|
}
|
|
|
|
for (i = 0; i != columns; i++)
|
2003-07-08 22:49:14 +04:00
|
|
|
if (row_span[i] != 0)
|
|
|
|
row_span[i]--;
|
|
|
|
else
|
|
|
|
row_span_cell[i] = 0;
|
2003-08-30 03:15:54 +04:00
|
|
|
if (row->next || row_group->next) {
|
2004-12-02 00:48:11 +03:00
|
|
|
/* row height is greatest excess of a cell
|
|
|
|
* which ends in this row */
|
2003-08-30 03:15:54 +04:00
|
|
|
for (i = 0; i != columns; i++)
|
2004-12-02 00:48:11 +03:00
|
|
|
if (row_span[i] == 0 && row_height <
|
|
|
|
excess_y[i])
|
2003-08-30 03:15:54 +04:00
|
|
|
row_height = excess_y[i];
|
|
|
|
} else {
|
|
|
|
/* except in the last row */
|
|
|
|
for (i = 0; i != columns; i++)
|
|
|
|
if (row_height < excess_y[i])
|
|
|
|
row_height = excess_y[i];
|
|
|
|
}
|
2003-07-07 01:10:12 +04:00
|
|
|
for (i = 0; i != columns; i++) {
|
2003-07-08 00:30:51 +04:00
|
|
|
if (row_height < excess_y[i])
|
|
|
|
excess_y[i] -= row_height;
|
|
|
|
else
|
|
|
|
excess_y[i] = 0;
|
2003-07-07 01:10:12 +04:00
|
|
|
if (row_span_cell[i] != 0)
|
2005-01-13 23:29:24 +03:00
|
|
|
row_span_cell[i]->padding[BOTTOM] +=
|
|
|
|
row_height +
|
2004-12-02 00:48:11 +03:00
|
|
|
border_spacing_v;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2003-07-07 01:10:12 +04:00
|
|
|
|
2002-08-18 20:46:45 +04:00
|
|
|
row->x = 0;
|
|
|
|
row->y = row_group_height;
|
|
|
|
row->width = table_width;
|
|
|
|
row->height = row_height;
|
2004-12-02 00:48:11 +03:00
|
|
|
row_group_height += row_height + border_spacing_v;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2002-08-18 20:46:45 +04:00
|
|
|
row_group->x = 0;
|
|
|
|
row_group->y = table_height;
|
|
|
|
row_group->width = table_width;
|
|
|
|
row_group->height = row_group_height;
|
|
|
|
table_height += row_group_height;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
2009-05-08 15:43:38 +04:00
|
|
|
/* Table height is either the height of the contents, or specified
|
|
|
|
* height if greater */
|
|
|
|
table_height = max(table_height, min_height);
|
|
|
|
/** \TODO distribute spare height over the row groups / rows / cells */
|
2002-05-04 23:57:18 +04:00
|
|
|
|
2005-01-11 00:35:34 +03:00
|
|
|
/* perform vertical alignment */
|
2008-10-12 19:34:43 +04:00
|
|
|
for (row_group = table->children; row_group;
|
|
|
|
row_group = row_group->next) {
|
2005-01-11 00:35:34 +03:00
|
|
|
for (row = row_group->children; row; row = row->next) {
|
|
|
|
for (c = row->children; c; c = c->next) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_vertical_align_e vertical_align;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
2008-10-12 19:34:43 +04:00
|
|
|
/* unextended bottom padding is in
|
|
|
|
* c->descendant_y1, and unextended
|
2005-01-11 17:16:40 +03:00
|
|
|
* cell height is in c->descendant_y0 */
|
2008-10-12 19:34:43 +04:00
|
|
|
spare_height = (c->padding[BOTTOM] -
|
|
|
|
c->descendant_y1) +
|
2005-04-14 23:54:24 +04:00
|
|
|
(c->height - c->descendant_y0);
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
vertical_align = css_computed_vertical_align(
|
|
|
|
c->style, &value, &unit);
|
|
|
|
|
|
|
|
switch (vertical_align) {
|
2008-10-12 19:34:43 +04:00
|
|
|
case CSS_VERTICAL_ALIGN_SUB:
|
|
|
|
case CSS_VERTICAL_ALIGN_SUPER:
|
|
|
|
case CSS_VERTICAL_ALIGN_TEXT_TOP:
|
|
|
|
case CSS_VERTICAL_ALIGN_TEXT_BOTTOM:
|
2009-07-24 03:05:34 +04:00
|
|
|
case CSS_VERTICAL_ALIGN_SET:
|
2008-10-12 19:34:43 +04:00
|
|
|
case CSS_VERTICAL_ALIGN_BASELINE:
|
|
|
|
/* todo: baseline alignment, for now
|
|
|
|
* just use ALIGN_TOP */
|
|
|
|
case CSS_VERTICAL_ALIGN_TOP:
|
|
|
|
break;
|
|
|
|
case CSS_VERTICAL_ALIGN_MIDDLE:
|
|
|
|
c->padding[TOP] += spare_height / 2;
|
|
|
|
c->padding[BOTTOM] -= spare_height / 2;
|
|
|
|
layout_move_children(c, 0,
|
|
|
|
spare_height / 2);
|
|
|
|
break;
|
|
|
|
case CSS_VERTICAL_ALIGN_BOTTOM:
|
|
|
|
c->padding[TOP] += spare_height;
|
|
|
|
c->padding[BOTTOM] -= spare_height;
|
|
|
|
layout_move_children(c, 0,
|
|
|
|
spare_height);
|
|
|
|
break;
|
|
|
|
case CSS_VERTICAL_ALIGN_INHERIT:
|
|
|
|
assert(0);
|
|
|
|
break;
|
2005-01-11 00:35:34 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-03 01:21:13 +04:00
|
|
|
free(col);
|
|
|
|
free(excess_y);
|
|
|
|
free(row_span);
|
|
|
|
free(row_span_cell);
|
|
|
|
free(xs);
|
2002-06-19 19:17:45 +04:00
|
|
|
|
2002-05-04 23:57:18 +04:00
|
|
|
table->width = table_width;
|
2009-05-08 15:43:38 +04:00
|
|
|
table->height = table_height;
|
2004-06-03 01:21:13 +04:00
|
|
|
|
|
|
|
return true;
|
2002-05-04 23:57:18 +04:00
|
|
|
}
|
|
|
|
|
2002-09-18 23:36:28 +04:00
|
|
|
|
2005-01-11 00:35:34 +03:00
|
|
|
/**
|
2005-07-02 22:17:51 +04:00
|
|
|
* Calculate minimum and maximum width of a table.
|
2004-02-23 01:22:50 +03:00
|
|
|
*
|
2005-07-02 22:17:51 +04:00
|
|
|
* \param table box of type TABLE
|
2005-07-22 01:48:41 +04:00
|
|
|
* \post table->min_width and table->max_width filled in,
|
|
|
|
* 0 <= table->min_width <= table->max_width
|
2002-09-18 23:36:28 +04:00
|
|
|
*/
|
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
void layout_minmax_table(struct box *table,
|
|
|
|
const struct font_functions *font_func)
|
2002-09-18 23:36:28 +04:00
|
|
|
{
|
2003-09-12 02:02:06 +04:00
|
|
|
unsigned int i, j;
|
2005-07-02 22:17:51 +04:00
|
|
|
int border_spacing_h = 0;
|
|
|
|
int table_min = 0, table_max = 0;
|
|
|
|
int extra_fixed = 0;
|
|
|
|
float extra_frac = 0;
|
|
|
|
struct column *col = table->col;
|
2002-09-18 23:36:28 +04:00
|
|
|
struct box *row_group, *row, *cell;
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_width_e wtype;
|
2009-07-24 03:05:34 +04:00
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
2002-09-18 23:36:28 +04:00
|
|
|
|
2003-08-30 23:20:19 +04:00
|
|
|
/* check if the widths have already been calculated */
|
2004-02-11 20:15:36 +03:00
|
|
|
if (table->max_width != UNKNOWN_MAX_WIDTH)
|
2005-07-02 22:17:51 +04:00
|
|
|
return;
|
2003-08-30 23:20:19 +04:00
|
|
|
|
2005-08-07 02:29:30 +04:00
|
|
|
/* start with 0 except for fixed-width columns */
|
|
|
|
for (i = 0; i != table->columns; i++) {
|
|
|
|
if (col[i].type == COLUMN_WIDTH_FIXED)
|
|
|
|
col[i].min = col[i].max = col[i].width;
|
|
|
|
else
|
|
|
|
col[i].min = col[i].max = 0;
|
|
|
|
}
|
2003-09-09 23:25:28 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* border-spacing is used in the separated borders model */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (css_computed_border_collapse(table->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_BORDER_COLLAPSE_SEPARATE) {
|
|
|
|
css_fixed h = 0, v = 0;
|
|
|
|
css_unit hu = CSS_UNIT_PX, vu = CSS_UNIT_PX;
|
|
|
|
|
|
|
|
css_computed_border_spacing(table->style, &h, &hu, &v, &vu);
|
|
|
|
|
|
|
|
border_spacing_h = FIXTOINT(nscss_len2px(h, hu, table->style));
|
|
|
|
}
|
2005-04-14 23:54:24 +04:00
|
|
|
|
2003-09-12 02:02:06 +04:00
|
|
|
/* 1st pass: consider cells with colspan 1 only */
|
2005-07-02 22:17:51 +04:00
|
|
|
for (row_group = table->children; row_group; row_group =row_group->next)
|
|
|
|
for (row = row_group->children; row; row = row->next)
|
|
|
|
for (cell = row->children; cell; cell = cell->next) {
|
|
|
|
assert(cell->type == BOX_TABLE_CELL);
|
|
|
|
assert(cell->style);
|
2002-12-27 21:58:03 +03:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
if (cell->columns != 1)
|
|
|
|
continue;
|
2003-09-12 02:02:06 +04:00
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(cell, font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
i = cell->start_column;
|
2004-05-28 02:13:20 +04:00
|
|
|
|
2008-04-20 19:49:25 +04:00
|
|
|
if (col[i].positioned)
|
|
|
|
continue;
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* update column min, max widths using cell widths */
|
|
|
|
if (col[i].min < cell->min_width)
|
|
|
|
col[i].min = cell->min_width;
|
|
|
|
if (col[i].max < cell->max_width)
|
|
|
|
col[i].max = cell->max_width;
|
2003-09-12 02:02:06 +04:00
|
|
|
}
|
2003-04-10 01:57:09 +04:00
|
|
|
|
2003-09-12 02:02:06 +04:00
|
|
|
/* 2nd pass: cells which span multiple columns */
|
2005-07-02 22:17:51 +04:00
|
|
|
for (row_group = table->children; row_group; row_group =row_group->next)
|
|
|
|
for (row = row_group->children; row; row = row->next)
|
|
|
|
for (cell = row->children; cell; cell = cell->next) {
|
|
|
|
unsigned int flexible_columns = 0;
|
|
|
|
int min = 0, max = 0, fixed_width = 0, extra;
|
2003-09-12 02:02:06 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
if (cell->columns == 1)
|
|
|
|
continue;
|
2003-09-12 02:02:06 +04:00
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_minmax_block(cell, font_func);
|
2005-07-02 22:17:51 +04:00
|
|
|
i = cell->start_column;
|
2003-09-12 02:02:06 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* find min width so far of spanned columns, and count
|
|
|
|
* number of non-fixed spanned columns and total fixed width */
|
|
|
|
for (j = 0; j != cell->columns; j++) {
|
|
|
|
min += col[i + j].min;
|
|
|
|
if (col[i + j].type == COLUMN_WIDTH_FIXED)
|
|
|
|
fixed_width += col[i + j].width;
|
|
|
|
else
|
|
|
|
flexible_columns++;
|
|
|
|
}
|
|
|
|
min += (cell->columns - 1) * border_spacing_h;
|
2003-04-10 01:57:09 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* distribute extra min to spanned columns */
|
|
|
|
if (min < cell->min_width) {
|
|
|
|
if (flexible_columns == 0) {
|
|
|
|
extra = 1 + (cell->min_width - min) /
|
|
|
|
cell->columns;
|
|
|
|
for (j = 0; j != cell->columns; j++) {
|
|
|
|
col[i + j].min += extra;
|
|
|
|
if (col[i + j].max < col[i + j].min)
|
|
|
|
col[i + j].max = col[i + j].min;
|
2003-09-12 02:02:06 +04:00
|
|
|
}
|
2005-07-02 22:17:51 +04:00
|
|
|
} else {
|
|
|
|
extra = 1 + (cell->min_width - min) /
|
|
|
|
flexible_columns;
|
|
|
|
for (j = 0; j != cell->columns; j++) {
|
|
|
|
if (col[i + j].type !=
|
|
|
|
COLUMN_WIDTH_FIXED) {
|
|
|
|
col[i + j].min += extra;
|
|
|
|
if (col[i + j].max <
|
|
|
|
col[i + j].min)
|
|
|
|
col[i + j].max =
|
|
|
|
col[i + j].min;
|
2002-12-27 21:58:03 +03:00
|
|
|
}
|
2003-01-04 01:19:39 +03:00
|
|
|
}
|
2002-09-18 23:36:28 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* find max width so far of spanned columns */
|
|
|
|
for (j = 0; j != cell->columns; j++)
|
|
|
|
max += col[i + j].max;
|
|
|
|
max += (cell->columns - 1) * border_spacing_h;
|
|
|
|
|
|
|
|
/* distribute extra max to spanned columns */
|
|
|
|
if (max < cell->max_width && flexible_columns) {
|
|
|
|
extra = 1 + (cell->max_width - max) / flexible_columns;
|
|
|
|
for (j = 0; j != cell->columns; j++)
|
|
|
|
if (col[i + j].type != COLUMN_WIDTH_FIXED)
|
|
|
|
col[i + j].max += extra;
|
|
|
|
}
|
2002-09-18 23:36:28 +04:00
|
|
|
}
|
2003-01-04 01:19:39 +03:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
for (i = 0; i != table->columns; i++) {
|
|
|
|
if (col[i].max < col[i].min) {
|
2007-08-20 06:39:49 +04:00
|
|
|
box_dump(stderr, table, 0);
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
table_min += col[i].min;
|
|
|
|
table_max += col[i].max;
|
|
|
|
}
|
2004-06-03 01:21:13 +04:00
|
|
|
|
2005-07-21 02:25:56 +04:00
|
|
|
/* fixed width takes priority, unless it is too narrow */
|
2009-07-24 03:05:34 +04:00
|
|
|
wtype = css_computed_width(table->style, &value, &unit);
|
|
|
|
if (wtype == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) {
|
|
|
|
int width = FIXTOINT(nscss_len2px(value, unit, table->style));
|
2005-07-21 02:25:56 +04:00
|
|
|
if (table_min < width)
|
|
|
|
table_min = width;
|
|
|
|
if (table_max < width)
|
|
|
|
table_max = width;
|
|
|
|
}
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
/* add margins, border, padding to min, max widths */
|
2009-05-01 22:00:01 +04:00
|
|
|
calculate_mbp_width(table->style, LEFT, true, true, true,
|
|
|
|
&extra_fixed, &extra_frac);
|
|
|
|
calculate_mbp_width(table->style, RIGHT, true, true, true,
|
|
|
|
&extra_fixed, &extra_frac);
|
2007-03-25 20:20:10 +04:00
|
|
|
if (extra_fixed < 0)
|
|
|
|
extra_fixed = 0;
|
|
|
|
if (extra_frac < 0)
|
|
|
|
extra_frac = 0;
|
2005-07-02 22:17:51 +04:00
|
|
|
if (1.0 <= extra_frac)
|
|
|
|
extra_frac = 0.9;
|
|
|
|
table->min_width = (table_min + extra_fixed) / (1.0 - extra_frac);
|
|
|
|
table->max_width = (table_max + extra_fixed) / (1.0 - extra_frac);
|
|
|
|
table->min_width += (table->columns + 1) * border_spacing_h;
|
|
|
|
table->max_width += (table->columns + 1) * border_spacing_h;
|
2005-07-22 01:48:41 +04:00
|
|
|
|
|
|
|
assert(0 <= table->min_width && table->min_width <= table->max_width);
|
2002-09-18 23:36:28 +04:00
|
|
|
}
|
2004-08-01 17:08:19 +04:00
|
|
|
|
|
|
|
|
2005-04-14 23:54:24 +04:00
|
|
|
/**
|
2005-07-02 22:17:51 +04:00
|
|
|
* Moves the children of a box by a specified amount
|
|
|
|
*
|
|
|
|
* \param box top of tree of boxes
|
|
|
|
* \param x the amount to move children by horizontally
|
|
|
|
* \param y the amount to move children by vertically
|
2005-04-14 23:54:24 +04:00
|
|
|
*/
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
void layout_move_children(struct box *box, int x, int y)
|
2005-04-14 23:54:24 +04:00
|
|
|
{
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(box);
|
2005-04-14 23:54:24 +04:00
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
for (box = box->children; box; box = box->next) {
|
|
|
|
box->x += x;
|
|
|
|
box->y += y;
|
2005-04-14 23:54:24 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2005-07-03 03:37:41 +04:00
|
|
|
* Determine width of margin, borders, and padding on one side of a box.
|
2005-07-02 22:17:51 +04:00
|
|
|
*
|
2009-05-01 22:00:01 +04:00
|
|
|
* \param style style to measure
|
|
|
|
* \param size side of box to measure
|
|
|
|
* \param margin whether margin width is required
|
|
|
|
* \param border whether border width is required
|
|
|
|
* \param padding whether padding width is required
|
|
|
|
* \param fixed increased by sum of fixed margin, border, and padding
|
|
|
|
* \param frac increased by sum of fractional margin and padding
|
2005-04-14 23:54:24 +04:00
|
|
|
*/
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
void calculate_mbp_width(const css_computed_style *style, unsigned int side,
|
2009-05-01 22:00:01 +04:00
|
|
|
bool margin, bool border, bool padding,
|
2005-07-03 03:37:41 +04:00
|
|
|
int *fixed, float *frac)
|
2005-04-14 23:54:24 +04:00
|
|
|
{
|
2009-07-24 03:05:34 +04:00
|
|
|
typedef uint8_t (*len_func)(const css_computed_style *style,
|
|
|
|
css_fixed *length, css_unit *unit);
|
|
|
|
|
|
|
|
static len_func margin_funcs[4] = {
|
|
|
|
css_computed_margin_top,
|
|
|
|
css_computed_margin_right,
|
|
|
|
css_computed_margin_bottom,
|
|
|
|
css_computed_margin_left
|
|
|
|
};
|
|
|
|
static len_func padding_funcs[4] = {
|
|
|
|
css_computed_padding_top,
|
|
|
|
css_computed_padding_right,
|
|
|
|
css_computed_padding_bottom,
|
|
|
|
css_computed_padding_left
|
|
|
|
};
|
|
|
|
static struct {
|
|
|
|
len_func width;
|
|
|
|
uint8_t (*style)(const css_computed_style *style);
|
|
|
|
} border_funcs[4] = {
|
2009-07-24 04:08:23 +04:00
|
|
|
{ css_computed_border_top_width,
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_border_top_style },
|
|
|
|
{ css_computed_border_right_width,
|
|
|
|
css_computed_border_right_style },
|
|
|
|
{ css_computed_border_bottom_width,
|
|
|
|
css_computed_border_bottom_style },
|
|
|
|
{ css_computed_border_left_width,
|
|
|
|
css_computed_border_left_style }
|
|
|
|
};
|
|
|
|
|
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
2005-07-02 22:17:51 +04:00
|
|
|
assert(style);
|
2005-04-14 23:54:24 +04:00
|
|
|
|
2005-07-03 03:37:41 +04:00
|
|
|
/* margin */
|
2009-05-01 22:00:01 +04:00
|
|
|
if (margin) {
|
2009-08-02 23:19:43 +04:00
|
|
|
enum css_margin_e type;
|
2009-07-24 03:05:34 +04:00
|
|
|
|
|
|
|
type = margin_funcs[side](style, &value, &unit);
|
|
|
|
if (type == CSS_MARGIN_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
*frac += FIXTOFLT(value) * 0.01;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*fixed += FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
style));
|
|
|
|
}
|
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2005-07-03 03:37:41 +04:00
|
|
|
|
|
|
|
/* border */
|
2009-05-01 22:00:01 +04:00
|
|
|
if (border) {
|
2009-07-24 04:08:23 +04:00
|
|
|
if (border_funcs[side].style(style) !=
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_BORDER_STYLE_NONE) {
|
|
|
|
border_funcs[side].width(style, &value, &unit);
|
|
|
|
|
|
|
|
*fixed += FIXTOINT(nscss_len2px(value, unit, style));
|
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2005-07-03 03:37:41 +04:00
|
|
|
|
|
|
|
/* padding */
|
2009-05-01 22:00:01 +04:00
|
|
|
if (padding) {
|
2009-07-24 03:05:34 +04:00
|
|
|
padding_funcs[side](style, &value, &unit);
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
|
|
|
*frac += FIXTOFLT(value) * 0.01;
|
|
|
|
} else {
|
|
|
|
*fixed += FIXTOINT(nscss_len2px(value, unit, style));
|
|
|
|
}
|
2009-05-01 22:00:01 +04:00
|
|
|
}
|
2005-04-14 23:54:24 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-11-05 15:58:24 +03:00
|
|
|
/**
|
|
|
|
* Layout list markers.
|
|
|
|
*/
|
|
|
|
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
void layout_lists(struct box *box,
|
|
|
|
const struct font_functions *font_func)
|
2006-11-05 15:58:24 +03:00
|
|
|
{
|
|
|
|
struct box *child;
|
|
|
|
struct box *marker;
|
2009-07-21 14:59:53 +04:00
|
|
|
plot_font_style_t fstyle;
|
2006-11-05 15:58:24 +03:00
|
|
|
|
|
|
|
for (child = box->children; child; child = child->next) {
|
|
|
|
if (child->list_marker) {
|
|
|
|
marker = child->list_marker;
|
2006-11-08 00:49:03 +03:00
|
|
|
if (marker->object) {
|
|
|
|
marker->width = marker->object->width;
|
|
|
|
marker->x = -marker->width;
|
|
|
|
marker->height = marker->object->height;
|
|
|
|
marker->y = (line_height(marker->style) -
|
|
|
|
marker->height) / 2;
|
2006-12-27 00:51:08 +03:00
|
|
|
} else if (marker->text) {
|
2009-07-21 14:59:53 +04:00
|
|
|
if (marker->width == UNKNOWN_WIDTH) {
|
2009-07-23 06:29:12 +04:00
|
|
|
font_plot_style_from_css(marker->style,
|
2009-07-21 14:59:53 +04:00
|
|
|
&fstyle);
|
|
|
|
font_func->font_width(&fstyle,
|
2006-11-08 00:49:03 +03:00
|
|
|
marker->text,
|
|
|
|
marker->length,
|
|
|
|
&marker->width);
|
2009-07-21 14:59:53 +04:00
|
|
|
}
|
2006-11-08 00:49:03 +03:00
|
|
|
marker->x = -marker->width;
|
|
|
|
marker->y = 0;
|
|
|
|
marker->height = line_height(marker->style);
|
2006-12-27 00:51:08 +03:00
|
|
|
} else {
|
|
|
|
marker->x = 0;
|
|
|
|
marker->y = 0;
|
|
|
|
marker->width = 0;
|
|
|
|
marker->height = 0;
|
2006-11-08 00:49:03 +03:00
|
|
|
}
|
2008-04-20 19:49:25 +04:00
|
|
|
/* Gap between marker and content */
|
|
|
|
marker->x -= 4;
|
2006-11-05 15:58:24 +03:00
|
|
|
}
|
First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.
Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf
........
r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
Pdf plotting skeleton pinned on Print Preview in GTK.
Just creates a file and draws lines.
........
r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
Pdf plotter - added drawing some graphic primitives.
Still with limited functionality, but a snapshot of the
currently viewed page can be made and resembles the original.
........
r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
Corrected encoding name
........
r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
Colours and polygons added.
........
r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
Added rectangles, filled boxes and clipping.
Taken into consideration joty's comments.
Added a todo list for this part.
Added some debug stuff and checking boundaries.
........
r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
Some more options in graphic primitives and normalizing some parameters.
........
r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
Plotting changed as jmb suggested (is the least invasive one from the possible)
Added dummy bitmap plotting - way of plotting an image is determined by its type.
........
r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
Added hadling images other than png and jpeg - with transparency.
........
r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
Added handling NULL-returns from all mallocs.
Added plot_bitmap_tile handling.
Changed code style a little.
........
r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
Added a first prototype of the paged-output organization.
Still not sure about naming, file locations etc.
Works with the same pdf plotting as before.
........
r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
Added primitive width adjustment and outputing the whole
website in multiple pages.
........
r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
Fix RISC OS build failure (change r4235 wasn't complete).
........
r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
This enables "Export PDF" in RISC OS build:
- Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
- Makefile.sources(S_PDF): Add to RISC OS target as well.
- utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
PDF export functionality or not.
- riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
by Adam Blokus to write a PDF file under RISC OS.
- riscos/save.c: Call save_as_pdf added.
- riscos/menus.c: Add 'Export->PDF' menu entry.
- riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
- desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
- desktop/print.c(print_run): Added return value.
- Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
(LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
Added margins and page size adjustment.
........
r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
Added 'fuzzy' margins on page bottom.
Disabled direct png embedding, because it is too unstable in Haru now.
........
r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
Added skeleton of applying loose layout.
Minor code cleaning-up.
........
r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
Implemented the elementar ideas of the loose layout.
Added scaling in the printing routine.
Added some basic demonstrations.
........
r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
Cleaned up the loosing code - commited to much of leftover rubbish code.
........
r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
Added duplicating box tree and current content - window flickering during printing solved.
Minor error checking after new HPDF_Image_AddSMask call.
........
r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
Changes in loosen layout (image resizing).
........
r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
Added pdf font handling and rendering functions with the use of Haru functions.
........
r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
Added a very basic and still buggy GTK print implementation.
........
r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
Added gtk printing one more time - I have forgotten to add the main file.
........
r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
removed error with comment
........
r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
Major style improvements - added a lot of doxygen comments,
followed tlsa's style guide.
Added some more error checking, too.
........
r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
Cleaned up the code.
........
r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
Solved the netsurf.glade clash from r4421.
........
r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug with wrong number of pages in gtk printing.
........
r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
- fixed uncommented line from the previous commit
- fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
Bug fix in nsfont_paint.
........
r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
Added gtk_selection files.
........
r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
Addam missing glade files.
........
r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS.
........
r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
Applied changes according to joty's review.
Added checking the dimensions of a plotted image to pdf plotter.
Commented out jpg embedding (it seems to cause some problems
I'll bring it back when I figure out what's wrong) .
Added back some files removed by mistake.
........
svn path=/trunk/netsurf/; revision=4741
2008-07-26 20:01:59 +04:00
|
|
|
layout_lists(child, font_func);
|
2006-11-05 15:58:24 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
/**
|
|
|
|
* Adjust positions of relatively positioned boxes.
|
2008-09-21 23:18:27 +04:00
|
|
|
*
|
|
|
|
* \param root box to adjust the position of
|
|
|
|
* \param fp box which forms the block formatting context for children of
|
|
|
|
* "root" which are floats
|
|
|
|
* \param fx x offset due to intervening relatively positioned boxes
|
|
|
|
* between current box, "root", and the block formatting context
|
|
|
|
* box, "fp", for float children of "root"
|
|
|
|
* \param fy y offset due to intervening relatively positioned boxes
|
|
|
|
* between current box, "root", and the block formatting context
|
|
|
|
* box, "fp", for float children of "root"
|
2006-06-26 08:52:34 +04:00
|
|
|
*/
|
|
|
|
|
2008-09-21 23:18:27 +04:00
|
|
|
void layout_position_relative(struct box *root, struct box *fp, int fx, int fy)
|
2006-06-26 08:52:34 +04:00
|
|
|
{
|
2008-09-21 23:18:27 +04:00
|
|
|
struct box *box; /* for children of "root" */
|
|
|
|
struct box *fn; /* for block formatting context box for children of
|
|
|
|
* "box" */
|
|
|
|
struct box *fc; /* for float children of the block formatting context,
|
|
|
|
* "fp" */
|
|
|
|
int x, y; /* for the offsets resulting from any relative
|
|
|
|
* positioning on the current block */
|
|
|
|
int fnx, fny; /* for affsets which apply to flat children of "box" */
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
/**\todo ensure containing box is large enough after moving boxes */
|
|
|
|
|
2006-10-11 02:00:10 +04:00
|
|
|
assert(root);
|
2006-06-26 08:52:34 +04:00
|
|
|
|
2006-06-27 02:24:42 +04:00
|
|
|
/* Normal children */
|
2006-06-26 08:52:34 +04:00
|
|
|
for (box = root->children; box; box = box->next) {
|
|
|
|
|
|
|
|
if (box->type == BOX_TEXT)
|
|
|
|
continue;
|
|
|
|
|
2008-09-21 23:18:27 +04:00
|
|
|
/* If relatively positioned, get offsets */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (box->style && css_computed_position(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_RELATIVE)
|
2008-09-21 23:18:27 +04:00
|
|
|
layout_compute_relative_offset(box, &x, &y);
|
|
|
|
else
|
|
|
|
x = y = 0;
|
|
|
|
|
|
|
|
/* Adjust float coordinates.
|
|
|
|
* (note float x and y are relative to their block formatting
|
|
|
|
* context box and not their parent) */
|
2009-07-24 04:08:23 +04:00
|
|
|
if (box->style && (css_computed_float(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_FLOAT_LEFT ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_float(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_FLOAT_RIGHT) &&
|
2008-09-21 23:18:27 +04:00
|
|
|
(fx != 0 || fy != 0)) {
|
|
|
|
/* box is a float and there is a float offset to
|
|
|
|
* apply */
|
|
|
|
for (fc = fp->float_children; fc; fc = fc->next_float) {
|
|
|
|
if (box == fc->children) {
|
|
|
|
/* Box is floated in the block
|
|
|
|
* formatting context block, fp.
|
|
|
|
* Apply float offsets. */
|
|
|
|
box->x += fx;
|
|
|
|
box->y += fy;
|
|
|
|
fx = fy = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (box->float_children) {
|
|
|
|
fn = box;
|
|
|
|
fnx = fny = 0;
|
|
|
|
} else {
|
|
|
|
fn = fp;
|
|
|
|
fnx = fx + x;
|
|
|
|
fny = fy + y;
|
|
|
|
}
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
/* recurse first */
|
2008-09-21 23:18:27 +04:00
|
|
|
layout_position_relative(box, fn, fnx, fny);
|
2006-06-26 08:52:34 +04:00
|
|
|
|
2006-06-27 02:24:42 +04:00
|
|
|
/* Ignore things we're not interested in. */
|
|
|
|
if (!box->style || (box->style &&
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(box->style) !=
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_RELATIVE))
|
2006-06-27 02:24:42 +04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
box->x += x;
|
|
|
|
box->y += y;
|
|
|
|
|
|
|
|
/* Handle INLINEs - their "children" are in fact
|
|
|
|
* the sibling boxes between the INLINE and
|
|
|
|
* INLINE_END boxes */
|
|
|
|
if (box->type == BOX_INLINE && box->inline_end) {
|
|
|
|
struct box *b;
|
|
|
|
for (b = box->next; b && b != box->inline_end;
|
|
|
|
b = b->next) {
|
|
|
|
b->x += x;
|
|
|
|
b->y += y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Compute a box's relative offset as per CSS 2.1 9.4.3
|
2009-04-15 17:22:28 +04:00
|
|
|
*
|
|
|
|
* \param box Box to compute relative offsets for.
|
|
|
|
* \param x Receives relative offset in x.
|
|
|
|
* \param y Receives relative offset in y.
|
2006-06-26 08:52:34 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_compute_relative_offset(struct box *box, int *x, int *y)
|
|
|
|
{
|
|
|
|
int left, right, top, bottom;
|
2009-05-28 22:06:49 +04:00
|
|
|
struct box *containing_block;
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
assert(box && box->parent && box->style &&
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_RELATIVE);
|
2006-06-26 08:52:34 +04:00
|
|
|
|
2009-08-31 14:44:40 +04:00
|
|
|
if (box->float_container &&
|
|
|
|
(css_computed_float(box->style) == CSS_FLOAT_LEFT ||
|
2009-07-24 03:05:34 +04:00
|
|
|
css_computed_float(box->style) == CSS_FLOAT_RIGHT)) {
|
2009-05-28 22:06:49 +04:00
|
|
|
containing_block = box->float_container;
|
|
|
|
} else {
|
|
|
|
containing_block = box->parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
layout_compute_offsets(box, containing_block,
|
|
|
|
&top, &right, &bottom, &left);
|
2006-06-26 17:22:43 +04:00
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
if (left == AUTO && right == AUTO)
|
|
|
|
left = right = 0;
|
|
|
|
else if (left == AUTO)
|
|
|
|
/* left is auto => computed = -right */
|
|
|
|
left = -right;
|
|
|
|
else if (right == AUTO)
|
|
|
|
/* right is auto => computed = -left */
|
|
|
|
right = -left;
|
|
|
|
else {
|
|
|
|
/* over constrained => examine direction property
|
|
|
|
* of containing block */
|
2009-08-31 14:39:32 +04:00
|
|
|
if (containing_block->style &&
|
|
|
|
css_computed_direction(
|
|
|
|
containing_block->style) ==
|
|
|
|
CSS_DIRECTION_RTL) {
|
|
|
|
/* right wins */
|
|
|
|
left = -right;
|
|
|
|
} else {
|
|
|
|
/* assume LTR in all other cases */
|
2006-06-26 08:52:34 +04:00
|
|
|
right = -left;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(left == -right);
|
|
|
|
|
|
|
|
if (top == AUTO && bottom == AUTO)
|
|
|
|
top = bottom = 0;
|
|
|
|
else if (top == AUTO)
|
|
|
|
top = -bottom;
|
|
|
|
else if (bottom == AUTO)
|
|
|
|
bottom = -top;
|
|
|
|
else
|
|
|
|
bottom = -top;
|
|
|
|
|
|
|
|
LOG(("left %i, right %i, top %i, bottom %i", left, right, top, bottom));
|
|
|
|
|
|
|
|
*x = left;
|
|
|
|
*y = top;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2006-11-04 22:17:11 +03:00
|
|
|
* Recursively layout and position absolutely positioned boxes.
|
2006-06-26 08:52:34 +04:00
|
|
|
*
|
2006-11-04 22:17:11 +03:00
|
|
|
* \param box tree of boxes to layout
|
|
|
|
* \param containing_block current containing block
|
|
|
|
* \param cx position of box relative to containing_block
|
|
|
|
* \param cy position of box relative to containing_block
|
|
|
|
* \param content memory pool for any new boxes
|
2006-06-26 08:52:34 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
|
|
|
*/
|
|
|
|
|
2006-10-11 02:00:10 +04:00
|
|
|
bool layout_position_absolute(struct box *box,
|
|
|
|
struct box *containing_block,
|
|
|
|
int cx, int cy,
|
2006-06-26 08:52:34 +04:00
|
|
|
struct content *content)
|
|
|
|
{
|
2006-10-11 02:00:10 +04:00
|
|
|
struct box *c;
|
2006-06-26 08:52:34 +04:00
|
|
|
|
2006-10-11 02:00:10 +04:00
|
|
|
for (c = box->children; c; c = c->next) {
|
2006-11-04 22:17:11 +03:00
|
|
|
if ((c->type == BOX_BLOCK || c->type == BOX_TABLE ||
|
|
|
|
c->type == BOX_INLINE_BLOCK) &&
|
2009-07-24 04:08:23 +04:00
|
|
|
(css_computed_position(c->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_ABSOLUTE ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_position(c->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_FIXED)) {
|
2006-10-11 02:00:10 +04:00
|
|
|
if (!layout_absolute(c, containing_block,
|
|
|
|
cx, cy, content))
|
|
|
|
return false;
|
|
|
|
if (!layout_position_absolute(c, c, 0, 0, content))
|
2006-10-09 02:46:25 +04:00
|
|
|
return false;
|
2009-07-24 04:08:23 +04:00
|
|
|
} else if (c->style && css_computed_position(c->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_POSITION_RELATIVE) {
|
2006-10-11 02:00:10 +04:00
|
|
|
if (!layout_position_absolute(c, c, 0, 0, content))
|
|
|
|
return false;
|
|
|
|
} else {
|
2008-04-22 02:02:33 +04:00
|
|
|
int px, py;
|
2009-07-24 04:08:23 +04:00
|
|
|
if (c->style && (css_computed_float(c->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_FLOAT_LEFT ||
|
2009-07-24 04:08:23 +04:00
|
|
|
css_computed_float(c->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_FLOAT_RIGHT)) {
|
2008-04-22 02:02:33 +04:00
|
|
|
/* Float x/y coords are relative to nearest
|
|
|
|
* ansestor with float_children, rather than
|
|
|
|
* relative to parent. Need to get x/y relative
|
|
|
|
* to parent */
|
|
|
|
struct box *p;
|
|
|
|
px = c->x;
|
|
|
|
py = c->y;
|
|
|
|
for (p = box->parent; p && !p->float_children;
|
|
|
|
p = p->parent) {
|
|
|
|
px -= p->x;
|
|
|
|
py -= p->y;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Not a float, so box x/y coords are relative
|
|
|
|
* to parent */
|
|
|
|
px = c->x;
|
|
|
|
py = c->y;
|
|
|
|
}
|
2006-10-11 02:00:10 +04:00
|
|
|
if (!layout_position_absolute(c, containing_block,
|
2008-04-22 02:02:33 +04:00
|
|
|
cx + px, cy + py, content))
|
2006-10-09 02:46:25 +04:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Layout and position an absolutely positioned box.
|
|
|
|
*
|
2006-11-04 22:17:11 +03:00
|
|
|
* \param box absolute box to layout and position
|
|
|
|
* \param containing_block containing block
|
|
|
|
* \param cx position of box relative to containing_block
|
|
|
|
* \param cy position of box relative to containing_block
|
|
|
|
* \param content memory pool for any new boxes
|
2006-06-26 08:52:34 +04:00
|
|
|
* \return true on success, false on memory exhaustion
|
|
|
|
*/
|
|
|
|
|
2006-10-11 02:00:10 +04:00
|
|
|
bool layout_absolute(struct box *box, struct box *containing_block,
|
|
|
|
int cx, int cy,
|
|
|
|
struct content *content)
|
2006-06-26 08:52:34 +04:00
|
|
|
{
|
2006-10-09 02:46:25 +04:00
|
|
|
int static_left, static_top; /* static position */
|
2006-06-26 08:52:34 +04:00
|
|
|
int top, right, bottom, left;
|
2008-09-28 00:19:46 +04:00
|
|
|
int width, height, max_width, min_width;
|
2006-06-26 08:52:34 +04:00
|
|
|
int *margin = box->margin;
|
|
|
|
int *padding = box->padding;
|
2009-07-24 03:05:34 +04:00
|
|
|
struct box_border *border = box->border;
|
2006-06-29 13:55:31 +04:00
|
|
|
int available_width = containing_block->width;
|
2006-06-26 08:52:34 +04:00
|
|
|
int space;
|
|
|
|
|
2006-11-04 22:17:11 +03:00
|
|
|
assert(box->type == BOX_BLOCK || box->type == BOX_TABLE ||
|
|
|
|
box->type == BOX_INLINE_BLOCK);
|
2006-06-26 08:52:34 +04:00
|
|
|
|
2006-10-09 02:46:25 +04:00
|
|
|
/* The static position is where the box would be if it was not
|
|
|
|
* absolutely positioned. The x and y are filled in by
|
|
|
|
* layout_block_context(). */
|
|
|
|
static_left = cx + box->x;
|
|
|
|
static_top = cy + box->y;
|
|
|
|
|
2006-06-29 19:53:17 +04:00
|
|
|
if (containing_block->type == BOX_BLOCK ||
|
|
|
|
containing_block->type == BOX_INLINE_BLOCK ||
|
|
|
|
containing_block->type == BOX_TABLE_CELL) {
|
|
|
|
/* Block level container => temporarily increase containing
|
|
|
|
* block dimensions to include padding (we restore this
|
|
|
|
* again at the end) */
|
|
|
|
containing_block->width += containing_block->padding[LEFT] +
|
|
|
|
containing_block->padding[RIGHT];
|
|
|
|
containing_block->height += containing_block->padding[TOP] +
|
|
|
|
containing_block->padding[BOTTOM];
|
|
|
|
} else {
|
|
|
|
/** \todo inline containers */
|
|
|
|
}
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
layout_compute_offsets(box, containing_block,
|
|
|
|
&top, &right, &bottom, &left);
|
2006-06-29 19:53:17 +04:00
|
|
|
|
2008-10-13 01:22:28 +04:00
|
|
|
/* Pass containing block into layout_find_dimensions via the float
|
2008-10-13 01:35:04 +04:00
|
|
|
* containing block box member. This is unused for absolutely positioned
|
|
|
|
* boxes because a box can't be floated and absolutely positioned. */
|
2008-10-13 01:22:28 +04:00
|
|
|
box->float_container = containing_block;
|
2009-05-07 20:22:38 +04:00
|
|
|
layout_find_dimensions(available_width, -1, box, box->style,
|
2008-09-28 00:19:46 +04:00
|
|
|
&width, &height, &max_width, &min_width,
|
|
|
|
margin, padding, border);
|
2008-10-13 01:22:28 +04:00
|
|
|
box->float_container = NULL;
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
/* 10.3.7 */
|
|
|
|
LOG(("%i + %i + %i + %i + %i + %i + %i + %i + %i = %i",
|
2009-07-24 04:08:23 +04:00
|
|
|
left, margin[LEFT], border[LEFT].width,
|
|
|
|
padding[LEFT], width, padding[RIGHT],
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width, margin[RIGHT], right,
|
2006-06-26 08:52:34 +04:00
|
|
|
containing_block->width));
|
|
|
|
if (left == AUTO && width == AUTO && right == AUTO) {
|
|
|
|
if (margin[LEFT] == AUTO)
|
|
|
|
margin[LEFT] = 0;
|
|
|
|
if (margin[RIGHT] == AUTO)
|
|
|
|
margin[RIGHT] = 0;
|
2006-10-09 02:46:25 +04:00
|
|
|
left = static_left;
|
2006-06-29 13:55:31 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
width = min(max(box->min_width, available_width),
|
|
|
|
box->max_width);
|
2009-07-24 03:05:34 +04:00
|
|
|
width -= box->margin[LEFT] + box->border[LEFT].width +
|
2006-06-29 13:55:31 +04:00
|
|
|
box->padding[LEFT] + box->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[RIGHT].width + box->margin[RIGHT];
|
2006-06-29 13:37:18 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width) width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width) width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
right = containing_block->width -
|
2009-07-24 03:05:34 +04:00
|
|
|
left -
|
|
|
|
margin[LEFT] - border[LEFT].width - padding[LEFT] -
|
|
|
|
width -
|
|
|
|
padding[RIGHT] - border[RIGHT].width - margin[RIGHT];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left != AUTO && width != AUTO && right != AUTO) {
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width) width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width) width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
if (margin[LEFT] == AUTO && margin[RIGHT] == AUTO) {
|
|
|
|
space = containing_block->width -
|
2009-07-24 03:05:34 +04:00
|
|
|
left - border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - right;
|
2006-06-26 08:52:34 +04:00
|
|
|
if (space < 0) {
|
|
|
|
margin[LEFT] = 0;
|
|
|
|
margin[RIGHT] = space;
|
|
|
|
} else {
|
|
|
|
margin[LEFT] = margin[RIGHT] = space / 2;
|
|
|
|
}
|
|
|
|
} else if (margin[LEFT] == AUTO) {
|
|
|
|
margin[LEFT] = containing_block->width -
|
2009-07-24 03:05:34 +04:00
|
|
|
left - border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 04:08:23 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
right;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (margin[RIGHT] == AUTO) {
|
|
|
|
margin[RIGHT] = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - right;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else {
|
|
|
|
right = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT];
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (margin[LEFT] == AUTO)
|
|
|
|
margin[LEFT] = 0;
|
|
|
|
if (margin[RIGHT] == AUTO)
|
|
|
|
margin[RIGHT] = 0;
|
2006-06-26 17:22:43 +04:00
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
if (left == AUTO && width == AUTO && right != AUTO) {
|
2006-06-26 17:22:43 +04:00
|
|
|
available_width -= right;
|
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
width = min(max(box->min_width, available_width),
|
|
|
|
box->max_width);
|
2009-07-24 03:05:34 +04:00
|
|
|
width -= box->margin[LEFT] + box->border[LEFT].width +
|
2006-06-29 13:37:18 +04:00
|
|
|
box->padding[LEFT] + box->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[RIGHT].width + box->margin[RIGHT];
|
2006-06-29 13:37:18 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
left = containing_block->width -
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[LEFT] - border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 04:08:23 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
right;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left == AUTO && width != AUTO && right == AUTO) {
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-10-09 02:46:25 +04:00
|
|
|
left = static_left;
|
2006-06-26 08:52:34 +04:00
|
|
|
right = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left != AUTO && width == AUTO && right == AUTO) {
|
2006-06-26 17:22:43 +04:00
|
|
|
available_width -= left;
|
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
width = min(max(box->min_width, available_width),
|
|
|
|
box->max_width);
|
2009-07-24 03:05:34 +04:00
|
|
|
width -= box->margin[LEFT] + box->border[LEFT].width +
|
2006-06-29 13:37:18 +04:00
|
|
|
box->padding[LEFT] + box->padding[RIGHT] +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->border[RIGHT].width + box->margin[RIGHT];
|
2006-06-29 13:37:18 +04:00
|
|
|
|
2008-09-28 00:19:46 +04:00
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
right = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left == AUTO && width != AUTO && right != AUTO) {
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
left = containing_block->width -
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[LEFT] - border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 04:08:23 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
right;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left != AUTO && width == AUTO && right != AUTO) {
|
|
|
|
width = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - padding[RIGHT] -
|
2009-07-24 04:08:23 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
right;
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (left != AUTO && width != AUTO && right == AUTO) {
|
2008-09-28 00:19:46 +04:00
|
|
|
|
|
|
|
/* Adjust for {min|max}-width */
|
|
|
|
if (max_width >= 0 && width > max_width)
|
|
|
|
width = max_width;
|
|
|
|
if (min_width > 0 && width < min_width)
|
|
|
|
width = min_width;
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
right = containing_block->width -
|
2009-07-24 04:08:23 +04:00
|
|
|
left - margin[LEFT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[LEFT].width -
|
2008-09-28 00:19:46 +04:00
|
|
|
padding[LEFT] - width - padding[RIGHT] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[RIGHT].width - margin[RIGHT];
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
LOG(("%i + %i + %i + %i + %i + %i + %i + %i + %i = %i",
|
2009-07-24 04:08:23 +04:00
|
|
|
left, margin[LEFT], border[LEFT].width, padding[LEFT],
|
|
|
|
width, padding[RIGHT], border[RIGHT].width,
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[RIGHT], right,
|
2006-06-26 08:52:34 +04:00
|
|
|
containing_block->width));
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
box->x = left + margin[LEFT] + border[LEFT].width - cx;
|
2006-06-29 15:55:21 +04:00
|
|
|
if (containing_block->type == BOX_BLOCK ||
|
|
|
|
containing_block->type == BOX_INLINE_BLOCK ||
|
|
|
|
containing_block->type == BOX_TABLE_CELL) {
|
2006-06-29 19:53:17 +04:00
|
|
|
/* Block-level ancestor => reset container's width */
|
|
|
|
containing_block->width -= containing_block->padding[LEFT] +
|
|
|
|
containing_block->padding[RIGHT];
|
2006-06-29 15:55:21 +04:00
|
|
|
} else {
|
|
|
|
/** \todo inline ancestors */
|
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
box->width = width;
|
|
|
|
box->height = height;
|
2006-06-26 17:22:43 +04:00
|
|
|
|
2006-11-04 22:17:11 +03:00
|
|
|
if (box->type == BOX_BLOCK || box->type == BOX_INLINE_BLOCK ||
|
|
|
|
box->object) {
|
2009-05-07 20:22:38 +04:00
|
|
|
if (!layout_block_context(box, -1, content))
|
2006-06-26 08:52:34 +04:00
|
|
|
return false;
|
|
|
|
} else if (box->type == BOX_TABLE) {
|
|
|
|
/* \todo layout_table considers margins etc. again */
|
|
|
|
if (!layout_table(box, width, content))
|
|
|
|
return false;
|
2009-08-31 14:39:32 +04:00
|
|
|
layout_solve_width(box, box->parent->width, box->width, 0, 0,
|
2009-08-21 21:05:22 +04:00
|
|
|
-1, -1);
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 10.6.4 */
|
|
|
|
LOG(("%i + %i + %i + %i + %i + %i + %i + %i + %i = %i",
|
2009-07-24 04:08:23 +04:00
|
|
|
top, margin[TOP], border[TOP].width, padding[TOP],
|
|
|
|
height, padding[BOTTOM], border[BOTTOM].width,
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[BOTTOM], bottom,
|
2006-06-26 08:52:34 +04:00
|
|
|
containing_block->height));
|
|
|
|
if (top == AUTO && height == AUTO && bottom == AUTO) {
|
2006-10-09 02:46:25 +04:00
|
|
|
top = static_top;
|
2006-06-26 08:52:34 +04:00
|
|
|
height = box->height;
|
|
|
|
if (margin[TOP] == AUTO)
|
|
|
|
margin[TOP] = 0;
|
|
|
|
if (margin[BOTTOM] == AUTO)
|
|
|
|
margin[BOTTOM] = 0;
|
|
|
|
bottom = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height - padding[BOTTOM] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[BOTTOM].width - margin[BOTTOM];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (top != AUTO && height != AUTO && bottom != AUTO) {
|
|
|
|
if (margin[TOP] == AUTO && margin[BOTTOM] == AUTO) {
|
|
|
|
space = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - border[TOP].width - padding[TOP] -
|
2008-10-13 19:06:19 +04:00
|
|
|
height - padding[BOTTOM] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[BOTTOM].width - bottom;
|
2006-06-26 08:52:34 +04:00
|
|
|
margin[TOP] = margin[BOTTOM] = space / 2;
|
|
|
|
} else if (margin[TOP] == AUTO) {
|
|
|
|
margin[TOP] = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - border[TOP].width - padding[TOP] -
|
2008-10-13 19:06:19 +04:00
|
|
|
height - padding[BOTTOM] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[BOTTOM].width - margin[BOTTOM] -
|
2006-06-26 08:52:34 +04:00
|
|
|
bottom;
|
|
|
|
} else if (margin[BOTTOM] == AUTO) {
|
|
|
|
margin[BOTTOM] = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2006-06-26 08:52:34 +04:00
|
|
|
bottom;
|
|
|
|
} else {
|
|
|
|
bottom = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM];
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (margin[TOP] == AUTO)
|
|
|
|
margin[TOP] = 0;
|
|
|
|
if (margin[BOTTOM] == AUTO)
|
|
|
|
margin[BOTTOM] = 0;
|
|
|
|
if (top == AUTO && height == AUTO && bottom != AUTO) {
|
|
|
|
height = box->height;
|
|
|
|
top = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM] - bottom;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (top == AUTO && height != AUTO && bottom == AUTO) {
|
2006-10-09 02:46:25 +04:00
|
|
|
top = static_top;
|
2006-06-26 08:52:34 +04:00
|
|
|
bottom = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (top != AUTO && height == AUTO && bottom == AUTO) {
|
|
|
|
height = box->height;
|
|
|
|
bottom = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM];
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (top == AUTO && height != AUTO && bottom != AUTO) {
|
|
|
|
top = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM] - bottom;
|
2006-06-26 08:52:34 +04:00
|
|
|
} else if (top != AUTO && height == AUTO && bottom != AUTO) {
|
|
|
|
height = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - padding[BOTTOM] -
|
2009-07-24 03:05:34 +04:00
|
|
|
border[BOTTOM].width - margin[BOTTOM] -
|
2006-06-26 08:52:34 +04:00
|
|
|
bottom;
|
|
|
|
} else if (top != AUTO && height != AUTO && bottom == AUTO) {
|
|
|
|
bottom = containing_block->height -
|
2009-07-24 03:05:34 +04:00
|
|
|
top - margin[TOP] - border[TOP].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
padding[TOP] - height -
|
2009-07-24 03:05:34 +04:00
|
|
|
padding[BOTTOM] - border[BOTTOM].width -
|
2008-10-13 19:06:19 +04:00
|
|
|
margin[BOTTOM];
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
LOG(("%i + %i + %i + %i + %i + %i + %i + %i + %i = %i",
|
2009-07-24 04:08:23 +04:00
|
|
|
top, margin[TOP], border[TOP].width, padding[TOP],
|
|
|
|
height, padding[BOTTOM], border[BOTTOM].width,
|
2009-07-24 03:05:34 +04:00
|
|
|
margin[BOTTOM], bottom,
|
2006-06-26 08:52:34 +04:00
|
|
|
containing_block->height));
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
box->y = top + margin[TOP] + border[TOP].width - cy;
|
2006-06-29 15:55:21 +04:00
|
|
|
if (containing_block->type == BOX_BLOCK ||
|
|
|
|
containing_block->type == BOX_INLINE_BLOCK ||
|
|
|
|
containing_block->type == BOX_TABLE_CELL) {
|
2006-06-29 19:53:17 +04:00
|
|
|
/* Block-level ancestor => reset container's height */
|
|
|
|
containing_block->height -= containing_block->padding[TOP] +
|
|
|
|
containing_block->padding[BOTTOM];
|
2006-06-29 15:55:21 +04:00
|
|
|
} else {
|
|
|
|
/** \todo Inline ancestors */
|
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
box->height = height;
|
2008-10-13 23:22:16 +04:00
|
|
|
layout_apply_minmax_height(box, containing_block);
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Compute box offsets for a relatively or absolutely positioned box with
|
|
|
|
* respect to a box.
|
|
|
|
*
|
|
|
|
* \param box box to compute offsets for
|
|
|
|
* \param containing_block box to compute percentages with respect to
|
|
|
|
* \param top updated to top offset, or AUTO
|
|
|
|
* \param right updated to right offset, or AUTO
|
|
|
|
* \param bottom updated to bottom offset, or AUTO
|
|
|
|
* \param left updated to left offset, or AUTO
|
|
|
|
*
|
|
|
|
* See CSS 2.1 9.3.2. containing_block must have width and height.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_compute_offsets(struct box *box,
|
|
|
|
struct box *containing_block,
|
|
|
|
int *top, int *right, int *bottom, int *left)
|
|
|
|
{
|
2009-07-24 03:05:34 +04:00
|
|
|
uint32_t type;
|
|
|
|
css_fixed value = 0;
|
|
|
|
css_unit unit = CSS_UNIT_PX;
|
|
|
|
|
2006-06-30 03:30:06 +04:00
|
|
|
assert(containing_block->width != UNKNOWN_WIDTH &&
|
|
|
|
containing_block->width != AUTO &&
|
|
|
|
containing_block->height != AUTO);
|
|
|
|
|
2006-06-26 08:52:34 +04:00
|
|
|
/* left */
|
2009-07-24 03:05:34 +04:00
|
|
|
type = css_computed_left(box->style, &value, &unit);
|
|
|
|
if (type == CSS_LEFT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*left = (FIXTOFLT(value) *
|
2009-07-24 03:05:34 +04:00
|
|
|
containing_block->width) / 100;
|
|
|
|
} else {
|
|
|
|
*left = FIXTOINT(nscss_len2px(value, unit, box->style));
|
|
|
|
}
|
|
|
|
} else {
|
2006-06-26 08:52:34 +04:00
|
|
|
*left = AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
/* right */
|
2009-07-24 03:05:34 +04:00
|
|
|
type = css_computed_right(box->style, &value, &unit);
|
|
|
|
if (type == CSS_RIGHT_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*right = (FIXTOFLT(value) *
|
2009-07-24 03:05:34 +04:00
|
|
|
containing_block->width) / 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*right = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
|
|
|
}
|
|
|
|
} else {
|
2006-06-26 08:52:34 +04:00
|
|
|
*right = AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
/* top */
|
2009-07-24 03:05:34 +04:00
|
|
|
type = css_computed_top(box->style, &value, &unit);
|
|
|
|
if (type == CSS_TOP_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*top = (FIXTOFLT(value) *
|
2009-07-24 03:05:34 +04:00
|
|
|
containing_block->height) / 100;
|
|
|
|
} else {
|
|
|
|
*top = FIXTOINT(nscss_len2px(value, unit, box->style));
|
|
|
|
}
|
|
|
|
} else {
|
2006-06-26 08:52:34 +04:00
|
|
|
*top = AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
|
|
|
|
/* bottom */
|
2009-07-24 03:05:34 +04:00
|
|
|
type = css_computed_bottom(box->style, &value, &unit);
|
|
|
|
if (type == CSS_BOTTOM_SET) {
|
|
|
|
if (unit == CSS_UNIT_PCT) {
|
2009-07-24 04:08:23 +04:00
|
|
|
*bottom = (FIXTOFLT(value) *
|
2009-07-24 03:05:34 +04:00
|
|
|
containing_block->height) / 100;
|
|
|
|
} else {
|
2009-07-24 04:08:23 +04:00
|
|
|
*bottom = FIXTOINT(nscss_len2px(value, unit,
|
2009-07-24 03:05:34 +04:00
|
|
|
box->style));
|
|
|
|
}
|
|
|
|
} else {
|
2006-06-26 08:52:34 +04:00
|
|
|
*bottom = AUTO;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2006-06-26 08:52:34 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-08-01 17:08:19 +04:00
|
|
|
/**
|
|
|
|
* Recursively calculate the descendant_[xy][01] values for a laid-out box tree.
|
|
|
|
*
|
|
|
|
* \param box tree of boxes to update
|
|
|
|
*/
|
|
|
|
|
|
|
|
void layout_calculate_descendant_bboxes(struct box *box)
|
|
|
|
{
|
|
|
|
struct box *child;
|
|
|
|
|
2006-12-27 00:51:08 +03:00
|
|
|
if (box->width == UNKNOWN_WIDTH || box->height == AUTO /*||
|
2005-07-02 22:17:51 +04:00
|
|
|
box->width < 0 || box->height < 0*/) {
|
|
|
|
LOG(("%p has bad width or height", box));
|
2006-12-27 00:51:08 +03:00
|
|
|
/*while (box->parent)
|
2005-04-02 15:13:27 +04:00
|
|
|
box = box->parent;
|
2006-12-27 00:51:08 +03:00
|
|
|
box_dump(box, 0);*/
|
2005-04-02 15:13:27 +04:00
|
|
|
assert(0);
|
|
|
|
}
|
|
|
|
|
2009-07-24 03:05:34 +04:00
|
|
|
box->descendant_x0 = -box->border[LEFT].width;
|
|
|
|
box->descendant_y0 = -box->border[TOP].width;
|
2004-08-01 17:08:19 +04:00
|
|
|
box->descendant_x1 = box->padding[LEFT] + box->width +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->padding[RIGHT] + box->border[RIGHT].width;
|
2004-08-01 17:08:19 +04:00
|
|
|
box->descendant_y1 = box->padding[TOP] + box->height +
|
2009-07-24 03:05:34 +04:00
|
|
|
box->padding[BOTTOM] + box->border[BOTTOM].width;
|
2004-08-01 17:08:19 +04:00
|
|
|
|
2005-08-08 23:19:20 +04:00
|
|
|
if (box->type == BOX_INLINE || box->type == BOX_TEXT)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (box->type == BOX_INLINE_END) {
|
|
|
|
box = box->inline_end;
|
2008-12-21 18:51:23 +03:00
|
|
|
for (child = box->next; child;
|
2005-08-08 23:19:20 +04:00
|
|
|
child = child->next) {
|
|
|
|
if (child->type == BOX_FLOAT_LEFT ||
|
|
|
|
child->type == BOX_FLOAT_RIGHT)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (child->x + child->descendant_x0 - box->x <
|
|
|
|
box->descendant_x0)
|
|
|
|
box->descendant_x0 = child->x +
|
|
|
|
child->descendant_x0 - box->x;
|
|
|
|
if (box->descendant_x1 < child->x +
|
|
|
|
child->descendant_x1 - box->x)
|
|
|
|
box->descendant_x1 = child->x +
|
|
|
|
child->descendant_x1 - box->x;
|
|
|
|
if (child->y + child->descendant_y0 - box->y <
|
|
|
|
box->descendant_y0)
|
|
|
|
box->descendant_y0 = child->y +
|
|
|
|
child->descendant_y0 - box->y;
|
|
|
|
if (box->descendant_y1 < child->y +
|
|
|
|
child->descendant_y1 - box->y)
|
|
|
|
box->descendant_y1 = child->y +
|
|
|
|
child->descendant_y1 - box->y;
|
2008-12-21 18:51:23 +03:00
|
|
|
if (child == box->inline_end)
|
|
|
|
break;
|
2005-08-08 23:19:20 +04:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-08-01 17:08:19 +04:00
|
|
|
for (child = box->children; child; child = child->next) {
|
|
|
|
if (child->type == BOX_FLOAT_LEFT ||
|
|
|
|
child->type == BOX_FLOAT_RIGHT)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
layout_calculate_descendant_bboxes(child);
|
|
|
|
|
2009-07-24 04:08:23 +04:00
|
|
|
if (box->style && css_computed_overflow(box->style) ==
|
2009-07-24 03:05:34 +04:00
|
|
|
CSS_OVERFLOW_HIDDEN)
|
2005-08-08 01:28:48 +04:00
|
|
|
continue;
|
|
|
|
|
2004-08-01 17:08:19 +04:00
|
|
|
if (child->x + child->descendant_x0 < box->descendant_x0)
|
|
|
|
box->descendant_x0 = child->x + child->descendant_x0;
|
|
|
|
if (box->descendant_x1 < child->x + child->descendant_x1)
|
|
|
|
box->descendant_x1 = child->x + child->descendant_x1;
|
|
|
|
if (child->y + child->descendant_y0 < box->descendant_y0)
|
|
|
|
box->descendant_y0 = child->y + child->descendant_y0;
|
|
|
|
if (box->descendant_y1 < child->y + child->descendant_y1)
|
|
|
|
box->descendant_y1 = child->y + child->descendant_y1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (child = box->float_children; child; child = child->next_float) {
|
2006-06-26 08:52:34 +04:00
|
|
|
assert(child->type == BOX_FLOAT_LEFT ||
|
|
|
|
child->type == BOX_FLOAT_RIGHT);
|
|
|
|
|
|
|
|
layout_calculate_descendant_bboxes(child);
|
|
|
|
|
|
|
|
if (child->x + child->descendant_x0 < box->descendant_x0)
|
|
|
|
box->descendant_x0 = child->x + child->descendant_x0;
|
|
|
|
if (box->descendant_x1 < child->x + child->descendant_x1)
|
|
|
|
box->descendant_x1 = child->x + child->descendant_x1;
|
|
|
|
if (child->y + child->descendant_y0 < box->descendant_y0)
|
|
|
|
box->descendant_y0 = child->y + child->descendant_y0;
|
|
|
|
if (box->descendant_y1 < child->y + child->descendant_y1)
|
|
|
|
box->descendant_y1 = child->y + child->descendant_y1;
|
|
|
|
}
|
2006-11-05 15:58:24 +03:00
|
|
|
|
|
|
|
if (box->list_marker) {
|
|
|
|
child = box->list_marker;
|
|
|
|
layout_calculate_descendant_bboxes(child);
|
|
|
|
|
|
|
|
if (child->x + child->descendant_x0 < box->descendant_x0)
|
|
|
|
box->descendant_x0 = child->x + child->descendant_x0;
|
|
|
|
if (box->descendant_x1 < child->x + child->descendant_x1)
|
|
|
|
box->descendant_x1 = child->x + child->descendant_x1;
|
|
|
|
if (child->y + child->descendant_y0 < box->descendant_y0)
|
|
|
|
box->descendant_y0 = child->y + child->descendant_y0;
|
|
|
|
if (box->descendant_y1 < child->y + child->descendant_y1)
|
|
|
|
box->descendant_y1 = child->y + child->descendant_y1;
|
|
|
|
}
|
2004-08-01 17:08:19 +04:00
|
|
|
}
|