From 6a63492f6c671076f64727c118d188f29e16969a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 15 Oct 2008 12:48:19 +0000
Subject: [PATCH] * When switching Terminals via Command-G, we now also take
 the workspace   information into account, ie. we now behave like the Terminal
 on BeOS, and only   allow to switch between the Terminal windows of one
 workspace.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28130 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/TermApp.cpp | 46 ++++++++++++++++++++---------------
 src/apps/terminal/TermApp.h   |  4 +--
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp
index 209f99d0f9..bd95475377 100644
--- a/src/apps/terminal/TermApp.cpp
+++ b/src/apps/terminal/TermApp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
  * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
  *
@@ -37,7 +37,7 @@ static bool sUsageRequested = false;
 
 
 const ulong MSG_ACTIVATE_TERM = 'msat';
-const ulong MSG_TERM_IS_MINIMIZE = 'mtim';
+const ulong MSG_TERM_WINDOW_INFO = 'mtwi';
 
 
 TermApp::TermApp()
@@ -132,7 +132,7 @@ TermApp::AboutRequested()
 	BAlert *alert = new BAlert("about", "Terminal\n"
 		"\twritten by Kazuho Okui and Takashi Murai\n"
 		"\tupdated by Kian Duffy and others\n\n"
-		"\tCopyright " B_UTF8_COPYRIGHT "2003-2005, Haiku.\n", "Ok");
+		"\tCopyright " B_UTF8_COPYRIGHT "2003-2008, Haiku.\n", "Ok");
 	BTextView *view = alert->TextView();
 	
 	view->SetStylable(true);
@@ -159,10 +159,11 @@ TermApp::MessageReceived(BMessage* msg)
 			fTermWindow->Activate();
 			break;
 
-		case MSG_TERM_IS_MINIMIZE:
+		case MSG_TERM_WINDOW_INFO:
 		{
 			BMessage reply(B_REPLY);
-			reply.AddBool("result", fTermWindow->IsMinimized());
+			reply.AddBool("minimized", fTermWindow->IsMinimized());
+			reply.AddInt32("workspaces", fTermWindow->Workspaces());
 			msg->SendReply(&reply);
 			break;
 		}
@@ -265,15 +266,15 @@ TermApp::_ActivateTermWindow(team_id id)
 void
 TermApp::_SwitchTerm()
 {
-	team_id myId = be_app->Team(); // My id
+	team_id myId = be_app->Team();
 	BList teams;
 	be_roster->GetAppList(TERM_SIGNATURE, &teams); 
+
 	int32 numTerms = teams.CountItems();
+	if (numTerms <= 1)
+		return;
 
-	if (numTerms <= 1 )
-		return; //Can't Switch !!
-
-	// Find position of mine in app teams.
+	// Find our position in the app teams.
 	int32 i;
 
 	for (i = 0; i < numTerms; i++) {
@@ -284,7 +285,7 @@ TermApp::_SwitchTerm()
 	do {
 		if (--i < 0)
 			i = numTerms - 1;
-	} while (_IsMinimized(reinterpret_cast<team_id>(teams.ItemAt(i))));
+	} while (!_IsSwitchTarget(reinterpret_cast<team_id>(teams.ItemAt(i))));
 
 	// Activate switched terminal.
 	_ActivateTermWindow(reinterpret_cast<team_id>(teams.ItemAt(i)));
@@ -292,19 +293,26 @@ TermApp::_SwitchTerm()
 
 
 bool
-TermApp::_IsMinimized(team_id id)
+TermApp::_IsSwitchTarget(team_id id)
 {
 	BMessenger app(TERM_SIGNATURE, id);
-	if (app.IsTargetLocal())
-		return fTermWindow->IsMinimized();
+	if (app.IsTargetLocal()) {
+		return !fTermWindow->IsMinimized()
+			&& (fTermWindow->Workspaces() & (1L << current_workspace())) != 0;
+	}
 
 	BMessage reply;
-	if (app.SendMessage(MSG_TERM_IS_MINIMIZE, &reply) != B_OK)
-		return true;
+	if (app.SendMessage(MSG_TERM_WINDOW_INFO, &reply) != B_OK)
+		return false;
 
-	bool hidden;
-	reply.FindBool("result", &hidden);
-	return hidden;
+	bool minimized;
+	int32 workspaces;
+	if (reply.FindBool("minimized", &minimized) != B_OK
+		|| reply.FindInt32("workspaces", &workspaces) != B_OK)
+		return false;
+
+	return !minimized
+		&& (workspaces & (1L << current_workspace())) != 0;
 }
 
 
diff --git a/src/apps/terminal/TermApp.h b/src/apps/terminal/TermApp.h
index 52a2f565f2..95a823807f 100644
--- a/src/apps/terminal/TermApp.h
+++ b/src/apps/terminal/TermApp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2008, Haiku.
  * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
  * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
  *
@@ -55,7 +55,7 @@ class TermApp : public BApplication {
 		status_t _MakeTermWindow(BRect& frame);
 		void _SwitchTerm();
 		void _ActivateTermWindow(team_id id);
-		bool _IsMinimized(team_id id);
+		bool _IsSwitchTarget(team_id id);
 		void _SanitizeIDs(BMessage* data, uint8* windows, ssize_t length);
 		bool _UpdateIDs(bool set, uint8* windows, ssize_t maxLength,
 			ssize_t* _length);