debian/changelog | 6 xkbcomp/ChangeLog | 96 + xkbcomp/Makefile.am | 21 xkbcomp/Makefile.in | 297 ++- xkbcomp/README | 8 xkbcomp/README.config | 195 -- xkbcomp/README.enhancing | 508 ----- xkbcomp/aclocal.m4 | 434 ++-- xkbcomp/config.guess | 257 +- xkbcomp/config.sub | 159 - xkbcomp/configure | 280 +-- xkbcomp/configure.ac | 20 xkbcomp/depcomp | 87 xkbcomp/install-sh | 5 xkbcomp/man/Makefile.am | 12 xkbcomp/man/Makefile.in | 418 ++++ xkbcomp/man/xkbcomp.man | 107 + xkbcomp/missing | 49 xkbcomp/xkbcomp.c | 2 xkbcomp/xkbcomp.man | 106 - xkbcomp/xkbparse.c | 4286 ++++++++++++++++------------------------------- xkbcomp/ylwrap | 11 22 files changed, 2936 insertions(+), 4428 deletions(-)
New commits: commit 2d6b8b365a7d66c2825c44bafe02a0da2cd99184 Author: Julien Cristau <[email protected]> Date: Sun Feb 13 12:54:05 2011 +0100 xkbcomp 1.2.1. diff --git a/debian/changelog b/debian/changelog index f46e181..b4d2a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11-xkb-utils (7.6+3) UNRELEASED; urgency=low + + * xkbcomp 1.2.1. + + -- Julien Cristau <[email protected]> Sun, 13 Feb 2011 12:53:45 +0100 + x11-xkb-utils (7.6+2) unstable; urgency=low [ Cyril Brulebois ] diff --git a/xkbcomp/ChangeLog b/xkbcomp/ChangeLog index f1b325f..5b33ab9 100644 --- a/xkbcomp/ChangeLog +++ b/xkbcomp/ChangeLog @@ -1,3 +1,99 @@ +commit c8375bcb7eb9f86ca1534cdf1143e91372d0499e +Author: Peter Hutterer <[email protected]> +Date: Fri Feb 11 09:06:04 2011 +1000 + + xkbcomp 1.2.1 + + Signed-off-by: Peter Hutterer <[email protected]> + +commit ab5371cefe2b7438b74338f71ff890e0e868b3df +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 19 10:06:56 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01 +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 13 11:15:47 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 12 16:28:02 2011 -0500 + + config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS + + This silences an Autoconf warning + +commit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 12 15:29:50 2011 -0500 + + config: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences an Automake warning. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit f524cfae6951442c9a9da65ef317b9c04199500f +Author: Alan Coopersmith <[email protected]> +Date: Tue Jan 4 00:05:18 2011 -0800 + + Remove out-of-date copies of README.config & README.enhancing + + The up-to-date master copies of those documents are found in the + xorg-docs module, and posted on the X.Org website. + + Also, x-docs.org no longer carries X11 docs, so point to X.Org's + website instead in the README. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Daniel Stone <[email protected]> + +commit cc55d8f5ab021861308b071aab9c03016be15187 +Author: Gaetan Nadon <[email protected]> +Date: Sun Oct 31 20:35:24 2010 -0400 + + config: replace AC_CHECK_FILE with test -f as it fails to cross-compile + + Testing for the presence of xkbparse.c is legitimate as this is a build + file, but the Autoconf macro assumes it is testing on the host system + and fails. + + Tested-by: Abdoulaye Walsimou Gaye <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1d59f5b0387b18028017cfab4e55b703417dd735 +Author: Dirk Wallenstein <[email protected]> +Date: Fri Oct 29 13:08:25 2010 +0200 + + man: Improve description of device selection option + + The device selection option takes effect when loading keymaps, too. + + Signed-off-by: Dirk Wallenstein <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 +Author: Dirk Wallenstein <[email protected]> +Date: Fri Oct 29 11:35:10 2010 +0200 + + Allow uploading a keymap to a single device + + Signed-off-by: Dirk Wallenstein <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + commit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607 Author: Alan Coopersmith <[email protected]> Date: Sat Oct 30 09:59:52 2010 -0700 diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am index cf33e69..9a41b88 100644 --- a/xkbcomp/Makefile.am +++ b/xkbcomp/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xkbcomp AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS) @@ -58,31 +59,11 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c -appman_PRE = \ - xkbcomp.man BUILT_SOURCES = xkbparse.c MAINTAINERCLEANFILES = ChangeLog INSTALL MAINTAINERCLEANFILES += $(BUILT_SOURCES) -EXTRA_DIST = \ - README.config \ - README.enhancing - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -CLEANFILES = $(appman_DATA) - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - - .PHONY: ChangeLog INSTALL INSTALL: diff --git a/xkbcomp/Makefile.in b/xkbcomp/Makefile.in index da3f2af..bfd9371 100644 --- a/xkbcomp/Makefile.in +++ b/xkbcomp/Makefile.in @@ -36,7 +36,6 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -72,7 +71,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" +am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_xkbcomp_OBJECTS = action.$(OBJEXT) alias.$(OBJEXT) compat.$(OBJEXT) \ expr.$(OBJEXT) geometry.$(OBJEXT) indicators.$(OBJEXT) \ @@ -112,30 +111,21 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(xkbcomp_SOURCES) DIST_SOURCES = $(xkbcomp_SOURCES) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -DATA = $(appman_DATA) +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-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 +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -143,6 +133,31 @@ am__remove_distdir = \ { test ! -d "$(distdir)" \ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -206,6 +221,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -268,6 +285,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +SUBDIRS = man AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS) xkbcomp_LDADD = $(XKBCOMP_LIBS) xkbcomp_SOURCES = \ @@ -304,21 +322,13 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c -appman_PRE = \ - xkbcomp.man - BUILT_SOURCES = xkbparse.c MAINTAINERCLEANFILES = ChangeLog INSTALL $(BUILT_SOURCES) -EXTRA_DIST = README.config README.enhancing $(appman_PRE) -appmandir = $(APP_MAN_DIR) -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man all: $(BUILT_SOURCES) config.h - $(MAKE) $(AM_MAKEFLAGS) all-am + $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj .y +.SUFFIXES: .c .o .obj .y am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @@ -455,26 +465,76 @@ distclean-compile: .y.c: $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) -install-appmanDATA: $(appman_DATA) - @$(NORMAL_INSTALL) - test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)" - @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \ - done -uninstall-appmanDATA: - @$(NORMAL_UNINSTALL) - @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appmandir)" && rm -f $$files +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -486,10 +546,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -508,7 +581,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ fi; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -560,6 +633,34 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook @@ -680,22 +781,23 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(DATA) config.h -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \ + $(MAKE) $(AM_MAKEFLAGS) check-recursive +all-am: Makefile $(PROGRAMS) config.h +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(bindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am + $(MAKE) $(AM_MAKEFLAGS) install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -installcheck: installcheck-am +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -704,7 +806,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -716,101 +817,99 @@ maintainer-clean-generic: -rm -f xkbparse.c -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am +clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic mostlyclean-am -distclean: distclean-am +distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags -dvi: dvi-am +dvi: dvi-recursive dvi-am: -html: html-am +html: html-recursive html-am: -info: info-am +info: info-recursive info-am: -install-data-am: install-appmanDATA +install-data-am: -install-dvi: install-dvi-am +install-dvi: install-dvi-recursive install-dvi-am: install-exec-am: install-binPROGRAMS -install-html: install-html-am +install-html: install-html-recursive install-html-am: -install-info: install-info-am +install-info: install-info-recursive install-info-am: install-man: -install-pdf: install-pdf-am +install-pdf: install-pdf-recursive install-pdf-am: -install-ps: install-ps-am +install-ps: install-ps-recursive install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-am +maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-am +mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic -pdf: pdf-am +pdf: pdf-recursive pdf-am: -ps: ps-am +ps: ps-recursive ps-am: -uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS +uninstall-am: uninstall-binPROGRAMS -.MAKE: all check install install-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ + ctags-recursive install install-am install-strip \ + tags-recursive -.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ - clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-binPROGRAMS \ + clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-hdr distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-appmanDATA \ - install-binPROGRAMS 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-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-appmanDATA \ - uninstall-binPROGRAMS - - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ + info-am install install-am install-binPROGRAMS 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS + .PHONY: ChangeLog INSTALL diff --git a/xkbcomp/README b/xkbcomp/README index 89dc3e6..4f79436 100644 --- a/xkbcomp/README +++ b/xkbcomp/README @@ -13,12 +13,8 @@ xkb symbolic names: symbols, geometry, keycodes, compat and types which determine the keyboard behaviour. These five components can combined together into a resulting keyboard mapping using the 'rules' component. -The complete specification can be found on -http://www.x-docs.org/XKB/XKBproto.pdf +More information, including the complete specification, can be found on +http://www.x.org/wiki/XKB -For XKB configuration information see 'README.config' file. - -For information how to further enhance XKB configuration see 'README.enhancing' -file. diff --git a/xkbcomp/README.config b/xkbcomp/README.config deleted file mode 100644 index 2cce521..0000000 --- a/xkbcomp/README.config +++ /dev/null @@ -1,195 +0,0 @@ - The XKB Configuration Guide - - Kamil Toman, Ivan U. Pascal - - 25 November 2002 - - Abstract - - This document describes how to configure X11R6.8 XKB from a user's - point a few. It converts basic configuration syntax and gives also - a few examples. - -1. Overview - -The XKB configuration is decomposed into a number of components. Selecting -proper parts and combining them back you can achieve most of configurations -you might need. Unless you have a completely atypical keyboard you really -don't need to touch any of xkb configuration files. - -2. Selecting XKB Configuration - -The easiest and the most natural way how to specify a keyboard mapping is to -use rules component. As its name suggests it describes a number of general -rules how to combine all bits and pieces into a valid and useful keyboard -mapping. All you need to do is to select a suitable rules file and then to -feed it with a few parameters that will adjust the keyboard behaviour to ful- -fill your needs. - -The parameters are: - - o XkbRules - files of rules to be used for keyboard mapping composition - - o XkbModel - name of model of your keyboard type - - o XkbLayout - layout(s) you intend to use - - o XkbVariant - variant(s) of layout you intend to use - - o XkbOptions - extra xkb configuration options - -The proper rules file depends on your vendor. In reality, the commonest file -of rules is xorg. For each rules file there is a description file named <ven- -dor-rules>.lst, for instance xorg.lst which is located in xkb configuration -subdirectory rules (for example /etc/X11/xkb/rules). - -2.1 Basic Configuration - -Let's say you want to configure a PC style America keyboard with 104 keys as -described in xorg.lst. It can be done by simply writing several lines from -below to you xorg.conf configuration file (previously known as -/etc/X11/XF86Config-4 or /etc/X11/XF86Config): - - Section "InputDevice" - Identifier "Keyboard1" - Driver "kbd" - - Option "XkbModel" "pc104" - Option "XkbLayout" "us" - Option "XKbOptions" "" - EndSection - -The values of parameters XkbModel and XkbLayout are really not surprising. -The parameters XkbOptions has been explicitly set to empty set of parameters. -The parameter XkbVariant has been left out. That means the default variant -named basic is loaded. - -Of course, this can be also done at runtime using utility setxkbmap. Shell -command loading the same keyboard mapping would look like: - - setxkbmap -rules xorg -model pc104 -layout us -option "" - -The configuration and the shell command would be very analogical for most -other layouts (internationalized mappings). - -2.2 Advanced Configuration - -You can use multi-layouts xkb configuration. What does it mean? Basically it -allows to load up to four different keyboard layouts at a time. Each such -layout would reside in its own group. The groups (unlike complete keyboard -remapping) can be switched very fast from one to another by a combination of -keys. - -Let's say you want to configure your new Logitech cordless desktop keyboard, -you intend to use three different layouts at the same time - us, czech and -german (in this order), and that you are used to Alt-Shift combination for -switching among them. - -Then the configuration snippet could look like this: - - Section "InputDevice" - Identifier "Keyboard1" - Driver "kbd" - - Option "XkbModel" "logicordless" - Option "XkbLayout" "us,cz,de" - Option "XKbOptions" "grp:alt_shift_toggle" - EndSection - -Of course, this can be also done at runtime using utility setxkbmap. Shell -command loading the same keyboard mapping would look like: - - setxkbmap -rules xorg -model logicordless -layout "us,cz,de" \ - -option "grp:alt_shift_toggle" - -2.3 Even More Advanced Configuration - -Okay, let's say you are more demanding. You do like the example above but you -want it to change a bit. Let's imagine you want the czech keyboard mapping to -use another variant but basic. The configuration snippet then changes into: - - Section "InputDevice" - Identifier "Keyboard1" - Driver "kbd" - - Option "XkbModel" "logicordless" - Option "XkbLayout" "us,cz,de" - Option "XkbVariant" ",bksl," - Option "XKbOptions" "grp:alt_shift_toggle" - EndSection - -That's seems tricky but it is not. The logic for settings of variants is the -same as for layouts, that means the first and the third variant settings are -left out (set to basic), the second is set to bksl (a special variant with an -enhanced definition of the backslash key). - -Analogically, the loading runtime will change to: - - setxkmap -rules xorg -model logicordless -layout "us,cz,de" \ - -variant ",bksl," -option "grp:alt_shift_toggle" - -2.4 Basic Global Options - -See rules/*.lst files. - -3. Direct XKB Configuration - -Generally, you can directly prescribe what configuration of each of basic xkb -components should be used to form the resulting keyboard mapping. This -method is rather "brute force". You precisely need to know the structure and -the meaning of all of used configuration components. - -This method also exposes all xkb configuration details directly into -xorg.conf configuration file which is a not very fortunate fact. In rare -occasions it may be needed, though. So how does it work? - -3.1 Basic Components - -There are five basic components used to form a keyboard mapping: - - o key codes - a translation of the scan codes produced by the keyboard - into a suitable symbolic form - - o types - a specification of what various combinations of modifiers pro- - duce - - o key symbols - a translation of symbolic key codes into actual symbols - - o geometry - a description of physical keyboard geometry - - o compatibility maps - a specification of what action should each key pro- - duce in order to preserve compatibility with XKB-unware clients - -3.2 Example Configuration - -Look at the following example: - - Section "InputDevice" - Identifier "Keyboard0" - Driver "kbd" - - Option "XkbKeycodes" "xorg" - Option "XkbTypes" "default" - Option "XkbSymbols" "en_US(pc104)+de+swapcaps" - Option "XkbGeometry" "pc(pc104)" - Option "XkbCompat" "basic+pc+iso9995" - EndSection - -This configuration sets the standard X server default interpretation of key- -board keycodes, sets the default modificator types. The symbol table is com- -posed of extended US keyboard layout in its variant for pc keyboards with 104 -keys plus all keys for german layout are redefined respectively. Also the -logical meaning of Caps-lock and Control keys is swapped. The standard key- -board geometry (physical look) is set to pc style keyboard with 104 keys. The -compatibility map is set to allow basic shifting, to allow Alt keys to be -interpreted and also to allow iso9995 group shifting. - -4. Keymap XKB Configuration - -It is the formerly used way to configure xkb. The user included a special -keymap file which specified the direct xkb configuration. This method has -been obsoleted by previously described rules files which are far more flexi- -ble and allow simpler and more intuitive syntax. It is preserved merely for -compatibility reasons. Avoid using it if it is possible. - - diff --git a/xkbcomp/README.enhancing b/xkbcomp/README.enhancing deleted file mode 100644 index 746902c..0000000 --- a/xkbcomp/README.enhancing +++ /dev/null @@ -1,508 +0,0 @@ - How to further enhance XKB configuration - - Kamil Toman, Ivan U. Pascal - - 25 November 2002 - - Abstract - - This guide is aimed to relieve one's labour to create a new (inter- - nationalized) keyboard layout. Unlike other documents this guide - accents the keymap developer's point of view. - -1. Overview - -The developer of a new layout should read the xkb protocol specification (The -X Keyboard Extension: Protocol Specification <URL:http://www.x- -docs.org/XKB/XKBproto.pdf>) at least to clarify for himself some xkb-specific -terms used in this document and elsewhere in xkb configuration. Also it shows -wise to understand how the X server and a client digest their keyboard inputs -(with and without xkb). - -A useful source is also Ivan Pascal's text about xkb configuration -<URL:http://www.tsu.ru/~pascal/en/xkb> often referenced throughout this docu- -ment. - -Note that this document covers only enhancements which are to be made to -XFree86 version 4.3 and X11R6.7.0 and above. - -2. The Basics - -At the startup (or at later at user's command) X server starts its xkb key- -board module extension and reads data from a compiled configuration file. - -This compiled configuration file is prepared by the program xkbcomp which -behaves altogether as an ordinary compiler (see man xkbcomp). Its input are -human readable xkb configuration files which are verified and then composed -into a useful xkb configuration. Users don't need to mess with xkbcomp them- -selves, for them it is invisible. Usually, it is started upon X server -startup. - -As you probably already know, the xkb configuration consists of five main -modules: - - Keycodes - Tables that defines translation from keyboard scan codes into - reasonable symbolic names, maximum, minimum legal keycodes, sym- - bolic aliases and description of physically present LED-indica- - tors. The primary sence of this component is to allow definitions - of maps of symbols (see below) to be independent of physical key- - board scancodes. There are two main naming conventions for sym- - bolic names (always four bytes long): - - o names which express some traditional meaning like <SPCE> - (stands for space bar) or - - o names which express some relative positioning on a key- - board, for example <AE01> (an exclamation mark on US key- - boards), on the right there are keys <AE02>, <AE03> etc. - - Types - Types describe how the produced key is changed by active modi- - fiers (like Shift, Control, Alt, ...). There are several prede- - fined types which cover most of used combinations. - - Compat - Compatibility component defines internal behaviour of modifiers. - Using compat component you can assign various actions (elabo- - rately described in xkb specification) to key events. This is - also the place where LED-indicators behaviour is defined. - - Symbols - For i18n purposes, this is the most important table. It defines - what values (=symbols) are assigned to what keycodes (represented - by their symbolic name, see above). There may be defined more - than one value for each key and then it depends on a key type and - on modifiers state (respective compat component) which value will - be the resulting one. - - Geometry - Geometry files aren't used by xkb itself but they may be used by - some external programs to depict a keyboard image. - -All these components have the files located in xkb configuration tree in sub- -directories with the same names (usually in /usr/lib/X11/xkb). - -3. Enhancing XKB Configuration - -Most of xkb enhancements concerns a need to define new output symbols for the -some input key events. In other words, a need to define a new symbol map (for -a new language, standard or just to feel more comfortable when typing text). - -What do you need to do? Generally, you have to define following things: - - o the map of symbols itself - - o the rules to allow users to select the new mapping - - o the description of the new layout - -First of all, it is good to go through existing layouts and to examine them -if there is something you could easily adjust to fit your needs. Even if -there is nothing similar you may get some ideas about basic concepts and used -tricks. -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
