Differential D23545 Diff 65440 abstract_wayland_output.cpp

Changeset View

Standalone View

View Options

abstract_wayland_output.cpp

Show First 20 Lines • Show All 44 Lines • ▼ Show 20 Line(s)
45} 45​}
46 46​
47QString AbstractWaylandOutput::name() const 47​QString AbstractWaylandOutput::name() const
48{ 48​{
49 return QStringLiteral("%1 %2").arg(m_waylandOutputDevice->manufacturer()).arg( 49​ return QStringLiteral("%1 %2").arg(m_waylandOutputDevice->manufacturer()).arg(
50 m_waylandOutputDevice->model()); 50​ m_waylandOutputDevice->model());
51} 51​}
52 52​
53​QByteArray AbstractWaylandOutput::uuid() const
54​{
55​ return m_waylandOutputDevice->uuid();
56​}
57​
53QRect AbstractWaylandOutput::geometry() const 58​QRect AbstractWaylandOutput::geometry() const
54{ 59​{
55 return QRect(globalPos(), pixelSize() / scale()); 60​ return QRect(globalPos(), pixelSize() / scale());
56} 61​}
57 62​
58QSize AbstractWaylandOutput::physicalSize() const 63​QSize AbstractWaylandOutput::physicalSize() const
59{ 64​{
60 return orientateSize(m_waylandOutputDevice->physicalSize()); 65​ return orientateSize(m_waylandOutputDevice->physicalSize());
▲ Show 20 Lines • Show All 46 Lines • ▼ Show 20 Line(s)105 if (m_waylandOutput) {
107 m_waylandOutput->setScale(std::ceil(scale)); 112​ m_waylandOutput->setScale(std::ceil(scale));
108 } 113​ }
109 if (m_xdgOutput) { 114​ if (m_xdgOutput) {
110 m_xdgOutput->setLogicalSize(pixelSize() / scale); 115​ m_xdgOutput->setLogicalSize(pixelSize() / scale);
111 m_xdgOutput->done(); 116​ m_xdgOutput->done();
112 } 117​ }
113} 118​}
114 119​
115void AbstractWaylandOutput::setChanges(KWayland::Server::OutputChangeSet *changes) 120​void AbstractWaylandOutput::applyChanges(const KWayland::Server::OutputChangeSet *changeSet)
116{ 121​{
117 qCDebug(KWIN_CORE) << "Set changes in AbstractWaylandOutput."; 122​ qCDebug(KWIN_CORE) << "Apply changes to the Wayland output.";
118 bool emitModeChanged = false; 123​ bool emitModeChanged = false;
119 124​
120 //enabledChanged is handled by plugin code 125​ // Enablement changes are handled by platform.
121 if (changes->modeChanged()) { 126​ if (changeSet->modeChanged()) {
122 qCDebug(KWIN_CORE) << "Setting new mode:" << changes->mode(); 127​ qCDebug(KWIN_CORE) << "Setting new mode:" << changeSet->mode();
123 m_waylandOutputDevice->setCurrentMode(changes->mode()); 128​ m_waylandOutputDevice->setCurrentMode(changeSet->mode());
124 updateMode(changes->mode()); 129​ updateMode(changeSet->mode());
125 emitModeChanged = true; 130​ emitModeChanged = true;
126 } 131​ }
127 if (changes->transformChanged()) { 132​ if (changeSet->transformChanged()) {
128 qCDebug(KWIN_CORE) << "Server setting transform: " << (int)(changes->transform()); 133​ qCDebug(KWIN_CORE) << "Server setting transform: " << (int)(changeSet->transform());
129 transform(changes->transform()); 134​ transform(changeSet->transform());
130 emitModeChanged = true; 135​ emitModeChanged = true;
131 } 136​ }
132 if (changes->positionChanged()) { 137​ if (changeSet->positionChanged()) {
133 qCDebug(KWIN_CORE) << "Server setting position: " << changes->position(); 138​ qCDebug(KWIN_CORE) << "Server setting position: " << changeSet->position();
134 setGlobalPos(changes->position()); 139​ setGlobalPos(changeSet->position());
135 // may just work already! 140​ // may just work already!
136 } 141​ }
137 if (changes->scaleChanged()) { 142​ if (changeSet->scaleChanged()) {
138 qCDebug(KWIN_CORE) << "Setting scale:" << changes->scale(); 143​ qCDebug(KWIN_CORE) << "Setting scale:" << changeSet->scale();
139 setScale(changes->scaleF()); 144​ setScale(changeSet->scaleF());
140 emitModeChanged = true; 145​ emitModeChanged = true;
141 } 146​ }
142 147​
143 if (emitModeChanged) { 148​ if (emitModeChanged) {
144 emit modeChanged(); 149​ emit modeChanged();
145 } 150​ }
146} 151​}
147 152​
▲ Show 20 Lines • Show All 116 Lines • Show Last 20 Lines