Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app_server: new font code cleanup: includes and the like

Browse Source 
Change-Id: I4b7f882fffc34be1984060838f13971c48d4abfc
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6059
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
This commit is contained in:
Máximo Castañeda 2023-02-10 10:56:11 +01:00 committed by Adrien Destugues
parent 229a173c6e
commit cb190a7dee
6 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/servers/app/font/AppFontManager.cpp
View File

@ -15,23 +15,11 @@
#include <new>
#include <stdint.h>
#include <syslog.h>
#include <Autolock.h>
#include <Debug.h>
#include <Directory.h>
#include <Entry.h>
#include <File.h>
#include <FindDirectory.h>
#include <Message.h>
#include <NodeMonitor.h>
#include <Path.h>
#include <String.h>
#include "FontFamily.h"
#include "FontManager.h"
#include "ServerConfig.h"
#include "ServerFont.h"
//#define TRACE_FONT_MANAGER
@ -42,6 +30,9 @@
#endif
extern FT_Library gFreeTypeLibrary;
// #pragma mark -

13
src/servers/app/font/AppFontManager.h
View File

@ -13,24 +13,11 @@
#include "FontManager.h"
#include <AutoDeleter.h>
#include <HashMap.h>
#include <Looper.h>
#include <ObjectList.h>
#include <Referenceable.h>
#include <ft2build.h>
#include FT_FREETYPE_H
class BEntry;
class BPath;
struct node_ref;
class FontFamily;
class FontStyle;
class ServerFont;
// font areas should be less than 20MB
#define MAX_FONT_DATA_SIZE_BYTES 20 * 1024 * 1024

11
src/servers/app/font/FontManager.cpp
View File

@ -15,20 +15,9 @@
#include <new>
#include <Autolock.h>
#include <Debug.h>
#include <Directory.h>
#include <Entry.h>
#include <File.h>
#include <FindDirectory.h>
#include <Message.h>
#include <NodeMonitor.h>
#include <Path.h>
#include <String.h>
#include "FontFamily.h"
#include "ServerConfig.h"
#include "ServerFont.h"
//#define TRACE_FONT_MANAGER

8
src/servers/app/font/FontManager.h
View File

@ -10,7 +10,6 @@
#define FONT_MANAGER_H
#include <AutoDeleter.h>
#include <HashMap.h>
#include <Looper.h>
#include <ObjectList.h>
@ -20,13 +19,8 @@
#include FT_FREETYPE_H
class BEntry;
class BPath;
struct node_ref;
class FontFamily;
class FontStyle;
class ServerFont;
/*!
@ -107,6 +101,4 @@ protected:
bool fHasFreetypeLibrary;
};
extern FT_Library gFreeTypeLibrary;
#endif /* FONT_MANAGER_H */

9
src/servers/app/font/GlobalFontManager.cpp
View File

@ -26,15 +26,17 @@
#include <Path.h>
#include <String.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#include "FontFamily.h"
#include "FontManager.h"
#include "ServerConfig.h"
#include "ServerFont.h"
//#define TRACE_FONT_MANAGER
//#define TRACE_GLOBAL_FONT_MANAGER
#ifdef TRACE_GLOBAL_FONT_MANAGER
# define FTRACE(x) printf x
# define FTRACE(x) debug_printf x
#else
# define FTRACE(x) ;
#endif
@ -43,6 +45,7 @@
// TODO: needs some more work for multi-user support
GlobalFontManager* gFontManager = NULL;
extern FT_Library gFreeTypeLibrary;
struct GlobalFontManager::font_directory {

8
src/servers/app/font/GlobalFontManager.h
View File

@ -13,13 +13,7 @@
#include "FontManager.h"
#include <AutoDeleter.h>
#include <HashMap.h>
#include <Looper.h>
#include <ObjectList.h>
#include <Referenceable.h>
#include <ft2build.h>
#include FT_FREETYPE_H
class BEntry;
@ -125,6 +119,4 @@ private:
extern GlobalFontManager* gFontManager;
extern FT_Library gFreeTypeLibrary;
#endif /* GLOBAL_FONT_MANAGER_H */