From 3b7457281b2aa91e576c342c22682dc75f70c38a Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Tue, 9 Sep 2003 10:26:11 +0000 Subject: [PATCH] Moved font server header to private app_server headers location - unbroke the build git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4606 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/server/FontServer.cpp | 6 +- src/servers/app/server/FontServer.h | 90 --------------------------- 2 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 src/servers/app/server/FontServer.h diff --git a/src/servers/app/server/FontServer.cpp b/src/servers/app/server/FontServer.cpp index 48b4e79615..bb425780af 100644 --- a/src/servers/app/server/FontServer.cpp +++ b/src/servers/app/server/FontServer.cpp @@ -32,9 +32,9 @@ #include #include -#include "FontServer.h" -#include "FontFamily.h" -#include "ServerFont.h" +#include +#include +#include #include "ServerConfig.h" extern FTC_Manager ftmanager; diff --git a/src/servers/app/server/FontServer.h b/src/servers/app/server/FontServer.h deleted file mode 100644 index 29f0ec04d8..0000000000 --- a/src/servers/app/server/FontServer.h +++ /dev/null @@ -1,90 +0,0 @@ -//------------------------------------------------------------------------------ -// Copyright (c) 2001-2002, OpenBeOS -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// File Name: FontServer.h -// Author: DarkWyrm -// Description: Handles the largest part of the font subsystem -// -//------------------------------------------------------------------------------ -#ifndef FONTSERVER_H_ -#define FONTSERVER_H_ - -#include -#include -#include -#include -#include -#include FT_FREETYPE_H -#include FT_CACHE_H - -class FontFamily; -class FontStyle; -class ServerFont; - -/*! - \class FontServer FontServer.h - \brief Manager for the largest part of the font subsystem -*/ -class FontServer -{ -public: - FontServer(void); - ~FontServer(void); - void Lock(void); - void Unlock(void); - - /*! - \brief Determines whether the font server has started up properly - \return true if so, false if not. - */ - bool IsInitialized(void) { return init; } - int32 CountFamilies(void); - int32 CountStyles(const char *family); - void RemoveFamily(const char *family); - status_t ScanDirectory(const char *path); - void SaveList(void); - FontStyle *GetStyle(font_family family, font_style face); - ServerFont *GetSystemPlain(void); - ServerFont *GetSystemBold(void); - ServerFont *GetSystemFixed(void); - bool SetSystemPlain(const char *family, const char *style, float size); - bool SetSystemBold(const char *family, const char *style, float size); - bool SetSystemFixed(const char *family, const char *style, float size); - bool FontsNeedUpdated(void) { return need_update; } - /*! - \brief Called when the fonts list has been updated - */ - void FontsUpdated(void) { need_update=false; } -protected: - FontFamily *_FindFamily(const char *name); - FT_CharMap _GetSupportedCharmap(const FT_Face &face); - bool init; - sem_id lock; - BList *families; - ServerFont *plain, *bold, *fixed; - bool need_update; -}; - -extern FTC_Manager ftmanager; -extern FT_Library ftlib; -extern FontServer *fontserver; - -#endif