aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config')
-rw-r--r--xorg-server/xkeyboard-config/compat/Makefile.am7
-rw-r--r--xorg-server/xkeyboard-config/configure.in5
-rw-r--r--xorg-server/xkeyboard-config/geometry/Makefile.am28
-rw-r--r--xorg-server/xkeyboard-config/keycodes/Makefile.am44
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in18
-rw-r--r--xorg-server/xkeyboard-config/symbols/Makefile.am8
-rw-r--r--xorg-server/xkeyboard-config/symbols/md92
-rw-r--r--xorg-server/xkeyboard-config/types/Makefile.am20
-rw-r--r--xorg-server/xkeyboard-config/xkbrules.am14
9 files changed, 158 insertions, 78 deletions
diff --git a/xorg-server/xkeyboard-config/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am
index aeed93266..e2026af3d 100644
--- a/xorg-server/xkeyboard-config/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/compat/Makefile.am
@@ -1,6 +1,6 @@
compatdir = $(xkb_base)/compat
-dist_compat_DATA = \
+compat_DATA = \
accessx basic caps complete \
iso9995 \
japan ledcaps \
@@ -9,7 +9,4 @@ misc mousekeys \
olpc pc pc98 xfree86 \
xtest README
-dir_data = $(dist_compat_DATA)
-
-include $(top_srcdir)/xkbrules.am
-
+EXTRA_DIST = $(compat_DATA)
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index 83e25b969..a43c379c8 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -14,11 +14,6 @@ AC_PROG_SED
AC_SUBST(VERSION)
-AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
-if test x$XKBCOMP = xnot_found ; then
- AC_ERROR([xkbcomp is required to install the xkb data files])
-fi
-
AC_ARG_WITH( xkb_base,
[AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])],
xkb_base="$withval",
diff --git a/xorg-server/xkeyboard-config/geometry/Makefile.am b/xorg-server/xkeyboard-config/geometry/Makefile.am
index 7c9e395fa..069a953f8 100644
--- a/xorg-server/xkeyboard-config/geometry/Makefile.am
+++ b/xorg-server/xkeyboard-config/geometry/Makefile.am
@@ -1,15 +1,13 @@
-SUBDIRS = digital_vndr sgi_vndr
-
-geomdir = $(xkb_base)/geometry
-
-dist_geom_DATA = \
-amiga ataritt chicony \
-dell everex fujitsu \
-hhk hp keytronic kinesis \
-macintosh microsoft nec nokia \
-northgate pc sanwa sony thinkpad \
-sun typematrix winbook README
-
-dir_data = $(dist_geom_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr sgi_vndr
+
+geomdir = $(xkb_base)/geometry
+
+geom_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hhk hp keytronic kinesis \
+macintosh microsoft nec nokia \
+northgate pc sanwa sony thinkpad \
+sun typematrix winbook README
+
+EXTRA_DIST = $(geom_DATA)
diff --git a/xorg-server/xkeyboard-config/keycodes/Makefile.am b/xorg-server/xkeyboard-config/keycodes/Makefile.am
index 2876ca9f1..9c5a3864b 100644
--- a/xorg-server/xkeyboard-config/keycodes/Makefile.am
+++ b/xorg-server/xkeyboard-config/keycodes/Makefile.am
@@ -1,23 +1,21 @@
-SUBDIRS = digital_vndr sgi_vndr
-
-keycodesdir = $(xkb_base)/keycodes
-
-dist_keycodes_DATA = \
-aliases \
-amiga \
-ataritt \
-empty \
-evdev \
-fujitsu \
-hp \
-ibm \
-macintosh \
-sony \
-sun \
-xfree86 \
-xfree98 \
-README
-
-dir_data = $(dist_keycodes_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr sgi_vndr
+
+keycodesdir = $(xkb_base)/keycodes
+
+keycodes_DATA = \
+aliases \
+amiga \
+ataritt \
+empty \
+evdev \
+fujitsu \
+hp \
+ibm \
+macintosh \
+sony \
+sun \
+xfree86 \
+xfree98 \
+README
+
+EXTRA_DIST = $(keycodes_DATA)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 49a2aeddf..60b41a5af 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -5474,6 +5474,24 @@
</variant>
</variantList>
</layout>
+ <layout>
+ <configItem>
+ <name>md</name>
+ <_shortDescription>md</_shortDescription>
+ <_description>Moldavian</_description>
+ <languageList><iso639Id>rum</iso639Id></languageList>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>gag</name>
+ <_shortDescription>gag</_shortDescription>
+ <_description>Gagauz</_description>
+ <languageList><iso639Id>gag</iso639Id></languageList>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
</layoutList>
<optionList>
<group allowMultipleSelection="true">
diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index ecd9f25fd..c67a60088 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
+symbols_DATA = \
ad af al \
am apl ara \
at az \
@@ -21,7 +21,7 @@ ke kg kh \
kr kz \
la latam latin \
lk lt lv \
-ma mao me \
+ma mao md me \
mk ml mm \
mn mt mv \
ng nl no np \
@@ -36,6 +36,4 @@ za \
altwin capslock compose ctrl empty eurosign rupeesign group inet \
keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+EXTRA_DIST = $(symbols_DATA)
diff --git a/xorg-server/xkeyboard-config/symbols/md b/xorg-server/xkeyboard-config/symbols/md
new file mode 100644
index 000000000..848fe05a7
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/md
@@ -0,0 +1,92 @@
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+ include "ro"
+
+ name[Group1]="Moldavian";
+};
+
+
+// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+// │ ~ │ ! │ " │ # │ ; │ % │ : │ ? │ * │ ( ̣ │ ) │ -- │ + ┃ ⌫ Back ┃
+// │ ` │ 1 │ 2 @ │ 3 │ 4 $ │ 5 € │ 6 ^ │ 7 & │ 8 │ 9 │ 0 │ - │ = ┃ space ┃
+// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
+// ┃ ┃ Ţ Q │ Ê W │ E │ R │ T │ Y │ U │ I │ O │ P │ Ö { │ Ü } ┃ Enter ┃
+// ┃Tab ↹ ┃ ţ q │ ê w │ e │ r │ t │ y │ u │ i │ o │ p │ ö [ │ ü ] ┃ ⏎ ┃
+// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓ ┃
+// ┃ ┃ A │ S │ D │ F │ G │ H │ J │ K │ L │Ş │I │ / ┃ ┃
+// ┃Caps ⇬ ┃ a │ s │ d │ f │ g │ h │ j │ k │ l │ş │ı │ \ ┃ ┃
+// ┣━━━━━━━━┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
+// ┃ │ Z │ Ç X │ C │ V │ B │ N │ M │Ä │< │> ┃ ┃
+// ┃Shift ⇧ │ z │ ç x │ c │ v │ b │ n │ m │ä │, │. ┃Shift ⇧ ┃
+// ┣━━━━━━━┳━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
+// ┃ ┃ ┃ ┃ ␣ ⍽ ┃ ┃ ┃ ┃
+// ┃Ctrl ┃Meta ┃Alt ┃ ␣ Space ⍽ ┃AltGr ⇮┃Menu ┃Ctrl ┃
+// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
+
+
+// A, Ä, B, C, Ç, D, E, Ê, F, G, H, I, İ, J, K, L, M, N, O, Ö, P, R, S, Ş, T, Ţ, U, Ü, V, Y, Z.
+
+partial alphanumeric_keys
+xkb_symbols "gag" {
+
+include "level3(ralt_switch)"
+include "us(basic)"
+
+name[Group1]="Moldavian (Gagauz)";
+
+ // Alphanumeric section
+ key <TLDE> { [ grave, asciitilde ] };
+ key <AE01> { [ 1, exclam ] };
+ key <AE02> { [ 2, quotedb1, at ] };
+ key <AE03> { [ 3, numbersign ] };
+ key <AE04> { [ 4, semicolon, dollar ] };
+ key <AE05> { [ 5, percent, EuroSign, cent ] };
+ key <AE06> { [ 6, colon, asciicircum ] };
+ key <AE07> { [ 7, question, ampersand ] };
+ key <AE08> { [ 8, asterisk ] };
+ key <AE09> { [ 9, parenleft ] };
+ key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+
+ key <AD01> { [ tcedilla, Tcedilla, q, Q ] };
+ key <AD02> { [ ecircumflex, Ecircumflex, w, W ] };
+ key <AD03> { [ e, E ] };
+ key <AD04> { [ r, R ] };
+ key <AD05> { [ t, T ] };
+ key <AD06> { [ y, Y ] };
+ key <AD07> { [ u, U ] };
+ key <AD08> { [ i, Iabovedot, i, I ] };
+ key <AD09> { [ o, O ] };
+ key <AD10> { [ p, P ] };
+ key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft ] };
+ key <AD12> { [ udiaeresis, Udiaeresis, bracketright, braceright ] };
+
+ key <AC01> { [ a, A ] };
+ key <AC02> { [ s, S ] };
+ key <AC03> { [ d, D ] };
+ key <AC04> { [ f, F ] };
+ key <AC05> { [ g, G ] };
+ key <AC06> { [ h, H ] };
+ key <AC07> { [ j, J ] };
+ key <AC08> { [ k, K ] };
+ key <AC09> { [ l, L ] };
+ key <AC10> { [ scedilla, Scedilla ] };
+ key <AC11> { [ idotless, I, apostrophe ] };
+
+ key <AB01> { [ z, Z ] };
+ key <AB02> { [ ccedilla, Ccedilla, x, X ] };
+ key <AB03> { [ c, Ccedilla ] };
+ key <AB04> { [ v, V ] };
+ key <AB05> { [ b, B ] };
+ key <AB06> { [ n, N ] };
+ key <AB07> { [ m, M ] };
+ key <AB08> { [ adiaeresis, Adiaeresis ] };
+ key <AB09> { [ comma, less ] };
+ key <AB10> { [ period, greater, slash ] };
+
+ key <BKSL> { [ backslash, bar ] };
+ // End alphanumeric section
+
+};
diff --git a/xorg-server/xkeyboard-config/types/Makefile.am b/xorg-server/xkeyboard-config/types/Makefile.am
index afc5acb58..008418431 100644
--- a/xorg-server/xkeyboard-config/types/Makefile.am
+++ b/xorg-server/xkeyboard-config/types/Makefile.am
@@ -1,11 +1,9 @@
-typesdir = $(xkb_base)/types
-
-dist_types_DATA = \
-basic cancel caps \
-complete default extra \
-iso9995 level5 mousekeys nokia numpad \
-pc README
-
-dir_data = $(dist_types_DATA)
-
-include $(top_srcdir)/xkbrules.am
+typesdir = $(xkb_base)/types
+
+types_DATA = \
+basic cancel caps \
+complete default extra \
+iso9995 level5 mousekeys nokia numpad \
+pc README
+
+EXTRA_DIST = $(types_DATA)
diff --git a/xorg-server/xkeyboard-config/xkbrules.am b/xorg-server/xkeyboard-config/xkbrules.am
deleted file mode 100644
index e506a92d3..000000000
--- a/xorg-server/xkeyboard-config/xkbrules.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Common rules for building *.dir files in all xkb subdirectories
-# Replaces Imake's MakeXkbDir() rule
-# svu: taken from xkbdata
-
-dist_dir_DATA = $(subdir).dir
-
-dirdir = $(xkb_base)
-
-$(subdir).dir: $(dir_data)
- -rm -f $@
- $(XKBCOMP) -lfhlpR -o $@ '*'
-
-CLEANFILES = $(subdir).dir
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:02:48 +0000