dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-07-13 14:34:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

implemented support for multiple keymaps

Browse Source
This commit is contained in:
Maarten van Gompel
2021-08-23 20:04:35 +02:00
committed by John Sullivan
parent cf77edf11c
commit 20b2dc61c3
4 changed files with 1592 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.c
View File

@ -17,7 +17,7 @@
/* lazy die macro */
#define die(...) \
fprintf(stderr, __VA_ARGS__); \
exit(0)
exit(1)
/* client state */
static const char *namespace = "wlroots";
@ -94,7 +94,7 @@ static void layer_surface_configure(void *data,
uint32_t serial, uint32_t w, uint32_t h);
static void layer_surface_closed(void *data,
struct zwlr_layer_surface_v1 *surface);
static void create_and_upload_keymap(uint32_t comp_unichr, uint32_t comp_shift_unichr);
static void create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr);
/* event handlers */
static const struct wl_pointer_listener pointer_listener = {
@ -277,8 +277,8 @@ layer_surface_closed(void *data, struct zwlr_layer_surface_v1 *surface) {
}
void
create_and_upload_keymap(uint32_t comp_unichr, uint32_t comp_shift_unichr) {
const char * keymap_str = get_keymap(comp_unichr, comp_shift_unichr);
create_and_upload_keymap(const char * name, uint32_t comp_unichr, uint32_t comp_shift_unichr) {
const char * keymap_str = get_keymap(name, comp_unichr, comp_shift_unichr);
size_t keymap_size = strlen(keymap_str) + 1;
int keymap_fd = os_create_anonymous_file(keymap_size);
if (keymap_fd < 0) {
@ -327,7 +327,7 @@ main(int argc, char **argv) {
zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkbd_mgr, seat);
/* upload keymap */
create_and_upload_keymap(0,0);
create_and_upload_keymap(layouts[DefaultLayout].keymap_name, 0,0);
/* assign kbd state */
keyboard.surf = &draw_surf;