2004-06-22 22:48:33 +04:00
|
|
|
/*
|
2005-02-27 19:03:02 +03:00
|
|
|
* Copyright 2005 James Bursa <bursa@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/>.
|
2004-06-22 22:48:33 +04:00
|
|
|
*/
|
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
/**
|
|
|
|
* \file
|
|
|
|
* GTK implementation of layout handling using pango.
|
2005-02-27 19:03:02 +03:00
|
|
|
*
|
|
|
|
* Pango is used handle and render fonts.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2004-06-22 22:48:33 +04:00
|
|
|
#include <assert.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <gtk/gtk.h>
|
2011-01-30 02:40:22 +03:00
|
|
|
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "utils/log.h"
|
2013-05-26 01:46:27 +04:00
|
|
|
#include "utils/nsoption.h"
|
2017-09-07 23:08:02 +03:00
|
|
|
#include "netsurf/inttypes.h"
|
2016-05-30 13:31:35 +03:00
|
|
|
#include "netsurf/layout.h"
|
2017-01-13 13:01:25 +03:00
|
|
|
#include "netsurf/plot_style.h"
|
2014-10-13 14:56:31 +04:00
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
#include "gtk/layout_pango.h"
|
2014-10-13 14:56:31 +04:00
|
|
|
#include "gtk/plotters.h"
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
static PangoContext *nsfont_pango_context = NULL;
|
|
|
|
static PangoLayout *nsfont_pango_layout = NULL;
|
|
|
|
|
|
|
|
static inline void nsfont_pango_check(void)
|
|
|
|
{
|
|
|
|
if (nsfont_pango_context == NULL) {
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Creating nsfont_pango_context.");
|
2011-03-14 19:28:37 +03:00
|
|
|
nsfont_pango_context = gdk_pango_context_get();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nsfont_pango_layout == NULL) {
|
Use coccinelle to change logging macro calls in c files
for F in $(git ls-files '*.c');do spatch --sp-file foo.cocci --in-place ${F};done
@@ expression E; @@
-LOG(E);
+NSLOG(netsurf, INFO, E);
@@ expression E, E1; @@
-LOG(E, E1);
+NSLOG(netsurf, INFO, E, E1);
@@ expression E, E1, E2; @@
-LOG(E, E1, E2);
+NSLOG(netsurf, INFO, E, E1, E2);
@@ expression E, E1, E2, E3; @@
-LOG(E, E1, E2, E3);
+NSLOG(netsurf, INFO, E, E1, E2, E3);
@@ expression E, E1, E2, E3, E4; @@
-LOG(E, E1, E2, E3, E4);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4);
@@ expression E, E1, E2, E3, E4, E5; @@
-LOG(E, E1, E2, E3, E4, E5);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5);
@@ expression E, E1, E2, E3, E4, E5, E6; @@
-LOG(E, E1, E2, E3, E4, E5, E6);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6);
@@ expression E, E1, E2, E3, E4, E5, E6, E7; @@
-LOG(E, E1, E2, E3, E4, E5, E6, E7);
+NSLOG(netsurf, INFO, E, E1, E2, E3, E4, E5, E6, E7);
2017-09-06 20:28:12 +03:00
|
|
|
NSLOG(netsurf, INFO, "Creating nsfont_pango_layout.");
|
2011-03-14 19:28:37 +03:00
|
|
|
nsfont_pango_layout = pango_layout_new(nsfont_pango_context);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-27 19:03:02 +03:00
|
|
|
/**
|
|
|
|
* Measure the width of a string.
|
|
|
|
*
|
2016-04-24 01:33:37 +03:00
|
|
|
* \param[in] fstyle plot style for this text
|
|
|
|
* \param[in] string UTF-8 string to measure
|
|
|
|
* \param[in] length length of string, in bytes
|
|
|
|
* \param[out] width updated to width of string[0..length)
|
|
|
|
* \return NSERROR_OK and width updated or appropriate error code on faliure
|
2005-02-27 19:03:02 +03:00
|
|
|
*/
|
2016-04-24 01:33:37 +03:00
|
|
|
static nserror
|
|
|
|
nsfont_width(const plot_font_style_t *fstyle,
|
|
|
|
const char *string,
|
|
|
|
size_t length,
|
|
|
|
int *width)
|
2004-06-22 22:48:33 +04:00
|
|
|
{
|
2005-02-27 19:03:02 +03:00
|
|
|
PangoFontDescription *desc;
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2005-04-09 17:26:57 +04:00
|
|
|
if (length == 0) {
|
|
|
|
*width = 0;
|
2016-04-24 01:33:37 +03:00
|
|
|
return NSERROR_OK;
|
2005-04-09 17:26:57 +04:00
|
|
|
}
|
2011-03-14 19:28:37 +03:00
|
|
|
|
|
|
|
nsfont_pango_check();
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
desc = nsfont_style_to_description(fstyle);
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_set_font_description(nsfont_pango_layout, desc);
|
2016-02-09 18:15:53 +03:00
|
|
|
pango_font_description_free(desc);
|
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_set_text(nsfont_pango_layout, string, length);
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_get_pixel_size(nsfont_pango_layout, width, 0);
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2017-09-07 20:12:09 +03:00
|
|
|
NSLOG(netsurf, DEEPDEBUG,
|
2017-09-07 23:08:02 +03:00
|
|
|
"fstyle: %p string:\"%.*s\", length: %" PRIsizet ", width: %dpx",
|
|
|
|
fstyle, (int)length, string, length, *width);
|
2017-09-07 20:12:09 +03:00
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
return NSERROR_OK;
|
2004-06-22 22:48:33 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-27 19:03:02 +03:00
|
|
|
/**
|
|
|
|
* Find the position in a string where an x coordinate falls.
|
|
|
|
*
|
2016-04-24 01:33:37 +03:00
|
|
|
* \param[in] fstyle style for this text
|
|
|
|
* \param[in] string UTF-8 string to measure
|
|
|
|
* \param[in] length length of string, in bytes
|
|
|
|
* \param[in] x coordinate to search for
|
|
|
|
* \param[out] char_offset updated to offset in string of actual_x, [0..length]
|
|
|
|
* \param[out] actual_x updated to x coordinate of character closest to x
|
|
|
|
* \return NSERROR_OK and char_offset and actual_x updated or appropriate
|
|
|
|
* error code on faliure
|
2005-02-27 19:03:02 +03:00
|
|
|
*/
|
2016-04-24 01:33:37 +03:00
|
|
|
static nserror
|
|
|
|
nsfont_position_in_string(const plot_font_style_t *fstyle,
|
|
|
|
const char *string,
|
|
|
|
size_t length,
|
|
|
|
int x,
|
|
|
|
size_t *char_offset,
|
|
|
|
int *actual_x)
|
2004-06-22 22:48:33 +04:00
|
|
|
{
|
|
|
|
int index;
|
2005-02-27 19:03:02 +03:00
|
|
|
PangoFontDescription *desc;
|
2004-06-22 22:48:33 +04:00
|
|
|
PangoRectangle pos;
|
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
nsfont_pango_check();
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
desc = nsfont_style_to_description(fstyle);
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_set_font_description(nsfont_pango_layout, desc);
|
2016-02-09 18:15:53 +03:00
|
|
|
pango_font_description_free(desc);
|
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_set_text(nsfont_pango_layout, string, length);
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
if (pango_layout_xy_to_index(nsfont_pango_layout,
|
|
|
|
x * PANGO_SCALE,
|
|
|
|
0, &index, 0) == FALSE) {
|
2008-03-22 15:11:09 +03:00
|
|
|
index = length;
|
2016-04-24 01:33:37 +03:00
|
|
|
}
|
2008-03-22 15:11:09 +03:00
|
|
|
|
2011-03-14 19:28:37 +03:00
|
|
|
pango_layout_index_to_pos(nsfont_pango_layout, index, &pos);
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2008-03-22 15:11:09 +03:00
|
|
|
*char_offset = index;
|
2005-02-27 19:03:02 +03:00
|
|
|
*actual_x = PANGO_PIXELS(pos.x);
|
2005-01-02 06:58:21 +03:00
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
return NSERROR_OK;
|
2004-06-22 22:48:33 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-27 19:03:02 +03:00
|
|
|
/**
|
|
|
|
* Find where to split a string to make it fit a width.
|
|
|
|
*
|
2016-04-24 01:33:37 +03:00
|
|
|
* \param[in] fstyle style for this text
|
|
|
|
* \param[in] string UTF-8 string to measure
|
|
|
|
* \param[in] length length of string, in bytes
|
|
|
|
* \param[in] x width available
|
|
|
|
* \param[out] char_offset updated to offset in string of actual_x, [1..length]
|
|
|
|
* \param[out] actual_x updated to x coordinate of character closest to x
|
|
|
|
* \return NSERROR_OK or appropriate error code on faliure
|
2005-02-27 19:03:02 +03:00
|
|
|
*
|
2013-02-10 22:23:34 +04:00
|
|
|
* On exit, char_offset indicates first character after split point.
|
|
|
|
*
|
2016-04-24 01:33:37 +03:00
|
|
|
* \note char_offset of 0 must never be returned.
|
2013-02-10 22:23:34 +04:00
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* char_offset giving split point closest to x, where actual_x <= x
|
|
|
|
* else
|
|
|
|
* char_offset giving split point closest to x, where actual_x > x
|
|
|
|
*
|
|
|
|
* Returning char_offset == length means no split possible
|
2005-02-27 19:03:02 +03:00
|
|
|
*/
|
2016-04-24 01:33:37 +03:00
|
|
|
static nserror
|
|
|
|
nsfont_split(const plot_font_style_t *fstyle,
|
|
|
|
const char *string,
|
|
|
|
size_t length,
|
|
|
|
int x,
|
|
|
|
size_t *char_offset,
|
|
|
|
int *actual_x)
|
2004-06-22 22:48:33 +04:00
|
|
|
{
|
|
|
|
int index = length;
|
2005-02-27 19:03:02 +03:00
|
|
|
PangoFontDescription *desc;
|
2004-06-22 22:48:33 +04:00
|
|
|
PangoContext *context;
|
|
|
|
PangoLayout *layout;
|
|
|
|
PangoLayoutLine *line;
|
|
|
|
|
|
|
|
context = gdk_pango_context_get();
|
|
|
|
layout = pango_layout_new(context);
|
2016-02-09 18:15:53 +03:00
|
|
|
|
|
|
|
desc = nsfont_style_to_description(fstyle);
|
2005-02-27 19:03:02 +03:00
|
|
|
pango_layout_set_font_description(layout, desc);
|
2016-02-09 18:15:53 +03:00
|
|
|
pango_font_description_free(desc);
|
|
|
|
|
2005-02-27 19:03:02 +03:00
|
|
|
pango_layout_set_text(layout, string, length);
|
2004-06-22 22:48:33 +04:00
|
|
|
|
2011-01-09 03:52:00 +03:00
|
|
|
/* Limit width of layout to the available width */
|
2005-02-27 19:03:02 +03:00
|
|
|
pango_layout_set_width(layout, x * PANGO_SCALE);
|
2011-01-09 03:52:00 +03:00
|
|
|
|
|
|
|
/* Request word wrapping */
|
2004-06-22 22:48:33 +04:00
|
|
|
pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
|
2006-11-11 15:05:45 +03:00
|
|
|
|
2011-01-09 03:52:00 +03:00
|
|
|
/* Prevent pango treating linebreak characters as line breaks */
|
|
|
|
pango_layout_set_single_paragraph_mode(layout, TRUE);
|
|
|
|
|
|
|
|
/* Obtain the second line of the layout (if there is one) */
|
2017-04-11 18:32:03 +03:00
|
|
|
line = pango_layout_get_line_readonly(layout, 1);
|
2011-01-09 03:52:00 +03:00
|
|
|
if (line != NULL) {
|
|
|
|
/* Pango split the text. The line's start_index indicates the
|
|
|
|
* start of the character after the line break. */
|
|
|
|
index = line->start_index;
|
|
|
|
}
|
2004-06-22 22:48:33 +04:00
|
|
|
|
|
|
|
g_object_unref(layout);
|
|
|
|
g_object_unref(context);
|
2005-02-27 19:03:02 +03:00
|
|
|
|
|
|
|
*char_offset = index;
|
2011-01-09 03:52:00 +03:00
|
|
|
/* Obtain the pixel offset of the split character */
|
|
|
|
nsfont_width(fstyle, string, index, actual_x);
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
return NSERROR_OK;
|
2005-02-27 19:03:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render a string.
|
|
|
|
*
|
2006-03-27 01:53:20 +04:00
|
|
|
* \param x x coordinate
|
|
|
|
* \param y y coordinate
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param string UTF-8 string to measure
|
|
|
|
* \param length length of string
|
2014-11-10 20:00:15 +03:00
|
|
|
* \param fstyle plot style for this text
|
2005-02-27 19:03:02 +03:00
|
|
|
* \return true on success, false on error and error reported
|
|
|
|
*/
|
2017-02-06 03:37:08 +03:00
|
|
|
nserror nsfont_paint(int x, int y, const char *string, size_t length,
|
2009-07-21 14:59:53 +04:00
|
|
|
const plot_font_style_t *fstyle)
|
2005-02-27 19:03:02 +03:00
|
|
|
{
|
|
|
|
PangoFontDescription *desc;
|
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
|
|
|
PangoLayoutLine *line;
|
2005-02-27 19:03:02 +03:00
|
|
|
|
|
|
|
if (length == 0)
|
2017-02-06 03:37:08 +03:00
|
|
|
return NSERROR_OK;
|
2005-02-27 19:03:02 +03:00
|
|
|
|
2017-04-11 18:03:23 +03:00
|
|
|
nsfont_pango_check();
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2016-02-09 18:15:53 +03:00
|
|
|
desc = nsfont_style_to_description(fstyle);
|
2017-04-11 18:03:23 +03:00
|
|
|
pango_layout_set_font_description(nsfont_pango_layout, desc);
|
2016-02-09 18:15:53 +03:00
|
|
|
pango_font_description_free(desc);
|
|
|
|
|
2017-04-11 18:03:23 +03:00
|
|
|
pango_layout_set_text(nsfont_pango_layout, string, length);
|
2016-02-09 18:15:53 +03:00
|
|
|
|
2017-04-11 18:03:23 +03:00
|
|
|
line = pango_layout_get_line_readonly(nsfont_pango_layout, 0);
|
2013-05-31 18:12:40 +04:00
|
|
|
cairo_move_to(current_cr, x, y);
|
2011-09-17 18:58:42 +04:00
|
|
|
nsgtk_set_colour(fstyle->foreground);
|
|
|
|
pango_cairo_show_layout_line(current_cr, line);
|
|
|
|
|
2017-02-06 03:37:08 +03:00
|
|
|
return NSERROR_OK;
|
2005-02-27 19:03:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
/* exported interface documented in gtk/layout_pango.h */
|
|
|
|
PangoFontDescription *
|
|
|
|
nsfont_style_to_description(const plot_font_style_t *fstyle)
|
2005-02-27 19:03:02 +03:00
|
|
|
{
|
|
|
|
unsigned int size;
|
|
|
|
PangoFontDescription *desc;
|
2009-07-21 14:59:53 +04:00
|
|
|
PangoStyle style = PANGO_STYLE_NORMAL;
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
switch (fstyle->family) {
|
|
|
|
case PLOT_FONT_FAMILY_SERIF:
|
2012-03-22 13:34:34 +04:00
|
|
|
desc = pango_font_description_from_string(nsoption_charp(font_serif));
|
2006-08-18 01:28:40 +04:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_MONOSPACE:
|
2012-03-22 13:34:34 +04:00
|
|
|
desc = pango_font_description_from_string(nsoption_charp(font_mono));
|
2006-08-18 01:28:40 +04:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_CURSIVE:
|
2012-03-22 13:34:34 +04:00
|
|
|
desc = pango_font_description_from_string(nsoption_charp(font_cursive));
|
2006-08-18 01:28:40 +04:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_FANTASY:
|
2012-03-22 13:34:34 +04:00
|
|
|
desc = pango_font_description_from_string(nsoption_charp(font_fantasy));
|
2006-08-18 01:28:40 +04:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_SANS_SERIF:
|
2006-08-18 01:28:40 +04:00
|
|
|
default:
|
2012-03-22 13:34:34 +04:00
|
|
|
desc = pango_font_description_from_string(nsoption_charp(font_sans));
|
2006-08-18 01:28:40 +04:00
|
|
|
break;
|
|
|
|
}
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2018-05-23 13:48:35 +03:00
|
|
|
size = (fstyle->size * PANGO_SCALE) / PLOT_STYLE_SCALE;
|
2005-02-27 19:03:02 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
if (fstyle->flags & FONTF_ITALIC)
|
|
|
|
style = PANGO_STYLE_ITALIC;
|
|
|
|
else if (fstyle->flags & FONTF_OBLIQUE)
|
|
|
|
style = PANGO_STYLE_OBLIQUE;
|
2005-02-27 19:03:02 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
pango_font_description_set_style(desc, style);
|
2005-02-27 19:03:02 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
pango_font_description_set_weight(desc, (PangoWeight) fstyle->weight);
|
2006-03-27 01:53:20 +04:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
pango_font_description_set_size(desc, size);
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
if (fstyle->flags & FONTF_SMALLCAPS) {
|
|
|
|
pango_font_description_set_variant(desc,
|
|
|
|
PANGO_VARIANT_SMALL_CAPS);
|
|
|
|
} else {
|
2006-03-27 01:53:20 +04:00
|
|
|
pango_font_description_set_variant(desc, PANGO_VARIANT_NORMAL);
|
|
|
|
}
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2005-02-27 19:03:02 +03:00
|
|
|
return desc;
|
2004-06-22 22:48:33 +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
|
|
|
|
2016-04-24 01:33:37 +03:00
|
|
|
static struct gui_layout_table layout_table = {
|
|
|
|
.width = nsfont_width,
|
|
|
|
.position = nsfont_position_in_string,
|
|
|
|
.split = nsfont_split,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct gui_layout_table *nsgtk_layout_table = &layout_table;
|