Update to xkeyboard-config 2.11.

ok matthieu@
This commit is contained in:
shadchin 2014-05-05 18:05:33 +00:00
parent ba5786444e
commit 72ef880b2e
157 changed files with 19094 additions and 20162 deletions

View File

@ -1,5 +1,5 @@
.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.10.1" "X Version 11"
.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.11" "X Version 11"
.SH NAME
xkeyboard-config \- XKB data description files
.SH DESCRIPTION
@ -282,17 +282,18 @@ be(sundeadkeys) Belgian (Sun dead keys)
be(wang) Belgian (Wang model 724 azerty)
_
bd Bengali
bd(probhat) Bengali (Probhat)
bd Bangla
bd(probhat) Bangla (Probhat)
_
in Indian
in(ben) Bengali (India)
in(ben_probhat) Bengali (India, Probhat)
in(ben_baishakhi) Bengali (India, Baishakhi)
in(ben_bornona) Bengali (India, Bornona)
in(ben_gitanjali) Bengali (India, Uni Gitanjali)
in(ben_inscript) Bengali (India, Baishakhi Inscript)
in(ben) Bangla (India)
in(ben_probhat) Bangla (India, Probhat)
in(ben_baishakhi) Bangla (India, Baishakhi)
in(ben_bornona) Bangla (India, Bornona)
in(ben_gitanjali) Bangla (India, Uni Gitanjali)
in(ben_inscript) Bangla (India, Baishakhi Inscript)
in(eeyek) Manipuri (Eeyek)
in(guj) Gujarati
in(guru) Punjabi (Gurmukhi)
in(jhelum) Punjabi (Gurmukhi Jhelum)
@ -330,9 +331,9 @@ _
br Portuguese (Brazil)
br(nodeadkeys) Portuguese (Brazil, eliminate dead keys)
br(dvorak) Portuguese (Brazil, Dvorak)
br(nativo) Portuguese (Brazil, nativo)
br(nativo-us) Portuguese (Brazil, nativo for US keyboards)
br(nativo-epo) Portuguese (Brazil, nativo for Esperanto)
br(nativo) Portuguese (Brazil, Nativo)
br(nativo-us) Portuguese (Brazil, Nativo for US keyboards)
br(nativo-epo) Esperanto (Brazil, Nativo)
_
bg Bulgarian
@ -376,7 +377,7 @@ _
cn Chinese
cn(tib) Tibetan
cn(tib_asciinum) Tibetan (with ASCII numerals)
cn(uig) Uyghur
cn(ug) Uyghur
_
hr Croatian
@ -692,7 +693,7 @@ rs(latinyz) Serbian (Latin qwerty)
rs(latinunicodeyz) Serbian (Latin Unicode qwerty)
rs(alternatequotes) Serbian (Cyrillic with guillemets)
rs(latinalternatequotes) Serbian (Latin with guillemets)
rs(rue) Pannonian Rusyn (homophonic)
rs(rue) Pannonian Rusyn
_
si Slovenian
@ -990,6 +991,9 @@ ctrl:aa_ctrl At bottom left
ctrl:rctrl_ralt Right Ctrl as Right Alt
ctrl:menu_rctrl Menu as Right Ctrl
ctrl:ctrl_ralt Right Alt as Right Ctrl
ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key
ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key
ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
.TE
@ -1155,6 +1159,7 @@ shift:both_capslock_cancel Both Shift keys together activate Caps Lock, one Shif
shift:both_shiftlock Both Shift keys together toggle ShiftLock
keypad:pointerkeys Shift + NumLock toggles PointerKeys
grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
grab:debug_actions Allow grab and window tree logging
.TE

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2014/03/29 14:27:12 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2014/05/05 18:05:33 shadchin Exp $
SUBDIR= compat
@ -7,6 +7,7 @@ XKB_SUBDIR= rules
DATA= xkb.dtd README
BASE_PARTS= base.hdr.part base.lists.part \
base.lists.base.part \
compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
@ -25,6 +26,7 @@ BASE_PARTS= base.hdr.part base.lists.part \
HDR compat/base.ml3v3_s.part \
HDR compat/base.ml4v4_s.part \
HDR base.m_s.part \
HDR base.ml_s1.part \
HDR compat/base.lv_c.part \
HDR compat/base.l1v1_c.part \
HDR compat/base.l2v2_c.part \
@ -43,6 +45,7 @@ BASE_PARTS= base.hdr.part base.lists.part \
HDR base.o_t.part
EVDEV_PARTS= base.hdr.part base.lists.part \
evdev.lists.part \
compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
@ -61,6 +64,7 @@ EVDEV_PARTS= base.hdr.part base.lists.part \
HDR compat/base.ml3v3_s.part \
HDR compat/base.ml4v4_s.part \
HDR evdev.m_s.part \
HDR \
HDR compat/base.lv_c.part \
HDR compat/base.l1v1_c.part \
HDR compat/base.l2v2_c.part \

View File

@ -12,7 +12,7 @@ EXTRA_DIST=config.rpath COPYING README \
DISTCLEANFILES=intltool-extract intltool-merge intltool-update
# ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
sync-po:
rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po

View File

@ -85,7 +85,12 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
ChangeLog NEWS README TODO config.guess config.rpath \
config.sub install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@ -379,6 +384,7 @@ EXTRA_DIST = config.rpath COPYING README \
intltool-extract.in intltool-merge.in intltool-update.in
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
all: all-recursive
.SUFFIXES:
@ -853,8 +859,6 @@ uninstall-am: uninstall-pkgconfigDATA
uninstall-am uninstall-pkgconfigDATA
# ACLOCAL_AMFLAGS = -I m4
sync-po:
rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/ po

View File

@ -1,3 +1,6 @@
2.11 11 bugs fixed
Continuing code formatting cleanup
Translations updated
2.10.1 Critical fix
2.10 10+ bugs fixed
37 cleanup commits by Benno Schulenberg

File diff suppressed because it is too large Load Diff

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = compat
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -1,7 +1,7 @@
The core protocol interpretation of keyboard modifiers does not include direct
support for multiple keyboard groups, so XKB reports the effective keyboard
group to XKB-aware clients using some of reserved bits in the state field of
some core protocol events. This modified state field would not be interpreted
group to XKB-aware clients using some of the reserved bits in the state field
of some core protocol events. This modified state field would not be interpreted
correctly by XKB-unaware clients, so XKB provides a group compatibility mapping
which remaps the keyboard group into a core modifier mask that has similar
effects, when possible.
@ -15,8 +15,8 @@ XKB-unaware clients(*) work as well as possible:
- The compatibility grab state which is the nearest core-protocol equivalent
of the grab state.
Compatibility state are essentially the corresponding XKB states, but with
keyboard group possibly encoded as one or more modifiers.
Compatibility states are essentially the corresponding XKB states, but with
the keyboard group possibly encoded as one or more modifiers.
Modifiers that correspond to each keyboard group are described in this
group compatibility map.
@ -25,9 +25,9 @@ group compatibility map.
----
(*) The implementation of XKB invisibly extends the X library to use the
keyboard extension if it is present. That means, clients that use library or
toolkit routines to interpret keyboard events automatically use all of XKB
features; clients that directly interpret the state field of core protocol
events or the keymap direcly may be affected by some of the XKB differences.
toolkit routines to interpret keyboard events automatically use all of XKB's
features; clients that directly interpret the state field of core-protocol
events or the keymap directly may be affected by some of the XKB differences.
Thus most clients can take all advantages without modification but it also
means that XKB state can be reported to clients that have not explicitly
requested the keyboard extension.

View File

