Ticket #8188: workspacesdiff1.2.patch

src/apps/workspaces/Workspaces.cpp

@@ -4 +4 @@
  * This file is distributed under the terms of the MIT License.
  *
  * Authors:
- *      François Revol, revol@free.fr
  *      Axel Dörfler, axeld@pinc-software.de
- *      Oliver "Madison" Kohl,
+ *      Daniel Devine, devine@ddevnet.net
+ *      Oliver "Madison" Kohl
  *      Matt Madia
+ *      François Revol, revol@free.fr
  */
 
 
@@ -21 +22 @@
 #include <FindDirectory.h>
 #include <Locale.h>
 #include <MenuItem.h>
+#include <new.h>
 #include <Path.h>
 #include <PopUpMenu.h>
 #include <Roster.h>
 #include <Screen.h>
 #include <TextView.h>
 #include <Window.h>
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -55 +56 @@
 static const uint32 kMsgToggleAlwaysOnTop = 'tgAT';
 static const uint32 kMsgToggleLiveInDeskbar = 'tgDb';
 
-static const float kScreenBorderOffset = 10.0;
 
 extern "C" _EXPORT BView* instantiate_deskbar_item();
 
@@ -71 +71 @@
         bool AlwaysOnTop() const { return fAlwaysOnTop; }
         bool HasTitle() const { return fHasTitle; }
         bool HasBorder() const { return fHasBorder; }
+        bool SettingsLoaded() const { return fLoaded; }
 
         void UpdateFramesForScreen(BRect screenFrame);
         void UpdateScreenFrame();
@@ -90 +91 @@
         bool    fAlwaysOnTop;
         bool    fHasTitle;
         bool    fHasBorder;
