em/slstatus
1
0
Fork 0
Code Releases Activity
3b86e4b5ef
slstatus/components/keymap.c

89 lines
1.8 KiB
C
Raw Normal View History

Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
/* See LICENSE file for copyright and license details. */
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <X11/XKBlib.h>
#include <X11/Xlib.h>
#include "../util.h"
components/*.c: include slstatus.h this gives the compiler a chance to check weather the prototype and definiton matches or not, which would catch issues like 3c47701.
2022-10-26 22:14:53 +02:00
#include "../slstatus.h"
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
static int
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
valid_layout_or_variant(char *sym)
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
{
size_t i;
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
/* invalid symbols from xkb rules config */
static const char *invalid[] = { "evdev", "inet", "pc", "base" };
for (i = 0; i < LEN(invalid); i++) {
if (!strncmp(sym, invalid[i], strlen(invalid[i]))) {
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
return 0;
}
keymap: Add braces for for loop
2018-05-23 13:30:45 +02:00
}
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
return 1;
}
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
static char *
get_layout(char *syms, int grp_num)
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
{
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
char *tok, *layout;
int grp;
layout = NULL;
tok = strtok(syms, "+:");
for (grp = 0; tok && grp <= grp_num; tok = strtok(NULL, "+:")) {
if (!valid_layout_or_variant(tok)) {
continue;
} else if (strlen(tok) == 1 && isdigit(tok[0])) {
/* ignore :2, :3, :4 (additional layout groups) */
continue;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
}
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
layout = tok;
grp++;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
}
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
return layout;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
}
const char *
do not rely on obsolete feature function prototype with unspecified argument is obsolete since c99. additionally some of these function which don't take any argument were being called with a `const char *` arg, which is UB. fix both these issues by declararing ALL the components to accept a `const char *`, and name the arg "unused" if it's meant to be ignored.
2022-10-26 22:16:05 +02:00
keymap(const char *unused)
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
{
Display *dpy;
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
XkbDescRec *desc;
XkbStateRec state;
char *symbols, *layout;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
layout = NULL;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
if (!(dpy = XOpenDisplay(NULL))) {
warn("XOpenDisplay: Failed to open display");
return NULL;
}
if (!(desc = XkbAllocKeyboard())) {
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
warn("XkbAllocKeyboard: Failed to allocate keyboard");
goto end;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
}
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
if (XkbGetNames(dpy, XkbSymbolsNameMask, desc)) {
warn("XkbGetNames: Failed to retrieve key symbols");
goto end;
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
}
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
if (XkbGetState(dpy, XkbUseCoreKbd, &state)) {
warn("XkbGetState: Failed to retrieve keyboard state");
goto end;
}
if (!(symbols = XGetAtomName(dpy, desc->names->symbols))) {
warn("XGetAtomName: Failed to get atom name");
goto end;
}
layout = (char *)bprintf("%s", get_layout(symbols, state.group));
XFree(symbols);
end:
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
XkbFreeKeyboard(desc, XkbSymbolsNameMask, 1);
Refactor keymap.c - Get rid of camel-casing - Don't use all-caps for variable names - use LEN()-macro - use strncmp() rather than strstr() for prefix-checking - clean up the tokenizer-loop and don't use copies - make the loop more readable by separating different breaking conditions - stricter error-checking and cleanup - store the layout directly with bprintf rather than having a separate buffer
2018-05-23 15:29:37 +02:00
if (XCloseDisplay(dpy)) {
warn("XCloseDisplay: Failed to close display");
}
Add keymap component Adding a new keymap component that will indicate the current keyboard layout (language) and variant if any was set. I use the standard X11 XKB APIs to retrieve and parse the xkb_symbols set with setxkbmap.
2018-05-23 08:16:30 +02:00
return layout;
}
Copy Permalink