Merge lp:~ermshiperete/onboard/keyman into lp:onboard
- keyman
- Merge into trunk
Proposed by
Eberhard Beilharz
Status: | Needs review |
---|---|
Proposed branch: | lp:~ermshiperete/onboard/keyman |
Merge into: | lp:onboard |
Diff against target: |
456 lines (+262/-14) 5 files modified
Onboard/Keyman.py (+203/-0) Onboard/LayoutLoaderSVG.py (+16/-7) Onboard/OnboardGtk.py (+33/-6) Onboard/utils.py (+9/-0) setup.py (+1/-1) |
To merge this branch: | bzr merge lp:~ermshiperete/onboard/keyman |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Onboard Devel Team | Pending | ||
Review via email: mp+414692@code.launchpad.net |
Commit message
Add support for Keyman keyboards
This change will allow to show OSK for Keyman keyboards in addition to previously supported ones. See https:/
Description of the change
Add support for Keyman keyboards
This change will allow to show OSK for Keyman keyboards in addition to previously supported ones. See https:/
To post a comment you must log in.
Unmerged revisions
- 2296. By Eberhard Beilharz <email address hidden>
-
Add support for Keyman keyboards
This change will allow to show OSK for Keyman keyboards in addition
to previously supported ones.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'Onboard/Keyman.py' | |||
2 | --- Onboard/Keyman.py 1970-01-01 00:00:00 +0000 | |||
3 | +++ Onboard/Keyman.py 2022-01-27 19:28:30 +0000 | |||
4 | @@ -0,0 +1,203 @@ | |||
5 | 1 | # -*- coding: utf-8 -*- | ||
6 | 2 | |||
7 | 3 | # Copyright © 2018 Daniel Glassey <dglassey@gmail.com> | ||
8 | 4 | # | ||
9 | 5 | # This file is part of Onboard. | ||
10 | 6 | # | ||
11 | 7 | # Onboard is free software; you can redistribute it and/or modify | ||
12 | 8 | # it under the terms of the GNU General Public License as published by | ||
13 | 9 | # the Free Software Foundation; either version 3 of the License, or | ||
14 | 10 | # (at your option) any later version. | ||
15 | 11 | # | ||
16 | 12 | # Onboard is distributed in the hope that it will be useful, | ||
17 | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
19 | 15 | # GNU General Public License for more details. | ||
20 | 16 | # | ||
21 | 17 | # You should have received a copy of the GNU General Public License | ||
22 | 18 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
23 | 19 | |||
24 | 20 | """ | ||
25 | 21 | Monitoring keyman keyboard | ||
26 | 22 | """ | ||
27 | 23 | |||
28 | 24 | from __future__ import division, print_function, unicode_literals | ||
29 | 25 | |||
30 | 26 | try: | ||
31 | 27 | import dbus | ||
32 | 28 | except ImportError: | ||
33 | 29 | pass | ||
34 | 30 | |||
35 | 31 | from Onboard.utils import Modifiers | ||
36 | 32 | |||
37 | 33 | from Onboard.Version import require_gi_versions | ||
38 | 34 | require_gi_versions() | ||
39 | 35 | from gi.repository import GObject | ||
40 | 36 | from lxml import etree | ||
41 | 37 | |||
42 | 38 | |||
43 | 39 | class KeymanDBus(GObject.GObject): | ||
44 | 40 | """ | ||
45 | 41 | Keyman D-bus control and signal handling. | ||
46 | 42 | """ | ||
47 | 43 | __gsignals__ = { | ||
48 | 44 | str('keyman-changed'): (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE, ()) | ||
49 | 45 | } | ||
50 | 46 | |||
51 | 47 | KEYMAN_SCHEMA_ID = "com.Keyman" | ||
52 | 48 | |||
53 | 49 | KM_DBUS_NAME = "com.Keyman" | ||
54 | 50 | KM_DBUS_PATH = "/com/Keyman/IBus" | ||
55 | 51 | KM_DBUS_IFACE = "com.Keyman" | ||
56 | 52 | KM_DBUS_PROP_LDML = "LDMLFile" | ||
57 | 53 | KM_DBUS_PROP_NAME = "Name" | ||
58 | 54 | |||
59 | 55 | def __init__(self): | ||
60 | 56 | GObject.GObject.__init__(self) | ||
61 | 57 | self.key_labels = None | ||
62 | 58 | self.name = "None" | ||
63 | 59 | self._name_callbacks = [] | ||
64 | 60 | |||
65 | 61 | if not "dbus" in globals(): | ||
66 | 62 | raise ImportError("python-dbus unavailable") | ||
67 | 63 | |||
68 | 64 | # connect to session bus | ||
69 | 65 | try: | ||
70 | 66 | self._bus = dbus.SessionBus() | ||
71 | 67 | except dbus.exceptions.DBusException: | ||
72 | 68 | raise RuntimeError("D-Bus session bus unavailable") | ||
73 | 69 | self._bus.add_signal_receiver(self._on_name_owner_changed, | ||
74 | 70 | "NameOwnerChanged", | ||
75 | 71 | dbus.BUS_DAEMON_IFACE, | ||
76 | 72 | arg0=self.KM_DBUS_NAME) | ||
77 | 73 | # Initial state | ||
78 | 74 | proxy = self._bus.get_object(dbus.BUS_DAEMON_NAME, dbus.BUS_DAEMON_PATH) | ||
79 | 75 | result = proxy.NameHasOwner(self.KM_DBUS_NAME, dbus_interface=dbus.BUS_DAEMON_IFACE) | ||
80 | 76 | self._set_connection(bool(result)) | ||
81 | 77 | |||
82 | 78 | def _set_connection(self, active): | ||
83 | 79 | ''' Update interface object, state and notify listeners ''' | ||
84 | 80 | if active: | ||
85 | 81 | proxy = self._bus.get_object(self.KM_DBUS_NAME, self.KM_DBUS_PATH) | ||
86 | 82 | self._iface = dbus.Interface(proxy, dbus.PROPERTIES_IFACE) | ||
87 | 83 | self._iface.connect_to_signal("PropertiesChanged", | ||
88 | 84 | self._on_name_prop_changed) | ||
89 | 85 | self._LDMLFile = self._iface.Get(self.KM_DBUS_IFACE, self.KM_DBUS_PROP_LDML) | ||
90 | 86 | self.name = self._iface.Get(self.KM_DBUS_IFACE, self.KM_DBUS_PROP_NAME) | ||
91 | 87 | |||
92 | 88 | if self._LDMLFile and self.name != "None": | ||
93 | 89 | self.key_labels = KeymanLabels() | ||
94 | 90 | self.key_labels.parse_labels(self._LDMLFile) | ||
95 | 91 | else: | ||
96 | 92 | self.key_labels = None | ||
97 | 93 | else: | ||
98 | 94 | self._iface = None | ||
99 | 95 | self.name = "None" | ||
100 | 96 | self._LDMLFile = None | ||
101 | 97 | self.key_labels = None | ||
102 | 98 | |||
103 | 99 | def _on_name_owner_changed(self, name, old, new): | ||
104 | 100 | ''' | ||
105 | 101 | The daemon has de/registered the name. | ||
106 | 102 | Called when ibus-kmfl un/loads a keyboard | ||
107 | 103 | ''' | ||
108 | 104 | active = old == "" | ||
109 | 105 | self._set_connection(active) | ||
110 | 106 | |||
111 | 107 | def _on_name_prop_changed(self, iface, changed_props, invalidated_props): | ||
112 | 108 | ''' The Keyboard name has changed.''' | ||
113 | 109 | if self.KM_DBUS_PROP_NAME in changed_props: | ||
114 | 110 | self.name = changed_props.get(self.KM_DBUS_PROP_NAME) | ||
115 | 111 | self._LDMLFile = self._iface.Get(self.KM_DBUS_IFACE, self.KM_DBUS_PROP_LDML) | ||
116 | 112 | if self._LDMLFile and self.name != "None": | ||
117 | 113 | self.key_labels = KeymanLabels() | ||
118 | 114 | self.key_labels.parse_labels(self._LDMLFile) | ||
119 | 115 | else: | ||
120 | 116 | self.key_labels = None | ||
121 | 117 | |||
122 | 118 | # notify listeners | ||
123 | 119 | for callback in self._name_callbacks: | ||
124 | 120 | callback(self.name) | ||
125 | 121 | |||
126 | 122 | def on_keyboard_changed(self, keyboardid): | ||
127 | 123 | self.emit("keyman-changed", keyboardid) | ||
128 | 124 | |||
129 | 125 | ########## | ||
130 | 126 | # Public | ||
131 | 127 | ########## | ||
132 | 128 | |||
133 | 129 | def state_notify_add(self, callback): | ||
134 | 130 | """ Convenience function to subscribes to all notifications """ | ||
135 | 131 | self.name_notify_add(callback) | ||
136 | 132 | |||
137 | 133 | def name_notify_add(self, callback): | ||
138 | 134 | self._name_callbacks.append(callback) | ||
139 | 135 | |||
140 | 136 | def is_active(self): | ||
141 | 137 | return bool(self._iface) | ||
142 | 138 | |||
143 | 139 | |||
144 | 140 | class KeymanLabels(): | ||
145 | 141 | keymankeys = {} | ||
146 | 142 | # keymanlabels is a dict of modmask : label (and also has "code" : keycode?) | ||
147 | 143 | # keymankeys is a dict of keycode : keymanlabels | ||
148 | 144 | |||
149 | 145 | def parse_labels(self, ldmlfile): | ||
150 | 146 | tree = etree.parse(ldmlfile) | ||
151 | 147 | root = tree.getroot() | ||
152 | 148 | keymaps = tree.findall('keyMap') | ||
153 | 149 | |||
154 | 150 | for keymap in keymaps: | ||
155 | 151 | if keymap.attrib: | ||
156 | 152 | # if there is more than one modifier set split it here | ||
157 | 153 | # because will need to duplicate the label set | ||
158 | 154 | keyman_modifiers = self.convert_ldml_modifiers_to_onboard(keymap.attrib['modifiers']) | ||
159 | 155 | else: | ||
160 | 156 | keyman_modifiers = (0,) | ||
161 | 157 | maps = keymap.findall('map') | ||
162 | 158 | for map in maps: | ||
163 | 159 | for keymanmodifier in keyman_modifiers: | ||
164 | 160 | iso = "A" + map.attrib['iso'] | ||
165 | 161 | if iso == "AA03": | ||
166 | 162 | iso = "SPCE" | ||
167 | 163 | elif iso == "AE00": | ||
168 | 164 | iso = "TLDE" | ||
169 | 165 | elif iso == "AB00": | ||
170 | 166 | iso = "LSGT" | ||
171 | 167 | elif iso == "AC12": | ||
172 | 168 | iso = "BKSL" | ||
173 | 169 | if not iso in self.keymankeys: | ||
174 | 170 | self.keymankeys[iso] = { keymanmodifier : map.attrib['to'] } | ||
175 | 171 | else: | ||
176 | 172 | self.keymankeys[iso][keymanmodifier] = map.attrib['to'] | ||
177 | 173 | |||
178 | 174 | def labels_from_id(self, id): | ||
179 | 175 | if id in self.keymankeys: | ||
180 | 176 | return self.keymankeys[id] | ||
181 | 177 | else: | ||
182 | 178 | print("unknown key id: ", id) | ||
183 | 179 | return {} | ||
184 | 180 | |||
185 | 181 | def convert_ldml_modifiers_to_onboard(self, modifiers): | ||
186 | 182 | list_modifiers = modifiers.split(" ") | ||
187 | 183 | keyman_modifiers = () | ||
188 | 184 | for modifier in list_modifiers: | ||
189 | 185 | keymanmod = 0 | ||
190 | 186 | keys = modifier.split("+") | ||
191 | 187 | for key in keys: | ||
192 | 188 | if "shift" == key: | ||
193 | 189 | keymanmod |= Modifiers.SHIFT | ||
194 | 190 | if "altR" == key: | ||
195 | 191 | keymanmod |= Modifiers.ALTGR | ||
196 | 192 | if "ctrlR" == key: | ||
197 | 193 | keymanmod |= Modifiers.MOD3 | ||
198 | 194 | if "ctrlL" == key: | ||
199 | 195 | keymanmod |= Modifiers.CTRL | ||
200 | 196 | if "ctrl" == key: | ||
201 | 197 | keymanmod |= Modifiers.CTRL | ||
202 | 198 | if "altL" == key: | ||
203 | 199 | keymanmod |= Modifiers.ALT | ||
204 | 200 | if "alt" == key: | ||
205 | 201 | keymanmod |= Modifiers.ALT | ||
206 | 202 | keyman_modifiers = keyman_modifiers + (keymanmod,) | ||
207 | 203 | return keyman_modifiers | ||
208 | 0 | 204 | ||
209 | === modified file 'Onboard/LayoutLoaderSVG.py' | |||
210 | --- Onboard/LayoutLoaderSVG.py 2017-04-17 23:53:19 +0000 | |||
211 | +++ Onboard/LayoutLoaderSVG.py 2022-01-27 19:28:30 +0000 | |||
212 | @@ -38,7 +38,7 @@ | |||
213 | 38 | from Onboard.utils import (modifiers, Rect, | 38 | from Onboard.utils import (modifiers, Rect, |
214 | 39 | toprettyxml, Version, open_utf8, | 39 | toprettyxml, Version, open_utf8, |
215 | 40 | permute_mask, LABEL_MODIFIERS, | 40 | permute_mask, LABEL_MODIFIERS, |
217 | 41 | unicode_str, XDGDirs) | 41 | KEYMAN_LABEL_MODIFIERS, unicode_str, XDGDirs) |
218 | 42 | 42 | ||
219 | 43 | # Layout items that can be created dynamically via the 'class' XML attribute. | 43 | # Layout items that can be created dynamically via the 'class' XML attribute. |
220 | 44 | from Onboard.WordSuggestions import WordListPanel # noqa: flake8 | 44 | from Onboard.WordSuggestions import WordListPanel # noqa: flake8 |
221 | @@ -86,9 +86,11 @@ | |||
222 | 86 | 86 | ||
223 | 87 | # precalc mask permutations | 87 | # precalc mask permutations |
224 | 88 | _label_modifier_masks = permute_mask(LABEL_MODIFIERS) | 88 | _label_modifier_masks = permute_mask(LABEL_MODIFIERS) |
225 | 89 | _keyman_label_modifier_masks = permute_mask(KEYMAN_LABEL_MODIFIERS) | ||
226 | 89 | 90 | ||
227 | 90 | def __init__(self): | 91 | def __init__(self): |
228 | 91 | self._vk = None | 92 | self._vk = None |
229 | 93 | self._keyman_labels = None | ||
230 | 92 | self._svg_cache = {} | 94 | self._svg_cache = {} |
231 | 93 | self._format = None # format of the currently loading layout | 95 | self._format = None # format of the currently loading layout |
232 | 94 | self._layout_filename = "" | 96 | self._layout_filename = "" |
233 | @@ -97,14 +99,14 @@ | |||
234 | 97 | self._layout_regex = re.compile("([^\(]+) (?: \( ([^\)]*) \) )?", | 99 | self._layout_regex = re.compile("([^\(]+) (?: \( ([^\)]*) \) )?", |
235 | 98 | re.VERBOSE) | 100 | re.VERBOSE) |
236 | 99 | 101 | ||
238 | 100 | def load(self, vk, layout_filename, color_scheme): | 102 | def load(self, vk, keyman_labels, layout_filename, color_scheme): |
239 | 101 | """ Load layout root file. """ | 103 | """ Load layout root file. """ |
240 | 102 | self._system_layout, self._system_variant = \ | 104 | self._system_layout, self._system_variant = \ |
241 | 103 | self._get_system_keyboard_layout(vk) | 105 | self._get_system_keyboard_layout(vk) |
242 | 104 | _logger.info("current system keyboard layout(variant): '{}'" | 106 | _logger.info("current system keyboard layout(variant): '{}'" |
243 | 105 | .format(self._get_system_layout_string())) | 107 | .format(self._get_system_layout_string())) |
244 | 106 | 108 | ||
246 | 107 | layout = self._load(vk, layout_filename, color_scheme, | 109 | layout = self._load(vk, keyman_labels, layout_filename, color_scheme, |
247 | 108 | os.path.dirname(layout_filename)) | 110 | os.path.dirname(layout_filename)) |
248 | 109 | if layout: | 111 | if layout: |
249 | 110 | # purge attributes only used during loading | 112 | # purge attributes only used during loading |
250 | @@ -122,10 +124,10 @@ | |||
251 | 122 | 124 | ||
252 | 123 | return layout | 125 | return layout |
253 | 124 | 126 | ||
256 | 125 | def _load(self, vk, layout_filename, color_scheme, | 127 | def _load(self, vk, keyman_labels, layout_filename, color_scheme, root_layout_dir, parent_item = None): |
255 | 126 | root_layout_dir, parent_item=None): | ||
257 | 127 | """ Load or include layout file at any depth level. """ | 128 | """ Load or include layout file at any depth level. """ |
258 | 128 | self._vk = vk | 129 | self._vk = vk |
259 | 130 | self._keyman_labels = keyman_labels | ||
260 | 129 | self._layout_filename = layout_filename | 131 | self._layout_filename = layout_filename |
261 | 130 | self._color_scheme = color_scheme | 132 | self._color_scheme = color_scheme |
262 | 131 | self._root_layout_dir = root_layout_dir | 133 | self._root_layout_dir = root_layout_dir |
263 | @@ -254,6 +256,7 @@ | |||
264 | 254 | filepath = config.find_layout_filename(filename, "layout include") | 256 | filepath = config.find_layout_filename(filename, "layout include") |
265 | 255 | _logger.info("Including layout '{}'".format(filename)) | 257 | _logger.info("Including layout '{}'".format(filename)) |
266 | 256 | incl_root = LayoutLoaderSVG()._load(self._vk, | 258 | incl_root = LayoutLoaderSVG()._load(self._vk, |
267 | 259 | self._keyman_labels, | ||
268 | 257 | filepath, | 260 | filepath, |
269 | 258 | self._color_scheme, | 261 | self._color_scheme, |
270 | 259 | self._root_layout_dir, | 262 | self._root_layout_dir, |
271 | @@ -632,7 +635,13 @@ | |||
272 | 632 | # Get labels from keyboard mapping first. | 635 | # Get labels from keyboard mapping first. |
273 | 633 | if key.type == KeyCommon.KEYCODE_TYPE and \ | 636 | if key.type == KeyCommon.KEYCODE_TYPE and \ |
274 | 634 | key.id not in ["BKSP"]: | 637 | key.id not in ["BKSP"]: |
276 | 635 | if self._vk: # xkb keyboard found? | 638 | if self._keyman_labels: # using Keyman keyboard |
277 | 639 | # load the labels from self._keyman_labels | ||
278 | 640 | vkmodmasks = self._label_modifier_masks | ||
279 | 641 | if sys.version_info.major == 2: | ||
280 | 642 | vkmodmasks = [long(m) for m in vkmodmasks] | ||
281 | 643 | labels = self._keyman_labels.labels_from_id(key.id) | ||
282 | 644 | elif self._vk: # xkb keyboard found? | ||
283 | 636 | vkmodmasks = self._label_modifier_masks | 645 | vkmodmasks = self._label_modifier_masks |
284 | 637 | if sys.version_info.major == 2: | 646 | if sys.version_info.major == 2: |
285 | 638 | vkmodmasks = [int(m) for m in vkmodmasks] | 647 | vkmodmasks = [int(m) for m in vkmodmasks] |
286 | @@ -666,7 +675,7 @@ | |||
287 | 666 | # override with per-keysym labels | 675 | # override with per-keysym labels |
288 | 667 | keysym_rules = self._get_keysym_rules(key) | 676 | keysym_rules = self._get_keysym_rules(key) |
289 | 668 | if key.type == KeyCommon.KEYCODE_TYPE: | 677 | if key.type == KeyCommon.KEYCODE_TYPE: |
291 | 669 | if self._vk: # xkb keyboard found? | 678 | if not self._keyman_labels and self._vk: # xkb keyboard found but no keyman one? |
292 | 670 | vkmodmasks = self._label_modifier_masks | 679 | vkmodmasks = self._label_modifier_masks |
293 | 671 | try: | 680 | try: |
294 | 672 | if sys.version_info.major == 2: | 681 | if sys.version_info.major == 2: |
295 | 673 | 682 | ||
296 | === modified file 'Onboard/OnboardGtk.py' | |||
297 | --- Onboard/OnboardGtk.py 2017-02-14 21:42:14 +0000 | |||
298 | +++ Onboard/OnboardGtk.py 2022-01-27 19:28:30 +0000 | |||
299 | @@ -30,6 +30,7 @@ | |||
300 | 30 | import time | 30 | import time |
301 | 31 | import signal | 31 | import signal |
302 | 32 | import os.path | 32 | import os.path |
303 | 33 | from lxml import etree | ||
304 | 33 | 34 | ||
305 | 34 | from Onboard.Version import require_gi_versions | 35 | from Onboard.Version import require_gi_versions |
306 | 35 | require_gi_versions() | 36 | require_gi_versions() |
307 | @@ -47,12 +48,13 @@ | |||
308 | 47 | from Onboard.KbdWindow import KbdWindow, KbdPlugWindow | 48 | from Onboard.KbdWindow import KbdWindow, KbdPlugWindow |
309 | 48 | from Onboard.Keyboard import Keyboard | 49 | from Onboard.Keyboard import Keyboard |
310 | 49 | from Onboard.KeyboardWidget import KeyboardWidget | 50 | from Onboard.KeyboardWidget import KeyboardWidget |
311 | 51 | from Onboard.Keyman import KeymanDBus | ||
312 | 50 | from Onboard.Indicator import Indicator | 52 | from Onboard.Indicator import Indicator |
313 | 51 | from Onboard.LayoutLoaderSVG import LayoutLoaderSVG | 53 | from Onboard.LayoutLoaderSVG import LayoutLoaderSVG |
314 | 52 | from Onboard.Appearance import ColorScheme | 54 | from Onboard.Appearance import ColorScheme |
315 | 53 | from Onboard.IconPalette import IconPalette | 55 | from Onboard.IconPalette import IconPalette |
316 | 54 | from Onboard.Exceptions import LayoutFileError | 56 | from Onboard.Exceptions import LayoutFileError |
318 | 55 | from Onboard.utils import unicode_str | 57 | from Onboard.utils import unicode_str, Modifiers |
319 | 56 | from Onboard.Timer import CallOnce, Timer | 58 | from Onboard.Timer import CallOnce, Timer |
320 | 57 | from Onboard.WindowUtils import show_confirmation_dialog | 59 | from Onboard.WindowUtils import show_confirmation_dialog |
321 | 58 | import Onboard.osk as osk | 60 | import Onboard.osk as osk |
322 | @@ -74,6 +76,8 @@ | |||
323 | 74 | """ | 76 | """ |
324 | 75 | 77 | ||
325 | 76 | keyboard = None | 78 | keyboard = None |
326 | 79 | keymandbus = None | ||
327 | 80 | _keyman_labels = None | ||
328 | 77 | 81 | ||
329 | 78 | def __init__(self): | 82 | def __init__(self): |
330 | 79 | 83 | ||
331 | @@ -99,12 +103,14 @@ | |||
332 | 99 | except dbus.exceptions.DBusException: | 103 | except dbus.exceptions.DBusException: |
333 | 100 | err_msg = "D-Bus session bus unavailable" | 104 | err_msg = "D-Bus session bus unavailable" |
334 | 101 | bus = None | 105 | bus = None |
335 | 106 | self.keymandbus = KeymanDBus() | ||
336 | 102 | 107 | ||
337 | 103 | if not bus: | 108 | if not bus: |
338 | 104 | _logger.warning(err_msg + " " + | 109 | _logger.warning(err_msg + " " + |
339 | 105 | "Onboard will start with reduced functionality. " | 110 | "Onboard will start with reduced functionality. " |
340 | 106 | "Single-instance check, " | 111 | "Single-instance check, " |
342 | 107 | "D-Bus service and " | 112 | "Keyman support, " |
343 | 113 | "D-Bus service and " | ||
344 | 108 | "hover click are disabled.") | 114 | "hover click are disabled.") |
345 | 109 | 115 | ||
346 | 110 | # Yield to GNOME Shell's keyboard before any other D-Bus activity | 116 | # Yield to GNOME Shell's keyboard before any other D-Bus activity |
347 | @@ -282,6 +288,9 @@ | |||
348 | 282 | self.do_connect(self.keymap, "state-changed", self.cb_state_changed) | 288 | self.do_connect(self.keymap, "state-changed", self.cb_state_changed) |
349 | 283 | # group changes | 289 | # group changes |
350 | 284 | Gdk.event_handler_set(cb_any_event, self) | 290 | Gdk.event_handler_set(cb_any_event, self) |
351 | 291 | # Keyman keyboard changes | ||
352 | 292 | if self.keymandbus: | ||
353 | 293 | self.keymandbus.name_notify_add(self.cb_keyman_changed) | ||
354 | 285 | 294 | ||
355 | 286 | # connect config notifications here to keep config from holding | 295 | # connect config notifications here to keep config from holding |
356 | 287 | # references to keyboard objects. | 296 | # references to keyboard objects. |
357 | @@ -553,6 +562,12 @@ | |||
358 | 553 | """ keyboard map change """ | 562 | """ keyboard map change """ |
359 | 554 | self.reload_layout_delayed() | 563 | self.reload_layout_delayed() |
360 | 555 | 564 | ||
361 | 565 | def cb_keyman_changed(self, name): | ||
362 | 566 | """ keyman keyboard change """ | ||
363 | 567 | _logger.debug("keyman changed to {}".format(name)) | ||
364 | 568 | self._keyman_labels = self.keymandbus.key_labels | ||
365 | 569 | self.reload_layout_delayed() | ||
366 | 570 | |||
367 | 556 | def cb_state_changed(self, keymap): | 571 | def cb_state_changed(self, keymap): |
368 | 557 | """ keyboard modifier state change """ | 572 | """ keyboard modifier state change """ |
369 | 558 | mod_mask = keymap.get_modifier_state() | 573 | mod_mask = keymap.get_modifier_state() |
370 | @@ -672,7 +687,7 @@ | |||
371 | 672 | self.reload_layout(force_update = True) | 687 | self.reload_layout(force_update = True) |
372 | 673 | self.keyboard_widget.update_transparency() | 688 | self.keyboard_widget.update_transparency() |
373 | 674 | 689 | ||
375 | 675 | def reload_layout_delayed(self): | 690 | def reload_layout_delayed(self, force_update=False): |
376 | 676 | """ | 691 | """ |
377 | 677 | Delay reloading the layout on keyboard map or group changes | 692 | Delay reloading the layout on keyboard map or group changes |
378 | 678 | This is mainly for LP #1313176 when Caps-lock is set up as | 693 | This is mainly for LP #1313176 when Caps-lock is set up as |
379 | @@ -689,14 +704,19 @@ | |||
380 | 689 | Checks if the X keyboard layout has changed and | 704 | Checks if the X keyboard layout has changed and |
381 | 690 | (re)loads Onboards layout accordingly. | 705 | (re)loads Onboards layout accordingly. |
382 | 691 | """ | 706 | """ |
384 | 692 | keyboard_state = (None, None) | 707 | keyboard_state = (None, None, None) |
385 | 693 | 708 | ||
386 | 694 | vk = self.get_vk() | 709 | vk = self.get_vk() |
387 | 695 | if vk: | 710 | if vk: |
388 | 696 | try: | 711 | try: |
389 | 697 | vk.reload() # reload keyboard names | 712 | vk.reload() # reload keyboard names |
390 | 713 | group = vk.get_current_group_name() | ||
391 | 714 | if self.keymandbus: | ||
392 | 715 | self._keyman_labels = self.keymandbus.key_labels | ||
393 | 716 | |||
394 | 698 | keyboard_state = (vk.get_layout_as_string(), | 717 | keyboard_state = (vk.get_layout_as_string(), |
396 | 699 | vk.get_current_group_name()) | 718 | vk.get_current_group_name(), |
397 | 719 | self.keymandbus.name if self.keymandbus else None) | ||
398 | 700 | except osk.error: | 720 | except osk.error: |
399 | 701 | self.reset_vk() | 721 | self.reset_vk() |
400 | 702 | force_update = True | 722 | force_update = True |
401 | @@ -704,6 +724,13 @@ | |||
402 | 704 | "keyboard information failed") | 724 | "keyboard information failed") |
403 | 705 | 725 | ||
404 | 706 | if self.keyboard_state != keyboard_state or force_update: | 726 | if self.keyboard_state != keyboard_state or force_update: |
405 | 727 | if self.keymandbus: | ||
406 | 728 | _logger.debug("Reloading layout. Layout: {}; Group: {}; Keyman: {}" | ||
407 | 729 | .format(vk.get_layout_as_string(), vk.get_current_group_name(), self.keymandbus.name)) | ||
408 | 730 | else: | ||
409 | 731 | _logger.debug("Reloading layout. Layout: {}; Group: {}" | ||
410 | 732 | .format(vk.get_layout_as_string(), vk.get_current_group_name())) | ||
411 | 733 | |||
412 | 707 | self.keyboard_state = keyboard_state | 734 | self.keyboard_state = keyboard_state |
413 | 708 | 735 | ||
414 | 709 | layout_filename = config.layout_filename | 736 | layout_filename = config.layout_filename |
415 | @@ -731,7 +758,7 @@ | |||
416 | 731 | 758 | ||
417 | 732 | color_scheme = ColorScheme.load(color_scheme_filename) \ | 759 | color_scheme = ColorScheme.load(color_scheme_filename) \ |
418 | 733 | if color_scheme_filename else None | 760 | if color_scheme_filename else None |
420 | 734 | layout = LayoutLoaderSVG().load(vk, layout_filename, color_scheme) | 761 | layout = LayoutLoaderSVG().load(vk, self._keyman_labels, layout_filename, color_scheme) |
421 | 735 | 762 | ||
422 | 736 | self.keyboard.set_layout(layout, color_scheme, vk) | 763 | self.keyboard.set_layout(layout, color_scheme, vk) |
423 | 737 | 764 | ||
424 | 738 | 765 | ||
425 | === modified file 'Onboard/utils.py' | |||
426 | --- Onboard/utils.py 2017-02-19 20:06:09 +0000 | |||
427 | +++ Onboard/utils.py 2022-01-27 19:28:30 +0000 | |||
428 | @@ -58,6 +58,15 @@ | |||
429 | 58 | Modifiers.NUMLK | \ | 58 | Modifiers.NUMLK | \ |
430 | 59 | Modifiers.ALTGR | 59 | Modifiers.ALTGR |
431 | 60 | 60 | ||
432 | 61 | # Keyman uses more modifiers inc MOD3(RCTRL) | ||
433 | 62 | KEYMAN_LABEL_MODIFIERS = Modifiers.SHIFT | \ | ||
434 | 63 | Modifiers.CAPS | \ | ||
435 | 64 | Modifiers.CTRL | \ | ||
436 | 65 | Modifiers.ALT | \ | ||
437 | 66 | Modifiers.NUMLK | \ | ||
438 | 67 | Modifiers.MOD3 | \ | ||
439 | 68 | Modifiers.ALTGR | ||
440 | 69 | |||
441 | 61 | modifiers = {"shift":1, | 70 | modifiers = {"shift":1, |
442 | 62 | "caps":2, | 71 | "caps":2, |
443 | 63 | "control":4, | 72 | "control":4, |
444 | 64 | 73 | ||
445 | === modified file 'setup.py' | |||
446 | --- setup.py 2017-05-14 14:36:31 +0000 | |||
447 | +++ setup.py 2022-01-27 19:28:30 +0000 | |||
448 | @@ -231,7 +231,7 @@ | |||
449 | 231 | "-Wsign-compare", | 231 | "-Wsign-compare", |
450 | 232 | "-Wdeclaration-after-statement", | 232 | "-Wdeclaration-after-statement", |
451 | 233 | "-Werror=declaration-after-statement", | 233 | "-Werror=declaration-after-statement", |
453 | 234 | "-Wlogical-op"], | 234 | "-fPIC" ], |
454 | 235 | 235 | ||
455 | 236 | **pkgconfig('gdk-3.0', 'x11', 'xi', 'xtst', 'xkbfile', | 236 | **pkgconfig('gdk-3.0', 'x11', 'xi', 'xtst', 'xkbfile', |
456 | 237 | 'dconf', 'libcanberra', 'hunspell', | 237 | 'dconf', 'libcanberra', 'hunspell', |