static int vconsole_convert_to_x11_and_emit(Context *c, sd_bus_message *m) { int r; assert(m); r = x11_read_data(c, m); if (r < 0) return r; r = vconsole_convert_to_x11(c); if (r <= 0) return r; /* modified */ r = x11_write_data(c); if (r < 0) return log_error_errno(r, "Failed to write X11 keyboard layout: %m"); sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/locale1", "org.freedesktop.locale1", "X11Layout", "X11Model", "X11Variant", "X11Options", NULL); return 1; }
static void test_vconsole_convert_to_x11(void) { _cleanup_(context_free) Context c = {}; log_info("/*** %s ***/", __func__); log_info("/* test emptying first (:) */"); assert_se(free_and_strdup(&c.x11_layout, "foo") >= 0); assert_se(free_and_strdup(&c.x11_variant, "bar") >= 0); assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(c.x11_layout == NULL); assert_se(c.x11_variant == NULL); log_info("/* test emptying second (:) */"); assert_se(vconsole_convert_to_x11(&c) == 0); assert_se(c.x11_layout == NULL); assert_se(c.x11_variant == NULL); log_info("/* test without variant, new mapping (es:) */"); assert_se(free_and_strdup(&c.vc_keymap, "es") >= 0); assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(streq(c.x11_layout, "es")); assert_se(c.x11_variant == NULL); log_info("/* test with known variant, new mapping (es:dvorak) */"); assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0); assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME assert_se(streq(c.x11_layout, "es")); assert_se(c.x11_variant == NULL); // FIXME: "dvorak" log_info("/* test with old mapping (fr:latin9) */"); assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0); assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(streq(c.x11_layout, "fr")); assert_se(streq(c.x11_variant, "latin9")); log_info("/* test with a compound mapping (ru,us) */"); assert_se(free_and_strdup(&c.vc_keymap, "ru") >= 0); assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(streq(c.x11_layout, "ru,us")); assert_se(c.x11_variant == NULL); log_info("/* test with a simple mapping (us) */"); assert_se(free_and_strdup(&c.vc_keymap, "us") >= 0); assert_se(vconsole_convert_to_x11(&c) == 1); assert_se(streq(c.x11_layout, "us")); assert_se(c.x11_variant == NULL); }