i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Notify* prefix to DesktopObservable hooks.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38218 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-08-17 23:44:30 +00:00
parent c0eff34541
commit bba6f48d64
3 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/Desktop.cpp
+19 -18
View File
@@ -251,21 +251,21 @@ MouseFilter::Filter(BMessage* message, EventTarget** _target, int32* _viewToken,
switch (message->what) { switch (message->what) {
case B_MOUSE_DOWN: case B_MOUSE_DOWN:
window->MouseDown(message, where, &viewToken); window->MouseDown(message, where, &viewToken);
fDesktop->MouseDown(window, message, where); fDesktop->NotifyMouseDown(window, message, where);
break; break;
case B_MOUSE_UP: case B_MOUSE_UP:
window->MouseUp(message, where, &viewToken); window->MouseUp(message, where, &viewToken);
if (buttons == 0) if (buttons == 0)
fDesktop->SetMouseEventWindow(NULL); fDesktop->SetMouseEventWindow(NULL);
fDesktop->MouseUp(window, message, where); fDesktop->NotifyMouseUp(window, message, where);
break; break;
case B_MOUSE_MOVED: case B_MOUSE_MOVED:
window->MouseMoved(message, where, &viewToken, window->MouseMoved(message, where, &viewToken,
latestMouseMoved == NULL || latestMouseMoved == message, latestMouseMoved == NULL || latestMouseMoved == message,
false); false);
fDesktop->MouseMoved(window, message, where); fDesktop->NotifyMouseMoved(window, message, where);
break; break;
} }
@@ -287,7 +287,7 @@ MouseFilter::Filter(BMessage* message, EventTarget** _target, int32* _viewToken,
fDesktop->SetLastMouseState(where, buttons, window); fDesktop->SetLastMouseState(where, buttons, window);
fDesktop->MouseEvent(message); fDesktop->NotifyMouseEvent(message);
fDesktop->UnlockAllWindows(); fDesktop->UnlockAllWindows();
@@ -492,7 +492,7 @@ Desktop::BroadcastToAllWindows(int32 code)
void void
Desktop::KeyEvent(uint32 what, int32 key, int32 modifiers) 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); AutoWriteLocker _(fWindowLock);
WindowActitvated(window); NotifyWindowActitvated(window);
bool windowOnOtherWorkspace = !window->InWorkspace(fCurrentWorkspace); bool windowOnOtherWorkspace = !window->InWorkspace(fCurrentWorkspace);
if (windowOnOtherWorkspace if (windowOnOtherWorkspace
@@ -1076,7 +1076,7 @@ Desktop::SendWindowBehind(Window* window, Window* behindOf)
_WindowChanged(window); _WindowChanged(window);
WindowSentBehind(window, behindOf); NotifyWindowSentBehind(window, behindOf);
UnlockAllWindows(); UnlockAllWindows();
@@ -1190,11 +1190,11 @@ Desktop::MinimizeWindow(Window* window, bool minimize)
if (minimize && !window->IsHidden()) { if (minimize && !window->IsHidden()) {
HideWindow(window); HideWindow(window);
window->SetMinimized(minimize); window->SetMinimized(minimize);
WindowMinimized(window, minimize); NotifyWindowMinimized(window, minimize);
} else if (!minimize && window->IsHidden()) { } else if (!minimize && window->IsHidden()) {
ActivateWindow(window); ActivateWindow(window);
// this will unminimize the window for us // this will unminimize the window for us
WindowMinimized(window, minimize); NotifyWindowMinimized(window, minimize);
} }
UnlockAllWindows(); UnlockAllWindows();
@@ -1225,7 +1225,7 @@ Desktop::MoveWindowBy(Window* window, float x, float y, int32 workspace)
} else } else
window->MoveBy((int32)x, (int32)y); window->MoveBy((int32)x, (int32)y);
WindowMoved(window); NotifyWindowMoved(window);
UnlockAllWindows(); UnlockAllWindows();
return; return;
} }
@@ -1280,7 +1280,7 @@ Desktop::MoveWindowBy(Window* window, float x, float y, int32 workspace)
B_DIRECT_START | B_BUFFER_MOVED | B_CLIPPING_MODIFIED); B_DIRECT_START | B_BUFFER_MOVED | B_CLIPPING_MODIFIED);
} }
WindowMoved(window); NotifyWindowMoved(window);
UnlockAllWindows(); UnlockAllWindows();
} }
@@ -1297,7 +1297,7 @@ Desktop::ResizeWindowBy(Window* window, float x, float y)
if (!window->IsVisible()) { if (!window->IsVisible()) {
window->ResizeBy((int32)x, (int32)y, NULL); window->ResizeBy((int32)x, (int32)y, NULL);
WindowResized(window); NotifyWindowResized(window);
UnlockAllWindows(); UnlockAllWindows();
return; return;
} }
@@ -1340,7 +1340,7 @@ Desktop::ResizeWindowBy(Window* window, float x, float y)
B_DIRECT_START | B_BUFFER_RESIZED | B_CLIPPING_MODIFIED); B_DIRECT_START | B_BUFFER_RESIZED | B_CLIPPING_MODIFIED);
} }
WindowResized(window); NotifyWindowResized(window);
UnlockAllWindows(); UnlockAllWindows();
} }
@@ -1356,7 +1356,7 @@ Desktop::SetWindowTabLocation(Window* window, float location)
if (changed) if (changed)
RebuildAndRedrawAfterWindowChange(window, dirty); RebuildAndRedrawAfterWindowChange(window, dirty);
WindowTabLocationChanged(window, location); NotifyWindowTabLocationChanged(window, location);
return changed; return changed;
} }
@@ -1417,7 +1417,7 @@ Desktop::AddWindow(Window *window)
_ChangeWindowWorkspaces(window, 0, window->Workspaces()); _ChangeWindowWorkspaces(window, 0, window->Workspaces());
WindowAdded(window); NotifyWindowAdded(window);
UnlockAllWindows(); UnlockAllWindows();
} }
@@ -1437,7 +1437,7 @@ Desktop::RemoveWindow(Window *window)
_ChangeWindowWorkspaces(window, window->Workspaces(), 0); _ChangeWindowWorkspaces(window, window->Workspaces(), 0);
WindowRemoved(window); NotifyWindowRemoved(window);
UnlockAllWindows(); UnlockAllWindows();
@@ -2834,7 +2834,7 @@ Desktop::_ChangeWindowWorkspaces(Window* window, uint32 oldWorkspaces,
// take care about modals and floating windows // take care about modals and floating windows
_UpdateSubsetWorkspaces(window); _UpdateSubsetWorkspaces(window);
WindowWorkspacesChanged(window, newWorkspaces); NotifyWindowWorkspacesChanged(window, newWorkspaces);
UnlockAllWindows(); UnlockAllWindows();
} }
@@ -3239,7 +3239,8 @@ Desktop::_SetWorkspace(int32 index, bool moveFocusWindow)
// send B_WORKSPACES_CHANGED message // send B_WORKSPACES_CHANGED message
movedWindow->WorkspacesChanged(oldWorkspaces, movedWindow->WorkspacesChanged(oldWorkspaces,
movedWindow->Workspaces()); movedWindow->Workspaces());
WindowWorkspacesChanged(movedWindow, movedWindow->Workspaces()); NotifyWindowWorkspacesChanged(movedWindow,
movedWindow->Workspaces());
} else { } else {
// make sure it's frontmost // make sure it's frontmost
_Windows(index).RemoveWindow(movedWindow); _Windows(index).RemoveWindow(movedWindow);
src/servers/app/DesktopListener.cpp
+16 -14
View File
@@ -66,7 +66,7 @@ DesktopObservable::MessageForListener(Window* sender,
void void
DesktopObservable::WindowAdded(Window* window) DesktopObservable::NotifyWindowAdded(Window* window)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -79,7 +79,7 @@ DesktopObservable::WindowAdded(Window* window)
void void
DesktopObservable::WindowRemoved(Window* window) DesktopObservable::NotifyWindowRemoved(Window* window)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -92,7 +92,7 @@ DesktopObservable::WindowRemoved(Window* window)
void void
DesktopObservable::KeyPressed(uint32 what, int32 key, int32 modifiers) DesktopObservable::NotifyKeyPressed(uint32 what, int32 key, int32 modifiers)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -105,7 +105,7 @@ DesktopObservable::KeyPressed(uint32 what, int32 key, int32 modifiers)
void void
DesktopObservable::MouseEvent(BMessage* message) DesktopObservable::NotifyMouseEvent(BMessage* message)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -118,7 +118,7 @@ DesktopObservable::MouseEvent(BMessage* message)
void void
DesktopObservable::MouseDown(Window* window, BMessage* message, DesktopObservable::NotifyMouseDown(Window* window, BMessage* message,
const BPoint& where) const BPoint& where)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
@@ -132,7 +132,7 @@ DesktopObservable::MouseDown(Window* window, BMessage* message,
void void
DesktopObservable::MouseUp(Window* window, BMessage* message, DesktopObservable::NotifyMouseUp(Window* window, BMessage* message,
const BPoint& where) const BPoint& where)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
@@ -146,7 +146,7 @@ DesktopObservable::MouseUp(Window* window, BMessage* message,
void void
DesktopObservable::MouseMoved(Window* window, BMessage* message, DesktopObservable::NotifyMouseMoved(Window* window, BMessage* message,
const BPoint& where) const BPoint& where)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
@@ -160,7 +160,7 @@ DesktopObservable::MouseMoved(Window* window, BMessage* message,
void void
DesktopObservable::WindowMoved(Window* window) DesktopObservable::NotifyWindowMoved(Window* window)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -173,7 +173,7 @@ DesktopObservable::WindowMoved(Window* window)
void void
DesktopObservable::WindowResized(Window* window) DesktopObservable::NotifyWindowResized(Window* window)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -186,7 +186,7 @@ DesktopObservable::WindowResized(Window* window)
void void
DesktopObservable::WindowActitvated(Window* window) DesktopObservable::NotifyWindowActitvated(Window* window)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -199,7 +199,7 @@ DesktopObservable::WindowActitvated(Window* window)
void void
DesktopObservable::WindowSentBehind(Window* window, Window* behindOf) DesktopObservable::NotifyWindowSentBehind(Window* window, Window* behindOf)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -212,7 +212,8 @@ DesktopObservable::WindowSentBehind(Window* window, Window* behindOf)
void void
DesktopObservable::WindowWorkspacesChanged(Window* window, uint32 workspaces) DesktopObservable::NotifyWindowWorkspacesChanged(Window* window,
uint32 workspaces)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -225,7 +226,7 @@ DesktopObservable::WindowWorkspacesChanged(Window* window, uint32 workspaces)
void void
DesktopObservable::WindowMinimized(Window* window, bool minimize) DesktopObservable::NotifyWindowMinimized(Window* window, bool minimize)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
@@ -238,7 +239,8 @@ DesktopObservable::WindowMinimized(Window* window, bool minimize)
void void
DesktopObservable::WindowTabLocationChanged(Window* window, float location) DesktopObservable::NotifyWindowTabLocationChanged(Window* window,
float location)
{ {
if (fWeAreInvoking) if (fWeAreInvoking)
return; return;
src/servers/app/DesktopListener.h
+16 -14
View File
@@ -81,28 +81,30 @@ public:
bool MessageForListener(Window* sender, bool MessageForListener(Window* sender,
BPrivate::ServerLink& link); BPrivate::ServerLink& link);
void WindowAdded(Window* window); void NotifyWindowAdded(Window* window);
void WindowRemoved(Window* window); void NotifyWindowRemoved(Window* window);
void KeyPressed(uint32 what, int32 key, void NotifyKeyPressed(uint32 what, int32 key,
int32 modifiers); int32 modifiers);
void MouseEvent(BMessage* message); void NotifyMouseEvent(BMessage* message);
void MouseDown(Window* window, BMessage* message, void NotifyMouseDown(Window* window, BMessage* message,
const BPoint& where); const BPoint& where);
void MouseUp(Window* window, BMessage* message, void NotifyMouseUp(Window* window, BMessage* message,
const BPoint& where); const BPoint& where);
void MouseMoved(Window* window, BMessage* message, void NotifyMouseMoved(Window* window, BMessage* message,
const BPoint& where); const BPoint& where);
void WindowMoved(Window* window); void NotifyWindowMoved(Window* window);
void WindowResized(Window* window); void NotifyWindowResized(Window* window);
void WindowActitvated(Window* window); void NotifyWindowActitvated(Window* window);
void WindowSentBehind(Window* window, Window* behindOf); void NotifyWindowSentBehind(Window* window,
void WindowWorkspacesChanged(Window* window, Window* behindOf);
void NotifyWindowWorkspacesChanged(Window* window,
uint32 workspaces); uint32 workspaces);
void WindowMinimized(Window* window, bool minimize); void NotifyWindowMinimized(Window* window,
bool minimize);
void WindowTabLocationChanged(Window* window, void NotifyWindowTabLocationChanged(Window* window,
float location); float location);
bool SetDecoratorSettings(Window* window, bool SetDecoratorSettings(Window* window,