vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/Window/xcb_window_t/g in workspace.h

icc-effect-5.14.5
Martin Gräßlin 2013-04-30 15:41:59 +02:00
parent ffc0e62f9d
commit 28d7b3c563
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
events.cpp
View File

@ -365,7 +365,7 @@ bool Workspace::workspaceEvent(QEvent* e)
// Some events don't have the actual window which caused the event // Some events don't have the actual window which caused the event
// as e->xany.window (e.g. ConfigureRequest), but as some other // as e->xany.window (e.g. ConfigureRequest), but as some other
// field in the XEvent structure. // field in the XEvent structure.
Window Workspace::findSpecialEventWindow(XEvent* e) xcb_window_t Workspace::findSpecialEventWindow(XEvent *e)
{ {
switch(e->type) { switch(e->type) {
case CreateNotify: case CreateNotify:

4
group.cpp
View File

@ -323,7 +323,7 @@ void Group::lostLeader()
// Workspace // Workspace
//*************************************** //***************************************
Group* Workspace::findGroup(Window leader) const Group* Workspace::findGroup(xcb_window_t leader) const
{ {
assert(leader != None); assert(leader != None);
for (GroupList::ConstIterator it = groups.constBegin(); for (GroupList::ConstIterator it = groups.constBegin();
@ -419,7 +419,7 @@ void Workspace::updateOnAllDesktopsOfTransients(Client* c)
} }
// A new window has been mapped. Check if it's not a mainwindow for some already existing transient window. // A new window has been mapped. Check if it's not a mainwindow for some already existing transient window.
void Workspace::checkTransients(Window w) void Workspace::checkTransients(xcb_window_t w)
{ {
TRANSIENCY_CHECK(NULL); TRANSIENCY_CHECK(NULL);
for (ClientList::ConstIterator it = clients.constBegin(); for (ClientList::ConstIterator it = clients.constBegin();

8
workspace.cpp
View File

@ -519,7 +519,7 @@ Workspace::~Workspace()
_self = 0; _self = 0;
} }
Client* Workspace::createClient(Window w, bool is_mapped) Client* Workspace::createClient(xcb_window_t w, bool is_mapped)
{ {
StackingUpdatesBlocker blocker(this); StackingUpdatesBlocker blocker(this);
Client* c = new Client(this); Client* c = new Client(this);
@ -540,7 +540,7 @@ Client* Workspace::createClient(Window w, bool is_mapped)
return c; return c;
} }
Unmanaged* Workspace::createUnmanaged(Window w) Unmanaged* Workspace::createUnmanaged(xcb_window_t w)
{ {
if (m_compositor && m_compositor->checkForOverlayWindow(w)) if (m_compositor && m_compositor->checkForOverlayWindow(w))
return NULL; return NULL;
@ -1331,7 +1331,7 @@ void Workspace::sendClientToScreen(Client* c, int screen)
sendClientToScreen(*it, screen); sendClientToScreen(*it, screen);
} }
void Workspace::sendPingToWindow(Window window, Time timestamp) void Workspace::sendPingToWindow(xcb_window_t window, xcb_timestamp_t timestamp)
{ {
rootInfo->sendPing(window, timestamp); rootInfo->sendPing(window, timestamp);
} }
@ -1367,7 +1367,7 @@ void Workspace::cancelDelayFocus()
delayFocusTimer = 0; delayFocusTimer = 0;
} }
bool Workspace::checkStartupNotification(Window w, KStartupInfoId& id, KStartupInfoData& data) bool Workspace::checkStartupNotification(xcb_window_t w, KStartupInfoId &id, KStartupInfoData &data)
{ {
return startup->checkStartup(w, id, data) == KStartupInfo::Match; return startup->checkStartup(w, id, data) == KStartupInfo::Match;
} }

14
workspace.h
View File

@ -231,7 +231,7 @@ public:
void updateMinimizedOfTransients(Client*); void updateMinimizedOfTransients(Client*);
void updateOnAllDesktopsOfTransients(Client*); void updateOnAllDesktopsOfTransients(Client*);
void checkTransients(Window w); void checkTransients(xcb_window_t w);
void performWindowOperation(Client* c, WindowOperation op); void performWindowOperation(Client* c, WindowOperation op);
@ -252,12 +252,12 @@ public:
void resetShowingDesktop(bool keep_hidden); void resetShowingDesktop(bool keep_hidden);
bool showingDesktop() const; bool showingDesktop() const;
void sendPingToWindow(Window w, Time timestamp); // Called from Client::pingWindow() void sendPingToWindow(xcb_window_t w, xcb_timestamp_t timestamp); // Called from Client::pingWindow()
void sendTakeActivity(Client* c, Time timestamp, long flags); // Called from Client::takeActivity() void sendTakeActivity(Client* c, Time timestamp, long flags); // Called from Client::takeActivity()
void removeClient(Client*); // Only called from Client::destroyClient() or Client::releaseWindow() void removeClient(Client*); // Only called from Client::destroyClient() or Client::releaseWindow()
void setActiveClient(Client*); void setActiveClient(Client*);
Group* findGroup(Window leader) const; Group* findGroup(xcb_window_t leader) const;
void addGroup(Group* group); void addGroup(Group* group);
void removeGroup(Group* group); void removeGroup(Group* group);
Group* findClientLeaderGroup(const Client* c) const; Group* findClientLeaderGroup(const Client* c) const;
@ -266,7 +266,7 @@ public:
void removeDeleted(Deleted*); void removeDeleted(Deleted*);
void addDeleted(Deleted*, Toplevel*); void addDeleted(Deleted*, Toplevel*);
bool checkStartupNotification(Window w, KStartupInfoId& id, KStartupInfoData& data); bool checkStartupNotification(xcb_window_t w, KStartupInfoId& id, KStartupInfoData& data);
void focusToNull(); // SELI TODO: Public? void focusToNull(); // SELI TODO: Public?
@ -446,12 +446,12 @@ private:
void saveOldScreenSizes(); void saveOldScreenSizes();
/// This is the right way to create a new client /// This is the right way to create a new client
Client* createClient(Window w, bool is_mapped); Client* createClient(xcb_window_t w, bool is_mapped);
void addClient(Client* c); void addClient(Client* c);
Unmanaged* createUnmanaged(Window w); Unmanaged* createUnmanaged(xcb_window_t w);
void addUnmanaged(Unmanaged* c); void addUnmanaged(Unmanaged* c);
Window findSpecialEventWindow(XEvent* e); xcb_window_t findSpecialEventWindow(XEvent* e);
//--------------------------------------------------------------------- //---------------------------------------------------------------------