yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support switching keyboard layout shortcut

Browse source 
KWin registers/steals the shortcut of the "KDE Keyboard Layout Switcher"
and binds it to a new method which actually switches the layout.

The actual switcher from which the shortcut is stolen should only be a
representation on Wayland. Though how to do this is a problem for the
future. Only the active window is notified about layout changes and the
plasmoid will never get the event in time. This is of course a minor
problem compared to the fact that the KeyboardDaemon is absolutely X11
dependent.
This commit is contained in:
Martin Gräßlin 2016-02-19 13:50:39 +01:00
parent 83a4fe5408
commit c79511b2d5
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
keyboard_input.cpp
View file

@ -30,6 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KScreenLocker/KsldApp> #include <KScreenLocker/KsldApp>
// Frameworks // Frameworks
#include <KKeyServer> #include <KKeyServer>
#include <KGlobalAccel>
// Qt // Qt
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusMessage> #include <QDBusMessage>
@ -321,6 +322,20 @@ bool Xkb::shouldKeyRepeat(quint32 key) const
return xkb_keymap_key_repeats(m_keymap, key) != 0; return xkb_keymap_key_repeats(m_keymap, key) != 0;
} }
void Xkb::switchToNextLayout()
{
if (!m_keymap || !m_state) {
return;
}
const xkb_layout_index_t numLayouts = xkb_keymap_num_layouts(m_keymap);
const xkb_layout_index_t nextLayout = (xkb_state_serialize_layout(m_state, XKB_STATE_LAYOUT_EFFECTIVE) + 1) % numLayouts;
const xkb_mod_mask_t depressed = xkb_state_serialize_mods(m_state, xkb_state_component(XKB_STATE_MODS_DEPRESSED));
const xkb_mod_mask_t latched = xkb_state_serialize_mods(m_state, xkb_state_component(XKB_STATE_MODS_LATCHED));
const xkb_mod_mask_t locked = xkb_state_serialize_mods(m_state, xkb_state_component(XKB_STATE_MODS_LOCKED));
xkb_state_update_mask(m_state, depressed, latched, locked, 0, 0, nextLayout);
updateModifiers();
}
KeyboardInputRedirection::KeyboardInputRedirection(InputRedirection *parent) KeyboardInputRedirection::KeyboardInputRedirection(InputRedirection *parent)
: QObject(parent) : QObject(parent)
, m_input(parent) , m_input(parent)
@ -344,6 +359,19 @@ void KeyboardInputRedirection::init()
connect(workspace(), &Workspace::clientActivated, this, &KeyboardInputRedirection::update); connect(workspace(), &Workspace::clientActivated, this, &KeyboardInputRedirection::update);
connect(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::lockStateChanged, this, &KeyboardInputRedirection::update); connect(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::lockStateChanged, this, &KeyboardInputRedirection::update);
QAction *switchKeyboardAction = new QAction(this);
switchKeyboardAction->setObjectName(QStringLiteral("Switch to Next Keyboard Layout"));
switchKeyboardAction->setProperty("componentName", QStringLiteral("KDE Keyboard Layout Switcher"));
const QKeySequence sequence = QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_K);
KGlobalAccel::self()->setDefaultShortcut(switchKeyboardAction, QList<QKeySequence>({sequence}));
KGlobalAccel::self()->setShortcut(switchKeyboardAction, QList<QKeySequence>({sequence}));
m_input->registerShortcut(sequence, switchKeyboardAction);
connect(switchKeyboardAction, &QAction::triggered, this,
[this] {
m_xkb->switchToNextLayout();
}
);
m_xkb->reconfigure(); m_xkb->reconfigure();
} }

2
keyboard_input.h
View file

@ -58,6 +58,8 @@ public:
Qt::KeyboardModifiers modifiers() const; Qt::KeyboardModifiers modifiers() const;
bool shouldKeyRepeat(quint32 key) const; bool shouldKeyRepeat(quint32 key) const;
void switchToNextLayout();
private: private:
xkb_keymap *loadKeymapFromConfig(); xkb_keymap *loadKeymapFromConfig();
xkb_keymap *loadDefaultKeymap(); xkb_keymap *loadDefaultKeymap();