Ticket #3209: TerminalPosition.patch

src/apps/terminal/TermWindow.cpp

@@ -1 +1 @@
 /*
- * Copyright 2007 Haiku, Inc.
+ * Copyright 2007-2009 Haiku, Inc.
  * Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
  * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
  * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
@@ -130 +130 @@
 };
 
 
-TermWindow::TermWindow(BRect frame, const char* title, Arguments *args)
+TermWindow::TermWindow(BRect frame, const char* title, uint32 workspaces, Arguments *args)
     :
-    BWindow(frame, title, B_DOCUMENT_WINDOW,
-        B_CURRENT_WORKSPACE | B_QUIT_ON_WINDOW_CLOSE),
+    BWindow(frame, title, B_DOCUMENT_WINDOW, B_QUIT_ON_WINDOW_CLOSE, workspaces),
     fInitialTitle(title),
     fTabView(NULL),
     fMenubar(NULL),
@@ -168 +167 @@
         fFindPanel->Quit();
         fFindPanel = NULL;
     }
-    
+
     PrefHandler::DeleteDefault();
 
     for (int32 i = 0; Session* session = (Session*)fSessions.ItemAt(i); i++)
@@ -615 +614 @@
 }
 
 
+bool
+TermWindow::QuitRequested()
+{
+    BMessage position = BMessage(MSG_SAVE_WINDOW_POSITION);
+    position.AddRect("rect", Frame());
+    position.AddInt32("workspaces", Workspaces());
+    be_app->PostMessage(&position);
+
+    return true;
+}
+
+
 void
 TermWindow::_SetTermColors(TermViewContainerView *containerView)
 {

src/apps/terminal/TermApp.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
  * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
  *
@@ -33 +33 @@
 
 
 #include <Application.h>
+#include <File.h>
 #include <String.h>
 
 class Arguments;
@@ -52 +53 @@
         void ArgvReceived(int32 argc, char** argv);
 
     private:
-        status_t _MakeTermWindow(BRect& frame);
+        status_t _GetWindowPositionsFile(BFile* file, uint32 openMode);
+        status_t _LoadWindowPosition(BRect* frame, uint32* workspaces);
+        status_t _SaveWindowPosition(BMessage* message);
+        status_t _MakeTermWindow(BRect& frame, uint32 workspaces);
         void _SwitchTerm();
         void _ActivateTermWindow(team_id id);
         bool _IsSwitchTarget(team_id id);
@@ -75 +79 @@
         
         BWindow*    fTermWindow;
         BRect       fTermFrame;
+        uint32      fTermWorkspaces;
         Arguments   *fArgs;
 };
 

src/apps/terminal/TermWindow.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2007, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
  * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
  *
@@ -48 +48 @@
 
 class TermWindow : public BWindow {
 public:
-    TermWindow(BRect frame, const char* title, Arguments *args);
+    TermWindow(BRect frame, const char* title, uint32 workspaces, Arguments *args);
     virtual ~TermWindow();
 
             void    SetSessionWindowTitle(TermView* termView,
@@ -59 +59 @@
     virtual void    MessageReceived(BMessage *message);
     virtual void    WindowActivated(bool);
     virtual void    MenusBeginning();
-
+    virtual bool    QuitRequested();
+    
 private:
     struct Session;
     class TabView;

src/apps/terminal/TermApp.cpp

@@ -1 +1 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
  * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. 
  *
@@ -17 +17 @@
 
 #include <Alert.h>
 #include <Clipboard.h>
+#include <FindDirectory.h>
+#include <InterfaceDefs.h>
 #include <NodeInfo.h>
 #include <Path.h>
 #include <Roster.h>
@@ -45 +47 @@
     fStartFullscreen(false),
     fWindowNumber(-1),
     fTermWindow(NULL),
+    fTermWorkspaces(B_CURRENT_WORKSPACE),
     fArgs(NULL)
 {
     fArgs = new Arguments();
@@ -55 +58 @@
     if (fWindowNumber > 0)
         fWindowTitle << " " << fWindowNumber;
 
-    int i = fWindowNumber / 16;
-    int j = fWindowNumber % 16;
-    int k = (j * 16) + (i * 64) + 50;
-    int l = (j * 16)  + 50;
+    if (_LoadWindowPosition(&fTermFrame, &fTermWorkspaces) != B_OK) {
+        int i = fWindowNumber / 16;
+        int j = fWindowNumber % 16;
+        int k = (j * 16) + (i * 64) + 50;
+        int l = (j * 16)  + 50;
 
-    fTermFrame.Set(k, l, k + 50, k + 50);
+        fTermFrame.Set(k, l, k + 50, k + 50);
+    }
 }
 
 
@@ -98 +103 @@
     // init the mouse copy'n'paste clipboard
     gMouseClipboard = new BClipboard(MOUSE_CLIPBOARD_NAME, true);
 
-    status_t status = _MakeTermWindow(fTermFrame);
+    status_t status = _MakeTermWindow(fTermFrame, fTermWorkspaces);
 
     // failed spawn, print stdout and open alert panel
     // TODO: This alert does never show up.
@@ -119 +124 @@
 void
 TermApp::Quit()
 {
+    fTermWindow->PostMessage(B_QUIT_REQUESTED);
+
     if (!sUsageRequested)
         _UnregisterTerminal();
 
@@ -168 +175 @@
             break;
         }
 
+        case MSG_SAVE_WINDOW_POSITION:
+            _SaveWindowPosition(msg);
+            break;
+            
         case MSG_CHECK_CHILDREN:
             _HandleChildCleanup();
             break;
@@ -236 +247 @@
 
 
 status_t
-TermApp::_MakeTermWindow(BRect &frame)
+TermApp::_GetWindowPositionsFile(BFile* file, uint32 openMode)
 {
+    BPath path;
+    status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path, true);
+    if (status != B_OK)
+        return status;
+
+    status = path.Append("Terminal_windows");
+    if (status != B_OK)
+        return status;
+
+    return file->SetTo(path.Path(), openMode);
+}
+
+status_t
+TermApp::_LoadWindowPosition(BRect* frame, uint32* workspaces)
+{
+    BClipboard clipboard(TERM_SIGNATURE);
+    if (!clipboard.Lock())
+        return B_ERROR;
+
+    status_t status = B_ERROR;
+    BMessage position = BMessage();
+
+    while (true) {
+        BFile file;
+        status = _GetWindowPositionsFile (&file, B_READ_ONLY);
+        if (status != B_OK)
+            break;;
+
+        status = position.Unflatten(&file);
+
+        file.Unset();
+        break;
+    }
+    
+    clipboard.Unlock();
+
+    if (status != B_OK)
+        return status;
+
+    status = position.FindRect((BString("rect_") << fWindowNumber).String(), frame);
+    if (status != B_OK)
+        return status;
+
+    int32 _workspaces;
+    status = position.FindInt32((BString("workspaces_") << fWindowNumber).String(), &_workspaces);
+    if (status != B_OK)
+        return status;
+    if (modifiers() & B_OPTION_KEY)
+        *workspaces = _workspaces;
+
+    return B_OK;
+}
+
+
+status_t
+TermApp::_SaveWindowPosition(BMessage* position)
+{
+    BRect frame;
+    status_t status = position->FindRect("rect", &frame);
+    if (status != B_OK)
+        return status;
+
+    int32 workspaces;
+    status = position->FindInt32("workspaces", &workspaces);
+    if (status != B_OK)
+        return status;
+
+    status = position->MakeEmpty();
+    if (status != B_OK)
+        return status;
+
+    BClipboard clipboard(TERM_SIGNATURE);
+    if (!clipboard.Lock())
+        return B_ERROR;
+
+    while (true) {
+        BFile file;
+        status = _GetWindowPositionsFile (&file, B_READ_ONLY);
+        if (status == B_OK) {
+            status = position->Unflatten(&file);
+            if (status != B_OK)
+                break;;
+        }
+    
+        status = position->ReplaceRect((BString("rect_") << fWindowNumber).String(), frame);
+        if (status != B_OK) {
+            status = position->AddRect((BString("rect_") << fWindowNumber).String(), frame);
+            if (status != B_OK)
+                break;
+        }
+    
+        status = position->ReplaceInt32((BString("workspaces_") << fWindowNumber).String(), workspaces);
+        if (status != B_OK) {
+            status = position->AddInt32((BString("workspaces_") << fWindowNumber).String(), workspaces);
+            if (status != B_OK)
+                break;
+        }
+    
+        file.Unset();
+        status = _GetWindowPositionsFile (&file, B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE);
+        if (status != B_OK)
+            break;
+    
+        status = position->Flatten(&file);
+        break;
+    }
+
+    clipboard.Unlock();
+
+    return status;
+}
+
+
+status_t
+TermApp::_MakeTermWindow(BRect &frame, uint32 workspaces)
+{
     try {
-        fTermWindow = new TermWindow(frame, fWindowTitle.String(), fArgs);
+        fTermWindow = new TermWindow(frame, fWindowTitle.String(), workspaces, fArgs);
     } catch (int error) {
         return (status_t)error; 
     } catch (...) {

src/apps/terminal/TermConst.h

@@ -1 +1 @@
 /*
- * Copyright 2001-2008, Haiku.
+ * Copyright 2001-2009, Haiku.
  * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
  * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
  *
@@ -92 +92 @@
 const uint32 MSG_SET_TERMNAL_TITLE              = 'sett';
 const uint32 MSG_QUIT_TERMNAL                   = 'qutt';
 
+const uint32 MSG_SAVE_WINDOW_POSITION           = 'swps';
+
 // Preference Read/Write Keys
 const char* const PREF_HALF_FONT_FAMILY = "Half Font Family";
 const char* const PREF_HALF_FONT_STYLE = "Half Font Style";