From a67db2d4847d798c01d4fd7584c5bb9297e109e3 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Fri, 6 Jan 2023 15:30:57 +0200 Subject: Kxkb: Improve layout switching 1) New layout switching approach The new approach is based on the "grp" options group of Xkb and so enables us to use predefined X11 layout (group) switching hotkeys like "Caps Lock" or "Shift+Alt" (you can see the full list in the Options tab). The added bonus to this is that we conform to the Xkb setting. The code lets Xkb handle the keyboard layout switching hotkey(s) and is similar to the one that is used in kkbswitch, monitoring for an Xkb group (layout) change event. This solution required me to remove some hacky and obsolete code which was there to support really old pre-XFree-4.2 era systems and included the "include groups" hack. This means that the "Enable latin layout" checkbox is now gone and setxkbmap is only called when the keyboard layouts and/or options are modified, and not for every layout change. 2) Common layout switching hotkeys combobox A combobox was added to the first page of the Keyboard Layouts KCM module. It provides to the users a quick way to set a layout switching key combination. It also controls the "grp" group in the Xkb tab. A special note about this combobox is that, even if Append Mode was selected in the Xkb Options tab, this hotkey will overwrite previous hotkey options. This means that all grp: options will be forced removed before applying the option from the combobox (in contrast to specifying options via the Xkb Options tab, which, in Append Mode, will not get overwritten until next login). Signed-off-by: Mavridis Philippe --- kxkb/layoutmap.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'kxkb/layoutmap.h') diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h index 7b0ebad61..38e6251ad 100644 --- a/kxkb/layoutmap.h +++ b/kxkb/layoutmap.h @@ -27,13 +27,11 @@ // LayoutInfo is used for sticky switching and per-window/application switching policy struct LayoutState { const LayoutUnit& layoutUnit; - int group; LayoutState(const LayoutUnit& layoutUnit_): - layoutUnit(layoutUnit_), - group(layoutUnit_.defaultGroup) + layoutUnit(layoutUnit_) { -// kdDebug() << "new LayoutState " << layoutUnit.toPair() << " group: " << group << endl; +// kdDebug() << "new LayoutState " << layoutUnit.toPair() << endl; } }; @@ -49,7 +47,6 @@ public: // void setConfig(const KxkbConfig& kxkbConfig); void setCurrentLayout(const LayoutUnit& layoutUnit); - void setCurrentGroup(int group); LayoutState& getNextLayout(); LayoutState& getCurrentLayout(); -- cgit v1.2.1