Changeset View
Changeset View
Standalone View
Standalone View
composite.cpp
Show First 20 Lines • Show All 386 Lines • ▼ Show 20 Line(s) | 374 | { | |||
---|---|---|---|---|---|
387 | 387 | | |||
388 | if (Workspace::self()) { | 388 | if (Workspace::self()) { | ||
389 | foreach (Client * c, Workspace::self()->clientList()) | 389 | foreach (Client * c, Workspace::self()->clientList()) | ||
390 | m_scene->removeToplevel(c); | 390 | m_scene->removeToplevel(c); | ||
391 | foreach (Client * c, Workspace::self()->desktopList()) | 391 | foreach (Client * c, Workspace::self()->desktopList()) | ||
392 | m_scene->removeToplevel(c); | 392 | m_scene->removeToplevel(c); | ||
393 | foreach (Unmanaged * c, Workspace::self()->unmanagedList()) | 393 | foreach (Unmanaged * c, Workspace::self()->unmanagedList()) | ||
394 | m_scene->removeToplevel(c); | 394 | m_scene->removeToplevel(c); | ||
395 | foreach (Deleted * c, Workspace::self()->deletedList()) | | |||
396 | m_scene->removeToplevel(c); | | |||
graesslin: why remove these? | |||||
If a Deleted is discarded, it will be removed from the scene as well, so we don't need these lines. zzag: If a Deleted is discarded, it will be removed from the scene as well, so we don't need these… | |||||
397 | foreach (Client * c, Workspace::self()->clientList()) | 395 | foreach (Client * c, Workspace::self()->clientList()) | ||
398 | c->finishCompositing(); | 396 | c->finishCompositing(); | ||
399 | foreach (Client * c, Workspace::self()->desktopList()) | 397 | foreach (Client * c, Workspace::self()->desktopList()) | ||
400 | c->finishCompositing(); | 398 | c->finishCompositing(); | ||
401 | foreach (Unmanaged * c, Workspace::self()->unmanagedList()) | 399 | foreach (Unmanaged * c, Workspace::self()->unmanagedList()) | ||
402 | c->finishCompositing(); | 400 | c->finishCompositing(); | ||
403 | foreach (Deleted * c, Workspace::self()->deletedList()) | | |||
404 | c->finishCompositing(); | | |||
405 | if (auto c = kwinApp()->x11Connection()) { | 401 | if (auto c = kwinApp()->x11Connection()) { | ||
406 | xcb_composite_unredirect_subwindows(c, kwinApp()->x11RootWindow(), XCB_COMPOSITE_REDIRECT_MANUAL); | 402 | xcb_composite_unredirect_subwindows(c, kwinApp()->x11RootWindow(), XCB_COMPOSITE_REDIRECT_MANUAL); | ||
407 | } | 403 | } | ||
404 | while (!workspace()->deletedList().isEmpty()) { | ||||
405 | workspace()->deletedList().first()->discard(); | ||||
406 | } | ||||
408 | } | 407 | } | ||
409 | if (waylandServer()) { | 408 | if (waylandServer()) { | ||
410 | foreach (ShellClient *c, waylandServer()->clients()) { | 409 | foreach (ShellClient *c, waylandServer()->clients()) { | ||
411 | m_scene->removeToplevel(c); | 410 | m_scene->removeToplevel(c); | ||
412 | } | 411 | } | ||
413 | foreach (ShellClient *c, waylandServer()->internalClients()) { | 412 | foreach (ShellClient *c, waylandServer()->internalClients()) { | ||
414 | m_scene->removeToplevel(c); | 413 | m_scene->removeToplevel(c); | ||
415 | } | 414 | } | ||
Show All 13 Lines | 427 | for (ClientList::ConstIterator it = Workspace::self()->clientList().constBegin(); | |||
429 | it != Workspace::self()->clientList().constEnd(); | 428 | it != Workspace::self()->clientList().constEnd(); | ||
430 | ++it) { | 429 | ++it) { | ||
431 | // forward all opacity values to the frame in case there'll be other CM running | 430 | // forward all opacity values to the frame in case there'll be other CM running | ||
432 | if ((*it)->opacity() != 1.0) { | 431 | if ((*it)->opacity() != 1.0) { | ||
433 | NETWinInfo i(connection(), (*it)->frameId(), rootWindow(), 0, 0); | 432 | NETWinInfo i(connection(), (*it)->frameId(), rootWindow(), 0, 0); | ||
434 | i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff)); | 433 | i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff)); | ||
435 | } | 434 | } | ||
436 | } | 435 | } | ||
437 | // discard all Deleted windows (#152914) | | |||
438 | while (!Workspace::self()->deletedList().isEmpty()) | | |||
439 | Workspace::self()->deletedList().first()->discard(); | | |||
440 | } | 436 | } | ||
441 | m_finishing = false; | 437 | m_finishing = false; | ||
442 | emit compositingToggled(false); | 438 | emit compositingToggled(false); | ||
443 | } | 439 | } | ||
444 | 440 | | |||
445 | void Compositor::releaseCompositorSelection() | 441 | void Compositor::releaseCompositorSelection() | ||
446 | { | 442 | { | ||
447 | if (hasScene() && !m_finishing) { | 443 | if (hasScene() && !m_finishing) { | ||
▲ Show 20 Lines • Show All 767 Lines • Show Last 20 Lines |
why remove these?