+        bool    fLoaded;
 };
 
 class WorkspacesView : public BView {
     public:
-        WorkspacesView(BRect frame, bool showDragger);
+        WorkspacesView(BRect frame, bool showDragger=true);
         WorkspacesView(BMessage* archive);
         ~WorkspacesView();
 
@@ -134 +136 @@
         virtual void MessageReceived(BMessage *msg);
         virtual bool QuitRequested();
 
-        void SetAutoRaise(bool enable);
-        bool IsAutoRaising() const { return fAutoRaising; }
+        void SetAutoRaising(bool enable);
+        bool IsAutoRaising() const { return fSettings->AutoRaising(); }
+        bool HasTitle() const { return fSettings->HasTitle(); }
+        float GetTabHeight() const { return fTabHeight; }
+        float GetBorderWidth() const { return fBorderWidth; }
+        float GetScreenBorderOffset() const { return 2.0 * fBorderWidth; }
 
     private:
         WorkspacesSettings *fSettings;
-        bool    fAutoRaising;
+        float   fTabHeight;
+        float   fBorderWidth;
 };
 
 class WorkspacesApp : public BApplication {
@@ -167 +174 @@
 {
     UpdateScreenFrame();
 
-    bool loaded = false;
     BScreen screen;
-
+    BPath path;
     BFile file;
+    
     if (_Open(file, B_READ_ONLY) == B_OK) {
         BMessage settings;
         if (settings.Unflatten(&file) == B_OK) {
             if (settings.FindRect("window", &fWindowFrame) == B_OK
-                && settings.FindRect("screen", &fScreenFrame) == B_OK)
-                loaded = true;
+                && settings.FindRect("screen", &fScreenFrame) == B_OK){
+                fLoaded = true;
+            }
 
             settings.FindBool("auto-raise", &fAutoRaising);
             settings.FindBool("always on top", &fAlwaysOnTop);
@@ -187 +195 @@
                 fHasBorder = true;
         }
     } else {
-        // try reading BeOS compatible settings
-        BPath path;
-        if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
+        if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK ) {
+            // try reading BeOS compatible settings
             path.Append(kOldSettingFile);
             BFile file(path.Path(), B_READ_ONLY);
-            if (file.InitCheck() == B_OK
+            if (file.InitCheck() == B_OK 
                 && file.Read(&fWindowFrame, sizeof(BRect)) == sizeof(BRect)) {
                 // we now also store the frame of the screen to know
                 // in which context the window frame has been chosen
@@ -201 +208 @@
                     fScreenFrame = frame;
                 else
                     fScreenFrame = screen.Frame();
-
-                loaded = true;
+                fLoaded = true;
             }
         }
     }
 
-    if (loaded) {
-        // if the current screen frame is different from the one
+    if (fLoaded) {
+        // If the current screen frame is different from the one
         // just loaded, we need to alter the window frame accordingly
         if (fScreenFrame != screen.Frame())
             UpdateFramesForScreen(screen.Frame());
     }
-
-    if (!loaded
-        || !(screen.Frame().right + 5 >= fWindowFrame.right
-            && screen.Frame().bottom + 5 >= fWindowFrame.bottom
-            && screen.Frame().left - 5 <= fWindowFrame.left
-            && screen.Frame().top - 5 <= fWindowFrame.top)) {
-        // set to some usable defaults
-        float screenWidth = screen.Frame().Width();
-        float screenHeight = screen.Frame().Height();
-        float aspectRatio = screenWidth / screenHeight;
-
-        uint32 columns, rows;
-        BPrivate::get_workspaces_layout(&columns, &rows);
-
-        // default size of ~1/10 of screen width
-        float workspaceWidth = screenWidth / 10;
-        float workspaceHeight = workspaceWidth / aspectRatio;
-
-        float width = floor(workspaceWidth * columns);
-        float height = floor(workspaceHeight * rows);
-
-        float tabHeight = 20;
-            // TODO: find tabHeight without being a window
-
-        // shrink to fit more
-        while (width + 2 * kScreenBorderOffset > screenWidth
-            || height + 2 * kScreenBorderOffset + tabHeight > screenHeight) {
-            width = floor(0.95 * width);
-            height = floor(0.95 * height);
-        }
-
-        fWindowFrame = fScreenFrame;
-        fWindowFrame.OffsetBy(-kScreenBorderOffset, -kScreenBorderOffset);
-        fWindowFrame.left = fWindowFrame.right - width;
-        fWindowFrame.top = fWindowFrame.bottom - height;
-    }
 }
 
 
@@ -260 +230 @@
         return;
 
     BMessage settings('wksp');
-
+    
     if (settings.AddRect("window", fWindowFrame) == B_OK
         && settings.AddRect("screen", fScreenFrame) == B_OK
         && settings.AddBool("auto-raise", fAutoRaising) == B_OK
@@ -268 +238 @@
         && settings.AddBool("has title", fHasTitle) == B_OK
         && settings.AddBool("has border", fHasBorder) == B_OK)
         settings.Flatten(&file);
+    else
+        fprintf(stderr,"An error occured while saving settings.\n");
 }
 
 
@@ -297 +269 @@
 
 void
 WorkspacesSettings::UpdateFramesForScreen(BRect newScreenFrame)
-{
+{   
     // don't change the position if the screen frame hasn't changed
     if (newScreenFrame == fScreenFrame)
         return;
@@ -313 +285 @@
         fWindowFrame.OffsetTo(fWindowFrame.left,
             newScreenFrame.bottom - (fScreenFrame.bottom - fWindowFrame.top));
     }
-
     fScreenFrame = newScreenFrame;
 }
 
@@ -336 +307 @@
 //  #pragma mark -
 
 
