1From 06cff88009447f2f382c679918db842669c42581 Mon Sep 17 00:00:00 2001 2From: Philipp Zabel <p.zabel@pengutronix.de> 3Date: Thu, 6 Oct 2022 16:50:47 +0200 4Subject: [PATCH 86/92] backend-vnc: use configured keymap 5 6Use the keymap rules/model/layout configured in the weston.ini [keyboard] 7section. 8 9Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> 10(cherry picked from commit 2f0be4b4d0971fc876768d0e38dcd34d24f0960f) 11Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> 12--- 13 libweston/backend-vnc/vnc.c | 6 +++--- 14 1 file changed, 3 insertions(+), 3 deletions(-) 15 16diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c 17index dbcb395..190fe92 100644 18--- a/libweston/backend-vnc/vnc.c 19+++ b/libweston/backend-vnc/vnc.c 20@@ -965,9 +965,9 @@ vnc_backend_create(struct weston_compositor *compositor, 21 22 compositor->capabilities |= WESTON_CAP_ARBITRARY_MODES; 23 24- backend->xkb_rule_name.rules = strdup("evdev"); 25- backend->xkb_rule_name.model = strdup("pc105"); 26- backend->xkb_rule_name.layout = strdup("us"); 27+ backend->xkb_rule_name.rules = strdup(compositor->xkb_names.rules); 28+ backend->xkb_rule_name.model = strdup(compositor->xkb_names.model); 29+ backend->xkb_rule_name.layout = strdup(compositor->xkb_names.layout); 30 31 backend->xkb_keymap = xkb_keymap_new_from_names( 32 backend->compositor->xkb_context, 33-- 342.20.1 35 36