[haiku-commits] haiku: hrev45263 - in src/servers/app/drawing: interface/html5 html5 remote interface/remote interface/local
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 9 Feb 2013 15:52:22 +0100 (CET)
hrev45263 adds 1 changeset to branch 'master'
old head: 322c4e6cb8334e85cb57e5f8ebb885457b7aaf90
new head: dcaec19c9a11eec63fd86420326935c5097e48e9
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=dcaec19+%5E322c4e6
----------------------------------------------------------------------------
dcaec19: AppServer: Organize "HWInterface" classes
* Organize interface classes into directories
* Long term this will assist in the multi-head
interface / accelerant changes.
* local draws to the local hw accelerant
* remote draws to a remote connection (???)
* html5 draws to... an html5 canvas?
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45263
Commit: dcaec19c9a11eec63fd86420326935c5097e48e9
URL: http://cgit.haiku-os.org/haiku/commit/?id=dcaec19
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Feb 8 23:45:50 2013 UTC
----------------------------------------------------------------------------
49 files changed, 33 insertions(+), 10 deletions(-)
src/servers/app/Jamfile | 7 +++++--
src/servers/app/ScreenManager.cpp | 4 ++--
src/servers/app/drawing/Jamfile | 5 +----
src/servers/app/drawing/interface/Jamfile | 5 +++++
.../{ => interface}/html5/CanvasEventStream.cpp | 0
.../{ => interface}/html5/CanvasEventStream.h | 0
.../{ => interface}/html5/CanvasMessage.cpp | 0
.../drawing/{ => interface}/html5/CanvasMessage.h | 0
.../{ => interface}/html5/HTML5DrawingEngine.cpp | 0
.../{ => interface}/html5/HTML5DrawingEngine.h | 0
.../{ => interface}/html5/HTML5HWInterface.cpp | 0
.../{ => interface}/html5/HTML5HWInterface.h | 0
.../app/drawing/{ => interface}/html5/Jamfile | 2 +-
.../drawing/{ => interface}/html5/NetSender.cpp | 0
.../app/drawing/{ => interface}/html5/NetSender.h | 0
.../{ => interface}/html5/StreamingRingBuffer.cpp | 0
.../{ => interface}/html5/StreamingRingBuffer.h | 0
.../drawing/{ => interface}/html5/WebHandler.cpp | 0
.../app/drawing/{ => interface}/html5/WebHandler.h | 0
.../drawing/{ => interface}/html5/WebServer.cpp | 0
.../app/drawing/{ => interface}/html5/WebServer.h | 0
.../drawing/{ => interface}/html5/WebWorker.cpp | 0
.../app/drawing/{ => interface}/html5/WebWorker.h | 0
.../app/drawing/{ => interface}/html5/base64.cpp | 0
.../app/drawing/{ => interface}/html5/base64.h | 0
.../app/drawing/{ => interface}/html5/desktop.html | 0
.../drawing/{ => interface}/html5/desktop.html.h | 0
.../app/drawing/{ => interface}/html5/haiku.js | 0
.../app/drawing/{ => interface}/html5/haiku.js.h | 0
.../{ => interface/local}/AccelerantBuffer.cpp | 0
.../{ => interface/local}/AccelerantBuffer.h | 0
.../local}/AccelerantHWInterface.cpp | 0
.../{ => interface/local}/AccelerantHWInterface.h | 0
src/servers/app/drawing/interface/local/Jamfile | 18 ++++++++++++++++++
.../app/drawing/{ => interface}/remote/Jamfile | 2 +-
.../drawing/{ => interface}/remote/NetReceiver.cpp | 0
.../drawing/{ => interface}/remote/NetReceiver.h | 0
.../drawing/{ => interface}/remote/NetSender.cpp | 0
.../app/drawing/{ => interface}/remote/NetSender.h | 0
.../{ => interface}/remote/RemoteDrawingEngine.cpp | 0
.../{ => interface}/remote/RemoteDrawingEngine.h | 0
.../{ => interface}/remote/RemoteEventStream.cpp | 0
.../{ => interface}/remote/RemoteEventStream.h | 0
.../{ => interface}/remote/RemoteHWInterface.cpp | 0
.../{ => interface}/remote/RemoteHWInterface.h | 0
.../{ => interface}/remote/RemoteMessage.cpp | 0
.../drawing/{ => interface}/remote/RemoteMessage.h | 0
.../{ => interface}/remote/StreamingRingBuffer.cpp | 0
.../{ => interface}/remote/StreamingRingBuffer.h | 0
----------------------------------------------------------------------------
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 3974d12..697ef0c 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -5,6 +5,9 @@ UsePrivateHeaders app graphics input interface kernel shared
storage support ;
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 interface local ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing interface remote ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing interface html5 ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
@@ -92,8 +95,8 @@ Server app_server :
# libraries
:
libtranslation.so libbe.so libbnetapi.so
- libasdrawing.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
- libpainter.a libagg.a $(HAIKU_FREETYPE_LIB)
+ libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
+ libasdrawing.a libpainter.a libagg.a $(HAIKU_FREETYPE_LIB)
libstackandtile.a liblinprog.a libtextencoding.so libshared.a
$(TARGET_LIBSTDC++)
diff --git a/src/servers/app/ScreenManager.cpp
b/src/servers/app/ScreenManager.cpp
index fda23d3..8851a3f 100644
--- a/src/servers/app/ScreenManager.cpp
+++ b/src/servers/app/ScreenManager.cpp
@@ -14,8 +14,8 @@
#include "Screen.h"
#include "ServerConfig.h"
-#include "remote/RemoteHWInterface.h"
-#include "html5/HTML5HWInterface.h"
+#include "RemoteHWInterface.h"
+#include "HTML5HWInterface.h"
#include <Autolock.h>
#include <Entry.h>
diff --git a/src/servers/app/drawing/Jamfile b/src/servers/app/drawing/Jamfile
index ff28d23..4c43ade 100644
--- a/src/servers/app/drawing/Jamfile
+++ b/src/servers/app/drawing/Jamfile
@@ -16,8 +16,6 @@ Includes [ FGristFiles DrawingEngine.cpp ]
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
StaticLibrary libasdrawing.a :
- AccelerantBuffer.cpp
- AccelerantHWInterface.cpp
BitmapBuffer.cpp
drawing_support.cpp
DrawingEngine.cpp
@@ -32,5 +30,4 @@ StaticLibrary libasdrawing.a :
;
SubInclude HAIKU_TOP src servers app drawing Painter ;
-SubInclude HAIKU_TOP src servers app drawing remote ;
-SubInclude HAIKU_TOP src servers app drawing html5 ;
+SubInclude HAIKU_TOP src servers app drawing interface ;
diff --git a/src/servers/app/drawing/interface/Jamfile
b/src/servers/app/drawing/interface/Jamfile
new file mode 100644
index 0000000..c03dad3
--- /dev/null
+++ b/src/servers/app/drawing/interface/Jamfile
@@ -0,0 +1,5 @@
+SubDir HAIKU_TOP src servers app drawing interface ;
+
+SubInclude HAIKU_TOP src servers app drawing interface html5 ;
+SubInclude HAIKU_TOP src servers app drawing interface local ;
+SubInclude HAIKU_TOP src servers app drawing interface remote ;
diff --git a/src/servers/app/drawing/html5/CanvasEventStream.cpp
b/src/servers/app/drawing/interface/html5/CanvasEventStream.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/CanvasEventStream.cpp
rename to src/servers/app/drawing/interface/html5/CanvasEventStream.cpp
diff --git a/src/servers/app/drawing/html5/CanvasEventStream.h
b/src/servers/app/drawing/interface/html5/CanvasEventStream.h
similarity index 100%
rename from src/servers/app/drawing/html5/CanvasEventStream.h
rename to src/servers/app/drawing/interface/html5/CanvasEventStream.h
diff --git a/src/servers/app/drawing/html5/CanvasMessage.cpp
b/src/servers/app/drawing/interface/html5/CanvasMessage.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/CanvasMessage.cpp
rename to src/servers/app/drawing/interface/html5/CanvasMessage.cpp
diff --git a/src/servers/app/drawing/html5/CanvasMessage.h
b/src/servers/app/drawing/interface/html5/CanvasMessage.h
similarity index 100%
rename from src/servers/app/drawing/html5/CanvasMessage.h
rename to src/servers/app/drawing/interface/html5/CanvasMessage.h
diff --git a/src/servers/app/drawing/html5/HTML5DrawingEngine.cpp
b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/HTML5DrawingEngine.cpp
rename to src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
diff --git a/src/servers/app/drawing/html5/HTML5DrawingEngine.h
b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
similarity index 100%
rename from src/servers/app/drawing/html5/HTML5DrawingEngine.h
rename to src/servers/app/drawing/interface/html5/HTML5DrawingEngine.h
diff --git a/src/servers/app/drawing/html5/HTML5HWInterface.cpp
b/src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/HTML5HWInterface.cpp
rename to src/servers/app/drawing/interface/html5/HTML5HWInterface.cpp
diff --git a/src/servers/app/drawing/html5/HTML5HWInterface.h
b/src/servers/app/drawing/interface/html5/HTML5HWInterface.h
similarity index 100%
rename from src/servers/app/drawing/html5/HTML5HWInterface.h
rename to src/servers/app/drawing/interface/html5/HTML5HWInterface.h
diff --git a/src/servers/app/drawing/html5/Jamfile
b/src/servers/app/drawing/interface/html5/Jamfile
similarity index 94%
rename from src/servers/app/drawing/html5/Jamfile
rename to src/servers/app/drawing/interface/html5/Jamfile
index 9d1c6d8..363d123 100644
--- a/src/servers/app/drawing/html5/Jamfile
+++ b/src/servers/app/drawing/interface/html5/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src servers app drawing html5 ;
+SubDir HAIKU_TOP src servers app drawing interface html5 ;
UseLibraryHeaders agg ;
UsePrivateHeaders app graphics interface kernel shared ;
diff --git a/src/servers/app/drawing/html5/NetSender.cpp
b/src/servers/app/drawing/interface/html5/NetSender.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/NetSender.cpp
rename to src/servers/app/drawing/interface/html5/NetSender.cpp
diff --git a/src/servers/app/drawing/html5/NetSender.h
b/src/servers/app/drawing/interface/html5/NetSender.h
similarity index 100%
rename from src/servers/app/drawing/html5/NetSender.h
rename to src/servers/app/drawing/interface/html5/NetSender.h
diff --git a/src/servers/app/drawing/html5/StreamingRingBuffer.cpp
b/src/servers/app/drawing/interface/html5/StreamingRingBuffer.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/StreamingRingBuffer.cpp
rename to src/servers/app/drawing/interface/html5/StreamingRingBuffer.cpp
diff --git a/src/servers/app/drawing/html5/StreamingRingBuffer.h
b/src/servers/app/drawing/interface/html5/StreamingRingBuffer.h
similarity index 100%
rename from src/servers/app/drawing/html5/StreamingRingBuffer.h
rename to src/servers/app/drawing/interface/html5/StreamingRingBuffer.h
diff --git a/src/servers/app/drawing/html5/WebHandler.cpp
b/src/servers/app/drawing/interface/html5/WebHandler.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/WebHandler.cpp
rename to src/servers/app/drawing/interface/html5/WebHandler.cpp
diff --git a/src/servers/app/drawing/html5/WebHandler.h
b/src/servers/app/drawing/interface/html5/WebHandler.h
similarity index 100%
rename from src/servers/app/drawing/html5/WebHandler.h
rename to src/servers/app/drawing/interface/html5/WebHandler.h
diff --git a/src/servers/app/drawing/html5/WebServer.cpp
b/src/servers/app/drawing/interface/html5/WebServer.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/WebServer.cpp
rename to src/servers/app/drawing/interface/html5/WebServer.cpp
diff --git a/src/servers/app/drawing/html5/WebServer.h
b/src/servers/app/drawing/interface/html5/WebServer.h
similarity index 100%
rename from src/servers/app/drawing/html5/WebServer.h
rename to src/servers/app/drawing/interface/html5/WebServer.h
diff --git a/src/servers/app/drawing/html5/WebWorker.cpp
b/src/servers/app/drawing/interface/html5/WebWorker.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/WebWorker.cpp
rename to src/servers/app/drawing/interface/html5/WebWorker.cpp
diff --git a/src/servers/app/drawing/html5/WebWorker.h
b/src/servers/app/drawing/interface/html5/WebWorker.h
similarity index 100%
rename from src/servers/app/drawing/html5/WebWorker.h
rename to src/servers/app/drawing/interface/html5/WebWorker.h
diff --git a/src/servers/app/drawing/html5/base64.cpp
b/src/servers/app/drawing/interface/html5/base64.cpp
similarity index 100%
rename from src/servers/app/drawing/html5/base64.cpp
rename to src/servers/app/drawing/interface/html5/base64.cpp
diff --git a/src/servers/app/drawing/html5/base64.h
b/src/servers/app/drawing/interface/html5/base64.h
similarity index 100%
rename from src/servers/app/drawing/html5/base64.h
rename to src/servers/app/drawing/interface/html5/base64.h
diff --git a/src/servers/app/drawing/html5/desktop.html
b/src/servers/app/drawing/interface/html5/desktop.html
similarity index 100%
rename from src/servers/app/drawing/html5/desktop.html
rename to src/servers/app/drawing/interface/html5/desktop.html
diff --git a/src/servers/app/drawing/html5/desktop.html.h
b/src/servers/app/drawing/interface/html5/desktop.html.h
similarity index 100%
rename from src/servers/app/drawing/html5/desktop.html.h
rename to src/servers/app/drawing/interface/html5/desktop.html.h
diff --git a/src/servers/app/drawing/html5/haiku.js
b/src/servers/app/drawing/interface/html5/haiku.js
similarity index 100%
rename from src/servers/app/drawing/html5/haiku.js
rename to src/servers/app/drawing/interface/html5/haiku.js
diff --git a/src/servers/app/drawing/html5/haiku.js.h
b/src/servers/app/drawing/interface/html5/haiku.js.h
similarity index 100%
rename from src/servers/app/drawing/html5/haiku.js.h
rename to src/servers/app/drawing/interface/html5/haiku.js.h
diff --git a/src/servers/app/drawing/AccelerantBuffer.cpp
b/src/servers/app/drawing/interface/local/AccelerantBuffer.cpp
similarity index 100%
rename from src/servers/app/drawing/AccelerantBuffer.cpp
rename to src/servers/app/drawing/interface/local/AccelerantBuffer.cpp
diff --git a/src/servers/app/drawing/AccelerantBuffer.h
b/src/servers/app/drawing/interface/local/AccelerantBuffer.h
similarity index 100%
rename from src/servers/app/drawing/AccelerantBuffer.h
rename to src/servers/app/drawing/interface/local/AccelerantBuffer.h
diff --git a/src/servers/app/drawing/AccelerantHWInterface.cpp
b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
similarity index 100%
rename from src/servers/app/drawing/AccelerantHWInterface.cpp
rename to src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
diff --git a/src/servers/app/drawing/AccelerantHWInterface.h
b/src/servers/app/drawing/interface/local/AccelerantHWInterface.h
similarity index 100%
rename from src/servers/app/drawing/AccelerantHWInterface.h
rename to src/servers/app/drawing/interface/local/AccelerantHWInterface.h
diff --git a/src/servers/app/drawing/interface/local/Jamfile
b/src/servers/app/drawing/interface/local/Jamfile
new file mode 100644
index 0000000..4a6b2be
--- /dev/null
+++ b/src/servers/app/drawing/interface/local/Jamfile
@@ -0,0 +1,18 @@
+SubDir HAIKU_TOP src servers app drawing interface local ;
+
+UseLibraryHeaders agg ;
+UsePrivateHeaders app graphics interface kernel shared ;
+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 ] ;
+UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter
font_support ] ;
+
+StaticLibrary libaslocal.a :
+ AccelerantBuffer.cpp
+ AccelerantHWInterface.cpp
+;
diff --git a/src/servers/app/drawing/remote/Jamfile
b/src/servers/app/drawing/interface/remote/Jamfile
similarity index 93%
rename from src/servers/app/drawing/remote/Jamfile
rename to src/servers/app/drawing/interface/remote/Jamfile
index 30f00d6..06bb357 100644
--- a/src/servers/app/drawing/remote/Jamfile
+++ b/src/servers/app/drawing/interface/remote/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src servers app drawing remote ;
+SubDir HAIKU_TOP src servers app drawing interface remote ;
UseLibraryHeaders agg ;
UsePrivateHeaders app graphics interface kernel shared ;
diff --git a/src/servers/app/drawing/remote/NetReceiver.cpp
b/src/servers/app/drawing/interface/remote/NetReceiver.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/NetReceiver.cpp
rename to src/servers/app/drawing/interface/remote/NetReceiver.cpp
diff --git a/src/servers/app/drawing/remote/NetReceiver.h
b/src/servers/app/drawing/interface/remote/NetReceiver.h
similarity index 100%
rename from src/servers/app/drawing/remote/NetReceiver.h
rename to src/servers/app/drawing/interface/remote/NetReceiver.h
diff --git a/src/servers/app/drawing/remote/NetSender.cpp
b/src/servers/app/drawing/interface/remote/NetSender.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/NetSender.cpp
rename to src/servers/app/drawing/interface/remote/NetSender.cpp
diff --git a/src/servers/app/drawing/remote/NetSender.h
b/src/servers/app/drawing/interface/remote/NetSender.h
similarity index 100%
rename from src/servers/app/drawing/remote/NetSender.h
rename to src/servers/app/drawing/interface/remote/NetSender.h
diff --git a/src/servers/app/drawing/remote/RemoteDrawingEngine.cpp
b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteDrawingEngine.cpp
rename to src/servers/app/drawing/interface/remote/RemoteDrawingEngine.cpp
diff --git a/src/servers/app/drawing/remote/RemoteDrawingEngine.h
b/src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteDrawingEngine.h
rename to src/servers/app/drawing/interface/remote/RemoteDrawingEngine.h
diff --git a/src/servers/app/drawing/remote/RemoteEventStream.cpp
b/src/servers/app/drawing/interface/remote/RemoteEventStream.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteEventStream.cpp
rename to src/servers/app/drawing/interface/remote/RemoteEventStream.cpp
diff --git a/src/servers/app/drawing/remote/RemoteEventStream.h
b/src/servers/app/drawing/interface/remote/RemoteEventStream.h
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteEventStream.h
rename to src/servers/app/drawing/interface/remote/RemoteEventStream.h
diff --git a/src/servers/app/drawing/remote/RemoteHWInterface.cpp
b/src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteHWInterface.cpp
rename to src/servers/app/drawing/interface/remote/RemoteHWInterface.cpp
diff --git a/src/servers/app/drawing/remote/RemoteHWInterface.h
b/src/servers/app/drawing/interface/remote/RemoteHWInterface.h
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteHWInterface.h
rename to src/servers/app/drawing/interface/remote/RemoteHWInterface.h
diff --git a/src/servers/app/drawing/remote/RemoteMessage.cpp
b/src/servers/app/drawing/interface/remote/RemoteMessage.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteMessage.cpp
rename to src/servers/app/drawing/interface/remote/RemoteMessage.cpp
diff --git a/src/servers/app/drawing/remote/RemoteMessage.h
b/src/servers/app/drawing/interface/remote/RemoteMessage.h
similarity index 100%
rename from src/servers/app/drawing/remote/RemoteMessage.h
rename to src/servers/app/drawing/interface/remote/RemoteMessage.h
diff --git a/src/servers/app/drawing/remote/StreamingRingBuffer.cpp
b/src/servers/app/drawing/interface/remote/StreamingRingBuffer.cpp
similarity index 100%
rename from src/servers/app/drawing/remote/StreamingRingBuffer.cpp
rename to src/servers/app/drawing/interface/remote/StreamingRingBuffer.cpp
diff --git a/src/servers/app/drawing/remote/StreamingRingBuffer.h
b/src/servers/app/drawing/interface/remote/StreamingRingBuffer.h
similarity index 100%
rename from src/servers/app/drawing/remote/StreamingRingBuffer.h
rename to src/servers/app/drawing/interface/remote/StreamingRingBuffer.h
Other related posts:
- » [haiku-commits] haiku: hrev45263 - in src/servers/app/drawing: interface/html5 html5 remote interface/remote interface/local - kallisti5
