[modules/layout] add a new - generic - layout module
Add a new module "layout" that will eventually evolve into the only keyboard layout module. Right now, it uses an external binary (get-kbd-layout) to determine the layout of a keyboard device (because I did not manage to call libX11 with ctypes correctly). see #788 see #790
This commit is contained in:
parent
902288f30d
commit
dfd23a44de
5 changed files with 93 additions and 0 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -1,3 +1,5 @@
|
||||||
|
*.o
|
||||||
|
|
||||||
# Vim swap files
|
# Vim swap files
|
||||||
*swp
|
*swp
|
||||||
*~
|
*~
|
||||||
|
|
BIN
bin/get-kbd-layout
Executable file
BIN
bin/get-kbd-layout
Executable file
Binary file not shown.
39
bumblebee_status/modules/core/layout.py
Normal file
39
bumblebee_status/modules/core/layout.py
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
# pylint: disable=C0111,R0903
|
||||||
|
|
||||||
|
"""Displays the current keyboard layout
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
* layout.device: The device ID of the keyboard (as reported by `xinput -list`), defaults to the core device
|
||||||
|
"""
|
||||||
|
|
||||||
|
import re
|
||||||
|
|
||||||
|
import core.widget
|
||||||
|
import core.module
|
||||||
|
|
||||||
|
import util.cli
|
||||||
|
|
||||||
|
from bumblebee_status.discover import utility
|
||||||
|
|
||||||
|
class Module(core.module.Module):
|
||||||
|
def __init__(self, config, theme):
|
||||||
|
super().__init__(config=config, theme=theme, widgets=core.widget.Widget(self.get_layout))
|
||||||
|
|
||||||
|
self._cmd = utility("get-kbd-layout")
|
||||||
|
keyboard = self.parameter("device", None)
|
||||||
|
if keyboard:
|
||||||
|
self._cmd += " {}".format(keyboard)
|
||||||
|
|
||||||
|
def get_layout(self, widget):
|
||||||
|
result = util.cli.execute(self._cmd, ignore_errors=True)
|
||||||
|
|
||||||
|
m = re.search("([a-zA-Z]+_)?([a-zA-Z]+)(\(([\w-]+)\))?", result)
|
||||||
|
|
||||||
|
if m:
|
||||||
|
layout = m.group(2)
|
||||||
|
variant = m.group(3)
|
||||||
|
return layout if not variant else "{} {}".format(layout, variant)
|
||||||
|
|
||||||
|
return "n/a"
|
||||||
|
|
||||||
|
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
13
util/Makefile
Normal file
13
util/Makefile
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
CC=gcc
|
||||||
|
CFLAGS=
|
||||||
|
|
||||||
|
%.o: %.c
|
||||||
|
$(CC) -c -o $@ $< $(CFLAGS)
|
||||||
|
|
||||||
|
../bin/get-kbd-layout: layout.o
|
||||||
|
$(CC) -o $@ layout.o -lX11
|
||||||
|
|
||||||
|
.PHONY: clean
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f *.o
|
39
util/layout.c
Normal file
39
util/layout.c
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <X11/XKBlib.h>
|
||||||
|
|
||||||
|
void err_if(int condition, const char* msg)
|
||||||
|
{
|
||||||
|
if (condition) {
|
||||||
|
fprintf(stderr, "fatal: %s\n", msg);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
Display* display = XOpenDisplay(NULL);
|
||||||
|
err_if(!display, "unable to open display");
|
||||||
|
|
||||||
|
int kbd = argc == 1 ? XkbUseCoreKbd : atoi(argv[1]);
|
||||||
|
|
||||||
|
XkbStateRec state;
|
||||||
|
XkbGetState(display, kbd, &state);
|
||||||
|
|
||||||
|
XkbDescPtr desc = XkbGetKeyboard(display, XkbAllComponentsMask, kbd);
|
||||||
|
char* symbols = XGetAtomName(display, desc->names->symbols);
|
||||||
|
printf("%s\n", symbols);
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
char *group = XGetAtomName(display, desc->names->groups[state.group]);
|
||||||
|
XFree(group);
|
||||||
|
#endif
|
||||||
|
XFree(symbols);
|
||||||
|
XFree(desc);
|
||||||
|
|
||||||
|
XCloseDisplay(display);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue