anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-17 13:26:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
lyx_mirror/src/frontends/qt/GuiFontMetrics.h

147 lines
3.6 KiB
C
Raw Normal View History

This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
// -*- C++ -*-
/**
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
* \file GuiFontMetrics.h
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
*/
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
#ifndef GUI_FONT_METRICS_H
#define GUI_FONT_METRICS_H
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
#include "frontends/FontMetrics.h"
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
#include "support/Cache.h"
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
#include "support/docstring.h"
Fix positionning of cursor The old implementation of Row::Element::pos2x and x2pos did not work correctly with Arabic text, because characters can have shapes that depend on context. This new implementation leverages QTextLayout in a simplified way, since only one word is added to the layout. This allows to make Row::Element::x2pos more readable. Fixes: #9115.
2014-05-14 17:46:43 +02:00
#include <QFont>
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
#include <QFontMetrics>
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
#include <QHash>
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 16:33:34 +01:00
#include <QTextLayout>
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
#include <memory>
Add caching for the QTextLayout objects we use The QTextLayout handling is terribly slow on Qt 4.8.7, but some caching has been added in Qt5 that makes it much faster. For some reason, it is not that slow with Qt 4.8.1. Caches are introduced for the three following methods * width(doctring), controlled by CACHE_METRICS_WIDTH. This cache already existed, but the code has been cleaned up * getTextLayout, controlled by CACHE_METRICS_QTEXTLAYOUT (disabled by default on Qt5, which does its own caching). This is used for pos2x and x2pos and now for drawing of text too. The previous code used a trivial caching scheme of the last used QTextLayout, but now they are properly kept in a QCache. Moreover, the cacheEnabled() property is enabled for these QTextLayout object (not sure what this does). * breakAt, controlled by CACHE_METRICS_BREAKAT. This is the only user of QTextLayout which did not have some kind of caching already. For some weird reasons related to Argument-dependent look-up, the qHash(docstring) function has to be defined in std namespace, since lyx::docstring is actually std::basic_string<wchar_t>. [NOTE: this version has profiling hooks, enabled by commenting out the line #define DISABLE_PMPROF that should eventually be removed.]
2016-07-05 14:06:22 +02:00
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
namespace lyx {
namespace frontend {
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
struct BreakStringKey
Improve (modestly) the performance of font metrics caches This fixes two performance issues and improves the performance of TextMetrics::redoParagraph by 15% in a workload that uses the cache a lot. The difference will be much less when the cache is not used much. 1/ repetion of the hash code computation The code if (cache.contains(key)) result = cache[key]: is not efficient, since qHash(key) has to be computed twice. To fix this a new Cache::object_str() method is added, which allows if (auto * obj = cache.object(key)) result = *obj; 2/ code of has code computation Instead of using a verbose string that is complicated to build as key, new key structs BreakAtKey and TextLayoutKey are introduced, along with the relevant qHash() implementation.
2021-09-24 16:57:05 +02:00
{
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
bool operator==(BreakStringKey const & key) const {
return key.s == s && key.first_wid == first_wid && key.wid == wid
&& key.rtl == rtl && key.force == force;
Improve (modestly) the performance of font metrics caches This fixes two performance issues and improves the performance of TextMetrics::redoParagraph by 15% in a workload that uses the cache a lot. The difference will be much less when the cache is not used much. 1/ repetion of the hash code computation The code if (cache.contains(key)) result = cache[key]: is not efficient, since qHash(key) has to be computed twice. To fix this a new Cache::object_str() method is added, which allows if (auto * obj = cache.object(key)) result = *obj; 2/ code of has code computation Instead of using a verbose string that is complicated to build as key, new key structs BreakAtKey and TextLayoutKey are introduced, along with the relevant qHash() implementation.
2021-09-24 16:57:05 +02:00
}
docstring s;
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
int first_wid;
int wid;
Improve (modestly) the performance of font metrics caches This fixes two performance issues and improves the performance of TextMetrics::redoParagraph by 15% in a workload that uses the cache a lot. The difference will be much less when the cache is not used much. 1/ repetion of the hash code computation The code if (cache.contains(key)) result = cache[key]: is not efficient, since qHash(key) has to be computed twice. To fix this a new Cache::object_str() method is added, which allows if (auto * obj = cache.object(key)) result = *obj; 2/ code of has code computation Instead of using a verbose string that is complicated to build as key, new key structs BreakAtKey and TextLayoutKey are introduced, along with the relevant qHash() implementation.
2021-09-24 16:57:05 +02:00
bool rtl;
bool force;
};
struct TextLayoutKey
{
bool operator==(TextLayoutKey const & key) const {
return key.s == s && key.rtl == rtl && key.ws == ws;
}
docstring s;
bool rtl;
double ws;
};
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
class GuiFontMetrics : public FontMetrics
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
{
public:
GuiFontMetrics(QFont const & font);
virtual ~GuiFontMetrics() {}
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
int maxAscent() const override;
int maxDescent() const override;
Dimension const defaultDimension() const override;
int em() const override;
int xHeight() const override;
int lineWidth() const override;
int underlinePos() const override;
int strikeoutPos() const override;
bool italic() const override;
double italicSlope() const override;
int width(char_type c) const override;
int ascent(char_type c) const override;
int descent(char_type c) const override;
int lbearing(char_type c) const override;
int rbearing(char_type c) const override;
int width(docstring const & s) const override;
int signedWidth(docstring const & s) const override;
int pos2x(docstring const & s, int pos, bool rtl, double ws) const override;
int x2pos(docstring const & s, int & x, bool rtl, double ws) const override;
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
Breaks breakString(docstring const & s, int first_wid, int wid, bool rtl, bool force) const override;
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
Dimension const dimension(char_type c) const override;
* enable font metrics cache for all platforms. * introduce defaultDimension() and dimension() in preparation of Dimension class cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16165 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-04 10:09:22 +00:00
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
void rectText(docstring const & str,
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
int & width,
int & ascent,
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
int & descent) const override;
void buttonText(docstring const & str,
Use the same code for editable and non-editable buttons This removes the use of rectText in RenderButton. The fact that this gave different spacing than buttonText was a problem. Now buttonText requires to specify * the offset, so that INSET_TO_TEXT_OFFSET is not used anymore in src/frontends/, which will be useful later. * the background and frame color, in replacement for the hover state. Remove the methods button() and buttonFrame() from GuiPainter. Remove some unused header files. Fixes bug #10704.
2017-06-15 15:30:23 +02:00
const int offset,
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
int & width,
int & ascent,
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
int & descent) const override;
On-screen justification: stretch in proportion with the em, up to a limit 1) Distinguish expanding characters from separators, to fit with Qt's notion of expanding character which comes from the Unicode std. CountExpanders() is moved to FontMetrics to fix a discrepancy with the duplicate implementation from 598f7e4a. 2) Make these expanders stretch on-screen proportionally to the em of the font. If a row mixes large and small text, LyX let us see which spaces are set in the bigger font. 3) Now that the stretch is defined in ems, add a limit such that an expander never stretches more than 1.5em to avoid weird and hard to read justified lines. 4) Add a return boolean to setSeparatorExtraWidth for future use.
2016-08-13 19:03:02 +01:00
Add `override` specifiers to improve code maintainability
2020-10-01 10:42:11 +03:00
int countExpanders(docstring const & str) const override;
* GuiFontMetrics: new metrics(QString) method * QLPainter::paintText(): use GuiFontMetrics::metrics(QString) to avoid an ucs4 to QString conversion. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15584 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 21:27:03 +00:00
///
int width(QString const & str) const;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
Add caching for the QTextLayout objects we use The QTextLayout handling is terribly slow on Qt 4.8.7, but some caching has been added in Qt5 that makes it much faster. For some reason, it is not that slow with Qt 4.8.1. Caches are introduced for the three following methods * width(doctring), controlled by CACHE_METRICS_WIDTH. This cache already existed, but the code has been cleaned up * getTextLayout, controlled by CACHE_METRICS_QTEXTLAYOUT (disabled by default on Qt5, which does its own caching). This is used for pos2x and x2pos and now for drawing of text too. The previous code used a trivial caching scheme of the last used QTextLayout, but now they are properly kept in a QCache. Moreover, the cacheEnabled() property is enabled for these QTextLayout object (not sure what this does). * breakAt, controlled by CACHE_METRICS_BREAKAT. This is the only user of QTextLayout which did not have some kind of caching already. For some weird reasons related to Argument-dependent look-up, the qHash(docstring) function has to be defined in std namespace, since lyx::docstring is actually std::basic_string<wchar_t>. [NOTE: this version has profiling hooks, enabled by commenting out the line #define DISABLE_PMPROF that should eventually be removed.]
2016-07-05 14:06:22 +02:00
/// Return a pointer to a cached QTextLayout object
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
std::shared_ptr<QTextLayout const>
Add caching for the QTextLayout objects we use The QTextLayout handling is terribly slow on Qt 4.8.7, but some caching has been added in Qt5 that makes it much faster. For some reason, it is not that slow with Qt 4.8.1. Caches are introduced for the three following methods * width(doctring), controlled by CACHE_METRICS_WIDTH. This cache already existed, but the code has been cleaned up * getTextLayout, controlled by CACHE_METRICS_QTEXTLAYOUT (disabled by default on Qt5, which does its own caching). This is used for pos2x and x2pos and now for drawing of text too. The previous code used a trivial caching scheme of the last used QTextLayout, but now they are properly kept in a QCache. Moreover, the cacheEnabled() property is enabled for these QTextLayout object (not sure what this does). * breakAt, controlled by CACHE_METRICS_BREAKAT. This is the only user of QTextLayout which did not have some kind of caching already. For some weird reasons related to Argument-dependent look-up, the qHash(docstring) function has to be defined in std namespace, since lyx::docstring is actually std::basic_string<wchar_t>. [NOTE: this version has profiling hooks, enabled by commenting out the line #define DISABLE_PMPROF that should eventually be removed.]
2016-07-05 14:06:22 +02:00
getTextLayout(docstring const & s, bool const rtl,
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
double const wordspacing) const;
Add caching for the QTextLayout objects we use The QTextLayout handling is terribly slow on Qt 4.8.7, but some caching has been added in Qt5 that makes it much faster. For some reason, it is not that slow with Qt 4.8.1. Caches are introduced for the three following methods * width(doctring), controlled by CACHE_METRICS_WIDTH. This cache already existed, but the code has been cleaned up * getTextLayout, controlled by CACHE_METRICS_QTEXTLAYOUT (disabled by default on Qt5, which does its own caching). This is used for pos2x and x2pos and now for drawing of text too. The previous code used a trivial caching scheme of the last used QTextLayout, but now they are properly kept in a QCache. Moreover, the cacheEnabled() property is enabled for these QTextLayout object (not sure what this does). * breakAt, controlled by CACHE_METRICS_BREAKAT. This is the only user of QTextLayout which did not have some kind of caching already. For some weird reasons related to Argument-dependent look-up, the qHash(docstring) function has to be defined in std namespace, since lyx::docstring is actually std::basic_string<wchar_t>. [NOTE: this version has profiling hooks, enabled by commenting out the line #define DISABLE_PMPROF that should eventually be removed.]
2016-07-05 14:06:22 +02:00
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
private:
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 16:33:34 +01:00
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
Breaks breakString_helper(docstring const & s, int first_wid, int wid,
bool rtl, bool force) const;
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 16:33:34 +01:00
Fix positionning of cursor The old implementation of Row::Element::pos2x and x2pos did not work correctly with Arabic text, because characters can have shapes that depend on context. This new implementation leverages QTextLayout in a simplified way, since only one word is added to the layout. This allows to make Row::Element::x2pos more readable. Fixes: #9115.
2014-05-14 17:46:43 +02:00
/// The font
QFont font_;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
/// Metrics on the font
QFontMetrics metrics_;
Use real italic slope for slanted caret
2020-09-23 11:18:08 +03:00
/// Slope of italic font
double slope_;
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
/// Cache of char widths
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
mutable QHash<char_type, int> width_cache_;
Implement real string width computation Important features: * widths are cached in a map * old behavior is still used when lyxrc.force_paint_single_char is true.
2013-06-25 08:18:25 +02:00
/// Cache of string widths
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
mutable Cache<docstring, int> strwidth_cache_;
Break multi-row strings in one pass Replace FontMetrics::breakAt, which returned the next break point, with FontMetrics::breakString, which returns a vector of break points. To this end, an additional parameter gives the available width for next rows. Rename various variables and methods accordingly. Factor the code in breakString_helper to be more manageable. Adapt Row::Element::splitAt to return a bool on sucess and provide remaining row elements in a vector. The width noted above has been added as parameters. Rename the helper function splitFrom to moveElements and rewrite the code to be more efficient. Remove type of row element INVALID, which is not needed anymore. The code in TextMetrics::breakParagraph is now much simpler. In Row::finalize, remove the code that computed inconditionnally the current element size, and make sure that this width will be computed in all code paths of Row::Element::splitAt.
2021-09-06 14:52:42 +02:00
/// Cache for breakString
mutable Cache<BreakStringKey, Breaks> breakstr_cache_;
Introduce support/Cache.h Useful to cache copies of objects, including shared_ptrs. No risks of dangling pointer, and avoid naked pointers in the source. Fix memory leak when compiling with Qt5.
2017-02-20 23:59:24 +01:00
/// Cache for QTextLayout
Improve (modestly) the performance of font metrics caches This fixes two performance issues and improves the performance of TextMetrics::redoParagraph by 15% in a workload that uses the cache a lot. The difference will be much less when the cache is not used much. 1/ repetion of the hash code computation The code if (cache.contains(key)) result = cache[key]: is not efficient, since qHash(key) has to be computed twice. To fix this a new Cache::object_str() method is added, which allows if (auto * obj = cache.object(key)) result = *obj; 2/ code of has code computation Instead of using a verbose string that is complicated to build as key, new key structs BreakAtKey and TextLayoutKey are introduced, along with the relevant qHash() implementation.
2021-09-24 16:57:05 +02:00
mutable Cache<TextLayoutKey, std::shared_ptr<QTextLayout>> qtextlayout_cache_;
Implement real string width computation Important features: * widths are cached in a map * old behavior is still used when lyxrc.force_paint_single_char is true.
2013-06-25 08:18:25 +02:00
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
struct AscendDescend {
Avoid narrowing in array initializator Gcc 4.7 warns that this kind of narrowing is illegal in C++11, so we can just as well fix that right now. In GuiFontMetrics this is fixed by chaning the types in the AscendDescend struct from short int to int. In ParagraphMetrics it is fixed by addint explicit casts. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40586 a592a061-630c-0410-9148-cb99ea01b6c8
2012-01-07 18:29:07 +00:00
int ascent;
int descent;
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
};
update comments. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16142 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 21:55:28 +00:00
/// Cache of char ascends and descends
* qt_helpers.h: - ucs4_to_qchar(): add a FIXME and an assertion * GuiFontMetrics: replace the table based cache with two QHash based cache. With this change, the speed overhead is not negligible (exact same score with the UserGuide test) and the required additional memory is minimal (maybe one or two megabytes). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16132 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-02 15:54:49 +00:00
mutable QHash<char_type, AscendDescend> metrics_cache_;
/// fill in \c metrics_cache_ at specified value.
Optimisation: don't search twice the hash tables. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19501 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-13 13:56:54 +00:00
AscendDescend const fillMetricsCache(char_type) const;
Cache char right bearings * src/frontends/qt4/GuiFontMetrics.C (GuiFontMetrics::rbearing): Cache char rbearing. * src/frontends/qt4/GuiFontMetrics.h: Implement rbearing_cache_ as a QHash. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17499 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-21 23:13:32 +00:00
typo
2019-03-21 18:45:28 +01:00
/// Cache of char left bearings
Cache the value of GuiFontMetrics::lbearing(). This seems to be necessary on windows, where math editing can get very slow. Note that other methods like rbearing already use a cache. In the future all these caches for single characters shall be unified.
2019-03-20 10:56:16 +01:00
mutable QHash<char_type, int> lbearing_cache_;
Cache char right bearings * src/frontends/qt4/GuiFontMetrics.C (GuiFontMetrics::rbearing): Cache char rbearing. * src/frontends/qt4/GuiFontMetrics.h: Implement rbearing_cache_ as a QHash. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17499 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-21 23:13:32 +00:00
/// Cache of char right bearings
mutable QHash<char_type, int> rbearing_cache_;
Do not use a static variable as QTextLayout cache It is a bad idea to have a QObject variable that oulives the main QApplication object. See for example: https://www.ics.com/designpatterns/book/globals.html Here the QTextLayout object was static to the anonymous namespace getTextLayout function, and got destroyed after the freetype renderer had been disposed of by QApplication. This causes segmentation faults when quitting LyX on some systems. This patch moves the cache together with other GuiFontMetrics caches. It means that one will have one such QTextLayout per font type, but this will not change much.
2015-12-11 16:33:34 +01:00
This commit is a big rework of the FontLoader/FontMetrics interaction. Only Qt4 for now, I would be grateful is somebody steps up for qt3 and gtk. Basically, I replaced all methods in the font_metrics namespace by a proper virtual interface FontMetrics. The FontLoader is _the_ container for FontMetrics. This patch should also bring some optimizations in a number of place in the code. This is because we do not need any more to search for the LyXFont at each font_metrics call. In effect, the speed advantage is not as sensible and this is a bit deceiving considering that this was my primary motivation behind the patch. But I like the patch anyway as it cleans up the relation and interfacing between fonts, metrics and frontends. * frontends/FontMetrics.h: new virtual interface. Renamed from font_metrics.h * qt4/GuiFontMetrics: corresponding qt4 implememtation. Renamed from qfont_metrics.C. The smallCaps particular case treatment has been transfered here as well as the width cache for MacOSX and Windows. * qt4/QLPainter.C: the smallCapsText has been reworked to return the width of the drawn text.C all other files: replace font_metric helper function call with corresponding FontMetrics method calls. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15265 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-07 16:15:06 +00:00
};
} // namespace frontend
} // namespace lyx
Merge QController into individual dialogs. Also various cleanup git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19961 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-31 22:16:11 +00:00
#endif // GUI_FONT_METRICS_H
Reference in New Issue Copy Permalink