From ab83a5c4e09fe3a0beb9bebb8abb47fa0dab356f Mon Sep 17 00:00:00 2001
From: DarkWyrm <darkwyrm@gmail.com>
Date: Sat, 21 May 2005 12:50:04 +0000
Subject: [PATCH] Re-enabled private SysCursor API and fixed build

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12753 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/prefs/appearance/Jamfile          |  2 +-
 src/prefs/appearance/SysCursorAPI.cpp | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/prefs/appearance/Jamfile b/src/prefs/appearance/Jamfile
index 8d20ec59d7..d786a665b9 100644
--- a/src/prefs/appearance/Jamfile
+++ b/src/prefs/appearance/Jamfile
@@ -13,7 +13,7 @@ Preference Appearance :
 	FontMenu.cpp
 	MenuView.cpp
 	PreviewDriver.cpp
-#	SysCursorAPI.cpp
+	SysCursorAPI.cpp
 	ColorWell.cpp
 	ColorWhichItem.cpp
 	CursorWhichItem.cpp
diff --git a/src/prefs/appearance/SysCursorAPI.cpp b/src/prefs/appearance/SysCursorAPI.cpp
index 89afbec859..304dae762e 100644
--- a/src/prefs/appearance/SysCursorAPI.cpp
+++ b/src/prefs/appearance/SysCursorAPI.cpp
@@ -1,10 +1,9 @@
 #include <PortLink.h>
-#include <PortMessage.h>
 #include <ServerProtocol.h>
 #include <OS.h>
 #include "SysCursorAPI.h"
 
-// TODO: tweak the BBitmap and BCursor headers
+// TODO R2: tweak the BBitmap and BCursor headers
 
 void set_syscursor(cursor_which which, const BCursor *cursor)
 {
@@ -39,15 +38,18 @@ cursor_which get_syscursor(void)
 	port_id server=find_port(SERVER_PORT_NAME);
 	if(server!=B_NAME_NOT_FOUND)
 	{
-		PortMessage pmsg;
+		int32 code;
+		BPortLink link(server);
 		
-		PortLink link(server);
-		link.SetOpCode(AS_GET_SYSCURSOR);
-		link.FlushWithReply(&pmsg);
+		link.StartMessage(AS_GET_SYSCURSOR);
+		link.GetNextReply(&code);
 		
-		cursor_which which;
-		pmsg.Read<cursor_which>(&which);
-		return which;
+		if(code==SERVER_TRUE)
+		{
+			cursor_which which;
+			link.Read<cursor_which>(&which);
+			return which;
+		}
 	}
 	return B_CURSOR_INVALID;
 }
@@ -57,8 +59,8 @@ void setcursor(cursor_which which)
 	port_id server=find_port(SERVER_PORT_NAME);
 	if(server!=B_NAME_NOT_FOUND)
 	{
-		PortLink link(server);
-		link.SetOpCode(AS_SET_CURSOR_SYSTEM);
+		BPortLink link(server);
+		link.StartMessage(AS_SET_CURSOR_SYSTEM);
 		link.Flush();
 	}
 }