From f4f30311aab9b2768d3ef7e590f85598298edfe0 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Mon, 25 Jul 2011 04:31:54 +0000 Subject: [PATCH] Cleanup app server directory a bit by creating a font and a decorator sub folder. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42483 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/decorators/SATDecorator/Jamfile | 2 + src/servers/app/Desktop.cpp | 1 + src/servers/app/DrawState.h | 1 - src/servers/app/Jamfile | 39 +++++++++++++------ src/servers/app/ServerPicture.cpp | 1 + .../app/{ => decorator}/DecorManager.cpp | 0 .../app/{ => decorator}/DecorManager.h | 0 src/servers/app/{ => decorator}/Decorator.cpp | 0 src/servers/app/{ => decorator}/Decorator.h | 0 .../app/{ => decorator}/DefaultDecorator.cpp | 0 .../app/{ => decorator}/DefaultDecorator.h | 0 .../DefaultWindowBehaviour.cpp | 0 .../{ => decorator}/DefaultWindowBehaviour.h | 0 .../app/{ => decorator}/MagneticBorder.cpp | 0 .../app/{ => decorator}/MagneticBorder.h | 0 .../app/{ => decorator}/WindowBehaviour.cpp | 0 .../app/{ => decorator}/WindowBehaviour.h | 0 src/servers/app/drawing/Jamfile | 1 + src/servers/app/drawing/Painter/Jamfile | 1 + src/servers/app/drawing/remote/Jamfile | 1 + src/servers/app/{ => font}/FontCache.cpp | 0 src/servers/app/{ => font}/FontCache.h | 0 src/servers/app/{ => font}/FontCacheEntry.cpp | 0 src/servers/app/{ => font}/FontCacheEntry.h | 0 src/servers/app/{ => font}/FontEngine.cpp | 0 src/servers/app/{ => font}/FontEngine.h | 0 src/servers/app/{ => font}/FontFamily.cpp | 0 src/servers/app/{ => font}/FontFamily.h | 0 src/servers/app/{ => font}/FontManager.cpp | 0 src/servers/app/{ => font}/FontManager.h | 0 src/servers/app/{ => font}/FontStyle.cpp | 0 src/servers/app/{ => font}/FontStyle.h | 0 .../app/{ => font}/GlyphLayoutEngine.h | 0 33 files changed, 34 insertions(+), 13 deletions(-) rename src/servers/app/{ => decorator}/DecorManager.cpp (100%) rename src/servers/app/{ => decorator}/DecorManager.h (100%) rename src/servers/app/{ => decorator}/Decorator.cpp (100%) rename src/servers/app/{ => decorator}/Decorator.h (100%) rename src/servers/app/{ => decorator}/DefaultDecorator.cpp (100%) rename src/servers/app/{ => decorator}/DefaultDecorator.h (100%) rename src/servers/app/{ => decorator}/DefaultWindowBehaviour.cpp (100%) rename src/servers/app/{ => decorator}/DefaultWindowBehaviour.h (100%) rename src/servers/app/{ => decorator}/MagneticBorder.cpp (100%) rename src/servers/app/{ => decorator}/MagneticBorder.h (100%) rename src/servers/app/{ => decorator}/WindowBehaviour.cpp (100%) rename src/servers/app/{ => decorator}/WindowBehaviour.h (100%) rename src/servers/app/{ => font}/FontCache.cpp (100%) rename src/servers/app/{ => font}/FontCache.h (100%) rename src/servers/app/{ => font}/FontCacheEntry.cpp (100%) rename src/servers/app/{ => font}/FontCacheEntry.h (100%) rename src/servers/app/{ => font}/FontEngine.cpp (100%) rename src/servers/app/{ => font}/FontEngine.h (100%) rename src/servers/app/{ => font}/FontFamily.cpp (100%) rename src/servers/app/{ => font}/FontFamily.h (100%) rename src/servers/app/{ => font}/FontManager.cpp (100%) rename src/servers/app/{ => font}/FontManager.h (100%) rename src/servers/app/{ => font}/FontStyle.cpp (100%) rename src/servers/app/{ => font}/FontStyle.h (100%) rename src/servers/app/{ => font}/GlyphLayoutEngine.h (100%) diff --git a/src/add-ons/decorators/SATDecorator/Jamfile b/src/add-ons/decorators/SATDecorator/Jamfile index 1f07f3ecc4..e83ebf7ef9 100644 --- a/src/add-ons/decorators/SATDecorator/Jamfile +++ b/src/add-ons/decorators/SATDecorator/Jamfile @@ -4,6 +4,8 @@ UseLibraryHeaders agg lp_solve linprog ; UsePrivateHeaders app graphics interface shared kernel ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; UseFreeTypeHeaders ; diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 5abe4c85ec..d6dc179c5f 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -40,6 +40,7 @@ #include "DecorManager.h" #include "DesktopSettingsPrivate.h" #include "DrawingEngine.h" +#include "FontManager.h" #include "HWInterface.h" #include "InputManager.h" #include "Screen.h" diff --git a/src/servers/app/DrawState.h b/src/servers/app/DrawState.h index a050f53644..c64ebd192a 100644 --- a/src/servers/app/DrawState.h +++ b/src/servers/app/DrawState.h @@ -17,7 +17,6 @@ #include #include // for B_FONT_ALL -#include "FontManager.h" #include "ServerFont.h" #include "PatternHandler.h" diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile index 6fb19d7b7f..9514028257 100644 --- a/src/servers/app/Jamfile +++ b/src/servers/app/Jamfile @@ -8,6 +8,26 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; UseFreeTypeHeaders ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ; +local decorator_src = + DecorManager.cpp + Decorator.cpp + DefaultDecorator.cpp + DefaultWindowBehaviour.cpp + MagneticBorder.cpp + WindowBehaviour.cpp + ; + +UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; +local font_src = + FontCache.cpp + FontCacheEntry.cpp + FontEngine.cpp + FontFamily.cpp + FontManager.cpp + FontStyle.cpp + ; + Server app_server : Angle.cpp AppServer.cpp @@ -18,10 +38,6 @@ Server app_server : CursorData.cpp CursorManager.cpp CursorSet.cpp - DecorManager.cpp - Decorator.cpp - DefaultDecorator.cpp - DefaultWindowBehaviour.cpp Desktop.cpp DesktopListener.cpp DesktopSettings.cpp @@ -29,17 +45,10 @@ Server app_server : DrawState.cpp EventDispatcher.cpp EventStream.cpp - FontCache.cpp - FontCacheEntry.cpp - FontEngine.cpp - FontFamily.cpp - FontManager.cpp - FontStyle.cpp HashTable.cpp InputManager.cpp IntPoint.cpp IntRect.cpp - MagneticBorder.cpp MessageLooper.cpp MultiLocker.cpp OffscreenServerWindow.cpp @@ -60,11 +69,13 @@ Server app_server : View.cpp VirtualScreen.cpp Window.cpp - WindowBehaviour.cpp WindowList.cpp Workspace.cpp WorkspacesView.cpp + $(decorator_src) + $(font_src) + # libraries : libtranslation.so libbe.so libbnetapi.so @@ -74,4 +85,8 @@ Server app_server : : app_server.rdef ; +SEARCH on [ FGristFiles $(decorator_src) ] = [ FDirName $(HAIKU_TOP) src servers app decorator ] ; +SEARCH on [ FGristFiles $(font_src) ] = [ FDirName $(HAIKU_TOP) src servers app font ] ; + + SubInclude HAIKU_TOP src servers app drawing ; diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp index 72d81f27c9..3e094cd899 100644 --- a/src/servers/app/ServerPicture.cpp +++ b/src/servers/app/ServerPicture.cpp @@ -16,6 +16,7 @@ #include "DrawingEngine.h" #include "DrawState.h" +#include "FontManager.h" #include "ServerApp.h" #include "ServerBitmap.h" #include "ServerFont.h" diff --git a/src/servers/app/DecorManager.cpp b/src/servers/app/decorator/DecorManager.cpp similarity index 100% rename from src/servers/app/DecorManager.cpp rename to src/servers/app/decorator/DecorManager.cpp diff --git a/src/servers/app/DecorManager.h b/src/servers/app/decorator/DecorManager.h similarity index 100% rename from src/servers/app/DecorManager.h rename to src/servers/app/decorator/DecorManager.h diff --git a/src/servers/app/Decorator.cpp b/src/servers/app/decorator/Decorator.cpp similarity index 100% rename from src/servers/app/Decorator.cpp rename to src/servers/app/decorator/Decorator.cpp diff --git a/src/servers/app/Decorator.h b/src/servers/app/decorator/Decorator.h similarity index 100% rename from src/servers/app/Decorator.h rename to src/servers/app/decorator/Decorator.h diff --git a/src/servers/app/DefaultDecorator.cpp b/src/servers/app/decorator/DefaultDecorator.cpp similarity index 100% rename from src/servers/app/DefaultDecorator.cpp rename to src/servers/app/decorator/DefaultDecorator.cpp diff --git a/src/servers/app/DefaultDecorator.h b/src/servers/app/decorator/DefaultDecorator.h similarity index 100% rename from src/servers/app/DefaultDecorator.h rename to src/servers/app/decorator/DefaultDecorator.h diff --git a/src/servers/app/DefaultWindowBehaviour.cpp b/src/servers/app/decorator/DefaultWindowBehaviour.cpp similarity index 100% rename from src/servers/app/DefaultWindowBehaviour.cpp rename to src/servers/app/decorator/DefaultWindowBehaviour.cpp diff --git a/src/servers/app/DefaultWindowBehaviour.h b/src/servers/app/decorator/DefaultWindowBehaviour.h similarity index 100% rename from src/servers/app/DefaultWindowBehaviour.h rename to src/servers/app/decorator/DefaultWindowBehaviour.h diff --git a/src/servers/app/MagneticBorder.cpp b/src/servers/app/decorator/MagneticBorder.cpp similarity index 100% rename from src/servers/app/MagneticBorder.cpp rename to src/servers/app/decorator/MagneticBorder.cpp diff --git a/src/servers/app/MagneticBorder.h b/src/servers/app/decorator/MagneticBorder.h similarity index 100% rename from src/servers/app/MagneticBorder.h rename to src/servers/app/decorator/MagneticBorder.h diff --git a/src/servers/app/WindowBehaviour.cpp b/src/servers/app/decorator/WindowBehaviour.cpp similarity index 100% rename from src/servers/app/WindowBehaviour.cpp rename to src/servers/app/decorator/WindowBehaviour.cpp diff --git a/src/servers/app/WindowBehaviour.h b/src/servers/app/decorator/WindowBehaviour.h similarity index 100% rename from src/servers/app/WindowBehaviour.h rename to src/servers/app/decorator/WindowBehaviour.h diff --git a/src/servers/app/drawing/Jamfile b/src/servers/app/drawing/Jamfile index 52fe15dc34..5c2a0bf964 100644 --- a/src/servers/app/drawing/Jamfile +++ b/src/servers/app/drawing/Jamfile @@ -6,6 +6,7 @@ UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateSystemHeaders ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ; diff --git a/src/servers/app/drawing/Painter/Jamfile b/src/servers/app/drawing/Painter/Jamfile index 18146324d8..10c9a25136 100644 --- a/src/servers/app/drawing/Painter/Jamfile +++ b/src/servers/app/drawing/Painter/Jamfile @@ -6,6 +6,7 @@ AddSubDirSupportedPlatforms libbe_test ; UseLibraryHeaders agg ; UsePrivateHeaders app graphics interface kernel shared ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ; UseFreeTypeHeaders ; diff --git a/src/servers/app/drawing/remote/Jamfile b/src/servers/app/drawing/remote/Jamfile index d55a61f523..e354b860eb 100644 --- a/src/servers/app/drawing/remote/Jamfile +++ b/src/servers/app/drawing/remote/Jamfile @@ -6,6 +6,7 @@ UsePrivateHeaders [ FDirName graphics common ] ; UsePrivateSystemHeaders ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ; diff --git a/src/servers/app/FontCache.cpp b/src/servers/app/font/FontCache.cpp similarity index 100% rename from src/servers/app/FontCache.cpp rename to src/servers/app/font/FontCache.cpp diff --git a/src/servers/app/FontCache.h b/src/servers/app/font/FontCache.h similarity index 100% rename from src/servers/app/FontCache.h rename to src/servers/app/font/FontCache.h diff --git a/src/servers/app/FontCacheEntry.cpp b/src/servers/app/font/FontCacheEntry.cpp similarity index 100% rename from src/servers/app/FontCacheEntry.cpp rename to src/servers/app/font/FontCacheEntry.cpp diff --git a/src/servers/app/FontCacheEntry.h b/src/servers/app/font/FontCacheEntry.h similarity index 100% rename from src/servers/app/FontCacheEntry.h rename to src/servers/app/font/FontCacheEntry.h diff --git a/src/servers/app/FontEngine.cpp b/src/servers/app/font/FontEngine.cpp similarity index 100% rename from src/servers/app/FontEngine.cpp rename to src/servers/app/font/FontEngine.cpp diff --git a/src/servers/app/FontEngine.h b/src/servers/app/font/FontEngine.h similarity index 100% rename from src/servers/app/FontEngine.h rename to src/servers/app/font/FontEngine.h diff --git a/src/servers/app/FontFamily.cpp b/src/servers/app/font/FontFamily.cpp similarity index 100% rename from src/servers/app/FontFamily.cpp rename to src/servers/app/font/FontFamily.cpp diff --git a/src/servers/app/FontFamily.h b/src/servers/app/font/FontFamily.h similarity index 100% rename from src/servers/app/FontFamily.h rename to src/servers/app/font/FontFamily.h diff --git a/src/servers/app/FontManager.cpp b/src/servers/app/font/FontManager.cpp similarity index 100% rename from src/servers/app/FontManager.cpp rename to src/servers/app/font/FontManager.cpp diff --git a/src/servers/app/FontManager.h b/src/servers/app/font/FontManager.h similarity index 100% rename from src/servers/app/FontManager.h rename to src/servers/app/font/FontManager.h diff --git a/src/servers/app/FontStyle.cpp b/src/servers/app/font/FontStyle.cpp similarity index 100% rename from src/servers/app/FontStyle.cpp rename to src/servers/app/font/FontStyle.cpp diff --git a/src/servers/app/FontStyle.h b/src/servers/app/font/FontStyle.h similarity index 100% rename from src/servers/app/FontStyle.h rename to src/servers/app/font/FontStyle.h diff --git a/src/servers/app/GlyphLayoutEngine.h b/src/servers/app/font/GlyphLayoutEngine.h similarity index 100% rename from src/servers/app/GlyphLayoutEngine.h rename to src/servers/app/font/GlyphLayoutEngine.h