Differential D15910 Diff 42764 src/server/surface_interface.cpp

Changeset View

Standalone View

View Options

src/server/surface_interface.cpp

Show First 20 Lines • Show All 268 Lines • ▼ Show 20 Line(s)268const struct wl_surface_interface SurfaceInterface::Private::s_interface = {
269 resourceDestroyedCallback, 269​ resourceDestroyedCallback,
270 attachCallback, 270​ attachCallback,
271 damageCallback, 271​ damageCallback,
272 frameCallback, 272​ frameCallback,
273 opaqueRegionCallback, 273​ opaqueRegionCallback,
274 inputRegionCallback, 274​ inputRegionCallback,
275 commitCallback, 275​ commitCallback,
276 bufferTransformCallback, 276​ bufferTransformCallback,
277 bufferScaleCallback 277​ bufferScaleCallback,
278​ damageBufferCallback
278}; 279​};
279#endif 280​#endif
280 281​
281SurfaceInterface::SurfaceInterface(CompositorInterface *parent, wl_resource *parentResource) 282​SurfaceInterface::SurfaceInterface(CompositorInterface *parent, wl_resource *parentResource)
282 : Resource(new Private(this, parent, parentResource)) 283​ : Resource(new Private(this, parent, parentResource))
283{ 284​{
284} 285​}
285 286​
▲ Show 20 Lines • Show All 82 Lines • ▼ Show 20 Line(s)367 if (!target->buffer && !source->buffer && emitChanged) {
368 bufferChanged = false; 369​ bufferChanged = false;
369 } 370​ }
370 buffer = source->buffer; 371​ buffer = source->buffer;
371 } 372​ }
372 // copy values 373​ // copy values
373 if (bufferChanged) { 374​ if (bufferChanged) {
374 target->buffer = buffer; 375​ target->buffer = buffer;
375 target->damage = source->damage; 376​ target->damage = source->damage;
377​ target->bufferDamage = source->bufferDamage;
376 target->bufferIsSet = source->bufferIsSet; 378​ target->bufferIsSet = source->bufferIsSet;
377 } 379​ }
378 if (childrenChanged) { 380​ if (childrenChanged) {
379 target->childrenChanged = source->childrenChanged; 381​ target->childrenChanged = source->childrenChanged;
380 target->children = source->children; 382​ target->children = source->children;
381 } 383​ }
382 target->callbacks.append(source->callbacks); 384​ target->callbacks.append(source->callbacks);
383 385​
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Line(s)434 if (scaleFactorChanged) {
434 if (buffer && !sizeChanged) { 436​ if (buffer && !sizeChanged) {
435 emit q->sizeChanged(); 437​ emit q->sizeChanged();
436 } 438​ }
437 } 439​ }
438 if (transformChanged) { 440​ if (transformChanged) {
439 emit q->transformChanged(target->transform); 441​ emit q->transformChanged(target->transform);
440 } 442​ }
441 if (bufferChanged && emitChanged) { 443​ if (bufferChanged && emitChanged) {
442 if (!target->damage.isEmpty()) { 444​ if (!target->damage.isEmpty() || !target->bufferDamage.isEmpty()) {
443 const QRegion windowRegion = QRegion(0, 0, q->size().width(), q->size().height()); 445​ const QRegion windowRegion = QRegion(0, 0, q->size().width(), q->size().height());
444 if (!windowRegion.isEmpty()) { 446​ if (!windowRegion.isEmpty()) {
445 target->damage = windowRegion.intersected(target->damage); 447​ QRegion bufferDamage;
448​ if (!target->bufferDamage.isEmpty()) {
449​ typedef OutputInterface::Transform Tr;
450​ const Tr tr = target->transform;
davidedmundsonUnsubmitted
Done

scale is also a transform.

Note also that the damage signal is used in kwin assuming it's surface local.

davidedmundson: scale is also a transform. Note also that the damage signal is used in kwin assuming it's…
romanggAuthorUnsubmitted
Done

Thanks! After applying the output transform and the scale transform, the damaged buffer region should be in surface local coordinates, right? I.e. the below sent damaged signal should then have the surface local damage.

romangg: Thanks! After applying the output transform **and** the scale transform, the damaged buffer…
451​ const qint32 sc = target->scale;
452​ if (tr == Tr::Rotated90 || tr == Tr::Rotated270 ||
453​ tr == Tr::Flipped90 || tr == Tr::Rotated270) {
davidedmundsonUnsubmitted
Done

Should this last one be flipped 270?

davidedmundson: Should this last one be flipped 270?
454​ // calculate transformed + scaled buffer damage
455​ for (const auto &rect : target->bufferDamage) {
456​ const auto add = QRegion(rect.x() / sc, rect.y() / sc, rect.height() / sc, rect.width() / sc);
457​ bufferDamage = bufferDamage.united(add);
458​ }
459​ } else if (sc != 1) {
460​ // calculate scaled buffer damage
461​ for (const auto &rect : target->bufferDamage) {
462​ const auto add = QRegion(rect.x() / sc, rect.y() / sc, rect.width() / sc, rect.height() / sc);
463​ bufferDamage = bufferDamage.united(add);
464​ }
465​ } else {
466​ bufferDamage = target->bufferDamage;
467​ }
468​ }
469​ target->damage = windowRegion.intersected(target->damage.united(bufferDamage));
446 if (emitChanged) { 470​ if (emitChanged) {
447 subSurfaceIsMapped = true; 471​ subSurfaceIsMapped = true;
448 trackedDamage = trackedDamage.united(target->damage); 472​ trackedDamage = trackedDamage.united(target->damage);
449 emit q->damaged(target->damage); 473​ emit q->damaged(target->damage);
450 // workaround for https://bugreports.qt.io/browse/QTBUG-52092 474​ // workaround for https://bugreports.qt.io/browse/QTBUG-52092
451 // if the surface is a sub-surface, but the main surface is not yet mapped, fake frame rendered 475​ // if the surface is a sub-surface, but the main surface is not yet mapped, fake frame rendered
452 if (subSurface) { 476​ if (subSurface) {
453 const auto mainSurface = subSurface->mainSurface(); 477​ const auto mainSurface = subSurface->mainSurface();
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Line(s)
526{ 550​{
527 if (!pending.bufferIsSet || (pending.bufferIsSet && !pending.buffer)) { 551​ if (!pending.bufferIsSet || (pending.bufferIsSet && !pending.buffer)) {
528 // TODO: should we send an error? 552​ // TODO: should we send an error?
529 return; 553​ return;
530 } 554​ }
531 pending.damage = pending.damage.united(rect); 555​ pending.damage = pending.damage.united(rect);
532} 556​}
533 557​
558​void SurfaceInterface::Private::damageBuffer(const QRect &rect)
559​{
560​ if (!pending.bufferIsSet || (pending.bufferIsSet && !pending.buffer)) {
561​ // TODO: should we send an error?
562​ return;
563​ }
564​ pending.bufferDamage = pending.bufferDamage.united(rect);
565​}
566​
534void SurfaceInterface::Private::setScale(qint32 scale) 567​void SurfaceInterface::Private::setScale(qint32 scale)
535{ 568​{
536 pending.scale = scale; 569​ pending.scale = scale;
537 pending.scaleIsSet = true; 570​ pending.scaleIsSet = true;
538} 571​}
539 572​
540void SurfaceInterface::Private::setTransform(OutputInterface::Transform transform) 573​void SurfaceInterface::Private::setTransform(OutputInterface::Transform transform)
541{ 574​{
Show All 17 Lines590{
559 pending.offset = offset; 592​ pending.offset = offset;
560 if (pending.buffer) { 593​ if (pending.buffer) {
561 delete pending.buffer; 594​ delete pending.buffer;
562 } 595​ }
563 if (!buffer) { 596​ if (!buffer) {
564 // got a null buffer, deletes content in next frame 597​ // got a null buffer, deletes content in next frame
565 pending.buffer = nullptr; 598​ pending.buffer = nullptr;
566 pending.damage = QRegion(); 599​ pending.damage = QRegion();
600​ pending.bufferDamage = QRegion();
567 return; 601​ return;
568 } 602​ }
569 Q_Q(SurfaceInterface); 603​ Q_Q(SurfaceInterface);
570 pending.buffer = new BufferInterface(buffer, q); 604​ pending.buffer = new BufferInterface(buffer, q);
571 QObject::connect(pending.buffer, &BufferInterface::aboutToBeDestroyed, q, 605​ QObject::connect(pending.buffer, &BufferInterface::aboutToBeDestroyed, q,
572 [this](BufferInterface *buffer) { 606​ [this](BufferInterface *buffer) {
573 if (pending.buffer == buffer) { 607​ if (pending.buffer == buffer) {
574 pending.buffer = nullptr; 608​ pending.buffer = nullptr;
Show All 24 Lines
599} 633​}
600 634​
601void SurfaceInterface::Private::damageCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height) 635​void SurfaceInterface::Private::damageCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height)
602{ 636​{
603 Q_UNUSED(client) 637​ Q_UNUSED(client)
604 cast<Private>(resource)->damage(QRect(x, y, width, height)); 638​ cast<Private>(resource)->damage(QRect(x, y, width, height));
605} 639​}
606 640​
641​void SurfaceInterface::Private::damageBufferCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height)
642​{
643​ Q_UNUSED(client)
644​ cast<Private>(resource)->damageBuffer(QRect(x, y, width, height));
645​}
646​
607void SurfaceInterface::Private::frameCallback(wl_client *client, wl_resource *resource, uint32_t callback) 647​void SurfaceInterface::Private::frameCallback(wl_client *client, wl_resource *resource, uint32_t callback)
608{ 648​{
609 auto s = cast<Private>(resource); 649​ auto s = cast<Private>(resource);
610 Q_ASSERT(client == *s->client); 650​ Q_ASSERT(client == *s->client);
611 s->addFrameCallback(callback); 651​ s->addFrameCallback(callback);
612} 652​}
613 653​
614void SurfaceInterface::Private::opaqueRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region) 654​void SurfaceInterface::Private::opaqueRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region)
▲ Show 20 Lines • Show All 273 Lines • Show Last 20 Lines