masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds variant to xkblayout

Browse Source
This commit is contained in:
fahrstuhl 2016-01-01 14:04:32 +01:00
parent 79c773184a
commit 0a63932c62
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
i3pystatus/xkblayout.py
View File

@ -20,7 +20,7 @@ class Xkblayout(IntervalModule):
on_leftclick = "change_layout" on_leftclick = "change_layout"
def run(self): def run(self):
kblayout = subprocess.check_output("setxkbmap -query | awk '/layout/{print $2}'", shell=True).decode('utf-8').strip() kblayout = subprocess.check_output("setxkbmap -query | awk '/layout/,/variant/{print $2}'", shell=True).decode('utf-8').replace("\n"," ").strip()
self.output = { self.output = {
"full_text": self.format.format(name=kblayout).upper(), "full_text": self.format.format(name=kblayout).upper(),
@ -29,12 +29,12 @@ class Xkblayout(IntervalModule):
def change_layout(self): def change_layout(self):
layouts = self.layouts layouts = self.layouts
kblayout = subprocess.check_output("setxkbmap -query | awk '/layout/{print $2}'", shell=True).decode('utf-8').strip() kblayout = subprocess.check_output("setxkbmap -query | awk '/layout/,/variant/{print $2}'", shell=True).decode('utf-8').replace("\n"," ").strip()
if kblayout in layouts: if kblayout in layouts:
position = layouts.index(kblayout) position = layouts.index(kblayout)
try: try:
subprocess.check_call(["setxkbmap", layouts[position + 1]]) subprocess.check_call(["setxkbmap"] + layouts[position + 1].split())
except IndexError: except IndexError:
subprocess.check_call(["setxkbmap", layouts[0]]) subprocess.check_call(["setxkbmap"] + layouts[0].split())
else: else:
subprocess.check_call(["setxkbmap", layouts[0]]) subprocess.check_call(["setxkbmap"] + layouts[0].split())