author | llornkcor <llornkcor> | 2002-10-21 00:21:54 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-21 00:21:54 (UTC) |
commit | 91171c4d5508ebf151dab551d5db3c1e87465d54 (patch) (unidiff) | |
tree | 63948040ab3611f28227c31d475108b56195e53b | |
parent | 8bbd3bca858939b15b8775b4811149b8d83bb6cc (diff) | |
download | opie-91171c4d5508ebf151dab551d5db3c1e87465d54.zip opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.gz opie-91171c4d5508ebf151dab551d5db3c1e87465d54.tar.bz2 |
updated.. QTDIR/fonts/fontdir needs to be updated for opie to find ttf
-rw-r--r-- | freetype/.cvsignore | 5 | ||||
-rw-r--r-- | freetype/fontfactoryttf_qws.cpp | 4 | ||||
-rw-r--r-- | freetype/fontfactoryttf_qws.h | 4 | ||||
-rw-r--r-- | freetype/freetype.pro | 25 | ||||
-rw-r--r-- | freetype/freetypefactoryimpl.cpp | 4 | ||||
-rw-r--r-- | freetype/freetypefactoryimpl.h | 6 | ||||
-rw-r--r-- | freetype/opie-freetype.control | 8 | ||||
-rw-r--r-- | freetype/qfontdata_p.h | 6 |
8 files changed, 29 insertions, 33 deletions
diff --git a/freetype/.cvsignore b/freetype/.cvsignore new file mode 100644 index 0000000..fccc477 --- a/dev/null +++ b/freetype/.cvsignore | |||
@@ -0,0 +1,5 @@ | |||
1 | moc_* | ||
2 | *.moc | ||
3 | Makefile* | ||
4 | qimpenprefbase.h | ||
5 | qimpenprefbase.cpp | ||
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp index 66fd96a..5aa53fb 100644 --- a/freetype/fontfactoryttf_qws.cpp +++ b/freetype/fontfactoryttf_qws.cpp | |||
@@ -1,68 +1,68 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #include "fontfactoryttf_qws.h" | 22 | #include "fontfactoryttf_qws.h" |
23 | 23 | ||
24 | #ifdef QT_NO_FREETYPE | 24 | #ifdef QT_NO_FREETYPE |
25 | 25 | ||
26 | #include "qfontdata_p.h" | 26 | #include "qfontdata_p.h" |
27 | #include <string.h> | 27 | #include <string.h> |
28 | #include <stdio.h> | 28 | #include <stdio.h> |
29 | 29 | ||
30 | #define FLOOR(x) ((x) & -64) | 30 | #define FLOOR(x) ((x) & -64) |
31 | #define CEIL(x) (((x)+63) & -64) | 31 | #define CEIL(x) (((x)+63) & -64) |
32 | #define TRUNC(x) ((x) >> 6) | 32 | #define TRUNC(x) ((x) >> 6) |
33 | 33 | ||
34 | 34 | ||
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ft2build.h> | 36 | #include <ft2build.h> |
37 | #include FT_FREETYPE_H | 37 | #include FT_FREETYPE_H |
38 | #include FT_GLYPH_H | 38 | #include FT_GLYPH_H |
39 | #include FT_OUTLINE_H | 39 | #include FT_OUTLINE_H |
40 | #include FT_BBOX_H | 40 | #include FT_BBOX_H |
41 | } | 41 | } |
42 | 42 | ||
43 | class QDiskFontFT : public QDiskFontPrivate { | 43 | class QDiskFontFT : public QDiskFontPrivate { |
44 | public: | 44 | public: |
45 | FT_Face face; | 45 | FT_Face face; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | class QRenderedFontFT : public QRenderedFont { | 48 | class QRenderedFontFT : public QRenderedFont { |
49 | public: | 49 | public: |
50 | QRenderedFontFT(QDiskFont* f, const QFontDef &d) : | 50 | QRenderedFontFT(QDiskFont* f, const QFontDef &d) : |
51 | QRenderedFont(f,d) | 51 | QRenderedFont(f,d) |
52 | { | 52 | { |
53 | QDiskFontFT *df = (QDiskFontFT*)(f->p); | 53 | QDiskFontFT *df = (QDiskFontFT*)(f->p); |
54 | myface=df->face; | 54 | myface=df->face; |
55 | selectThisSize(); | 55 | selectThisSize(); |
56 | // A 1-pixel baseline is excluded in Qt/Windows/X11 fontmetrics | 56 | // A 1-pixel baseline is excluded in Qt/Windows/X11 fontmetrics |
57 | // (see QFontMetrics::height()) | 57 | // (see QFontMetrics::height()) |
58 | // | 58 | // |
59 | fascent=CEIL(myface->size->metrics.ascender)/64; | 59 | fascent=CEIL(myface->size->metrics.ascender)/64; |
60 | fdescent=-FLOOR(myface->size->metrics.descender)/64-1; | 60 | fdescent=-FLOOR(myface->size->metrics.descender)/64-1; |
61 | fmaxwidth=CEIL(myface->size->metrics.max_advance)/64; | 61 | fmaxwidth=CEIL(myface->size->metrics.max_advance)/64; |
62 | fleading=CEIL(myface->size->metrics.height)/64 | 62 | fleading=CEIL(myface->size->metrics.height)/64 |
63 | - fascent - fdescent + 1; | 63 | - fascent - fdescent + 1; |
64 | 64 | ||
65 | // FT has these in font units | 65 | // FT has these in font units |
66 | funderlinepos = ptsize/200+1; | 66 | funderlinepos = ptsize/200+1; |
67 | funderlinewidth = ptsize/200+1; | 67 | funderlinewidth = ptsize/200+1; |
68 | } | 68 | } |
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h index 82b7e49..4ba8ce5 100644 --- a/freetype/fontfactoryttf_qws.h +++ b/freetype/fontfactoryttf_qws.h | |||
@@ -1,64 +1,64 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #ifndef FONTFACTORY_FT_H | 22 | #ifndef FONTFACTORY_FT_H |
23 | #define FONTFACTORY_FT_H | 23 | #define FONTFACTORY_FT_H |
24 | 24 | ||
25 | #include <qfontmanager_qws.h> | 25 | #include <qfontmanager_qws.h> |
26 | #if QT_VERSION >= 300 | 26 | #if QT_VERSION >= 300 |
27 | # include <private/qfontdata_p.h> | 27 | # include <private/qfontdata_p.h> |
28 | #else | 28 | #else |
29 | # include "qfontdata_p.h" | 29 | # include "qfontdata_p.h" |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | 32 | ||
33 | #ifdef QT_NO_FREETYPE | 33 | #ifdef QT_NO_FREETYPE |
34 | 34 | ||
35 | extern "C" { | 35 | extern "C" { |
36 | #include <ft2build.h> | 36 | #include <ft2build.h> |
37 | #include FT_FREETYPE_H | 37 | #include FT_FREETYPE_H |
38 | } | 38 | } |
39 | 39 | ||
40 | // ascent, descent, width(ch), width(string), maxwidth? | 40 | // ascent, descent, width(ch), width(string), maxwidth? |
41 | // leftbearing, rightbearing, minleftbearing,minrightbearing | 41 | // leftbearing, rightbearing, minleftbearing,minrightbearing |
42 | // leading | 42 | // leading |
43 | 43 | ||
44 | class QFontFactoryFT : public QFontFactory { | 44 | class QFontFactoryFT : public QFontFactory { |
45 | 45 | ||
46 | public: | 46 | public: |
47 | 47 | ||
48 | QFontFactoryFT(); | 48 | QFontFactoryFT(); |
49 | virtual ~QFontFactoryFT(); | 49 | virtual ~QFontFactoryFT(); |
50 | 50 | ||
51 | QRenderedFont * get(const QFontDef &,QDiskFont *); | 51 | QRenderedFont * get(const QFontDef &,QDiskFont *); |
52 | virtual void load(QDiskFont *) const; | 52 | virtual void load(QDiskFont *) const; |
53 | virtual QString name(); | 53 | virtual QString name(); |
54 | 54 | ||
55 | private: | 55 | private: |
56 | 56 | ||
57 | friend class QRenderedFontFT; | 57 | friend class QRenderedFontFT; |
58 | FT_Library library; | 58 | FT_Library library; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | #endif // QT_NO_FREETYPE | 61 | #endif // QT_NO_FREETYPE |
62 | 62 | ||
63 | #endif // QFONTFACTORY_FT_H | 63 | #endif // QFONTFACTORY_FT_H |
64 | 64 | ||
diff --git a/freetype/freetype.pro b/freetype/freetype.pro index 1196db9..5800b48 100644 --- a/freetype/freetype.pro +++ b/freetype/freetype.pro | |||
@@ -1,28 +1,11 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | HEADERS =fontfactoryttf_qws.h freetypefactoryimpl.h | 3 | HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h |
4 | SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp | 4 | SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp |
5 | qt2:HEADERS+= qfontdata_p.h | 5 | qt2:HEADERS+= qfontdata_p.h |
6 | TARGET = freetypefactory | 6 | TARGET = freetypefactory |
7 | DESTDIR = ../plugins/fontfactories | 7 | DESTDIR = $(OPIEDIR)/plugins/fontfactories |
8 | INCLUDEPATH += $(OPIEDIR)/include | 8 | INCLUDEPATH+= $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 9 | DEPENDPATH += $(OPIEDIR)/include |
10 | #INCLUDEPATH += $(OPIEDIR)/include | ||
11 | #DEPENDPATH+= /usr/local/include/freetype2 | ||
12 | LIBS += -lqpe -lfreetype | 10 | LIBS += -lqpe -lfreetype |
13 | VERSION = 1.0.0 | 11 | VERSION = 1.0.0 |
14 | |||
15 | TRANSLATIONS = ../i18n/de/libfreetypefactory.ts \ | ||
16 | ../i18n/en/libfreetypefactory.ts \ | ||
17 | ../i18n/es/libfreetypefactory.ts \ | ||
18 | ../i18n/fr/libfreetypefactory.ts \ | ||
19 | ../i18n/hu/libfreetypefactory.ts \ | ||
20 | ../i18n/ja/libfreetypefactory.ts \ | ||
21 | ../i18n/ko/libfreetypefactory.ts \ | ||
22 | ../i18n/no/libfreetypefactory.ts \ | ||
23 | ../i18n/pl/libfreetypefactory.ts \ | ||
24 | ../i18n/pt/libfreetypefactory.ts \ | ||
25 | ../i18n/pt_BR/libfreetypefactory.ts \ | ||
26 | ../i18n/sl/libfreetypefactory.ts \ | ||
27 | ../i18n/zh_CN/libfreetypefactory.ts \ | ||
28 | ../i18n/zh_TW/libfreetypefactory.ts | ||
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp index 8c1afab..71460b2 100644 --- a/freetype/freetypefactoryimpl.cpp +++ b/freetype/freetypefactoryimpl.cpp | |||
@@ -1,57 +1,57 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "fontfactoryttf_qws.h" | 20 | #include "fontfactoryttf_qws.h" |
21 | #include "freetypefactoryimpl.h" | 21 | #include "freetypefactoryimpl.h" |
22 | 22 | ||
23 | 23 | ||
24 | FreeTypeFactoryImpl::FreeTypeFactoryImpl() | 24 | FreeTypeFactoryImpl::FreeTypeFactoryImpl() |
25 | : factory(0), ref(0) | 25 | : factory(0), ref(0) |
26 | { | 26 | { |
27 | } | 27 | } |
28 | 28 | ||
29 | FreeTypeFactoryImpl::~FreeTypeFactoryImpl() | 29 | FreeTypeFactoryImpl::~FreeTypeFactoryImpl() |
30 | { | 30 | { |
31 | delete factory; | 31 | delete factory; |
32 | } | 32 | } |
33 | 33 | ||
34 | QFontFactory *FreeTypeFactoryImpl::fontFactory() | 34 | QFontFactory *FreeTypeFactoryImpl::fontFactory() |
35 | { | 35 | { |
36 | if ( !factory ) | 36 | if ( !factory ) |
37 | factory = new QFontFactoryFT(); | 37 | factory = new QFontFactoryFT(); |
38 | return factory; | 38 | return factory; |
39 | } | 39 | } |
40 | 40 | ||
41 | QRESULT FreeTypeFactoryImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) | 41 | QRESULT FreeTypeFactoryImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) |
42 | { | 42 | { |
43 | *iface = 0; | 43 | *iface = 0; |
44 | if ( uuid == IID_QUnknown ) | 44 | if ( uuid == IID_QUnknown ) |
45 | *iface = this; | 45 | *iface = this; |
46 | else if ( uuid == IID_FontFactory ) | 46 | else if ( uuid == IID_FontFactory ) |
47 | *iface = this; | 47 | *iface = this; |
48 | 48 | ||
49 | if ( *iface ) | 49 | if ( *iface ) |
50 | (*iface)->addRef(); | 50 | (*iface)->addRef(); |
51 | return QS_OK; | 51 | return QS_OK; |
52 | } | 52 | } |
53 | 53 | ||
54 | Q_EXPORT_INTERFACE() | 54 | Q_EXPORT_INTERFACE() |
55 | { | 55 | { |
56 | Q_CREATE_INSTANCE( FreeTypeFactoryImpl ) | 56 | Q_CREATE_INSTANCE( FreeTypeFactoryImpl ) |
57 | } | 57 | } |
diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h index d7c376e..4c0d5f5 100644 --- a/freetype/freetypefactoryimpl.h +++ b/freetype/freetypefactoryimpl.h | |||
@@ -1,40 +1,40 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #include <fontfactoryinterface.h> | 22 | #include <qpe/fontfactoryinterface.h> |
23 | 23 | ||
24 | class QFontFactoryFT; | 24 | class QFontFactoryFT; |
25 | 25 | ||
26 | class FreeTypeFactoryImpl : public FontFactoryInterface | 26 | class FreeTypeFactoryImpl : public FontFactoryInterface |
27 | { | 27 | { |
28 | public: | 28 | public: |
29 | FreeTypeFactoryImpl(); | 29 | FreeTypeFactoryImpl(); |
30 | virtual ~FreeTypeFactoryImpl(); | 30 | virtual ~FreeTypeFactoryImpl(); |
31 | 31 | ||
32 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); | 32 | QRESULT queryInterface( const QUuid&, QUnknownInterface** ); |
33 | Q_REFCOUNT | 33 | Q_REFCOUNT |
34 | 34 | ||
35 | virtual QFontFactory *fontFactory(); | 35 | virtual QFontFactory *fontFactory(); |
36 | 36 | ||
37 | private: | 37 | private: |
38 | QFontFactoryFT *factory; | 38 | QFontFactoryFT *factory; |
39 | ulong ref; | 39 | ulong ref; |
40 | }; | 40 | }; |
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control new file mode 100644 index 0000000..f1ce408 --- a/dev/null +++ b/freetype/opie-freetype.control | |||
@@ -0,0 +1,8 @@ | |||
1 | Files: plugins/fontfactories/libfreetypefactory* | ||
2 | Priority: optional | ||
3 | Section: opie/plugins | ||
4 | Maintainer: Opie <opie@llornkcor.com> | ||
5 | Architecture: arm | ||
6 | Version: $QPE_VERSION-$SUB_VERSION | ||
7 | Depends: opie-base ($QPE_VERSION) | ||
8 | Description: Freetype fontfactory plugin | ||
diff --git a/freetype/qfontdata_p.h b/freetype/qfontdata_p.h index fc22c72..9da1d06 100644 --- a/freetype/qfontdata_p.h +++ b/freetype/qfontdata_p.h | |||
@@ -1,94 +1,94 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | 21 | ||
22 | #ifndef QFONTDATA_P_H | 22 | #ifndef QFONTDATA_P_H |
23 | #define QFONTDATA_P_H | 23 | #define QFONTDATA_P_H |
24 | 24 | ||
25 | 25 | ||
26 | // | 26 | // |
27 | // W A R N I N G | 27 | // W A R N I N G |
28 | // ------------- | 28 | // ------------- |
29 | // | 29 | // |
30 | // This file is not part of the Qt API. It exists for the convenience | 30 | // This file is not part of the Qt API. It exists for the convenience |
31 | // of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp, | 31 | // of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp, |
32 | // qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change | 32 | // qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change |
33 | // from version to version without notice, or even be removed. | 33 | // from version to version without notice, or even be removed. |
34 | // | 34 | // |
35 | // We mean it. | 35 | // We mean it. |
36 | // | 36 | // oh, we're really scared. |
37 | // | 37 | // |
38 | 38 | ||
39 | #ifndef QT_H | 39 | #ifndef QT_H |
40 | #endif // QT_H | 40 | #endif // QT_H |
41 | 41 | ||
42 | struct QFontDef { // font definition | 42 | struct QFontDef { // font definition |
43 | QStringfamily; | 43 | QStringfamily; |
44 | QStringaddStyle; | 44 | QStringaddStyle; |
45 | int pointSize; | 45 | int pointSize; |
46 | uint styleHint: 8; | 46 | uint styleHint: 8; |
47 | uint styleStrategy: 8; | 47 | uint styleStrategy: 8; |
48 | uint charSet : 8; | 48 | uint charSet : 8; |
49 | uint weight : 8; | 49 | uint weight : 8; |
50 | uint italic : 1; | 50 | uint italic : 1; |
51 | uint underline: 1; | 51 | uint underline: 1; |
52 | uint strikeOut: 1; | 52 | uint strikeOut: 1; |
53 | uint fixedPitch: 1; | 53 | uint fixedPitch: 1; |
54 | uint hintSetByUser: 1; | 54 | uint hintSetByUser: 1; |
55 | uint rawMode : 1; | 55 | uint rawMode : 1; |
56 | uint dirty : 1; | 56 | uint dirty : 1; |
57 | shortlbearing; | 57 | shortlbearing; |
58 | shortrbearing; | 58 | shortrbearing; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | 61 | ||
62 | class QFontInternal; | 62 | class QFontInternal; |
63 | class QTextCodec; | 63 | class QTextCodec; |
64 | 64 | ||
65 | struct QFontData : public QShared { | 65 | struct QFontData : public QShared { |
66 | QFontData() | 66 | QFontData() |
67 | : exactMatch(FALSE), fin(0), printerHackFont( 0 ) | 67 | : exactMatch(FALSE), fin(0), printerHackFont( 0 ) |
68 | {} | 68 | {} |
69 | QFontData( const QFontData &d ) | 69 | QFontData( const QFontData &d ) |
70 | : QShared(d), req(d.req), exactMatch(d.exactMatch), fin(d.fin), | 70 | : QShared(d), req(d.req), exactMatch(d.exactMatch), fin(d.fin), |
71 | printerHackFont(0) | 71 | printerHackFont(0) |
72 | // Copy the QShared count as well. The count may need to be | 72 | // Copy the QShared count as well. The count may need to be |
73 | // reset when using the QFontData class, see QFont::QFont(QFontData*) | 73 | // reset when using the QFontData class, see QFont::QFont(QFontData*) |
74 | {} | 74 | {} |
75 | ~QFontData() | 75 | ~QFontData() |
76 | {} | 76 | {} |
77 | QFontData &operator=( const QFontData &d ) | 77 | QFontData &operator=( const QFontData &d ) |
78 | { | 78 | { |
79 | req = d.req; | 79 | req = d.req; |
80 | exactMatch = d.exactMatch; | 80 | exactMatch = d.exactMatch; |
81 | fin = d.fin; | 81 | fin = d.fin; |
82 | printerHackFont=d.printerHackFont; | 82 | printerHackFont=d.printerHackFont; |
83 | return *this; | 83 | return *this; |
84 | } | 84 | } |
85 | QFontDef req; // requested font | 85 | QFontDef req; // requested font |
86 | bool exactMatch; | 86 | bool exactMatch; |
87 | QFontInternal *fin; | 87 | QFontInternal *fin; |
88 | QFont *printerHackFont; | 88 | QFont *printerHackFont; |
89 | const QTextCodec *mapper() const; | 89 | const QTextCodec *mapper() const; |
90 | void *fontSet() const; | 90 | void *fontSet() const; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | 93 | ||
94 | #endif // QFONTDATA_P_H | 94 | #endif // QFONTDATA_P_H |