-WorkspacesView::WorkspacesView(BRect frame, bool showDragger=true)
+WorkspacesView::WorkspacesView(BRect frame, bool showDragger)
     :
     BView(frame, kDeskbarItemName, B_FOLLOW_ALL,
-        kWorkspacesViewFlag | B_FRAME_EVENTS),
-    fParentWhichDrawsOnChildren(NULL),
+        kWorkspacesViewFlag | B_FRAME_EVENTS),    // kWorkspacesViewFlag is picked up by the app_server.
+    fParentWhichDrawsOnChildren(NULL),            // ...That's how the desktop frames are done!
     fCurrentFrame(frame)
 {
     if(showDragger) {
@@ -380 +351 @@
     if (!validate_instantiation(archive, "WorkspacesView"))
         return NULL;
 
-    return new WorkspacesView(archive);
+    return new(std::nothrow) WorkspacesView(archive);
 }
 
 
@@ -388 +359 @@
 WorkspacesView::Archive(BMessage* archive, bool deep) const
 {
     status_t status = BView::Archive(archive, deep);
-    if (status == B_OK)
-        status = archive->AddString("add_on", kSignature);
-    if (status == B_OK)
-        status = archive->AddString("class", "WorkspacesView");
-
     return status;
 }
 
@@ -420 +386 @@
     font.SetFace(B_BOLD_FACE);
     view->SetFontAndColor(0, 10, &font);
 
-    alert->Go();
+    alert->Go(NULL);
 }
 
 
@@ -511 +477 @@
             // since HasItem() locks up we just remove directly.
             BDeskbar deskbar;
             // we shouldn't do this here actually, but it works for now...
-            deskbar.RemoveItem (kDeskbarItemName);
+            deskbar.RemoveItem(kDeskbarItemName);
             break;
         }
 
@@ -534 +500 @@
 
     where = ConvertToScreen(where);
     BScreen screen(window);
-    BRect frame = screen.Frame();
-    if (where.x == frame.left || where.x == frame.right
-        || where.y == frame.top || where.y == frame.bottom) {
-        // cursor is on screen edge
-        if (window->Frame().Contains(where))
+    BRect screenFrame = screen.Frame();
+    BRect windowFrame = window->Frame();
+    float tabHeight = window->GetTabHeight();
+    float borderWidth = window->GetBorderWidth();
+    
+    // cursor is on screen edge
+    if (where.x == screenFrame.left || where.x == screenFrame.right
+        || where.y == screenFrame.top || where.y == screenFrame.bottom) {
+            
+        if (!window->HasTitle())
+            tabHeight = 0;
+        
+        // Stretch frame so that it may meet the edge of the screen.
+        windowFrame.InsetBy(-borderWidth,-(tabHeight + borderWidth));
+        
+        if (windowFrame.Contains(where))
             window->Activate();
     }
 }
@@ -642 +619 @@
     BWindow(settings->WindowFrame(), B_TRANSLATE_SYSTEM_NAME("Workspaces"), 
         B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
         B_AVOID_FRONT | B_WILL_ACCEPT_FIRST_CLICK, B_ALL_WORKSPACES),
