Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwin: adjust to changes in kdelibs window management

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-08-13 22:32:06 +00:00
parent c2e00ef6d6
commit cf8dd960a7
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kwin/netinfo.cpp
View file

@ -162,7 +162,7 @@ void RootInfo::changeCurrentDesktop(int d)
VirtualDesktopManager::self()->setCurrent(d); VirtualDesktopManager::self()->setCurrent(d);
} }
void RootInfo::changeActiveWindow(xcb_window_t w, NET::RequestSource src, xcb_timestamp_t timestamp, xcb_window_t active_window) void RootInfo::changeActiveWindow(Window w, NET::RequestSource src, Time timestamp, Window active_window)
{ {
Workspace *workspace = Workspace::self(); Workspace *workspace = Workspace::self();
if (Client* c = workspace->findClient(WindowMatchPredicate(w))) { if (Client* c = workspace->findClient(WindowMatchPredicate(w))) {
@ -190,7 +190,7 @@ void RootInfo::changeActiveWindow(xcb_window_t w, NET::RequestSource src, xcb_ti
} }
} }
void RootInfo::restackWindow(xcb_window_t w, RequestSource src, xcb_window_t above, int detail, xcb_timestamp_t timestamp) void RootInfo::restackWindow(Window w, RequestSource src, Window above, int detail, Time timestamp)
{ {
if (Client* c = Workspace::self()->findClient(WindowMatchPredicate(w))) { if (Client* c = Workspace::self()->findClient(WindowMatchPredicate(w))) {
if (timestamp == CurrentTime) if (timestamp == CurrentTime)
@ -201,21 +201,21 @@ void RootInfo::restackWindow(xcb_window_t w, RequestSource src, xcb_window_t abo
} }
} }
void RootInfo::gotTakeActivity(xcb_window_t w, xcb_timestamp_t timestamp, long flags) void RootInfo::gotTakeActivity(Window w, Time timestamp, long flags)
{ {
Workspace *workspace = Workspace::self(); Workspace *workspace = Workspace::self();
if (Client* c = workspace->findClient(WindowMatchPredicate(w))) if (Client* c = workspace->findClient(WindowMatchPredicate(w)))
workspace->handleTakeActivity(c, timestamp, flags); workspace->handleTakeActivity(c, timestamp, flags);
} }
void RootInfo::closeWindow(xcb_window_t w) void RootInfo::closeWindow(Window w)
{ {
Client* c = Workspace::self()->findClient(WindowMatchPredicate(w)); Client* c = Workspace::self()->findClient(WindowMatchPredicate(w));
if (c) if (c)
c->closeWindow(); c->closeWindow();
} }
void RootInfo::moveResize(xcb_window_t w, int x_root, int y_root, unsigned long direction) void RootInfo::moveResize(Window w, int x_root, int y_root, unsigned long direction)
{ {
Client* c = Workspace::self()->findClient(WindowMatchPredicate(w)); Client* c = Workspace::self()->findClient(WindowMatchPredicate(w));
if (c) { if (c) {
@ -224,14 +224,14 @@ void RootInfo::moveResize(xcb_window_t w, int x_root, int y_root, unsigned long
} }
} }
void RootInfo::moveResizeWindow(xcb_window_t w, int flags, int x, int y, int width, int height) void RootInfo::moveResizeWindow(Window w, int flags, int x, int y, int width, int height)
{ {
Client* c = Workspace::self()->findClient(WindowMatchPredicate(w)); Client* c = Workspace::self()->findClient(WindowMatchPredicate(w));
if (c) if (c)
c->NETMoveResizeWindow(flags, x, y, width, height); c->NETMoveResizeWindow(flags, x, y, width, height);
} }
void RootInfo::gotPing(xcb_window_t w, xcb_timestamp_t timestamp) void RootInfo::gotPing(Window w, Time timestamp)
{ {
if (Client* c = Workspace::self()->findClient(WindowMatchPredicate(w))) if (Client* c = Workspace::self()->findClient(WindowMatchPredicate(w)))
c->gotPing(timestamp); c->gotPing(timestamp);
@ -246,8 +246,8 @@ void RootInfo::changeShowingDesktop(bool showing)
// WinInfo // WinInfo
// **************************************** // ****************************************
WinInfo::WinInfo(Client * c, Display * display, xcb_window_t window, WinInfo::WinInfo(Client * c, Display * display, Window window,
xcb_window_t rwin, const unsigned long pr[], int pr_size) Window rwin, const unsigned long pr[], int pr_size)
: NETWinInfo(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c) : NETWinInfo(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
{ {
} }

18
kwin/netinfo.h
View file

@ -47,13 +47,13 @@ public:
protected: protected:
virtual void changeNumberOfDesktops(int n); virtual void changeNumberOfDesktops(int n);
virtual void changeCurrentDesktop(int d); virtual void changeCurrentDesktop(int d);
virtual void changeActiveWindow(xcb_window_t w, NET::RequestSource src, xcb_timestamp_t timestamp, xcb_window_t active_window); virtual void changeActiveWindow(Window w, NET::RequestSource src, Time timestamp, Window active_window);
virtual void closeWindow(xcb_window_t w); virtual void closeWindow(Window w);
virtual void moveResize(xcb_window_t w, int x_root, int y_root, unsigned long direction); virtual void moveResize(Window w, int x_root, int y_root, unsigned long direction);
virtual void moveResizeWindow(xcb_window_t w, int flags, int x, int y, int width, int height); virtual void moveResizeWindow(Window w, int flags, int x, int y, int width, int height);
virtual void gotPing(xcb_window_t w, xcb_timestamp_t timestamp); virtual void gotPing(Window w, Time timestamp);
virtual void restackWindow(xcb_window_t w, RequestSource source, xcb_window_t above, int detail, xcb_timestamp_t timestamp); virtual void restackWindow(Window w, RequestSource source, Window above, int detail, Time timestamp);
virtual void gotTakeActivity(xcb_window_t w, xcb_timestamp_t timestamp, long flags); virtual void gotTakeActivity(Window w, Time timestamp, long flags);
virtual void changeShowingDesktop(bool showing); virtual void changeShowingDesktop(bool showing);
private: private:
@ -77,8 +77,8 @@ private:
typedef KWin::Client Client; // Because of NET::Client typedef KWin::Client Client; // Because of NET::Client
public: public:
WinInfo(Client* c, Display * display, xcb_window_t window, WinInfo(Client* c, Display * display, Window window,
xcb_window_t rwin, const unsigned long pr[], int pr_size); Window rwin, const unsigned long pr[], int pr_size);
virtual void changeDesktop(int desktop); virtual void changeDesktop(int desktop);
virtual void changeFullscreenMonitors(NETFullscreenMonitors topology); virtual void changeFullscreenMonitors(NETFullscreenMonitors topology);
virtual void changeState(unsigned long state, unsigned long mask); virtual void changeState(unsigned long state, unsigned long mask);