@ -1,9 +1,10 @@
// Minimal set of symbol interpretations to provide
// reasonable default behavior (Num lock, shift and
// caps lock and mode switch) and set up the
// reasonable default behavior (Num lock, Shift lock,
// Caps lock, and Mode switch) and set up the
// automatic updating of common keyboard LEDs.
default xkb_compatibility "basic" {
virtual_modifiers NumLock,AltGr;
interpret.repeat= False;

View File

@ -1,9 +1,8 @@
partial xkb_compatibility "caps_lock" {
// Keysym Caps_Lock locks Lock modifier.
// With this, the keysym Caps_Lock can be used without binding the whole
// key to a real modifier.
// This is essential when you don't want to use caps lock on the first
// level.
// Keysym Caps_Lock locks the Lock modifier.
// With this definition, the keysym Caps_Lock can be used without binding
// the whole key to a real modifier. This is essential when you don't
// want to use Caps_Lock on the first level.
// This should not have any compatibility issues when used together with
// other layouts which don't utilize this capability.
interpret Caps_Lock {

View File

@ -1,7 +1,8 @@
// Fairly complete set of symbol interpretations
// to provide reasonable default behavior
// to provide reasonable default behavior.
default partial xkb_compatibility "default" {
virtual_modifiers LevelThree,AltGr;
interpret.repeat= False;

View File

@ -1,9 +1,9 @@
// Japanese keyboards need Eisu and Kana shift and
// lock keys, which are typically bound to the
// second shift level for some other modifier key.
// Japanese keyboards need the Eisu and Kana Shift
// and Lock keys, which are typically bound to the
// second shift level of some other modifier key.
// These interpretations disable the default
// interpretation (which would have these keys set
// the same modifier as the level one symbol).
// to the same modifier as the level one symbol).
default partial xkb_compatibility "japan" {
@ -26,8 +26,8 @@ default partial xkb_compatibility "japan" {
};
};
// Some Japanese keyboards have an explict Kana Lock key & matching LED
// Some Japanese keyboards have an explict
// Kana Lock key and matching LED.
partial xkb_compatibility "kana_lock" {
virtual_modifiers Kana_Lock;

View File

@ -1,4 +1,5 @@
// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
// Use the Caps Lock LED to show either
// Caps Lock, Group, or Shift Lock state.
default partial xkb_compatibility "caps_lock" {
indicator "Caps Lock" {

View File

@ -1,4 +1,5 @@
// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
// Use the Num Lock LED to show either
// Num Lock, Group, or Shift Lock state.
default partial xkb_compatibility "num_lock" {
indicator "Num Lock" {

View File

@ -1,4 +1,5 @@
// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
// Use the Scroll Lock LED to show either
// Scroll Lock, Group, or Shift Lock state.
default partial xkb_compatibility "scroll_lock" {
indicator "Scroll Lock" {

View File

@ -1,7 +1,8 @@
// Fairly complete set of symbol interpretations
// to provide reasonable default behavior
// to provide reasonable default behavior.
default partial xkb_compatibility "default" {
virtual_modifiers LevelFive;
interpret.repeat= False;
@ -39,12 +40,14 @@ default partial xkb_compatibility "default" {
action= LockMods(modifiers=LevelFive);
};
};
partial xkb_compatibility "level5_lock" {
// This defines a Level5-Lock using the NumLock real modifier in order to
// create arbitrary level-behaviour, which would not be possible with the
// virtual modifier.
// This defines a Level5-Lock using the NumLock real modifier
// in order to create arbitrary level-behaviour, which would
// not be possible with the virtual modifier.
// See also: types/level5 : EIGHT_LEVEL_LEVEL_FIVE_LOCK
// See also: symbols/level5(lock)
virtual_modifiers NumLock;
interpret ISO_Level5_Lock {

View File

@ -2,7 +2,7 @@ default partial xkb_compatibility "misc" {
virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock;
// Interpretations for some other useful keys
// Interpretations for some other useful keys.
interpret Terminate_Server {
action = Terminate();
@ -10,7 +10,7 @@ default partial xkb_compatibility "misc" {
setMods.clearLocks= True;
// Sets the "Alt" virtual modifier
// Sets the "Alt" virtual modifier.
interpret Alt_L+Any {
//useModMapMods= level1;
@ -32,7 +32,7 @@ default partial xkb_compatibility "misc" {
action = SetMods(modifiers=Alt);
};
// Sets the "Meta" virtual modifier
// Sets the "Meta" virtual modifier.
interpret Meta_L+Any {
//useModMapMods= level1;
@ -54,7 +54,7 @@ default partial xkb_compatibility "misc" {
action = SetMods(modifiers=Meta);
};
// Sets the "Super" virtual modifier
// Sets the "Super" virtual modifier.
interpret Super_L+Any {
//useModMapMods= level1;
@ -76,7 +76,7 @@ default partial xkb_compatibility "misc" {
action = SetMods(modifiers=Super);
};
// Sets the "Hyper" virtual modifier
// Sets the "Hyper" virtual modifier.
interpret Hyper_L+Any {
//useModMapMods= level1;
@ -112,8 +112,8 @@ default partial xkb_compatibility "misc" {
};
partial xkb_compatibility "assign_shift_left_action" {
// Because of the irrevertable modifier mapping in symbols/pc <LFSH> is
// getting bound to the Lock modifier when using
// Because of the irrevertable modifier mapping in symbols/pc,
// <LFSH> is getting bound to the Lock modifier when using
// symbols/shift(both_capslock), creating unwanted behaviour.
// This is a quirk, to circumvent the problem.
interpret Shift_L {

View File

@ -1,12 +1,12 @@
// Interpretations for arrow keys and a bunch of other
// common keysyms which make it possible to bind "mouse"
// keys using xmodmap and activate or deactivate them
// from the keyboard.
// Interpretations for arrow keys and a bunch of
// other common keysyms which make it possible to
// bind "mouse" keys using xmodmap and activate or
// deactivate them from the keyboard.
default partial xkb_compatibility "mousekeys" {
// Keypad actions.
//
interpret.repeat= True;
interpret KP_1 {
@ -114,7 +114,8 @@ default partial xkb_compatibility "mousekeys" {
action = LockPointerButton(button=default,affect=unlock);
};
// Additional mappings for Solaris keypad compatibility
// Additional mappings for Solaris keypad compatibility.
interpret F25 { // aka KP_Divide
action = SetPtrDflt(affect=defaultButton,button=1);
};
@ -139,9 +140,8 @@ default partial xkb_compatibility "mousekeys" {
interpret.repeat= False;
// New keysym actions.
// New Keysym Actions.
//
interpret Pointer_Button_Dflt {
action= PointerButton(button=default);
};
@ -192,7 +192,6 @@ default partial xkb_compatibility "mousekeys" {
action= SetPtrDflt(affect=defaultButton,button= -1);
};
// Allow an indicator for MouseKeys.
indicator "Mouse Keys" {
//!allowExplicit;

View File

@ -1,8 +1,8 @@
//
// Map the OLPC game keys to virtual modifiers.
//
// Created by Bernardo Innocenti <bernie@codewiz.org>
//
// Map the OLPC game keys to virtual modifiers
//
default xkb_compatibility "olpc" {
include "complete"

View File

@ -1,6 +1,6 @@
default partial xkb_compatibility "pc" {
// Sets the "Alt" virtual modifier
// Sets the "Alt" virtual modifier.
virtual_modifiers Alt;

View File

@ -1,9 +1,10 @@
// Minimal set of symbol interpretations to provide
// reasonable default behavior (Num lock, shift and
// caps lock and mode switch) and set up the
// automatic updating of common keyboard LEDs.
// reasonable default behavior (Num lock, Shift lock,
// and Mode switch) and set up the automatic updating
// of common keyboard LEDs.
default xkb_compatibility "basic" {
virtual_modifiers NumLock,AltGr;
interpret.repeat= False;

View File

@ -1,4 +1,4 @@
// XFree86 special keysyms
// XFree86 special keysyms.
default partial xkb_compatibility "basic" {

View File

@ -1,15 +1,14 @@
default xkb_compatibility "xtest" {
// Minimal set of symbol interpretations to provide
// reasonable behavior for testing. The X Test
// Suite assumes that it can set any modifier by
// simulating a KeyPress and clear it by simulating
// a KeyRelease. Because of the way that XKB
// implements locking/latching modifiers, this
// approach fails in some cases (typically the
// lock or num lock modifiers). These symbol
// interpretations make all modifier keys just
// set the corresponding modifier so that xtest
// reasonable behavior for testing.
// The X Test Suite assumes that it can set any modifier
// by simulating a KeyPress and clear it by simulating a
// KeyRelease. Because of the way that XKB implements
// locking/latching modifiers, this approach fails in
// some cases (typically the Lock or NumLock modifiers).
// These symbol interpretations make all modifier keys
// just set the corresponding modifier so that xtest
// will see the behavior it expects.
virtual_modifiers NumLock,AltGr;

View File

@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
timestamp='2013-06-10'
timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -50,7 +52,9 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -132,27 +136,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
case "${UNAME_SYSTEM}" in
Linux|GNU|GNU/*)
# If the system lacks a compiler, then just pick glibc.
# We could probably try harder.
LIBC=gnu
eval $set_cc_for_build
cat <<-EOF > $dummy.c
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
#elif defined(__dietlibc__)
LIBC=dietlibc
#else
LIBC=gnu
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
;;
esac
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -874,21 +857,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -901,54 +884,59 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arc:Linux:*:* | arceb:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
echo ${UNAME_MACHINE}-pc-linux-${LIBC}
LIBC=gnu
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __dietlibc__
LIBC=dietlibc
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@ -967,63 +955,54 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or1k:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
or32:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-${LIBC}
echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-${LIBC}
echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
*) echo hppa-unknown-linux-${LIBC} ;;
PA7*) echo hppa1.1-unknown-linux-gnu ;;
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-${LIBC}
echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-${LIBC}
exit ;;
ppc64le:Linux:*:*)
echo powerpc64le-unknown-linux-${LIBC}
exit ;;
ppcle:Linux:*:*)
echo powerpcle-unknown-linux-${LIBC}
echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@ -1256,21 +1235,19 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
i386)
eval $set_cc_for_build
if test "$UNAME_PROCESSOR" = unknown ; then
UNAME_PROCESSOR=powerpc
fi
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
grep IS_64BIT_ARCH >/dev/null
then
case $UNAME_PROCESSOR in
i386) UNAME_PROCESSOR=x86_64 ;;
powerpc) UNAME_PROCESSOR=powerpc64 ;;
UNAME_PROCESSOR="x86_64"
fi
fi ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
fi
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)

View File

@ -1,8 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013 Free Software Foundation, Inc.
timestamp='2013-04-24'
timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -68,7 +70,9 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2013 Free Software Foundation, Inc.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@ -252,7 +256,7 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arceb \
| arc \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
@ -286,17 +290,16 @@ case $basic_machine in
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
| nios | nios2 | nios2eb | nios2el \
| nios | nios2 \
| ns16k | ns32k \
| open8 \
| or1k | or32 \
| or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@ -366,7 +369,7 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@ -404,13 +407,12 @@ case $basic_machine in
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@ -1352,7 +1354,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@ -1498,6 +1500,9 @@ case $os in
-aros*)
os=-aros
;;
-kaos*)
os=-kaos
;;
-zvmoe)
os=-zvmoe
;;
@ -1589,9 +1594,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
or1k-*)
os=-elf
;;
or32-*)
os=-coff
;;

View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.10.1.
# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.11.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
PACKAGE_VERSION='2.10.1'
PACKAGE_STRING='xkeyboard-config 2.10.1'
PACKAGE_VERSION='2.11'
PACKAGE_STRING='xkeyboard-config 2.11'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xkeyboard-config 2.10.1 to adapt to many kinds of systems.
\`configure' configures xkeyboard-config 2.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1405,7 +1405,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xkeyboard-config 2.10.1:";;
short | recursive ) echo "Configuration of xkeyboard-config 2.11:";;
esac
cat <<\_ACEOF
@ -1434,7 +1434,7 @@ Optional Packages:
(default: auto)
--with-xkb-base=DIR XKB base path [DATADIR/X11/xkb]
--with-xkb-rules-symlink=NAME1(,NAME2)* create symlink(s) to "old style" rules files (xfree86 and/or xorg)
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
@ -1524,7 +1524,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xkeyboard-config configure 2.10.1
xkeyboard-config configure 2.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1771,7 +1771,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by xkeyboard-config $as_me 2.10.1, which was
It was created by xkeyboard-config $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2636,7 +2636,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
VERSION='2.10.1'
VERSION='2.11'
cat >>confdefs.h <<_ACEOF
@ -4990,6 +4990,13 @@ fi
mkdir_p="$MKDIR_P"
case $mkdir_p in
[\\/$]* | ?:[\\/]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
GETTEXT_MACRO_VERSION=0.18
@ -4999,14 +5006,15 @@ fi
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
# contains only /bin. Note that ksh looks also at the FPATH variable,
# so we have to set that as well for the test.
echo "#! /bin/sh" >conf$$.sh
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|| PATH_SEPARATOR=';'
}
fi
rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
@ -5121,14 +5129,15 @@ fi
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
# contains only /bin. Note that ksh looks also at the FPATH variable,
# so we have to set that as well for the test.
echo "#! /bin/sh" >conf$$.sh
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|| PATH_SEPARATOR=';'
}
fi
rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
@ -5198,14 +5207,15 @@ fi
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
# contains only /bin. Note that ksh looks also at the FPATH variable,
# so we have to set that as well for the test.
echo "#! /bin/sh" >conf$$.sh
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|| PATH_SEPARATOR=';'
}
fi
rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
@ -5289,7 +5299,6 @@ fi
prefix="$acl_save_prefix"
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@ -5300,21 +5309,21 @@ fi
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
# contains only /bin. Note that ksh looks also at the FPATH variable,
# so we have to set that as well for the test.
echo "#! /bin/sh" >conf$$.sh
echo "exit 0" >>conf$$.sh
chmod +x conf$$.sh
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
PATH_SEPARATOR=';'
else
PATH_SEPARATOR=:
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|| PATH_SEPARATOR=';'
}
fi
rm -f conf$$.sh
fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
$as_echo_n "checking for ld used by $CC... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@ -5324,11 +5333,11 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
esac
case $ac_prog in
# Accept absolute paths.
[\\/]* | ?:[\\/]*)
[\\/]* | [A-Za-z]:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the pathname of ld
ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
# Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
@ -5353,26 +5362,23 @@ if ${acl_cv_path_LD+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do
IFS="$acl_save_ifs"
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
acl_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
*GNU* | *'with BFD'*)
test "$with_gnu_ld" != no && break
;;
test "$with_gnu_ld" != no && break ;;
*)
test "$with_gnu_ld" != yes && break
;;
test "$with_gnu_ld" != yes && break ;;
esac
fi
done
IFS="$acl_save_ifs"
IFS="$ac_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi
@ -5392,14 +5398,12 @@ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
if ${acl_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
acl_cv_prog_gnu_ld=yes
;;
acl_cv_prog_gnu_ld=yes ;;
*)
acl_cv_prog_gnu_ld=no
;;
acl_cv_prog_gnu_ld=no ;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@ -5850,7 +5854,7 @@ fi
done
if test -z "$already_handled"; then
names_already_handled="$names_already_handled $name"
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
eval value=\"\$HAVE_LIB$uppername\"
if test -n "$value"; then
if test "$value" = yes; then
@ -6379,19 +6383,15 @@ if eval \${$gt_func_gnugettext_libc+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;
int
main ()
{
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
;
return 0;
}
@ -6449,10 +6449,8 @@ else
am_cv_lib_iconv=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
int
main ()
{
@ -6473,10 +6471,8 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS="$LIBS $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
int
main ()
{
@ -6511,12 +6507,10 @@ else
LIBS="$LIBS $LIBICONV"
fi
if test "$cross_compiling" = yes; then :
case "$host_os" in
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
*) am_cv_func_iconv_works="guessing yes" ;;
esac
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -6525,7 +6519,6 @@ else
#include <string.h>
int main ()
{
int result = 0;
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
returns. */
{
@ -6542,8 +6535,7 @@ int main ()
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
result |= 1;
iconv_close (cd_utf8_to_88591);
return 1;
}
}
/* Test against Solaris 10 bug: Failures are not distinguishable from
@ -6562,27 +6554,7 @@ int main ()
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res == 0)
result |= 2;
iconv_close (cd_ascii_to_88591);
}
}
/* Test against AIX 6.1..7.1 bug: Buffer overrun. */
{
iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
if (cd_88591_to_utf8 != (iconv_t)(-1))
{
static const char input[] = "\304";
static char buf[2] = { (char)0xDE, (char)0xAD };
const char *inptr = input;
size_t inbytesleft = 1;
char *outptr = buf;
size_t outbytesleft = 1;
size_t res = iconv (cd_88591_to_utf8,
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
result |= 4;
iconv_close (cd_88591_to_utf8);
return 1;
}
}
#if 0 /* This bug could be worked around by the caller. */
@ -6601,8 +6573,7 @@ int main ()
(char **) &inptr, &inbytesleft,
&outptr, &outbytesleft);
if ((int)res > 0)
result |= 8;
iconv_close (cd_88591_to_utf8);
return 1;
}
}
#endif
@ -6616,8 +6587,8 @@ int main ()
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
/* Try HP-UX names. */
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
result |= 16;
return result;
return 1;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@ -6734,7 +6705,7 @@ fi
done
if test -z "$already_handled"; then
names_already_handled="$names_already_handled $name"
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
eval value=\"\$HAVE_LIB$uppername\"
if test -n "$value"; then
if test "$value" = yes; then
@ -7132,7 +7103,6 @@ else
LIBS="$LIBS $LIBINTL"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
@ -7141,14 +7111,11 @@ extern
"C"
#endif
const char *_nl_expand_alias (const char *);
int
main ()
{
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
;
return 0;
}
@ -7164,7 +7131,6 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS="$LIBS $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
@ -7173,14 +7139,11 @@ extern
"C"
#endif
const char *_nl_expand_alias (const char *);
int
main ()
{
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
;
return 0;
}
@ -7908,7 +7871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xkeyboard-config $as_me 2.10.1, which was
This file was extended by xkeyboard-config $as_me 2.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -7965,7 +7928,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
xkeyboard-config config.status 2.10.1
xkeyboard-config config.status 2.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -8653,7 +8616,7 @@ $as_echo X"$file" |
case "$ac_file" in */Makefile.in)
# Adjust a relative srcdir.
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
# In autoconf-2.13 it is called $ac_given_srcdir.
# In autoconf-2.50 it is called $srcdir.
@ -8669,8 +8632,7 @@ $as_echo X"$file" |
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
gt_tab=`printf '\t'`
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
POMAKEFILEDEPS="POTFILES.in"
# ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
# on $ac_dir but don't depend on user-specified configuration
@ -8681,12 +8643,12 @@ $as_echo X"$file" |
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assignment from automake < 1.5.
# Hide the ALL_LINGUAS assigment from automake < 1.5.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
# Hide the ALL_LINGUAS assignment from automake < 1.5.
# Hide the ALL_LINGUAS assigment from automake < 1.5.
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
# Compute POFILES

View File

@ -1,4 +1,4 @@
AC_INIT(xkeyboard-config, 2.10.1)
AC_INIT(xkeyboard-config, 2.11)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE

View File

@ -80,7 +80,12 @@ host_triplet = @host@
subdir = docs
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = geometry
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ subdir = geometry/digital_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_geom_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ subdir = geometry/sgi_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_geom_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = keycodes
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ subdir = keycodes/digital_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_keycodes_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ subdir = keycodes/sgi_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_keycodes_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ host_triplet = @host@
subdir = man
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,7 @@
! model layout[3] variant[3] = symbols
! model layout[4] variant[4] = symbols
! model = symbols
! model layout = symbols
! layout variant = compat
! layout[1] variant[1] = compat
! layout[2] variant[2] = compat

View File

@ -23,6 +23,7 @@ endif
if USE_COMPAT_RULES
base_parts = base.hdr.part base.lists.part \
base.lists.base.part \
compat/base.lists.part \
HDR base.m_k.part \
HDR base.l1_k.part \
@ -41,6 +42,7 @@ HDR compat/base.ml2v2_s.part \
HDR compat/base.ml3v3_s.part \
HDR compat/base.ml4v4_s.part \
HDR base.m_s.part \
HDR base.ml_s1.part \
HDR compat/base.lv_c.part \
HDR compat/base.l1v1_c.part \
HDR compat/base.l2v2_c.part \
@ -59,6 +61,7 @@ HDR base.o_c.part \
HDR base.o_t.part
evdev_parts = base.hdr.part base.lists.part \
evdev.lists.part \
compat/base.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
@ -77,6 +80,7 @@ HDR compat/base.ml2v2_s.part \
HDR compat/base.ml3v3_s.part \
HDR compat/base.ml4v4_s.part \
HDR evdev.m_s.part \
HDR \
HDR compat/base.lv_c.part \
HDR compat/base.l1v1_c.part \
HDR compat/base.l2v2_c.part \
@ -97,6 +101,7 @@ HDR base.o_t.part
else
base_parts = base.hdr.part base.lists.part \
base.lists.base.part \
HDR base.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
@ -114,6 +119,7 @@ HDR \
HDR \
HDR \
HDR base.m_s.part \
HDR base.ml_s1.part \
HDR \
HDR \
HDR \
@ -132,6 +138,7 @@ HDR base.o_c.part \
HDR base.o_t.part
evdev_parts = base.hdr.part base.lists.part \
evdev.lists.part \
HDR evdev.m_k.part \
HDR base.l1_k.part \
HDR base.l_k.part \
@ -154,6 +161,7 @@ HDR \
HDR \
HDR \
HDR \
HDR \
HDR base.ml_c.part \
HDR base.ml1_c.part \
HDR base.m_t.part \
@ -170,6 +178,8 @@ endif
all_parts_dist = HDR base.hdr.part \
base.lists.part \
base.lists.base.part \
evdev.lists.part \
base.m_k.part \
base.l1_k.part \
base.l_k.part \
@ -183,6 +193,7 @@ base.ml2_s.part \
base.ml3_s.part \
base.ml4_s.part \
base.m_s.part \
base.ml_s1.part \
base.ml_c.part \
base.ml1_c.part \
base.m_t.part \

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = rules
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@ -348,6 +353,7 @@ xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
SUBDIRS = bin compat
@USE_COMPAT_RULES_FALSE@base_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_FALSE@base.lists.base.part \
@USE_COMPAT_RULES_FALSE@HDR base.m_k.part \
@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \
@ -365,6 +371,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR base.m_s.part \
@USE_COMPAT_RULES_FALSE@HDR base.ml_s1.part \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@ -383,6 +390,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@base.lists.base.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \
@ -401,6 +409,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_TRUE@HDR compat/base.ml3v3_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.ml4v4_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.m_s.part \
@USE_COMPAT_RULES_TRUE@HDR base.ml_s1.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.lv_c.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l1v1_c.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_c.part \
@ -419,6 +428,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_TRUE@HDR base.o_t.part
@USE_COMPAT_RULES_FALSE@evdev_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_FALSE@evdev.lists.part \
@USE_COMPAT_RULES_FALSE@HDR evdev.m_k.part \
@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \
@ -441,6 +451,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR \
@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \
@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \
@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \
@ -454,6 +465,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
@USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \
@USE_COMPAT_RULES_TRUE@evdev.lists.part \
@USE_COMPAT_RULES_TRUE@compat/base.lists.part \
@USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \
@USE_COMPAT_RULES_TRUE@HDR base.l1_k.part \
@ -472,6 +484,7 @@ SUBDIRS = bin compat
@USE_COMPAT_RULES_TRUE@HDR compat/base.ml3v3_s.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.ml4v4_s.part \
@USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \
@USE_COMPAT_RULES_TRUE@HDR \
@USE_COMPAT_RULES_TRUE@HDR compat/base.lv_c.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l1v1_c.part \
@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_c.part \
@ -491,6 +504,8 @@ SUBDIRS = bin compat
all_parts_dist = HDR base.hdr.part \
base.lists.part \
base.lists.base.part \
evdev.lists.part \
base.m_k.part \
base.l1_k.part \
base.l_k.part \
@ -504,6 +519,7 @@ base.ml2_s.part \
base.ml3_s.part \
base.ml4_s.part \
base.m_s.part \
base.ml_s1.part \
base.ml_c.part \
base.ml1_c.part \
base.m_t.part \

View File

@ -277,6 +277,12 @@
<_description>English (US, Sun Type 6/7)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>norman</name>
<_description>English (Norman)</_description>
</configItem>
</variant>
</variantList>
</layout>
<layout>

View File

@ -0,0 +1,54 @@
! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
airkey \
apple armada azonaRF2300 \
benqx brother \
btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
cherryblue cherrybluea cherryblueb \
cherrycyboard cherrycmexpert \
chicony chicony0108 chicony0420 chicony9885 \
compalfl90 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
creativedw7000 \
cymotionlinux \
dell dellm65 inspiron dellusbmm \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy2 \
gyration honeywell_euroboard \
hp250x hp5xx hp500fa hpdv5 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
ibm_spacesaver ipaq inspiron intel \
logiaccess logicda logicink \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik \
logitech_base itouch logiultrax \
logitech_g15 \
logidinovo logidinovoedge \
microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
pc105 \
presario propeller \
qtronix \
rapidaccess rapidaccess2 thinkpad60 \
samsung4500 samsung4510 \
silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
unitekkb1925 yahoo
! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
armada presario dellm65 inspiron dellusbmm diamond \
ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \
microsoft4000 microsoft7000 microsoftprooem microsoftmult \
propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \
toshiba_s3000 trust trustda cymotionlinux silvercrest \
emachines benqx unitekkb1925 creativedw7000 compalfl90 \
pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \
dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \
microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \
tm2030USB-102 tm2030USB-106 trust_slimline

View File

@ -33,45 +33,6 @@
! $azerty = be fr
! $qwertz = al cz de hr hu ro si sk
! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
airkey \
apple armada azonaRF2300 \
benqx brother \
btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
cherryblue cherrybluea cherryblueb \
cherrycyboard cherrycmexpert \
chicony chicony0108 chicony0420 chicony9885 \
compalfl90 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
creativedw7000 \
cymotionlinux \
dell dellm65 inspiron dellusbmm \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy2 \
gyration honeywell_euroboard \
hp250x hp5xx hp500fa hpdv5 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
ibm_spacesaver ipaq inspiron intel \
logiaccess logicda logicink \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik \
logitech_base itouch logiultrax \
logitech_g15 \
logidinovo logidinovoedge \
microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
pc105 \
presario propeller \
qtronix \
rapidaccess rapidaccess2 thinkpad60 \
samsung4500 samsung4510 \
silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
@ -95,8 +56,6 @@
vn \
za
! $evdevkbds = ibm_spacesaver
! $thinkpads = thinkpad thinkpad60 thinkpadz60
! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
@ -117,3 +76,4 @@
! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
! $htcdreamlayouts = us it de

View File

@ -0,0 +1 @@
$inetmediakbds jp = +jp(henkan)

View File

@ -8,6 +8,7 @@
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
altwin:swap_alt_win = +altwin(swap_alt_win)
grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)

View File

@ -1762,9 +1762,9 @@
<layout>
<configItem>
<name>bd</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali</_description>
<_description>Bangla</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1773,7 +1773,7 @@
<variant>
<configItem>
<name>probhat</name>
<_description>Bengali (Probhat)</_description>
<_description>Bangla (Probhat)</_description>
</configItem>
</variant>
</variantList>
@ -1789,9 +1789,9 @@
<variant>
<configItem>
<name>ben</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali (India)</_description>
<_description>Bangla (India)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1800,9 +1800,9 @@
<variant>
<configItem>
<name>ben_probhat</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali (India, Probhat)</_description>
<_description>Bangla (India, Probhat)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1811,31 +1811,38 @@
<variant>
<configItem>
<name>ben_baishakhi</name>
<_description>Bengali (India, Baishakhi)</_description>
<_description>Bangla (India, Baishakhi)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bengali (India, Bornona)</_description>
<_description>Bangla (India, Bornona)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bengali (India, Uni Gitanjali)</_description>
<_description>Bangla (India, Uni Gitanjali)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bengali (India, Baishakhi Inscript)</_description>
<_description>Bangla (India, Baishakhi Inscript)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<description>Manipuri (Eeyek)</description>
<languageList><iso639Id>mni</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>guj</name>
@ -2174,19 +2181,19 @@
<variant>
<configItem>
<name>nativo</name>
<_description>Portuguese (Brazil, nativo)</_description>
<_description>Portuguese (Brazil, Nativo)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>nativo-us</name>
<_description>Portuguese (Brazil, nativo for US keyboards)</_description>
<_description>Portuguese (Brazil, Nativo for US keyboards)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>nativo-epo</name>
<_description>Portuguese (Brazil, nativo for Esperanto)</_description>
<_description>Esperanto (Brazil, Nativo)</_description>
<languageList>
<iso639Id>epo</iso639Id>
</languageList>
@ -2528,10 +2535,11 @@
</variant>
<variant>
<configItem>
<name>uig</name>
<name>ug</name>
<_shortDescription>ug</_shortDescription>
<_description>Uyghur</_description>
<languageList>
<iso639Id>uig</iso639Id>
<iso639Id>ug</iso639Id>
</languageList>
</configItem>
</variant>
@ -3963,6 +3971,8 @@
<_description>Norwegian</_description>
<languageList>
<iso639Id>nor</iso639Id>
<iso639Id>nob</iso639Id>
<iso639Id>nno</iso639Id>
</languageList>
</configItem>
<variantList>
@ -4411,7 +4421,7 @@
<variant>
<configItem>
<name>rue</name>
<_description>Pannonian Rusyn (homophonic)</_description>
<_description>Pannonian Rusyn</_description>
<languageList>
<iso639Id>rue</iso639Id>
</languageList>
@ -6030,6 +6040,24 @@
<_description>Right Alt as Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lalt_lctl</name>
<_description>Swap Left Alt key with Left Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lwin_lctl</name>
<_description>Swap Left Win key with Left Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lalt_lctl_lwin</name>
<_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description>
</configItem>
</option>
</group>
<group allowMultipleSelection="true">
<!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
@ -6529,6 +6557,12 @@
<_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grab:debug_actions</name>
<_description>Allow grab and window tree logging</_description>
</configItem>
</option>
</group>
<group allowMultipleSelection="true">
<!-- Special shortcuts for the Euro character -->

View File

@ -80,7 +80,12 @@ host_triplet = @host@
subdir = rules/bin
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = rules/compat
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -277,6 +277,12 @@
<_description>English (US, Sun Type 6/7)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>norman</name>
<_description>English (Norman)</_description>
</configItem>
</variant>
</variantList>
</layout>
<layout>

View File

@ -0,0 +1 @@
! $evdevkbds = ibm_spacesaver

View File

@ -1762,9 +1762,9 @@
<layout>
<configItem>
<name>bd</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali</_description>
<_description>Bangla</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1773,7 +1773,7 @@
<variant>
<configItem>
<name>probhat</name>
<_description>Bengali (Probhat)</_description>
<_description>Bangla (Probhat)</_description>
</configItem>
</variant>
</variantList>
@ -1789,9 +1789,9 @@
<variant>
<configItem>
<name>ben</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali (India)</_description>
<_description>Bangla (India)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1800,9 +1800,9 @@
<variant>
<configItem>
<name>ben_probhat</name>
<!-- Keyboard indicator for Bengali layouts -->
<!-- Keyboard indicator for Bangla layouts -->
<_shortDescription>bn</_shortDescription>
<_description>Bengali (India, Probhat)</_description>
<_description>Bangla (India, Probhat)</_description>
<languageList>
<iso639Id>ben</iso639Id>
</languageList>
@ -1811,31 +1811,38 @@
<variant>
<configItem>
<name>ben_baishakhi</name>
<_description>Bengali (India, Baishakhi)</_description>
<_description>Bangla (India, Baishakhi)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_bornona</name>
<_description>Bengali (India, Bornona)</_description>
<_description>Bangla (India, Bornona)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_gitanjali</name>
<_description>Bengali (India, Uni Gitanjali)</_description>
<_description>Bangla (India, Uni Gitanjali)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>ben_inscript</name>
<_description>Bengali (India, Baishakhi Inscript)</_description>
<_description>Bangla (India, Baishakhi Inscript)</_description>
<languageList><iso639Id>ben</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>eeyek</name>
<description>Manipuri (Eeyek)</description>
<languageList><iso639Id>mni</iso639Id></languageList>
</configItem>
</variant>
<variant>
<configItem>
<name>guj</name>
@ -2174,19 +2181,19 @@
<variant>
<configItem>
<name>nativo</name>
<_description>Portuguese (Brazil, nativo)</_description>
<_description>Portuguese (Brazil, Nativo)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>nativo-us</name>
<_description>Portuguese (Brazil, nativo for US keyboards)</_description>
<_description>Portuguese (Brazil, Nativo for US keyboards)</_description>
</configItem>
</variant>
<variant>
<configItem>
<name>nativo-epo</name>
<_description>Portuguese (Brazil, nativo for Esperanto)</_description>
<_description>Esperanto (Brazil, Nativo)</_description>
<languageList>
<iso639Id>epo</iso639Id>
</languageList>
@ -2528,10 +2535,11 @@
</variant>
<variant>
<configItem>
<name>uig</name>
<name>ug</name>
<_shortDescription>ug</_shortDescription>
<_description>Uyghur</_description>
<languageList>
<iso639Id>uig</iso639Id>
<iso639Id>ug</iso639Id>
</languageList>
</configItem>
</variant>
@ -3963,6 +3971,8 @@
<_description>Norwegian</_description>
<languageList>
<iso639Id>nor</iso639Id>
<iso639Id>nob</iso639Id>
<iso639Id>nno</iso639Id>
</languageList>
</configItem>
<variantList>
@ -4411,7 +4421,7 @@
<variant>
<configItem>
<name>rue</name>
<_description>Pannonian Rusyn (homophonic)</_description>
<_description>Pannonian Rusyn</_description>
<languageList>
<iso639Id>rue</iso639Id>
</languageList>
@ -6030,6 +6040,24 @@
<_description>Right Alt as Right Ctrl</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lalt_lctl</name>
<_description>Swap Left Alt key with Left Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lwin_lctl</name>
<_description>Swap Left Win key with Left Ctrl key</_description>
</configItem>
</option>
<option>
<configItem>
<name>ctrl:swap_lalt_lctl_lwin</name>
<_description>Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt</_description>
</configItem>
</option>
</group>
<group allowMultipleSelection="true">
<!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
@ -6529,6 +6557,12 @@
<_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
</configItem>
</option>
<option>
<configItem>
<name>grab:debug_actions</name>
<_description>Allow grab and window tree logging</_description>
</configItem>
</option>
</group>
<group allowMultipleSelection="true">
<!-- Special shortcuts for the Euro character -->

View File

@ -81,7 +81,12 @@ host_triplet = @host@
subdir = symbols
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -32,8 +32,11 @@ xkb_symbols "ctrl_alt_win" {
symbols[Group1] = [ Control_R, Control_R ] };
key <LWIN> { [ Alt_L, Meta_L ] };
key <RWIN> { [ Alt_R, Meta_R ] };
key <LCTL> { [ Super_L ] };
key <RCTL> { [ Super_R ] };
modifier_map Control { <RALT>, <LALT> };
modifier_map Mod1 { <LWIN>, <RWIN> };
modifier_map Mod4 { <LCTL>, <RCTL> };
};
// Meta is mapped to the Win keys.

View File

@ -5,7 +5,7 @@
// This file supports:
// - The Sharp APL for Unix (SAX) layout
// - The IBM APL2 layout
// - The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout
// - The Manugistics APL*PLUS II layout (version 5.1, 1993)
// - The Dyalog APL layout - with additions for box drawing and commands
// Unicode APL table: http://aplwiki.com/UnicodeAplTable
@ -23,20 +23,20 @@
// shift keys. I have striven, however, to ensure that the use of shift keys
// in these maps is at least self-consistent.
// I'm assuming that this will be used with another keyboard layout (ie. for
// I'm assuming that this will be used with another keyboard layout (i.e. for
// your language), with a special shift key to use these maps.
// 2011-12-22 Geoff Streeter: geoff@dyalog.com
// Added the Dyalog support.
// Corrected (what he thinks) are some errors.
// Resolving the confusion between APL's and Unicode's concept of Left and Right tacks.
// Unsure about some of the inheritance from APL2 into APLPLUS. Patches welcome.
// Complied with freedesktop.org requirement that the keycodes be in sorted order. Which
// leads to the bottom to top (roughly) definitions.
// 2011-12-22 Geoff Streeter <geoff@dyalog.com>,
// added the Dyalog support;
// corrected (what he thinks) are some errors:
// resolving the confusion between APL's and Unicode's concept of Left and Right tacks;
// unsure about some of the inheritance from APL2 into APLPLUS -- patches welcome;
// complied with freedesktop.org requirement that the keycodes be in sorted order,
// which leads to the bottom to top (roughly) definitions.
// default layout seems to have to be the first one. Choosing the basic Dyalog layout is definitely
// better than using the "common" one. Choosing the complete Dyalog layout is not useful to non-Dyalog
// users.
// The default layout still has to be the first one. Choosing the basic Dyalog layout is
// definitely better than using the "common" one. Choosing the complete Dyalog layout is
// not useful to non-Dyalog users.
default partial alphanumeric_keys
xkb_symbols "basic" {
@ -350,13 +350,12 @@ xkb_symbols "aplx" {
};
// APL language support for the Dyalog keyboard.
// Dyalog Ltd sell this keyboard with APL engravings. The current model is
// engraved on a Cherry G80. Base languages for US, UK and DK are availible.
// Dyalog Ltd sells this keyboard with APL engravings. The current model is
// engraved on a Cherry G80. Base languages for US, UK and DK are available.
// Geoff Streeter, Dyalog Ltd. 2007-09-03
// geoff@dyalog.com
// Geoff Streeter, Dyalog Ltd. 2007-09-03 <geoff@dyalog.com>
// extended for APL special actions 2008-09-09
// add variant 2010-11-26
// added a variant 2010-11-26
// The intention is that this keyboard layout overlays a base keyboard that provides
// the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
@ -365,7 +364,6 @@ xkb_symbols "aplx" {
partial hidden alphanumeric_keys
xkb_symbols "dyalog_base" {
// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
// │ │ ⌶ │ ⍫ │ ⍒ │ ⍋ │ ⌽ │ ⍉ │ ⊖ │ ⍟ │ ⍱ │ ⍲ │ ! │ ⌹ ┃ ┃
// │ ⋄ │ ¨ │ ¯ │ < │ ≤ │ = │ ≥ │ > │ ≠ │ │ ∧ │ × │ ÷ ┃ ┃
@ -383,7 +381,6 @@ xkb_symbols "dyalog_base" {
// ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
key <AB01> { [ U2282 ] }; // subset of
key <AB02> { [ U2283 ] }; // superset of
key <AB03> { [ U2229 ] }; // intersection
@ -516,7 +513,7 @@ xkb_symbols "dyalog_codes" {
// └────┴────┴────┴────┴....┴────┴────┴────┴────┘
//
// whilst these locations are defined. Dyalog's "aplkeys/xterm" file copes with
// normal function keys from the base keyboard rather than this overlay
// normal function keys from the base keyboard rather than this overlay.
// ┌─────┐ ┌───┐
// │ │ │ZM │
@ -540,7 +537,6 @@ xkb_symbols "dyalog_codes" {
// ┃ ┃ ┃ ┃ TO ┃ ┃ ┃ ┃
// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
key <BKSP> { [ Uf850, Uf855 ] }; // BP CB
key <ESC> { [ Uf800 ] }; // QT
key <FK11> { [ Uf821, Uf821 ] }; // ZM, ZM put this on both, the unshifted one sometimes gets lost
@ -561,7 +557,6 @@ xkb_symbols "dyalog_codes" {
key <RGHT> { [ Uf824, Uf854 ] }; // NX, RM
key <UP> { [ Uf820 ] }; // BK
// ┌───┬───┬───┐
// │PT │LL │UL │
// │CP │LS │US │
@ -589,7 +584,6 @@ xkb_symbols "dyalog_codes" {
// │ │ │ │
// └───────┴───┴───┘
key <KPAD> { [ Uf859 ] }; // TL
key <KPDV> { [ Uf819 ] }; // RD
key <KPMU> { [ Uf81a ] }; // TG
@ -602,4 +596,3 @@ xkb_symbols "dyalog" {
include "apl(dyalog_codes)"
name[Group1] = "APL keyboard symbols (Dyalog)";
};

View File

@ -1,15 +1,12 @@
// based on a keyboard map from an 'xkb/symbols/ar' file
default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Arabic";
// NOTES:
//
// there is also combined shadda diacritis in AltGr position of simple
// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
// should a third state be added to Group2 ?
//
// There is also a combined shadda diacritic in the AltGr position of the
// simple diacritics fatha, fathatan, damma, dammatan, kasra and kasratan. (??)
// Should a third state be added to Group2?
key <TLDE> { [ Arabic_thal, Arabic_shadda ] };
key <AE01> { [ 1, exclam ] };
@ -74,14 +71,14 @@ xkb_symbols "azerty" {
include "ara(basic)"
name[Group1]= "Arabic (azerty)";
// the north african arabic keyboard differs from the middle east one
// by the numeric row; it follows French keyboard style
// The North African Arabic keyboard differs from the Middle East one
// by the numeric row; it follows French keyboard style.
//
// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *
// should they go elsewhere? replace " ' that are now in double ?
// also, dead_circumflex and dead_diaeresis from French keyboard
// PROBLEM: some characters are inaccessible: ! @ # $ % ^ *
// Should they go elsewhere? Replacing " ' that are now doubled?
// Also, dead_circumflex and dead_diaeresis from French keyboard
// as well as ugrave are missing, which questions the utility of the
// other accentuated latin letters. Maybe this is useful only with
// other accentuated Latin letters. Maybe this is useful only with
// a French keyboard in Group1? Then, shouldn't Group1 be filled?
key <AE01> { [ ampersand, 1 ] };
@ -101,21 +98,21 @@ partial alphanumeric_keys
xkb_symbols "digits_KP" {
name[Group1]= "Arabic (digits_KP)";
// use arabic script digits on KP
// Use Arabic-script digits on the keypad.
key <KP7> { [ KP_Home, 0x1000667 ] }; //
key <KP8> { [ KP_Up, 0x1000668 ] }; //
key <KP9> { [ KP_Prior, 0x1000669 ] }; //
key <KP7> { [ KP_Home, 0x1000667 ] };
key <KP8> { [ KP_Up, 0x1000668 ] };
key <KP9> { [ KP_Prior, 0x1000669 ] };
key <KP4> { [ KP_Left, 0x1000664 ] }; //
key <KP5> { [ KP_Begin, 0x1000665 ] }; //
key <KP6> { [ KP_Right, 0x1000666 ] }; //
key <KP4> { [ KP_Left, 0x1000664 ] };
key <KP5> { [ KP_Begin, 0x1000665 ] };
key <KP6> { [ KP_Right, 0x1000666 ] };
key <KP1> { [ KP_End, 0x1000661 ] }; //
key <KP2> { [ KP_Down, 0x1000662 ] }; //
key <KP3> { [ KP_Next, 0x1000663 ] }; //
key <KP1> { [ KP_End, 0x1000661 ] };
key <KP2> { [ KP_Down, 0x1000662 ] };
key <KP3> { [ KP_Next, 0x1000663 ] };
key <KP0> { [ KP_Insert, 0x1000660 ] }; //
key <KP0> { [ KP_Insert, 0x1000660 ] };
};
partial alphanumeric_keys
@ -123,7 +120,7 @@ xkb_symbols "digits" {
include "ara(basic)"
name[Group1]= "Arabic (digits)";
// use arabic script digits
// Use Arabic-script digits on the numberic row.
key <AE01> { [ 0x1000661, exclam ] };
key <AE02> { [ 0x1000662, at ] };
@ -166,8 +163,6 @@ xkb_symbols "azerty_digits" {
// http://www.qamus.org/transliteration.htm
// Martin Vidner
// symbol names: see /usr/X11R6/include/X11/keysymdef.h (XFree86-devel.rpm)
partial alphanumeric_keys
xkb_symbols "buckwalter" {
name[Group1]= "Arabic (Buckwalter)";
@ -220,8 +215,6 @@ xkb_symbols "buckwalter" {
key <BKSL> { [ VoidSymbol, Arabic_maddaonalef ] };
// key <LSGT> { [ bar, brokenbar ] };
key <AB01> { [ Arabic_zain, Arabic_zah ] };
key <AB02> { [ Arabic_khah, VoidSymbol ] };
key <AB03> { [ VoidSymbol, VoidSymbol ] };

View File

@ -16,7 +16,7 @@
default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Bengali";
name[Group1]= "Bangla";
key <ESC> { [ Escape ] };
// numbers
@ -92,5 +92,5 @@ xkb_symbols "basic" {
xkb_symbols "probhat" {
include "in(ben_probhat)"
name[Group1]= "Bengali (Probhat)";
name[Group1]= "Bangla (Probhat)";
};

View File

@ -5,7 +5,7 @@
// both in source and binary form provided that the above copyright
// notice and these terms are retained. The name of the author may not
// be used to endorse or promote products derived from this software
// without prior permission. THIS SOFTWARE IS PROVIDES "AS IS" AND
// without prior permission. THIS SOFTWARE IS PROVIDED "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED. IN NO EVENT
// SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT
// OF THE USE OF THIS SOFTWARE.
@ -18,14 +18,14 @@
// "bds" - the BDS keyboard layout compliant with the proposed
// Bulgarian state standard BDS 5237:2006
// "phonetic" - Bulgarian phonetic layout with traditional position of
// the letters.
// "phonetic" - the phonetic Bulgarian layout with the traditional position
// of the letters
// "bas_phonetic" - the phonetic keyboard layout compliant with the
// proposed Bulgarian state standard BDS 5237:2006
// "latin" - an extended variant of the QWERTY layout with symbols
// Bulgarian users will type while the keyboard is in Latin mode.
// "latin" - an extended variant of the QWERTY layout with symbols that
// Bulgarian users will type while the keyboard is in Latin mode
// The reasons behind the layout of the symbols in levels 3 and 4 are
// explained in http://arxiv.org/abs/0905.0484 (in Bulgarian).
@ -49,93 +49,67 @@ xkb_symbols "bds" {
name[Group1]= "Bulgarian";
key <TLDE> { [ parenleft, parenright,
bracketleft, bracketright ] };
key <TLDE> {[ parenleft, parenright, bracketleft, bracketright ]};
key <AE01> {[ 1, exclam ]};
key <AE02> {[ 2, question ]};
key <AE03> { [ 3, plus,
dagger, dagger ] };
key <AE03> {[ 3, plus, dagger, dagger ]};
key <AE04> {[ 4, quotedbl ]};
key <AE05> { [ 5, percent,
U2329, U232A ] };
key <AE06> { [ 6, equal,
emdash, emdash ] };
key <AE07> { [ 7, colon,
ellipsis, ellipsis ] };
key <AE08> { [ 8, slash,
U0300, U0301 ] };
key <AE05> {[ 5, percent, U2329, U232A ]};
key <AE06> {[ 6, equal, emdash, emdash ]};
key <AE07> {[ 7, colon, ellipsis, ellipsis ]};
key <AE08> {[ 8, slash, U0300, U0301 ]};
key <AE09> {[ 9, endash ]};
key <AE10> {[ 0, numerosign ]};
key <AE11> { [ minus, dollar,
U2011, EuroSign ] };
key <AE11> {[ minus, dollar, U2011, EuroSign ]};
key <AE12> {[ period, EuroSign ]};
key <AD01> { [ comma, Cyrillic_yeru,
rightsinglequotemark, leftsinglequotemark ] };
key <AD01> {[ comma, Cyrillic_yeru, rightsinglequotemark, leftsinglequotemark ]};
key <AD02> {[ Cyrillic_u, Cyrillic_U ]};
key <AD03> { [ Cyrillic_ie, Cyrillic_IE,
Cyrillic_e, Cyrillic_E ] };
key <AD04> { [ Cyrillic_i, Cyrillic_I,
U045D, U040D ] };
key <AD03> {[ Cyrillic_ie, Cyrillic_IE, Cyrillic_e, Cyrillic_E ]};
key <AD04> {[ Cyrillic_i, Cyrillic_I, U045D, U040D ]};
key <AD05> {[ Cyrillic_sha, Cyrillic_SHA ]};
key <AD06> {[ Cyrillic_shcha, Cyrillic_SHCHA ]};
key <AD07> { [ Cyrillic_ka, Cyrillic_KA,
copyright, copyright ] };
key <AD08> { [ Cyrillic_es, Cyrillic_ES,
copyright, copyright ] };
key <AD07> {[ Cyrillic_ka, Cyrillic_KA, copyright, copyright ]};
key <AD08> {[ Cyrillic_es, Cyrillic_ES, copyright, copyright ]};
key <AD09> {[ Cyrillic_de, Cyrillic_DE ]};
key <AD10> {[ Cyrillic_ze, Cyrillic_ZE ]};
key <AD11> {[ Cyrillic_tse, Cyrillic_TSE ]};
key <AD12> {[ semicolon, section ]};
key <AC01> { [ Cyrillic_softsign, U045D,
Cyrillic_yeru, Cyrillic_YERU ] };
key <AC02> { [ Cyrillic_ya, Cyrillic_YA,
U0463, U0462 ] };
key <AC01> {[ Cyrillic_softsign, U045D, Cyrillic_yeru, Cyrillic_YERU ]};
key <AC02> {[ Cyrillic_ya, Cyrillic_YA, U0463, U0462 ]};
key <AC03> {[ Cyrillic_a, Cyrillic_A ]};
key <AC04> {[ Cyrillic_o, Cyrillic_O ]};
key <AC05> {[ Cyrillic_zhe, Cyrillic_ZHE ]};
key <AC06> {[ Cyrillic_ghe, Cyrillic_GHE ]};
key <AC07> { [ Cyrillic_te, Cyrillic_TE,
trademark, trademark ] };
key <AC07> {[ Cyrillic_te, Cyrillic_TE, trademark, trademark ]};
key <AC08> {[ Cyrillic_en, Cyrillic_EN ]};
key <AC09> {[ Cyrillic_ve, Cyrillic_VE ]};
key <AC10> {[ Cyrillic_em, Cyrillic_EM ]};
key <AC11> {[ Cyrillic_che, Cyrillic_CHE ]};
key <BKSL> { [ doublelowquotemark, leftdoublequotemark,
guillemotleft, guillemotright ] };
key <BKSL> {[ doublelowquotemark, leftdoublequotemark, guillemotleft, guillemotright ]};
key <LSGT> {[ U045D, U040D ]};
key <AB01> {[ Cyrillic_yu, Cyrillic_YU ]};
key <AB02> { [ Cyrillic_shorti, Cyrillic_SHORTI,
U046D, U046C ] };
key <AB03> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
U046B, U046A ] };
key <AB02> {[ Cyrillic_shorti, Cyrillic_SHORTI, U046D, U046C ]};
key <AB03> {[ Cyrillic_hardsign, Cyrillic_HARDSIGN, U046B, U046A ]};
key <AB04> {[ Cyrillic_e, Cyrillic_E ]};
key <AB05> {[ Cyrillic_ef, Cyrillic_EF ]};
key <AB06> {[ Cyrillic_ha, Cyrillic_HA ]};
key <AB07> {[ Cyrillic_pe, Cyrillic_PE ]};
key <AB08> { [ Cyrillic_er, Cyrillic_ER,
registered, registered ] };
key <AB08> {[ Cyrillic_er, Cyrillic_ER, registered, registered ]};
key <AB09> {[ Cyrillic_el, Cyrillic_EL ]};
key <AB10> {[ Cyrillic_be, Cyrillic_BE ]};
key <SPCE> {[ space, space, nobreakspace, nobreakspace ]};
key <SPCE> { [ space, space,
nobreakspace, nobreakspace ] };
key <KPDL> { type[Group1] = "KEYPAD",
[ KP_Delete, KP_Separator ] };
key <KPDL> { type[Group1] = "KEYPAD", [ KP_Delete, KP_Separator ]};
};
// This is improved variant of the traditional Bulgarian phonetic
// This is an improved variant of the traditional Bulgarian phonetic
// keyboard. Some unnecessary symbols in levels 1 and 2 are replaced
// by more useful (the same way as in "bas_phonetic") and additional
// symbols in levels 3 and 4 are added.
// by more useful ones (similar as in "bas_phonetic") and additional
// symbols are added in levels 3 and 4.
partial alphanumeric_keys
xkb_symbols "phonetic" {
name[Group1]= "Bulgarian (traditional phonetic)";
@ -144,89 +118,61 @@ xkb_symbols "phonetic" {
key <AE01> {[ 1, exclam ]};
key <AE02> {[ 2, at ]};
key <AE03> {[ 3, numerosign ]};
key <AE04> { [ 4, dollar,
EuroSign, EuroSign ] };
key <AE04> {[ 4, dollar, EuroSign, EuroSign ]};
key <AE05> {[ 5, percent ]};
key <AE06> {[ 6, EuroSign ]};
key <AE07> {[ 7, section ]};
key <AE08> {[ 8, asterisk ]};
key <AE09> { [ 9, parenleft,
bracketleft, U2329 ] };
key <AE10> { [ 0, parenright,
bracketright, U232A ] };
key <AE11> { [ minus, endash,
U2011, U2011 ] };
key <AE12> { [ equal, plus,
emdash, dagger ] };
key <AE09> {[ 9, parenleft, bracketleft, U2329 ]};
key <AE10> {[ 0, parenright, bracketright, U232A ]};
key <AE11> {[ minus, endash, U2011, U2011 ]};
key <AE12> {[ equal, plus, emdash, dagger ]};
key <AD01> { [ Cyrillic_ya, Cyrillic_YA,
U0463, U0462 ] };
key <AD01> {[ Cyrillic_ya, Cyrillic_YA, U0463, U0462 ]};
key <AD02> {[ Cyrillic_ve, Cyrillic_VE ]};
key <AD03> { [ Cyrillic_ie, Cyrillic_IE,
Cyrillic_e, Cyrillic_E ] };
key <AD04> { [ Cyrillic_er, Cyrillic_ER,
registered, registered ] };
key <AD05> { [ Cyrillic_te, Cyrillic_TE,
trademark, trademark ] };
key <AD06> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN,
U046B, U046A ] };
key <AD03> {[ Cyrillic_ie, Cyrillic_IE, Cyrillic_e, Cyrillic_E ]};
key <AD04> {[ Cyrillic_er, Cyrillic_ER, registered, registered ]};
key <AD05> {[ Cyrillic_te, Cyrillic_TE, trademark, trademark ]};
key <AD06> {[ Cyrillic_hardsign, Cyrillic_HARDSIGN, U046B, U046A ]};
key <AD07> {[ Cyrillic_u, Cyrillic_U ]};
key <AD08> { [ Cyrillic_i, Cyrillic_I,
U045D, U040D ] };
key <AD08> {[ Cyrillic_i, Cyrillic_I, U045D, U040D ]};
key <AD09> {[ Cyrillic_o, Cyrillic_O ]};
key <AD10> {[ Cyrillic_pe, Cyrillic_PE ]};
key <AD11> {[ Cyrillic_sha, Cyrillic_SHA ]};
key <AD12> {[ Cyrillic_shcha, Cyrillic_SHCHA ]};
key <AC01> {[ Cyrillic_a, Cyrillic_A ]};
key <AC02> { [ Cyrillic_es, Cyrillic_ES,
copyright, copyright ] };
key <AC02> {[ Cyrillic_es, Cyrillic_ES, copyright, copyright ]};
key <AC03> {[ Cyrillic_de, Cyrillic_DE ]};
key <AC04> {[ Cyrillic_ef, Cyrillic_EF ]};
key <AC05> {[ Cyrillic_ghe, Cyrillic_GHE ]};
key <AC06> {[ Cyrillic_ha, Cyrillic_HA ]};
key <AC07> { [ Cyrillic_shorti, Cyrillic_SHORTI,
U046D, U046C ] };
key <AC07> {[ Cyrillic_shorti, Cyrillic_SHORTI, U046D, U046C ]};
key <AC08> {[ Cyrillic_ka, Cyrillic_KA ]};
key <AC09> {[ Cyrillic_el, Cyrillic_EL ]};
key <AC10> { [ semicolon, colon,
ellipsis, ellipsis ] };
key <AC11> { [ apostrophe, quotedbl,
rightsinglequotemark, leftsinglequotemark ] };
key <AC10> {[ semicolon, colon, ellipsis, ellipsis ]};
key <AC11> {[ apostrophe, quotedbl, rightsinglequotemark, leftsinglequotemark ]};
key <BKSL> {[ Cyrillic_yu, Cyrillic_YU ]};
key <LSGT> {[ U045D, U040D ]};
key <AB01> {[ Cyrillic_ze, Cyrillic_ZE ]};
key <AB02> { [ Cyrillic_softsign, U045D,
Cyrillic_yeru, Cyrillic_YERU ] };
key <AB03> { [ Cyrillic_tse, Cyrillic_TSE,
copyright, copyright ] };
key <AB02> {[ Cyrillic_softsign, U045D, Cyrillic_yeru, Cyrillic_YERU ]};
key <AB03> {[ Cyrillic_tse, Cyrillic_TSE, copyright, copyright ]};
key <AB04> {[ Cyrillic_zhe, Cyrillic_ZHE ]};
key <AB05> {[ Cyrillic_be, Cyrillic_BE ]};
key <AB06> {[ Cyrillic_en, Cyrillic_EN ]};
key <AB07> {[ Cyrillic_em, Cyrillic_EM ]};
key <AB08> { [ comma, doublelowquotemark,
guillemotleft, guillemotleft ] };
key <AB09> { [ period, leftdoublequotemark,
guillemotright, guillemotright ] };
key <AB10> { [ slash, question,
U0300, U0301 ] };
key <AB08> {[ comma, doublelowquotemark, guillemotleft, guillemotleft ]};
key <AB09> {[ period, leftdoublequotemark, guillemotright, guillemotright ]};
key <AB10> {[ slash, question, U0300, U0301 ]};
key <SPCE> {[ space, space, nobreakspace, nobreakspace ]};
key <SPCE> { [ space, space,
nobreakspace, nobreakspace ] };
key <KPDL> { type[Group1] = "KEYPAD",
[ KP_Delete, KP_Separator ] };
key <KPDL> { type[Group1] = "KEYPAD", [ KP_Delete, KP_Separator ]};
};
// This is the Bulgarian phonetic keyboard acording to the proposed
// state standard BDS 5237:2006 with additional symbols in
// levels 3 and 4.
// This is the Bulgarian phonetic keyboard according to the proposed
// state standard BDS 5237:2006 with additional symbols in levels 3 and 4.
partial alphanumeric_keys
xkb_symbols "bas_phonetic" {
include "bg(phonetic)"
@ -235,127 +181,71 @@ xkb_symbols "bas_phonetic" {
key <TLDE> {[ Cyrillic_yu, Cyrillic_YU ]};
key <AD01> {[ Cyrillic_che, Cyrillic_CHE ]};
key <AD02> {[ Cyrillic_sha, Cyrillic_SHA ]};
key <AD11> { [ Cyrillic_ya, Cyrillic_YA,
U0463, U0462 ] };
key <BKSL> { [ Cyrillic_softsign, U045D,
Cyrillic_yeru, Cyrillic_YERU ] };
key <AD11> {[ Cyrillic_ya, Cyrillic_YA, U0463, U0462 ]};
key <BKSL> {[ Cyrillic_softsign, U045D, Cyrillic_yeru, Cyrillic_YERU ]};
key <AB02> {[ Cyrillic_zhe, Cyrillic_ZHE ]};
key <AB04> {[ Cyrillic_ve, Cyrillic_VE ]};
};
// This is extended variant of the standard Latin QWERTY layout with
// This is an extended variant of the standard Latin QWERTY layout with
// additional symbols in levels 3 and 4.
partial hidden alphanumeric_keys
xkb_symbols "latin" {
key <TLDE> { [ grave, asciitilde,
U2248, U2245 ] };
key <AE01> { [ 1, exclam,
notsign, notsign ] };
key <AE02> { [ 2, at,
twosuperior, enfilledcircbullet ] };
key <AE03> { [ 3, numbersign,
threesuperior, notequal ] };
key <AE04> { [ 4, dollar,
EuroSign, sterling ] };
key <AE05> { [ 5, percent,
U2030, U2030 ] };
key <AE06> { [ 6, asciicircum,
logicaland, logicalor ] };
key <AE07> { [ 7, ampersand,
section, section ] };
key <AE08> { [ 8, asterisk,
infinity, multiply ] };
key <AE09> { [ 9, parenleft,
U2202, nabla ] };
key <AE10> { [ 0, parenright,
U2300, U2300 ] };
key <AE11> { [ minus, underscore,
U2011, endash ] };
key <AE12> { [ equal, plus,
emdash, plusminus ] };
key <TLDE> {[ grave, asciitilde, U2248, U2245 ]};
key <AE01> {[ 1, exclam, notsign, notsign ]};
key <AE02> {[ 2, at, twosuperior, enfilledcircbullet ]};
key <AE03> {[ 3, numbersign, threesuperior, notequal ]};
key <AE04> {[ 4, dollar, EuroSign, sterling ]};
key <AE05> {[ 5, percent, U2030, U2030 ]};
key <AE06> {[ 6, asciicircum, logicaland, logicalor ]};
key <AE07> {[ 7, ampersand, section, section ]};
key <AE08> {[ 8, asterisk, infinity, multiply ]};
key <AE09> {[ 9, parenleft, U2202, nabla ]};
key <AE10> {[ 0, parenright, U2300, U2300 ]};
key <AE11> {[ minus, underscore, U2011, endash ]};
key <AE12> {[ equal, plus, emdash, plusminus ]};
key <AD01> {[ q, Q, Greek_THETA, Greek_theta ]};
key <AD02> {[ w, W, Greek_OMEGA, Greek_omega ]};
key <AD03> {[ e, E, U2203, Greek_epsilon ]};
key <AD04> {[ r, R, registered, Greek_rho ]};
key <AD05> {[ t, T, trademark, Greek_tau ]};
key <AD06> {[ y, Y, yen, Greek_upsilon ]};
key <AD07> {[ u, U, intersection, union ]};
key <AD08> {[ i, I, integral, Greek_iota ]};
key <AD09> {[ o, O, degree, U222E ]};
key <AD10> {[ p, P, Greek_PI, Greek_pi ]};
key <AD11> {[ bracketleft, braceleft, U2286, includedin ]};
key <AD12> {[ bracketright, braceright, U2208, U2209 ]};
key <AD01> { [ q, Q,
Greek_THETA, Greek_theta ] };
key <AD02> { [ w, W,
Greek_OMEGA, Greek_omega ] };
key <AD03> { [ e, E,
U2203, Greek_epsilon ] };
key <AD04> { [ r, R,
registered, Greek_rho ] };
key <AD05> { [ t, T,
trademark, Greek_tau ] };
key <AD06> { [ y, Y,
yen, Greek_upsilon ] };
key <AD07> { [ u, U,
intersection, union ] };
key <AD08> { [ i, I,
integral, Greek_iota ] };
key <AD09> { [ o, O,
degree, U222E ] };
key <AD10> { [ p, P,
Greek_PI, Greek_pi ] };
key <AD11> { [ bracketleft, braceleft,
U2286, includedin ] };
key <AD12> { [ bracketright, braceright,
U2208, U2209 ] };
key <AC01> { [ a, A,
U2200, Greek_alpha ] };
key <AC02> { [ s, S,
Greek_SIGMA, Greek_sigma ] };
key <AC03> { [ d, D,
Greek_DELTA, Greek_delta ] };
key <AC04> { [ f, F,
Greek_PHI, Greek_phi ] };
key <AC05> { [ g, G,
Greek_GAMMA, Greek_gamma ] };
key <AC06> { [ h, H,
U2225, Greek_eta ] };
key <AC01> {[ a, A, U2200, Greek_alpha ]};
key <AC02> {[ s, S, Greek_SIGMA, Greek_sigma ]};
key <AC03> {[ d, D, Greek_DELTA, Greek_delta ]};
key <AC04> {[ f, F, Greek_PHI, Greek_phi ]};
key <AC05> {[ g, G, Greek_GAMMA, Greek_gamma ]};
key <AC06> {[ h, H, U2225, Greek_eta ]};
key <AC07> {[ j, J ]};
key <AC08> { [ k, K,
U03F0, Greek_kappa ] };
key <AC09> { [ l, L,
Greek_LAMBDA, Greek_lambda ] };
key <AC10> { [ semicolon, colon,
division, division ] };
key <AC11> { [ apostrophe, quotedbl,
leftdoublequotemark, rightdoublequotemark ] };
key <BKSL> { [ backslash, bar,
identical, downtack ] };
key <AC08> {[ k, K, U03F0, Greek_kappa ]};
key <AC09> {[ l, L, Greek_LAMBDA, Greek_lambda ]};
key <AC10> {[ semicolon, colon, division, division ]};
key <AC11> {[ apostrophe, quotedbl, leftdoublequotemark, rightdoublequotemark]};
key <BKSL> {[ backslash, bar, identical, downtack ]};
key <LSGT> {[ less, greater, U2266, U2267 ]};
key <AB01> {[ z, Z, U2220, Greek_zeta ]};
key <AB02> {[ x, X, Greek_XI, Greek_xi ]};
key <AB03> {[ c, C, copyright, Greek_chi ]};
key <AB04> {[ v, V, Greek_PSI, Greek_psi ]};
key <AB05> {[ b, B, U03D1, Greek_beta ]};
key <AB06> {[ n, N, U207F, Greek_nu ]};
key <AB07> {[ m, M, Greek_mu, Greek_mu ]};
key <AB08> {[ comma, less, U2266, U21D4 ]};
key <AB09> {[ period, greater, U2267, U21D2 ]};
key <AB10> {[ slash, question, leftsinglequotemark, rightsinglequotemark]};
key <LSGT> { [ less, greater,
U2266, U2267 ] };
key <AB01> { [ z, Z,
U2220, Greek_zeta ] };
key <AB02> { [ x, X,
Greek_XI, Greek_xi ] };
key <AB03> { [ c, C,
copyright, Greek_chi ] };
key <AB04> { [ v, V,
Greek_PSI, Greek_psi ] };
key <AB05> { [ b, B,
U03D1, Greek_beta ] };
key <AB06> { [ n, N,
U207F, Greek_nu ] };
key <AB07> { [ m, M,
Greek_mu, Greek_mu ] };
key <AB08> { [ comma, less,
U2266, U21D4 ] };
key <AB09> { [ period, greater,
U2267, U21D2 ] };
key <AB10> { [ slash, question,
leftsinglequotemark, rightsinglequotemark ] };
key <SPCE> {[ space, space, nobreakspace, nobreakspace ]};
key <SPCE> { [ space, space,
nobreakspace, nobreakspace ] };
key <KPDL> { type[Group1] = "KEYPAD",
[ KP_Delete, KP_Decimal ] };
key <KPDL> { type[Group1] = "KEYPAD", [ KP_Delete, KP_Decimal ]};
};

View File

@ -1,17 +1,15 @@
//
// based on
// "a very simple Brasilian ABNT2 keyboard
// by Ricardo Y. Igarashi (iga@that.com.br)
// Adds suport for dead-keys in I18N applications
// by Conectiva (http://www.conectiva.com.br)"
//
default
xkb_symbols "abnt2" {
// Based on a very simple Brazilian ABNT2 keyboard,
// by Ricardo Y. Igarashi (iga@that.com.br).
// With added support for dead keys in I18N applications,
// by Conectiva (http://www.conectiva.com.br).
include "latin"
name[Group1]="Portuguese (Brazil)";
key <TLDE> { [ apostrophe, quotedbl, notsign, notsign ] };
key <AE02> { [ 2, at, twosuperior, onehalf ] };
key <AE03> { [ 3, numbersign, threesuperior, threequarters ] };
key <AE04> { [ 4, dollar, sterling, onequarter ] };
@ -25,20 +23,17 @@ xkb_symbols "abnt2" {
key <AD04> { [ r, R, registered, registered ] };
key <AD11> { [ dead_acute, dead_grave, acute, grave ] };
key <AD12> { [ bracketleft, braceleft, ordfeminine, dead_macron ] };
key <BKSL> { [ bracketright, braceright, masculine, masculine ] };
key <AC10> { [ ccedilla, Ccedilla, dead_acute,dead_doubleacute ] };
key <AC11> { [ dead_tilde,dead_circumflex, asciitilde, asciicircum ] };
key <BKSL> { [bracketright, braceright, masculine, masculine ] };
key <TLDE> { [apostrophe, quotedbl, notsign, notsign ] };
key <LSGT> { [ backslash, bar, masculine, dead_breve ] };
key <AB03> { [ c, C, copyright, copyright ] };
key <AB07> { [ m, M, mu, mu ] };
key <AB10> { [ semicolon, colon, dead_belowdot, dead_abovedot ] };
// ABNT-2 keyboard has this special key
// The ABNT-2 keyboard has this special key:
key <AB11> { [ slash, question, degree, questiondown ] };
modifier_map Mod3 { Scroll_Lock };
@ -51,7 +46,7 @@ xkb_symbols "abnt2" {
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "br(abnt2)" // for consistent naming
include "br(abnt2)"
name[Group1]="Portuguese (Brazil, eliminate dead keys)";
key <AE06> { [ 6, diaeresis, notsign, notsign ] };
@ -62,13 +57,13 @@ xkb_symbols "nodeadkeys" {
};
// ABNT2 Keyboard to IBM/Lenovo Thinkpads
// by Piter PUNK <piterpk@terra.com.br>
// The ABNT2 keyboard on IBM/Lenovo Thinkpads,
// by Piter PUNK <piterpk@terra.com.br>.
//
partial alphanumeric_keys
xkb_symbols "thinkpad" {
include "br(abnt2)" // for consistent naming
include "br(abnt2)"
name[Group1]="Portuguese (Brazil)";
key <RCTL> { [ slash, question, degree, questiondown ] };
@ -82,7 +77,6 @@ xkb_symbols "olpc" {
name[Group1]="Portuguese (Brazil)";
key <TLDE> { [ apostrophe, quotedbl ] };
key <AE01> { [ 1, exclam, onesuperior ] };
key <AE02> { [ 2, at, twosuperior ] };
key <AE03> { [ 3, numbersign, threesuperior ] };
@ -94,10 +88,10 @@ xkb_symbols "olpc" {
key <AD03> { [ e, E, EuroSign ] };
key <AD11> { [ dead_acute, dead_grave, acute, grave ] };
key <AD12> { [ bracketleft, braceleft, 0x10000AA ] };
key <BKSL> { [ bracketright, braceright, 0x10000BA ] };
key <AC10> { [ ccedilla, Ccedilla ] };
key <AC11> { [ dead_tilde, dead_circumflex ] };
key <BKSL> { [ bracketright, braceright, 0x10000BA ] };
key <AB01> { [ z, Z, bar ] };
key <AB03> { [ c, C, 0x10020A2 ] };
@ -111,7 +105,7 @@ xkb_symbols "olpc" {
//
// Brazilian Dvorak keyboard 2005-04-18
// Brazilian Dvorak layout 2005-04-18
// "Teclado Simplificado Brasileiro" ou "Dvorak Brasileiro"
//
// Heitor Moraes heitor.moraes@gmail.com
@ -189,21 +183,19 @@ xkb_symbols "dvorak" {
// Configures the use of the AltGr key
include "level3(ralt_switch)"
};
//
// Teclado Nativo Brasileiro 2005-07-19
// Brazilian Nativo Keyboard
// This is a Dvorak-based layout, designed for the Portuguese language
// Brazilian Nativo layout.
// This is a Dvorak-based layout, designed for the Portuguese language.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo" {
name[Group1]="Portuguese (Brazil, nativo)";
name[Group1]="Portuguese (Brazil, Nativo)";
// Numeric row
key <TLDE> { [ equal, plus, section, plusminus ] };
@ -269,51 +261,45 @@ xkb_symbols "nativo" {
// Configures the use of the AltGr key
include "level3(ralt_switch)"
};
//
// Teclado Nativo Brasileiro para o teclado estadunidense 2005-07-19
// Brazilian Nativo Keyboard for USA keyboards
// Brazilian Nativo layout for US keyboards.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo-us" {
include "br(nativo)"
name[Group1]="Portuguese (Brazil, nativo for US keyboards)";
name[Group1]="Portuguese (Brazil, Nativo for US keyboards)";
// Lower row
key <AB01> { [ y, Y, ccedilla, Ccedilla ] };
key <AB02> { [ semicolon, colon, backslash, bar ] };
};
//
// Teclado Nativo Brasileiro para digitacao em Esperanto 2005-07-19
// Brazilian Nativo Keyboard for typing Esperanto
// Brazilian Nativo layout for typing Esperanto.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo-epo" {
include "br(nativo)"
name[Group1]="Portuguese (Brazil, nativo for Esperanto)";
name[Group1]="Esperanto (Brazil, Nativo)";
// Upper row Esperanto
key <AD04> { [ h, H, hcircumflex, Hcircumflex ] };
key <AD05> { [ ccircumflex, Ccircumflex, x, X ] };
key <AD06> { [ ubreve, Ubreve, w, W ] };
// Lower row Esperanto
key <AB01> { [ jcircumflex, Jcircumflex, y, Y ] };
key <AB02> { [ scircumflex, Scircumflex, ccedilla, Ccedilla ] };
key <AB06> { [ gcircumflex, Gcircumflex, q, Q ] };
};
// EXTRAS:

View File

@ -149,32 +149,21 @@ xkb_symbols "tib_asciinum" {
key <AE10> { [ 0, 0x1000f20, 0x1000f08, 0x1000f12 ] }; # 0 ༠ ༈ ༒
};
// Uyghur Standard Keyboard map for XKB/X.org
// Uyghur Standard Keyboard Map for XKB/X.Org
//
// xkb version originally created by
// Abdusalam Abdurahman <Abdusalam.Abdurahman@gmail.com>
// slightly corrected according to feedback and submitted by
// XKB version in collaboration by Muhemmed Abdullah <muhammad@yulghun.com>,
// Abdussalam Abdurrahman <abdusalam.abdurahman@gmail.com>, and
// Ekrem Tomur <ekrem.tomur@gmail.com>
partial alphanumeric_keys
xkb_symbols "uig" {
xkb_symbols "ug" {
include "us(basic)"
name[Group1]= "Uyghur";
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ 1, exclam ] }; // 1 !
key <AE02> { [ 2, at ] }; // 2 @
key <AE03> { [ 3, numbersign ] }; // 3 #
key <AE04> { [ 4, dollar ] }; // 4 $
key <AE05> { [ 5, percent ] }; // 5 %
key <AE06> { [ 6, asciicircum ] }; // 6 ^
key <AE07> { [ 7, ampersand ] }; // 7 &
key <AE08> { [ 8, asterisk ] }; // 8 *
key <AE09> { [ 9, parenright ] }; // 9 )
key <AE10> { [ 0, parenleft ] }; // 0 (
key <AE11> { [ minus, 0x1002014 ] }; // - —
key <AE12> { [ equal, plus ] }; // = +
key <AD01> { [ 0x1000686, VoidSymbol ] }; // چ
key <AD02> { [ 0x10006cb, VoidSymbol ] }; // ۋ
@ -199,7 +188,6 @@ xkb_symbols "uig" {
key <AC08> { [ 0x1000643, 0x10006c6 ] }; // ك ۆ
key <AC09> { [ 0x1000644, VoidSymbol ] }; // ل
key <AC10> { [ Arabic_semicolon, colon ] }; // ؛ :
key <AC11> { [ apostrophe, quotedbl ] }; // ' "
key <AB01> { [ 0x1000632, VoidSymbol ] }; // ز
key <AB02> { [ 0x1000634, VoidSymbol ] }; // ش
@ -211,6 +199,4 @@ xkb_symbols "uig" {
key <AB08> { [ Arabic_comma, 0x100203a ] }; // ،
key <AB09> { [ period, 0x1002039 ] }; // .
key <AB10> { [ 0x1000626, Arabic_question_mark ] }; // ئ ؟
key <BKSL> { [ backslash, bar ] }; // \ |
};

View File

@ -55,3 +55,26 @@ xkb_symbols "ralt_rctrl" {
symbols[Group1] = [ Control_R, Control_R ] };
modifier_map Control { <RALT> };
};
// Swap the functions of the left Alt key and the left Ctrl key.
partial modifier_keys
xkb_symbols "swap_lalt_lctl" {
replace key <LALT> { [ Control_L, Control_L ] };
replace key <LCTL> { [ Alt_L, Meta_L ] };
};
// Swap the functions of the left Win key and the left Ctrl key.
partial modifier_keys
xkb_symbols "swap_lwin_lctl" {
replace key <LWIN> { [ Control_L ] };
replace key <LCTL> { [ Super_L ] };
};
// Map Ctrl to the left Alt key, Alt to the left Win key,
// and Super to the left Ctrl key.
partial modifier_keys
xkb_symbols "swap_lalt_lctl_lwin" {
replace key <LALT> { [ Control_L, Control_L ] };
replace key <LWIN> { [ Alt_L, Meta_L ] };
replace key <LCTL> { [ Super_L ] };
};

View File

@ -82,7 +82,12 @@ subdir = symbols/digital_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -36,6 +36,8 @@ xkb_symbols "basic" {
key <AB09> { [ colon, slash, periodcentered, division ] };
key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };
include "kpdl(comma)"
include "level3(ralt_switch)"
};

View File

@ -82,7 +82,12 @@ subdir = symbols/fujitsu_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -1,6 +1,4 @@
// using the group(switch) map, the right alt key temporarily chooses
// the second keyboard group (until it is released).
//
// The right Alt key (while pressed) chooses the second keyboard group.
partial modifier_keys
xkb_symbols "switch" {
key <RALT> {
@ -9,9 +7,7 @@ xkb_symbols "switch" {
};
};
// using the group(lswitch) map, the left alt key temporarily chooses
// the second keyboard group (until it is released).
//
// The left Alt key (while pressed) chooses the second keyboard group.
partial modifier_keys
xkb_symbols "lswitch" {
key <LALT> {
@ -20,21 +16,16 @@ xkb_symbols "lswitch" {
};
};
// using the group(win_switch) map, both Windows'logo keys temporarily
// choose the second keyboard group (until release). If you use this
// map, you would declare you keyboard as pc101 or pc102 instead of
// pc104 or pc105.
// Either Win key (while pressed) chooses the second keyboard group.
partial modifier_keys
xkb_symbols "win_switch" {
include "group(lwin_switch)"
include "group(rwin_switch)"
};
// using the group(lwin_switch) map, the left Windows' logo key
// temporarily chooses the second keyboard group (until it is
// released). If you use this map, you would declare you keyboard as
// pc101 or pc102 instead of pc104 or pc105.
// The left Win key (while pressed) chooses the second keyboard group.
// (Using this map, you should declare your keyboard as pc101 or pc102
// instead of pc104 or pc105.)
partial modifier_keys
xkb_symbols "lwin_switch" {
key <LWIN> {
@ -43,10 +34,9 @@ xkb_symbols "lwin_switch" {
};
};
// using the group(rwin_switch) map, the right Windows' logo key
// temporarily chooses the second keyboard group (until it is
// released). If you use this map, you would declare you keyboard as
// pc101 or pc102 instead of pc104 or pc105.
// The right Win key (while pressed) chooses the second keyboard group.
// (Using this map, you should declare your keyboard as pc101 or pc102
// instead of pc104 or pc105.)
partial modifier_keys
xkb_symbols "rwin_switch" {
key <RWIN> {
@ -55,8 +45,8 @@ xkb_symbols "rwin_switch" {
};
};
// Right Ctrl key temporary chooses the second keyboard group.
// Needed mainly for Canadian keyboard
// The right Ctrl key (while pressed) chooses the second keyboard group.
// (Needed mainly for the Canadian keyboard.)
partial modifier_keys
xkb_symbols "rctrl_switch" {
key <RCTL> {
@ -64,8 +54,7 @@ xkb_symbols "rctrl_switch" {
};
};
// using the group(toggle) map, pressing the right alt key switches to
// the next sequential group (until the next explicit group change).
// Pressing the right Alt key switches to the next group.
partial modifier_keys
xkb_symbols "toggle" {
virtual_modifiers AltGr;
@ -75,34 +64,29 @@ xkb_symbols "toggle" {
};
};
// using the group(shifts_toggle) map, pressing both shift keys together
// locks the next or previous sequential keyboard group
// (depending on which shift is pressed first - right or left,
// correspongingly)
// Pressing both Shift keys switches to the next or previous group
// (depending on which Shift is pressed first).
partial modifier_keys
xkb_symbols "shifts_toggle" {
key <LFSH> { [ Shift_L, ISO_Prev_Group ] };
key <RTSH> { [ Shift_R, ISO_Next_Group ] };
};
// using the group(shift_caps_toggle) map, pressing:
// Shift+Caps Lock toggles group
// Pressing Shift+Caps_Lock switches to the next group.
partial modifier_keys
xkb_symbols "shift_caps_toggle" {
key <CAPS> { [ Caps_Lock, ISO_Next_Group ] };
};
// using the group(shift_caps_switch) map, pressing:
// Caps Lock selects the first group
// Shift+Caps Lock selects the last group
// Pressing Caps_Lock selects the first group,
// pressing Shift+Caps_Lock selects the last group.
partial modifier_keys
xkb_symbols "shift_caps_switch" {
key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
};
// using the group(win_menu_switch) map, pressing:
// LWIN selects the first group
// RWIN or MENU selects the last group
// Pressing the left Win key selects the first group,
// pressing the right Win or the Menu key selects the last group.
partial modifier_keys
xkb_symbols "win_menu_switch" {
virtual_modifiers AltGr;
@ -120,9 +104,8 @@ xkb_symbols "win_menu_switch" {
};
};
// using the group(lctrl_rctrl_switch) map, pressing:
// Left Control selects the first group
// Right Control selects the last group
// Pressing the left Ctrl key selects the first group,
// pressing the right Ctrl key selects the last group.
partial modifier_keys
xkb_symbols "lctrl_rctrl_switch" {
virtual_modifiers AltGr;
@ -293,17 +276,16 @@ xkb_symbols "alt_shift_toggle_bidir" {
};
// using the group(menu_toggle) map, pressing:
// Menu key toggles groups
// Shift+Menu acts as Menu
// Pressing the Menu key switches to the next group,
// while Shift+Menu acts as Menu.
partial modifier_keys
xkb_symbols "menu_toggle" {
key <MENU> { [ ISO_Next_Group, Menu ] };
};
// using the group(lwin_toggle) map, pressing the left Windows' logo key
// toggles groups. If you use this map, you would declare you keyboard
// as pc101 or pc102 instead of pc104 or pc105.
// Pressing the left Win key switches to the next group.
// (Using this map, you should declare your keyboard as
// pc101 or pc102 instead of pc104 or pc105.)
partial modifier_keys
xkb_symbols "lwin_toggle" {
virtual_modifiers AltGr;
@ -313,9 +295,9 @@ xkb_symbols "lwin_toggle" {
};
};
// using the group(rwin_toggle) map, pressing the right Windows' logo key
// toggles groups. If you use this map, you would declare you keyboard
// as pc101 or pc102 instead of pc104 or pc105.
// Pressing the right Win key switches to the next group.
// (Using this map, you should declare your keyboard as
// pc101 or pc102 instead of pc104 or pc105.)
partial modifier_keys
xkb_symbols "rwin_toggle" {
virtual_modifiers AltGr;
@ -325,7 +307,8 @@ xkb_symbols "rwin_toggle" {
};
};
// Both Ctrls pressed together toggle group
// Pressing both Ctrl keys switches to the next or previous group
// (depending on which Ctrl is pressed first).
partial modifier_keys
xkb_symbols "ctrls_toggle" {
virtual_modifiers LControl, RControl;
@ -341,7 +324,8 @@ xkb_symbols "ctrls_toggle" {
};
};
// Both Alts pressed together toggle group
// Pressing both Alt keys switches to the next or previous group
// (depending on which Alt is pressed first).
partial modifier_keys
xkb_symbols "alts_toggle" {
virtual_modifiers LAlt, RAlt;
@ -357,7 +341,7 @@ xkb_symbols "alts_toggle" {
};
};
// Left Shift key toggles group
// Pressing the left Shift key switches to the next group.
partial modifier_keys
xkb_symbols "lshift_toggle" {
virtual_modifiers AltGr;
@ -367,7 +351,7 @@ xkb_symbols "lshift_toggle" {
};
};
// Right Shift key toggles group
// Pressing the right Shift key switches to the next group.
partial modifier_keys
xkb_symbols "rshift_toggle" {
virtual_modifiers AltGr;
@ -377,7 +361,7 @@ xkb_symbols "rshift_toggle" {
};
};
// Left Alt key toggles group
// Pressing the left Alt key switches to the next group.
partial modifier_keys
xkb_symbols "lalt_toggle" {
virtual_modifiers AltGr;
@ -387,7 +371,7 @@ xkb_symbols "lalt_toggle" {
};
};
// Left Ctrl key toggles group
// Pressing the left Ctrl key switches to the next group.
partial modifier_keys
xkb_symbols "lctrl_toggle" {
virtual_modifiers AltGr;
@ -397,7 +381,7 @@ xkb_symbols "lctrl_toggle" {
};
};
// Right Ctrl key toggles group
// Pressing the right Ctrl key switches to the next group.
partial modifier_keys
xkb_symbols "rctrl_toggle" {
virtual_modifiers AltGr;
@ -407,9 +391,8 @@ xkb_symbols "rctrl_toggle" {
};
};
// using the group(alt_caps_toggle) map, pressing:
// Alt+Caps Lock toggles group
// Caps Lock toggles caps lock
// Pressing Alt+Caps_Lock switches to the next group,
// pressing Caps_Lock toggles CapsLock.
partial modifier_keys
xkb_symbols "alt_caps_toggle" {
key <CAPS> {
@ -431,8 +414,7 @@ xkb_symbols "alt_space_toggle" {
};
};
// using the group(sclk_toggle) map, pressing the Scroll Lock key
// toggles groups.
// Pressing the Scroll Lock key switches to the next group,
partial modifier_keys
xkb_symbols "sclk_toggle" {
virtual_modifiers AltGr;
@ -442,8 +424,8 @@ xkb_symbols "sclk_toggle" {
};
};
// Control_L+Win_L locks the first group (presumably Lat).
// Control_R+Menu locks the second group (presumably Rus).
// Control_L+Win_L selects the first group (presumably Lat),
// Control_R+Menu selects the second group (presumably Rus).
partial modifier_keys
xkb_symbols "lctrl_lwin_rctrl_menu" {
key <LWIN> {
@ -454,4 +436,4 @@ xkb_symbols "lctrl_lwin_rctrl_menu" {
type[Group1] = "PC_CONTROL_LEVEL2",
symbols[Group1] = [ Menu, ISO_Last_Group ]
};
}; // lctrl_lwin_rctrl_menu
};

View File

@ -82,7 +82,12 @@ subdir = symbols/hp_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -398,6 +398,7 @@ hidden partial alphanumeric_keys
xkb_symbols "def_common" {
key <AD01> { [ q, Q, backslash ] };
key <AD02> { [ w, W, bar ] };
key <AD03> { [ e, E, Adiaeresis ] };
key <AD07> { [ u, U, EuroSign ] };
key <AD08> { [ i, I, Iacute, iacute ] };
key <AD09> { [ o, O, doublelowquotemark ] };

View File

@ -1,78 +1,74 @@
// based on a keyboard map from an 'xkb/symbols/il' file
// This is a partial implemetation of the Israeli standard SI-1452
// It does not implement changes to the English layout ("Alt-English"),
// as I believe that it is not the job of this layout to modify the English
// layout.
// This is an implemetation of the Israeli standard SI-1452 (2013)
// It does not implement changes to the English layout, as that part
// of the standard is not normative nor really useful in the context
// of xkb.
// This implementation extends the standard with Yiddish digraphs
// (a common extension) and Nun Hafukha (a fun character).
default partial alphanumeric_keys
xkb_symbols "basic" {
// uses the kbd layout in use in Israel.
name[Group1]= "Hebrew";
key <AD01> { [ slash, Q ] };
key <AD02> { [ apostrophe, W ] };
key <AD04> { [ hebrew_resh, R ] };
key <AD05> { [ hebrew_aleph,T ] };
key <AD06> { [ hebrew_tet, Y ] };
key <AD07> { [ hebrew_waw, U ] };
key <AD08> { [ hebrew_finalnun, I ] };
key <AD09> { [ hebrew_finalmem, O ] };
key <AD10> { [ hebrew_pe, P ] };
key <AC02> { [ hebrew_dalet,S ] };
key <AC03> { [ hebrew_gimel,D ] };
key <AC04> { [ hebrew_kaph, F ] };
key <AC05> { [ hebrew_ayin, G ] };
key <AC06> { [ hebrew_yod, H ] };
key <AC07> { [ hebrew_chet, J ] };
key <AC08> { [ hebrew_lamed, K ] };
key <AC09> { [ hebrew_finalkaph, L ] };
key <AC10> { [ hebrew_finalpe, colon ] };
key <AC11> { [ comma, quotedbl ] };
key.type[Group1] = "FOUR_LEVEL_SEMIALPHABETIC";
key <AB01> { [ hebrew_zain, Z ] };
key <AB02> { [ hebrew_samech, X ] };
key <AB03> { [ hebrew_bet, C ] };
key <AB02> { [ hebrew_samech, X, U05B6 ] }; // Segol
key <AB03> { [ hebrew_bet, C, U05B1 ] }; // Hataf Segol
key <AB04> { [ hebrew_he, V ] };
key <AB05> { [ hebrew_nun, B ] };
key <AB05> { [ hebrew_nun, B, NoSymbol, U05C6 ]}; // Nun Hafukha
key <AB06> { [ hebrew_mem, N ] };
key <AB07> { [ hebrew_zade, M ] };
// Mirrored:
key <AB08> { [ hebrew_taw, greater ] };
key <AB09> { [ hebrew_finalzade, less ] };
key <AB07> { [ hebrew_zade, M, U05B5 ] }; // Tsere
key <AB08> { [ hebrew_taw, greater, rightsinglequotemark ]}; // greater Mirrored
key <AB09> { [ hebrew_finalzade, less, singlelowquotemark ]}; // less Mirrored
key.type[Group1] = "THREE_LEVEL";
key <AC01> { [ hebrew_shin, A, U05B0 ] }; // Shva
key <AC02> { [ hebrew_dalet,S, U05BC ] }; // Dagesh
key <AC03> { [ hebrew_gimel,D ] };
key <AC04> { [ hebrew_kaph, F ] };
key <AC05> { [ hebrew_ayin, G, U05F1 ] }; // Yiddish Vav Yod
key <AC06> { [ hebrew_yod, H, U05F2 ] }; // Yiddish Double Yod
key <AC07> { [ hebrew_chet, J, U05B4 ] }; // Hiriq
key <AC08> { [ hebrew_lamed, K ] };
key <AC09> { [ hebrew_finalkaph, L, rightdoublequotemark ]};
key <AC10> { [ hebrew_finalpe, colon, doublelowquotemark ]};
key <TLDE> { [ semicolon, asciitilde,0x10005b0 ]}; // Sheva
key <AB10> { [ period, question, 0x10005c3 ]}; // Sof Pasuq
key <AD03> { [ hebrew_qoph, E, EuroSign ]};
key <AC01> { [ hebrew_shin, A, 0x10020AA ]};
key <AD01> { [ slash, Q, U05C2 ] }; // Sin Dot
key <AD02> { [ apostrophe, W, U05C1 ] }; // Shin Dot
key <AD03> { [ hebrew_qoph, E, U05B8 ] }; // Qamats
key <AD04> { [ hebrew_resh, R, U05B3 ] }; // Hataf Qamats
key <AD05> { [ hebrew_aleph,T ] };
key <AD06> { [ hebrew_tet, Y, U05F0 ] }; // Yiddish Double Vav
key <AD07> { [ hebrew_waw, U, U05B9 ] }; // Holam
key <AD08> { [ hebrew_finalnun, I ] };
key <AD09> { [ hebrew_finalmem, O ] };
key <AD10> { [ hebrew_pe, P, U05B7 ] }; // Patah
// The following may get overriden by the iso9995-3(basic101) symbols.
// therefore they are included here.
// Including them isn't a great idea (for instance: what if group 1 uses
// UK keyboard mapping, and maps shift-3 to sterling? This mapping won't
// preserve that, and I'm not sure that this is a good feature.
key <AE01> { [ 1, exclam , 0x10005b1 ]}; // H. Segol
key <AE02> { [ 2, at , 0x10005b2 ]}; // H. Patah
key <AE03> { [ 3, numbersign , 0x10005b3 ]}; // H. Qamats
key <AE04> { [ 4, dollar , 0x10005b4 ]}; // Hiriq
key <AE05> { [ 5, percent , 0x10005b5 ]}; // Tsere
key <AE06> { [ 6, asciicircum , 0x10005b6 ]}; // Segol
key <AE07> { [ 7, ampersand , 0x10005b7 ]}; // Patah
key <AE08> { [ 8, asterisk , 0x10005b8 ]}; // Qamats
// Mirrored:
key <AE09> { [ 9, parenright , 0x10005c2 ]}; // Sin dot
key <AE10> { [ 0, parenleft , 0x10005c1 ]}; // Shin dot
key <AE11> { [ minus, underscore , 0x10005b9 ]}; // Holam
key <AE12> { [ equal, plus , 0x10005bc ]}; // Dagesh/Shuruq
key.type[Group1] = "FOUR_LEVEL";
// Mirrored:
key <AD11> { [ bracketright, braceright, 0x10005bf ]}; // Rafe
key <AD12> { [ bracketleft, braceleft, 0x10005bd ]}; // Meteg
// Non-alphanumeric keys
key <AB10> { [ period, question, division ]};
key <AC11> { [ comma, quotedbl, U05F4] }; // Gershayim
key <AD11> { [ bracketright, braceright, U05B2 ]}; // Mirrored; Hataf Patah
key <AD12> { [ bracketleft, braceleft, U05BF ]}; // Mirrored; Rafe
key <BKSL> { [ backslash, bar, U05BB ] }; // Qubuts
key <BKSL> { [ backslash, bar, 0x10005bb ]}; // Qubuts
// Top (digits) row
key <TLDE> { [ semicolon, asciitilde, U05F3 ]}; // Geresh
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, at ] };
key <AE03> { [ 3, numbersign, EuroSign ]};
key <AE04> { [ 4, dollar, NewSheqelSign ]};
key <AE05> { [ 5, percent, degree ]};
key <AE06> { [ 6, asciicircum, U05AB ]}; // Hebrew Accent Ole
key <AE07> { [ 7, ampersand, U05BD ]}; // Meteg
key <AE08> { [ 8, asterisk, multiply]};
key <AE09> { [ 9, parenright, U200E ]}; // LRM; Paren Mirrored
key <AE10> { [ 0, parenleft, U200F ]}; // RLM; Paren Mirrored
key <AE11> { [ minus, underscore, U05BE ]}; // Maqaf
key <AE12> { [ equal, plus, endash ]};
include "level3(ralt_switch)"
};

View File

@ -1,6 +1,6 @@
// This layout includes all Indian layouts, including:
// - Devanagari (Hindi, Marathi, Sanskrit)
// - Bengali
// - Bangla
// - Gujarati
// - Kannada
// - Malayalam
@ -12,12 +12,12 @@
// Links:
// - Indic INSCRIPT keyboard layout diagrams:
// http://java.sun.com/products/jfc/tsc/articles/InputMethod/indiclayout.html
// - Bengali Baishakhi (Bengali layouts):
// - Bengali Baishakhi Inscript (Bengali layouts):
// - Bengali Bornona (Bengali layouts):
// - Uni Gitanjali (Bengali layouts):
// - Bangla Baishakhi (Bangla layouts):
// - Bangla Baishakhi Inscript (Bangla layouts):
// - Bangla Bornona (Bangla layouts):
// - Uni Gitanjali (Bangla layouts):
// http://nltr.org
// - Ekusheyr Shadhinota (Bengali layouts):
// - Ekusheyr Shadhinota (Bangla layouts):
// http://ekushey.org/projects/shadhinota/index.html
// - Microsoft Windows XP SP2: Indic Language Standards - an Introduction:
// http://www.bhashaindia.com/MSProducts/XpSp2/Articles/IndicLanguageStandards.aspx
@ -176,7 +176,7 @@ xkb_symbols "bolnagri" {
partial alphanumeric_keys
xkb_symbols "ben" {
name[Group1]= "Bengali (India)";
name[Group1]= "Bangla (India)";
// Mainly numbers.
key <AE01> { [ U09E7 ] };
@ -244,7 +244,7 @@ xkb_symbols "ben" {
};
xkb_symbols "ben_probhat" {
name[Group1]= "Bengali (India, Probhat)";
name[Group1]= "Bangla (India, Probhat)";
key <ESC> { [ Escape ] };
// numbers
@ -318,10 +318,10 @@ xkb_symbols "ben_probhat" {
include "rupeesign(4)"
};
// Bengali Baishakhi, Bengali Baishakhi Inscript, Bengali Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004@gmail.com>
// Bangla Baishakhi, Bangla Baishakhi Inscript, Bangla Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004@gmail.com>
xkb_symbols "ben_baishakhi" {
name[Group1]= "Bengali (India, Baishakhi)";
name[Group1]= "Bangla (India, Baishakhi)";
key <ESC> { [ Escape ] };
// numbers
@ -398,7 +398,7 @@ xkb_symbols "ben_baishakhi" {
};
xkb_symbols "ben_inscript" {
name[Group1]= "Bengali (India, Baishakhi Inscript)";
name[Group1]= "Bangla (India, Baishakhi Inscript)";
// Mainly numbers.
key <TLDE> { [ 0x100200D, 0x100200C ] };
@ -464,7 +464,7 @@ xkb_symbols "ben_inscript" {
};
xkb_symbols "ben_gitanjali" {
name[Group1]= "Bengali (India, Uni Gitanjali)";
name[Group1]= "Bangla (India, Uni Gitanjali)";
key <ESC> { [ Escape ] };
// numbers
@ -542,7 +542,7 @@ xkb_symbols "ben_gitanjali" {
xkb_symbols "ben_bornona" {
name[Group1]= "Bengali (India, Bornona)";
name[Group1]= "Bangla (India, Bornona)";
key <ESC> { [ Escape ] };
// numbers
@ -2013,4 +2013,72 @@ xkb_symbols "tel-kagapa" {
include "level3(ralt_switch)"
};
// ---- END Telugu KaGaPa ----
// Description : Keymap for Manipuri language (Meetei mayek script)
// Encoding : Unicode (http://www.unicode.org)
// Author : Santosh Heigrujam <santosh.tomba@gmail.com>
// Date : December, 2013
// Source :
// Comment :
partial alphanumeric_keys modifier_keys
xkb_symbols "eeyek" {
name[Group1]= "Manipuri (Eeyek)";
// Alphanumeric section
key <TLDE> { [ grave, asciitilde ] };
key <AE01> { [ Uabf1, exclam ] };
key <AE02> { [ Uabf2, at ] };
key <AE03> { [ Uabf3, numbersign ] };
key <AE04> { [ Uabf4, dollar ] };
key <AE05> { [ Uabf5, percent ] };
key <AE06> { [ Uabf6, asciicircum ] };
key <AE07> { [ Uabf7, ampersand ] };
key <AE08> { [ Uabf8, asterisk ] };
key <AE09> { [ Uabf9, parenleft ] };
key <AE10> { [ Uabf0, parenright ] };
key <AE11> { [ minus, underscore ] };
key <AE12> { [ equal, plus ] };
key <AD01> { [ Uabc8, Uabd8 ] };
key <AD02> { [ Uabcb, Uabcb ] };
key <AD03> { [ Uabcf, Uabe2 ] };
key <AD04> { [ Uabd4, Uabd4 ] };
key <AD05> { [ Uabc7, Uabe0 ] };
key <AD06> { [ Uabcc, Uabe6 ] };
key <AD07> { [ Uabce, Uabe8 ] };
key <AD08> { [ Uabe4, Uabe9 ] };
key <AD09> { [ Uabe3, Uabe7 ] };
key <AD10> { [ Uabc4, Uabde ] };
key <AD11> { [ bracketleft, braceleft ] };
key <AD12> { [ bracketright, braceright ] };
key <AC01> { [ Uabd1, Uabe5 ] };
key <AC02> { [ Uabc1, Uabd3 ] };
key <AC03> { [ Uabd7, Uabd9 ] };
key <AC04> { [ Uabd0, Uabda ] };
key <AC05> { [ Uabd2, Uabd8 ] };
key <AC06> { [ Uabcd, Uabea ] };
key <AC07> { [ Uabd6, Uabd3 ] };
key <AC08> { [ Uabc0, Uabdb ] };
key <AC09> { [ Uabc2, Uabdc ] };
key <AC10> { [ semicolon, colon ] };
key <AC11> { [ apostrophe, quotedbl ] };
key <AB01> { [ Uabc9, Uabe1 ] };
key <AB02> { [ Uabca, Uabd9 ] };
key <AB03> { [ Uabc6, Uabeb ] };
key <AB04> { [ Uabda, Uabed ] };
key <AB05> { [ Uabd5, Uabec ] };
key <AB06> { [ Uabc5, Uabdf ] };
key <AB07> { [ Uabc3, Uabdd ] };
key <AB08> { [ comma, less ] };
key <AB09> { [ period, greater ] };
key <AB10> { [ slash, question ] };
key <BKSL> { [ backslash, bar ] };
// End alphanumeric section
include "level3(ralt_switch)"
};

View File

@ -1,7 +1,7 @@
// EAK (Easy Access, Internet, Multimedia, PDA) keyboards
// EAK (Easy Access keyboards: Internet, Multimedia, PDA)
// Copyright (C) 2002 Stanislav Brabec <sbrabec@suse.cz>
//
// Based on LinEAK project
// Based on the LinEAK project.
// LinEAK - Linux support for Easy Access and Internet Keyboards
// Copyright (C) 2001, 2002 Mark Smulders <Mark@PIRnet.nl>
@ -13,10 +13,7 @@
// Simple command line usage:
// setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
// All keyboards listed here should be also mentioned in
// rules/base, base.lst and base.xml.
// Very common set of media keys
// Very common set of media keys.
partial hidden alphanumeric_keys
xkb_symbols "media_common" {
key <I01> { [ XF86AudioMedia ] };
@ -31,7 +28,7 @@ xkb_symbols "media_common" {
key <K6C> { [ XF86Eject ] };
};
// popular web navigation combination
// Popular web navigation keys.
partial hidden alphanumeric_keys
xkb_symbols "nav_common" {
key <I21> { [ XF86Calculator ] };
@ -58,7 +55,7 @@ xkb_symbols "acpi_common" {
key <I16> { [ XF86Sleep ] };
};
// Combined sections, for simplicity
// Combined sections, for simplicity.
partial hidden alphanumeric_keys
xkb_symbols "media_nav_common" {
include "inet(media_common)"
@ -139,8 +136,8 @@ xkb_symbols "evdev" {
key <I158> { [ XF86WWW ] };
key <I159> { [ XF86DOS ] };
key <I160> { [ XF86ScreenSaver ] };
// key <I161> { [ ] }; // KEY_DIRECTION
key <I162> { [ XF86RotateWindows ] };
key <I161> { [ XF86RotateWindows ] };
key <I162> { [ XF86TaskPane ] };
key <I163> { [ XF86Mail ] };
key <I164> { [ XF86Favorites ] };
key <I165> { [ XF86MyComputer ] };
@ -230,6 +227,8 @@ xkb_symbols "evdev" {
};
// Acer
// Acer AirKey V
partial alphanumeric_keys
xkb_symbols "airkey" {
@ -303,11 +302,12 @@ xkb_symbols "acer_laptop" {
// versions of HAL, these keys are commented out for now. When they are no
// longer marked 'FIXME' and have saner keycodes, these two entries can be
// fixed and permanently uncommented. In the meantime, just uncomment these
// to make the keys work
// to make the keys work.
// key <K5D> { [ EuroSign ] }; // Euro (HAL)
// key <K5E> { [ dollar ] }; // Dollar (HAL)
};
// Azona
// Azona RF2300 wireless Internet Keyboard
@ -374,7 +374,6 @@ xkb_symbols "btc5113rf" {
key <I32> { [ XF86Search ] };
};
// BTC 9000
partial alphanumeric_keys
xkb_symbols "btc9000" {
@ -444,7 +443,8 @@ xkb_symbols "btc9019u" {
key <I02> { [ XF86HomePage ] };
};
// Cherry Blue Line
// Cherry
// Cherry Blue Line CyBo@rd
partial alphanumeric_keys
@ -630,7 +630,6 @@ xkb_symbols "compaqik18" {
key <I68> { [ Print ] };
};
// Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
partial alphanumeric_keys
xkb_symbols "armada" {
@ -751,7 +750,6 @@ xkb_symbols "genius" {
key <I32> { [ XF86WWW ] };
};
// Genius Comfy 21e
partial alphanumeric_keys
xkb_symbols "geniuscomfy2" {
@ -761,6 +759,7 @@ xkb_symbols "geniuscomfy2" {
key <I23> { [ Return ] };
};
// Gyration
partial alphanumeric_keys
@ -944,7 +943,6 @@ xkb_symbols "honeywell_euroboard" {
// IBM
// IBM Rapid Access
partial alphanumeric_keys
xkb_symbols "rapidaccess" {
@ -999,6 +997,7 @@ xkb_symbols "ibm_spacesaver" {
};
};
// Logitech
// Logitech common definitions
@ -1069,7 +1068,6 @@ partial alphanumeric_keys
xkb_symbols "logiex110" {
include "inet(logitech_base)"
key <I2F> { [ XF86Close ] }; // Close
// Extended function keys
// In the Console before starting X
// Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217
@ -1646,6 +1644,7 @@ xkb_symbols "symplon" {
key <UP> { [ XF86MenuPB ] };
};
// Toshiba
// Toshiba Satellite S3000
@ -1663,6 +1662,7 @@ xkb_symbols "toshiba_s3000" {
key <I76> { [ XF86AudioLowerVolume ] };
};
// Trust
// Trust Wireless Keyboard Classic
@ -1673,7 +1673,6 @@ xkb_symbols "trust" {
key <I1E> { [ XF86Eject ] };
};
// Trust Direct Access Keyboard
partial alphanumeric_keys
xkb_symbols "trustda" {
@ -1711,6 +1710,7 @@ xkb_symbols "yahoo" {
key <I28> { [ XF86WWW ] };
};
// Apple keyboards (macbooks, powerbooks, powermac G5, etc)
partial alphanumeric_keys
xkb_symbols "apple" {
@ -1759,6 +1759,7 @@ xkb_symbols "silvercrest" {
key <K67> { [ XF86Launch1 ] };
};
// eMachines
partial alphanumeric_keys
@ -1782,13 +1783,12 @@ xkb_symbols "emachines" {
key <KPSU> { [ KP_Subtract ] };
};
// BenQ
// BenQ X* (X730, X500, X800)
//
// BenQ X*
// (X730, X500, X800)
//
// to make the FN_LOCK and CONFIG key work on the BenQ X500 , use ...
// To make the FN_LOCK and CONFIG key work on the BenQ X500 , use:
// setkeycodes e074 130 # KEY_PROPS from /usr/include/linux/input.h
// setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
partial alphanumeric_keys
@ -1800,6 +1800,7 @@ xkb_symbols "benqx" {
key <I31> { [ XF86Calendar ] };
};
// Intel
// Intel Classmate
@ -1809,6 +1810,7 @@ xkb_symbols "classmate" {
key <I30> { [ XF86AudioRaiseVolume ] };
};
// Unitek
partial alphanumeric_keys
@ -1822,6 +1824,7 @@ xkb_symbols "unitekkb1925" {
key <I1A> { [ XF86Reload ] };
};
// Creative
// Creative Desktop Wireless 7000
@ -1831,6 +1834,7 @@ xkb_symbols "creativedw7000" {
key <I66> { [ XF86Pictures ] };
};
// Compal
// Compal FL90
@ -1846,13 +1850,13 @@ xkb_symbols "pc105" {
include "inet(media_nav_acpi_common)"
};
// HTC Dream
partial alphanumeric_keys
xkb_symbols "htcdream" {
key <BKSP> { [ BackSpace ] };
key <RTRN> { [ Return ] };
//first row
key <AE01> { [ 1, 1, exclam, exclam ] };
key <AE02> { [ 2, 2, at, at ] };
key <AE03> { [ 3, 3, numbersign, numbersign ] };
@ -1864,12 +1868,10 @@ xkb_symbols "htcdream" {
key <AE09> { [ 9, 9, parenleft, parenleft ] };
key <AE10> { [ 0, 0, parenright, parenright ] };
//fifth row
key <LFSH> { [ Shift_L ] };
key <SPCE> { [ space ] };
key <AB09> { [ period, period, slash, slash ] };
key <RTSH> { [ Shift_R ] };
//modifiers
modifier_map Shift { <LFSH>, <RTSH> };
};

View File

@ -79,11 +79,9 @@ xkb_symbols "pes_part_basic" {
key <AB01> { [ Arabic_zah, Arabic_kaf, VoidSymbol ] };
key <AB02> { [ Arabic_tah, 0x1000653, VoidSymbol ] };
key <AB03> { [ Arabic_zain, Arabic_jeh, VoidSymbol ] };
key <AB04> { [ Arabic_ra, Arabic_superscript_alef
, 0x1000656 ] };
key <AB04> { [ Arabic_ra, Arabic_superscript_alef,0x1000656 ] };
key <AB05> { [ Arabic_thal, 0x100200c, 0x100200d ] };
key <AB06> { [ Arabic_dal, Arabic_hamza_above
, Arabic_hamza_below ] };
key <AB06> { [ Arabic_dal, Arabic_hamza_above, Arabic_hamza_below ] };
key <AB07> { [ Arabic_peh, Arabic_hamza, ellipsis ] };
key <AB08> { [ Arabic_waw, greater, comma ] };
key <AB09> { [ period, less, apostrophe ] };

View File

@ -33,6 +33,8 @@ xkb_symbols "basic" {
key <LSGT> { [ less, greater,guillemotleft,guillemotright] };
include "kpdl(comma)"
include "level3(ralt_switch)"
};

View File

@ -100,6 +100,14 @@ xkb_symbols "common" {
};
};
partial alphanumeric_keys
xkb_symbols "henkan" {
key <XFER> {
type[Group1]="PC_ALT_LEVEL2",
symbols[Group1]= [ Henkan, Mode_switch ]
};
};
partial alphanumeric_keys
xkb_symbols "OADG109A" {

View File

@ -82,7 +82,12 @@ subdir = symbols/macintosh_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -2,7 +2,7 @@ default partial alphanumeric_keys
xkb_symbols "basic" {
// Adds the macrons needed for the Maori language to
// a simple us keyboard layout.
// a simple US keyboard layout.
include "latin"
@ -17,5 +17,6 @@ xkb_symbols "basic" {
key <RALT> { type[Group1]="TWO_LEVEL",
[ ISO_Level3_Shift, Multi_key ] };
modifier_map Mod5 { <RALT> };
};

View File

@ -82,7 +82,12 @@ subdir = symbols/nec_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -49,6 +49,8 @@ xkb_symbols "basic" {
key <LSGT> { [bracketright, bracketleft, bar, brokenbar ] };
include "kpdl(comma)"
include "level3(ralt_switch)"
};

View File

@ -82,7 +82,12 @@ subdir = symbols/nokia_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -62,6 +62,7 @@ xkb_symbols "legacy" {
name[Group1]="Polish (legacy)";
key <AD03> { [ e, E, eogonek, Eogonek ] };
key <AD07> { [ u, U, EuroSign, cent ] };
key <AD09> { [ o, O, oacute, Oacute ] };
key <AC01> { [ a, A, aogonek, Aogonek ] };

View File

@ -1,13 +1,10 @@
// based on a keyboard map from an 'xkb/symbols/pt' file
default partial alphanumeric_keys
xkb_symbols "basic" {
include "latin(type4)"
name[Group1]="Portuguese";
key <LSGT> { [ less, greater, backslash, backslash ] };
key <TLDE> { [ backslash, bar, notsign, notsign ] };
key <AE03> { [ 3, numbersign, sterling, sterling ] };
key <AE04> { [ 4, dollar, section, dollar ] };
key <AE11> { [ apostrophe, question, backslash, questiondown ] };
@ -15,12 +12,12 @@ xkb_symbols "basic" {
key <AD11> { [ plus, asterisk, dead_diaeresis, dead_abovering ] };
key <AD12> { [ dead_acute, dead_grave, dead_tilde, dead_macron ] };
key <BKSL> { [ dead_tilde, dead_circumflex, dead_grave, dead_breve ] };
key <AC10> { [ ccedilla, Ccedilla, dead_acute, dead_doubleacute ] };
key <AC11> { [ masculine, ordfeminine,dead_circumflex, dead_caron ] };
key <TLDE> { [ backslash, bar, notsign, notsign ] };
key <BKSL> { [dead_tilde, dead_circumflex, dead_grave, dead_breve] };
key <LSGT> { [ less, greater, backslash, backslash ] };
include "level3(ralt_switch)"
};
@ -28,81 +25,79 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "Sundeadkeys" {
include "pt(basic)" // for consistent naming
include "pt(basic)"
key <AD11> { [ plus, asterisk, dead_diaeresis, dead_diaeresis ] };
key <BKSL> { [dead_tilde, dead_circumflex ] };
key <AD12> { [ dead_acute, dead_grave ] };
key <BKSL> { [ dead_tilde, dead_circumflex ] };
};
partial alphanumeric_keys
xkb_symbols "sundeadkeys" {
include "pt(Sundeadkeys)" // for consistent naming
include "pt(Sundeadkeys)"
name[Group1]="Portuguese (Sun dead keys)";
};
partial alphanumeric_keys
xkb_symbols "nodeadkeys" {
include "pt(basic)" // for consistent naming
include "pt(basic)"
name[Group1]="Portuguese (eliminate dead keys)";
key <AE12> { [ guillemotleft, guillemotright, cedilla, ogonek ] };
key <AD11> { [ plus, asterisk, quotedbl, quotedbl ] };
key <AD12> { [ acute, grave ] };
key <BKSL> { [ asciitilde, asciicircum ] };
key <AC10> { [ ccedilla, Ccedilla, acute, doubleacute ] };
key <AC11> { [ masculine, ordfeminine, asciicircum, caron ] };
key <BKSL> { [asciitilde, asciicircum ] };
key <AB10> { [ minus, underscore, dead_belowdot, abovedot ] };
};
// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
// Copied from macintosh_vndr/pt
// Layout variant for Mac, by Ricardo Cabral <bfe00991@mail.telepac.pt>.
partial alphanumeric_keys
xkb_symbols "mac" {
include "pt"
name[Group1]= "Portuguese (Macintosh)";
key <TLDE> { [ grave, asciitilde, notsign, notsign ] };
key <AE06> { [ 6, ampersand, threequarters, fiveeighths ] };
key <AE08> { [ 8, parenleft, bracketleft, braceleft ] };
key <AE09> { [ 9, parenright, bracketright, braceright ] };
key <AE12> { [ plus, asterisk, dead_diaeresis ] };
key <AC11> { [ dead_tilde, dead_circumflex ] };
key <AD11> { [ masculine, ordfeminine ] };
key <BKSL> { [ backslash, bar, dead_grave, dead_breve ] };
key <TLDE> { [ grave, asciitilde, notsign, notsign ] };
key <AC11> { [ dead_tilde, dead_circumflex ] };
};
partial alphanumeric_keys
xkb_symbols "mac_sundeadkeys" {
include "pt(mac)"
name[Group1]= "Portuguese (Macintosh, Sun dead keys)";
key <AE12> { [ plus, asterisk, dead_diaeresis, dead_diaeresis ] };
key <AC11> { [ dead_tilde, dead_circumflex ] };
key <AD12> { [ dead_acute, dead_grave ] };
key <AC11> { [ dead_tilde, dead_circumflex ] };
};
partial alphanumeric_keys
xkb_symbols "mac_nodeadkeys" {
include "pt(mac)"
name[Group1]= "Portuguese (Macintosh, eliminate dead keys)";
key <AE12> { [ plus, asterisk, quotedbl, quotedbl ] };
key <AC11> { [ asciitilde, asciicircum ] };
key <AD12> { [ acute, grave ] };
key <AC11> { [ asciitilde, asciicircum ] };
};
//
// Teclado Nativo Portugues 2005-07-19
// Portuguese Nativo Keyboard
// This is a Dvorak-based layout, designed for the Portuguese language
// Portuguese Nativo layout.
// This is a Dvorak-based layout, designed for the Portuguese language.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo" {
@ -169,51 +164,45 @@ xkb_symbols "nativo" {
// Configures the use of the AltGr key
include "level3(ralt_switch)"
};
//
// Teclado Nativo Portugues para o teclado estadunidense 2005-07-19
// Portuguese Nativo Keyboard for USA keyboards
// Portuguese Nativo layout for US keyboards.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo-us" {
include "pt(nativo)"
name[Group1]="Portuguese (Nativo for US keyboards)";
// Lower row
key <AB01> { [ y, Y, ccedilla, Ccedilla ] };
key <AB02> { [ guillemotleft, guillemotright, 0x01002039, 0x0100203A ] };
};
//
// Teclado Nativo Portugues para digitacao em Esperanto 2005-07-19
// Portuguese Nativo Keyboard for typing Esperanto
// Portuguese Nativo layout for typing Esperanto.
//
// Ari Caldeira ari@tecladobrasileiro.com.br
// Ari Caldeira <ari@tecladobrasileiro.com.br> 2005-07-19
//
partial alphanumeric_keys
xkb_symbols "nativo-epo" {
include "pt(nativo)"
name[Group1]="Esperanto (Portugal, Nativo)";
// Upper row Esperanto
key <AD04> { [ h, H, hcircumflex, Hcircumflex ] };
key <AD05> { [ ccircumflex, Ccircumflex, x, X ] };
key <AD06> { [ ubreve, Ubreve, w, W ] };
// Lower row Esperanto
key <AB01> { [ jcircumflex, Jcircumflex, y, Y ] };
key <AB02> { [ scircumflex, Scircumflex, ccedilla, Ccedilla ] };
key <AB06> { [ gcircumflex, Gcircumflex, q, Q ] };
};
// EXTRAS:

View File

@ -300,30 +300,28 @@ xkb_symbols "latinalternatequotes" {
};
xkb_symbols "rue" {
// Homophonic layout for Pannonian Rusyn (spoken mainly in Serbia and
// Croatia by the Rusyn people), based on Ukrainian homophonic.
// Author: Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga.rs@gmail.com>
// Layout for Pannonian Rusyn (spoken mainly in Serbia and
// Croatia by the Rusyn people), based on Serbian Cyrillic layout.
// Authors:
// Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
// Mihajlo Hornjak <smeceiotpad@gmail.com>
name[Group1]= "Pannonian Rusyn (homophonic)";
name[Group1]= "Pannonian Rusyn";
include "ua(homophonic)"
include "rs(basic)"
key <TLDE> { [ grave, asciitilde ] };
key <AE03> { [ 3, doublelowquotemark ] };
key <AE04> { [ 4, rightdoublequotemark ] };
key <AE07> { [ 7, EuroSign ] };
key <AE11> { [ 0x002D, emdash ] };
key <AE12> { [ equal, plus ] };
key <TLDE> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // `
key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] };
key <AD06> { [ Cyrillic_yu, Cyrillic_YU ] };
key <AD08> { [ Cyrillic_i, Cyrillic_I ] };
key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
key <AD01> { [ Cyrillic_ya, Cyrillic_YA ] }; // q
key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] }; // w
key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // ]
key <LSGT> { [ Ukrainian_yi, Ukrainian_YI ] };
key <AB08> { [ comma, semicolon ] };
key <AB09> { [ period, colon ] };
key <AC05> { [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; // g
key <AC07> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // j
key <AC11> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // '
key <AB01> { [ Cyrillic_yu, Cyrillic_YU ] }; // z
key <AB02> { [ Ukrainian_yi, Ukrainian_YI ] }; // x
};
// EXTRAS:

View File

@ -179,7 +179,7 @@ xkb_symbols "phonetic" {
key <LatA> { [ Cyrillic_a, Cyrillic_A ] };
key <LatW> { [ Cyrillic_ve, Cyrillic_VE ] };
key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] };
key <LatX> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
key <LatX> { [ Cyrillic_ha, Cyrillic_HA ] };
key <LatD> { [ Cyrillic_de, Cyrillic_DE ] };
key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] };
key <LatV> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
@ -188,7 +188,7 @@ xkb_symbols "phonetic" {
key <LatR> { [ Cyrillic_er, Cyrillic_ER ] };
key <LatN> { [ Cyrillic_en, Cyrillic_EN ] };
key <LatB> { [ Cyrillic_be, Cyrillic_BE ] };
key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] };
key <LatH> { [ Cyrillic_che, Cyrillic_CHE ] };
key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] };
key <LatY> { [ Cyrillic_yeru, Cyrillic_YERU ] };
key <LatM> { [ Cyrillic_em, Cyrillic_EM ] };
@ -201,7 +201,7 @@ xkb_symbols "phonetic" {
key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] };
key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
key <AE12> { [ Cyrillic_che, Cyrillic_CHE ] };
key <AE12> { [ Cyrillic_softsign, Cyrillic_softsign ] };
key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
key <BKSL> { [ Cyrillic_e, Cyrillic_E ] };
};

View File

@ -82,7 +82,12 @@ subdir = symbols/sgi_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -82,7 +82,12 @@ subdir = symbols/sharp_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -1,5 +1,5 @@
// $NetBSD: sl-c3x00,v 1.1 2009/12/13 04:54:51 nonaka Exp $
// $OpenBSD: sl-c3x00,v 1.2 2013/10/26 17:49:59 shadchin Exp $
// $OpenBSD: sl-c3x00,v 1.3 2014/05/05 18:05:35 shadchin Exp $
partial default alphanumeric_keys
xkb_symbols "basic" {

View File

@ -82,7 +82,12 @@ subdir = symbols/sony_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -1,4 +1,4 @@
// Actions which control the server's behavior
// Actions which control the server's behavior.
partial keypad_keys function_keys
xkb_symbols "xfree86" {
@ -68,7 +68,6 @@ xkb_symbols "fkey2vt" {
type="CTRL+ALT",
symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ]
};
};
partial function_keys keypad_keys
@ -94,3 +93,18 @@ xkb_symbols "no_srvr_keys" {
key <KPSU> { [ KP_Subtract, KP_Subtract ] };
key <KPAD> { [ KP_Add, KP_Add ] };
};
partial function_keys
xkb_symbols "grab_debug" {
key <FK11> {
type="CTRL+ALT",
symbols[Group1]= [ F11, F11, F11, F11, XF86LogGrabInfo ]
};
key <FK12> {
type="CTRL+ALT",
symbols[Group1]= [ F12, F12, F12, F12, XF86LogWindowTree ]
};
};

View File

@ -82,7 +82,12 @@ subdir = symbols/sun_vndr
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(dist_symbols_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d

View File

@ -12,7 +12,7 @@ xkb_symbols "unicode" {
name[Group1]= "Ukrainian";
key <TLDE> { [ U2019, apostrophe, U0301, asciitilde ] }; // Apostrophe and Stress symbol
key <AE02> { [ 1, exclam, onesuperior ] };
key <AE01> { [ 1, exclam, onesuperior ] };
key <AE02> { [ 2, quotedbl, twosuperior ] };
key <AE03> { [ 3, numerosign, U00A7, U20B4 ] }; // Paragraph and Hryvnia sign
key <AE04> { [ 4, semicolon, dollar, EuroSign ] };

Some files were not shown because too many files have changed in this diff Show More