2003-06-30 16:44:03 +04:00
|
|
|
/*
|
2006-01-29 15:23:22 +03:00
|
|
|
* Copyright 2006 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/>.
|
2002-07-28 01:10:45 +04:00
|
|
|
*/
|
|
|
|
|
2016-04-24 15:32:07 +03:00
|
|
|
/**
|
|
|
|
* \file
|
2014-06-05 18:14:49 +04:00
|
|
|
* RISC OS implementation of Font handling.
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2014-06-05 18:14:49 +04:00
|
|
|
* The RUfl is used to handle and render fonts.
|
2004-01-22 02:57:19 +03:00
|
|
|
*/
|
|
|
|
|
2014-06-05 18:14:49 +04:00
|
|
|
#include "utils/config.h"
|
|
|
|
|
2002-09-27 01:38:33 +04:00
|
|
|
#include <assert.h>
|
2005-02-23 02:36:14 +03:00
|
|
|
#include <string.h>
|
2014-06-05 18:14:49 +04:00
|
|
|
#include <oslib/wimp.h>
|
|
|
|
#include <oslib/wimpreadsysinfo.h>
|
|
|
|
|
2013-05-26 01:46:27 +04:00
|
|
|
#include "utils/nsoption.h"
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "utils/log.h"
|
|
|
|
#include "utils/messages.h"
|
|
|
|
#include "utils/utils.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"
|
2003-07-18 03:01:02 +04:00
|
|
|
|
2014-06-05 18:14:49 +04:00
|
|
|
#include "riscos/gui.h"
|
|
|
|
#include "riscos/font.h"
|
|
|
|
|
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
|
|
|
|
|
|
|
/** desktop font, size and style being used */
|
|
|
|
char ro_gui_desktop_font_family[80];
|
|
|
|
int ro_gui_desktop_font_size = 12;
|
|
|
|
rufl_style ro_gui_desktop_font_style = rufl_WEIGHT_400;
|
2013-08-16 12:28:56 +04:00
|
|
|
bool no_font_blending = false;
|
2004-01-31 01:28:32 +03:00
|
|
|
|
2016-04-24 15:32:07 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Check that at least Homerton.Medium is available.
|
|
|
|
*/
|
|
|
|
static void nsfont_check_fonts(void)
|
|
|
|
{
|
|
|
|
char s[252];
|
|
|
|
font_f font;
|
|
|
|
os_error *error;
|
|
|
|
|
|
|
|
error = xfont_find_font("Homerton.Medium\\ELatin1",
|
|
|
|
160, 160, 0, 0, &font, 0, 0);
|
|
|
|
if (error) {
|
|
|
|
if (error->errnum == error_FILE_NOT_FOUND) {
|
|
|
|
xwimp_start_task("TaskWindow -wimpslot 200K -quit "
|
|
|
|
"<NetSurf$Dir>.FixFonts", 0);
|
|
|
|
die("FontBadInst");
|
|
|
|
} else {
|
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, "xfont_find_font: 0x%x: %s",
|
|
|
|
error->errnum, error->errmess);
|
2016-04-24 15:32:07 +03:00
|
|
|
snprintf(s, sizeof s, messages_get("FontError"),
|
|
|
|
error->errmess);
|
|
|
|
die(s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
error = xfont_lose_font(font);
|
|
|
|
if (error) {
|
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, "xfont_lose_font: 0x%x: %s",
|
|
|
|
error->errnum, error->errmess);
|
2016-04-24 15:32:07 +03:00
|
|
|
snprintf(s, sizeof s, messages_get("FontError"),
|
|
|
|
error->errmess);
|
|
|
|
die(s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check that a font option is valid, and fix it if not.
|
|
|
|
*
|
|
|
|
* \param option pointer to option, as used by options.[ch]
|
|
|
|
* \param family font family to use if option is not set, or the set
|
|
|
|
* family is not available
|
|
|
|
* \param fallback font family to use if family is not available either
|
|
|
|
*/
|
|
|
|
static void nsfont_check_option(char **option, const char *family,
|
|
|
|
const char *fallback)
|
|
|
|
{
|
|
|
|
if (*option && !nsfont_exists(*option)) {
|
|
|
|
free(*option);
|
|
|
|
*option = 0;
|
|
|
|
}
|
|
|
|
if (!*option) {
|
|
|
|
if (nsfont_exists(family))
|
|
|
|
*option = strdup(family);
|
|
|
|
else
|
|
|
|
*option = strdup(fallback);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-11 18:24:02 +04:00
|
|
|
|
2005-02-23 02:36:14 +03:00
|
|
|
/**
|
|
|
|
* Initialize font handling.
|
|
|
|
*
|
|
|
|
* Exits through die() on error.
|
|
|
|
*/
|
|
|
|
void nsfont_init(void)
|
|
|
|
{
|
2006-01-10 11:17:51 +03:00
|
|
|
const char *fallback;
|
2005-02-23 02:36:14 +03:00
|
|
|
rufl_code code;
|
|
|
|
|
|
|
|
nsfont_check_fonts();
|
|
|
|
|
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, "Initialise RUfl");
|
2005-02-23 02:36:14 +03:00
|
|
|
code = rufl_init();
|
|
|
|
if (code != rufl_OK) {
|
|
|
|
if (code == rufl_FONT_MANAGER_ERROR)
|
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,
|
|
|
|
"rufl_init: rufl_FONT_MANAGER_ERROR: 0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2005-02-23 02:36:14 +03:00
|
|
|
else
|
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, "rufl_init: 0x%x", code);
|
2005-02-23 02:36:14 +03:00
|
|
|
die("The Unicode font library could not be initialized. "
|
|
|
|
"Please report this to the developers.");
|
|
|
|
}
|
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, "RUfl initialised");
|
2005-02-23 02:36:14 +03:00
|
|
|
|
|
|
|
if (rufl_family_list_entries == 0)
|
|
|
|
die("No fonts could be found. At least one font must be "
|
|
|
|
"installed.");
|
|
|
|
|
2006-01-10 11:17:51 +03:00
|
|
|
fallback = nsfont_fallback_font();
|
2005-02-23 02:36:14 +03:00
|
|
|
|
2012-03-22 13:34:34 +04:00
|
|
|
nsfont_check_option(&nsoption_charp(font_sans), "Homerton", fallback);
|
|
|
|
nsfont_check_option(&nsoption_charp(font_serif), "Trinity", fallback);
|
|
|
|
nsfont_check_option(&nsoption_charp(font_mono), "Corpus", fallback);
|
|
|
|
nsfont_check_option(&nsoption_charp(font_cursive), "Churchill", fallback);
|
|
|
|
nsfont_check_option(&nsoption_charp(font_fantasy), "Sassoon", fallback);
|
|
|
|
|
|
|
|
if (nsoption_int(font_default) != PLOT_FONT_FAMILY_SANS_SERIF &&
|
|
|
|
nsoption_int(font_default) != PLOT_FONT_FAMILY_SERIF &&
|
|
|
|
nsoption_int(font_default) != PLOT_FONT_FAMILY_MONOSPACE &&
|
|
|
|
nsoption_int(font_default) != PLOT_FONT_FAMILY_CURSIVE &&
|
|
|
|
nsoption_int(font_default) != PLOT_FONT_FAMILY_FANTASY) {
|
|
|
|
nsoption_set_int(font_default, PLOT_FONT_FAMILY_SANS_SERIF);
|
|
|
|
}
|
2005-02-23 02:36:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-03 00:24:43 +03:00
|
|
|
/**
|
|
|
|
* Retrieve the fallback font name
|
|
|
|
*
|
|
|
|
* \return Fallback font name
|
|
|
|
*/
|
|
|
|
const char *nsfont_fallback_font(void)
|
|
|
|
{
|
|
|
|
const char *fallback = "Homerton";
|
|
|
|
|
2006-06-28 18:38:31 +04:00
|
|
|
if (!nsfont_exists(fallback)) {
|
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,
|
|
|
|
"Homerton not found, dumping RUfl family list");
|
2006-06-28 18:38:31 +04:00
|
|
|
for (unsigned int i = 0; i < rufl_family_list_entries; i++) {
|
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, "'%s'", rufl_family_list[i]);
|
2006-06-28 18:38:31 +04:00
|
|
|
}
|
2006-01-03 00:24:43 +03:00
|
|
|
fallback = rufl_family_list[0];
|
2006-06-28 18:38:31 +04:00
|
|
|
}
|
2006-01-03 00:24:43 +03:00
|
|
|
|
|
|
|
return fallback;
|
|
|
|
}
|
|
|
|
|
2016-04-24 15:32:07 +03:00
|
|
|
|
2005-02-23 02:36:14 +03:00
|
|
|
/**
|
2016-04-24 15:32:07 +03:00
|
|
|
* bsearch comparison routine
|
2005-02-23 02:36:14 +03:00
|
|
|
*/
|
2016-04-24 15:32:07 +03:00
|
|
|
static int nsfont_list_cmp(const void *keyval, const void *datum)
|
2005-02-23 02:36:14 +03:00
|
|
|
{
|
2016-04-24 15:32:07 +03:00
|
|
|
const char *key = keyval;
|
|
|
|
const char * const *entry = datum;
|
|
|
|
return strcasecmp(key, *entry);
|
2005-02-23 02:36:14 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check if a font family is available.
|
|
|
|
*
|
|
|
|
* \param font_family name of font family
|
|
|
|
* \return true if the family is available
|
|
|
|
*/
|
|
|
|
bool nsfont_exists(const char *font_family)
|
|
|
|
{
|
|
|
|
if (bsearch(font_family, rufl_family_list,
|
|
|
|
rufl_family_list_entries, sizeof rufl_family_list[0],
|
|
|
|
nsfont_list_cmp))
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-09-27 01:38:33 +04:00
|
|
|
/**
|
2005-02-20 16:19:19 +03:00
|
|
|
* Measure the width of a string.
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param fstyle plot style for this text
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param string UTF-8 string to measure
|
|
|
|
* \param length length of string
|
|
|
|
* \param width updated to width of string[0..length)
|
|
|
|
* \return true on success, false on error and error reported
|
2002-09-27 01:38:33 +04:00
|
|
|
*/
|
2016-04-24 15:32:07 +03:00
|
|
|
static nserror
|
|
|
|
ro_font_width(const plot_font_style_t *fstyle,
|
2005-02-20 16:19:19 +03:00
|
|
|
const char *string, size_t length,
|
|
|
|
int *width)
|
2002-09-27 01:38:33 +04:00
|
|
|
{
|
2005-02-20 16:19:19 +03:00
|
|
|
const char *font_family;
|
|
|
|
unsigned int font_size;
|
|
|
|
rufl_style font_style;
|
|
|
|
rufl_code code;
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
nsfont_read_style(fstyle, &font_family, &font_size, &font_style);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (font_size == 0) {
|
|
|
|
*width = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_OK;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2005-02-20 16:19:19 +03:00
|
|
|
|
|
|
|
code = rufl_width(font_family, font_style, font_size,
|
|
|
|
string, length,
|
|
|
|
width);
|
|
|
|
if (code != rufl_OK) {
|
|
|
|
if (code == rufl_FONT_MANAGER_ERROR)
|
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,
|
|
|
|
"rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2005-02-20 16:19:19 +03:00
|
|
|
else
|
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, "rufl_width: 0x%x", code);
|
2016-04-26 17:16:33 +03:00
|
|
|
/* ro_warn_user("MiscError", "font error"); */
|
2013-01-27 02:04:26 +04:00
|
|
|
*width = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_INVALID;
|
2002-09-27 01:38:33 +04:00
|
|
|
}
|
|
|
|
|
2005-02-20 16:19:19 +03:00
|
|
|
*width /= 2;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_OK;
|
2002-09-27 01:38:33 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-01-22 02:57:19 +03:00
|
|
|
/**
|
2005-02-20 16:19:19 +03:00
|
|
|
* Find the position in a string where an x coordinate falls.
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param fstyle style for this text
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param string UTF-8 string to measure
|
|
|
|
* \param length length of string
|
|
|
|
* \param x x coordinate to search for
|
|
|
|
* \param char_offset updated to offset in string of actual_x, [0..length]
|
|
|
|
* \param actual_x updated to x coordinate of character closest to x
|
|
|
|
* \return true on success, false on error and error reported
|
2004-01-22 02:57:19 +03:00
|
|
|
*/
|
2016-04-24 15:32:07 +03:00
|
|
|
static nserror
|
|
|
|
ro_font_position(const plot_font_style_t *fstyle,
|
2005-02-20 16:19:19 +03:00
|
|
|
const char *string, size_t length,
|
|
|
|
int x, size_t *char_offset, int *actual_x)
|
2004-07-06 00:19:52 +04:00
|
|
|
{
|
2005-02-20 16:19:19 +03:00
|
|
|
const char *font_family;
|
|
|
|
unsigned int font_size;
|
|
|
|
rufl_style font_style;
|
|
|
|
rufl_code code;
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
nsfont_read_style(fstyle, &font_family, &font_size, &font_style);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (font_size == 0) {
|
|
|
|
*char_offset = 0;
|
|
|
|
*actual_x = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_OK;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2005-02-20 16:19:19 +03:00
|
|
|
|
|
|
|
code = rufl_x_to_offset(font_family, font_style, font_size,
|
|
|
|
string, length,
|
|
|
|
x * 2, char_offset, actual_x);
|
|
|
|
if (code != rufl_OK) {
|
|
|
|
if (code == rufl_FONT_MANAGER_ERROR)
|
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,
|
|
|
|
"rufl_x_to_offset: rufl_FONT_MANAGER_ERROR: ""0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2005-02-20 16:19:19 +03:00
|
|
|
else
|
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, "rufl_x_to_offset: 0x%x", code);
|
2016-04-26 17:16:33 +03:00
|
|
|
/* ro_warn_user("MiscError", "font error"); */
|
2013-01-27 02:04:26 +04:00
|
|
|
*char_offset = 0;
|
|
|
|
*actual_x = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_INVALID;
|
2004-07-06 00:19:52 +04:00
|
|
|
}
|
2002-09-27 01:38:33 +04:00
|
|
|
|
2005-02-20 16:19:19 +03:00
|
|
|
*actual_x /= 2;
|
2016-04-28 13:31:31 +03:00
|
|
|
|
|
|
|
return NSERROR_OK;
|
2002-09-27 01:38:33 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-01-22 02:57:19 +03:00
|
|
|
/**
|
2005-02-20 16:19:19 +03:00
|
|
|
* Find where to split a string to make it fit a width.
|
|
|
|
*
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param fstyle style for this text
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param string UTF-8 string to measure
|
2013-02-10 22:25:09 +04:00
|
|
|
* \param length length of string, in bytes
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param x width available
|
2013-02-10 22:25:09 +04:00
|
|
|
* \param char_offset updated to offset in string of actual_x, [1..length]
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param actual_x updated to x coordinate of character closest to x
|
|
|
|
* \return true on success, false on error and error reported
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2013-02-10 22:25:09 +04:00
|
|
|
* On exit, char_offset indicates first character after split point.
|
|
|
|
*
|
|
|
|
* Note: char_offset of 0 should never be returned.
|
|
|
|
*
|
|
|
|
* 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
|
2004-01-22 02:57:19 +03:00
|
|
|
*/
|
2016-04-24 15:32:07 +03:00
|
|
|
static nserror
|
|
|
|
ro_font_split(const plot_font_style_t *fstyle,
|
2005-02-20 16:19:19 +03:00
|
|
|
const char *string, size_t length,
|
|
|
|
int x, size_t *char_offset, int *actual_x)
|
|
|
|
{
|
|
|
|
const char *font_family;
|
|
|
|
unsigned int font_size;
|
|
|
|
rufl_style font_style;
|
|
|
|
rufl_code code;
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
nsfont_read_style(fstyle, &font_family, &font_size, &font_style);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (font_size == 0) {
|
|
|
|
*char_offset = 0;
|
|
|
|
*actual_x = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_OK;
|
2009-07-24 03:05:34 +04:00
|
|
|
}
|
2005-02-20 16:19:19 +03:00
|
|
|
|
2005-03-24 10:45:41 +03:00
|
|
|
code = rufl_split(font_family, font_style, font_size,
|
2005-02-20 16:19:19 +03:00
|
|
|
string, length,
|
|
|
|
x * 2, char_offset, actual_x);
|
|
|
|
if (code != rufl_OK) {
|
2016-04-28 13:31:31 +03:00
|
|
|
if (code == rufl_FONT_MANAGER_ERROR) {
|
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,
|
|
|
|
"rufl_split: rufl_FONT_MANAGER_ERROR: ""0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2016-04-28 13:31:31 +03:00
|
|
|
} else {
|
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, "rufl_split: 0x%x", code);
|
2016-04-28 13:31:31 +03:00
|
|
|
}
|
2016-04-26 17:16:33 +03:00
|
|
|
/* ro_warn_user("MiscError", "font error"); */
|
2013-01-27 02:04:26 +04:00
|
|
|
*char_offset = 0;
|
|
|
|
*actual_x = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_INVALID;
|
2004-07-06 00:19:52 +04:00
|
|
|
}
|
2005-02-20 16:19:19 +03:00
|
|
|
|
2013-01-19 02:04:57 +04:00
|
|
|
if (*char_offset != length) {
|
|
|
|
/* we found something to split at */
|
|
|
|
size_t orig = *char_offset;
|
|
|
|
|
|
|
|
/* ensure a space at <= the split point we found */
|
2016-04-28 13:31:31 +03:00
|
|
|
while (*char_offset && string[*char_offset] != ' ') {
|
2013-01-16 16:28:11 +04:00
|
|
|
(*char_offset)--;
|
2016-04-28 13:31:31 +03:00
|
|
|
}
|
2005-02-20 16:19:19 +03:00
|
|
|
|
2013-01-19 02:04:57 +04:00
|
|
|
/* nothing valid found <= split point, advance to next space */
|
|
|
|
if (*char_offset == 0) {
|
|
|
|
*char_offset = orig;
|
2016-04-28 13:31:31 +03:00
|
|
|
while ((*char_offset != length) &&
|
|
|
|
(string[*char_offset] != ' ')) {
|
2013-01-19 02:04:57 +04:00
|
|
|
(*char_offset)++;
|
2016-04-28 13:31:31 +03:00
|
|
|
}
|
2013-01-19 02:04:57 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-20 16:19:19 +03:00
|
|
|
code = rufl_width(font_family, font_style, font_size,
|
|
|
|
string, *char_offset,
|
|
|
|
actual_x);
|
|
|
|
if (code != rufl_OK) {
|
2016-04-28 13:31:31 +03:00
|
|
|
if (code == rufl_FONT_MANAGER_ERROR) {
|
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,
|
|
|
|
"rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2016-04-28 13:31:31 +03:00
|
|
|
} else {
|
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, "rufl_width: 0x%x", code);
|
2016-04-28 13:31:31 +03:00
|
|
|
}
|
2016-04-26 17:16:33 +03:00
|
|
|
/* ro_warn_user("MiscError", "font error"); */
|
2013-01-27 02:04:26 +04:00
|
|
|
*char_offset = 0;
|
|
|
|
*actual_x = 0;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_INVALID;
|
2004-01-22 02:57:19 +03:00
|
|
|
}
|
|
|
|
|
2005-02-20 16:19:19 +03:00
|
|
|
*actual_x /= 2;
|
2016-04-28 13:31:31 +03:00
|
|
|
return NSERROR_OK;
|
2004-01-22 02:57:19 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
2005-02-20 16:19:19 +03:00
|
|
|
* Paint a string.
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param fstyle plot style for this text
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param string UTF-8 string to measure
|
|
|
|
* \param length length of string
|
|
|
|
* \param x x coordinate
|
|
|
|
* \param y y coordinate
|
|
|
|
* \return true on success, false on error and error reported
|
2004-01-22 02:57:19 +03:00
|
|
|
*/
|
2009-07-21 14:59:53 +04:00
|
|
|
bool nsfont_paint(const plot_font_style_t *fstyle, const char *string,
|
2011-03-08 21:48:23 +03:00
|
|
|
size_t length, int x, int y)
|
2005-02-20 16:19:19 +03:00
|
|
|
{
|
|
|
|
const char *font_family;
|
|
|
|
unsigned int font_size;
|
2013-08-16 12:15:50 +04:00
|
|
|
unsigned int flags = rufl_BLEND_FONT;
|
2005-02-20 16:19:19 +03:00
|
|
|
rufl_style font_style;
|
|
|
|
rufl_code code;
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
nsfont_read_style(fstyle, &font_family, &font_size, &font_style);
|
2009-07-24 03:05:34 +04:00
|
|
|
if (font_size == 0)
|
|
|
|
return true;
|
2005-02-20 16:19:19 +03:00
|
|
|
|
2013-08-16 12:15:50 +04:00
|
|
|
if (no_font_blending || print_active)
|
|
|
|
flags = 0;
|
|
|
|
|
2011-03-08 21:48:23 +03:00
|
|
|
code = rufl_paint(font_family, font_style, font_size,
|
2013-08-16 12:15:50 +04:00
|
|
|
string, length, x, y, flags);
|
2005-02-20 16:19:19 +03:00
|
|
|
if (code != rufl_OK) {
|
2016-04-28 13:31:31 +03:00
|
|
|
if (code == rufl_FONT_MANAGER_ERROR) {
|
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,
|
|
|
|
"rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s",
|
|
|
|
rufl_fm_error->errnum,
|
|
|
|
rufl_fm_error->errmess);
|
2016-04-28 13:31:31 +03:00
|
|
|
} else {
|
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, "rufl_paint: 0x%x", code);
|
2016-04-28 13:31:31 +03:00
|
|
|
}
|
2004-01-22 02:57:19 +03:00
|
|
|
}
|
2005-03-20 21:58:34 +03:00
|
|
|
|
2005-01-02 06:58:21 +03:00
|
|
|
return true;
|
2002-09-27 01:38:33 +04:00
|
|
|
}
|
|
|
|
|
2002-10-12 17:05:16 +04:00
|
|
|
|
2004-01-22 02:57:19 +03:00
|
|
|
/**
|
2009-07-21 14:59:53 +04:00
|
|
|
* Convert a font style to a font family, size and rufl_style.
|
2004-01-22 02:57:19 +03:00
|
|
|
*
|
2009-07-21 14:59:53 +04:00
|
|
|
* \param fstyle plot style for this text
|
2005-02-20 16:19:19 +03:00
|
|
|
* \param font_family updated to font family
|
|
|
|
* \param font_size updated to font size
|
|
|
|
* \param font_style updated to font style
|
2004-01-22 02:57:19 +03:00
|
|
|
*/
|
2009-07-21 14:59:53 +04:00
|
|
|
void nsfont_read_style(const plot_font_style_t *fstyle,
|
2005-02-20 16:19:19 +03:00
|
|
|
const char **font_family, unsigned int *font_size,
|
|
|
|
rufl_style *font_style)
|
|
|
|
{
|
2009-07-21 14:59:53 +04:00
|
|
|
static const rufl_style weight_table[] = {
|
|
|
|
rufl_WEIGHT_100,
|
|
|
|
rufl_WEIGHT_200,
|
|
|
|
rufl_WEIGHT_300,
|
|
|
|
rufl_WEIGHT_400,
|
|
|
|
rufl_WEIGHT_500,
|
|
|
|
rufl_WEIGHT_600,
|
|
|
|
rufl_WEIGHT_700,
|
|
|
|
rufl_WEIGHT_800,
|
|
|
|
rufl_WEIGHT_900
|
|
|
|
};
|
|
|
|
|
2018-05-23 13:48:35 +03:00
|
|
|
*font_size = (fstyle->size * 16) / PLOT_STYLE_SCALE;
|
2005-02-20 16:19:19 +03:00
|
|
|
if (1600 < *font_size)
|
|
|
|
*font_size = 1600;
|
2002-10-12 17:05:16 +04:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
switch (fstyle->family) {
|
|
|
|
case PLOT_FONT_FAMILY_SANS_SERIF:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_sans);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_SERIF:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_serif);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_MONOSPACE:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_mono);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_CURSIVE:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_cursive);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
2009-07-21 14:59:53 +04:00
|
|
|
case PLOT_FONT_FAMILY_FANTASY:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_fantasy);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
|
|
|
default:
|
2012-03-22 13:34:34 +04:00
|
|
|
*font_family = nsoption_charp(font_sans);
|
2005-02-23 02:36:14 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
if ((fstyle->flags & FONTF_ITALIC) || (fstyle->flags & FONTF_OBLIQUE)) {
|
2005-02-23 02:36:14 +03:00
|
|
|
*font_style = rufl_SLANTED;
|
2009-07-21 14:59:53 +04:00
|
|
|
} else {
|
2006-01-29 15:23:22 +03:00
|
|
|
*font_style = 0;
|
2005-02-20 16:19:19 +03:00
|
|
|
}
|
2005-01-02 06:58:21 +03:00
|
|
|
|
2009-07-21 14:59:53 +04:00
|
|
|
*font_style |= weight_table[(fstyle->weight / 100) - 1];
|
2002-10-12 17:05:16 +04:00
|
|
|
}
|
2006-08-21 07:11:44 +04:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Looks up the current desktop font and converts that to a family name,
|
|
|
|
* font size and style flags suitable for passing directly to rufl
|
|
|
|
*
|
|
|
|
* \param family buffer to receive font family
|
|
|
|
* \param family_size buffer size
|
|
|
|
* \param psize receives the font size in 1/16 points
|
|
|
|
* \param pstyle receives the style settings to be passed to rufl
|
|
|
|
*/
|
2016-04-24 15:32:07 +03:00
|
|
|
static void
|
|
|
|
ro_gui_wimp_desktop_font(char *family,
|
|
|
|
size_t family_size,
|
|
|
|
int *psize,
|
|
|
|
rufl_style *pstyle)
|
2006-08-21 07:11:44 +04:00
|
|
|
{
|
|
|
|
rufl_style style = rufl_WEIGHT_400;
|
|
|
|
os_error *error;
|
|
|
|
int ptx, pty;
|
|
|
|
font_f font_handle;
|
|
|
|
int used;
|
|
|
|
|
|
|
|
assert(family);
|
|
|
|
assert(20 < family_size);
|
|
|
|
assert(psize);
|
|
|
|
assert(pstyle);
|
|
|
|
|
|
|
|
error = xwimpreadsysinfo_font(&font_handle, NULL);
|
|
|
|
if (error) {
|
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, "xwimpreadsysinfo_font: 0x%x: %s",
|
|
|
|
error->errnum, error->errmess);
|
2016-04-26 17:16:33 +03:00
|
|
|
ro_warn_user("WimpError", error->errmess);
|
2006-08-21 07:11:44 +04:00
|
|
|
goto failsafe;
|
|
|
|
}
|
|
|
|
|
2006-09-08 00:10:14 +04:00
|
|
|
if (font_handle == font_SYSTEM) {
|
|
|
|
/* Er, yeah; like that's ever gonna work with RUfl */
|
|
|
|
goto failsafe;
|
|
|
|
}
|
|
|
|
|
2006-08-21 07:11:44 +04:00
|
|
|
error = xfont_read_identifier(font_handle, NULL, &used);
|
|
|
|
if (error) {
|
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, "xfont_read_identifier: 0x%x: %s",
|
|
|
|
error->errnum, error->errmess);
|
2016-04-26 17:16:33 +03:00
|
|
|
ro_warn_user("MiscError", error->errmess);
|
2006-08-21 07:11:44 +04:00
|
|
|
goto failsafe;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (family_size < (size_t) used + 1) {
|
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, "desktop font name too long");
|
2006-08-21 07:11:44 +04:00
|
|
|
goto failsafe;
|
|
|
|
}
|
|
|
|
|
2009-03-27 05:21:42 +03:00
|
|
|
error = xfont_read_defn(font_handle, (byte *) family,
|
2006-08-21 07:11:44 +04:00
|
|
|
&ptx, &pty, NULL, NULL, NULL, NULL);
|
|
|
|
if (error) {
|
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, "xfont_read_defn: 0x%x: %s",
|
|
|
|
error->errnum, error->errmess);
|
2016-04-26 17:16:33 +03:00
|
|
|
ro_warn_user("MiscError", error->errmess);
|
2006-08-21 07:11:44 +04:00
|
|
|
goto failsafe;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 0; i != (size_t) used; i++) {
|
|
|
|
if (family[i] < ' ') {
|
|
|
|
family[i] = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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, "desktop font \"%s\"", family);
|
2006-08-21 07:11:44 +04:00
|
|
|
|
2006-08-22 04:08:18 +04:00
|
|
|
if (strcasestr(family, ".Medium"))
|
|
|
|
style = rufl_WEIGHT_500;
|
|
|
|
else if (strcasestr(family, ".Bold"))
|
2006-08-21 07:11:44 +04:00
|
|
|
style = rufl_WEIGHT_700;
|
2006-08-22 04:08:18 +04:00
|
|
|
if (strcasestr(family, ".Italic") || strcasestr(family, ".Oblique"))
|
2006-08-21 07:11:44 +04:00
|
|
|
style |= rufl_SLANTED;
|
|
|
|
|
|
|
|
char *dot = strchr(family, '.');
|
|
|
|
if (dot)
|
|
|
|
*dot = 0;
|
|
|
|
|
|
|
|
*psize = max(ptx, pty);
|
|
|
|
*pstyle = style;
|
|
|
|
|
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, "family \"%s\", size %i, style %i", family,
|
|
|
|
*psize, style);
|
2006-08-21 07:11:44 +04:00
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
failsafe:
|
|
|
|
strcpy(family, "Homerton");
|
|
|
|
*psize = 12*16;
|
|
|
|
*pstyle = rufl_WEIGHT_400;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Retrieve the current desktop font family, size and style from
|
|
|
|
* the WindowManager in a form suitable for passing to rufl
|
|
|
|
*/
|
|
|
|
void ro_gui_wimp_get_desktop_font(void)
|
|
|
|
{
|
|
|
|
ro_gui_wimp_desktop_font(ro_gui_desktop_font_family,
|
|
|
|
sizeof(ro_gui_desktop_font_family),
|
|
|
|
&ro_gui_desktop_font_size,
|
|
|
|
&ro_gui_desktop_font_style);
|
|
|
|
}
|
2016-04-24 15:32:07 +03:00
|
|
|
|
|
|
|
|
|
|
|
static struct gui_layout_table layout_table = {
|
|
|
|
.width = ro_font_width,
|
|
|
|
.position = ro_font_position,
|
|
|
|
.split = ro_font_split,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct gui_layout_table *riscos_layout_table = &layout_table;
|