xkblayout: use FcitxCurrentIMwithRime() when available (#2670)

latest version of fcitx.vim add FcitxCurrentIMwithRime() to display input method information in detail
vim-airline · Apr 24, 2024 · ff0f9a4 · ff0f9a4
1 parent d9f42cb
commit ff0f9a4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/autoload/airline/extensions/xkblayout.vim b/autoload/airline/extensions/xkblayout.vim
@@ -12,8 +12,13 @@ function! airline#extensions#xkblayout#status()
     let keyboard_layout = libcall(g:XkbSwitchLib, 'Xkb_Switch_getXkbLayout', '')
     let keyboard_layout = get(split(keyboard_layout, '\.'), -1, '')
   else
+    if exists('*FcitxCurrentIMwithRime')
+      let keyboard_layout = FcitxCurrentIMwithRime()
+    else
+      let keyboard_layout = FcitxCurrentIM()
+    endif
     " substitute keyboard-us to us
-    let keyboard_layout = substitute(FcitxCurrentIM(), 'keyboard-', '', 'g')
+    let keyboard_layout = substitute(keyboard_layout, 'keyboard-', '', 'g')
   endif
 
   let short_codes = get(g:, 'airline#extensions#xkblayout#short_codes', {'2SetKorean': 'KR', 'Chinese': 'CN', 'Japanese': 'JP'})