i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Update header indentation

Browse Source 
* Unify pointer style, it was a mix before


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30592 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-05-02 21:32:33 +00:00
parent cc0580fe34
commit 338299319e
1 changed files with 83 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/FontManager.h
+36 -16
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2001-2005, Haiku. * Copyright 2001-2009, Haiku.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -51,16 +51,20 @@ class FontManager : public BLooper {
FontFamily* GetFamily(uint16 familyID) const; FontFamily* GetFamily(uint16 familyID) const;
FontFamily* GetFamily(const char* name); FontFamily* GetFamily(const char* name);
FontStyle *GetStyleByIndex(const char *family, int32 index); FontStyle* GetStyleByIndex(const char* family,
int32 index);
FontStyle* GetStyleByIndex(uint16 familyID, int32 index); FontStyle* GetStyleByIndex(uint16 familyID, int32 index);
FontStyle *GetStyle(const char *family, const char *style, uint16 familyID = 0xffff, FontStyle* GetStyle(const char* family, const char* style,
uint16 familyID = 0xffff,
uint16 styleID = 0xffff, uint16 face = 0); uint16 styleID = 0xffff, uint16 face = 0);
FontStyle* GetStyle(const char *family, uint16 styleID); FontStyle* GetStyle(const char *family, uint16 styleID);
FontStyle *GetStyle(uint16 familyID, uint16 styleID) const; FontStyle* GetStyle(uint16 familyID,
uint16 styleID) const;
FontStyle* FindStyleMatchingFace(uint16 face) const; FontStyle* FindStyleMatchingFace(uint16 face) const;
void RemoveStyle(FontStyle* style); void RemoveStyle(FontStyle* style);
// this call must not be used by anything else than class FontStyle // This call must not be used by anything else than class
// FontStyle.
const ServerFont* DefaultPlainFont() const; const ServerFont* DefaultPlainFont() const;
const ServerFont* DefaultBoldFont() const; const ServerFont* DefaultBoldFont() const;
@@ -73,11 +77,15 @@ class FontManager : public BLooper {
struct font_directory; struct font_directory;
struct font_mapping; struct font_mapping;
void _AddDefaultMapping(const char* family, const char* style, const char* path); void _AddDefaultMapping(const char* family,
const char* style, const char* path);
bool _LoadRecentFontMappings(); bool _LoadRecentFontMappings();
status_t _AddMappedFont(const char* family, const char* style = NULL); status_t _AddMappedFont(const char* family,
FontStyle* _GetDefaultStyle(const char* familyName, const char* styleName, const char* style = NULL);
const char* fallbackFamily, const char* fallbackStyle, FontStyle* _GetDefaultStyle(const char* familyName,
const char* styleName,
const char* fallbackFamily,
const char* fallbackStyle,
uint16 fallbackFace); uint16 fallbackFace);
status_t _SetDefaultFonts(); status_t _SetDefaultFonts();
void _AddSystemPaths(); void _AddSystemPaths();
@@ -85,28 +93,40 @@ class FontManager : public BLooper {
void _RemoveDirectory(font_directory* directory); void _RemoveDirectory(font_directory* directory);
status_t _CreateDirectories(const char* path); status_t _CreateDirectories(const char* path);
status_t _AddPath(const char* path); status_t _AddPath(const char* path);
status_t _AddPath(BEntry& entry, font_directory** _newDirectory = NULL); status_t _AddPath(BEntry& entry,
font_directory** _newDirectory = NULL);
void _RemoveStyle(font_directory& directory, FontStyle* style); void _RemoveStyle(font_directory& directory,
void _RemoveStyle(dev_t device, uint64 directory, uint64 node); FontStyle* style);
void _RemoveStyle(dev_t device, uint64 directory,
uint64 node);
FontFamily* _FindFamily(const char* family) const; FontFamily* _FindFamily(const char* family) const;
void _ScanFontsIfNecessary(); void _ScanFontsIfNecessary();
void _ScanFonts(); void _ScanFonts();
status_t _ScanFontDirectory(font_directory& directory); status_t _ScanFontDirectory(font_directory& directory);
status_t _AddFont(font_directory& directory, BEntry& entry); status_t _AddFont(font_directory& directory,
BEntry& entry);
FT_CharMap _GetSupportedCharmap(const FT_Face& face); FT_CharMap _GetSupportedCharmap(const FT_Face& face);
private: private:
status_t fInitStatus; status_t fInitStatus;
BObjectList<font_directory> fDirectories;
BObjectList<font_mapping> fMappings; typedef BObjectList<font_directory> DirectoryList;
BObjectList<FontFamily> fFamilies; typedef BObjectList<font_mapping> MappingList;
typedef BObjectList<FontFamily> FamilyList;
DirectoryList fDirectories;
MappingList fMappings;
FamilyList fFamilies;
HashTable fStyleHashTable; HashTable fStyleHashTable;
ServerFont* fDefaultPlainFont; ServerFont* fDefaultPlainFont;
ServerFont* fDefaultBoldFont; ServerFont* fDefaultBoldFont;
ServerFont* fDefaultFixedFont; ServerFont* fDefaultFixedFont;
bool fScanned; bool fScanned;
int32 fNextID; int32 fNextID;
}; };