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

Drop redundant static casts

Browse Source
wilder/Plasma/6.3
Vlad Zahorodnii 1 year ago
parent 4f18aae673
commit ac45541379
1 changed files with 16 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/input.cpp

35
src/input.cpp
Unescape View File

@ -370,12 +370,11 @@ public:
auto seat = waylandServer()->seat(); auto seat = waylandServer()->seat();
if (pointerSurfaceAllowed()) { if (pointerSurfaceAllowed()) {
const WheelEvent *wheelEvent = static_cast<WheelEvent *>(event); seat->setTimestamp(event->timestamp());
seat->setTimestamp(wheelEvent->timestamp()); seat->notifyPointerAxis(event->orientation(), event->delta(),
seat->notifyPointerAxis(wheelEvent->orientation(), wheelEvent->delta(), event->deltaV120(),
wheelEvent->deltaV120(), kwinAxisSourceToKWaylandAxisSource(event->axisSource()),
kwinAxisSourceToKWaylandAxisSource(wheelEvent->axisSource()), event->inverted() ? PointerAxisRelativeDirection::Inverted : PointerAxisRelativeDirection::Normal);
wheelEvent->inverted() ? PointerAxisRelativeDirection::Inverted : PointerAxisRelativeDirection::Normal);
} }
return true; return true;
} }
@ -945,7 +944,7 @@ public:
bool keyEvent(KeyEvent *event) override bool keyEvent(KeyEvent *event) override
{ {
if (event->key() == Qt::Key_PowerOff) { if (event->key() == Qt::Key_PowerOff) {
const auto modifiers = static_cast<KeyEvent *>(event)->modifiersRelevantForGlobalShortcuts(); const auto modifiers = event->modifiersRelevantForGlobalShortcuts();
if (event->type() == QEvent::KeyPress && !event->isAutoRepeat()) { if (event->type() == QEvent::KeyPress && !event->isAutoRepeat()) {
auto passToShortcuts = [modifiers] { auto passToShortcuts = [modifiers] {
input()->shortcuts()->processKey(modifiers, Qt::Key_PowerDown); input()->shortcuts()->processKey(modifiers, Qt::Key_PowerDown);
@ -960,11 +959,11 @@ public:
} }
} else if (event->type() == QEvent::KeyPress) { } else if (event->type() == QEvent::KeyPress) {
if (!waylandServer()->isKeyboardShortcutsInhibited()) { if (!waylandServer()->isKeyboardShortcutsInhibited()) {
return input()->shortcuts()->processKey(static_cast<KeyEvent *>(event)->modifiersRelevantForGlobalShortcuts(), event->key()); return input()->shortcuts()->processKey(event->modifiersRelevantForGlobalShortcuts(), event->key());
} }
} else if (event->type() == QEvent::KeyRelease) { } else if (event->type() == QEvent::KeyRelease) {
if (!waylandServer()->isKeyboardShortcutsInhibited()) { if (!waylandServer()->isKeyboardShortcutsInhibited()) {
return input()->shortcuts()->processKeyRelease(static_cast<KeyEvent *>(event)->modifiersRelevantForGlobalShortcuts(), event->key()); return input()->shortcuts()->processKeyRelease(event->modifiersRelevantForGlobalShortcuts(), event->key());
} }
} }
return false; return false;
@ -1648,7 +1647,7 @@ public:
if (event->type() == QEvent::KeyPress) { if (event->type() == QEvent::KeyPress) {
workspace()->tabbox()->keyPress(event->modifiers() | event->key()); workspace()->tabbox()->keyPress(event->modifiers() | event->key());
} else if (static_cast<KeyEvent *>(event)->modifiersRelevantForGlobalShortcuts() == Qt::NoModifier) { } else if (event->modifiersRelevantForGlobalShortcuts() == Qt::NoModifier) {
workspace()->tabbox()->modifiersReleased(); workspace()->tabbox()->modifiersReleased();
return false; return false;
} }
@ -1851,13 +1850,12 @@ public:
switch (event->type()) { switch (event->type()) {
case QEvent::MouseMove: { case QEvent::MouseMove: {
seat->notifyPointerMotion(event->globalPosition()); seat->notifyPointerMotion(event->globalPosition());
MouseEvent *e = static_cast<MouseEvent *>(event);
// absolute motion events confuse games and Wayland doesn't have a warp event yet // absolute motion events confuse games and Wayland doesn't have a warp event yet
// -> send a relative motion event with a zero delta to signal the warp instead // -> send a relative motion event with a zero delta to signal the warp instead
if (e->isWarp()) { if (event->isWarp()) {
seat->relativePointerMotion(QPointF(0, 0), QPointF(0, 0), e->timestamp()); seat->relativePointerMotion(QPointF(0, 0), QPointF(0, 0), event->timestamp());
} else if (!e->delta().isNull()) { } else if (!event->delta().isNull()) {
seat->relativePointerMotion(e->delta(), e->deltaUnaccelerated(), e->timestamp()); seat->relativePointerMotion(event->delta(), event->deltaUnaccelerated(), event->timestamp());
} }
break; break;
} }
@ -1882,10 +1880,9 @@ public:
{ {
auto seat = waylandServer()->seat(); auto seat = waylandServer()->seat();
seat->setTimestamp(event->timestamp()); seat->setTimestamp(event->timestamp());
auto _event = static_cast<WheelEvent *>(event); seat->notifyPointerAxis(event->orientation(), event->delta(), event->deltaV120(),
seat->notifyPointerAxis(_event->orientation(), _event->delta(), _event->deltaV120(), kwinAxisSourceToKWaylandAxisSource(event->axisSource()),
kwinAxisSourceToKWaylandAxisSource(_event->axisSource()), event->inverted() ? PointerAxisRelativeDirection::Inverted : PointerAxisRelativeDirection::Normal);
_event->inverted() ? PointerAxisRelativeDirection::Inverted : PointerAxisRelativeDirection::Normal);
return true; return true;
} }
bool keyEvent(KeyEvent *event) override bool keyEvent(KeyEvent *event) override

Write Preview
Loading…
Cancel
Save