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