[modules] layout-xkbswitch: Update to new API
This commit is contained in:
parent
d1b0d8b123
commit
69c57836df
1 changed files with 26 additions and 25 deletions
|
@ -4,37 +4,38 @@ Requires the following executable:
|
||||||
* xkb-switch
|
* xkb-switch
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import bumblebee.util
|
import core.module
|
||||||
import bumblebee.input
|
import core.widget
|
||||||
import bumblebee.output
|
import core.decorators
|
||||||
import bumblebee.engine
|
import core.input
|
||||||
|
|
||||||
|
import util.cli
|
||||||
|
|
||||||
class Module(bumblebee.engine.Module):
|
class Module(core.module.Module):
|
||||||
def __init__(self, engine, config):
|
@core.decorators.every(seconds=60)
|
||||||
widget = bumblebee.output.Widget(full_text=self.current_layout)
|
def __init__(self, config):
|
||||||
super(Module, self).__init__(engine, config, widget)
|
super().__init__(config, core.widget.Widget(self.current_layout))
|
||||||
engine.input.register_callback(
|
|
||||||
|
core.input.register(
|
||||||
self,
|
self,
|
||||||
button=bumblebee.input.LEFT_MOUSE,
|
button=core.input.LEFT_MOUSE,
|
||||||
cmd=self._next_keymap)
|
cmd=self.__next_keymap)
|
||||||
self._current_layout = self._get_current_layout()
|
self.__current_layout = self.__get_current_layout()
|
||||||
|
|
||||||
def current_layout(self, __):
|
def current_layout(self, _):
|
||||||
return self._current_layout
|
return self.__current_layout
|
||||||
|
|
||||||
def _next_keymap(self, event):
|
def __next_keymap(self, event):
|
||||||
|
util.cli.execute('xkb-switch -n', ignore_errors=True)
|
||||||
|
|
||||||
|
def __get_current_layout(self):
|
||||||
try:
|
try:
|
||||||
bumblebee.util.execute("xkb-switch -n")
|
res = util.cli.execute('xkb-switch')
|
||||||
|
return res.split('\n')[0]
|
||||||
except RuntimeError:
|
except RuntimeError:
|
||||||
pass
|
return ['n/a']
|
||||||
|
|
||||||
def _get_current_layout(self):
|
def update(self):
|
||||||
try:
|
self.__current_layout = self.__get_current_layout()
|
||||||
res = bumblebee.util.execute("xkb-switch")
|
|
||||||
return res.split("\n")[0]
|
|
||||||
except RuntimeError:
|
|
||||||
return ["n/a"]
|
|
||||||
|
|
||||||
def update(self, __):
|
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||||
self._current_layout = self._get_current_layout()
|
|
||||||
|
|
Loading…
Reference in a new issue