summaryrefslogtreecommitdiff
path: root/dist/xkeyboard-config/geometry
diff options
context:
space:
mode:
Diffstat (limited to 'dist/xkeyboard-config/geometry')
-rw-r--r--dist/xkeyboard-config/geometry/Makefile.am4
-rw-r--r--dist/xkeyboard-config/geometry/Makefile.in202
-rw-r--r--dist/xkeyboard-config/geometry/digital_vndr/Makefile.in82
-rw-r--r--dist/xkeyboard-config/geometry/geometry.dir106
-rw-r--r--dist/xkeyboard-config/geometry/hp246
-rw-r--r--dist/xkeyboard-config/geometry/macintosh877
-rw-r--r--dist/xkeyboard-config/geometry/nokia53
-rw-r--r--dist/xkeyboard-config/geometry/pc28
-rw-r--r--dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in82
-rw-r--r--dist/xkeyboard-config/geometry/sun40
-rw-r--r--dist/xkeyboard-config/geometry/typematrix745
11 files changed, 2227 insertions, 238 deletions
diff --git a/dist/xkeyboard-config/geometry/Makefile.am b/dist/xkeyboard-config/geometry/Makefile.am
index 8dccdc288..84619fb96 100644
--- a/dist/xkeyboard-config/geometry/Makefile.am
+++ b/dist/xkeyboard-config/geometry/Makefile.am
@@ -6,9 +6,9 @@ dist_geom_DATA = \
amiga ataritt chicony \
dell everex fujitsu \
hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
northgate pc sony thinkpad \
-sun winbook README
+sun typematrix winbook README
dir_data = $(dist_geom_DATA)
diff --git a/dist/xkeyboard-config/geometry/Makefile.in b/dist/xkeyboard-config/geometry/Makefile.in
index 5965542c5..7620e0f72 100644
--- a/dist/xkeyboard-config/geometry/Makefile.in
+++ b/dist/xkeyboard-config/geometry/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -20,8 +21,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -44,6 +46,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -58,17 +61,58 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+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'
am__installdirs = "$(DESTDIR)$(dirdir)" "$(DESTDIR)$(geomdir)"
-dist_dirDATA_INSTALL = $(INSTALL_DATA)
-dist_geomDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_dir_DATA) $(dist_geom_DATA)
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
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+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"
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -124,6 +168,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POFILES = @POFILES@
@@ -187,9 +232,9 @@ dist_geom_DATA = \
amiga ataritt chicony \
dell everex fujitsu \
hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
northgate pc sony thinkpad \
-sun winbook README
+sun typematrix winbook README
dir_data = $(dist_geom_DATA)
dist_dir_DATA = $(subdir).dir
@@ -207,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu geometry/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu geometry/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geometry/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign geometry/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -227,40 +272,47 @@ $(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
+$(am__aclocal_m4_deps):
install-dist_dirDATA: $(dist_dir_DATA)
@$(NORMAL_INSTALL)
test -z "$(dirdir)" || $(MKDIR_P) "$(DESTDIR)$(dirdir)"
- @list='$(dist_dir_DATA)'; for p in $$list; do \
+ @list='$(dist_dir_DATA)'; test -n "$(dirdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_dirDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dirdir)/$$f'"; \
- $(dist_dirDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dirdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dirdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(dirdir)" || exit $$?; \
done
uninstall-dist_dirDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_dir_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(dirdir)/$$f'"; \
- rm -f "$(DESTDIR)$(dirdir)/$$f"; \
- done
+ @list='$(dist_dir_DATA)'; test -n "$(dirdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(dirdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(dirdir)" && rm -f $$files
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
- @list='$(dist_geom_DATA)'; for p in $$list; do \
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
- $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(geomdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(geomdir)" || exit $$?; \
done
uninstall-dist_geomDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_geom_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
- rm -f "$(DESTDIR)$(geomdir)/$$f"; \
- done
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(geomdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(geomdir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -269,7 +321,7 @@ uninstall-dist_geomDATA:
# (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):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -286,7 +338,7 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
@@ -294,7 +346,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -320,16 +372,16 @@ $(RECURSIVE_CLEAN_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ ($(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" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -344,7 +396,7 @@ tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
@@ -356,7 +408,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -365,29 +417,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
done | \
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
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; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -408,29 +465,44 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
+ 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="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -464,6 +536,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -482,6 +555,8 @@ dvi-am:
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -490,18 +565,28 @@ install-data-am: install-dist_dirDATA install-dist_geomDATA
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am:
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -522,8 +607,8 @@ ps-am:
uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am check check-am clean clean-generic ctags \
@@ -542,7 +627,8 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA
$(subdir).dir: $(dir_data)
-rm -f $@
- here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*'
+ $(XKBCOMP) -lfhlpR -o $@ '*'
+
# 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.
.NOEXPORT:
diff --git a/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in b/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
index 82b3b990b..9cf0f2ee2 100644
--- a/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
+++ b/dist/xkeyboard-config/geometry/digital_vndr/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -16,8 +17,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -46,9 +49,23 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+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'
am__installdirs = "$(DESTDIR)$(geomdir)"
-dist_geomDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_geom_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -106,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POFILES = @POFILES@
@@ -179,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu geometry/digital_vndr/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu geometry/digital_vndr/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geometry/digital_vndr/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign geometry/digital_vndr/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -199,23 +217,27 @@ $(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
+$(am__aclocal_m4_deps):
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
- @list='$(dist_geom_DATA)'; for p in $$list; do \
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
- $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(geomdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(geomdir)" || exit $$?; \
done
uninstall-dist_geomDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_geom_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
- rm -f "$(DESTDIR)$(geomdir)/$$f"; \
- done
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(geomdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(geomdir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -239,13 +261,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -276,6 +302,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,6 +321,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -302,18 +331,28 @@ install-data-am: install-dist_geomDATA
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -347,6 +386,7 @@ uninstall-am: uninstall-dist_geomDATA
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA
+
# 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.
.NOEXPORT:
diff --git a/dist/xkeyboard-config/geometry/geometry.dir b/dist/xkeyboard-config/geometry/geometry.dir
index b5e627de2..ebd7d497d 100644
--- a/dist/xkeyboard-config/geometry/geometry.dir
+++ b/dist/xkeyboard-config/geometry/geometry.dir
@@ -1,106 +1,10 @@
--d------ -------- everex(STEPnote)
-d------ -------- macintosh(macintosh)
-------- -------- macintosh(applepro)
-------- -------- macintosh(macbook78)
-------- -------- macintosh(macbook79)
--------- -------- sun(type4)
--------- -------- sun(type4tuv)
--------- -------- sun(type4_ca)
--------- -------- sun(type4jp)
--------- -------- sun(t5)
--------- -------- sun(t5tuv)
--------- -------- sun(t5jp)
--------- -------- sun(t5unix)
--------- -------- sun(t5hobo)
--------- -------- sun(t5tuvhobo)
--------- -------- sun(t5jphobo)
--------- -------- sun(type5_se)
--------- -------- sun(type5c_se)
--------- -------- sun(type4_se)
--------- -------- sun(t6)
--------- -------- sun(t6tuv)
--------- -------- sun(t6jp)
--------- -------- sun(t6unix)
--------- -------- sun(type5)
--------- -------- sun(type5jp)
--------- -------- sun(type5tuv)
--------- -------- sun(type5euro)
--------- -------- sun(type5unix)
--------- -------- sun(type5hobo)
--------- -------- sun(type5tuvhobo)
--------- -------- sun(type5jphobo)
--d------ -------- sun(type6)
--------- -------- sun(type6jp)
--------- -------- sun(type6tuv)
--------- -------- sun(type6unix)
--------- -------- sun(x86)
--------- -------- sun(MS_x86)
--------- -------- sun(x86tuv)
--d------ -------- fujitsu(138)
--------- -------- fujitsu(140)
--d------ -------- pc(pc101)
--------- -------- pc(pc102)
--------- -------- pc(pc104)
--------- -------- pc(pc105)
--------- -------- pc(jp106)
--------- -------- pc(abnt2)
--------- -------- pc(pc86)
--------- -------- pc(kr106)
--------- -------- pc(latitude)
--------- -------- pc(pc104alt)
--d------ -------- hhk(win1)
--------- -------- hhk(win2)
--------- -------- hhk(win3)
--------- -------- hhk(win4)
--------- -------- hhk(jp1)
--------- -------- hhk(jp2)
--------- -------- hhk(jp3)
--------- -------- hhk(jp4)
-h-p----- -------- hhk(basic)
--d------ -------- kinesis(model100)
--d------ -------- hp(pc101)
--------- -------- hp(hil)
--------- -------- hp(omnibook)
--------- -------- hp(omnibook_intl)
--d------ -------- microsoft(natural)
--------- -------- microsoft(elite)
--d------ -------- keytronic(FlexPro)
--d------ -------- northgate(omnikey101)
--d------ -------- sgi_vndr/indy(pc101)
--------- -------- sgi_vndr/indy(pc102)
--------- -------- sgi_vndr/indy(jp106)
--d------ -------- sgi_vndr/O2(pc101)
--------- -------- sgi_vndr/O2(pc102)
--------- -------- sgi_vndr/O2(jp106)
--d------ -------- sgi_vndr/indigo(pc101)
--------- -------- sgi_vndr/indigo(pc102)
--d------ -------- sony(nwp5461)
+-------- -------- macintosh(applealu_ansi)
+-------- -------- macintosh(applealu_iso)
+-------- -------- macintosh(applealu_jis)
-d------ -------- winbook(XP5)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
--------- -------- thinkpad(common)
--------- -------- thinkpad(us)
--------- -------- thinkpad(intl)
--------- -------- thinkpad(60)
--d------ -------- dell(dell101)
--------- -------- dell(dell65)
--------- -------- dell(dell65x)
--------- -------- dell(dellm65)
--------- -------- dell(latitude)
---p----- -------- digital_vndr/pc(common)
---p----- -------- digital_vndr/pc(leds_on_keys)
---p----- -------- digital_vndr/pc(leds_alone)
--------- -------- digital_vndr/pc(pc101)
--------- -------- digital_vndr/pc(pc102)
--------- -------- digital_vndr/pc(pcxaj)
--------- -------- digital_vndr/unix(unix)
--------- -------- digital_vndr/unix(lk421jj)
--------- -------- digital_vndr/lk(lk201)
--------- -------- digital_vndr/lk(lk401)
--------- -------- digital_vndr/lk(lk450)
--------- -------- digital_vndr/lk(lk401bj)
--------- -------- digital_vndr/lk(lk401jj)
--d------ -------- chicony(us)
--d------ -------- nec(pc98)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
+-d------ -------- nokia(nokiarx51)
+-d------ -------- kinesis(model100)
diff --git a/dist/xkeyboard-config/geometry/hp b/dist/xkeyboard-config/geometry/hp
index c93cb0cd1..62e4d8a18 100644
--- a/dist/xkeyboard-config/geometry/hp
+++ b/dist/xkeyboard-config/geometry/hp
@@ -454,3 +454,249 @@ xkb_geometry "omnibook_intl" {
};
}; // End of "Alpha" section
};
+
+xkb_geometry "mini110" {
+
+ description= "HP Mini 110";
+ width= 262;
+ height= 106;
+
+ shape.cornerRadius = 0;
+ shape "FN0" { { [ 14, 10 ] } , { [ 14, 10 ] } };
+ shape "NORM" { { [ 16.7, 16 ] } , { [ 16.7, 16 ] } };
+ shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } };
+ shape "ONE" { { [ 14, 16 ] } , { [ 14, 16 ] } };
+ shape "BKSP" { { [ 31.3, 16 ] } , { [ 31.3, 16 ] } };
+ shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } };
+ shape "CAPS" { { [ 22, 16 ] } , { [ 22, 16 ] } };
+ shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } };
+ shape "LFSH" { { [ 31, 16 ] } , { [ 31, 16 ] } };
+ shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } };
+ shape "CTLS" { { [ 16.5, 19 ] } , { [ 16.5, 19 ] } };
+ shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } };
+ shape "ARRW" { { [ 16.7, 9 ] } , { [ 16.7, 9 ] } };
+
+ key.gap=1;
+
+ section "Function" {
+ top=4;
+ left=3;
+ key.shape="FN0";
+ row {
+ keys {
+ <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+ <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+ <FK12>, <PAUS>, <SCLK>, <INS>, <DELE>
+ };
+ };
+ };
+
+ section "Alphanum" {
+ top=15;
+ left=3;
+ key.shape="NORM";
+ row {
+ top= 0;
+ keys { { <TLDE>, "TLDE" } , { <AE01>, "ONE" }, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>,
+ { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top= 17;
+ keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <BKSL>, "BKSL" }
+ };
+ };
+ row {
+ top= 34;
+ keys { { <CAPS>, "CAPS" } ,
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top= 51;
+ keys { { <LFSH>, "LFSH" },
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH" }
+ };
+ };
+
+ };
+
+ section "Control" {
+ top=83;
+ left=3;
+ key.shape="CTLS";
+ row {
+ keys {
+ <LCTL>, <FN>, <LWIN>, <LALT>, { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+ };
+ };
+ };
+
+ section "Arrows" {
+ top=83;
+ left=204.9;
+ key.shape="ARRW";
+ row {
+ left= 17.7;
+ keys {
+ <UP>
+ };
+ };
+ row {
+ top = 10;
+ keys {
+ <LEFT>, <DOWN>, <RGHT>
+ };
+ };
+ };
+
+};
+
+xkb_geometry "dv5" {
+
+ height=118.4;
+ width=310.6;
+
+ description = "HP Pavilion dv5";
+
+ shape.cornerRadius = 1;
+
+ shape "ESC" { { [20.0, 12.5] }, { [2.2, 1], [17.8, 10.5] } };
+ shape "FN0" { { [15.9, 12.5] }, { [2.2, 1], [13.7, 10.5] } };
+ shape "DELE" { { [19.4, 12.5] }, { [2.2, 1], [17.2, 10.5] } };
+
+ shape "NORM" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+ shape "BKSP" { { [36.1, 18.3] }, { [2.4, 1], [33.7, 16.3] } };
+
+ shape "TABK" { { [26.8, 18.3] }, { [2.4, 1], [24.4, 16.3] } };
+ shape "BKSL" { { [27.1, 18.3] }, { [2.4, 1], [24.7, 16.3] } };
+
+ shape "CAPS" { { [31.6, 18.3] }, { [2.4, 1], [29.2, 16.3] } };
+ shape "RTRN" { { [41.2, 18.3] }, { [2.4, 1], [39.3, 16.3] } };
+
+ shape "LFSH" { { [41.5, 18.3] }, { [2.4, 1], [38.8, 16.3] } };
+ shape "RTSH" { { [31.5, 18.3] }, { [2.4, 1], [29.1, 16.3] } };
+
+ shape "LCTL" { { [22.4, 18.3] }, { [2.2, 1], [20.2, 16.3] } };
+ shape "RCTL" { { [22.6, 18.3] }, { [2.2, 1], [20.4, 16.3] } };
+ shape "CTLS" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+ shape "SPCE" { { [94.3, 18.3] }, { [2.5, 1], [91.8, 16.3] } };
+
+ shape "ARRW" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+ shape "EDIT" { { [16.6, 18.3] }, { [2.2, 1], [14.4, 16.3] } };
+
+ key.gap = 1.2;
+
+ section "Function" {
+ top=4.2;
+ left=3;
+ row {
+ key.shape = "FN0";
+ keys {
+ {<ESC>, "ESC"},
+ {2.9, <FK01>}, <FK02>, <FK03>, <FK04>,
+ {2.9, <FK05>}, <FK06>, <FK07>, <FK08>,
+ {2.9, <FK09>}, <FK10>, <FK11>, <FK12>,
+ {2.9, <NMLK>}, <PAUS>, <INS>, {<DELE>, "DELE"}
+ };
+ };
+ };
+
+ section "Alpha" {
+ top = 17.9;
+ key.shape = "NORM";
+ left = 3;
+
+ row {
+ top = 0;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+ <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top = 19.5;
+ keys { { <TAB>, "TABK" },
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+ <AD11>, <AD12>, { <BKSL>, "BKSL" }
+ };
+ };
+ row {
+ top = 39;
+ keys { { <CAPS>, "CAPS" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+ <AC11>, { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top = 58.5;
+ keys { { <LFSH>, "LFSH" },
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+ <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+ { <RTSH>, "RTSH" }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Controls" {
+ top = 95.9;
+ key.shape = "CTLS";
+ left = 3;
+
+ row {
+ top = 0;
+ keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
+ <RALT>, <MENU>, {<RCTL>, "RCTL"}
+ };
+ };
+ };
+
+ section "Edition" {
+ top = 16.5;
+ left = 289.9;
+ key.shape = "EDIT";
+ key.gap = 1.4;
+ row {
+ top = 0;
+ vertical = true;
+ keys {
+ <HOME>, <PGUP>, <PGDN>, <END>
+ };
+ };
+ };
+
+ section "Arrows" {
+ top = 76.4;
+ key.shape = "ARRW";
+ left = 249.3;
+ row {
+ top = 0;
+ left = 19.1;
+ keys {
+ <UP>
+ };
+ };
+ row {
+ top = 19.5;
+ left = 0;
+ keys {
+ <LEFT>, <DOWN>, <RGHT>
+ };
+ };
+ };
+};
+
+
+
diff --git a/dist/xkeyboard-config/geometry/macintosh b/dist/xkeyboard-config/geometry/macintosh
index e4b47749f..4d81eb32e 100644
--- a/dist/xkeyboard-config/geometry/macintosh
+++ b/dist/xkeyboard-config/geometry/macintosh
@@ -568,3 +568,880 @@ xkb_geometry "macbook79" {
}; // End of "default" geometry
+
+// Aluminium Keyboard, ANSI model (United States, 109 keys)
+xkb_geometry "applealu_ansi" {
+
+ width= 430;
+ height= 113.5;
+
+ baseColor= "white";
+ labelColor= "black";
+ xfont= "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+ description= "Aluminium Keyboard (ANSI)";
+
+ shape "NORM" {
+ corner= 1,
+ { [ 15.5, 15 ] }
+ };
+ shape "FUNC" {
+ corner= 1,
+ { [ 16.1, 9 ] }
+ };
+ shape "FUNS" {
+ corner= 1,
+ { [ 15.5, 9 ] }
+ };
+ shape "BKSP" {
+ corner= 1,
+ { [ 24.5, 15 ] }
+ };
+ shape "TAB" {
+ corner= 1,
+ { [ 24.5, 15 ] }
+ };
+ shape "RTRN" {
+ corner= 1,
+ { [ 29.5, 15 ] }
+ };
+ shape "CAPS" {
+ corner= 1,
+ { [ 29.5, 15 ] }
+ };
+ shape "LCTL" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "LALT" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "LMTA" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "LFSH" {
+ corner= 1,
+ { [ 39, 15 ] }
+ };
+ shape "RCTL" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "RALT" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "RMTA" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "RTSH" {
+ corner= 1,
+ { [ 39, 15 ] }
+ };
+ shape "SPCE" {
+ corner= 1,
+ { [ 110.5, 18 ] }
+ };
+ shape "KP0" {
+ corner= 1,
+ { [ 34.5, 18 ] }
+ };
+ shape "KPEN" {
+ corner= 1,
+ { [ 15.5, 36.5 ] }
+ };
+ shape "KPDT" {
+ corner= 1,
+ { [ 15.5, 18 ] }
+ };
+ shape "LED" {
+ corner= 0.5,
+ { [ 1.5, 1.5 ] }
+ };
+
+ section "Function" {
+ key.color= "white";
+ priority= 7;
+ top= 4.5;
+ left= 4.7;
+ width= 420.5;
+ height= 10;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <ESC>, "FUNC", 0 }, { <FK01>, "FUNC", 3.6 },
+ { <FK02>, "FUNC", 3.5 }, { <FK03>, "FUNC", 3.6 },
+ { <FK04>, "FUNC", 3.5 }, { <FK05>, "FUNC", 3.6 },
+ { <FK06>, "FUNC", 3.5 }, { <FK07>, "FUNC", 3.6 },
+ { <FK08>, "FUNC", 3.5 }, { <FK09>, "FUNC", 3.6 },
+ { <FK10>, "FUNC", 3.5 }, { <FK11>, "FUNC", 3.6 },
+ { <FK12>, "FUNC", 3.5 }, { <I169>, "FUNC", 3.5 },
+ { <FK13>, "FUNS", 11.5 }, { <FK14>, "FUNS", 3.5 },
+ { <FK15>, "FUNS", 3.5 }, { <FK16>, "FUNS", 11.5 },
+ { <FK17>, "FUNS", 3.5 }, { <FK18>, "FUNS", 3.5 },
+ { <FK19>, "FUNS", 3.5 }
+ };
+ };
+ }; // End of "Function" section
+
+ section "Alpha" {
+ key.color= "white";
+ priority= 8;
+ top= 17;
+ left= 5;
+ width= 271.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <TLDE>, "NORM", 0 }, { <AE01>, "NORM", 3.5 },
+ { <AE02>, "NORM", 3.5 }, { <AE03>, "NORM", 3.5 },
+ { <AE04>, "NORM", 3.5 }, { <AE05>, "NORM", 3.5 },
+ { <AE06>, "NORM", 3.5 }, { <AE07>, "NORM", 3.5 },
+ { <AE08>, "NORM", 3.5 }, { <AE09>, "NORM", 3.5 },
+ { <AE10>, "NORM", 3.5 }, { <AE11>, "NORM", 3.5 },
+ { <AE12>, "NORM", 3.5 }, { <BKSP>, "BKSP", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <TAB>, "TAB", 0 }, { <AD01>, "NORM", 3.5 },
+ { <AD02>, "NORM", 3.5 }, { <AD03>, "NORM", 3.5 },
+ { <AD04>, "NORM", 3.5 }, { <AD05>, "NORM", 3.5 },
+ { <AD06>, "NORM", 3.5 }, { <AD07>, "NORM", 3.5 },
+ { <AD08>, "NORM", 3.5 }, { <AD09>, "NORM", 3.5 },
+ { <AD10>, "NORM", 3.5 }, { <AD11>, "NORM", 3.5 },
+ { <AD12>, "NORM", 3.5 }, { <BKSL>, "NORM", 3.5 }
+
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <CAPS>, "CAPS", 0 }, { <AC01>, "NORM", 3.5 },
+ { <AC02>, "NORM", 3.5 }, { <AC03>, "NORM", 3.5 },
+ { <AC04>, "NORM", 3.5 }, { <AC05>, "NORM", 3.5 },
+ { <AC06>, "NORM", 3.5 }, { <AC07>, "NORM", 3.5 },
+ { <AC08>, "NORM", 3.5 }, { <AC09>, "NORM", 3.5 },
+ { <AC10>, "NORM", 3.5 }, { <AC11>, "NORM", 3.5 },
+ { <RTRN>, "RTRN", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <LFSH>, "LFSH", 0 },
+ { <AB01>, "NORM", 3.5 }, { <AB02>, "NORM", 3.5 },
+ { <AB03>, "NORM", 3.5 }, { <AB04>, "NORM", 3.5 },
+ { <AB05>, "NORM", 3.5 }, { <AB06>, "NORM", 3.5 },
+ { <AB07>, "NORM", 3.5 }, { <AB08>, "NORM", 3.5 },
+ { <AB09>, "NORM", 3.5 }, { <AB10>, "NORM", 3.5 },
+ { <RTSH>, "RTSH", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <LCTL>, "LCTL", 0 }, { <LALT>, "LALT", 3.5 },
+ { <LMTA>, "LMTA", 3.5 }, { <SPCE>, "SPCE", 3.5 },
+ { <RMTA>, "RMTA", 3.5 }, { <RALT>, "RALT", 3.5 },
+ { <RCTL>, "RCTL", 3.5 }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ key.color= "white";
+ priority= 9;
+ top= 17;
+ left= 287.7;
+ width= 53.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <INS>, "NORM", 0 }, { <HOME>, "NORM", 3.5 },
+ { <PGUP>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <DELE>, "NORM", 0 }, { <END>, "NORM", 3.5 },
+ { <PGDN>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 58.5;
+ left= 19;
+ keys {
+ { <UP>, "NORM", 0 }
+ };
+ };
+ row {
+ top= 77;
+ left= 0;
+ keys {
+ { <LEFT>, "NORM", 0 }, { <DOWN>, "NORM", 3.5 },
+ { <RGHT>, "NORM", 3.5 }
+ };
+ };
+ }; // End of "Editing" section
+
+ section "Keypad" {
+ key.color= "white";
+ priority= 10;
+ top= 17;
+ left= 352.7;
+ width= 72.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <NMLK>, "NORM", 0 }, { <KPEQ>, "NORM", 3.5 },
+ { <KPDV>, "NORM", 3.5 }, { <KPMU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <KP7>, "NORM", 0 }, { <KP8>, "NORM", 3.5 },
+ { <KP9>, "NORM", 3.5 }, { <KPSU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <KP4>, "NORM", 0 }, { <KP5>, "NORM", 3.5 },
+ { <KP6>, "NORM", 3.5 }, { <KPAD>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <KP1>, "NORM", 0 }, { <KP2>, "NORM", 3.5 },
+ { <KP3>, "NORM", 3.5 }, { <KPEN>, "KPEN", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <KP0>, "KP0", 0 }, { <KPDL>, "KPDT", 3.5 }
+ };
+ };
+ }; // End of "Keypad" section
+
+ indicator "Caps Lock" {
+ top= 56;
+ left= 6.7;
+ priority= 2;
+ onColor= "green";
+ offColor= "gray";
+ shape= "LED";
+ };
+
+};
+
+// Aluminium Keyboard, ISO model (International, 110 keys)
+xkb_geometry "applealu_iso" {
+
+ width= 430;
+ height= 113.5;
+
+ baseColor= "white";
+ labelColor= "black";
+ xfont= "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+ description= "Aluminium Keyboard (ISO)";
+
+ shape "NORM" {
+ corner= 1,
+ { [ 15.5, 15 ] }
+ };
+ shape "FUNC" {
+ corner= 1,
+ { [ 16.1, 9 ] }
+ };
+ shape "FUNS" {
+ corner= 1,
+ { [ 15.5, 9 ] }
+ };
+ shape "BKSP" {
+ corner= 1,
+ { [ 24.5, 15 ] }
+ };
+ shape "TAB" {
+ corner= 1,
+ { [ 24.5, 15 ] }
+ };
+ shape "RTRN" {
+ corner= 1,
+ { [ 0, 0 ], [ 15.5 , 0 ], [ 15.5 , 33.5 ], [ 5, 33.5 ],
+ [ 5, 15 ], [ 0, 15 ] }
+ };
+ shape "CAPS" {
+ corner= 1,
+ { [ 29.5, 15 ] }
+ };
+ shape "LCTL" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "LALT" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "LMTA" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "LFSH" {
+ corner= 1,
+ { [ 20, 15 ] }
+ };
+ shape "RCTL" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "RALT" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "RMTA" {
+ corner= 1,
+ { [ 25, 18 ] }
+ };
+ shape "RTSH" {
+ corner= 1,
+ { [ 39, 15 ] }
+ };
+ shape "SPCE" {
+ corner= 1,
+ { [ 110.5, 18 ] }
+ };
+ shape "KP0" {
+ corner= 1,
+ { [ 34.5, 18 ] }
+ };
+ shape "KPEN" {
+ corner= 1,
+ { [ 15.5, 36.5 ] }
+ };
+ shape "KPDT" {
+ corner= 1,
+ { [ 15.5, 18 ] }
+ };
+ shape "LED" {
+ corner= 0.5,
+ { [ 1.5, 1.5 ] }
+ };
+
+ section "Function" {
+ key.color= "white";
+ priority= 7;
+ top= 4.5;
+ left= 4.7;
+ width= 420.5;
+ height= 10;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <ESC>, "FUNC", 0 }, { <FK01>, "FUNC", 3.6 },
+ { <FK02>, "FUNC", 3.5 }, { <FK03>, "FUNC", 3.6 },
+ { <FK04>, "FUNC", 3.5 }, { <FK05>, "FUNC", 3.6 },
+ { <FK06>, "FUNC", 3.5 }, { <FK07>, "FUNC", 3.6 },
+ { <FK08>, "FUNC", 3.5 }, { <FK09>, "FUNC", 3.6 },
+ { <FK10>, "FUNC", 3.5 }, { <FK11>, "FUNC", 3.6 },
+ { <FK12>, "FUNC", 3.5 }, { <I169>, "FUNC", 3.5 },
+ { <FK13>, "FUNS", 11.5 }, { <FK14>, "FUNS", 3.5 },
+ { <FK15>, "FUNS", 3.5 }, { <FK16>, "FUNS", 11.5 },
+ { <FK17>, "FUNS", 3.5 }, { <FK18>, "FUNS", 3.5 },
+ { <FK19>, "FUNS", 3.5 }
+ };
+ };
+ }; // End of "Function" section
+
+ section "Alpha" {
+ key.color= "white";
+ priority= 8;
+ top= 17;
+ left= 5;
+ width= 271.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <TLDE>, "NORM", 0 }, { <AE01>, "NORM", 3.5 },
+ { <AE02>, "NORM", 3.5 }, { <AE03>, "NORM", 3.5 },
+ { <AE04>, "NORM", 3.5 }, { <AE05>, "NORM", 3.5 },
+ { <AE06>, "NORM", 3.5 }, { <AE07>, "NORM", 3.5 },
+ { <AE08>, "NORM", 3.5 }, { <AE09>, "NORM", 3.5 },
+ { <AE10>, "NORM", 3.5 }, { <AE11>, "NORM", 3.5 },
+ { <AE12>, "NORM", 3.5 }, { <BKSP>, "BKSP", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <TAB>, "TAB", 0 }, { <AD01>, "NORM", 3.5 },
+ { <AD02>, "NORM", 3.5 }, { <AD03>, "NORM", 3.5 },
+ { <AD04>, "NORM", 3.5 }, { <AD05>, "NORM", 3.5 },
+ { <AD06>, "NORM", 3.5 }, { <AD07>, "NORM", 3.5 },
+ { <AD08>, "NORM", 3.5 }, { <AD09>, "NORM", 3.5 },
+ { <AD10>, "NORM", 3.5 }, { <AD11>, "NORM", 3.5 },
+ { <AD12>, "NORM", 3.5 }, { <RTRN>, "RTRN", 3.5 }
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <CAPS>, "CAPS", 0 }, { <AC01>, "NORM", 3.5 },
+ { <AC02>, "NORM", 3.5 }, { <AC03>, "NORM", 3.5 },
+ { <AC04>, "NORM", 3.5 }, { <AC05>, "NORM", 3.5 },
+ { <AC06>, "NORM", 3.5 }, { <AC07>, "NORM", 3.5 },
+ { <AC08>, "NORM", 3.5 }, { <AC09>, "NORM", 3.5 },
+ { <AC10>, "NORM", 3.5 }, { <AC11>, "NORM", 3.5 },
+ { <BKSL>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <LFSH>, "LFSH", 0 }, { <LSGT>, "NORM", 3.5 },
+ { <AB01>, "NORM", 3.5 }, { <AB02>, "NORM", 3.5 },
+ { <AB03>, "NORM", 3.5 }, { <AB04>, "NORM", 3.5 },
+ { <AB05>, "NORM", 3.5 }, { <AB06>, "NORM", 3.5 },
+ { <AB07>, "NORM", 3.5 }, { <AB08>, "NORM", 3.5 },
+ { <AB09>, "NORM", 3.5 }, { <AB10>, "NORM", 3.5 },
+ { <RTSH>, "RTSH", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <LCTL>, "LCTL", 0 }, { <LALT>, "LALT", 3.5 },
+ { <LMTA>, "LMTA", 3.5 }, { <SPCE>, "SPCE", 3.5 },
+ { <RMTA>, "RMTA", 3.5 }, { <RALT>, "RALT", 3.5 },
+ { <RCTL>, "RCTL", 3.5 }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ key.color= "white";
+ priority= 9;
+ top= 17;
+ left= 287.7;
+ width= 53.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <INS>, "NORM", 0 }, { <HOME>, "NORM", 3.5 },
+ { <PGUP>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <DELE>, "NORM", 0 }, { <END>, "NORM", 3.5 },
+ { <PGDN>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 58.5;
+ left= 19;
+ keys {
+ { <UP>, "NORM", 0 }
+ };
+ };
+ row {
+ top= 77;
+ left= 0;
+ keys {
+ { <LEFT>, "NORM", 0 }, { <DOWN>, "NORM", 3.5 },
+ { <RGHT>, "NORM", 3.5 }
+ };
+ };
+ }; // End of "Editing" section
+
+ section "Keypad" {
+ key.color= "white";
+ priority= 10;
+ top= 17;
+ left= 352.7;
+ width= 72.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <NMLK>, "NORM", 0 }, { <KPEQ>, "NORM", 3.5 },
+ { <KPDV>, "NORM", 3.5 }, { <KPMU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <KP7>, "NORM", 0 }, { <KP8>, "NORM", 3.5 },
+ { <KP9>, "NORM", 3.5 }, { <KPSU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <KP4>, "NORM", 0 }, { <KP5>, "NORM", 3.5 },
+ { <KP6>, "NORM", 3.5 }, { <KPAD>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <KP1>, "NORM", 0 }, { <KP2>, "NORM", 3.5 },
+ { <KP3>, "NORM", 3.5 }, { <KPEN>, "KPEN", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <KP0>, "KP0", 0 }, { <KPDL>, "KPDT", 3.5 }
+ };
+ };
+ }; // End of "Keypad" section
+
+ indicator "Caps Lock" {
+ top= 56;
+ left= 6.7;
+ priority= 2;
+ onColor= "green";
+ offColor= "gray";
+ shape= "LED";
+ };
+
+};
+
+// Aluminium Keyboard, JIS model (Japanese, 112 keys)
+xkb_geometry "applealu_jis" {
+
+ width= 430;
+ height= 113.5;
+
+ baseColor= "white";
+ labelColor= "black";
+ xfont= "-*-helvetica-medium-r-normal--*-80-*-*-*-*-iso8859-1";
+ description= "Aluminium Keyboard (JIS)";
+
+ shape "NORM" {
+ corner= 1,
+ { [ 15.5, 15 ] }
+ };
+ shape "FUNC" {
+ corner= 1,
+ { [ 16.1, 9 ] }
+ };
+ shape "FUNS" {
+ corner= 1,
+ { [ 15.5, 9 ] }
+ };
+ shape "KEY1" {
+ corner= 1,
+ { [ 24.5, 15 ] }
+ };
+ shape "BKSP" {
+ corner= 1,
+ { [ 15.5, 15 ] }
+ };
+ shape "TAB" {
+ corner= 1,
+ { [ 15.5, 15 ] }
+ };
+ shape "RTRN" {
+ corner= 1,
+ { [ 0, 0 ], [ 24.5 , 0 ], [ 24.5 , 33.5 ], [ 4.5, 33.5 ],
+ [ 4.5, 15 ], [ 0, 15 ] }
+ };
+ shape "CAPS" {
+ corner= 1,
+ { [ 35, 18 ] }
+ };
+ shape "LCTL" {
+ corner= 1,
+ { [ 20, 15 ] }
+ };
+ shape "LALT" {
+ corner= 1,
+ { [ 27, 18 ] }
+ };
+ shape "LMTA" {
+ corner= 1,
+ { [ 27, 18 ] }
+ };
+ shape "LFSH" {
+ corner= 1,
+ { [ 29.5, 15 ] }
+ };
+ shape "EISU" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "RCTL" {
+ corner= 1,
+ { [ 27, 18 ] }
+ };
+ shape "RALT" {
+ corner= 1,
+ { [ 27, 18 ] }
+ };
+ shape "RMTA" {
+ corner= 1,
+ { [ 27, 18 ] }
+ };
+ shape "RTSH" {
+ corner= 1,
+ { [ 29.5, 15 ] }
+ };
+ shape "KANA" {
+ corner= 1,
+ { [ 20, 18 ] }
+ };
+ shape "SPCE" {
+ corner= 1,
+ { [ 64, 18 ] }
+ };
+ shape "KPDT" {
+ corner= 1,
+ { [ 15.5, 18 ] }
+ };
+ shape "KPEN" {
+ corner= 1,
+ { [ 15.5, 36.5 ] }
+ };
+ shape "LED" {
+ corner= 0.5,
+ { [ 1.5, 1.5 ] }
+ };
+
+ section "Function" {
+ key.color= "white";
+ priority= 7;
+ top= 4.5;
+ left= 4.7;
+ width= 420.5;
+ height= 10;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <ESC>, "FUNC", 0 }, { <FK01>, "FUNC", 3.6 },
+ { <FK02>, "FUNC", 3.5 }, { <FK03>, "FUNC", 3.6 },
+ { <FK04>, "FUNC", 3.5 }, { <FK05>, "FUNC", 3.6 },
+ { <FK06>, "FUNC", 3.5 }, { <FK07>, "FUNC", 3.6 },
+ { <FK08>, "FUNC", 3.5 }, { <FK09>, "FUNC", 3.6 },
+ { <FK10>, "FUNC", 3.5 }, { <FK11>, "FUNC", 3.6 },
+ { <FK12>, "FUNC", 3.5 }, { <I169>, "FUNC", 3.5 },
+ { <FK13>, "FUNS", 11.5 }, { <FK14>, "FUNS", 3.5 },
+ { <FK15>, "FUNS", 3.5 }, { <FK16>, "FUNS", 11.5 },
+ { <FK17>, "FUNS", 3.5 }, { <FK18>, "FUNS", 3.5 },
+ { <FK19>, "FUNS", 3.5 }
+ };
+ };
+ }; // End of "Function" section
+
+ section "Alpha" {
+ key.color= "white";
+ priority= 8;
+ top= 17;
+ left= 5;
+ width= 271.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <AE01>, "KEY1", 0 },
+ { <AE02>, "NORM", 3.5 }, { <AE03>, "NORM", 3.5 },
+ { <AE04>, "NORM", 3.5 }, { <AE05>, "NORM", 3.5 },
+ { <AE06>, "NORM", 3.5 }, { <AE07>, "NORM", 3.5 },
+ { <AE08>, "NORM", 3.5 }, { <AE09>, "NORM", 3.5 },
+ { <AE10>, "NORM", 3.5 }, { <AE11>, "NORM", 3.5 },
+ { <AE12>, "NORM", 3.5 }, { <AE13>, "NORM", 3.5 },
+ { <BKSP>, "BKSP", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <TAB>, "TAB", 0 }, { <AD01>, "NORM", 3.5 },
+ { <AD02>, "NORM", 3.5 }, { <AD03>, "NORM", 3.5 },
+ { <AD04>, "NORM", 3.5 }, { <AD05>, "NORM", 3.5 },
+ { <AD06>, "NORM", 3.5 }, { <AD07>, "NORM", 3.5 },
+ { <AD08>, "NORM", 3.5 }, { <AD09>, "NORM", 3.5 },
+ { <AD10>, "NORM", 3.5 }, { <AD11>, "NORM", 3.5 },
+ { <AD12>, "NORM", 3.5 }, { <RTRN>, "RTRN", 3.5 }
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <LCTL>, "LCTL", 0 }, { <AC01>, "NORM", 3.5 },
+ { <AC02>, "NORM", 3.5 }, { <AC03>, "NORM", 3.5 },
+ { <AC04>, "NORM", 3.5 }, { <AC05>, "NORM", 3.5 },
+ { <AC06>, "NORM", 3.5 }, { <AC07>, "NORM", 3.5 },
+ { <AC08>, "NORM", 3.5 }, { <AC09>, "NORM", 3.5 },
+ { <AC10>, "NORM", 3.5 }, { <AC11>, "NORM", 3.5 },
+ { <AC12>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <LFSH>, "LFSH", 0 },
+ { <AB01>, "NORM", 3.5 }, { <AB02>, "NORM", 3.5 },
+ { <AB03>, "NORM", 3.5 }, { <AB04>, "NORM", 3.5 },
+ { <AB05>, "NORM", 3.5 }, { <AB06>, "NORM", 3.5 },
+ { <AB07>, "NORM", 3.5 }, { <AB08>, "NORM", 3.5 },
+ { <AB09>, "NORM", 3.5 }, { <AB10>, "NORM", 3.5 },
+ { <AB11>, "NORM", 3.5 }, { <RTSH>, "RTSH", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <LALT>, "LALT", 0 }, { <LMTA>, "LMTA", 3.5 },
+ { <EISU>, "EISU", 3.5 }, { <SPCE>, "SPCE", 3.5 },
+ { <KANA>, "KANA", 3.5 }, { <RMTA>, "RMTA", 3.5 },
+ { <RALT>, "RALT", 3.5 }, { <CAPS>, "CAPS", 3.5 }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ key.color= "white";
+ priority= 9;
+ top= 17;
+ left= 287.7;
+ width= 53.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <INS>, "NORM", 0 }, { <HOME>, "NORM", 3.5 },
+ { <PGUP>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <DELE>, "NORM", 0 }, { <END>, "NORM", 3.5 },
+ { <PGDN>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 58.5;
+ left= 19;
+ keys {
+ { <UP>, "NORM", 0 }
+ };
+ };
+ row {
+ top= 77;
+ left= 0;
+ keys {
+ { <LEFT>, "NORM", 0 }, { <DOWN>, "NORM", 3.5 },
+ { <RGHT>, "NORM", 3.5 }
+ };
+ };
+ }; // End of "Editing" section
+
+ section "Keypad" {
+ key.color= "white";
+ priority= 10;
+ top= 17;
+ left= 352.7;
+ width= 72.5;
+ height= 92;
+ row {
+ top= 0;
+ left= 0;
+ keys {
+ { <NMLK>, "NORM", 0 }, { <KPEQ>, "NORM", 3.5 },
+ { <KPDV>, "NORM", 3.5 }, { <KPMU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 18.5;
+ left= 0;
+ keys {
+ { <KP7>, "NORM", 0 }, { <KP8>, "NORM", 3.5 },
+ { <KP9>, "NORM", 3.5 }, { <KPSU>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 37;
+ left= 0;
+ keys {
+ { <KP4>, "NORM", 0 }, { <KP5>, "NORM", 3.5 },
+ { <KP6>, "NORM", 3.5 }, { <KPAD>, "NORM", 3.5 }
+ };
+ };
+ row {
+ top= 55.5;
+ left= 0;
+ keys {
+ { <KP1>, "NORM", 0 }, { <KP2>, "NORM", 3.5 },
+ { <KP3>, "NORM", 3.5 }, { <KPEN>, "KPEN", 3.5 }
+ };
+ };
+ row {
+ top= 74;
+ left= 0;
+ keys {
+ { <KP0>, "KPDT", 0 }, { <JPCM>, "KPDT", 3.5 },
+ { <KPDL>, "KPDT", 3.5 }
+ };
+ };
+ }; // End of "Keypad" section
+
+ indicator "Caps Lock" {
+ top= 93;
+ left= 273.2;
+ priority= 2;
+ onColor= "green";
+ offColor= "gray";
+ shape= "LED";
+ };
+
+};
diff --git a/dist/xkeyboard-config/geometry/nokia b/dist/xkeyboard-config/geometry/nokia
new file mode 100644
index 000000000..5132840ca
--- /dev/null
+++ b/dist/xkeyboard-config/geometry/nokia
@@ -0,0 +1,53 @@
+// Zoomed 3x because of text size
+
+default xkb_geometry "nokiarx51" {
+
+ description= "Nokia RX-51";
+ width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
+ height= 54; // 3x5mm + 2x1.5mm border
+
+ shape.cornerRadius= 1.5;
+ shape "NORM" { { [18,15] } };
+ shape "SPCE" { { [36,15] } };
+ shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
+
+ solid "FRAME" {
+ shape= "FRAME";
+ color= "white";
+ top= 0;
+ left= 15;
+ };
+
+ section.left= 15;
+ row.left= 4.5;
+ key.shape= "NORM";
+ key.gap= 0;
+ section "Keys" {
+ top= 0;
+ row {
+ top= 4.5;
+ keys { { <LCTL>, "NORM", color="grey20" },
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AB08>,
+ { <BKSP>, "NORM", color="grey20" }
+ };
+ };
+ row {
+ top= 19.5;
+ keys { { <RALT>, "NORM", color="grey20" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ <AC06>, <AC07>, <AC08>, <AC09>, <AB09>, <UP>,
+ { <RTRN>, "NORM", color="grey20" }
+ };
+ };
+ row {
+ top= 34.5;
+ keys { { <LFSH>, "NORM", color="grey20" },
+ <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>,
+ { <SPCE>, "SPCE", color="white" },
+ <LEFT>, <DOWN>, <RGHT>
+ };
+ };
+ }; // End of "Keys" section
+
+}; // End of "rx51" geometry
diff --git a/dist/xkeyboard-config/geometry/pc b/dist/xkeyboard-config/geometry/pc
index 812f8425f..e399a89e2 100644
--- a/dist/xkeyboard-config/geometry/pc
+++ b/dist/xkeyboard-config/geometry/pc
@@ -196,11 +196,11 @@ xkb_geometry "pc102" {
shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
shape "RTRN" {
- { [16,0],[ 43,0],[43,37],[2,37],[2,19],[16,19] },
- { [18,1],[ 41,1],[41,36],[4,36],[4,20],[18,20] } };
+ { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] },
+ { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } };
shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
- shape "RTSH" { { [ 49,18] }, { [2,1], [ 47,16] } };
+ shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
shape "SPCE" { { [134,18] }, { [2,1], [132,16] } };
shape "KP0" { { [ 37,18] }, { [2,1], [ 35,16] } };
@@ -251,8 +251,8 @@ xkb_geometry "pc102" {
top= 1;
keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
- <AE10>, <AE11>, <AE12>, <BKSL>,
- { <BKSP>, color="grey20" }
+ <AE10>, <AE11>, <AE12>,
+ { <BKSP>, "BKSP", color="grey20" }
};
};
row {
@@ -260,7 +260,7 @@ xkb_geometry "pc102" {
keys { { <TAB>, "TABK", color="grey20" },
<AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
<AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
- <AD11>, <AD12>, { <RTRN>, -15, "RTRN", color="grey20" }
+ <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
};
};
row {
@@ -268,7 +268,7 @@ xkb_geometry "pc102" {
keys { { <CAPS>, "CAPS", color="grey20" },
<AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
<AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
- <AC11>
+ <AC11>, <BKSL>
};
};
row {
@@ -285,7 +285,7 @@ xkb_geometry "pc102" {
key.color= "grey20";
keys { <LCTL>, { <LALT>, 20 },
{ <SPCE>, "SPCE", color="white" },
- <RALT>, { <RCTL>, 20 }
+ <RALT>, { <RCTL>, 21 }
};
};
}; // End of "Alpha" section
@@ -510,14 +510,18 @@ xkb_geometry "pc105" {
height= 180;
shape.cornerRadius= 1;
+
shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
- shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+ shape "RTRN" {
+ { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] } ,
+ { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } ,
+ approx = { [5,0], [28,37] } };
shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
- shape "RTSH" { { [ 50,18] }, { [2,1], [ 50,16] } };
+ shape "RTSH" { { [ 50,18] }, { [2,1], [ 48,16] } };
shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
@@ -578,7 +582,7 @@ xkb_geometry "pc105" {
keys { { <TAB>, "TABK", color="grey20" },
<AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
<AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
- <AD11>, <AD12>, { <BKSL>, "BKSL" }
+ <AD11>, <AD12>, { <RTRN>, "RTRN", color="grey20" }
};
};
row {
@@ -586,7 +590,7 @@ xkb_geometry "pc105" {
keys { { <CAPS>, "CAPS", color="grey20" },
<AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
<AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
- <AC11>, { <RTRN>, "RTRN", color="grey20" }
+ <AC11>, <BKSL>
};
};
row {
diff --git a/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in b/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
index d50ee7bcf..0ad12259b 100644
--- a/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
+++ b/dist/xkeyboard-config/geometry/sgi_vndr/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
@@ -16,8 +17,9 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -39,6 +41,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -46,9 +49,23 @@ am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+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'
am__installdirs = "$(DESTDIR)$(geomdir)"
-dist_geomDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dist_geom_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -106,6 +123,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POFILES = @POFILES@
@@ -179,9 +197,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu geometry/sgi_vndr/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu geometry/sgi_vndr/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign geometry/sgi_vndr/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign geometry/sgi_vndr/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -199,23 +217,27 @@ $(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
+$(am__aclocal_m4_deps):
install-dist_geomDATA: $(dist_geom_DATA)
@$(NORMAL_INSTALL)
test -z "$(geomdir)" || $(MKDIR_P) "$(DESTDIR)$(geomdir)"
- @list='$(dist_geom_DATA)'; for p in $$list; do \
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_geomDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(geomdir)/$$f'"; \
- $(dist_geomDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(geomdir)/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(geomdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(geomdir)" || exit $$?; \
done
uninstall-dist_geomDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_geom_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(geomdir)/$$f'"; \
- rm -f "$(DESTDIR)$(geomdir)/$$f"; \
- done
+ @list='$(dist_geom_DATA)'; test -n "$(geomdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(geomdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(geomdir)" && rm -f $$files
tags: TAGS
TAGS:
@@ -239,13 +261,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -276,6 +302,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,6 +321,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -302,18 +331,28 @@ install-data-am: install-dist_geomDATA
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -347,6 +386,7 @@ uninstall-am: uninstall-dist_geomDATA
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-dist_geomDATA
+
# 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.
.NOEXPORT:
diff --git a/dist/xkeyboard-config/geometry/sun b/dist/xkeyboard-config/geometry/sun
index 633077ac7..585eb2615 100644
--- a/dist/xkeyboard-config/geometry/sun
+++ b/dist/xkeyboard-config/geometry/sun
@@ -29,29 +29,23 @@
// Copyright 2004 Sun Microsystems, Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
//
// ---------------------------------------------------------------------------
//
diff --git a/dist/xkeyboard-config/geometry/typematrix b/dist/xkeyboard-config/geometry/typematrix
new file mode 100644
index 000000000..d86976f8f
--- /dev/null
+++ b/dist/xkeyboard-config/geometry/typematrix
@@ -0,0 +1,745 @@
+// -*- indent-tabs-mode: nil -*-
+
+// Created by Frédéric Boiteux <fboiteux (at) free (dot) fr>
+// and Gildas Cotomale <gildas (dot) cotomale (at) gmail (dot) com>
+
+// Note : the special/multimedia keys (Calc, WWW, Desktop…) have a keycode
+// <I[XX]>, found in definition file /usr/share/X11/xkb/keycodes/evdev.
+// Fn = <I120>;
+// Calc = <I148>;
+// WWW = <I158>;
+// CycleWindows = <I162>;
+// Mail = <I163>;
+// PlayPause = <I172>;
+// Desktop = <I243>;
+
+
+xkb_geometry "tm2020" {
+ description = "TypeMatrix EZ-Reach 2020";
+
+ // Keyboard total size :
+ width = 308;
+ height = 152;
+ // background / foreground colours :
+ baseColor = "white";
+ labelColor = "black";
+
+ // Key shapes : base key = 16 mm each side
+ shape "NORM" { cornerRadius=1, { [16, 16] }, { [1, 1], [15, 15] }};
+ shape "ALPL" { cornerRadius=1, { [24.25, 16] }, { [1, 1], [23, 15] }};
+ shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1, 1], [23, 31.5] }};
+ shape "FUNC" { cornerRadius=1, { [16, 12] }, { [2.5, 0], [13.5, 10] }};
+ shape "FUNL" { cornerRadius=1, { [24.25, 12] }, { [2.5, 0], [21.5, 10] }};
+ shape "SPCE" { cornerRadius=1, { [57, 26] }, { [2.5, 1], [54.5, 24] }};
+ shape "DBLA" { cornerRadius=1, { [32.5, 16] }, { [1, 1], [31, 15] }};
+ shape "LED" { cornerRadius=2, { [4, 4] }};
+ shape "DECO" { cornerRadius=1, { [3, 18] }};
+
+ // Function keys row
+ section "Function" {
+ left = 4;
+ top = 24;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "FUNC";
+ row {
+ keys { { <ESC>, "FUNL" },
+ <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
+ key.color = "grey20";
+ keys { { <NMLK>, "FUNL" } };
+ };
+ row {
+ left = 150;
+ key.color = "red";
+ keys { { <DELE>, "FUNL" } };
+ key.color = "grey10";
+ keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+ { <FK12>, "FUNL" } };
+ };
+ };
+
+ // Alpha-numeric keys rows
+ section "Alpha" {
+ left = 4;
+ top = 36.5;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "NORM";
+ row {
+ top = 0;
+ keys { { <TLDE>, "ALPL" },
+ <AE01>, <AE02>, <AE03>, <AE04>, <AE05>,
+ { <BKSP>, "DHAL" } };
+ };
+ row {
+ top = 16.5;
+ keys { { <TAB>, "ALPL" },
+ <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+ };
+ row {
+ top = 33;
+ keys { { <LFSH>, "DHAL" },
+ <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+ { <TAB>, "DHAL" } };
+ };
+ row {
+ top = 49.5;
+ left = 24.5;
+ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+ };
+ row {
+ top = 0;
+ left = 150;
+ keys { { <BKSP>, "DHAL" },
+ <AE06>, <AE07>, <AE08> };
+ key.color = "grey20";
+ keys { <AE09>, <AE10>, <AE11>, { <AE12>, "ALPL" } };
+ };
+ row {
+ top = 16.5;
+ left = 174.5;
+ keys { <AD06>, <AD07>, <AD08> };
+ key.color = "grey20";
+ keys { <AD09>, <AD10>, <AD11>, { <AD12>, "ALPL" } };
+ };
+ row {
+ top = 33;
+ left = 150;
+ keys { { <RTRN>, "DHAL" },
+ <AC06>, <AC07>, <AC08> };
+ key.color = "grey20";
+ keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "DHAL" } };
+ };
+ row {
+ top = 49.5;
+ left = 174.5;
+ keys { <AB06>, <AB07>, <AB08> };
+ key.color = "grey20";
+ keys { <AB09>, <AB10>, <BKSL> };
+ };
+ };
+
+ // Control keys rows
+ section "Control" {
+ left = 4;
+ top = 102.5;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "ALPL";
+ row {
+ top = 0;
+ keys { <LCTL>, <LALT>, <CAPS> };
+ keys { { <SPCE>, "SPCE"} };
+ };
+ row {
+ top = 16.5;
+ keys { <I120>, <LWIN>, <MENU> };
+ };
+ row {
+ top = 0;
+ left = 150;
+ key.shape = "NORM";
+ keys { { <SPCE>, "SPCE"}, <RALT> };
+ key.color = "grey20";
+ keys { <RCTL>, <UP>, <I162>, { <KPEN>, "DHAL" } };
+ };
+ row {
+ top = 16.5;
+ left = 207.5;
+ key.shape = "NORM";
+ key.color = "grey20";
+ keys { { <LEFT>, "DBLA" }, <DOWN>, <RGHT> };
+ };
+ };
+
+ // Diods
+ indicator.top = 12;
+ indicator.onColor = "green";
+ indicator.offColor = "grey10";
+ indicator.shape = "LED";
+ indicator "Num Lock" { left = 252; };
+ indicator "Caps Lock" { left = 266; };
+ indicator "Misc" { left = 280; };
+ text.top= 5;
+ text.color= "black";
+ text "NumLockLabel" { left= 252; text="1"; };
+ text "CapsLockLabel" { left= 266; text="A"; };
+ text "MiscLabel" { left= 280; text="D"; };
+
+ text "Logo" { left = 29; top = 10; text="TypeMatrix™"; };
+
+ // other decorations : drawings
+ solid "rainure1" { shape = "DECO"; top = 1; left = 110; color = "grey10";};
+ solid "rainure2" { shape = "DECO"; top = 1; left = 115; color = "grey10";};
+ solid "rainure3" { shape = "DECO"; top = 1; left = 120; color = "grey10";};
+ solid "rainure4" { shape = "DECO"; top = 1; left = 125; color = "grey10";};
+ solid "rainure5" { shape = "DECO"; top = 1; left = 130; color = "grey10";};
+ solid "rainure6" { shape = "DECO"; top = 1; left = 135; color = "grey10";};
+ solid "rainure7" { shape = "DECO"; top = 1; left = 140; color = "grey10";};
+ solid "rainure8" { shape = "DECO"; top = 1; left = 145; color = "grey10";};
+ solid "rainure9" { shape = "DECO"; top = 1; left = 150; color = "grey10";};
+ solid "rainure10" { shape = "DECO"; top = 1; left = 155; color = "grey10";};
+ solid "rainure11" { shape = "DECO"; top = 1; left = 160; color = "grey10";};
+ solid "rainure12" { shape = "DECO"; top = 1; left = 165; color = "grey10";};
+ solid "rainure13" { shape = "DECO"; top = 1; left = 170; color = "grey10";};
+}; // geometry tm2020
+
+
+xkb_geometry "tm2030_shape" {
+ // Keyboard total size
+ width = 320;
+ height = 130;
+ // background / foreground colours :
+ baseColor = "white";
+ labelColor = "black";
+
+ // Key shapes : base key = 20 mm each side
+ shape "NORM" { cornerRadius=1, { [18, 18] }, { [1.5, 1.5], [16.5, 14] } };
+ shape "FUNC" { cornerRadius=1, { [18, 12] }, { [2.5, 0], [15.5, 10] } };
+ shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5, 0], [15.5, 30] } };
+ shape "ALT1" { cornerRadius=1, { [27.5, 18] }, { [2.5, 0], [23.5, 14] } };
+ shape "BKSP" { cornerRadius=1, { [18, 30.5] }, { [1.5, 1.5], [16.5, 29] } };
+ shape "SPCE" { cornerRadius=1, { [92, 25] }, { [1.5, 1.5], [90.5, 22] } };
+ shape "LED" { cornerRadius=2, { [4, 4] } };
+ shape "PAN1" { cornerRadius=1, { [27, 126.5] } };
+ shape "PAN2" { cornerRadius=1, { [92, 13] } };
+
+ // other decorations : panels
+ solid "panneau1" {
+ shape = "PAN1";
+ left = 0;
+ top = 0;
+ color = "grey40";
+ };
+ solid "panneau2" {
+ shape = "PAN2";
+ left = 101.5;
+ top = 113.5;
+ color = "grey40";
+ };
+
+ // Diods (Indicators) : they have to be put after panels, either the panels
+ // overwrites them.
+ indicator.left = 6;
+ indicator.onColor = "green";
+ indicator.offColor = "grey10";
+ indicator.shape = "LED";
+
+ indicator "Num Lock" { top = 11 ; };
+ indicator "Caps Lock" { top = 27.5; };
+ indicator "Scroll Lock" { top = 44 ; };
+
+ text.left = 12;
+ text.color = "black";
+ text "NumLockLabel" { top = 11; text="num"; };
+ text "CapsLockLabel" { top = 27.5; text="caps"; };
+ text "SrollLockLabel" { top = 44; text="scroll"; };
+}; // geometry tm2030_shape
+
+xkb_geometry "tm2030_MiscDiod_dvk" {
+ text "ModeLabel" { left = 12; top = 58; color = "black"; text="Dvorak"; };
+}; // geometry tm2030_MiscDiod_dvk
+
+xkb_geometry "tm2030_MiscDiod_102" {
+ text "ModeLabel" { left = 12; top = 58; color = "black"; text="102"; };
+}; // geometry tm2030_MiscDiod_102
+
+xkb_geometry "tm2030_MiscDiod_106" {
+ text "ModeLabel" { left = 12; top = 58; color = "black"; text="106"; };
+}; // geometry tm2030_MiscDiod_106
+
+xkb_geometry "tm2030_MiscDiod_off" {
+ indicator "Misc" { left = 6; top = 60.5; shape = "LED";
+ offColor = "grey10"; onColor = "grey10"; };
+}; // geometry tm2030_MiscDiod_off
+
+xkb_geometry "tm2030_MiscDiod_on" {
+ indicator "Misc" { left = 6; top = 60.5; shape = "LED";
+ offColor = "green"; onColor = "green"; };
+}; // geometry tm2030_MiscDiod_on
+
+
+xkb_geometry "tm2030USB_func" {
+ // Function keys rows
+ section "Function" {
+ left = 27;
+ top = 1.5;
+ key.gap = 0.5;
+ key.color = "grey30";
+ key.shape = "FUNC";
+ row {
+ keys { <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05> };
+ };
+ row {
+ left = 129.5;
+ keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+ <FK12>, <NMLK> };
+ };
+ };
+}; // geometry tm2030USB_func
+
+
+xkb_geometry "tm2030USB_alpha" {
+ // Alpha-numeric keys rows
+ section "Alpha" {
+ left = 27;
+ top = 14;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "NORM";
+ row {
+ top = 0;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+ };
+ row {
+ top = 18.5;
+ keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+ };
+ row {
+ top = 37;
+ keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+ };
+ row {
+ top = 55.5;
+ left = 18.5;
+ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+ };
+
+ row {
+ top = 0;
+ left = 129.5;
+ keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I148> };
+ };
+ row {
+ top = 18.5;
+ left = 129.5;
+ keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <I163> };
+ };
+ row {
+ top = 37;
+ left = 129.5;
+ keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
+ };
+ row {
+ top = 55.5;
+ left = 129.5;
+ keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <BKSL> };
+ };
+ row {
+ top = 55.5;
+ left = 259;
+ keys { <I158> };
+ };
+ row {
+ top = 74;
+ left = 74;
+ keys { { <SPCE>, "SPCE" } };
+ };
+ };
+}; // geometry tm2030USB_alpha
+
+
+xkb_geometry "tm2030USB_ctrl" {
+ // Control keys rows
+ section "Control" {
+ left = 27;
+ top = 0;
+ key.gap = 0.5;
+ key.color = "grey30";
+ key.shape = "NORM";
+ row {
+ top = 88;
+ keys { <LCTL>, <I172>, <MENU>, <I162> };
+ };
+ row {
+ top = 106.5;
+ keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+ };
+ row {
+ top = 88;
+ left = 166.5;
+ keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+ };
+ row {
+ top = 106.5;
+ left = 166.5;
+ keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+ };
+ row {
+ top = 106.5;
+ left = 259;
+ keys { <PGDN> };
+ };
+ row {
+ top = 1;
+ left = 111.5;
+ vertical = true;
+ keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+ };
+ };
+}; // geometry tm2030USB_ctrl
+
+
+xkb_geometry "tm2030PS2" {
+ include "typematrix(tm2030_shape)"
+ include "typematrix(tm2030_MiscDiod_dvk)"
+ include "typematrix(tm2030_MiscDiod_off)"
+
+ description = "TypeMatrix EZ-Reach 2030 PS2";
+
+ // Function keys row
+ section "Function" {
+ left = 27;
+ top = 1.5;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "FUNC";
+ row {
+ key.color = "grey30";
+ keys { <ESC> };
+ };
+ row {
+ left = 18.5;
+ keys { <FK01>, <FK02>, <FK03>, <FK04> };
+ };
+ row {
+ left = 92.5;
+ key.color = "grey30";
+ keys { <FK05> };
+ };
+ row {
+ left = 129.5;
+ key.color = "grey30";
+ keys { <FK06>, <FK07>, <FK08> };
+ };
+ row {
+ left = 185;
+ keys { <FK09>, <FK10>, <FK11>, <FK12> };
+ };
+ row {
+ left = 259;
+ key.color = "grey30";
+ keys { <NMLK> };
+ };
+ };
+
+ // Alpha-numeric keys rows
+ section "Alpha" {
+ left = 27;
+ top = 14;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "NORM";
+ row {
+ top = 0;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+ };
+ row {
+ top = 18.5;
+ keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+ };
+ row {
+ top = 37;
+ keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+ };
+ row {
+ top = 55.5;
+ left = 18.5;
+ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+ };
+
+ row {
+ top = 0;
+ left = 129.5;
+ keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I120> };
+ };
+ row {
+ top = 18.5;
+ left = 129.5;
+ keys { <AD06>, <AD07>, <AD08> };
+ };
+ row {
+ top = 18.5;
+ left = 185;
+ key.color = "grey30";
+ keys { <AD09>, <AD10>, <AD11>, <AD12>};
+ };
+ row {
+ top = 18.5;
+ left = 259;
+ keys { <BKSP> };
+ };
+ row {
+ top = 37;
+ left = 129.5;
+ keys { <AC06>, <AC07>, <AC08> };
+ };
+ row {
+ top = 37;
+ left = 185;
+ key.color = "grey30";
+ keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" },
+ {<DELE>, key.color="red"} };
+ };
+ row {
+ top = 55.5;
+ left = 129.5;
+ keys { <AB06>, <AB07>, <AB08> };
+ };
+ row {
+ top = 55.5;
+ left = 185;
+ key.color = "grey30";
+ keys { <AB09>, <AB10>, <BKSL> };
+ };
+ row {
+ top = 55.5;
+ left = 259;
+ keys { <INS> };
+ };
+ row {
+ top = 74;
+ left = 74;
+ keys { { <SPCE>, "SPCE" } };
+ };
+ }; // end section "Alpha"
+
+ // Control keys rows
+ section "Control" {
+ left = 27;
+ top = 0;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "NORM";
+ row {
+ top = 88;
+ keys { <I120>, <LWIN>, <MENU>, <I162> };
+ };
+ row {
+ top = 106.5;
+ keys { <LCTL>, { <LALT>, "ALT1" }, { <LTSH>, "ALT1" } };
+ };
+ row {
+ top = 88;
+ left = 166.5;
+ keys { <PGUP> };
+ };
+ row {
+ top = 88;
+ left = 185;
+ key.color = "grey30";
+ keys { <HOME>, <UP>, <END>, { <KPEN>, "LFSH"} };
+ };
+ row {
+ top = 88;
+ left = 259;
+ keys { <RCTL> };
+ };
+ row {
+ top = 106.5;
+ left = 166.5;
+ keys { <PGDN> };
+ };
+ row {
+ top = 106.5;
+ left = 185;
+ key.color = "grey30";
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ row {
+ top = 106.5;
+ left = 259;
+ keys { <RALT> };
+ };
+ row {
+ top = 1;
+ left = 111.5;
+ key.color = "grey10";
+ vertical = true;
+ keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+ };
+ }; // end section "Control"
+}; // geometry tm2030PS2
+
+
+xkb_geometry "tm2030USB" {
+ include "typematrix(tm2030_shape)"
+ include "typematrix(tm2030_MiscDiod_102)"
+ include "typematrix(tm2030_MiscDiod_off)"
+
+ description = "TypeMatrix EZ-Reach 2030 USB";
+
+ include "typematrix(tm2030USB_func)"
+ include "typematrix(tm2030USB_alpha)"
+ include "typematrix(tm2030USB_ctrl)"
+}; // geometry tm2030USB
+
+
+// European 102/105 keys mode :
+// Same as the standard keyboard, except for one key, Play becomes LSGT
+xkb_geometry "tm2030USB-102" {
+ include "typematrix(tm2030_shape)"
+ include "typematrix(tm2030_MiscDiod_102)"
+ include "typematrix(tm2030_MiscDiod_on)"
+
+ description = "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)";
+
+ include "typematrix(tm2030USB_func)"
+ include "typematrix(tm2030USB_alpha)"
+
+ // Control keys rows
+ section "Control" {
+ left = 27;
+ top = 0;
+ key.gap = 0.5;
+ key.color = "grey30";
+ key.shape = "NORM";
+ row {
+ top = 88;
+ keys { <LCTL>, <LSGT>, <MENU>, <I162> };
+ };
+ row {
+ top = 106.5;
+ keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+ };
+ row {
+ top = 88;
+ left = 166.5;
+ keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+ };
+ row {
+ top = 106.5;
+ left = 166.5;
+ keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+ };
+ row {
+ top = 106.5;
+ left = 259;
+ keys { <PGDN> };
+ };
+ row {
+ top = 1;
+ left = 111.5;
+ vertical = true;
+ keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+ };
+ };
+}; // geometry tm2030USB-102
+
+
+// Japan / Korean 106 keys mode :
+// Same as the standard keyboard, except for following keys :
+// – <TLDE> is replaced by <HZTG>
+// – WWW key becomes <HKTG>
+// — Calc key becomes <AE13>
+// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11>
+
+// about Controls:
+// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist)
+// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section
+// (see upper).
+
+xkb_geometry "tm2030USB-106" {
+ include "typematrix(tm2030_shape)"
+ include "typematrix(tm2030_MiscDiod_106)"
+ include "typematrix(tm2030_MiscDiod_on)"
+
+ description = "TypeMatrix EZ-Reach 2030 USB (106:JP mode)";
+
+ include "typematrix(tm2030USB_func)"
+
+ // Alpha-numeric keys rows
+ section "Alpha" {
+ left = 27;
+ top = 14;
+ key.gap = 0.5;
+ key.color = "grey10";
+ key.shape = "NORM";
+ row {
+ top = 0;
+ keys { <HZTG>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> };
+ };
+ row {
+ top = 18.5;
+ keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> };
+ };
+ row {
+ top = 37;
+ keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> };
+ };
+ row {
+ top = 55.5;
+ left = 18.5;
+ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> };
+ };
+
+ row {
+ top = 0;
+ left = 129.5;
+ keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13> };
+ };
+ row {
+ top = 18.5;
+ left = 129.5;
+ keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <BKSL> };
+ };
+ row {
+ top = 37;
+ left = 129.5;
+ keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> };
+ };
+ row {
+ top = 55.5;
+ left = 129.5;
+ keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11> };
+ };
+ row {
+ top = 55.5;
+ left = 259;
+ keys { <HKTG> };
+ };
+ row {
+ top = 74;
+ left = 74;
+ keys { { <SPCE>, "SPCE" } };
+ };
+ };
+
+ // Control keys rows
+ section "Control" {
+ left = 27;
+ top = 0;
+ key.gap = 0.5;
+ key.color = "grey30";
+ key.shape = "NORM";
+ row {
+ top = 88;
+ keys { <LCTL>, <I172>, <MENU>, <I162> };
+ };
+ row {
+ top = 106.5;
+ keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } };
+ };
+ row {
+ top = 88;
+ left = 166.5;
+ keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> };
+ };
+ row {
+ top = 106.5;
+ left = 166.5;
+ keys { <RALT>, <LEFT>, <DOWN>, <RGHT> };
+ };
+ row {
+ top = 106.5;
+ left = 259;
+ keys { <PGDN> };
+ };
+ row {
+ top = 1;
+ left = 111.5;
+ vertical = true;
+ keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
+ };
+ };
+}; // geometry tm2030USB-106
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 09:18:53 +0000