yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Client::restackWindow() accepts xcb_(window|timestamp)_t as argument

Browse source 
At the same time X define usage is changed to XCB enums.
This commit is contained in:
Martin Gräßlin 2013-05-03 10:27:04 +02:00
parent 2f718bd4fb
commit 1b7d2e5ca4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client.h
View file

@ -497,7 +497,7 @@ public:
void NETMoveResize(int x_root, int y_root, NET::Direction direction);
void NETMoveResizeWindow(int flags, int x, int y, int width, int height);
void restackWindow(Window above, int detail, NET::RequestSource source, Time timestamp,
void restackWindow(xcb_window_t above, int detail, NET::RequestSource source, xcb_timestamp_t timestamp,
bool send_event = false);
void gotPing(Time timestamp);

18
layers.cpp
View file

@ -700,10 +700,10 @@ ToplevelList Workspace::xStackingOrder() const
// Client
//*******************************
void Client::restackWindow(Window above, int detail, NET::RequestSource src, Time timestamp, bool send_event)
void Client::restackWindow(xcb_window_t above, int detail, NET::RequestSource src, xcb_timestamp_t timestamp, bool send_event)
{
Client *other = 0;
if (detail == Opposite) {
if (detail == XCB_STACK_MODE_OPPOSITE) {
other = workspace()->findClient(WindowMatchPredicate(above));
if (!other) {
workspace()->raiseOrLowerClient(this);
@ -713,22 +713,22 @@ void Client::restackWindow(Window above, int detail, NET::RequestSource src, Tim
end = workspace()->stackingOrder().constEnd();
while (it != end) {
if (*it == this) {
detail = Above;
detail = XCB_STACK_MODE_ABOVE;
break;
} else if (*it == other) {
detail = Below;
detail = XCB_STACK_MODE_BELOW;
break;
}
++it;
}
}
else if (detail == TopIf) {
else if (detail == XCB_STACK_MODE_TOP_IF) {
other = workspace()->findClient(WindowMatchPredicate(above));
if (other && other->geometry().intersects(geometry()))
workspace()->raiseClientRequest(this, src, timestamp);
return;
}
else if (detail == BottomIf) {
else if (detail == XCB_STACK_MODE_BOTTOM_IF) {
other = workspace()->findClient(WindowMatchPredicate(above));
if (other && other->geometry().intersects(geometry()))
workspace()->lowerClientRequest(this, src, timestamp);
@ -738,7 +738,7 @@ void Client::restackWindow(Window above, int detail, NET::RequestSource src, Tim
if (!other)
other = workspace()->findClient(WindowMatchPredicate(above));
if (other && detail == Above) {
if (other && detail == XCB_STACK_MODE_ABOVE) {
ToplevelList::const_iterator it = workspace()->stackingOrder().constEnd(),
begin = workspace()->stackingOrder().constBegin();
while (--it != begin) {
@ -766,9 +766,9 @@ void Client::restackWindow(Window above, int detail, NET::RequestSource src, Tim
if (other)
workspace()->restack(this, other);
else if (detail == Below)
else if (detail == XCB_STACK_MODE_BELOW)
workspace()->lowerClientRequest(this, src, timestamp);
else if (detail == Above)
else if (detail == XCB_STACK_MODE_ABOVE)
workspace()->raiseClientRequest(this, src, timestamp);
if (send_event)