napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[keyboard] Add support for getting the layout via locale1

Browse Source 
Getter counterpart to the previous commit, to support using locale1 to
fetch the current keyboard config.

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2023-08-12 21:41:37 +09:00
parent 812d861307
commit 25bb41f549
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/keyboard/Config.cpp
View File

@ -331,21 +331,10 @@ findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout )
}
void
Config::detectCurrentKeyboardLayout()
Config::getCurrentKeyboardLayoutXkb( QString& currentLayout, QString& currentVariant )
{
if ( m_state != State::Initial )
{
return;
}
cScopedAssignment returnToIntial( &m_state, State::Initial );
m_state = State::Guessing;
//### Detect current keyboard layout and variant
QString currentLayout;
QString currentVariant;
QProcess process;
process.start( "setxkbmap", QStringList() << "-print" );
if ( process.waitForFinished() )
{
const QStringList list = QString( process.readAll() ).split( "\n", SplitSkipEmptyParts );
@ -385,6 +374,47 @@ Config::detectCurrentKeyboardLayout()
}
}
}
}
void
Config::getCurrentKeyboardLayoutLocale1( QString& currentLayout, QString& currentVariant )
{
QDBusInterface locale1( "org.freedesktop.locale1",
"/org/freedesktop/locale1",
"org.freedesktop.locale1",
QDBusConnection::systemBus() );
if ( !locale1.isValid() )
{
cWarning() << "Interface" << locale1.interface() << "is not valid.";
return;
}
currentLayout = locale1.property( "X11Layout" ).toString().split( "," ).last();
currentVariant = locale1.property( "X11Variant" ).toString().split( "," ).last();
}
void
Config::detectCurrentKeyboardLayout()
{
if ( m_state != State::Initial )
{
return;
}
cScopedAssignment returnToIntial( &m_state, State::Initial );
m_state = State::Guessing;
//### Detect current keyboard layout and variant
QString currentLayout;
QString currentVariant;
if ( m_useLocale1 )
{
getCurrentKeyboardLayoutLocale1( currentLayout, currentVariant );
}
else
{
getCurrentKeyboardLayoutXkb( currentLayout, currentVariant );
}
//### Layouts and Variants
QPersistentModelIndex currentLayoutItem = findLayout( m_keyboardLayoutsModel, currentLayout );

3
src/modules/keyboard/Config.h
View File

@ -91,6 +91,9 @@ private:
void xkbApply();
void locale1Apply();
void getCurrentKeyboardLayoutXkb( QString& currentLayout, QString& currentVariant );
void getCurrentKeyboardLayoutLocale1( QString& currentLayout, QString& currentVariant );
KeyboardModelsModel* m_keyboardModelsModel;
KeyboardLayoutModel* m_keyboardLayoutsModel;
KeyboardVariantsModel* m_keyboardVariantsModel;