From c991202b5ccea1a13cacbf92ad5e699e7feea5e7 Mon Sep 17 00:00:00 2001 From: Alexandr Shadchin Date: Mon, 5 May 2014 18:05:36 +0000 Subject: Update to xkeyboard-config 2.11. ok matthieu@ --- data/xkeyboard-config/man/xkeyboard-config.7 | 33 ++++++++++++++++------------ data/xkeyboard-config/rules/Makefile | 6 ++++- 2 files changed, 24 insertions(+), 15 deletions(-) (limited to 'data/xkeyboard-config') diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7 index 674e51375..7027cbfbc 100644 --- a/data/xkeyboard-config/man/xkeyboard-config.7 +++ b/data/xkeyboard-config/man/xkeyboard-config.7 @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.10.1" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.11" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -282,17 +282,18 @@ be(sundeadkeys) Belgian (Sun dead keys) be(wang) Belgian (Wang model 724 azerty) _ -bd Bengali -bd(probhat) Bengali (Probhat) +bd Bangla +bd(probhat) Bangla (Probhat) _ in Indian -in(ben) Bengali (India) -in(ben_probhat) Bengali (India, Probhat) -in(ben_baishakhi) Bengali (India, Baishakhi) -in(ben_bornona) Bengali (India, Bornona) -in(ben_gitanjali) Bengali (India, Uni Gitanjali) -in(ben_inscript) Bengali (India, Baishakhi Inscript) +in(ben) Bangla (India) +in(ben_probhat) Bangla (India, Probhat) +in(ben_baishakhi) Bangla (India, Baishakhi) +in(ben_bornona) Bangla (India, Bornona) +in(ben_gitanjali) Bangla (India, Uni Gitanjali) +in(ben_inscript) Bangla (India, Baishakhi Inscript) +in(eeyek) Manipuri (Eeyek) in(guj) Gujarati in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) @@ -330,9 +331,9 @@ _ br Portuguese (Brazil) br(nodeadkeys) Portuguese (Brazil, eliminate dead keys) br(dvorak) Portuguese (Brazil, Dvorak) -br(nativo) Portuguese (Brazil, nativo) -br(nativo-us) Portuguese (Brazil, nativo for US keyboards) -br(nativo-epo) Portuguese (Brazil, nativo for Esperanto) +br(nativo) Portuguese (Brazil, Nativo) +br(nativo-us) Portuguese (Brazil, Nativo for US keyboards) +br(nativo-epo) Esperanto (Brazil, Nativo) _ bg Bulgarian @@ -376,7 +377,7 @@ _ cn Chinese cn(tib) Tibetan cn(tib_asciinum) Tibetan (with ASCII numerals) -cn(uig) Uyghur +cn(ug) Uyghur _ hr Croatian @@ -692,7 +693,7 @@ rs(latinyz) Serbian (Latin qwerty) rs(latinunicodeyz) Serbian (Latin Unicode qwerty) rs(alternatequotes) Serbian (Cyrillic with guillemets) rs(latinalternatequotes) Serbian (Latin with guillemets) -rs(rue) Pannonian Rusyn (homophonic) +rs(rue) Pannonian Rusyn _ si Slovenian @@ -990,6 +991,9 @@ ctrl:aa_ctrl At bottom left ctrl:rctrl_ralt Right Ctrl as Right Alt ctrl:menu_rctrl Menu as Right Ctrl ctrl:ctrl_ralt Right Alt as Right Ctrl +ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key +ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key +ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt .TE @@ -1155,6 +1159,7 @@ shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shif shift:both_shiftlock Both Shift keys together toggle ShiftLock keypad:pointerkeys Shift + NumLock toggles PointerKeys grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk) +grab:debug_actions Allow grab and window tree logging .TE diff --git a/data/xkeyboard-config/rules/Makefile b/data/xkeyboard-config/rules/Makefile index 76b4868b9..a9b5ae2f8 100644 --- a/data/xkeyboard-config/rules/Makefile +++ b/data/xkeyboard-config/rules/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2014/03/29 14:27:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2014/05/05 18:05:33 shadchin Exp $ SUBDIR= compat @@ -7,6 +7,7 @@ XKB_SUBDIR= rules DATA= xkb.dtd README BASE_PARTS= base.hdr.part base.lists.part \ + base.lists.base.part \ compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ @@ -25,6 +26,7 @@ BASE_PARTS= base.hdr.part base.lists.part \ HDR compat/base.ml3v3_s.part \ HDR compat/base.ml4v4_s.part \ HDR base.m_s.part \ + HDR base.ml_s1.part \ HDR compat/base.lv_c.part \ HDR compat/base.l1v1_c.part \ HDR compat/base.l2v2_c.part \ @@ -43,6 +45,7 @@ BASE_PARTS= base.hdr.part base.lists.part \ HDR base.o_t.part EVDEV_PARTS= base.hdr.part base.lists.part \ + evdev.lists.part \ compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ @@ -61,6 +64,7 @@ EVDEV_PARTS= base.hdr.part base.lists.part \ HDR compat/base.ml3v3_s.part \ HDR compat/base.ml4v4_s.part \ HDR evdev.m_s.part \ + HDR \ HDR compat/base.lv_c.part \ HDR compat/base.l1v1_c.part \ HDR compat/base.l2v2_c.part \ -- cgit v1.2.3