Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
6fdfd8be
Commit
6fdfd8be
authored
Mar 24, 2021
by
Vlad Zahorodnii
Browse files
wayland: Switch to new keyboard event notify methods in SeatInterface
parent
57aec197
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/input.cpp
View file @
6fdfd8be
...
...
@@ -233,12 +233,14 @@ void InputEventFilter::passToWaylandServer(QKeyEvent *event)
if
(
event
->
isAutoRepeat
())
{
return
;
}
KWaylandServer
::
SeatInterface
*
seat
=
waylandServer
()
->
seat
();
switch
(
event
->
type
())
{
case
QEvent
::
KeyPress
:
waylandServer
()
->
seat
()
->
keyboard
()
->
keyPressed
(
event
->
nativeScanCode
()
);
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
(),
KWaylandServer
::
KeyboardKeyState
::
Pressed
);
break
;
case
QEvent
::
KeyRelease
:
waylandServer
()
->
seat
()
->
keyboard
()
->
keyReleased
(
event
->
nativeScanCode
()
);
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
(),
KWaylandServer
::
KeyboardKeyState
::
Released
);
break
;
default:
break
;
...
...
@@ -343,10 +345,10 @@ public:
}
switch
(
event
->
type
())
{
case
QEvent
::
KeyPress
:
seat
->
keyboard
()
->
keyPressed
(
event
->
nativeScanCode
());
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
()
,
KWaylandServer
::
KeyboardKeyState
::
Pressed
);
break
;
case
QEvent
::
KeyRelease
:
seat
->
keyboard
()
->
keyReleased
(
event
->
nativeScanCode
());
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
()
,
KWaylandServer
::
KeyboardKeyState
::
Released
);
break
;
default:
break
;
...
...
src/inputmethod.cpp
View file @
6fdfd8be
...
...
@@ -364,11 +364,13 @@ void InputMethod::keysymReceived(quint32 serial, quint32 time, quint32 sym, bool
}
auto
t3
=
waylandServer
()
->
seat
()
->
textInputV3
();
if
(
t3
&&
t3
->
isEnabled
())
{
KWaylandServer
::
KeyboardKeyState
state
;
if
(
pressed
)
{
w
aylandServer
()
->
seat
()
->
keyboard
()
->
keyPressed
(
keysymToKeycode
(
sym
))
;
state
=
KW
aylandServer
::
KeyboardKeyState
::
Pressed
;
}
else
{
w
aylandServer
()
->
seat
()
->
keyboard
()
->
keyReleased
(
keysymToKeycode
(
sym
))
;
state
=
KW
aylandServer
::
KeyboardKeyState
::
Released
;
}
waylandServer
()
->
seat
()
->
notifyKeyboardKey
(
keysymToKeycode
(
sym
),
state
);
return
;
}
}
...
...
src/popup_input_filter.cpp
View file @
6fdfd8be
...
...
@@ -11,7 +11,6 @@
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <QMouseEvent>
...
...
@@ -84,10 +83,10 @@ bool PopupInputFilter::keyEvent(QKeyEvent *event)
seat
->
setFocusedKeyboardSurface
(
last
->
surface
());
switch
(
event
->
type
())
{
case
QEvent
::
KeyPress
:
seat
->
keyboard
()
->
keyPressed
(
event
->
nativeScanCode
());
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
()
,
KWaylandServer
::
KeyboardKeyState
::
Pressed
);
break
;
case
QEvent
::
KeyRelease
:
seat
->
keyboard
()
->
keyReleased
(
event
->
nativeScanCode
());
seat
->
notifyKeyboardKey
(
event
->
nativeScanCode
()
,
KWaylandServer
::
KeyboardKeyState
::
Released
);
break
;
default:
break
;
...
...
src/xkb.cpp
View file @
6fdfd8be
...
...
@@ -385,10 +385,10 @@ void Xkb::forwardModifiers()
if
(
!
m_seat
||
!
m_seat
->
keyboard
())
{
return
;
}
m_seat
->
keyboard
()
->
update
Modifiers
(
m_modifierState
.
depressed
,
m_modifierState
.
latched
,
m_modifierState
.
locked
,
m_currentLayout
);
m_seat
->
notifyKeyboard
Modifiers
(
m_modifierState
.
depressed
,
m_modifierState
.
latched
,
m_modifierState
.
locked
,
m_currentLayout
);
}
QString
Xkb
::
layoutName
(
xkb_layout_index_t
index
)
const
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment