l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/layout] use python-only layout detection

Browse source 
remove precompiled binary and make the layout module
fall back to the python implementation.

fixes #883
This commit is contained in:
tobi-wan-kenobi 2022-07-03 14:02:38 +02:00
parent 326e2f9318
commit 6f4f163a7d
3 changed files with 1 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/get-kbd-layout
View file

Binary file not shown.

39
bumblebee_status/modules/core/layout.py
View file

@ -1,39 +0,0 @@
# 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

1
bumblebee_status/modules/core/layout.py Symbolic link
View file

@ -0,0 +1 @@
layout-xkb.py

39
util/layout.c
View file

@ -1,39 +0,0 @@
#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;
}