Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix luaa.c following suggestions from @psychon 

Also remove a file that at the end really was unnecessary `xkb_utf32_to_keysym.h`
This commit is contained in:
ArenaL5 2020-02-29 23:09:07 +01:00 committed by Emmanuel Lepage Vallee
parent 131b25473f
commit 515867d42f
2 changed files with 25 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
luaa.c
View File

@ -68,6 +68,11 @@
#include <lauxlib.h> #include <lauxlib.h>
#include <lualib.h> #include <lualib.h>
/* for strings and Unicode handling */
#include <glib.h>
#include <stdlib.h>
#include <string.h>
#include <basedir_fs.h> #include <basedir_fs.h>
#include <xcb/xcb_atom.h> #include <xcb/xcb_atom.h>
@ -417,42 +422,22 @@ get_modifier_name(int map_index)
// valid UTF-8 character. Otherwise, it will return zero. // valid UTF-8 character. Otherwise, it will return zero.
static uint32_t static uint32_t
one_utf8_to_utf32(const char* input, const size_t length) { one_utf8_to_utf32(const char* input, const size_t length) {
// When casting a char to a uint32_t, the missing bits will all be set to gunichar character = g_utf8_get_char_validated(input, length);
// the highest bit in the original char. Thus the exaggerated masking of // Return 0 if there is more than one UTF-8 character:
// every value (Unicode is defined around bytes) if (g_unichar_to_utf8(character, NULL) != (gint)length)
if (length < 1 || length > 4)
return 0; return 0;
if (length == 1) // Return 0 if the character is invalid.
{ if (character == (gunichar)-1 || character == (gunichar)-2)
if ((*input & 0x80) == 0)
return *input;
else
return 0; return 0;
} return character;
uint32_t mask = (0xff << (7 - length)) & 0x000000ff;
const uint32_t check = (mask << 1) & 0x000000ff;
uint32_t ucs = 0x00000000;
if ((*input & mask) == check)
{
mask = (~mask) & 0x000000ff;
ucs = (*input & mask) << (6 * (length-1));
}
else
return 0;
for (size_t i = 1; i < length; i++)
{
if ((*(input + i) & 0x000000c0) != 0x00000080)
return 0;
ucs += (*(input + i) & 0x0000003f) << (6 * (length-i-1));
}
return ucs;
} }
/** Get Xlib keysym and xkb_keysym_to_uf8 from an Awesome keycode. /** Get X11 keysym and a one-character representation from an Awesome keycode.
* *
* xkb_keysym_to_utf8 returns a UTF-8 representation of the symbol a given * A "one-character representation" is a single UTF-8 representing the typical
* symkey generates. It matches the engraving of the key for level-0 symbols * output from that keysym in a text editor (e.g. " " for space, "ñ" for
* (but lowercase) * n_tilde, "Ā" for A_macron). It usually matches the main engraving of the key
* for level-0 symbols (but lowercase).
* *
* Keycodes may be given in a string in any valid format for `awful.key`: * Keycodes may be given in a string in any valid format for `awful.key`:
* "#" + keycode, the symkey name and the UTF-8 representation will all work. * "#" + keycode, the symkey name and the UTF-8 representation will all work.
@ -487,21 +472,13 @@ luaA_get_key_name(lua_State *L)
* 2: the symbol itself (the result of xkb_keysym_to_utf8, e.g. @ for at). * 2: the symbol itself (the result of xkb_keysym_to_utf8, e.g. @ for at).
* 3: the keysym * 3: the keysym
*/ */
if (length > 1 && *input == '#' && length < 5) // syntax #1 if (input[0] == '#' && input[1] != '\0' && length < 5) // syntax #1
{ {
int keycode_from_hash = 0; int keycode_from_hash = atoi(input+1);
for (size_t i = 1; i < length; i++) // We discard keycodes with invalid values:
{ const xcb_setup_t *setup = xcb_get_setup(globalconf.connection);
if ('9' < *(input + i) || *(input + i) < '0') if (keycode_from_hash < setup->min_keycode ||
return 0; keycode_from_hash > setup->max_keycode)
else
{
keycode_from_hash *= 10;
keycode_from_hash += input[i] - 48;
}
}
// A keycode cannot go lower than 8 or higher than 255
if ((keycode_from_hash < 8) || keycode_from_hash > 255)
return 0; return 0;
xkb_keycode_t keycode = (xkb_keycode_t) keycode_from_hash; xkb_keycode_t keycode = (xkb_keycode_t) keycode_from_hash;
struct xkb_keymap *keymap = xkb_state_get_keymap(globalconf.xkb_state); struct xkb_keymap *keymap = xkb_state_get_keymap(globalconf.xkb_state);
@ -514,20 +491,16 @@ luaA_get_key_name(lua_State *L)
keysym = xkb_keysym_from_name(input, XKB_KEYSYM_NO_FLAGS); keysym = xkb_keysym_from_name(input, XKB_KEYSYM_NO_FLAGS);
if (keysym == XKB_KEY_NoSymbol) if (keysym == XKB_KEY_NoSymbol)
{ return 0;
lua_pushnil(L);
lua_pushnil(L);
}
else else
{ {
char *name = key_get_keysym_name(keysym); char *name = key_get_keysym_name(keysym);
lua_pushstring(L, name); lua_pushstring(L, name);
char *utfname; char utfname[8];
utfname=malloc(8);
if (xkb_keysym_to_utf8(keysym, utfname, 8) > 0) if (xkb_keysym_to_utf8(keysym, utfname, 8) > 0)
lua_pushstring(L, utfname); lua_pushstring(L, utfname);
else else
lua_pushnil(L); return 1; // this will make the second returned value a nil
} }
return 2; return 2;
} }

7
xkb_utf32_to_keysym.h
View File

@ -1,7 +0,0 @@
/* As of Feb 26, 2020, xkb_utf32_to_keysym.c exists only in development code
* for xkbcommon/libxkbcommon. This source code is to adapt
* https://github.com/xkbcommon/libxkbcommon/commit/0345aba082c83e9950f9dd8b7ea3bf91fe566a02
* which Jaroslaw Kubik authored and @bluetech committed.
* */
static xkb_keysym_t xkb_utf32_to_keysym(uint32_t ucs);