Ticket #693: 693.diff

src/servers/app/Desktop.cpp

@@ -879 +879 @@
 
 
 /*!
+    Returns the virtual screen frame of the workspace specified by \a index.
+*/
+BRect
+Desktop::WorkspaceFrame(int32 index) const
+{
+    BRect frame;
+    if (index == fCurrentWorkspace)
+        frame = fVirtualScreen.Frame();
+    else if (index >= 0 && index < fSettings->WorkspacesCount()) {
+        BMessage screenData;
+        int32 width;
+        int32 height;
+        fSettings->WorkspacesMessage(index)->FindMessage("screen", &screenData);
+        if (screenData.FindInt32("width", &width) != B_OK || screenData.FindInt32("height", &height) != B_OK)
+            frame = fVirtualScreen.Frame();
+        else
+            frame.Set(0.0, 0.0, width - 1, height - 1);
+    }
+    return frame;
+}
+
+
+/*!
     Changes the current workspace to the one specified by \a index.
 */
 void
@@ -923 +946 @@
     int32 previousIndex = fCurrentWorkspace;
     rgb_color previousColor = fWorkspaces[fCurrentWorkspace].Color();
     bool movedMouseEventWindow = false;
+    display_mode previousMode, newMode;
+    fVirtualScreen.ScreenAt(0)->GetMode(&previousMode);
+    fVirtualScreen.RestoreConfiguration(*this, fSettings->WorkspacesMessage(index));
+    fVirtualScreen.ScreenAt(0)->GetMode(&newMode);
+    // We only need to invalidate the entire desktop if we changed display modes
+    if (memcmp(&previousMode, &newMode, sizeof(display_mode)))
+        ScreenChanged(fVirtualScreen.ScreenAt(0), false);
 
     if (fMouseEventWindow != NULL) {
         if (fMouseEventWindow->IsNormal()) {
@@ -1095 +1125 @@
     BRegion dirty(screen->Frame());
     // update our cached screen region
     fScreenRegion.Set(screen->Frame());
-
+    gInputManager->UpdateScreenBounds(screen->Frame());
+    
     BRegion background;
     _RebuildClippingForAllWindows(background);
 
@@ -1122 +1153 @@
     fVirtualScreen.UpdateFrame();
 
     if (makeDefault) {
+        StoreConfiguration(fCurrentWorkspace);
+    }
+}
+
+
+status_t
+Desktop::StoreConfiguration(int32 workspace)
+{
+    if (workspace >= 0 && workspace < fSettings->WorkspacesCount()) {
         // store settings
         BMessage settings;
         fVirtualScreen.StoreConfiguration(settings);
-        fWorkspaces[fCurrentWorkspace].StoreConfiguration(settings);
+        fWorkspaces[workspace].StoreConfiguration(settings);
 
-        fSettings->SetWorkspacesMessage(fCurrentWorkspace, settings);
+        fSettings->SetWorkspacesMessage(workspace, settings);
         fSettings->Save(kWorkspacesSettings);
+        return B_OK;
     }
+    
+    return B_BAD_VALUE;
 }
 
-
 //  #pragma mark - Methods for Window manipulation
 
 

src/servers/app/Desktop.h

@@ -91 +91 @@
         void                    GetLastMouseState(BPoint* position,
                                     int32* buttons) const;
                                     // for use by ServerWindow
-
         void                    ScreenChanged(Screen* screen, bool makeDefault);
-
         void                    ScreenRemoved(Screen* screen) {}
         void                    ScreenAdded(Screen* screen) {}
         bool                    ReleaseScreen(Screen* screen) { return false; }
+        status_t                StoreConfiguration(int32 workspace);
 
         const ::VirtualScreen&  VirtualScreen() const { return fVirtualScreen; }
         DrawingEngine*          GetDrawingEngine() const
@@ -113 +112 @@
         Workspace::Private&     WorkspaceAt(int32 index)
                                     { return fWorkspaces[index]; }
         status_t                SetWorkspacesCount(int32 newCount);
+        BRect                   WorkspaceFrame(int32 index) const;
 
         // Window methods
 

src/servers/app/Screen.cpp

@@ -22 +22 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-
 static float
 get_mode_frequency(const display_mode& mode)
 {
@@ -91 +90 @@
 status_t
 Screen::SetMode(const display_mode& mode, bool makeDefault)
 {
+    display_mode current;
+    GetMode(&current);
+    current.flags = mode.flags;
+    if (!memcmp(&mode, &current, sizeof(display_mode))) 
+        return B_OK;
+    
     gBitmapManager->SuspendOverlays();
 
     status_t status = fHWInterface->SetMode(mode);
@@ -162 +167 @@
             * mode.timing.v_total / 10 * int32(frequency * 10)) / 1000;
         adjusted = true;
     }
-
     status = SetMode(mode, false);
     if (status < B_OK && adjusted) {
         // try again with the unchanged mode

src/servers/app/ServerApp.cpp

@@ -2167 +2167 @@
             // 2) workspace index
             // 3) display_mode to set
             // 4) 'makeDefault' boolean
-            // TODO: See above: workspaces support, etc.
 
             screen_id id;
             link.Read<screen_id>(&id);
@@ -2183 +2182 @@
 
             if (status == B_OK && fDesktop->LockAllWindows()) {
                 display_mode oldMode;
-                fDesktop->ScreenAt(0)->GetMode(&oldMode);
-                if (memcmp(&oldMode, &mode, sizeof(display_mode))) {
-                    status = fDesktop->ScreenAt(0)->SetMode(mode, makeDefault);
-                    if (status == B_OK) {
-                        gInputManager->UpdateScreenBounds(fDesktop->ScreenAt(0)->Frame());
-                        fDesktop->ScreenChanged(fDesktop->ScreenAt(0), makeDefault);
-                    }
-                } else
-                    status = B_OK;
+                if (workspace == (uint32)fDesktop->CurrentWorkspace()) {
+                    fDesktop->ScreenAt(0)->GetMode(&oldMode);
+                    if (memcmp(&oldMode, &mode, sizeof(display_mode))) {
+                        status = fDesktop->ScreenAt(0)->SetMode(mode, makeDefault);
+                        if (status == B_OK) {
+                            fDesktop->ScreenChanged(fDesktop->ScreenAt(0), makeDefault);
+                        }
+                    } else
+                        status = B_OK;
+                } else {
+                    // this is perhaps not ideal - it assumes that if the 
+                    // workspace is not the active one, then pull the
+                    // configuration from active and store it to the specified 
+                    // workspace. This is safer since it's assumed that the
+                    // active workspace has a display mode that's usable,
+                    // but at the same time the API implies that you can set
+                    // a non-visible workspace to whatever mode you like
+                    // TODO: decide what to do here. 
+                    if (makeDefault)
+                        fDesktop->StoreConfiguration(workspace);
+                }
                 fDesktop->UnlockAllWindows();
             } else
                 status = B_ERROR;

src/servers/app/VirtualScreen.cpp

@@ -167 +167 @@
     fDrawingEngine = screen->GetDrawingEngine();
     fHWInterface = screen->HWInterface();
     fFrame = screen->Frame();
+    item->frame = fFrame;
 
     fScreenList.AddItem(item);
 

src/servers/app/WorkspacesView.cpp

@@ -80 +80 @@
 BRect
 WorkspacesView::_ScreenFrame(int32 i)
 {
-    return Window()->Desktop()->VirtualScreen().Frame();
+    return Window()->Desktop()->WorkspaceFrame(i);
 }
 
 

src/preferences/screen/ScreenWindow.cpp

@@ -246 +246 @@
     BMenuItem *item = new BMenuItem("Current Workspace",
         new BMessage(WORKSPACE_CHECK_MSG));
     
-    // TODO: since per workspace settings is unimplemented (Ticket #693)
-    //       we force the menu to "All Workspaces" for now
-    fAllWorkspacesItem->SetMarked(true);
-    item->SetEnabled(false);
-    
     popUpMenu->AddItem(item);
+    fAllWorkspacesItem->SetMarked(true);
 
     BMenuField* workspaceMenuField = new BMenuField(BRect(0, 0, 100, 15),
         "WorkspaceMenu", NULL, popUpMenu, true);
@@ -1008 +1004 @@
 void
 ScreenWindow::_CheckApplyEnabled()
 {
-    fApplyButton->SetEnabled(fSelected != fActive);
+    fApplyButton->SetEnabled(fSelected != fActive 
+        || fAllWorkspacesItem->IsMarked());
     fRevertButton->SetEnabled(count_workspaces() != fOriginalWorkspaceCount
         || fSelected != fOriginal);
 }