From cd2b8867e1d331be8bfb4f0db30f659c82e30907 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Fri, 27 Jul 2007 21:43:24 +0000
Subject: [PATCH] Removed weird code in TermWindow::WindowActivated. Added
 basic Archive(), Instantiate(), and unarchiving constructor.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21724 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/TermApp.cpp    |  1 -
 src/apps/terminal/TermView.cpp   | 24 ++++++++++++++++++++++++
 src/apps/terminal/TermView.h     |  3 +++
 src/apps/terminal/TermWindow.cpp | 10 ++--------
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index e0676048f6..a6f887161b 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -11,7 +11,6 @@
 
 #include "CodeConv.h"
 #include "PrefHandler.h"
-#include "TermBuffer.h"
 #include "TermWindow.h"
 #include "TermConst.h"
 
diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index 60b732e576..6410518f4e 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -155,6 +155,13 @@ TermView::TermView(BRect frame, const char *command)
 }
 
 
+TermView::TermView(BMessage *archive)
+	:
+	BView(archive)
+{
+}
+
+
 void
 TermView::_InitObject(const char *command)
 {
@@ -194,6 +201,23 @@ TermView::~TermView()
 }
 
 
+/* static */
+BArchivable *
+TermView::Instantiate(BMessage* data)
+{
+	if (validate_instantiation(data, "TermView"))
+		return new TermView(data);
+	return NULL;
+}
+
+
+status_t
+TermView::Archive(BMessage* data, bool deep) const
+{
+	return BView::Archive(data, deep);
+}
+
+
 void
 TermView::GetPreferredSize(float *width, float *height)
 {
diff --git a/src/apps/terminal/TermView.h b/src/apps/terminal/TermView.h
index f10d4b2ebe..604ee1fa22 100644
--- a/src/apps/terminal/TermView.h
+++ b/src/apps/terminal/TermView.h
@@ -51,8 +51,11 @@ class TermBuffer;
 class TermView : public BView {
 public:
 	TermView(BRect frame, const char *command = NULL);
+	TermView(BMessage *archive);	
 	~TermView();
 
+	static	BArchivable* Instantiate(BMessage* data);
+	virtual status_t Archive(BMessage* data, bool deep = true) const;
 	virtual void GetPreferredSize(float *width, float *height);
 
 	status_t AttachShell(Shell *shell);
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index b0712a3bff..0ab745e5ff 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -523,15 +523,9 @@ TermWindow::MessageReceived(BMessage *message)
 
 
 void
-TermWindow::WindowActivated(bool)
+TermWindow::WindowActivated(bool activated)
 {
-#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-	if (focus_follows_mouse()) {
-		BPoint aMouseLoc = Frame().LeftTop();
-		set_mouse_position(int32(aMouseLoc.x + 16), int32(aMouseLoc.y + 2));
-		be_app->SetCursor(B_HAND_CURSOR);
-	}
-#endif
+	BWindow::WindowActivated(activated);
 }