diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
| commit | a16c0d6f73877af35ea0519917a82d5919e3c304 (patch) | |
| tree | b575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/rules | |
| parent | 0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff) | |
| parent | ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff) | |
| download | vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2 vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/rules')
31 files changed, 1793 insertions, 777 deletions
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am index bdd8c70fb..5d6e8b4bf 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.am +++ b/xorg-server/xkbdata.src/rules/Makefile.am @@ -21,32 +21,64 @@ install-data-hook: endif base_parts_no_compat = base.hdr.part base.lists.part \ -HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR base.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR base.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part evdev_parts_no_compat = base.hdr.part base.lists.part \ -HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR evdev.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR evdev.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part if USE_COMPAT_RULES base_parts = base.hdr.part base.lists.part \ compat/base.lists.part \ -HDR base.m_k.part HDR base.l1_k.part \ -HDR base.l_k.part HDR base.o_k.part \ +HDR base.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -59,16 +91,25 @@ HDR compat/base.l4_s.part base.l4_s.part \ HDR compat/base.l2v2_s.part \ HDR compat/base.l3v3_s.part \ HDR compat/base.l4v4_s.part \ -HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +HDR base.lo_s.part \ +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part HDR base.o_t.part +HDR base.o_c.part \ +HDR base.o_t.part evdev_parts = base.hdr.part base.lists.part \ compat/base.lists.part \ -HDR evdev.m_k.part HDR base.l1_k.part \ -HDR base.l_k.part HDR base.o_k.part \ +HDR evdev.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -81,16 +122,25 @@ HDR compat/base.l4_s.part base.l4_s.part \ HDR compat/base.l2v2_s.part \ HDR compat/base.l3v3_s.part \ HDR compat/base.l4v4_s.part \ -HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR evdev.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +HDR base.lo_s.part \ +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part HDR base.o_t.part +HDR base.o_c.part \ +HDR base.o_t.part else base_parts = $(base_parts_no_compat) evdev_parts = $(base_parts_no_compat) endif +base_parts_compat_dist = base.o_k.part base.lo_s.part + rules_files = base evdev xfree98 lst_files = base.lst evdev.lst @@ -104,33 +154,24 @@ base: $(base_parts_no_compat) evdev: $(evdev_parts_no_compat) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) -all_rules_files = $(rules_files) $(lst_files) \ -xkb.dtd README \ - sgi \ - sgi.lst \ - sun \ - sun.lst \ - xfree98 \ - xfree98.lst \ - xorg \ - xorg-it.lst \ - xorg.lst \ - xorg.xml - -rules_DATA = $(all_rules_files) +dist_files = xkb.dtd README + +rules_DATA = $(rules_files) $(lst_files) $(dist_files) xml_in_files = base.xml.in evdev.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) -evdev.xml.in: base.xml.in +$(srcdir)/evdev.xml.in: base.xml.in cp $< $@ -EXTRA_DIST= $(all_rules_files) $(xml_in_files) \ +EXTRA_DIST= $(xml_in_files) xfree98 \ $(base_parts_no_compat) \ $(evdev_parts_no_compat) \ - xml2lst.pl merge.sh + $(base_parts_compat_dist) \ + xml2lst.pl merge.sh $(dist_files) -DISTCLEANFILES=base.xml base.lst evdev.xml evdev.lst +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in index a5184f2ba..bc498f1d1 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.in +++ b/xorg-server/xkbdata.src/rules/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -46,10 +42,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -60,14 +57,14 @@ am__installdirs = "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)" rulesDATA_INSTALL = $(INSTALL_DATA) xmlDATA_INSTALL = $(INSTALL_DATA) DATA = $(rules_DATA) $(xml_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -80,10 +77,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -97,43 +90,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -153,15 +127,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -169,6 +143,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -192,38 +167,74 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ SUBDIRS = compat base_parts_no_compat = base.hdr.part base.lists.part \ -HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR base.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR base.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part evdev_parts_no_compat = base.hdr.part base.lists.part \ -HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR evdev.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR evdev.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part @USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat) @USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ -@USE_COMPAT_RULES_TRUE@HDR base.m_k.part HDR base.l1_k.part \ -@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.m_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -236,17 +247,26 @@ HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +@USE_COMPAT_RULES_TRUE@HDR base.m_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_t.part \ -@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part +@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ +@USE_COMPAT_RULES_TRUE@HDR base.o_t.part @USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat) @USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ -@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part HDR base.l1_k.part \ -@USE_COMPAT_RULES_TRUE@HDR base.l_k.part HDR base.o_k.part \ +@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l_k.part \ +@USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -259,26 +279,34 @@ HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_t.part \ -@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.lo_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ @USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR base.o_c.part HDR base.o_t.part +@USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ +@USE_COMPAT_RULES_TRUE@HDR base.o_t.part +base_parts_compat_dist = base.o_k.part base.lo_s.part rules_files = base evdev xfree98 lst_files = base.lst evdev.lst -all_rules_files = $(rules_files) $(lst_files) \ -xkb.dtd README - -rules_DATA = $(all_rules_files) +dist_files = xkb.dtd README +rules_DATA = $(rules_files) $(lst_files) $(dist_files) xml_in_files = base.xml.in evdev.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) -EXTRA_DIST = $(all_rules_files) $(xml_in_files) \ +EXTRA_DIST = $(xml_in_files) xfree98 \ $(base_parts_no_compat) \ $(evdev_parts_no_compat) \ - xml2lst.pl merge.sh + $(base_parts_compat_dist) \ + xml2lst.pl merge.sh $(dist_files) -DISTCLEANFILES = base.xml base.lst evdev.xml evdev.lst +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) all: all-recursive @@ -288,8 +316,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -313,10 +341,9 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: install-rulesDATA: $(rules_DATA) @$(NORMAL_INSTALL) - test -z "$(rulesdir)" || $(mkdir_p) "$(DESTDIR)$(rulesdir)" + test -z "$(rulesdir)" || $(MKDIR_P) "$(DESTDIR)$(rulesdir)" @list='$(rules_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -333,7 +360,7 @@ uninstall-rulesDATA: done install-xmlDATA: $(xml_DATA) @$(NORMAL_INSTALL) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" + test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)" @list='$(xml_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -380,8 +407,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -425,8 +451,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -451,8 +477,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -462,13 +488,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -482,22 +507,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -511,7 +535,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -519,6 +543,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -529,7 +555,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(xmldir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -548,14 +574,15 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-generic mostlyclean-am @@ -578,12 +605,20 @@ install-data-am: install-rulesDATA install-xmlDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -602,23 +637,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-rulesDATA uninstall-xmlDATA +uninstall-am: uninstall-rulesDATA uninstall-xmlDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-data-am install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-recursive distclean-tags \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-data install-data-am install-data-hook \ - install-exec install-exec-am install-info install-info-am \ - install-man install-rulesDATA install-strip install-xmlDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-rulesDATA install-strip install-xmlDATA \ installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am uninstall-rulesDATA \ - uninstall-xmlDATA + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-rulesDATA uninstall-xmlDATA # extra_rules_file = $(xkb_rules_symlink) @@ -646,7 +682,7 @@ base: $(base_parts_no_compat) evdev: $(evdev_parts_no_compat) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) -evdev.xml.in: base.xml.in +$(srcdir)/evdev.xml.in: base.xml.in cp $< $@ @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/xorg-server/xkbdata.src/rules/base b/xorg-server/xkbdata.src/rules/base index f226b3b54..11976b7a1 100644 --- a/xorg-server/xkbdata.src/rules/base +++ b/xorg-server/xkbdata.src/rules/base @@ -21,7 +21,7 @@ ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 -! $pcgeometries = abnt2 latitude jp106 kr106 +! $pcgeometries = latitude // Layouts that provide further specializations for the OLPC ! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us @@ -35,42 +35,44 @@ ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk -! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \ - acer_c300 acer_ferrari4k acer_laptop \ - acpi airkey \ - apple armada asus_laptop azonaRF2300 \ +! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ + airkey \ + apple armada azonaRF2300 \ benqx brother \ - btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb cherrycyboard \ - chicony chicony0108 chicony9885 \ + btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ + cherryblue cherrybluea cherryblueb \ + cherrycyboard cherrycmexpert \ + chicony chicony0108 chicony0420 chicony9885 \ + compalfl90 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ cymotionlinux \ - dell dellm65 inspiron precision_m dellusbmm dtk2000 \ - emachines ennyah_dkb1008 evdev fscaa1667g \ - genius geniuscomfy geniuscomfy2 geniuskb19e \ + dell dellm65 inspiron dellusbmm \ + emachines ennyah_dkb1008 evdev \ + genius geniuscomfy2 \ gyration honeywell_euroboard \ - hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \ + hp250x hp5xx hp500fa hpdv5 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ - ibm_spacesaver ipaq inspiron intel latitude \ + ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ + pc105 \ presario propeller \ qtronix \ - rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ + rapidaccess rapidaccess2 thinkpad60 \ samsung4500 samsung4510 \ - scorpius silvercrest \ - sk1300 sk2500 sk6200 sk7100 sp_inet \ + silvercrest \ + sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ toshiba_s3000 trust trustda \ - yahoo + unitekkb1925 yahoo // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ @@ -82,7 +84,6 @@ gb gr \ hu \ ie ir is it \ - kg \ latam \ lk lt \ mn mt \ @@ -95,6 +96,10 @@ vn \ za +! $evdevkbds = ibm_spacesaver + +! $thinkpads = thinkpad thinkpad60 thinkpadz60 + ! $dvoraklayouts = br ca de ee es fr gb no pl se us @@ -105,13 +110,10 @@ sun5 = sun(type5_euro) sun6 = sun(type6_usb) pc98 = xfree98(pc98) - abnt2 = xfree86(abnt2) - jp106 = xfree86(jp106) evdev = evdev olpc = evdev macintosh_hhk = macintosh(hhk) macintosh_old = macintosh(old) - $macbooks = macintosh+macintosh(goodmap) $macs = macintosh thinkpadz60 = xfree86(thinkpadz60) * = xfree86 @@ -127,13 +129,16 @@ * = +aliases(qwerty) ! option = keycodes - thinkpad us = thinkpad(us) ! model layout = geometry + thinkpad us = thinkpad(us) + +! model = geometry microsoftelite = microsoft(elite) $msmodels = microsoft(natural) dell101 = dell(dell101) dellm65 = dell(dellm65) + latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) omnikey101 = northgate(omnikey101) @@ -151,7 +156,7 @@ kinesis = kinesis(model100) * = pc(pc104) -! model = geometry +! model layout variant = symbols * ben basic = pc+in(ben)
* ben probhat = pc+in(ben_probhat)
* dev basic = pc+in(deva)
@@ -203,7 +208,7 @@ classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) -! model layout variant = symbols +! model layout = symbols * ar = pc+ara
* ben = pc+in(ben)
* bs = pc+ba
@@ -283,10 +288,10 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) - sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(sun4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(sun5)+%l%(v) + sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 + sun4 * = latin+sun_vndr/us(type4)+%l%(v) + sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 + sun5 * = latin+sun_vndr/us(type5)+%l%(v) sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) @@ -300,11 +305,11 @@ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) - thinkpad br = pc+br(thinkpad) + $thinkpads br = pc+br(thinkpad) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) -! model layout = symbols +! model layout[1] = symbols * ar = pc+ara%(v[1])
* ben = pc+in(ben)%(v[1])
* bs = pc+ba%(v[1])
@@ -387,10 +392,10 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - thinkpad br = pc+%l[1](thinkpad) + $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) -! model layout[1] = symbols +! model layout[1] variant[1] = symbols * ben basic = pc+in(ben)
* ben probhat = pc+in(ben_probhat)
* dev basic = pc+in(deva)
@@ -439,7 +444,7 @@ * yu yz = pc+srp(latinyz)
* yu unicodeyz = pc+srp(latinunicodeyz)
-! model layout[1] variant[1] = symbols +! layout[2] = symbols ar = +ara%(v[2]):2
ben = +in(ben)%(v[2]):2
bs = +ba%(v[2]):2
@@ -516,7 +521,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):2
* = +%l[2]%(v[2]):2 -! layout[2] = symbols +! layout[3] = symbols ar = +ara%(v[3]):3
ben = +in(ben)%(v[3]):3
bs = +ba%(v[3]):3
@@ -593,7 +598,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):3
* = +%l[3]%(v[3]):3 -! layout[3] = symbols +! layout[4] = symbols ar = +ara%(v[4]):4
ben = +in(ben)%(v[4]):4
bs = +ba%(v[4]):4
@@ -670,7 +675,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):4
* = +%l[4]%(v[4]):4 -! layout[4] = symbols +! layout[2] variant[2] = symbols ben basic = +in(ben):2
ben probhat = +in(ben_probhat):2
dev basic = +in(deva):2
@@ -719,7 +724,7 @@ yu yz = +srp(latinyz):2
yu unicodeyz = +srp(latinunicodeyz):2
-! layout[2] variant[2] = symbols +! layout[3] variant[3] = symbols ben basic = +in(ben):3
ben probhat = +in(ben_probhat):3
dev basic = +in(deva):3
@@ -768,7 +773,7 @@ yu yz = +srp(latinyz):3
yu unicodeyz = +srp(latinunicodeyz):3
-! layout[3] variant[3] = symbols +! layout[4] variant[4] = symbols ben basic = +in(ben):4
ben probhat = +in(ben_probhat):4
dev basic = +in(deva):4
@@ -817,12 +822,29 @@ yu yz = +srp(latinyz):4
yu unicodeyz = +srp(latinunicodeyz):4
-! layout[4] variant[4] = symbols +! model = symbols + a4techKB21 = +inet(media_nav_common) + a4techKBS8 = +inet(media_nav_acpi_common) + a4_rfkb23 = +inet(media_nav_acpi_common) + asus_laptop = +inet(media_common) + acer_tm_800 = +inet(acer_laptop) + acpi = +inet(acpi_common) benqx730 = +inet(benqx) benqx800 = +inet(benqx) + btc5126t = +inet(nav_acpi_common) + btc9116u = +inet(btc9019u) + btc6301urf = +inet(media_nav_acpi_common) dellsk8125 = +inet(dell) dellsk8135 = +inet(dell) - hpnx9020 = +inet(hp5185) + cherrybunlim = +inet(nav_common) + dexxa = +inet(media_nav_common) + dtk2000 = +inet(media_nav_acpi_common) + fscaa1667g = +inet(media_nav_common) + geniuskb19e = +inet(media_nav_acpi_common) + geniuscomfy = +inet(media_nav_acpi_common) + geniuskkb2050hs = +inet(dellusbmm) + hpnx9020 = +inet(hpi6) + latitude = +inet(media_common) logicd = +inet(logitech_base) logicd_it = +inet(logitech_base) logicd_nav = +inet(logitech_base) @@ -831,56 +853,67 @@ logiclx300 = +inet(logiex110) logii350 = +inet(logiex110) logimel = +inet(logiex110) - vsonku306 = +inet(microsoftprooem) - $inetkbds = +inet(%m) - acer_tm_800 = +inet(acer_laptop) - benqx730 = +inet(benqx) - benqx800 = +inet(benqx) - dell8125 = +inet(dellusbmm) - dell8135 = +inet(dellusbmm) - ltcd = +inet(logicda) logicdit = +inet(logicd) logicdo = +inet(logicd) logicdp = +inet(logicd) logicdpa = +inet(logicda) logiciink = +inet(logicink) + ltcd = +inet(logicda) + microsoftccurve2k = +inet(microsoftprooem) + microsoftpro = +inet(media_nav_acpi_common) + precision_m = +inet(media_nav_common) + scorpius = +inet(media_nav_acpi_common) + sp_inet = +inet(media_nav_acpi_common) + targa_v811 = +inet(media_nav_acpi_common) + thinkpad = +inet(media_nav_common) + thinkpadz60 = +inet(thinkpad60) + trust_slimline = +inet(media_nav_acpi_common) + vsonku306 = +inet(microsoftprooem) + $inetkbds = +inet(%m) $maclaptop = +inet(apple)+level3(enter_switch) $macs = +inet(apple) - thinkpadz60 = +inet(thinkpad60) -! model = symbols +! model layout = compat pc98 nec_vndr/jp = pc98(basic) * jp = complete+japan olpc * = olpc * * = complete -! model layout = compat +! model layout[1] = compat * * = complete -! model layout[1] = compat +! model = types $macs = complete+numpad(mac) * = complete -! model = types +! layout option = symbols + $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) + * misc:typo = +typo(base) + +! layout[1] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 + * misc:typo = +typo(base):1 -! layout option = symbols +! layout[2] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 + * misc:typo = +typo(base):2 -! layout[1] option = symbols +! layout[3] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 + * misc:typo = +typo(base):3 -! layout[2] option = symbols +! layout[4] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 + * misc:typo = +typo(base):4 -! layout[3] option = symbols +! option = symbols grp:shift_toggle = +group(shifts_toggle) altwin:menu = +altwin(menu) altwin:meta_alt = +altwin(meta_alt) altwin:ctrl_win = +altwin(ctrl_win) + altwin:ctrl_alt_win = +altwin(ctrl_alt_win) altwin:meta_win = +altwin(meta_win) altwin:left_meta_win = +altwin(left_meta_win) - altwin:super_win = +altwin(super_win) altwin:hyper_win = +altwin(hyper_win) altwin:alt_super_win = +altwin(alt_super_win) altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) @@ -899,9 +932,11 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) grp:alt_shift_toggle = +group(alt_shift_toggle) + grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) grp:lwin_toggle = +group(lwin_toggle) grp:rwin_toggle = +group(rwin_toggle) @@ -911,6 +946,7 @@ grp:lctrl_toggle = +group(lctrl_toggle) grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) + grp:sclk_toggle = +group(sclk_toggle) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -921,9 +957,12 @@ lv3:win_switch = +level3(win_switch) lv3:lwin_switch = +level3(lwin_switch) lv3:rwin_switch = +level3(rwin_switch) + lv3:enter_switch = +level3(enter_switch) caps:capslock = +capslock(capslock) caps:shiftlock = +capslock(shiftlock) caps:swapescape = +capslock(swapescape) + caps:escape = +capslock(escape) + caps:backspace = +capslock(backspace) ctrl:nocaps = +ctrl(nocaps) ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) @@ -947,7 +986,8 @@ keypad:oss_wang = +keypad(oss_wang) keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) - keypad:phone_hex = +keypad(phone_hex) + keypad:hex = +keypad(ops)+keypad(hex) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) @@ -964,18 +1004,24 @@ kpdl:commaoss = +kpdl(commaoss) kpdl:momayyezoss = +kpdl(momayyezoss) kpdl:kposs = +kpdl(kposs) + kpdl:semi = +kpdl(semi) shift:breaks_caps = +shift(breaks_caps) + esperanto:qwerty = +epo(qwerty) + esperanto:dvorak = +epo(dvorak) + terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) -! layout[4] option = symbols + +! option = compat grp_led:num = +lednum(group_lock) grp_led:caps = +ledcaps(group_lock) grp_led:scroll = +ledscroll(group_lock) grp:caps_toggle = +ledcaps(group_lock) japan:kana_lock = +japan(kana_lock) + caps:shiftlock = +ledcaps(shift_lock) -! option = symbols +! option = types caps:internal = +caps(internal) caps:internal_nocancel = +caps(internal_nocancel) caps:shift = +caps(shift) @@ -983,3 +1029,4 @@ numpad:pc = +numpad(pc) numpad:mac = +numpad(mac) numpad:microsoft = +numpad(microsoft) + numpad:shift3 = +numpad(shift3) diff --git a/xorg-server/xkbdata.src/rules/base.l1o_s.part b/xorg-server/xkbdata.src/rules/base.l1o_s.part index 5544d5386..592fab272 100644 --- a/xorg-server/xkbdata.src/rules/base.l1o_s.part +++ b/xorg-server/xkbdata.src/rules/base.l1o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 + * misc:typo = +typo(base):1 diff --git a/xorg-server/xkbdata.src/rules/base.l2o_s.part b/xorg-server/xkbdata.src/rules/base.l2o_s.part index 3ffd6a8b0..aac680e9d 100644 --- a/xorg-server/xkbdata.src/rules/base.l2o_s.part +++ b/xorg-server/xkbdata.src/rules/base.l2o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 + * misc:typo = +typo(base):2 diff --git a/xorg-server/xkbdata.src/rules/base.l3o_s.part b/xorg-server/xkbdata.src/rules/base.l3o_s.part index aa327eb42..1010e2e03 100644 --- a/xorg-server/xkbdata.src/rules/base.l3o_s.part +++ b/xorg-server/xkbdata.src/rules/base.l3o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 + * misc:typo = +typo(base):3 diff --git a/xorg-server/xkbdata.src/rules/base.l4o_s.part b/xorg-server/xkbdata.src/rules/base.l4o_s.part index 79682503e..49650ad9c 100644 --- a/xorg-server/xkbdata.src/rules/base.l4o_s.part +++ b/xorg-server/xkbdata.src/rules/base.l4o_s.part @@ -1 +1,2 @@ $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 + * misc:typo = +typo(base):4 diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part index b08ab24fe..d2e8383df 100644 --- a/xorg-server/xkbdata.src/rules/base.lists.part +++ b/xorg-server/xkbdata.src/rules/base.lists.part @@ -12,7 +12,7 @@ ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 -! $pcgeometries = abnt2 latitude jp106 kr106 +! $pcgeometries = latitude // Layouts that provide further specializations for the OLPC ! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us @@ -26,42 +26,44 @@ ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk -! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \ - acer_c300 acer_ferrari4k acer_laptop \ - acpi airkey \ - apple armada asus_laptop azonaRF2300 \ +! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ + airkey \ + apple armada azonaRF2300 \ benqx brother \ - btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb cherrycyboard \ - chicony chicony0108 chicony9885 \ + btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ + cherryblue cherrybluea cherryblueb \ + cherrycyboard cherrycmexpert \ + chicony chicony0108 chicony0420 chicony9885 \ + compalfl90 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ cymotionlinux \ - dell dellm65 inspiron precision_m dellusbmm dtk2000 \ - emachines ennyah_dkb1008 evdev fscaa1667g \ - genius geniuscomfy geniuscomfy2 geniuskb19e \ + dell dellm65 inspiron dellusbmm \ + emachines ennyah_dkb1008 evdev \ + genius geniuscomfy2 \ gyration honeywell_euroboard \ - hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \ + hp250x hp5xx hp500fa hpdv5 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ - ibm_spacesaver ipaq inspiron intel latitude \ + ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ + pc105 \ presario propeller \ qtronix \ - rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ + rapidaccess rapidaccess2 thinkpad60 \ samsung4500 samsung4510 \ - scorpius silvercrest \ - sk1300 sk2500 sk6200 sk7100 sp_inet \ + silvercrest \ + sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ toshiba_s3000 trust trustda \ - yahoo + unitekkb1925 yahoo // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ @@ -73,7 +75,6 @@ gb gr \ hu \ ie ir is it \ - kg \ latam \ lk lt \ mn mt \ @@ -86,3 +87,7 @@ vn \ za +! $evdevkbds = ibm_spacesaver + +! $thinkpads = thinkpad thinkpad60 thinkpadz60 + diff --git a/xorg-server/xkbdata.src/rules/base.lo_s.part b/xorg-server/xkbdata.src/rules/base.lo_s.part new file mode 100644 index 000000000..dee7b6daa --- /dev/null +++ b/xorg-server/xkbdata.src/rules/base.lo_s.part @@ -0,0 +1,2 @@ + $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) + * misc:typo = +typo(base) diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part index 7c0751d7b..36525754c 100644 --- a/xorg-server/xkbdata.src/rules/base.m_g.part +++ b/xorg-server/xkbdata.src/rules/base.m_g.part @@ -2,6 +2,7 @@ $msmodels = microsoft(natural) dell101 = dell(dell101) dellm65 = dell(dellm65) + latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) omnikey101 = northgate(omnikey101) diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index a39d4c881..b6433b2c8 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -4,13 +4,10 @@ sun5 = sun(type5_euro) sun6 = sun(type6_usb) pc98 = xfree98(pc98) - abnt2 = xfree86(abnt2) - jp106 = xfree86(jp106) evdev = evdev olpc = evdev macintosh_hhk = macintosh(hhk) macintosh_old = macintosh(old) - $macbooks = macintosh+macintosh(goodmap) $macs = macintosh thinkpadz60 = xfree86(thinkpadz60) * = xfree86 diff --git a/xorg-server/xkbdata.src/rules/base.m_s.part b/xorg-server/xkbdata.src/rules/base.m_s.part index f066cc077..13621e79c 100644 --- a/xorg-server/xkbdata.src/rules/base.m_s.part +++ b/xorg-server/xkbdata.src/rules/base.m_s.part @@ -1,8 +1,25 @@ + a4techKB21 = +inet(media_nav_common) + a4techKBS8 = +inet(media_nav_acpi_common) + a4_rfkb23 = +inet(media_nav_acpi_common) + asus_laptop = +inet(media_common) + acer_tm_800 = +inet(acer_laptop) + acpi = +inet(acpi_common) benqx730 = +inet(benqx) benqx800 = +inet(benqx) + btc5126t = +inet(nav_acpi_common) + btc9116u = +inet(btc9019u) + btc6301urf = +inet(media_nav_acpi_common) dellsk8125 = +inet(dell) dellsk8135 = +inet(dell) - hpnx9020 = +inet(hp5185) + cherrybunlim = +inet(nav_common) + dexxa = +inet(media_nav_common) + dtk2000 = +inet(media_nav_acpi_common) + fscaa1667g = +inet(media_nav_common) + geniuskb19e = +inet(media_nav_acpi_common) + geniuscomfy = +inet(media_nav_acpi_common) + geniuskkb2050hs = +inet(dellusbmm) + hpnx9020 = +inet(hpi6) + latitude = +inet(media_common) logicd = +inet(logitech_base) logicd_it = +inet(logitech_base) logicd_nav = +inet(logitech_base) @@ -11,19 +28,22 @@ logiclx300 = +inet(logiex110) logii350 = +inet(logiex110) logimel = +inet(logiex110) - vsonku306 = +inet(microsoftprooem) - $inetkbds = +inet(%m) - acer_tm_800 = +inet(acer_laptop) - benqx730 = +inet(benqx) - benqx800 = +inet(benqx) - dell8125 = +inet(dellusbmm) - dell8135 = +inet(dellusbmm) - ltcd = +inet(logicda) logicdit = +inet(logicd) logicdo = +inet(logicd) logicdp = +inet(logicd) logicdpa = +inet(logicda) logiciink = +inet(logicink) + ltcd = +inet(logicda) + microsoftccurve2k = +inet(microsoftprooem) + microsoftpro = +inet(media_nav_acpi_common) + precision_m = +inet(media_nav_common) + scorpius = +inet(media_nav_acpi_common) + sp_inet = +inet(media_nav_acpi_common) + targa_v811 = +inet(media_nav_acpi_common) + thinkpad = +inet(media_nav_common) + thinkpadz60 = +inet(thinkpad60) + trust_slimline = +inet(media_nav_acpi_common) + vsonku306 = +inet(microsoftprooem) + $inetkbds = +inet(%m) $maclaptop = +inet(apple)+level3(enter_switch) $macs = +inet(apple) - thinkpadz60 = +inet(thinkpad60) diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index 8e0eeef4f..c45b9805e 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -6,5 +6,5 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - thinkpad br = pc+%l[1](thinkpad) + $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index 570c5ef77..7e9b2d63e 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -3,10 +3,10 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) - sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(sun4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(sun5)+%l%(v) + sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 + sun4 * = latin+sun_vndr/us(type4)+%l%(v) + sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 + sun5 * = latin+sun_vndr/us(type5)+%l%(v) sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) @@ -20,6 +20,6 @@ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) - thinkpad br = pc+br(thinkpad) + $thinkpads br = pc+br(thinkpad) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) diff --git a/xorg-server/xkbdata.src/rules/base.o_c.part b/xorg-server/xkbdata.src/rules/base.o_c.part index 9ce5410ed..8898e3b50 100644 --- a/xorg-server/xkbdata.src/rules/base.o_c.part +++ b/xorg-server/xkbdata.src/rules/base.o_c.part @@ -3,4 +3,5 @@ grp_led:scroll = +ledscroll(group_lock) grp:caps_toggle = +ledcaps(group_lock) japan:kana_lock = +japan(kana_lock) + caps:shiftlock = +ledcaps(shift_lock) diff --git a/xorg-server/xkbdata.src/rules/base.o_k.part b/xorg-server/xkbdata.src/rules/base.o_k.part new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/xorg-server/xkbdata.src/rules/base.o_k.part diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part index 2e1e38cd2..d3078bfc5 100644 --- a/xorg-server/xkbdata.src/rules/base.o_s.part +++ b/xorg-server/xkbdata.src/rules/base.o_s.part @@ -1,9 +1,9 @@ altwin:menu = +altwin(menu) altwin:meta_alt = +altwin(meta_alt) altwin:ctrl_win = +altwin(ctrl_win) + altwin:ctrl_alt_win = +altwin(ctrl_alt_win) altwin:meta_win = +altwin(meta_win) altwin:left_meta_win = +altwin(left_meta_win) - altwin:super_win = +altwin(super_win) altwin:hyper_win = +altwin(hyper_win) altwin:alt_super_win = +altwin(alt_super_win) altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) @@ -22,9 +22,11 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) grp:alt_shift_toggle = +group(alt_shift_toggle) + grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) grp:lwin_toggle = +group(lwin_toggle) grp:rwin_toggle = +group(rwin_toggle) @@ -34,6 +36,7 @@ grp:lctrl_toggle = +group(lctrl_toggle) grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) + grp:sclk_toggle = +group(sclk_toggle) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -44,9 +47,12 @@ lv3:win_switch = +level3(win_switch) lv3:lwin_switch = +level3(lwin_switch) lv3:rwin_switch = +level3(rwin_switch) + lv3:enter_switch = +level3(enter_switch) caps:capslock = +capslock(capslock) caps:shiftlock = +capslock(shiftlock) caps:swapescape = +capslock(swapescape) + caps:escape = +capslock(escape) + caps:backspace = +capslock(backspace) ctrl:nocaps = +ctrl(nocaps) ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) @@ -70,7 +76,8 @@ keypad:oss_wang = +keypad(oss_wang) keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) - keypad:phone_hex = +keypad(phone_hex) + keypad:hex = +keypad(ops)+keypad(hex) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) @@ -87,5 +94,10 @@ kpdl:commaoss = +kpdl(commaoss) kpdl:momayyezoss = +kpdl(momayyezoss) kpdl:kposs = +kpdl(kposs) + kpdl:semi = +kpdl(semi) shift:breaks_caps = +shift(breaks_caps) + esperanto:qwerty = +epo(qwerty) + esperanto:dvorak = +epo(dvorak) + terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + diff --git a/xorg-server/xkbdata.src/rules/base.o_t.part b/xorg-server/xkbdata.src/rules/base.o_t.part index 440f9efe3..e0d4b15ed 100644 --- a/xorg-server/xkbdata.src/rules/base.o_t.part +++ b/xorg-server/xkbdata.src/rules/base.o_t.part @@ -5,3 +5,4 @@ numpad:pc = +numpad(pc) numpad:mac = +numpad(mac) numpad:microsoft = +numpad(microsoft) + numpad:shift3 = +numpad(shift3) diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index 8d0aa921c..996cde84f 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -88,13 +88,6 @@ </model> <model> <configItem> - <name>jp106</name> - <_description>Japanese 106-key</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>pc98</name> <_description>PC-98xx Series</_description> <vendor>Generic</vendor> @@ -123,13 +116,6 @@ </model> <model> <configItem> - <name>abnt2</name> - <_description>Brazilian ABNT2</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>airkey</name> <_description>Acer AirKey V</_description> <vendor>Acer</vendor> @@ -221,6 +207,12 @@ </model> <model> <configItem> + <name>btc9116u</name> + <_description>BTC 9116U Mini Wireless Internet and Gaming</_description> + </configItem> + </model> + <model> + <configItem> <name>cherryblue</name> <_description>Cherry Blue Line CyBo@rd</_description> </configItem> @@ -248,6 +240,20 @@ </model> <model> <configItem> + <name>cherrycmexpert</name> + <_description>Cherry CyMotion Expert</_description> + <vendor>Cherry</vendor> + </configItem> + </model> + <model> + <configItem> + <name>cherrybunlim</name> + <_description>Cherry B.UNLIMITED</_description> + <vendor>Cherry</vendor> + </configItem> + </model> + <model> + <configItem> <name>chicony</name> <_description>Chicony Internet Keyboard</_description> <vendor>Chicony</vendor> @@ -262,6 +268,13 @@ </model> <model> <configItem> + <name>chicony0420</name> + <_description>Chicony KU-0420</_description> + <vendor>Chicony</vendor> + </configItem> + </model> + <model> + <configItem> <name>chicony9885</name> <_description>Chicony KB-9885</_description> <vendor>Chicony</vendor> @@ -395,7 +408,7 @@ <model> <configItem> <name>fscaa1667g</name> - <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description> + <_description>Fujitsu-Siemens Computers AMILO laptop</_description> <vendor>Fujitsu-Siemens</vendor> </configItem> </model> @@ -429,6 +442,13 @@ </model> <model> <configItem> + <name>geniuskkb2050hs</name> + <_description>Genius KKB-2050HS</_description> + <vendor>Genius</vendor> + </configItem> + </model> + <model> + <configItem> <name>gyration</name> <_description>Gyration</_description> <vendor>Gyration</vendor> @@ -457,15 +477,8 @@ </model> <model> <configItem> - <name>hp2501</name> - <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp2505</name> - <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description> + <name>hp250x</name> + <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description> <vendor>Hewlett-Packard</vendor> </configItem> </model> @@ -492,6 +505,13 @@ </model> <model> <configItem> + <name>hpdv5</name> + <_description>Hewlett-Packard Pavilion dv5</_description> + <vendor>Hewlett-Packard</vendor> + </configItem> + </model> + <model> + <configItem> <name>hpzt11xx</name> <_description>Hewlett-Packard Pavilion ZT11xx</_description> <vendor>Hewlett-Packard</vendor> @@ -513,20 +533,6 @@ </model> <model> <configItem> - <name>hp5181</name> - <_description>Hewlett-Packard Internet Keyboard 5181</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp5185</name> - <_description>Hewlett-Packard Internet Keyboard 5185</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> <name>hpnx9020</name> <_description>Hewlett-Packard nx9020</_description> <vendor>Hewlett-Packard</vendor> @@ -562,13 +568,6 @@ </model> <model> <configItem> - <name>rapidaccess2a</name> - <_description>IBM Rapid Access II (alternate option)</_description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad</name> <_description>IBM ThinkPad 560Z/600/600E/A22E</_description> <vendor>IBM</vendor> @@ -668,7 +667,7 @@ <model> <configItem> <name>logicdpa2</name> - <_description>Logitech Cordless Desktop Pro (alternate option2)</_description> + <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description> <vendor>Logitech</vendor> </configItem> </model> @@ -856,6 +855,13 @@ </model> <model> <configItem> + <name>microsoftccurve2k</name> + <_description>Microsoft Comfort Curve Keyboard 2000</_description> + <vendor>Microsoft Inc.</vendor> + </configItem> + </model> + <model> + <configItem> <name>oretec</name> <_description>Ortek MCK-800 MM/Internet keyboard</_description> <vendor>Ortek</vendor> @@ -968,6 +974,13 @@ </model> <model> <configItem> + <name>trust_slimline</name> + <_description>Trust Slimline</_description> + <vendor>Trust</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <_description>Yahoo! Internet Keyboard</_description> <vendor>Yahoo!</vendor> @@ -1066,13 +1079,6 @@ </model> <model> <configItem> - <name>kr106</name> - <_description>Korean 106-key</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>evdev</name> <_description>Evdev-managed keyboard</_description> <vendor>Generic</vendor> @@ -1127,6 +1133,27 @@ <vendor>Sun Microsystems</vendor> </configItem> </model> + <model> + <configItem> + <name>targa_v811</name> + <_description>Targa Visionary 811</_description> + <vendor>Targa</vendor> + </configItem> + </model> + <model> + <configItem> + <name>unitekkb1925</name> + <_description>Unitek KB-1925</_description> + <vendor>Unitek Group</vendor> + </configItem> + </model> + <model> + <configItem> + <name>compalfl90</name> + <_description>FL90</_description> + <vendor>Compal Electronics Inc.</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1451,6 +1478,24 @@ <variantList> <variant> <configItem> + <name>oss</name> + <_description>Alternative</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_latin9</name> + <_description>Alternative, latin-9 only</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_sundeadkeys</name> + <_description>Alternative, Sun dead keys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>iso-alternate</name> <_description>ISO Alternate</_description> </configItem> @@ -1598,8 +1643,22 @@ </variant> <variant> <configItem> - <name>urd</name> - <_description>Urdu</_description> + <name>urd-phonetic</name> + <_description>Urdu, Phonetic</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-phonetic3</name> + <_description>Urdu, Alternative phonetic</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-winkeys</name> + <_description>Urdu, Winkeys</_description> <languageList><iso639Id>urd</iso639Id></languageList> </configItem> </variant> @@ -1610,6 +1669,13 @@ <languageList><iso639Id>hin</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>hin-wx</name> + <_description>Hindi Wx</_description> + <languageList><iso639Id>hin</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1698,7 +1764,15 @@ <variant> <configItem> <name>phonetic</name> - <_description>Phonetic</_description> + <_description>Traditional Phonetic</_description> + </configItem> + </variant> + </variantList> + <variantList> + <variant> + <configItem> + <name>bas_phonetic</name> + <_description>Standard Phonetic</_description> </configItem> </variant> </variantList> @@ -1827,6 +1901,13 @@ <_description>Ktunaxa</_description> </configItem> </variant> + <variant> + <configItem> + <name>eng</name> + <_description>English</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2157,7 +2238,8 @@ <configItem> <name>smi</name> <_description>Northern Saami</_description> - <languageList><iso639Id>smi</iso639Id></languageList> + <languageList><iso639Id>smi</iso639Id> + <iso639Id>sme</iso639Id></languageList> </configItem> </variant> <variant> @@ -2262,6 +2344,19 @@ </variant> <variant> <configItem> + <name>bre</name> + <_description>Breton</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oci</name> + <_description>Occitan</_description> + <languageList><iso639Id>oci</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <_description>Georgian AZERTY Tskapo</_description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -2418,7 +2513,7 @@ <variant> <configItem> <name>neo</name> - <_description>Neostyle</_description> + <_description>Neo 2</_description> </configItem> </variant> <variant> @@ -2433,6 +2528,26 @@ <_description>Macintosh, eliminate dead keys</_description> </configItem> </variant> + <variant> + <configItem> + <name>dsb</name> + <_description>Lower Sorbian</_description> + <languageList><iso639Id>dsb</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>dsb_qwertz</name> + <_description>Lower Sorbian (qwertz)</_description> + <languageList><iso639Id>dsb</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> + <_description>qwerty</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2714,11 +2829,18 @@ <layout> <configItem> <name>kg</name> - <_shortDescription>Kir</_shortDescription> + <_shortDescription>Kgz</_shortDescription> <_description>Kyrgyzstan</_description> <languageList><iso639Id>kir</iso639Id></languageList> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>phonetic</name> + <_description>Phonetic</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -2787,6 +2909,8 @@ <iso3166Id>PE</iso3166Id> <iso3166Id>PR</iso3166Id> <iso3166Id>PY</iso3166Id> + <iso3166Id>SV</iso3166Id> + <iso3166Id>US</iso3166Id> <iso3166Id>UY</iso3166Id> <iso3166Id>VE</iso3166Id> </countryList> @@ -2801,6 +2925,12 @@ </variant> <variant> <configItem> + <name>deadtilde</name> + <_description>Include dead tilde</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sundeadkeys</name> <_description>Sun dead keys</_description> </configItem> @@ -3060,7 +3190,7 @@ <variant> <configItem> <name>dvorak_altquotes</name> - <_description>Dvorak, Polish quotes on key "1/!"</_description> + <_description>Dvorak, Polish quotes on key 1</_description> </configItem> </variant> <variant> @@ -3170,6 +3300,34 @@ <_description>Winkeys</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_dobruca1</name> + <_description>Crimean Tatar (Dobruca-1 Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_dobruca2</name> + <_description>Crimean Tatar (Dobruca-2 Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3188,6 +3346,12 @@ </variant> <variant> <configItem> + <name>phonetic_winkeys</name> + <_description>Phonetic Winkeys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>typewriter</name> <_description>Typewriter</_description> </configItem> @@ -3254,6 +3418,19 @@ <languageList><iso639Id>sah</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>xal</name> + <_description>Kalmyk</_description> + <languageList><iso639Id>xal</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>dos</name> + <_description>DOS</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3324,18 +3501,6 @@ </variant> <variant> <configItem> - <name>unicode</name> - <_description>Use Slovenian digraphs</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> - <_description>US keyboard with Slovenian digraphs</_description> - </configItem> - </variant> - <variant> - <configItem> <name>us</name> <_description>US keyboard with Slovenian letters</_description> </configItem> @@ -3386,6 +3551,12 @@ </variant> <variant> <configItem> + <name>deadtilde</name> + <_description>Include dead tilde</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sundeadkeys</name> <_description>Sun dead keys</_description> </configItem> @@ -3580,7 +3751,14 @@ <_description>Tajikistan</_description> <languageList><iso639Id>tgk</iso639Id></languageList> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>legacy</name> + <_description>Legacy</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -3681,6 +3859,27 @@ <_description>International (with dead keys)</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3711,8 +3910,8 @@ </variant> <variant> <configItem> - <name>unicode</name> - <_description>Unicode</_description> + <name>legacy</name> + <_description>Legacy</_description> </configItem> </variant> <variant> @@ -3735,6 +3934,27 @@ <_description>Homophonic</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3747,6 +3967,12 @@ <variantList> <variant> <configItem> + <name>extd</name> + <_description>Extended - Winkeys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>intl</name> <_description>International (with dead keys)</_description> </configItem> @@ -3791,6 +4017,27 @@ <_description>Latin</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3875,6 +4122,20 @@ <variantList> <variant> <configItem> + <name>urd-crulp</name> + <_description>CRULP</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-nla</name> + <_description>NLA</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>ara</name> <_description>Arabic</_description> <languageList><iso639Id>ara</iso639Id></languageList> @@ -3965,7 +4226,16 @@ </layout> <layout> <configItem> - <name>braille</name> + <name>sn</name> + <shortDescription>Sen</shortDescription> + <description>Senegal</description> + <languageList><iso639Id>wol</iso639Id></languageList> + </configItem> + <variantList/> + </layout> + <layout> + <configItem> + <name>brai</name> <_shortDescription>Brl</_shortDescription> <_description>Braille</_description> </configItem> @@ -3984,174 +4254,208 @@ </variant> </variantList> </layout> + <layout> + <configItem> + <name>tm</name> + <shortDescription>Tkm</shortDescription> + <_description>Turkmenistan</_description> + <languageList><iso639Id>tuk</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>alt</name> + <_description>Alt-Q</_description> + </configItem> + </variant> + </variantList> + </layout> </layoutList> <optionList> <group allowMultipleSelection="true"> <!-- The key combination used to switch between groups --> <configItem> <name>grp</name> - <_description>Layout switching</_description> + <_description>Key(s) to change layout</_description> </configItem> <option> <configItem> <name>grp:switch</name> - <_description>R-Alt switches layout while pressed.</_description> + <_description>Right Alt (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:lswitch</name> - <_description>Left Alt key switches layout while pressed.</_description> + <_description>Left Alt (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:lwin_switch</name> - <_description>Left Win-key switches layout while pressed.</_description> + <_description>Left Win (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:rwin_switch</name> - <_description>Right Win-key switches layout while pressed.</_description> + <_description>Right Win (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:win_switch</name> - <_description>Both Win-keys switch layout while pressed.</_description> + <_description>Any Win key (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:caps_switch</name> - <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description> + <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description> </configItem> </option> <option> <configItem> <name>grp:rctrl_switch</name> - <_description>Right Ctrl key switches layout while pressed.</_description> + <_description>Right Ctrl (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:toggle</name> - <_description>Right Alt key changes layout.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>grp:lalt_toggle</name> - <_description>Left Alt key changes layout.</_description> + <_description>Left Alt</_description> </configItem> </option> <option> <configItem> <name>grp:caps_toggle</name> - <_description>CapsLock key changes layout.</_description> + <_description>CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shift_caps_toggle</name> - <_description>Shift+CapsLock changes layout.</_description> + <_description>Shift+CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shift_caps_switch</name> - <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description> + <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:win_menu_switch</name> + <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description> </configItem> </option> <option> <configItem> <name>grp:alt_caps_toggle</name> - <_description>Alt+CapsLock changes layout.</_description> + <_description>Alt+CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shifts_toggle</name> - <_description>Both Shift keys together change layout.</_description> + <_description>Both Shift keys together</_description> </configItem> </option> <option> <configItem> <name>grp:alts_toggle</name> - <_description>Both Alt keys together change layout.</_description> + <_description>Both Alt keys together</_description> </configItem> </option> <option> <configItem> <name>grp:ctrls_toggle</name> - <_description>Both Ctrl keys together change layout.</_description> + <_description>Both Ctrl keys together</_description> </configItem> </option> <option> <configItem> <name>grp:ctrl_shift_toggle</name> - <_description>Ctrl+Shift change layout.</_description> + <_description>Ctrl+Shift</_description> </configItem> </option> <option> <configItem> <name>grp:lctrl_lshift_toggle</name> - <_description>LCtrl+LShift change layout.</_description> + <_description>Left Ctrl+Left Shift</_description> </configItem> </option> <option> <configItem> <name>grp:ctrl_alt_toggle</name> - <_description>Alt+Ctrl change layout.</_description> + <_description>Alt+Ctrl</_description> </configItem> </option> <option> <configItem> <name>grp:alt_shift_toggle</name> - <_description>Alt+Shift change layout.</_description> + <_description>Alt+Shift</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alt_space_toggle</name> + <_description>Alt+Space</_description> </configItem> </option> <option> <configItem> <name>grp:menu_toggle</name> - <_description>Menu key changes layout.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>grp:lwin_toggle</name> - <_description>Left Win-key changes layout.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>grp:rwin_toggle</name> - <_description>Right Win-key changes layout.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>grp:lshift_toggle</name> - <_description>Left Shift key changes layout.</_description> + <_description>Left Shift</_description> </configItem> </option> <option> <configItem> <name>grp:rshift_toggle</name> - <_description>Right Shift key changes layout.</_description> + <_description>Right Shift</_description> </configItem> </option> <option> <configItem> <name>grp:lctrl_toggle</name> - <_description>Left Ctrl key changes layout.</_description> + <_description>Left Ctrl</_description> </configItem> </option> <option> <configItem> <name>grp:rctrl_toggle</name> - <_description>Right Ctrl key changes layout.</_description> + <_description>Right Ctrl</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:sclk_toggle</name> + <_description>Scroll Lock</_description> </configItem> </option> </group> @@ -4160,66 +4464,72 @@ level of symbols --> <configItem> <name>lv3</name> - <_description>Third level choosers</_description> + <_description>Key to choose 3rd level</_description> </configItem> <option> <configItem> <name>lv3:switch</name> - <_description>Press Right Ctrl to choose 3rd level.</_description> + <_description>Right Ctrl</_description> </configItem> </option> <option> <configItem> <name>lv3:menu_switch</name> - <_description>Press Menu key to choose 3rd level.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>lv3:win_switch</name> - <_description>Press any of Win-keys to choose 3rd level.</_description> + <_description>Any Win key</_description> </configItem> </option> <option> <configItem> <name>lv3:lwin_switch</name> - <_description>Press Left Win-key to choose 3rd level.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>lv3:rwin_switch</name> - <_description>Press Right Win-key to choose 3rd level.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>lv3:alt_switch</name> - <_description>Press any of Alt keys to choose 3rd level.</_description> + <_description>Any Alt key</_description> </configItem> </option> <option> <configItem> <name>lv3:lalt_switch</name> - <_description>Press Left Alt key to choose 3rd level.</_description> + <_description>Left Alt</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_switch</name> - <_description>Press Right Alt key to choose 3rd level.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_switch_multikey</name> - <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description> + <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_alt</name> - <_description>Right Alt key never chooses 3rd level.</_description> + <_description>Right Alt key never chooses 3rd level</_description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:enter_switch</name> + <_description>Enter on keypad</_description> </configItem> </option> </group> @@ -4232,31 +4542,31 @@ <option> <configItem> <name>ctrl:nocaps</name> - <_description>Make CapsLock an additional Ctrl.</_description> + <_description>Make CapsLock an additional Ctrl</_description> </configItem> </option> <option> <configItem> <name>ctrl:swapcaps</name> - <_description>Swap Ctrl and CapsLock.</_description> + <_description>Swap Ctrl and CapsLock</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_ac</name> - <_description>Ctrl key at left of 'A'</_description> + <_description>At left of 'A'</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_aa</name> - <_description>Ctrl key at bottom left</_description> + <_description>At bottom left</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_ra</name> - <_description>Right Ctrl key works as Right Alt.</_description> + <_description>Right Ctrl as Right Alt</_description> </configItem> </option> </group> @@ -4264,24 +4574,24 @@ <!-- Using startard LEDs to indicate the alternative (not first) group(s) --> <configItem> <name>grp_led</name> - <_description>Use keyboard LED to show alternative layout.</_description> + <_description>Use keyboard LED to show alternative layout</_description> </configItem> <option> <configItem> <name>grp_led:num</name> - <_description>NumLock LED shows alternative layout.</_description> + <_description>NumLock</_description> </configItem> </option> <option> <configItem> <name>grp_led:caps</name> - <_description>CapsLock LED shows alternative layout.</_description> + <_description>CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp_led:scroll</name> - <_description>ScrollLock LED shows alternative layout.</_description> + <_description>ScrollLock</_description> </configItem> </option> </group> @@ -4294,25 +4604,25 @@ <option> <configItem> <name>keypad:legacy</name> - <_description>Legacy keypad</_description> + <_description>Legacy</_description> </configItem> </option> <option> <configItem> <name>keypad:oss</name> - <_description>Keypad with unicode additions (arrows and math operators)</_description> + <_description>Unicode additions (arrows and math operators)</_description> </configItem> </option> <option> <configItem> <name>keypad:future</name> - <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description> + <_description>Unicode additions (arrows and math operators). Math operators on default level</_description> </configItem> </option> <option> <configItem> <name>keypad:legacy_wang</name> - <_description>Legacy Wang 724 keypad</_description> + <_description>Legacy Wang 724</_description> </configItem> </option> <option> @@ -4324,14 +4634,20 @@ <option> <configItem> <name>keypad:future_wang</name> - <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description> + <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description> </configItem> </option> <option> <configItem> - <name>keypad:phone_hex</name> - <_description>ATM/phone-style hexadecimal keypad</_description> - </configItem> + <name>keypad:hex</name> + <_description>Hexadecimal</_description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:atm</name> + <_description>ATM/phone-style</_description> + </configItem> </option> </group> <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place --> @@ -4387,6 +4703,12 @@ <_description>Four-level key with abstract separators</_description> </configItem> </option> + <option> + <configItem> + <name>kpdl:semi</name> + <_description>Semi-colon on third level</_description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> <!-- CapsLock tweaks. @@ -4399,43 +4721,55 @@ <option> <configItem> <name>caps:internal</name> - <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description> + <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:internal_nocancel</name> - <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description> + <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:shift</name> - <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description> + <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:shift_nocancel</name> - <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description> + <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:capslock</name> - <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description> + <_description>CapsLock toggles normal capitalization of alphabetic characters</_description> </configItem> </option> <option> <configItem> <name>caps:swapescape</name> - <_description>Swap ESC and CapsLock.</_description> + <_description>Swap ESC and CapsLock</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:escape</name> + <_description>Make CapsLock an additional ESC</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:backspace</name> + <_description>Make CapsLock an additional Backspace</_description> </configItem> </option> <option> <configItem> <name>caps:shiftlock</name> - <_description>CapsLock toggles Shift so all keys are affected.</_description> + <_description>CapsLock toggles Shift so all keys are affected</_description> </configItem> </option> </group> @@ -4448,55 +4782,55 @@ <option> <configItem> <name>altwin:menu</name> - <_description>Add the standard behavior to Menu key.</_description> + <_description>Add the standard behavior to Menu key</_description> </configItem> </option> <option> <configItem> <name>altwin:meta_alt</name> - <_description>Alt and Meta are on the Alt keys.</_description> + <_description>Alt and Meta are on Alt keys</_description> </configItem> </option> <option> <configItem> <name>altwin:ctrl_win</name> - <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description> + <_description>Control is mapped to Win keys (and the usual Ctrl keys)</_description> </configItem> </option> <option> <configItem> - <name>altwin:meta_win</name> - <_description>Meta is mapped to the Win-keys.</_description> + <name>altwin:ctrl_alt_win</name> + <_description>Control is mapped to Alt keys, Alt is mapped to Win keys</_description> </configItem> </option> <option> <configItem> - <name>altwin:left_meta_win</name> - <_description>Meta is mapped to the left Win-key.</_description> + <name>altwin:meta_win</name> + <_description>Meta is mapped to Win keys</_description> </configItem> </option> <option> <configItem> - <name>altwin:super_win</name> - <_description>Super is mapped to the Win-keys.</_description> + <name>altwin:left_meta_win</name> + <_description>Meta is mapped to Left Win</_description> </configItem> </option> <option> <configItem> <name>altwin:hyper_win</name> - <_description>Hyper is mapped to the Win-keys.</_description> + <_description>Hyper is mapped to Win-keys</_description> </configItem> </option> <option> <configItem> <name>altwin:alt_super_win</name> - <_description>Alt is mapped to the right Win-key and Super to Menu.</_description> + <_description>Alt is mapped to Right Win, Super to Menu</_description> </configItem> </option> <option> <configItem> <name>altwin:swap_lalt_lwin</name> - <_description>Left Alt is swapped with left Win-key.</_description> + <_description>Left Alt is swapped with Left Win</_description> </configItem> </option> </group> @@ -4509,43 +4843,43 @@ <option> <configItem> <name>compose:ralt</name> - <_description>Right Alt is Compose.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>compose:lwin</name> - <_description>Left Win-key is Compose.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>compose:rwin</name> - <_description>Right Win-key is Compose.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>compose:menu</name> - <_description>Menu is Compose.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>compose:rctrl</name> - <_description>Right Ctrl is Compose.</_description> + <_description>Right Ctrl</_description> </configItem> </option> <option> <configItem> <name>compose:caps</name> - <_description>Caps Lock is Compose.</_description> + <_description>Caps Lock</_description> </configItem> </option> <option> <configItem> <name>compose:102</name> - <_description>Less-than/Greater-than is Compose.</_description> + <_description>Less-than/Greater-than</_description> </configItem> </option> </group> @@ -4557,37 +4891,43 @@ <option> <configItem> <name>numpad:pc</name> - <_description>Default numeric keypad keys.</_description> + <_description>Default numeric keypad keys</_description> </configItem> </option> <option> <configItem> <name>numpad:mac</name> - <_description>Numeric keypad keys work as with Mac.</_description> + <_description>Numeric keypad keys work as with Mac</_description> </configItem> </option> <option> <configItem> <name>numpad:microsoft</name> - <_description>Shift with numeric keypad keys works as in MS Windows.</_description> + <_description>Shift with numeric keypad keys works as in MS Windows</_description> </configItem> </option> <option> <configItem> - <name>srvrkeys:none</name> - <_description>Special keys (Ctrl+Alt+<key>) handled in a server.</_description> + <name>numpad:shift3</name> + <_description>Shift does not cancel NumLock, chooses 3d level instead</_description> </configItem> </option> <option> <configItem> - <name>apple:badmap</name> - <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description> + <name>srvrkeys:none</name> + <_description>Special keys (Ctrl+Alt+<key>) handled in a server</_description> </configItem> </option> <option> <configItem> <name>shift:breaks_caps</name> - <_description>Shift cancels CapsLock.</_description> + <_description>Shift cancels CapsLock</_description> + </configItem> + </option> + <option> + <configItem> + <name>misc:typo</name> + <_description>Enable extra typographic characters</_description> </configItem> </option> </group> @@ -4595,30 +4935,30 @@ <!-- Special shortcuts for the Euro character --> <configItem> <name>eurosign</name> - <_description>Adding the EuroSign to certain keys</_description> + <_description>Adding EuroSign to certain keys</_description> </configItem> <option> <configItem> <name>eurosign:e</name> - <_description>Add the EuroSign to the E key.</_description> + <_description>E</_description> </configItem> </option> <option> <configItem> <name>eurosign:2</name> - <_description>Add the EuroSign to the 2 key.</_description> + <_description>2</_description> </configItem> </option> <option> <configItem> <name>eurosign:4</name> - <_description>Add the EuroSign to the 4 key.</_description> + <_description>4</_description> </configItem> </option> <option> <configItem> <name>eurosign:5</name> - <_description>Add the EuroSign to the 5 key.</_description> + <_description>5</_description> </configItem> </option> </group> @@ -4631,49 +4971,49 @@ <option> <configItem> <name>nbsp:none</name> - <_description>Space key outputs usual space at any level.</_description> + <_description>Usual space at any level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level2</name> - <_description>Space key outputs non-breakable space character at second level.</_description> + <_description>Non-breakable space character at second level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3</name> - <_description>Space key outputs non-breakable space character at third level.</_description> + <_description>Non-breakable space character at third level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3s</name> - <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description> + <_description>Non-breakable space character at third level, nothing at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3n</name> - <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description> + <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4</name> - <_description>Space key outputs non-breakable space character at fourth level.</_description> + <_description>Non-breakable space character at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4n</name> - <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> + <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4nl</name> - <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> + <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> </configItem> </option> </group> @@ -4695,5 +5035,35 @@ </configItem> </option> </group> + <group allowMultipleSelection="false"> + <configItem> + <name>esperanto</name> + <_description>Adding Esperanto circumflexes (supersigno)</_description> + </configItem> + <option> + <configItem> + <name>esperanto:qwerty</name> + <_description>To the corresponding key in a Qwerty keyboard.</_description> + </configItem> + </option> + <option> + <configItem> + <name>esperanto:dvorak</name> + <_description>To the corresponding key in a Dvorak keyboard.</_description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>terminate</name> + <_description>Key sequence to kill the X server</_description> + </configItem> + <option> + <configItem> + <name>terminate:ctrl_alt_bksp</name> + <_description>Control + Alt + Backspace</_description> + </configItem> + </option> + </group> </optionList> </xkbConfigRegistry> diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am index 331265ae1..20bf3d9a1 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am @@ -1,14 +1,28 @@ transform_files=layoutRename.lst variantRename.lst -transform_scripts=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh +transform_scripts= \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh dist_parts=base.o_s.part -scripts=base.l2_s.part base.l3_s.part base.l4_s.part \ -base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \ -base.ml_s.part base.ml1_s.part \ -base.mlv_s.part base.ml1v1_s.part \ +scripts= \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ base.ml_s.part if USE_COMPAT_RULES diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in index 10fa254b1..1488a728d 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.in +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -48,8 +44,6 @@ DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -62,10 +56,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@ -CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@ -CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@ -CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ @@ -79,43 +69,24 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -135,15 +106,15 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@ -USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -151,6 +122,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -174,17 +146,36 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ transform_files = layoutRename.lst variantRename.lst -transform_scripts = ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh +transform_scripts = \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + dist_parts = base.o_s.part -scripts = base.l2_s.part base.l3_s.part base.l4_s.part \ -base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \ -base.ml_s.part base.ml1_s.part \ -base.mlv_s.part base.ml1v1_s.part \ +scripts = \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ base.ml_s.part @USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = @@ -198,8 +189,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ exit 1;; \ esac; \ done; \ @@ -223,7 +214,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: tags: TAGS TAGS: @@ -232,22 +222,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -307,12 +296,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -331,16 +328,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am base.l2_s.part: ln_s.sh $(transform_files) diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh index 9423e8980..934e0b571 100644 --- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh +++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh @@ -5,6 +5,6 @@ set OUTFILE=base.l%variant%_s.part del %OUTFILE% -gawk "{ printf """ %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2; }" layoutRename.lst >> %OUTFILE% +gawk "{ if (index($2, """(""") == 0) { printf """ %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;} else { printf """ %%s = +%%s:%variant%\n""", $1, $2; } }" layoutRename.lst >> %OUTFILE% gawk "{ printf """ %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile index d04a3ceb2..1abfe775f 100644 --- a/xorg-server/xkbdata.src/rules/compat/makefile +++ b/xorg-server/xkbdata.src/rules/compat/makefile @@ -1,12 +1,26 @@ TRANSFORM_FILES=layoutRename.lst variantRename.lst -TRANSFORM_SCRIPTS=ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh - -SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \ -base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \ -base.ml_s.part base.ml1_s.part \ -base.mlv_s.part base.ml1v1_s.part \ +TRANSFORM_SCRIPTS= \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +SCRIPTS= \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ base.ml_s.part SH=cmd /c diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh index bd47a342e..b31eb2af9 100644 --- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh +++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh @@ -4,6 +4,6 @@ set OUTFILE=base.ml1_s.part del %OUTFILE% -awk "{ printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2; }" layoutRename.lst >> %OUTFILE% +awk "{if (index($2, """(""") == 0) { printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """ * %%s = pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE% awk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantRename.lst index e6a99e9de..f85a2d0a8 100644 --- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst +++ b/xorg-server/xkbdata.src/rules/compat/variantRename.lst @@ -14,6 +14,7 @@ gur basic in guru ie laptop ie basic ie CloGaelachLaptop ie CloGaelach il si1452 ie basic +in urd in urd-phonetic iu basic ca ike lo basic la basic kan basic in kan @@ -30,6 +31,7 @@ ro academic ro std ro std_comma ro std ro comma ro basic ru os ru os_legacy +pk urd pk urd-phonetic sapmi basic no smi sapmi nodeadkeys no smi_nodeadkeys sapmi sefi fi smi diff --git a/xorg-server/xkbdata.src/rules/evdev b/xorg-server/xkbdata.src/rules/evdev index 3d84eaad0..76d3281dc 100644 --- a/xorg-server/xkbdata.src/rules/evdev +++ b/xorg-server/xkbdata.src/rules/evdev @@ -21,7 +21,7 @@ ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose // PC geometries - they have special geometry but symbols are mostly pc105 -! $pcgeometries = abnt2 latitude jp106 kr106 +! $pcgeometries = latitude // Layouts that provide further specializations for the OLPC ! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us @@ -35,42 +35,44 @@ ! $azerty = be fr ! $qwertz = al cz de hr hu ro si sk -! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \ - acer_c300 acer_ferrari4k acer_laptop \ - acpi airkey \ - apple armada asus_laptop azonaRF2300 \ +! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \ + airkey \ + apple armada azonaRF2300 \ benqx brother \ - btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb cherrycyboard \ - chicony chicony0108 chicony9885 \ + btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \ + cherryblue cherrybluea cherryblueb \ + cherrycyboard cherrycmexpert \ + chicony chicony0108 chicony0420 chicony9885 \ + compalfl90 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ cymotionlinux \ - dell dellm65 inspiron precision_m dellusbmm dtk2000 \ - emachines ennyah_dkb1008 evdev fscaa1667g \ - genius geniuscomfy geniuscomfy2 geniuskb19e \ + dell dellm65 inspiron dellusbmm \ + emachines ennyah_dkb1008 evdev \ + genius geniuscomfy2 \ gyration honeywell_euroboard \ - hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \ + hp250x hp5xx hp500fa hpdv5 \ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ - ibm_spacesaver ipaq inspiron intel latitude \ + ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ logitech_g15 \ logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \ + microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ + pc105 \ presario propeller \ qtronix \ - rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ + rapidaccess rapidaccess2 thinkpad60 \ samsung4500 samsung4510 \ - scorpius silvercrest \ - sk1300 sk2500 sk6200 sk7100 sp_inet \ + silvercrest \ + sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ toshiba_s3000 trust trustda \ - yahoo + unitekkb1925 yahoo // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ @@ -82,7 +84,6 @@ gb gr \ hu \ ie ir is it \ - kg \ latam \ lk lt \ mn mt \ @@ -95,13 +96,15 @@ vn \ za +! $evdevkbds = ibm_spacesaver + +! $thinkpads = thinkpad thinkpad60 thinkpadz60 + ! $dvoraklayouts = br ca de ee es fr gb no pl se us ! model = keycodes pc98 = evdev(pc98) - abnt2 = evdev(abnt2) - jp106 = evdev(jp106) * = evdev ! layout[1] = keycodes @@ -115,13 +118,16 @@ * = +aliases(qwerty) ! option = keycodes - thinkpad us = thinkpad(us) ! model layout = geometry + thinkpad us = thinkpad(us) + +! model = geometry microsoftelite = microsoft(elite) $msmodels = microsoft(natural) dell101 = dell(dell101) dellm65 = dell(dellm65) + latitude = dell(latitude) flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) omnikey101 = northgate(omnikey101) @@ -139,7 +145,7 @@ kinesis = kinesis(model100) * = pc(pc104) -! model = geometry +! model layout variant = symbols * ben basic = pc+in(ben)
* ben probhat = pc+in(ben_probhat)
* dev basic = pc+in(deva)
@@ -191,7 +197,7 @@ classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) -! model layout variant = symbols +! model layout = symbols * ar = pc+ara
* ben = pc+in(ben)
* bs = pc+ba
@@ -271,10 +277,10 @@ amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 amiga * = xfree68_vndr/amiga(usa1)+%l%(v) classmate us = pc+%l(classmate) - sun4 $nonlatin = latin+sun_vndr/us(sun4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(sun4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(sun5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(sun5)+%l%(v) + sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 + sun4 * = latin+sun_vndr/us(type4)+%l%(v) + sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 + sun5 * = latin+sun_vndr/us(type5)+%l%(v) sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) @@ -288,11 +294,11 @@ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) - thinkpad br = pc+br(thinkpad) + $thinkpads br = pc+br(thinkpad) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) -! model layout = symbols +! model layout[1] = symbols * ar = pc+ara%(v[1])
* ben = pc+in(ben)%(v[1])
* bs = pc+ba%(v[1])
@@ -375,10 +381,10 @@ macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) - thinkpad br = pc+%l[1](thinkpad) + $thinkpads br = pc+%l[1](thinkpad) * * = pc+%l[1]%(v[1]) -! model layout[1] = symbols +! model layout[1] variant[1] = symbols * ben basic = pc+in(ben)
* ben probhat = pc+in(ben_probhat)
* dev basic = pc+in(deva)
@@ -427,7 +433,7 @@ * yu yz = pc+srp(latinyz)
* yu unicodeyz = pc+srp(latinunicodeyz)
-! model layout[1] variant[1] = symbols +! layout[2] = symbols ar = +ara%(v[2]):2
ben = +in(ben)%(v[2]):2
bs = +ba%(v[2]):2
@@ -504,7 +510,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):2
* = +%l[2]%(v[2]):2 -! layout[2] = symbols +! layout[3] = symbols ar = +ara%(v[3]):3
ben = +in(ben)%(v[3]):3
bs = +ba%(v[3]):3
@@ -581,7 +587,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):3
* = +%l[3]%(v[3]):3 -! layout[3] = symbols +! layout[4] = symbols ar = +ara%(v[4]):4
ben = +in(ben)%(v[4]):4
bs = +ba%(v[4]):4
@@ -658,7 +664,7 @@ yu(unicodeyz) = +srp(latinunicodeyz):4
* = +%l[4]%(v[4]):4 -! layout[4] = symbols +! layout[2] variant[2] = symbols ben basic = +in(ben):2
ben probhat = +in(ben_probhat):2
dev basic = +in(deva):2
@@ -707,7 +713,7 @@ yu yz = +srp(latinyz):2
yu unicodeyz = +srp(latinunicodeyz):2
-! layout[2] variant[2] = symbols +! layout[3] variant[3] = symbols ben basic = +in(ben):3
ben probhat = +in(ben_probhat):3
dev basic = +in(deva):3
@@ -756,7 +762,7 @@ yu yz = +srp(latinyz):3
yu unicodeyz = +srp(latinunicodeyz):3
-! layout[3] variant[3] = symbols +! layout[4] variant[4] = symbols ben basic = +in(ben):4
ben probhat = +in(ben_probhat):4
dev basic = +in(deva):4
@@ -805,42 +811,51 @@ yu yz = +srp(latinyz):4
yu unicodeyz = +srp(latinunicodeyz):4
-! layout[4] variant[4] = symbols - * = +inet(evdev) - ! model = symbols + $evdevkbds = +inet(evdev)+inet(%m) + * = +inet(evdev) + +! model layout = compat pc98 nec_vndr/jp = pc98(basic) * jp = complete+japan olpc * = olpc * * = complete -! model layout = compat +! model layout[1] = compat * * = complete -! model layout[1] = compat +! model = types $macs = complete+numpad(mac) * = complete -! model = types +! layout option = symbols + $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle) + * misc:typo = +typo(base) + +! layout[1] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1 + * misc:typo = +typo(base):1 -! layout option = symbols +! layout[2] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2 + * misc:typo = +typo(base):2 -! layout[1] option = symbols +! layout[3] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3 + * misc:typo = +typo(base):3 -! layout[2] option = symbols +! layout[4] option = symbols $threelevellayouts grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4 + * misc:typo = +typo(base):4 -! layout[3] option = symbols +! option = symbols grp:shift_toggle = +group(shifts_toggle) altwin:menu = +altwin(menu) altwin:meta_alt = +altwin(meta_alt) altwin:ctrl_win = +altwin(ctrl_win) + altwin:ctrl_alt_win = +altwin(ctrl_alt_win) altwin:meta_win = +altwin(meta_win) altwin:left_meta_win = +altwin(left_meta_win) - altwin:super_win = +altwin(super_win) altwin:hyper_win = +altwin(hyper_win) altwin:alt_super_win = +altwin(alt_super_win) altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) @@ -859,9 +874,11 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) grp:alt_shift_toggle = +group(alt_shift_toggle) + grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) grp:lwin_toggle = +group(lwin_toggle) grp:rwin_toggle = +group(rwin_toggle) @@ -871,6 +888,7 @@ grp:lctrl_toggle = +group(lctrl_toggle) grp:rctrl_toggle = +group(rctrl_toggle) grp:lalt_toggle = +group(lalt_toggle) + grp:sclk_toggle = +group(sclk_toggle) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -881,9 +899,12 @@ lv3:win_switch = +level3(win_switch) lv3:lwin_switch = +level3(lwin_switch) lv3:rwin_switch = +level3(rwin_switch) + lv3:enter_switch = +level3(enter_switch) caps:capslock = +capslock(capslock) caps:shiftlock = +capslock(shiftlock) caps:swapescape = +capslock(swapescape) + caps:escape = +capslock(escape) + caps:backspace = +capslock(backspace) ctrl:nocaps = +ctrl(nocaps) ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) @@ -907,7 +928,8 @@ keypad:oss_wang = +keypad(oss_wang) keypad:future = +keypad(future) keypad:future_wang = +keypad(future_wang) - keypad:phone_hex = +keypad(phone_hex) + keypad:hex = +keypad(ops)+keypad(hex) + keypad:atm = +keypad(ops)+keypad(hex)+keypad(atm) nbsp:none = +nbsp(none) nbsp:level2 = +nbsp(level2) nbsp:level3 = +nbsp(level3) @@ -924,18 +946,24 @@ kpdl:commaoss = +kpdl(commaoss) kpdl:momayyezoss = +kpdl(momayyezoss) kpdl:kposs = +kpdl(kposs) + kpdl:semi = +kpdl(semi) shift:breaks_caps = +shift(breaks_caps) + esperanto:qwerty = +epo(qwerty) + esperanto:dvorak = +epo(dvorak) + terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) -! layout[4] option = symbols + +! option = compat grp_led:num = +lednum(group_lock) grp_led:caps = +ledcaps(group_lock) grp_led:scroll = +ledscroll(group_lock) grp:caps_toggle = +ledcaps(group_lock) japan:kana_lock = +japan(kana_lock) + caps:shiftlock = +ledcaps(shift_lock) -! option = symbols +! option = types caps:internal = +caps(internal) caps:internal_nocancel = +caps(internal_nocancel) caps:shift = +caps(shift) @@ -943,3 +971,4 @@ numpad:pc = +numpad(pc) numpad:mac = +numpad(mac) numpad:microsoft = +numpad(microsoft) + numpad:shift3 = +numpad(shift3) diff --git a/xorg-server/xkbdata.src/rules/evdev.m_k.part b/xorg-server/xkbdata.src/rules/evdev.m_k.part index 9bae15336..8fa8f8dad 100644 --- a/xorg-server/xkbdata.src/rules/evdev.m_k.part +++ b/xorg-server/xkbdata.src/rules/evdev.m_k.part @@ -1,4 +1,2 @@ pc98 = evdev(pc98) - abnt2 = evdev(abnt2) - jp106 = evdev(jp106) * = evdev diff --git a/xorg-server/xkbdata.src/rules/evdev.m_s.part b/xorg-server/xkbdata.src/rules/evdev.m_s.part index fd6590d9d..516c976ad 100644 --- a/xorg-server/xkbdata.src/rules/evdev.m_s.part +++ b/xorg-server/xkbdata.src/rules/evdev.m_s.part @@ -1 +1,2 @@ - * = +inet(evdev) + $evdevkbds = +inet(evdev)+inet(%m) + * = +inet(evdev) diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in index 8d0aa921c..996cde84f 100644 --- a/xorg-server/xkbdata.src/rules/evdev.xml.in +++ b/xorg-server/xkbdata.src/rules/evdev.xml.in @@ -88,13 +88,6 @@ </model> <model> <configItem> - <name>jp106</name> - <_description>Japanese 106-key</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>pc98</name> <_description>PC-98xx Series</_description> <vendor>Generic</vendor> @@ -123,13 +116,6 @@ </model> <model> <configItem> - <name>abnt2</name> - <_description>Brazilian ABNT2</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>airkey</name> <_description>Acer AirKey V</_description> <vendor>Acer</vendor> @@ -221,6 +207,12 @@ </model> <model> <configItem> + <name>btc9116u</name> + <_description>BTC 9116U Mini Wireless Internet and Gaming</_description> + </configItem> + </model> + <model> + <configItem> <name>cherryblue</name> <_description>Cherry Blue Line CyBo@rd</_description> </configItem> @@ -248,6 +240,20 @@ </model> <model> <configItem> + <name>cherrycmexpert</name> + <_description>Cherry CyMotion Expert</_description> + <vendor>Cherry</vendor> + </configItem> + </model> + <model> + <configItem> + <name>cherrybunlim</name> + <_description>Cherry B.UNLIMITED</_description> + <vendor>Cherry</vendor> + </configItem> + </model> + <model> + <configItem> <name>chicony</name> <_description>Chicony Internet Keyboard</_description> <vendor>Chicony</vendor> @@ -262,6 +268,13 @@ </model> <model> <configItem> + <name>chicony0420</name> + <_description>Chicony KU-0420</_description> + <vendor>Chicony</vendor> + </configItem> + </model> + <model> + <configItem> <name>chicony9885</name> <_description>Chicony KB-9885</_description> <vendor>Chicony</vendor> @@ -395,7 +408,7 @@ <model> <configItem> <name>fscaa1667g</name> - <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description> + <_description>Fujitsu-Siemens Computers AMILO laptop</_description> <vendor>Fujitsu-Siemens</vendor> </configItem> </model> @@ -429,6 +442,13 @@ </model> <model> <configItem> + <name>geniuskkb2050hs</name> + <_description>Genius KKB-2050HS</_description> + <vendor>Genius</vendor> + </configItem> + </model> + <model> + <configItem> <name>gyration</name> <_description>Gyration</_description> <vendor>Gyration</vendor> @@ -457,15 +477,8 @@ </model> <model> <configItem> - <name>hp2501</name> - <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp2505</name> - <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description> + <name>hp250x</name> + <_description>Hewlett-Packard SK-250x Multimedia Keyboard</_description> <vendor>Hewlett-Packard</vendor> </configItem> </model> @@ -492,6 +505,13 @@ </model> <model> <configItem> + <name>hpdv5</name> + <_description>Hewlett-Packard Pavilion dv5</_description> + <vendor>Hewlett-Packard</vendor> + </configItem> + </model> + <model> + <configItem> <name>hpzt11xx</name> <_description>Hewlett-Packard Pavilion ZT11xx</_description> <vendor>Hewlett-Packard</vendor> @@ -513,20 +533,6 @@ </model> <model> <configItem> - <name>hp5181</name> - <_description>Hewlett-Packard Internet Keyboard 5181</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> - <name>hp5185</name> - <_description>Hewlett-Packard Internet Keyboard 5185</_description> - <vendor>Hewlett-Packard</vendor> - </configItem> - </model> - <model> - <configItem> <name>hpnx9020</name> <_description>Hewlett-Packard nx9020</_description> <vendor>Hewlett-Packard</vendor> @@ -562,13 +568,6 @@ </model> <model> <configItem> - <name>rapidaccess2a</name> - <_description>IBM Rapid Access II (alternate option)</_description> - <vendor>IBM</vendor> - </configItem> - </model> - <model> - <configItem> <name>thinkpad</name> <_description>IBM ThinkPad 560Z/600/600E/A22E</_description> <vendor>IBM</vendor> @@ -668,7 +667,7 @@ <model> <configItem> <name>logicdpa2</name> - <_description>Logitech Cordless Desktop Pro (alternate option2)</_description> + <_description>Logitech Cordless Desktop Pro (alternate option 2)</_description> <vendor>Logitech</vendor> </configItem> </model> @@ -856,6 +855,13 @@ </model> <model> <configItem> + <name>microsoftccurve2k</name> + <_description>Microsoft Comfort Curve Keyboard 2000</_description> + <vendor>Microsoft Inc.</vendor> + </configItem> + </model> + <model> + <configItem> <name>oretec</name> <_description>Ortek MCK-800 MM/Internet keyboard</_description> <vendor>Ortek</vendor> @@ -968,6 +974,13 @@ </model> <model> <configItem> + <name>trust_slimline</name> + <_description>Trust Slimline</_description> + <vendor>Trust</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <_description>Yahoo! Internet Keyboard</_description> <vendor>Yahoo!</vendor> @@ -1066,13 +1079,6 @@ </model> <model> <configItem> - <name>kr106</name> - <_description>Korean 106-key</_description> - <vendor>Generic</vendor> - </configItem> - </model> - <model> - <configItem> <name>evdev</name> <_description>Evdev-managed keyboard</_description> <vendor>Generic</vendor> @@ -1127,6 +1133,27 @@ <vendor>Sun Microsystems</vendor> </configItem> </model> + <model> + <configItem> + <name>targa_v811</name> + <_description>Targa Visionary 811</_description> + <vendor>Targa</vendor> + </configItem> + </model> + <model> + <configItem> + <name>unitekkb1925</name> + <_description>Unitek KB-1925</_description> + <vendor>Unitek Group</vendor> + </configItem> + </model> + <model> + <configItem> + <name>compalfl90</name> + <_description>FL90</_description> + <vendor>Compal Electronics Inc.</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1451,6 +1478,24 @@ <variantList> <variant> <configItem> + <name>oss</name> + <_description>Alternative</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_latin9</name> + <_description>Alternative, latin-9 only</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oss_sundeadkeys</name> + <_description>Alternative, Sun dead keys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>iso-alternate</name> <_description>ISO Alternate</_description> </configItem> @@ -1598,8 +1643,22 @@ </variant> <variant> <configItem> - <name>urd</name> - <_description>Urdu</_description> + <name>urd-phonetic</name> + <_description>Urdu, Phonetic</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-phonetic3</name> + <_description>Urdu, Alternative phonetic</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-winkeys</name> + <_description>Urdu, Winkeys</_description> <languageList><iso639Id>urd</iso639Id></languageList> </configItem> </variant> @@ -1610,6 +1669,13 @@ <languageList><iso639Id>hin</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>hin-wx</name> + <_description>Hindi Wx</_description> + <languageList><iso639Id>hin</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -1698,7 +1764,15 @@ <variant> <configItem> <name>phonetic</name> - <_description>Phonetic</_description> + <_description>Traditional Phonetic</_description> + </configItem> + </variant> + </variantList> + <variantList> + <variant> + <configItem> + <name>bas_phonetic</name> + <_description>Standard Phonetic</_description> </configItem> </variant> </variantList> @@ -1827,6 +1901,13 @@ <_description>Ktunaxa</_description> </configItem> </variant> + <variant> + <configItem> + <name>eng</name> + <_description>English</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2157,7 +2238,8 @@ <configItem> <name>smi</name> <_description>Northern Saami</_description> - <languageList><iso639Id>smi</iso639Id></languageList> + <languageList><iso639Id>smi</iso639Id> + <iso639Id>sme</iso639Id></languageList> </configItem> </variant> <variant> @@ -2262,6 +2344,19 @@ </variant> <variant> <configItem> + <name>bre</name> + <_description>Breton</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>oci</name> + <_description>Occitan</_description> + <languageList><iso639Id>oci</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <_description>Georgian AZERTY Tskapo</_description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -2418,7 +2513,7 @@ <variant> <configItem> <name>neo</name> - <_description>Neostyle</_description> + <_description>Neo 2</_description> </configItem> </variant> <variant> @@ -2433,6 +2528,26 @@ <_description>Macintosh, eliminate dead keys</_description> </configItem> </variant> + <variant> + <configItem> + <name>dsb</name> + <_description>Lower Sorbian</_description> + <languageList><iso639Id>dsb</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>dsb_qwertz</name> + <_description>Lower Sorbian (qwertz)</_description> + <languageList><iso639Id>dsb</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>qwerty</name> + <_description>qwerty</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2714,11 +2829,18 @@ <layout> <configItem> <name>kg</name> - <_shortDescription>Kir</_shortDescription> + <_shortDescription>Kgz</_shortDescription> <_description>Kyrgyzstan</_description> <languageList><iso639Id>kir</iso639Id></languageList> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>phonetic</name> + <_description>Phonetic</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -2787,6 +2909,8 @@ <iso3166Id>PE</iso3166Id> <iso3166Id>PR</iso3166Id> <iso3166Id>PY</iso3166Id> + <iso3166Id>SV</iso3166Id> + <iso3166Id>US</iso3166Id> <iso3166Id>UY</iso3166Id> <iso3166Id>VE</iso3166Id> </countryList> @@ -2801,6 +2925,12 @@ </variant> <variant> <configItem> + <name>deadtilde</name> + <_description>Include dead tilde</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sundeadkeys</name> <_description>Sun dead keys</_description> </configItem> @@ -3060,7 +3190,7 @@ <variant> <configItem> <name>dvorak_altquotes</name> - <_description>Dvorak, Polish quotes on key "1/!"</_description> + <_description>Dvorak, Polish quotes on key 1</_description> </configItem> </variant> <variant> @@ -3170,6 +3300,34 @@ <_description>Winkeys</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_dobruca1</name> + <_description>Crimean Tatar (Dobruca-1 Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_dobruca2</name> + <_description>Crimean Tatar (Dobruca-2 Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3188,6 +3346,12 @@ </variant> <variant> <configItem> + <name>phonetic_winkeys</name> + <_description>Phonetic Winkeys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>typewriter</name> <_description>Typewriter</_description> </configItem> @@ -3254,6 +3418,19 @@ <languageList><iso639Id>sah</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>xal</name> + <_description>Kalmyk</_description> + <languageList><iso639Id>xal</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>dos</name> + <_description>DOS</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3324,18 +3501,6 @@ </variant> <variant> <configItem> - <name>unicode</name> - <_description>Use Slovenian digraphs</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>unicodeus</name> - <_description>US keyboard with Slovenian digraphs</_description> - </configItem> - </variant> - <variant> - <configItem> <name>us</name> <_description>US keyboard with Slovenian letters</_description> </configItem> @@ -3386,6 +3551,12 @@ </variant> <variant> <configItem> + <name>deadtilde</name> + <_description>Include dead tilde</_description> + </configItem> + </variant> + <variant> + <configItem> <name>sundeadkeys</name> <_description>Sun dead keys</_description> </configItem> @@ -3580,7 +3751,14 @@ <_description>Tajikistan</_description> <languageList><iso639Id>tgk</iso639Id></languageList> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>legacy</name> + <_description>Legacy</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -3681,6 +3859,27 @@ <_description>International (with dead keys)</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3711,8 +3910,8 @@ </variant> <variant> <configItem> - <name>unicode</name> - <_description>Unicode</_description> + <name>legacy</name> + <_description>Legacy</_description> </configItem> </variant> <variant> @@ -3735,6 +3934,27 @@ <_description>Homophonic</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3747,6 +3967,12 @@ <variantList> <variant> <configItem> + <name>extd</name> + <_description>Extended - Winkeys</_description> + </configItem> + </variant> + <variant> + <configItem> <name>intl</name> <_description>International (with dead keys)</_description> </configItem> @@ -3791,6 +4017,27 @@ <_description>Latin</_description> </configItem> </variant> + <variant> + <configItem> + <name>crh</name> + <_description>Crimean Tatar (Turkish Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_f</name> + <_description>Crimean Tatar (Turkish F)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>crh_alt</name> + <_description>Crimean Tatar (Turkish Alt-Q)</_description> + <languageList><iso639Id>crh</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -3875,6 +4122,20 @@ <variantList> <variant> <configItem> + <name>urd-crulp</name> + <_description>CRULP</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> + <name>urd-nla</name> + <_description>NLA</_description> + <languageList><iso639Id>urd</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>ara</name> <_description>Arabic</_description> <languageList><iso639Id>ara</iso639Id></languageList> @@ -3965,7 +4226,16 @@ </layout> <layout> <configItem> - <name>braille</name> + <name>sn</name> + <shortDescription>Sen</shortDescription> + <description>Senegal</description> + <languageList><iso639Id>wol</iso639Id></languageList> + </configItem> + <variantList/> + </layout> + <layout> + <configItem> + <name>brai</name> <_shortDescription>Brl</_shortDescription> <_description>Braille</_description> </configItem> @@ -3984,174 +4254,208 @@ </variant> </variantList> </layout> + <layout> + <configItem> + <name>tm</name> + <shortDescription>Tkm</shortDescription> + <_description>Turkmenistan</_description> + <languageList><iso639Id>tuk</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>alt</name> + <_description>Alt-Q</_description> + </configItem> + </variant> + </variantList> + </layout> </layoutList> <optionList> <group allowMultipleSelection="true"> <!-- The key combination used to switch between groups --> <configItem> <name>grp</name> - <_description>Layout switching</_description> + <_description>Key(s) to change layout</_description> </configItem> <option> <configItem> <name>grp:switch</name> - <_description>R-Alt switches layout while pressed.</_description> + <_description>Right Alt (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:lswitch</name> - <_description>Left Alt key switches layout while pressed.</_description> + <_description>Left Alt (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:lwin_switch</name> - <_description>Left Win-key switches layout while pressed.</_description> + <_description>Left Win (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:rwin_switch</name> - <_description>Right Win-key switches layout while pressed.</_description> + <_description>Right Win (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:win_switch</name> - <_description>Both Win-keys switch layout while pressed.</_description> + <_description>Any Win key (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:caps_switch</name> - <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description> + <_description>CapsLock (while pressed), Alt+CapsLock does the original capslock action</_description> </configItem> </option> <option> <configItem> <name>grp:rctrl_switch</name> - <_description>Right Ctrl key switches layout while pressed.</_description> + <_description>Right Ctrl (while pressed)</_description> </configItem> </option> <option> <configItem> <name>grp:toggle</name> - <_description>Right Alt key changes layout.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>grp:lalt_toggle</name> - <_description>Left Alt key changes layout.</_description> + <_description>Left Alt</_description> </configItem> </option> <option> <configItem> <name>grp:caps_toggle</name> - <_description>CapsLock key changes layout.</_description> + <_description>CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shift_caps_toggle</name> - <_description>Shift+CapsLock changes layout.</_description> + <_description>Shift+CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shift_caps_switch</name> - <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description> + <_description>CapsLock (to first layout), Shift+CapsLock (to last layout)</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:win_menu_switch</name> + <_description>Left Win (to first layout), Right Win/Menu (to last layout)</_description> </configItem> </option> <option> <configItem> <name>grp:alt_caps_toggle</name> - <_description>Alt+CapsLock changes layout.</_description> + <_description>Alt+CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp:shifts_toggle</name> - <_description>Both Shift keys together change layout.</_description> + <_description>Both Shift keys together</_description> </configItem> </option> <option> <configItem> <name>grp:alts_toggle</name> - <_description>Both Alt keys together change layout.</_description> + <_description>Both Alt keys together</_description> </configItem> </option> <option> <configItem> <name>grp:ctrls_toggle</name> - <_description>Both Ctrl keys together change layout.</_description> + <_description>Both Ctrl keys together</_description> </configItem> </option> <option> <configItem> <name>grp:ctrl_shift_toggle</name> - <_description>Ctrl+Shift change layout.</_description> + <_description>Ctrl+Shift</_description> </configItem> </option> <option> <configItem> <name>grp:lctrl_lshift_toggle</name> - <_description>LCtrl+LShift change layout.</_description> + <_description>Left Ctrl+Left Shift</_description> </configItem> </option> <option> <configItem> <name>grp:ctrl_alt_toggle</name> - <_description>Alt+Ctrl change layout.</_description> + <_description>Alt+Ctrl</_description> </configItem> </option> <option> <configItem> <name>grp:alt_shift_toggle</name> - <_description>Alt+Shift change layout.</_description> + <_description>Alt+Shift</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:alt_space_toggle</name> + <_description>Alt+Space</_description> </configItem> </option> <option> <configItem> <name>grp:menu_toggle</name> - <_description>Menu key changes layout.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>grp:lwin_toggle</name> - <_description>Left Win-key changes layout.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>grp:rwin_toggle</name> - <_description>Right Win-key changes layout.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>grp:lshift_toggle</name> - <_description>Left Shift key changes layout.</_description> + <_description>Left Shift</_description> </configItem> </option> <option> <configItem> <name>grp:rshift_toggle</name> - <_description>Right Shift key changes layout.</_description> + <_description>Right Shift</_description> </configItem> </option> <option> <configItem> <name>grp:lctrl_toggle</name> - <_description>Left Ctrl key changes layout.</_description> + <_description>Left Ctrl</_description> </configItem> </option> <option> <configItem> <name>grp:rctrl_toggle</name> - <_description>Right Ctrl key changes layout.</_description> + <_description>Right Ctrl</_description> + </configItem> + </option> + <option> + <configItem> + <name>grp:sclk_toggle</name> + <_description>Scroll Lock</_description> </configItem> </option> </group> @@ -4160,66 +4464,72 @@ level of symbols --> <configItem> <name>lv3</name> - <_description>Third level choosers</_description> + <_description>Key to choose 3rd level</_description> </configItem> <option> <configItem> <name>lv3:switch</name> - <_description>Press Right Ctrl to choose 3rd level.</_description> + <_description>Right Ctrl</_description> </configItem> </option> <option> <configItem> <name>lv3:menu_switch</name> - <_description>Press Menu key to choose 3rd level.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>lv3:win_switch</name> - <_description>Press any of Win-keys to choose 3rd level.</_description> + <_description>Any Win key</_description> </configItem> </option> <option> <configItem> <name>lv3:lwin_switch</name> - <_description>Press Left Win-key to choose 3rd level.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>lv3:rwin_switch</name> - <_description>Press Right Win-key to choose 3rd level.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>lv3:alt_switch</name> - <_description>Press any of Alt keys to choose 3rd level.</_description> + <_description>Any Alt key</_description> </configItem> </option> <option> <configItem> <name>lv3:lalt_switch</name> - <_description>Press Left Alt key to choose 3rd level.</_description> + <_description>Left Alt</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_switch</name> - <_description>Press Right Alt key to choose 3rd level.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_switch_multikey</name> - <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description> + <_description>Right Alt, Shift+Right Alt key is Multi_Key</_description> </configItem> </option> <option> <configItem> <name>lv3:ralt_alt</name> - <_description>Right Alt key never chooses 3rd level.</_description> + <_description>Right Alt key never chooses 3rd level</_description> + </configItem> + </option> + <option> + <configItem> + <name>lv3:enter_switch</name> + <_description>Enter on keypad</_description> </configItem> </option> </group> @@ -4232,31 +4542,31 @@ <option> <configItem> <name>ctrl:nocaps</name> - <_description>Make CapsLock an additional Ctrl.</_description> + <_description>Make CapsLock an additional Ctrl</_description> </configItem> </option> <option> <configItem> <name>ctrl:swapcaps</name> - <_description>Swap Ctrl and CapsLock.</_description> + <_description>Swap Ctrl and CapsLock</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_ac</name> - <_description>Ctrl key at left of 'A'</_description> + <_description>At left of 'A'</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_aa</name> - <_description>Ctrl key at bottom left</_description> + <_description>At bottom left</_description> </configItem> </option> <option> <configItem> <name>ctrl:ctrl_ra</name> - <_description>Right Ctrl key works as Right Alt.</_description> + <_description>Right Ctrl as Right Alt</_description> </configItem> </option> </group> @@ -4264,24 +4574,24 @@ <!-- Using startard LEDs to indicate the alternative (not first) group(s) --> <configItem> <name>grp_led</name> - <_description>Use keyboard LED to show alternative layout.</_description> + <_description>Use keyboard LED to show alternative layout</_description> </configItem> <option> <configItem> <name>grp_led:num</name> - <_description>NumLock LED shows alternative layout.</_description> + <_description>NumLock</_description> </configItem> </option> <option> <configItem> <name>grp_led:caps</name> - <_description>CapsLock LED shows alternative layout.</_description> + <_description>CapsLock</_description> </configItem> </option> <option> <configItem> <name>grp_led:scroll</name> - <_description>ScrollLock LED shows alternative layout.</_description> + <_description>ScrollLock</_description> </configItem> </option> </group> @@ -4294,25 +4604,25 @@ <option> <configItem> <name>keypad:legacy</name> - <_description>Legacy keypad</_description> + <_description>Legacy</_description> </configItem> </option> <option> <configItem> <name>keypad:oss</name> - <_description>Keypad with unicode additions (arrows and math operators)</_description> + <_description>Unicode additions (arrows and math operators)</_description> </configItem> </option> <option> <configItem> <name>keypad:future</name> - <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description> + <_description>Unicode additions (arrows and math operators). Math operators on default level</_description> </configItem> </option> <option> <configItem> <name>keypad:legacy_wang</name> - <_description>Legacy Wang 724 keypad</_description> + <_description>Legacy Wang 724</_description> </configItem> </option> <option> @@ -4324,14 +4634,20 @@ <option> <configItem> <name>keypad:future_wang</name> - <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description> + <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level</_description> </configItem> </option> <option> <configItem> - <name>keypad:phone_hex</name> - <_description>ATM/phone-style hexadecimal keypad</_description> - </configItem> + <name>keypad:hex</name> + <_description>Hexadecimal</_description> + </configItem> + </option> + <option> + <configItem> + <name>keypad:atm</name> + <_description>ATM/phone-style</_description> + </configItem> </option> </group> <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place --> @@ -4387,6 +4703,12 @@ <_description>Four-level key with abstract separators</_description> </configItem> </option> + <option> + <configItem> + <name>kpdl:semi</name> + <_description>Semi-colon on third level</_description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> <!-- CapsLock tweaks. @@ -4399,43 +4721,55 @@ <option> <configItem> <name>caps:internal</name> - <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description> + <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:internal_nocancel</name> - <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description> + <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:shift</name> - <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description> + <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:shift_nocancel</name> - <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description> + <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock</_description> </configItem> </option> <option> <configItem> <name>caps:capslock</name> - <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description> + <_description>CapsLock toggles normal capitalization of alphabetic characters</_description> </configItem> </option> <option> <configItem> <name>caps:swapescape</name> - <_description>Swap ESC and CapsLock.</_description> + <_description>Swap ESC and CapsLock</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:escape</name> + <_description>Make CapsLock an additional ESC</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:backspace</name> + <_description>Make CapsLock an additional Backspace</_description> </configItem> </option> <option> <configItem> <name>caps:shiftlock</name> - <_description>CapsLock toggles Shift so all keys are affected.</_description> + <_description>CapsLock toggles Shift so all keys are affected</_description> </configItem> </option> </group> @@ -4448,55 +4782,55 @@ <option> <configItem> <name>altwin:menu</name> - <_description>Add the standard behavior to Menu key.</_description> + <_description>Add the standard behavior to Menu key</_description> </configItem> </option> <option> <configItem> <name>altwin:meta_alt</name> - <_description>Alt and Meta are on the Alt keys.</_description> + <_description>Alt and Meta are on Alt keys</_description> </configItem> </option> <option> <configItem> <name>altwin:ctrl_win</name> - <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description> + <_description>Control is mapped to Win keys (and the usual Ctrl keys)</_description> </configItem> </option> <option> <configItem> - <name>altwin:meta_win</name> - <_description>Meta is mapped to the Win-keys.</_description> + <name>altwin:ctrl_alt_win</name> + <_description>Control is mapped to Alt keys, Alt is mapped to Win keys</_description> </configItem> </option> <option> <configItem> - <name>altwin:left_meta_win</name> - <_description>Meta is mapped to the left Win-key.</_description> + <name>altwin:meta_win</name> + <_description>Meta is mapped to Win keys</_description> </configItem> </option> <option> <configItem> - <name>altwin:super_win</name> - <_description>Super is mapped to the Win-keys.</_description> + <name>altwin:left_meta_win</name> + <_description>Meta is mapped to Left Win</_description> </configItem> </option> <option> <configItem> <name>altwin:hyper_win</name> - <_description>Hyper is mapped to the Win-keys.</_description> + <_description>Hyper is mapped to Win-keys</_description> </configItem> </option> <option> <configItem> <name>altwin:alt_super_win</name> - <_description>Alt is mapped to the right Win-key and Super to Menu.</_description> + <_description>Alt is mapped to Right Win, Super to Menu</_description> </configItem> </option> <option> <configItem> <name>altwin:swap_lalt_lwin</name> - <_description>Left Alt is swapped with left Win-key.</_description> + <_description>Left Alt is swapped with Left Win</_description> </configItem> </option> </group> @@ -4509,43 +4843,43 @@ <option> <configItem> <name>compose:ralt</name> - <_description>Right Alt is Compose.</_description> + <_description>Right Alt</_description> </configItem> </option> <option> <configItem> <name>compose:lwin</name> - <_description>Left Win-key is Compose.</_description> + <_description>Left Win</_description> </configItem> </option> <option> <configItem> <name>compose:rwin</name> - <_description>Right Win-key is Compose.</_description> + <_description>Right Win</_description> </configItem> </option> <option> <configItem> <name>compose:menu</name> - <_description>Menu is Compose.</_description> + <_description>Menu</_description> </configItem> </option> <option> <configItem> <name>compose:rctrl</name> - <_description>Right Ctrl is Compose.</_description> + <_description>Right Ctrl</_description> </configItem> </option> <option> <configItem> <name>compose:caps</name> - <_description>Caps Lock is Compose.</_description> + <_description>Caps Lock</_description> </configItem> </option> <option> <configItem> <name>compose:102</name> - <_description>Less-than/Greater-than is Compose.</_description> + <_description>Less-than/Greater-than</_description> </configItem> </option> </group> @@ -4557,37 +4891,43 @@ <option> <configItem> <name>numpad:pc</name> - <_description>Default numeric keypad keys.</_description> + <_description>Default numeric keypad keys</_description> </configItem> </option> <option> <configItem> <name>numpad:mac</name> - <_description>Numeric keypad keys work as with Mac.</_description> + <_description>Numeric keypad keys work as with Mac</_description> </configItem> </option> <option> <configItem> <name>numpad:microsoft</name> - <_description>Shift with numeric keypad keys works as in MS Windows.</_description> + <_description>Shift with numeric keypad keys works as in MS Windows</_description> </configItem> </option> <option> <configItem> - <name>srvrkeys:none</name> - <_description>Special keys (Ctrl+Alt+<key>) handled in a server.</_description> + <name>numpad:shift3</name> + <_description>Shift does not cancel NumLock, chooses 3d level instead</_description> </configItem> </option> <option> <configItem> - <name>apple:badmap</name> - <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description> + <name>srvrkeys:none</name> + <_description>Special keys (Ctrl+Alt+<key>) handled in a server</_description> </configItem> </option> <option> <configItem> <name>shift:breaks_caps</name> - <_description>Shift cancels CapsLock.</_description> + <_description>Shift cancels CapsLock</_description> + </configItem> + </option> + <option> + <configItem> + <name>misc:typo</name> + <_description>Enable extra typographic characters</_description> </configItem> </option> </group> @@ -4595,30 +4935,30 @@ <!-- Special shortcuts for the Euro character --> <configItem> <name>eurosign</name> - <_description>Adding the EuroSign to certain keys</_description> + <_description>Adding EuroSign to certain keys</_description> </configItem> <option> <configItem> <name>eurosign:e</name> - <_description>Add the EuroSign to the E key.</_description> + <_description>E</_description> </configItem> </option> <option> <configItem> <name>eurosign:2</name> - <_description>Add the EuroSign to the 2 key.</_description> + <_description>2</_description> </configItem> </option> <option> <configItem> <name>eurosign:4</name> - <_description>Add the EuroSign to the 4 key.</_description> + <_description>4</_description> </configItem> </option> <option> <configItem> <name>eurosign:5</name> - <_description>Add the EuroSign to the 5 key.</_description> + <_description>5</_description> </configItem> </option> </group> @@ -4631,49 +4971,49 @@ <option> <configItem> <name>nbsp:none</name> - <_description>Space key outputs usual space at any level.</_description> + <_description>Usual space at any level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level2</name> - <_description>Space key outputs non-breakable space character at second level.</_description> + <_description>Non-breakable space character at second level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3</name> - <_description>Space key outputs non-breakable space character at third level.</_description> + <_description>Non-breakable space character at third level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3s</name> - <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description> + <_description>Non-breakable space character at third level, nothing at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level3n</name> - <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description> + <_description>Non-breakable space character at third level, thin non-breakable space character at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4</name> - <_description>Space key outputs non-breakable space character at fourth level.</_description> + <_description>Non-breakable space character at fourth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4n</name> - <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> + <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description> </configItem> </option> <option> <configItem> <name>nbsp:level4nl</name> - <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> + <_description>Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description> </configItem> </option> </group> @@ -4695,5 +5035,35 @@ </configItem> </option> </group> + <group allowMultipleSelection="false"> + <configItem> + <name>esperanto</name> + <_description>Adding Esperanto circumflexes (supersigno)</_description> + </configItem> + <option> + <configItem> + <name>esperanto:qwerty</name> + <_description>To the corresponding key in a Qwerty keyboard.</_description> + </configItem> + </option> + <option> + <configItem> + <name>esperanto:dvorak</name> + <_description>To the corresponding key in a Dvorak keyboard.</_description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> + <name>terminate</name> + <_description>Key sequence to kill the X server</_description> + </configItem> + <option> + <configItem> + <name>terminate:ctrl_alt_bksp</name> + <_description>Control + Alt + Backspace</_description> + </configItem> + </option> + </group> </optionList> </xkbConfigRegistry> diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile index 51918f834..f808aad64 100644 --- a/xorg-server/xkbdata.src/rules/makefile +++ b/xorg-server/xkbdata.src/rules/makefile @@ -7,31 +7,63 @@ $(DESTDIR): if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)" BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ -HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR base.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR base.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ -HDR evdev.m_k.part HDR base.l1_k.part HDR base.l_k.part \ +HDR evdev.m_k.part \ +HDR base.l1_k.part \ +HDR base.l_k.part \ HDR base.ml_g.part \ -HDR base.m_g.part HDR base.mlv_s.part HDR base.ml_s.part \ -HDR base.ml1_s.part HDR \ -HDR base.l2_s.part HDR base.l3_s.part HDR base.l4_s.part HDR HDR HDR \ -HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_g.part \ +HDR base.mlv_s.part \ +HDR base.ml_s.part \ +HDR base.ml1_s.part \ +HDR \ +HDR base.l2_s.part \ +HDR base.l3_s.part \ +HDR base.l4_s.part \ +HDR HDR HDR \ +HDR evdev.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ -HDR base.o_s.part HDR base.o_c.part HDR base.o_t.part +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ +HDR base.o_s.part \ +HDR base.o_c.part \ +HDR base.o_t.part BASE_PARTS = base.hdr.part base.lists.part \ compat/base.lists.part \ -HDR base.m_k.part HDR base.l1_k.part \ +HDR base.m_k.part \ +HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -44,16 +76,25 @@ HDR compat/base.l4_s.part base.l4_s.part \ HDR compat/base.l2v2_s.part \ HDR compat/base.l3v3_s.part \ HDR compat/base.l4v4_s.part \ -HDR base.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR base.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +HDR base.lo_s.part \ +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part HDR base.o_t.part +HDR base.o_c.part \ +HDR base.o_t.part EVDEV_PARTS = base.hdr.part base.lists.part \ compat/base.lists.part \ -HDR evdev.m_k.part HDR base.l1_k.part \ +HDR evdev.m_k.part \ +HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ HDR compat/base.mlv_s.part base.mlv_s.part \ @@ -66,11 +107,18 @@ HDR compat/base.l4_s.part base.l4_s.part \ HDR compat/base.l2v2_s.part \ HDR compat/base.l3v3_s.part \ HDR compat/base.l4v4_s.part \ -HDR evdev.m_s.part HDR base.ml_c.part HDR base.ml1_c.part \ +HDR evdev.m_s.part \ +HDR base.ml_c.part \ +HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part \ +HDR base.lo_s.part \ +HDR base.l1o_s.part \ +HDR base.l2o_s.part \ +HDR base.l3o_s.part \ +HDR base.l4o_s.part \ HDR compat/base.o_s.part base.o_s.part \ -HDR base.o_c.part HDR base.o_t.part +HDR base.o_c.part \ +HDR base.o_t.part RULES_FILES = base evdev xfree98 diff --git a/xorg-server/xkbdata.src/rules/merge.sh b/xorg-server/xkbdata.src/rules/merge.sh index 8dfde5546..b18af7c3d 100644 --- a/xorg-server/xkbdata.src/rules/merge.sh +++ b/xorg-server/xkbdata.src/rules/merge.sh @@ -1,5 +1,6 @@ -#!/bin/bash +#!/bin/sh +INDIR=`dirname $0` DEST=$1 shift @@ -11,12 +12,14 @@ basename=`basename $0` echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST for i in $*; do - if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then + if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then echo >> $DEST; read hdr echo "$hdr" >> $DEST + elif test -f $i; then + cat $i >> $DEST || exit 1 else - cat $i >> $DEST; + cat $INDIR/$i >> $DEST || exit 1 fi done < $HDR |