diff options
| author | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-12-21 14:34:07 +0800 |
|---|---|---|
| committer | Sam Spilsbury <sam.spilsbury@canonical.com> | 2011-12-21 14:34:07 +0800 |
| commit | 163c5b7478ce790fd7c74a2754943c19f5c8f1f9 (patch) | |
| tree | 0ee779a8aa32934e50ef26149f1d6e7dc9f3e2e7 /plugins | |
| parent | f12f8513e9b6a467e71cb39d98c99bb0c6ede685 (diff) | |
s/Unity/unity
(bzr r1794.2.1)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp | 172 | ||||
| -rw-r--r-- | plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h | 34 |
2 files changed, 103 insertions, 103 deletions
diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp index 615617788..baae39d40 100644 --- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp +++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp @@ -24,24 +24,24 @@ COMPIZ_PLUGIN_20090315(unitymtgrabhandles, UnityMTGrabHandlesPluginVTable); -Unity::MT::GrabHandle::ImplFactory * Unity::MT::GrabHandle::ImplFactory::mDefault = NULL; +unity::MT::GrabHandle::ImplFactory * unity::MT::GrabHandle::ImplFactory::mDefault = NULL; -Unity::MT::GrabHandle::ImplFactory::ImplFactory () +unity::MT::GrabHandle::ImplFactory::ImplFactory () { } -Unity::MT::GrabHandle::ImplFactory::~ImplFactory () +unity::MT::GrabHandle::ImplFactory::~ImplFactory () { } -Unity::MT::GrabHandle::ImplFactory * -Unity::MT::GrabHandle::ImplFactory::Default() +unity::MT::GrabHandle::ImplFactory * +unity::MT::GrabHandle::ImplFactory::Default() { return mDefault; } void -Unity::MT::GrabHandle::ImplFactory::SetDefault (ImplFactory *factory) +unity::MT::GrabHandle::ImplFactory::SetDefault (ImplFactory *factory) { if (mDefault) { @@ -52,23 +52,23 @@ Unity::MT::GrabHandle::ImplFactory::SetDefault (ImplFactory *factory) mDefault = factory; } -Unity::MT::X11ImplFactory::X11ImplFactory (Display *dpy) : +unity::MT::X11ImplFactory::X11ImplFactory (Display *dpy) : mDpy (dpy) { } -Unity::MT::X11ImplFactory::~X11ImplFactory () +unity::MT::X11ImplFactory::~X11ImplFactory () { } -Unity::MT::GrabHandle::Impl * -Unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle) +unity::MT::GrabHandle::Impl * +unity::MT::X11ImplFactory::create (const GrabHandle::Ptr &handle) { - Unity::MT::GrabHandle::Impl *impl = new X11GrabHandleImpl (mDpy, handle); + unity::MT::GrabHandle::Impl *impl = new X11GrabHandleImpl (mDpy, handle); return impl; } -Unity::MT::X11GrabHandleImpl::X11GrabHandleImpl (Display *dpy, const GrabHandle::Ptr &h) : +unity::MT::X11GrabHandleImpl::X11GrabHandleImpl (Display *dpy, const GrabHandle::Ptr &h) : mGrabHandle (h), mIpw (None), mDpy (dpy) @@ -77,7 +77,7 @@ Unity::MT::X11GrabHandleImpl::X11GrabHandleImpl (Display *dpy, const GrabHandle: } void -Unity::MT::X11GrabHandleImpl::show () +unity::MT::X11GrabHandleImpl::show () { if (mIpw) { @@ -89,7 +89,7 @@ Unity::MT::X11GrabHandleImpl::show () xswa.override_redirect = TRUE; - Unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); + unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); mIpw = XCreateWindow(mDpy, DefaultRootWindow (mDpy), @@ -106,14 +106,14 @@ Unity::MT::X11GrabHandleImpl::show () } void -Unity::MT::X11GrabHandleImpl::hide () +unity::MT::X11GrabHandleImpl::hide () { if (mIpw) XUnmapWindow (mDpy, mIpw); } void -Unity::MT::X11GrabHandleImpl::lockPosition (int x, +unity::MT::X11GrabHandleImpl::lockPosition (int x, int y, unsigned int flags) { @@ -123,14 +123,14 @@ Unity::MT::X11GrabHandleImpl::lockPosition (int x, if (!mIpw) return; - if (flags & Unity::MT::PositionSet) + if (flags & unity::MT::PositionSet) { xwc.x = x; xwc.y = y; vm |= CWX | CWY; } - Unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); + unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); gh->raise (); @@ -138,7 +138,7 @@ Unity::MT::X11GrabHandleImpl::lockPosition (int x, XSelectInput(screen->dpy(), mIpw, ButtonPressMask | ButtonReleaseMask); } -Unity::MT::X11GrabHandleImpl::~X11GrabHandleImpl () +unity::MT::X11GrabHandleImpl::~X11GrabHandleImpl () { if (mIpw) { @@ -149,16 +149,16 @@ Unity::MT::X11GrabHandleImpl::~X11GrabHandleImpl () } void -Unity::MT::X11GrabHandleImpl::buttonPress (int x, +unity::MT::X11GrabHandleImpl::buttonPress (int x, int y, unsigned int button) const { - Unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); + unity::MT::GrabHandle::Ptr gh = mGrabHandle.lock (); gh->requestMovement (x, y, button); } void -Unity::MT::GrabHandle::buttonPress (int x, +unity::MT::GrabHandle::buttonPress (int x, int y, unsigned int button) const { @@ -166,36 +166,36 @@ Unity::MT::GrabHandle::buttonPress (int x, } void -Unity::MT::GrabHandle::requestMovement (int x, +unity::MT::GrabHandle::requestMovement (int x, int y, unsigned int button) const { - Unity::MT::GrabHandleGroup::Ptr ghg = mOwner.lock (); + unity::MT::GrabHandleGroup::Ptr ghg = mOwner.lock (); ghg->requestMovement (x, y, (maskHandles.find (mId))->second, button); } void -Unity::MT::GrabHandle::show () +unity::MT::GrabHandle::show () { mImpl->show (); } void -Unity::MT::GrabHandle::hide () +unity::MT::GrabHandle::hide () { mImpl->hide (); } void -Unity::MT::GrabHandle::raise () const +unity::MT::GrabHandle::raise () const { - Unity::MT::GrabHandleGroup::Ptr ghg = mOwner.lock (); - boost::shared_ptr <const Unity::MT::GrabHandle> gh = shared_from_this (); + unity::MT::GrabHandleGroup::Ptr ghg = mOwner.lock (); + boost::shared_ptr <const unity::MT::GrabHandle> gh = shared_from_this (); ghg->raiseHandle (gh); } void -Unity::MT::GrabHandle::reposition(int x, +unity::MT::GrabHandle::reposition(int x, int y, unsigned int flags) { @@ -216,7 +216,7 @@ Unity::MT::GrabHandle::reposition(int x, } void -Unity::MT::GrabHandle::reposition(int x, int y, unsigned int flags) const +unity::MT::GrabHandle::reposition(int x, int y, unsigned int flags) const { if (flags & PositionLock) { @@ -224,13 +224,13 @@ Unity::MT::GrabHandle::reposition(int x, int y, unsigned int flags) const } } -Unity::MT::TextureLayout -Unity::MT::GrabHandle::layout() +unity::MT::TextureLayout +unity::MT::GrabHandle::layout() { return TextureLayout(mTexture, mRect); } -Unity::MT::GrabHandle::GrabHandle(GLTexture::List *texture, +unity::MT::GrabHandle::GrabHandle(GLTexture::List *texture, unsigned int width, unsigned int height, const boost::shared_ptr <GrabHandleGroup> &owner, @@ -243,26 +243,26 @@ Unity::MT::GrabHandle::GrabHandle(GLTexture::List *texture, { } -Unity::MT::GrabHandle::Ptr -Unity::MT::GrabHandle::create (GLTexture::List *texture, unsigned int width, unsigned int height, +unity::MT::GrabHandle::Ptr +unity::MT::GrabHandle::create (GLTexture::List *texture, unsigned int width, unsigned int height, const boost::shared_ptr <GrabHandleGroup> &owner, unsigned int id) { - Unity::MT::GrabHandle::Ptr p (new Unity::MT::GrabHandle (texture, width, height, owner, id)); - p->mImpl = Unity::MT::GrabHandle::ImplFactory::Default ()->create (p); + unity::MT::GrabHandle::Ptr p (new unity::MT::GrabHandle (texture, width, height, owner, id)); + p->mImpl = unity::MT::GrabHandle::ImplFactory::Default ()->create (p); return p; } -Unity::MT::GrabHandle::~GrabHandle() +unity::MT::GrabHandle::~GrabHandle() { delete mImpl; } void -Unity::MT::GrabHandleGroup::show(unsigned int handles) +unity::MT::GrabHandleGroup::show(unsigned int handles) { - for(const Unity::MT::GrabHandle::Ptr & handle : mHandles) + for(const unity::MT::GrabHandle::Ptr & handle : mHandles) if (handles & handle->id ()) handle->show(); @@ -270,22 +270,22 @@ Unity::MT::GrabHandleGroup::show(unsigned int handles) } void -Unity::MT::GrabHandleGroup::hide() +unity::MT::GrabHandleGroup::hide() { - for(const Unity::MT::GrabHandle::Ptr & handle : mHandles) + for(const unity::MT::GrabHandle::Ptr & handle : mHandles) handle->hide(); mState = State::FADE_OUT; } void -Unity::MT::GrabHandleGroup::raiseHandle(const boost::shared_ptr <const Unity::MT::GrabHandle> &h) +unity::MT::GrabHandleGroup::raiseHandle(const boost::shared_ptr <const unity::MT::GrabHandle> &h) { mOwner->raiseGrabHandle (h); } bool -Unity::MT::GrabHandleGroup::animate(unsigned int msec) +unity::MT::GrabHandleGroup::animate(unsigned int msec) { mMoreAnimate = false; @@ -320,25 +320,25 @@ Unity::MT::GrabHandleGroup::animate(unsigned int msec) } int -Unity::MT::GrabHandleGroup::opacity() +unity::MT::GrabHandleGroup::opacity() { return mOpacity; } bool -Unity::MT::GrabHandleGroup::visible() +unity::MT::GrabHandleGroup::visible() { return mOpacity > 0.0f; } bool -Unity::MT::GrabHandleGroup::needsAnimate() +unity::MT::GrabHandleGroup::needsAnimate() { return mMoreAnimate; } void -Unity::MT::GrabHandleGroup::relayout(const nux::Geometry& rect, bool hard) +unity::MT::GrabHandleGroup::relayout(const nux::Geometry& rect, bool hard) { /* Each grab handle at each vertex, eg: * @@ -362,18 +362,18 @@ Unity::MT::GrabHandleGroup::relayout(const nux::Geometry& rect, bool hard) for (unsigned int i = 0; i < NUM_HANDLES; i++) { - Unity::MT::GrabHandle::Ptr & handle = mHandles.at(i); + unity::MT::GrabHandle::Ptr & handle = mHandles.at(i); CompPoint p(rect.x + rect.width * pos[i][0] - handle->width () / 2, rect.y + rect.height * pos[i][1] - handle->height () / 2); - handle->reposition (p.x (), p.y (), Unity::MT::PositionSet | (hard ? Unity::MT::PositionLock : 0)); + handle->reposition (p.x (), p.y (), unity::MT::PositionSet | (hard ? unity::MT::PositionLock : 0)); } } void -UnityMTGrabHandlesWindow::raiseGrabHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &h) +UnityMTGrabHandlesWindow::raiseGrabHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &h) { UnityMTGrabHandlesScreen::get (screen)->raiseHandle (h, window->frame ()); } @@ -416,8 +416,8 @@ UnityMTGrabHandlesWindow::requestMovement (int x, &event); } -Unity::MT::GrabHandleGroup::GrabHandleGroup(GrabHandleWindow *owner, - std::vector <Unity::MT::TextureSize> &textures) : +unity::MT::GrabHandleGroup::GrabHandleGroup(GrabHandleWindow *owner, + std::vector <unity::MT::TextureSize> &textures) : mState(State::NONE), mOpacity(0.0f), mMoreAnimate(false), @@ -425,13 +425,13 @@ Unity::MT::GrabHandleGroup::GrabHandleGroup(GrabHandleWindow *owner, { } -Unity::MT::GrabHandleGroup::Ptr -Unity::MT::GrabHandleGroup::create (GrabHandleWindow *owner, - std::vector<Unity::MT::TextureSize> &textures) +unity::MT::GrabHandleGroup::Ptr +unity::MT::GrabHandleGroup::create (GrabHandleWindow *owner, + std::vector<unity::MT::TextureSize> &textures) { - Unity::MT::GrabHandleGroup::Ptr p = Unity::MT::GrabHandleGroup::Ptr (new Unity::MT::GrabHandleGroup (owner, textures)); + unity::MT::GrabHandleGroup::Ptr p = unity::MT::GrabHandleGroup::Ptr (new unity::MT::GrabHandleGroup (owner, textures)); for (unsigned int i = 0; i < NUM_HANDLES; i++) - p->mHandles.push_back(Unity::MT::GrabHandle::create (textures.at(i).first, + p->mHandles.push_back(unity::MT::GrabHandle::create (textures.at(i).first, textures.at(i).second.width, textures.at(i).second.height, p, @@ -439,9 +439,9 @@ Unity::MT::GrabHandleGroup::create (GrabHandleWindow *owner, return p; } -Unity::MT::GrabHandleGroup::~GrabHandleGroup() +unity::MT::GrabHandleGroup::~GrabHandleGroup() { - for (Unity::MT::GrabHandle::Ptr & handle : mHandles) + for (unity::MT::GrabHandle::Ptr & handle : mHandles) handle->damage (nux::Geometry (handle->x (), handle->y (), handle->width (), @@ -449,7 +449,7 @@ Unity::MT::GrabHandleGroup::~GrabHandleGroup() } void -Unity::MT::GrabHandleGroup::requestMovement (int x, +unity::MT::GrabHandleGroup::requestMovement (int x, int y, unsigned int direction, unsigned int button) @@ -458,7 +458,7 @@ Unity::MT::GrabHandleGroup::requestMovement (int x, } unsigned int -Unity::MT::getLayoutForMask (unsigned int state, +unity::MT::getLayoutForMask (unsigned int state, unsigned int actions) { unsigned int allHandles = 0; @@ -552,12 +552,12 @@ Unity::MT::getLayoutForMask (unsigned int state, return allHandles; } -std::vector <Unity::MT::TextureLayout> -Unity::MT::GrabHandleGroup::layout(unsigned int handles) +std::vector <unity::MT::TextureLayout> +unity::MT::GrabHandleGroup::layout(unsigned int handles) { - std::vector <Unity::MT::TextureLayout> layout; + std::vector <unity::MT::TextureLayout> layout; - for(const Unity::MT::GrabHandle::Ptr & handle : mHandles) + for(const unity::MT::GrabHandle::Ptr & handle : mHandles) if (handle->id () & handles) layout.push_back (handle->layout ()); @@ -565,9 +565,9 @@ Unity::MT::GrabHandleGroup::layout(unsigned int handles) } void -Unity::MT::GrabHandleGroup::forEachHandle (const std::function <void (const Unity::MT::GrabHandle::Ptr &)> &f) +unity::MT::GrabHandleGroup::forEachHandle (const std::function <void (const unity::MT::GrabHandle::Ptr &)> &f) { - for (Unity::MT::GrabHandle::Ptr &h : mHandles) + for (unity::MT::GrabHandle::Ptr &h : mHandles) f (h); } @@ -579,7 +579,7 @@ sortPointers(void *p1, void *p2) } void -UnityMTGrabHandlesScreen::raiseHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &h, +UnityMTGrabHandlesScreen::raiseHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &h, Window owner) { for (const auto &pair : mInputHandles) @@ -724,7 +724,7 @@ UnityMTGrabHandlesScreen::handleEvent(XEvent* event) if (it != mInputHandles.end()) { if (it->second) - it->second->reposition (0, 0, Unity::MT::PositionLock); + it->second->reposition (0, 0, unity::MT::PositionLock); } break; @@ -742,11 +742,11 @@ UnityMTGrabHandlesScreen::donePaint() { if (mMoreAnimate) { - for (const Unity::MT::GrabHandleGroup::Ptr &handles : mGrabHandles) + for (const unity::MT::GrabHandleGroup::Ptr &handles : mGrabHandles) { if (handles->needsAnimate()) { - handles->forEachHandle ([&](const Unity::MT::GrabHandle::Ptr &h) + handles->forEachHandle ([&](const unity::MT::GrabHandle::Ptr &h) { h->damage (nux::Geometry (h->x (), h->y (), @@ -767,7 +767,7 @@ UnityMTGrabHandlesScreen::preparePaint(int msec) { mMoreAnimate = false; - for(const Unity::MT::GrabHandleGroup::Ptr &handles : mGrabHandles) + for(const unity::MT::GrabHandleGroup::Ptr &handles : mGrabHandles) { mMoreAnimate |= handles->animate(msec); } @@ -795,7 +795,7 @@ UnityMTGrabHandlesWindow::allowHandles() void UnityMTGrabHandlesWindow::getOutputExtents(CompWindowExtents& output) { - auto f = [&] (const Unity::MT::GrabHandle::Ptr &h) + auto f = [&] (const unity::MT::GrabHandle::Ptr &h) { output.left = std::max (window->borderRect().left() + h->width () / 2, static_cast <unsigned int> (output.left)); output.right = std::max (window->borderRect().right() + h->width () / 2, static_cast <unsigned int> (output.right)); @@ -825,12 +825,12 @@ UnityMTGrabHandlesWindow::glDraw(const GLMatrix& transform, if (mHandles && mHandles->visible()) { - unsigned int allowedHandles = Unity::MT::getLayoutForMask (window->state (), window->actions ()); + unsigned int allowedHandles = unity::MT::getLayoutForMask (window->state (), window->actions ()); unsigned int handle = 0; UMTGH_SCREEN (screen); - for(Unity::MT::TextureLayout layout : mHandles->layout (allowedHandles)) + for(unity::MT::TextureLayout layout : mHandles->layout (allowedHandles)) { /* We want to set the geometry of the handle to the window * region */ @@ -975,13 +975,13 @@ UnityMTGrabHandlesWindow::showHandles(bool use_timer) if (!mHandles) { - mHandles = Unity::MT::GrabHandleGroup::create (this, us->textures ()); + mHandles = unity::MT::GrabHandleGroup::create (this, us->textures ()); us->addHandles(mHandles); } if (!mHandles->visible()) { - unsigned int showingMask = Unity::MT::getLayoutForMask (window->state (), window->actions ()); + unsigned int showingMask = unity::MT::getLayoutForMask (window->state (), window->actions ()); activate(); mHandles->show(showingMask); mHandles->relayout(nux::Geometry (window->inputRect().x (), @@ -1005,14 +1005,14 @@ UnityMTGrabHandlesWindow::restackHandles() if (!mHandles) return; - mHandles->forEachHandle ([&](const Unity::MT::GrabHandle::Ptr &h) - { h->reposition (0, 0, Unity::MT::PositionLock); }); + mHandles->forEachHandle ([&](const unity::MT::GrabHandle::Ptr &h) + { h->reposition (0, 0, unity::MT::PositionLock); }); } void -UnityMTGrabHandlesScreen::addHandleWindow(const Unity::MT::GrabHandle::Ptr &h, Window w) +UnityMTGrabHandlesScreen::addHandleWindow(const unity::MT::GrabHandle::Ptr &h, Window w) { - mInputHandles.insert(std::pair <Window, const Unity::MT::GrabHandle::Ptr> (w, h)); + mInputHandles.insert(std::pair <Window, const unity::MT::GrabHandle::Ptr> (w, h)); } void @@ -1022,13 +1022,13 @@ UnityMTGrabHandlesScreen::removeHandleWindow(Window w) } void -UnityMTGrabHandlesScreen::addHandles(const Unity::MT::GrabHandleGroup::Ptr &handles) +UnityMTGrabHandlesScreen::addHandles(const unity::MT::GrabHandleGroup::Ptr &handles) { mGrabHandles.push_back(handles); } void -UnityMTGrabHandlesScreen::removeHandles(const Unity::MT::GrabHandleGroup::Ptr &handles) +UnityMTGrabHandlesScreen::removeHandles(const unity::MT::GrabHandleGroup::Ptr &handles) { mGrabHandles.remove(handles); @@ -1124,7 +1124,7 @@ UnityMTGrabHandlesScreen::UnityMTGrabHandlesScreen(CompScreen* s) : "_COMPIZ_RESIZE_NOTIFY", 0)), mMoreAnimate(false) { - Unity::MT::GrabHandle::ImplFactory::SetDefault (new Unity::MT::X11ImplFactory (screen->dpy ())); + unity::MT::GrabHandle::ImplFactory::SetDefault (new unity::MT::X11ImplFactory (screen->dpy ())); ScreenInterface::setHandler(s); CompositeScreenInterface::setHandler(cScreen); diff --git a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h index 795039c9f..ebff8ac57 100644 --- a/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h +++ b/plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h @@ -30,7 +30,7 @@ #include "unitymtgrabhandles_options.h" -namespace Unity +namespace unity { namespace MT { @@ -246,7 +246,7 @@ public: private: - boost::weak_ptr <Unity::MT::GrabHandle> mGrabHandle; + boost::weak_ptr <unity::MT::GrabHandle> mGrabHandle; Window mIpw; Display *mDpy; }; @@ -260,7 +260,7 @@ class GrabHandleWindow int y, unsigned int direction, unsigned int button) = 0; - virtual void raiseGrabHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &) = 0; + virtual void raiseGrabHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &) = 0; }; class GrabHandleGroup : @@ -286,11 +286,11 @@ public: void hide(); void show(unsigned int handles = ~0); - void raiseHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &); + void raiseHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &); std::vector <TextureLayout> layout(unsigned int handles); - void forEachHandle (const std::function<void (const Unity::MT::GrabHandle::Ptr &)> &); + void forEachHandle (const std::function<void (const unity::MT::GrabHandle::Ptr &)> &); void requestMovement (int x, int y, @@ -312,7 +312,7 @@ private: int mOpacity; bool mMoreAnimate; - std::vector <Unity::MT::GrabHandle::Ptr> mHandles; + std::vector <unity::MT::GrabHandle::Ptr> mHandles; GrabHandleWindow *mOwner; }; }; @@ -349,29 +349,29 @@ public: CompAction::State state, CompOption::Vector& options); - void addHandles(const Unity::MT::GrabHandleGroup::Ptr & handles); - void removeHandles(const Unity::MT::GrabHandleGroup::Ptr & handles); + void addHandles(const unity::MT::GrabHandleGroup::Ptr & handles); + void removeHandles(const unity::MT::GrabHandleGroup::Ptr & handles); - void addHandleWindow(const Unity::MT::GrabHandle::Ptr &, Window); + void addHandleWindow(const unity::MT::GrabHandle::Ptr &, Window); void removeHandleWindow(Window); void preparePaint(int); void donePaint(); - void raiseHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &, + void raiseHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &, Window owner); - std::vector <Unity::MT::TextureSize> & textures() + std::vector <unity::MT::TextureSize> & textures() { return mHandleTextures; } private: - std::list <Unity::MT::GrabHandleGroup::Ptr> mGrabHandles; - std::vector <Unity::MT::TextureSize> mHandleTextures; + std::list <unity::MT::GrabHandleGroup::Ptr> mGrabHandles; + std::vector <unity::MT::TextureSize> mHandleTextures; - std::map <Window, const Unity::MT::GrabHandle::Ptr> mInputHandles; + std::map <Window, const unity::MT::GrabHandle::Ptr> mInputHandles; CompWindowVector mLastClientListStacking; Atom mCompResizeWindowAtom; @@ -386,7 +386,7 @@ class UnityMTGrabHandlesWindow : public WindowInterface, public CompositeWindowInterface, public GLWindowInterface, - public Unity::MT::GrabHandleWindow + public unity::MT::GrabHandleWindow { public: @@ -426,7 +426,7 @@ public: protected: - void raiseGrabHandle (const boost::shared_ptr <const Unity::MT::GrabHandle> &h); + void raiseGrabHandle (const boost::shared_ptr <const unity::MT::GrabHandle> &h); void requestMovement (int x, int y, unsigned int direction, @@ -436,7 +436,7 @@ private: bool onHideTimeout(); - Unity::MT::GrabHandleGroup::Ptr mHandles; + unity::MT::GrabHandleGroup::Ptr mHandles; CompTimer mTimer; }; |
