From bba6f48d645fb24c509f4a8c8da4886f074513dc Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Tue, 17 Aug 2010 23:44:30 +0000 Subject: [PATCH] Add Notify* prefix to DesktopObservable hooks. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38218 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/Desktop.cpp | 37 +++++++++++++++-------------- src/servers/app/DesktopListener.cpp | 30 ++++++++++++----------- src/servers/app/DesktopListener.h | 30 ++++++++++++----------- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp index 0f2551c27a..bcb1829254 100644 --- a/src/servers/app/Desktop.cpp +++ b/src/servers/app/Desktop.cpp @@ -251,21 +251,21 @@ MouseFilter::Filter(BMessage* message, EventTarget** _target, int32* _viewToken, switch (message->what) { case B_MOUSE_DOWN: window->MouseDown(message, where, &viewToken); - fDesktop->MouseDown(window, message, where); + fDesktop->NotifyMouseDown(window, message, where); break; case B_MOUSE_UP: window->MouseUp(message, where, &viewToken); if (buttons == 0) fDesktop->SetMouseEventWindow(NULL); - fDesktop->MouseUp(window, message, where); + fDesktop->NotifyMouseUp(window, message, where); break; case B_MOUSE_MOVED: window->MouseMoved(message, where, &viewToken, latestMouseMoved == NULL || latestMouseMoved == message, false); - fDesktop->MouseMoved(window, message, where); + fDesktop->NotifyMouseMoved(window, message, where); break; } @@ -287,7 +287,7 @@ MouseFilter::Filter(BMessage* message, EventTarget** _target, int32* _viewToken, fDesktop->SetLastMouseState(where, buttons, window); - fDesktop->MouseEvent(message); + fDesktop->NotifyMouseEvent(message); fDesktop->UnlockAllWindows(); @@ -492,7 +492,7 @@ Desktop::BroadcastToAllWindows(int32 code) void Desktop::KeyEvent(uint32 what, int32 key, int32 modifiers) { - KeyPressed(what, key, modifiers); + NotifyKeyPressed(what, key, modifiers); } @@ -921,7 +921,7 @@ Desktop::ActivateWindow(Window* window) AutoWriteLocker _(fWindowLock); - WindowActitvated(window); + NotifyWindowActitvated(window); bool windowOnOtherWorkspace = !window->InWorkspace(fCurrentWorkspace); if (windowOnOtherWorkspace @@ -1076,7 +1076,7 @@ Desktop::SendWindowBehind(Window* window, Window* behindOf) _WindowChanged(window); - WindowSentBehind(window, behindOf); + NotifyWindowSentBehind(window, behindOf); UnlockAllWindows(); @@ -1190,11 +1190,11 @@ Desktop::MinimizeWindow(Window* window, bool minimize) if (minimize && !window->IsHidden()) { HideWindow(window); window->SetMinimized(minimize); - WindowMinimized(window, minimize); + NotifyWindowMinimized(window, minimize); } else if (!minimize && window->IsHidden()) { ActivateWindow(window); // this will unminimize the window for us - WindowMinimized(window, minimize); + NotifyWindowMinimized(window, minimize); } UnlockAllWindows(); @@ -1225,7 +1225,7 @@ Desktop::MoveWindowBy(Window* window, float x, float y, int32 workspace) } else window->MoveBy((int32)x, (int32)y); - WindowMoved(window); + NotifyWindowMoved(window); UnlockAllWindows(); return; } @@ -1280,7 +1280,7 @@ Desktop::MoveWindowBy(Window* window, float x, float y, int32 workspace) B_DIRECT_START | B_BUFFER_MOVED | B_CLIPPING_MODIFIED); } - WindowMoved(window); + NotifyWindowMoved(window); UnlockAllWindows(); } @@ -1297,7 +1297,7 @@ Desktop::ResizeWindowBy(Window* window, float x, float y) if (!window->IsVisible()) { window->ResizeBy((int32)x, (int32)y, NULL); - WindowResized(window); + NotifyWindowResized(window); UnlockAllWindows(); return; } @@ -1340,7 +1340,7 @@ Desktop::ResizeWindowBy(Window* window, float x, float y) B_DIRECT_START | B_BUFFER_RESIZED | B_CLIPPING_MODIFIED); } - WindowResized(window); + NotifyWindowResized(window); UnlockAllWindows(); } @@ -1356,7 +1356,7 @@ Desktop::SetWindowTabLocation(Window* window, float location) if (changed) RebuildAndRedrawAfterWindowChange(window, dirty); - WindowTabLocationChanged(window, location); + NotifyWindowTabLocationChanged(window, location); return changed; } @@ -1417,7 +1417,7 @@ Desktop::AddWindow(Window *window) _ChangeWindowWorkspaces(window, 0, window->Workspaces()); - WindowAdded(window); + NotifyWindowAdded(window); UnlockAllWindows(); } @@ -1437,7 +1437,7 @@ Desktop::RemoveWindow(Window *window) _ChangeWindowWorkspaces(window, window->Workspaces(), 0); - WindowRemoved(window); + NotifyWindowRemoved(window); UnlockAllWindows(); @@ -2834,7 +2834,7 @@ Desktop::_ChangeWindowWorkspaces(Window* window, uint32 oldWorkspaces, // take care about modals and floating windows _UpdateSubsetWorkspaces(window); - WindowWorkspacesChanged(window, newWorkspaces); + NotifyWindowWorkspacesChanged(window, newWorkspaces); UnlockAllWindows(); } @@ -3239,7 +3239,8 @@ Desktop::_SetWorkspace(int32 index, bool moveFocusWindow) // send B_WORKSPACES_CHANGED message movedWindow->WorkspacesChanged(oldWorkspaces, movedWindow->Workspaces()); - WindowWorkspacesChanged(movedWindow, movedWindow->Workspaces()); + NotifyWindowWorkspacesChanged(movedWindow, + movedWindow->Workspaces()); } else { // make sure it's frontmost _Windows(index).RemoveWindow(movedWindow); diff --git a/src/servers/app/DesktopListener.cpp b/src/servers/app/DesktopListener.cpp index 1956f40e2b..e7028b7d43 100644 --- a/src/servers/app/DesktopListener.cpp +++ b/src/servers/app/DesktopListener.cpp @@ -66,7 +66,7 @@ DesktopObservable::MessageForListener(Window* sender, void -DesktopObservable::WindowAdded(Window* window) +DesktopObservable::NotifyWindowAdded(Window* window) { if (fWeAreInvoking) return; @@ -79,7 +79,7 @@ DesktopObservable::WindowAdded(Window* window) void -DesktopObservable::WindowRemoved(Window* window) +DesktopObservable::NotifyWindowRemoved(Window* window) { if (fWeAreInvoking) return; @@ -92,7 +92,7 @@ DesktopObservable::WindowRemoved(Window* window) void -DesktopObservable::KeyPressed(uint32 what, int32 key, int32 modifiers) +DesktopObservable::NotifyKeyPressed(uint32 what, int32 key, int32 modifiers) { if (fWeAreInvoking) return; @@ -105,7 +105,7 @@ DesktopObservable::KeyPressed(uint32 what, int32 key, int32 modifiers) void -DesktopObservable::MouseEvent(BMessage* message) +DesktopObservable::NotifyMouseEvent(BMessage* message) { if (fWeAreInvoking) return; @@ -118,7 +118,7 @@ DesktopObservable::MouseEvent(BMessage* message) void -DesktopObservable::MouseDown(Window* window, BMessage* message, +DesktopObservable::NotifyMouseDown(Window* window, BMessage* message, const BPoint& where) { if (fWeAreInvoking) @@ -132,7 +132,7 @@ DesktopObservable::MouseDown(Window* window, BMessage* message, void -DesktopObservable::MouseUp(Window* window, BMessage* message, +DesktopObservable::NotifyMouseUp(Window* window, BMessage* message, const BPoint& where) { if (fWeAreInvoking) @@ -146,7 +146,7 @@ DesktopObservable::MouseUp(Window* window, BMessage* message, void -DesktopObservable::MouseMoved(Window* window, BMessage* message, +DesktopObservable::NotifyMouseMoved(Window* window, BMessage* message, const BPoint& where) { if (fWeAreInvoking) @@ -160,7 +160,7 @@ DesktopObservable::MouseMoved(Window* window, BMessage* message, void -DesktopObservable::WindowMoved(Window* window) +DesktopObservable::NotifyWindowMoved(Window* window) { if (fWeAreInvoking) return; @@ -173,7 +173,7 @@ DesktopObservable::WindowMoved(Window* window) void -DesktopObservable::WindowResized(Window* window) +DesktopObservable::NotifyWindowResized(Window* window) { if (fWeAreInvoking) return; @@ -186,7 +186,7 @@ DesktopObservable::WindowResized(Window* window) void -DesktopObservable::WindowActitvated(Window* window) +DesktopObservable::NotifyWindowActitvated(Window* window) { if (fWeAreInvoking) return; @@ -199,7 +199,7 @@ DesktopObservable::WindowActitvated(Window* window) void -DesktopObservable::WindowSentBehind(Window* window, Window* behindOf) +DesktopObservable::NotifyWindowSentBehind(Window* window, Window* behindOf) { if (fWeAreInvoking) return; @@ -212,7 +212,8 @@ DesktopObservable::WindowSentBehind(Window* window, Window* behindOf) void -DesktopObservable::WindowWorkspacesChanged(Window* window, uint32 workspaces) +DesktopObservable::NotifyWindowWorkspacesChanged(Window* window, + uint32 workspaces) { if (fWeAreInvoking) return; @@ -225,7 +226,7 @@ DesktopObservable::WindowWorkspacesChanged(Window* window, uint32 workspaces) void -DesktopObservable::WindowMinimized(Window* window, bool minimize) +DesktopObservable::NotifyWindowMinimized(Window* window, bool minimize) { if (fWeAreInvoking) return; @@ -238,7 +239,8 @@ DesktopObservable::WindowMinimized(Window* window, bool minimize) void -DesktopObservable::WindowTabLocationChanged(Window* window, float location) +DesktopObservable::NotifyWindowTabLocationChanged(Window* window, + float location) { if (fWeAreInvoking) return; diff --git a/src/servers/app/DesktopListener.h b/src/servers/app/DesktopListener.h index f99412c877..c2487a7554 100644 --- a/src/servers/app/DesktopListener.h +++ b/src/servers/app/DesktopListener.h @@ -81,28 +81,30 @@ public: bool MessageForListener(Window* sender, BPrivate::ServerLink& link); - void WindowAdded(Window* window); - void WindowRemoved(Window* window); + void NotifyWindowAdded(Window* window); + void NotifyWindowRemoved(Window* window); - void KeyPressed(uint32 what, int32 key, + void NotifyKeyPressed(uint32 what, int32 key, int32 modifiers); - void MouseEvent(BMessage* message); - void MouseDown(Window* window, BMessage* message, + void NotifyMouseEvent(BMessage* message); + void NotifyMouseDown(Window* window, BMessage* message, const BPoint& where); - void MouseUp(Window* window, BMessage* message, + void NotifyMouseUp(Window* window, BMessage* message, const BPoint& where); - void MouseMoved(Window* window, BMessage* message, + void NotifyMouseMoved(Window* window, BMessage* message, const BPoint& where); - void WindowMoved(Window* window); - void WindowResized(Window* window); - void WindowActitvated(Window* window); - void WindowSentBehind(Window* window, Window* behindOf); - void WindowWorkspacesChanged(Window* window, + void NotifyWindowMoved(Window* window); + void NotifyWindowResized(Window* window); + void NotifyWindowActitvated(Window* window); + void NotifyWindowSentBehind(Window* window, + Window* behindOf); + void NotifyWindowWorkspacesChanged(Window* window, uint32 workspaces); - void WindowMinimized(Window* window, bool minimize); + void NotifyWindowMinimized(Window* window, + bool minimize); - void WindowTabLocationChanged(Window* window, + void NotifyWindowTabLocationChanged(Window* window, float location); bool SetDecoratorSettings(Window* window,