Merge branch 'app_server'

Conflicts:
	src/kits/interface/PicturePlayer.cpp
	src/servers/app/ServerPicture.cpp

In addition, the following files were also adapted to master branch
BPicture changes during the merge:
	src/kits/interface/PicturePlayer.h
	src/servers/app/PictureBoundingBoxPlayer.cpp

headers/os/interface/View.h

@@ -505,6 +505,9 @@ public:
 			void				DrawPictureAsync(const char* filename,
 									long offset, BPoint where);
 
+			void				BeginLayer(uint8 opacity);
+			void				EndLayer();
+
 			status_t			SetEventMask(uint32 mask, uint32 options = 0);
 			uint32				EventMask();
 			status_t			SetMouseEventMask(uint32 mask,

headers/private/app/RegistrarDefs.h

@@ -23,7 +23,14 @@ namespace BPrivate {
 extern const char* kRAppLooperPortName;
 
 
-#define B_REGISTRAR_SIGNATURE "application/x-vnd.haiku-registrar"
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	define B_REGISTRAR_SIGNATURE "application/x-vnd.haiku-registrar"
+#	define B_REGISTRAR_PORT_NAME "system:roster"
+#else
+#	define B_REGISTRAR_SIGNATURE "application/x-vnd.test-registrar"
+#	define B_REGISTRAR_PORT_NAME "haiku-test:roster"
+#endif
+
 #define B_REGISTRAR_AUTHENTICATION_PORT_NAME	"auth"
 
 

headers/private/app/ServerProtocol.h

@@ -7,6 +7,7 @@
  *		Jérôme Duval, [email protected]
  *		Axel Dörfler, [email protected]
  *		Andrej Spielmann, <[email protected]>
+ *		Julian Harnath, <[email protected]>
  */
 #ifndef APP_SERVER_PROTOCOL_H
 #define APP_SERVER_PROTOCOL_H
@@ -15,6 +16,10 @@
 #include <SupportDefs.h>
 
 
+#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	define SERVER_PORT_NAME "haiku-test:app_server"
+#endif
+
 #if TEST_MODE
 #	define SERVER_INPUT_PORT "haiku-test:input port"
 #endif
@@ -319,6 +324,8 @@ enum {
 	AS_VIEW_SET_VIEW_BITMAP,
 	AS_VIEW_SET_PATTERN,
 	AS_SET_CURRENT_VIEW,
+	AS_VIEW_BEGIN_LAYER,
+	AS_VIEW_END_LAYER,
 
 	// BDirectWindow/BWindowScreen codes
 	AS_DIRECT_WINDOW_GET_SYNC_DATA,

headers/private/interface/PictureDataWriter.h

@@ -1,9 +1,10 @@
 /*
- * Copyright 2006-2007 Haiku, Inc. All rights reserved.
+ * Copyright 2006-2015 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Stefano Ceccherini, [email protected]
+ *		Julian Harnath, <[email protected]>
  */
 #ifndef _PICTURE_DATA_WRITER_H
 #define _PICTURE_DATA_WRITER_H
@@ -17,6 +18,7 @@
 #include <stack>
 
 
+class Layer;
 class BPositionIO;
 class BRegion;
 
@@ -93,6 +95,8 @@ public:
 			status_t			WriteDrawPicture(const BPoint& where,
 									const int32& token);
 
+			status_t			WriteBlendLayer(Layer* layer);
+
 protected:
 	// throw a status_t on error
 			void				BeginOp(const int16& op);

headers/private/interface/PicturePlayer.h

@@ -23,6 +23,7 @@ class BAffineTransform;
 class BList;
 class BPicture;
 class BShape;
+class Layer;
 
 
 namespace BPrivate {
@@ -83,6 +84,7 @@ struct picture_player_callbacks {
 	void (*set_blending_mode)(void* userData, source_alpha alphaSourceMode,
 		alpha_function alphaFunctionMode);
 	void (*set_transform)(void* userData, const BAffineTransform& transform);
+	void (*blend_layer)(void* userData, Layer* layer);
 };
 
 

headers/private/interface/PictureProtocol.h

@@ -52,10 +52,11 @@ enum {
 	B_PIC_SET_FONT_BPP			= 0x0388,
 	B_PIC_SET_FONT_FACE			= 0x0389,
 	B_PIC_SET_TRANSFORM			= 0x0390,
+	B_PIC_BLEND_LAYER			= 0x0391
 };
 
 
-const static uint32 kOpsTableSize = 49;
+const static uint32 kOpsTableSize = 50;
 
 
 #endif