-    fSettings(settings),
-    fAutoRaising(false)
+    fSettings(settings)
 {
     AddChild(new WorkspacesView(Bounds()));
+    
+    // Turn window decor on to grab decor widths.
+    BMessage windowSettings;
+    SetLook(B_TITLED_WINDOW_LOOK);
+    if (GetDecoratorSettings(&windowSettings) == B_OK){
+        BRect tabFrame = windowSettings.FindRect("tab frame");
+        float borderWidth = windowSettings.FindFloat("border width");
+        fTabHeight = tabFrame.Height();
+        fBorderWidth = borderWidth;
+        
+        // NOTE: Below is based on old code from WorkspacesSettings::WorkspacesSettings(). 
+        // Decorator dimensions are dynamically called and set instead of hardcoded here.
+        
+        // TODO: refresh tab height and border width variables if decor is changed. 
+        
+        BScreen screen;
+        
+        float screenWidth = screen.Frame().Width();
+        float screenHeight = screen.Frame().Height();
+        float aspectRatio = screenWidth / screenHeight;
+
+        uint32 columns, rows;
+        BPrivate::get_workspaces_layout(&columns, &rows);
+
+        // default size of ~1/10 of screen width
+        float workspaceWidth = screenWidth / 10;
+        float workspaceHeight = workspaceWidth / aspectRatio;
+
+        float width = floor(workspaceWidth * columns);
+        float height = floor(workspaceHeight * rows);
+        
+        // If you have too many workspaces to fit on the screen, shrink until they fit.
+        while (width + 2 * borderWidth > screenWidth
+            || height + 2 * borderWidth + GetTabHeight() > screenHeight) {
+            width = floor(0.95 * width);
+            height = floor(0.95 * height);
+        }
+        
+        BRect windowFrame = fSettings->WindowFrame();
+        BRect frame;
+        
+        // If we don't have settings loaded or decorator/screen dimensions changed, load defaults.
+        if (!fSettings->SettingsLoaded() || fSettings->ScreenFrame() != screen.Frame()) {
+            frame = fSettings->ScreenFrame();
+            frame.left = frame.right - width;
+            frame.top = frame.bottom - height;
+            ResizeTo(frame.Width(), frame.Height());
+            // Put it in bottom corner by default.
+            MoveTo(screenWidth - frame.Width() - borderWidth, 
+                    screenHeight - frame.Height() - borderWidth);
+        } else {
+            frame = windowFrame;    
+        }
+        fSettings->SetWindowFrame(frame);
+    }
 
     if (!fSettings->HasBorder())
         SetLook(B_NO_BORDER_WINDOW_LOOK);
@@ -655 +686 @@
     if (fSettings->AlwaysOnTop())
         SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
     else
-        SetAutoRaise(fSettings->AutoRaising());
+        SetAutoRaising(fSettings->AutoRaising());
 }
 
 
@@ -685 +716 @@
 {
     if (!modifiers() & B_SHIFT_KEY) {
         BWindow::FrameResized(width, height);
+        fSettings->SetWindowFrame(Frame());
         return;
     }
-
+    // This is only run if you are trying to keep the aspect ratio.
     uint32 columns, rows;
     BPrivate::get_workspaces_layout(&columns, &rows);
 
@@ -724 +756 @@
     width = floor(workspaceWidth * columns);
     height = floor(workspaceHeight * rows);
 
-    float tabHeight = Frame().top - DecoratorFrame().top;
-
-    while (width + 2 * kScreenBorderOffset > screenWidth
-        || height + 2 * kScreenBorderOffset + tabHeight > screenHeight) {
+    while (width + 2 * GetScreenBorderOffset() > screenWidth
+        || height + 2 * GetScreenBorderOffset() + GetTabHeight() > screenHeight) {
         width = floor(0.95 * width);
         height = floor(0.95 * height);
     }
@@ -735 +765 @@
     ResizeTo(width, height);
 
     origin = screen.Frame().RightBottom();
-    origin.x -= kScreenBorderOffset + width;
-    origin.y -= kScreenBorderOffset + height;
+    origin.x -= GetScreenBorderOffset() + width;
+    origin.y -= GetScreenBorderOffset() + height;
 
     MoveTo(origin);
 }
@@ -797 +827 @@
         }
 
         case kMsgToggleAutoRaise:
-            SetAutoRaise(!IsAutoRaising());
+            SetAutoRaising(!IsAutoRaising());
             SetFeel(B_NORMAL_WINDOW_FEEL);
             break;
 
@@ -845 +875 @@
 
 
 void
-WorkspacesWindow::SetAutoRaise(bool enable)
+WorkspacesWindow::SetAutoRaising(bool enable)
 {
-    if (enable == fAutoRaising)
+    if (enable == IsAutoRaising())
         return;
 
-    fAutoRaising = enable;
     fSettings->SetAutoRaising(enable);
 
     if (enable)
@@ -923 +952 @@
             else if (!strcmp(argv[i], "--alwaysontop"))
                 fWindow->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
             else if (!strcmp(argv[i], "--autoraise"))
-                fWindow->SetAutoRaise(true);
+                fWindow->SetAutoRaising(true);
             else {
                 const char *programName = strrchr(argv[0], '/');
                 programName = programName ? programName + 1 : argv[0];