diff options
Diffstat (limited to 'xorg-server/xkbdata.src/keycodes')
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/Makefile.in | 153 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/amiga | 4 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/ataritt | 2 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in | 106 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/evdev | 19 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/fujitsu | 2 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/keycodes.dir | 66 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/macintosh | 12 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in | 106 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo | 4 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/sgi_vndr/indy | 24 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/sun | 10 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/xfree86 | 32 | ||||
| -rw-r--r-- | xorg-server/xkbdata.src/keycodes/xfree98 | 2 |
14 files changed, 234 insertions, 308 deletions
diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in index 552016071..1df15c3a1 100644 --- a/xorg-server/xkbdata.src/keycodes/Makefile.in +++ b/xorg-server/xkbdata.src/keycodes/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. @@ -18,15 +18,11 @@ # Replaces Imake's MakeXkbDir() rule # svu: taken from xkbdata -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 @@ -52,10 +48,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/||"`;; \ @@ -66,14 +63,14 @@ am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)" dist_dirDATA_INSTALL = $(INSTALL_DATA) dist_keycodesDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_dir_DATA) $(dist_keycodes_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@ @@ -86,10 +83,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@ @@ -103,43 +96,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@ @@ -159,15 +133,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@ @@ -175,6 +149,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -198,8 +173,12 @@ 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 = digital_vndr sgi_vndr @@ -230,8 +209,8 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir @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; \ @@ -255,10 +234,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-dist_dirDATA: $(dist_dir_DATA) @$(NORMAL_INSTALL) - test -z "$(dirdir)" || $(mkdir_p) "$(DESTDIR)$(dirdir)" + test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)" @list='$(dist_dir_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -275,7 +253,7 @@ uninstall-dist_dirDATA: done install-dist_keycodesDATA: $(dist_keycodes_DATA) @$(NORMAL_INSTALL) - test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)" + test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)" @list='$(dist_keycodes_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -322,8 +300,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 \ @@ -367,8 +344,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 @@ -393,8 +370,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) \ @@ -404,13 +381,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 @@ -424,23 +400,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. - @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; \ @@ -454,7 +428,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`; \ @@ -462,6 +436,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -472,7 +448,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(keycodesdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -519,12 +495,20 @@ info-am: install-data-am: install-dist_dirDATA install-dist_keycodesDATA +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 @@ -543,24 +527,25 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA \ - uninstall-info-am +uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-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-dist_dirDATA \ - install-dist_keycodesDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keycodesDATA 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 \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ uninstall uninstall-am uninstall-dist_dirDATA \ - uninstall-dist_keycodesDATA uninstall-info-am + uninstall-dist_keycodesDATA $(subdir).dir: $(dir_data) diff --git a/xorg-server/xkbdata.src/keycodes/amiga b/xorg-server/xkbdata.src/keycodes/amiga index 7b661a5cf..7d2576701 100644 --- a/xorg-server/xkbdata.src/keycodes/amiga +++ b/xorg-server/xkbdata.src/keycodes/amiga @@ -7,7 +7,7 @@ default xkb_keycodes "usa1" { minimum= 8; - maximum= 111; + maximum= 255; <ESC> = 77; <FK01> = 88; @@ -119,7 +119,7 @@ default xkb_keycodes "usa1" { xkb_keycodes "de" { minimum= 8; - maximum= 111; + maximum= 255; <ESC> = 77; <FK01> = 88; diff --git a/xorg-server/xkbdata.src/keycodes/ataritt b/xorg-server/xkbdata.src/keycodes/ataritt index 3cfd503be..7eae09f49 100644 --- a/xorg-server/xkbdata.src/keycodes/ataritt +++ b/xorg-server/xkbdata.src/keycodes/ataritt @@ -7,7 +7,7 @@ default xkb_keycodes "us" { minimum= 8; - maximum= 134; + maximum= 255; <ESC> = 9; <AE01> = 10; diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in index 3ca867294..c4645694c 100644 --- a/xorg-server/xkbdata.src/keycodes/digital_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/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 @@ -57,8 +53,6 @@ DATA = $(dist_keycodes_DATA) 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@ @@ -71,10 +65,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@ @@ -88,43 +78,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@ @@ -144,15 +115,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@ @@ -160,6 +131,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,8 +155,12 @@ 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@ keycodesdir = $(xkb_base)/keycodes/digital_vndr @@ -198,8 +174,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,10 +199,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-dist_keycodesDATA: $(dist_keycodes_DATA) @$(NORMAL_INSTALL) - test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)" + test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)" @list='$(dist_keycodes_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -249,22 +224,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; \ @@ -280,7 +254,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(keycodesdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -326,12 +300,20 @@ info-am: install-data-am: install-dist_keycodesDATA +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 @@ -350,17 +332,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am +uninstall-am: uninstall-dist_keycodesDATA + +.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-dist_keycodesDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keycodesDATA 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-dist_keycodesDATA uninstall-info-am + uninstall-dist_keycodesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/keycodes/evdev b/xorg-server/xkbdata.src/keycodes/evdev index 673a967e6..d6963a2d5 100644 --- a/xorg-server/xkbdata.src/keycodes/evdev +++ b/xorg-server/xkbdata.src/keycodes/evdev @@ -36,6 +36,7 @@ default xkb_keycodes "evdev" { <AD11> = 34; <AD12> = 35; <BKSL> = 51; + alias <AC12> = <BKSL>; <RTRN> = 36; <CAPS> = 66; @@ -145,7 +146,8 @@ default xkb_keycodes "evdev" { // Keys that are generated on Japanese keyboards - <HZTG> = 93; // Hankaku/Zenkakau toggle + //<HZTG> = 93; // Hankaku/Zenkakau toggle - not actually used + alias <HZTG> = <TLDE>; <HKTG> = 101; // Hiragana/Katakana toggle <AB11> = 97; // backslash/underscore <HENK> = 100; // Henkan @@ -270,7 +272,7 @@ default xkb_keycodes "evdev" { <I244> = 244; // #define KEY_BATTERY 236 <I245> = 245; // #define KEY_BLUETOOTH 237 <I246> = 246; // #define KEY_WLAN 238 - <I247> = 247; // (not defined in input.h) 239 + <I247> = 247; // #define KEY_UWB 239 <I248> = 248; // #define KEY_UNKNOWN 240 <I249> = 249; // #define KEY_VIDEO_NEXT 241 <I250> = 250; // #define KEY_VIDEO_PREV 242 @@ -299,18 +301,9 @@ default xkb_keycodes "evdev" { indicator 11 = "Charging"; alias <ALGR> = <RALT>; -}; -// For japanese 106 keyboard. -xkb_keycodes "jp106" { - include "evdev(evdev)" - <HZTG> = 49; - <AC12> = 51; -}; - -// For brazilian ABNT2 keyboard. -xkb_keycodes "abnt2" { - include "evdev(evdev)" + // For Brazilian ABNT2 + alias <KPPT> = <I129>; }; // PC98 diff --git a/xorg-server/xkbdata.src/keycodes/fujitsu b/xorg-server/xkbdata.src/keycodes/fujitsu index e0e63c6b5..c36a3a984 100644 --- a/xorg-server/xkbdata.src/keycodes/fujitsu +++ b/xorg-server/xkbdata.src/keycodes/fujitsu @@ -27,7 +27,7 @@ default xkb_keycodes "138" { minimum= 8; - maximum= 156; + maximum= 255; <ESC> = 37; <AE01> = 38; diff --git a/xorg-server/xkbdata.src/keycodes/keycodes.dir b/xorg-server/xkbdata.src/keycodes/keycodes.dir index 002037e6f..f1d572ad5 100644 --- a/xorg-server/xkbdata.src/keycodes/keycodes.dir +++ b/xorg-server/xkbdata.src/keycodes/keycodes.dir @@ -1,18 +1,6 @@ -d------ -------- macintosh(macintosh) --------- -------- macintosh(badmap) --------- -------- macintosh(goodmap) -------- -------- macintosh(old) -------- -------- macintosh(hhk) --d------ -------- aliases(qwerty) --------- -------- aliases(azerty) --------- -------- aliases(qwertz) --------- -------- sony(nwp5461) --d------ -------- fujitsu(138) --d------ -------- xfree98(pc98) --d------ -------- evdev(evdev) --------- -------- evdev(jp106) --------- -------- evdev(abnt2) --------- -------- evdev(pc98) -d------ -------- sun(type4) -------- -------- sun(type5) -------- -------- sun(type4tuv) @@ -38,12 +26,12 @@ -------- -------- sun(type4__se) -------- -------- sun(type4_se) -------- -------- sun(type4_se_swapctl) --d------ -------- amiga(usa1) --------- -------- amiga(de) +-d------ -------- xfree98(pc98) +-d------ -------- fujitsu(138) -d------ -------- hp(hp-101) -------- -------- hp(hil) --d------ -------- sgi_vndr/indigo(pc101) --------- -------- sgi_vndr/indigo(pc102) +-------- -------- ibm(rs6k-101) +-------- -------- ibm(rs6k-102) -d------ -------- sgi_vndr/indy(universal) -------- -------- sgi_vndr/indy(pc101) -------- -------- sgi_vndr/indy(pc102) @@ -52,9 +40,28 @@ -------- -------- sgi_vndr/indy(jp106) h-p----- -------- sgi_vndr/indy(overlayKeypad) h-p----- -------- sgi_vndr/indy(shiftLock) +-d------ -------- sgi_vndr/indigo(pc101) +-------- -------- sgi_vndr/indigo(pc102) -d------ -------- sgi_vndr/iris(iris) --------- -------- ibm(rs6k-101) --------- -------- ibm(rs6k-102) +-------- -------- sony(nwp5461) +-d------ -------- evdev(evdev) +-------- -------- evdev(pc98) +-d------ -------- xfree86(xfree86) +-------- -------- xfree86(basic) +-------- -------- xfree86(102) +-------- -------- xfree86(thinkpadz60) +-d------ -------- ataritt(us) +-------- -------- ataritt(de) +-------- -------- digital_vndr/pc(pc_common) +-------- -------- digital_vndr/pc(pc10x) +-------- -------- digital_vndr/pc(pc101) +-------- -------- digital_vndr/pc(pc102) +-------- -------- digital_vndr/pc(pc104) +-------- -------- digital_vndr/pc(lk411_common) +-------- -------- digital_vndr/pc(lk411) +-------- -------- digital_vndr/pc(lk450) +-------- -------- digital_vndr/pc(pcxajaa) +-------- -------- digital_vndr/pc(lk411jj) -------- -------- digital_vndr/lk(lk_common) -------- -------- digital_vndr/lk(lkx01) -------- -------- digital_vndr/lk(lk201) @@ -67,21 +74,8 @@ h-p----- -------- sgi_vndr/indy(shiftLock) -------- -------- digital_vndr/lk(lk421jj) -------- -------- digital_vndr/lk(lk401bj) -------- -------- digital_vndr/lk(lk401jj) --------- -------- digital_vndr/pc(pc_common) --------- -------- digital_vndr/pc(pc10x) --------- -------- digital_vndr/pc(pc101) --------- -------- digital_vndr/pc(pc102) --------- -------- digital_vndr/pc(pc104) --------- -------- digital_vndr/pc(lk411_common) --------- -------- digital_vndr/pc(lk411) --------- -------- digital_vndr/pc(lk450) --------- -------- digital_vndr/pc(pcxajaa) --------- -------- digital_vndr/pc(lk411jj) --d------ -------- ataritt(us) --------- -------- ataritt(de) --d------ -------- xfree86(xfree86) --------- -------- xfree86(basic) --------- -------- xfree86(102) --------- -------- xfree86(jp106) --------- -------- xfree86(abnt2) --------- -------- xfree86(thinkpadz60) +-d------ -------- aliases(qwerty) +-------- -------- aliases(azerty) +-------- -------- aliases(qwertz) +-d------ -------- amiga(usa1) +-------- -------- amiga(de) diff --git a/xorg-server/xkbdata.src/keycodes/macintosh b/xorg-server/xkbdata.src/keycodes/macintosh index 8f5418b25..d41ac4bcb 100644 --- a/xorg-server/xkbdata.src/keycodes/macintosh +++ b/xorg-server/xkbdata.src/keycodes/macintosh @@ -38,20 +38,10 @@ default xkb_keycodes "macintosh" { }; -xkb_keycodes "badmap" { - <TLDE> = 94; - <LSGT> = 49; -}; - -xkb_keycodes "goodmap" { - <TLDE> = 49; - <LSGT> = 94; -}; - xkb_keycodes "old" { minimum= 8; - maximum= 134; + maximum= 255; <ESC> = 61; <TLDE> = 58; diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in index f913b105b..a064ed494 100644 --- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/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 @@ -57,8 +53,6 @@ DATA = $(dist_keycodes_DATA) 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@ @@ -71,10 +65,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@ @@ -88,43 +78,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@ @@ -144,15 +115,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@ @@ -160,6 +131,7 @@ am__tar = @am__tar@ am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -183,8 +155,12 @@ 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@ keycodesdir = $(xkb_base)/keycodes/sgi_vndr @@ -198,8 +174,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,10 +199,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-dist_keycodesDATA: $(dist_keycodes_DATA) @$(NORMAL_INSTALL) - test -z "$(keycodesdir)" || $(mkdir_p) "$(DESTDIR)$(keycodesdir)" + test -z "$(keycodesdir)" || $(MKDIR_P) "$(DESTDIR)$(keycodesdir)" @list='$(dist_keycodes_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -249,22 +224,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; \ @@ -280,7 +254,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(keycodesdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -326,12 +300,20 @@ info-am: install-data-am: install-dist_keycodesDATA +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 @@ -350,17 +332,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-dist_keycodesDATA uninstall-info-am +uninstall-am: uninstall-dist_keycodesDATA + +.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-dist_keycodesDATA install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-dist_keycodesDATA 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-dist_keycodesDATA uninstall-info-am + uninstall-dist_keycodesDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo index fd87e57ba..6605ade53 100644 --- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo +++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indigo @@ -1,7 +1,7 @@ // $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ default xkb_keycodes "pc101" { - minimum= 10; - maximum= 118; + minimum= 8; + maximum= 255; <TLDE> = 62; <AE01> = 15; diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy index a777c374b..e16a0cbc1 100644 --- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy +++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/indy @@ -1,15 +1,15 @@ // $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $ default xkb_keycodes "universal" { - minimum= 15; - maximum= 149; + minimum= 8; + maximum= 255; include "sgi_vndr/indy(pc105)" alternate <BKSL> = 91; alternate <BKSL> = 100; alternate <BKSL> = 101; }; xkb_keycodes "pc101" { - minimum= 15; - maximum= 149; + minimum= 8; + maximum= 255; <TLDE> = 22; <AE01> = 30; @@ -147,13 +147,13 @@ xkb_keycodes "pc102" { <BKSL> = 91; <LSGT> = 27; augment "sgi_vndr/indy(pc101)" - maximum= 149; - minimum= 15; + maximum= 255; + minimum= 8; }; xkb_keycodes "pc104" { include "sgi_vndr/indy(pc101)" - minimum= 15; - maximum= 149; + minimum= 8; + maximum= 255; // These key names are here to support so-called "Windows95" // keyboards like the Microsoft Natural keyboard. @@ -164,8 +164,8 @@ xkb_keycodes "pc104" { xkb_keycodes "pc105" { <LSGT> = 27; augment "sgi_vndr/indy(pc104)" - minimum= 15; - maximum= 149; + minimum= 8; + maximum= 255; }; xkb_keycodes "jp106" { <HZTG> = 22; @@ -178,8 +178,8 @@ xkb_keycodes "jp106" { alias <AE00> = <HZTG>; alias <AE13> = <BKSL>; augment "sgi_vndr/indy(pc101)" - minimum= 15; - maximum= 149; + minimum= 8; + maximum= 255; }; // can be combined with any other "indy" keycode // description to add virtual keys which can be diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun index 70400a4c6..cdf8694fc 100644 --- a/xorg-server/xkbdata.src/keycodes/sun +++ b/xorg-server/xkbdata.src/keycodes/sun @@ -61,7 +61,7 @@ default xkb_keycodes "type4" { minimum= 8; - maximum= 132; + maximum= 255; <ESC> = 36; <AE01> = 37; @@ -192,7 +192,7 @@ default xkb_keycodes "type4" { xkb_keycodes "type5" { minimum= 8; - maximum= 132; + maximum= 255; <ESC> = 36; <AE01> = 37; @@ -379,7 +379,7 @@ xkb_keycodes "type5_euro" { xkb_keycodes "type5hobo" { minimum= 8; - maximum= 132; + maximum= 255; <ESC> = 36; <AE01> = 37; @@ -606,7 +606,7 @@ xkb_keycodes "type6_jp_usb" { xkb_keycodes "type5_se" { minimum= 8; - maximum= 132; + maximum= 255; // Row G <HELP> = 125; @@ -788,7 +788,7 @@ xkb_keycodes "type5c_se" { xkb_keycodes "type4__se" { minimum= 8; - maximum= 132; + maximum= 255; // Row F <STOP> = 8; diff --git a/xorg-server/xkbdata.src/keycodes/xfree86 b/xorg-server/xkbdata.src/keycodes/xfree86 index f140a841b..bf91fa8ff 100644 --- a/xorg-server/xkbdata.src/keycodes/xfree86 +++ b/xorg-server/xkbdata.src/keycodes/xfree86 @@ -12,6 +12,7 @@ default xkb_keycodes "xfree86" { include "xfree86(basic)" <BKSL> = 51; + alias <AC12> = <BKSL>; <LSGT> = 94; }; @@ -255,10 +256,10 @@ xkb_keycodes "basic" { // <I53> = 211; <K73> <I54> = 212; <I55> = 213; - <OUTP> = 214; - <KITG> = 215; - <KIDN> = 216; - <KIUP> = 217; + <I56> = 214; + <I57> = 215; + <I58> = 216; + <I59> = 217; <I5A> = 218; // <I5B> = 219; <K74> // <I5C> = 220; <K75> @@ -351,6 +352,10 @@ xkb_keycodes "basic" { alias <PAST> = <I18>; alias <FIND> = <I19>; alias <CUT> = <I1A>; + alias <OUTP> = <I56>; + alias <KITG> = <I57>; + alias <KIDN> = <I58>; + alias <KIUP> = <I59>; // Other codes never generated. The XFree86 ddx never generates // these codes. @@ -367,6 +372,9 @@ xkb_keycodes "basic" { indicator 3 = "Scroll Lock"; alias <ALGR> = <RALT>; + + // For Brazilian ABNT2 + alias <KPPT> = <I06>; }; // What keyboard is this? @@ -400,22 +408,6 @@ xkb_keycodes "102" { }; -// For japanese 106 keyboard. by tsuka(tsuka@kawalab.dnj.ynu.ac.jp) -// -// All of the keycodes here are now in the basic "xfree86" set. -// -xkb_keycodes "jp106" { - include "xfree86(basic)" - <AC12> = 51; -}; - - -// For brazilian ABNT2 keyboard. by Ricardo Y. Igarashi(iga@that.com.br) -xkb_keycodes "abnt2" { - include "xfree86(xfree86)" - <KPPT> = 134; -}; - // IBM ThinkPad Z60m/Z60t/Z61m/Z61t xkb_keycodes "thinkpadz60" { include "xfree86(xfree86)" diff --git a/xorg-server/xkbdata.src/keycodes/xfree98 b/xorg-server/xkbdata.src/keycodes/xfree98 index 6d34772f9..59483caf3 100644 --- a/xorg-server/xkbdata.src/keycodes/xfree98 +++ b/xorg-server/xkbdata.src/keycodes/xfree98 @@ -29,7 +29,7 @@ default xkb_keycodes "pc98" { minimum= 8; - maximum= 134; + maximum= 255; <ESC> = 8; <AE01> = 9; |