diff options
| -rw-r--r-- | README.config | 47 | ||||
| -rw-r--r-- | README.enhancing | 23 | ||||
| -rw-r--r-- | action.c | 2 | ||||
| -rw-r--r-- | action.h | 2 | ||||
| -rw-r--r-- | alias.c | 2 | ||||
| -rw-r--r-- | alias.h | 2 | ||||
| -rw-r--r-- | compat.c | 2 | ||||
| -rw-r--r-- | compat.h | 2 | ||||
| -rw-r--r-- | expr.c | 3 | ||||
| -rw-r--r-- | expr.h | 2 | ||||
| -rw-r--r-- | geometry.c | 2 | ||||
| -rw-r--r-- | indicators.c | 2 | ||||
| -rw-r--r-- | indicators.h | 2 | ||||
| -rw-r--r-- | keycodes.c | 2 | ||||
| -rw-r--r-- | keycodes.h | 2 | ||||
| -rw-r--r-- | keymap.c | 2 | ||||
| -rw-r--r-- | keytypes.c | 2 | ||||
| -rw-r--r-- | listing.c | 2 | ||||
| -rw-r--r-- | misc.c | 2 | ||||
| -rw-r--r-- | misc.h | 2 | ||||
| -rw-r--r-- | parseutils.c | 2 | ||||
| -rw-r--r-- | parseutils.h | 2 | ||||
| -rw-r--r-- | symbols.c | 2 | ||||
| -rw-r--r-- | utils.c | 2 | ||||
| -rw-r--r-- | utils.h | 2 | ||||
| -rw-r--r-- | vmod.c | 2 | ||||
| -rw-r--r-- | vmod.h | 2 | ||||
| -rw-r--r-- | xkbcomp.c | 2 | ||||
| -rw-r--r-- | xkbcomp.h | 2 | ||||
| -rw-r--r-- | xkbcomp.man | 2 | ||||
| -rw-r--r-- | xkbparse.y | 2 | ||||
| -rw-r--r-- | xkbpath.c | 2 | ||||
| -rw-r--r-- | xkbpath.h | 2 | ||||
| -rw-r--r-- | xkbscan.c | 2 |
34 files changed, 67 insertions, 68 deletions
diff --git a/README.config b/README.config index 9a94577..3d31137 100644 --- a/README.config +++ b/README.config @@ -6,9 +6,9 @@ Abstract - This document describes how to configure XFree86 XKB from a user's - point a few. It converts basic configuration syntax and gives also - a few examples. + This document describes how to configure X11R6.7.0 XKB from a + user's point a few. It converts basic configuration syntax and + gives also a few examples. 1. Overview @@ -39,16 +39,16 @@ The parameters are: o XkbOptions - extra xkb configuration options The proper rules file depends on your vendor. In reality, the commonest file -of rules is xfree86. For each rules file there is a description file named -<vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu- -ration subdirectory rules (for example /etc/X11/xkb/rules). +of rules is xorg. For each rules file there is a description file named <ven- +dor-rules>.lst, for instance xorg.lst which is located in xkb configuration +subdirectory rules (for example /etc/X11/xkb/rules). 2.1 Basic Configuration Let's say you want to configure a PC style America keyboard with 104 keys as -described in xfree86.lst. It can be done by simply writing several lines from -below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4 -or /etc/X11/XF86Config): +described in xorg.lst. It can be done by simply writing several lines from +below to you xorg.conf configuration file (previously known as +/etc/X11/XF86Config-4 or /etc/X11/XF86Config): Section "InputDevice" Identifier "Keyboard1" @@ -67,18 +67,18 @@ named basic is loaded. Of course, this can be also done at runtime using utility setxkbmap. Shell command loading the same keyboard mapping would look like: - setxkbmap -rules xfree86 -model pc104 -layout us -option "" + setxkbmap -rules xorg -model pc104 -layout us -option "" The configuration and the shell command would be very analogical for most other layouts (internationalized mappings). 2.2 Advanced Configuration -Since XFree86 4.3.x you can use multi-layouts xkb configuration. What does -it mean? Basically it allows to load up to four different keyboard layouts at -a time. Each such layout would reside in its own group. The groups (unlike -complete keyboard remapping) can be switched very fast from one to another by -a combination of keys. +You can use multi-layouts xkb configuration. What does it mean? Basically it +allows to load up to four different keyboard layouts at a time. Each such +layout would reside in its own group. The groups (unlike complete keyboard +remapping) can be switched very fast from one to another by a combination of +keys. Let's say you want to configure your new Logitech cordless desktop keyboard, you intend to use three different layouts at the same time - us, czech and @@ -99,7 +99,7 @@ Then the configuration snippet could look like this: Of course, this can be also done at runtime using utility setxkbmap. Shell command loading the same keyboard mapping would look like: - setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \ + setxkbmap -rules xorg -model logicordless -layout "us,cz,de" \ -option "grp:alt_shift_toggle" 2.3 Even More Advanced Configuration @@ -125,7 +125,7 @@ enhanced definition of the backslash key). Analogically, the loading runtime will change to: - setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \ + setxkmap -rules xorg -model logicordless -layout "us,cz,de" \ -variant ",bksl," -option "grp:alt_shift_toggle" 2.4 Basic Global Options @@ -139,9 +139,9 @@ components should be used to form the resulting keyboard mapping. This method is rather "brute force". You precisely need to know the structure and the meaning of all of used configuration components. -This method also exposes all xkb configuration details directly into XFree86 -configuration file which is a not very fortunate fact. In rare occasions it -may be needed, though. So how does it work? +This method also exposes all xkb configuration details directly into +xorg.conf configuration file which is a not very fortunate fact. In rare +occasions it may be needed, though. So how does it work? 3.1 Basic Components @@ -168,14 +168,14 @@ Look at the following example: Identifier "Keyboard0" Driver "Keyboard" - Option "XkbKeycodes" "xfree86" + Option "XkbKeycodes" "xorg" Option "XkbTypes" "default" Option "XkbSymbols" "en_US(pc104)+de+swapcaps" Option "XkbGeometry" "pc(pc104)" Option "XkbCompat" "basic+pc+iso9995" EndSection -This configuration sets the standard XFree86 default interpretation of key- +This configuration sets the standard X server default interpretation of key- board keycodes, sets the default modificator types. The symbol table is com- posed of extended US keyboard layout in its variant for pc keyboards with 104 keys plus all keys for german layout are redefined respectively. Also the @@ -192,7 +192,6 @@ been obsoleted by previously described rules files which are far more flexi- ble and allow simpler and more intuitive syntax. It is preserved merely for compatibility reasons. Avoid using it if it is possible. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $ + Generated from Id: XKB-Config.sgml,v 1.1.4.1.6.2 eich Exp $ -$XFree86: xc/programs/xkbcomp/README.config,v 1.6 2003/09/21 01:55:04 dawes Exp $ diff --git a/README.enhancing b/README.enhancing index 695cc5d..9993584 100644 --- a/README.enhancing +++ b/README.enhancing @@ -24,7 +24,7 @@ A useful source is also Ivan Pascal's text about xkb configuration ment. Note that this document covers only enhancements which are to be made to -XFree86 version 4.3.x and above. +XFree86 version 4.3 and X11R6.7.0 and above. 2. The Basics @@ -104,10 +104,10 @@ tricks. 3.1 Levels And Groups -Since XFree86 4.3.0 you can use multi-layout concept of xkb configuration. -Though it is still in boundaries of xkb protocol and general ideas, the -keymap designer must obey new rules when creating new maps. In exchange we -get a more powerful and cleaner configuration system. +Since XFree86 4.3.0 and X11R6.7.0 you can use multi-layout concept of xkb +configuration. Though it is still in boundaries of xkb protocol and general +ideas, the keymap designer must obey new rules when creating new maps. In +exchange we get a more powerful and cleaner configuration system. Remember that it is the application which must decide which symbol matches which keycode according to effective modifier state. The X server itself @@ -423,7 +423,7 @@ this: ! model = keycodes macintosh_old = macintosh ... - * = xfree86 + * = xorg ! model = symbols hp = +inet(%m) @@ -446,10 +446,10 @@ Each rule defines what certain combination of values on the left side of equal sign ('=') results in. For example a (keyboard) model macintosh_old instructs xkb to take definitions of keycodes from file keycodes/macintosh while the rest of models (represented by a wild card '*') instructs it to -take them from file keycodes/xfree86. The wild card represents all possible -values on the left side which were not found in any of the previous rules. -The more specialized (more complete) rules have higher precedence than gen- -eral ones, i.e. the more general rules supply reasonable default values. +take them from file keycodes/xorg. The wild card represents all possible val- +ues on the left side which were not found in any of the previous rules. The +more specialized (more complete) rules have higher precedence than general +ones, i.e. the more general rules supply reasonable default values. As you can see some lines contain substitution parameters - the parameters preceded by the percent sign ('%'). The first alphabetical character after @@ -505,7 +505,6 @@ rules file described above the .lst file could look like: And that should be it. Enjoy creating your own xkb mapping. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.2 dawes Exp $ + Generated from Id: XKB-Enhancing.sgml,v 1.1.10.2 eich Exp $ -$XFree86: xc/programs/xkbcomp/README.enhancing,v 1.5 2003/10/19 19:57:44 dawes Exp $ @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/action.c,v 3.11 2002/11/22 22:56:04 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/action.c,v 3.10tsi Exp $ */ #include "xkbcomp.h" #include "tokens.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/action.h,v 3.3 2002/07/01 02:26:00 tsi Exp $ */ +/* $XFree86$ */ #ifndef ACTION_H #define ACTION_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/alias.c,v 1.5 2002/07/01 02:26:00 tsi Exp $ */ +/* $XFree86$ */ #include "xkbcomp.h" #include "misc.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/alias.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef ALIAS_H #define ALIAS_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/compat.c,v 3.3 2001/01/17 23:45:43 dawes Exp $ */ #include <X11/Xos.h> #include "xkbcomp.h" @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xkbcomp/compat.h,v 1.1 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86$ */ #ifndef COMPAT_H #define COMPAT_H 1 @@ -1,3 +1,4 @@ +/* $XdotOrg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /* $Xorg: expr.c,v 1.5 2000/08/17 19:54:30 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.8 2003/12/18 14:14:37 pascal Exp $ */ +/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.7 2003/08/06 14:04:05 eich Exp $ */ #include "xkbcomp.h" #include "tokens.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/expr.h,v 3.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef EXPR_H #define EXPR_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.6 2003/12/22 17:48:13 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/geometry.c,v 1.5tsi Exp $ */ #include "xkbcomp.h" #include "tokens.h" diff --git a/indicators.c b/indicators.c index 9ff2ffa..3061f3e 100644 --- a/indicators.c +++ b/indicators.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/indicators.c,v 1.4 2001/01/17 23:45:43 dawes Exp $ */ #include "xkbcomp.h" #include "misc.h" diff --git a/indicators.h b/indicators.h index c1d5ea9..041cacc 100644 --- a/indicators.h +++ b/indicators.h @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/indicators.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef INDICATORS_H #define INDICATORS_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keycodes.c,v 3.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #include "xkbcomp.h" #include "tokens.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keycodes.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef KEYCODES_H #define KEYCODES_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keymap.c,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #include "xkbcomp.h" #include "tokens.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.5 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/keytypes.c,v 1.4 2001/01/17 23:45:44 dawes Exp $ */ #include "xkbcomp.h" #include "tokens.h" @@ -70,7 +70,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.10 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/listing.c,v 3.9 2001/12/14 20:01:57 dawes Exp $ */ #include <stdio.h> @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.6 2002/12/20 20:18:33 paulo Exp $ */ +/* $XFree86: xc/programs/xkbcomp/misc.c,v 3.4 2001/01/17 23:45:44 dawes Exp $ */ #include "xkbcomp.h" #include "xkbpath.h" @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/misc.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef MISC_H #define MISC_H 1 diff --git a/parseutils.c b/parseutils.c index 88a2b20..bae18f9 100644 --- a/parseutils.c +++ b/parseutils.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/parseutils.c,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #define DEBUG_VAR_NOT_LOCAL #define DEBUG_VAR parseDebug diff --git a/parseutils.h b/parseutils.h index 7be50d1..2f29e9e 100644 --- a/parseutils.h +++ b/parseutils.h @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/parseutils.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef XKBPARSE_H #define XKBPARSE_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.16 2003/10/31 14:32:04 pascal Exp $ */ +/* $XFree86: xc/programs/xkbcomp/symbols.c,v 3.15 2003/04/19 12:25:31 pascal Exp $ */ #include "xkbcomp.h" #include "tokens.h" @@ -25,7 +25,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.7 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/utils.c,v 3.6 2001/07/25 15:05:24 dawes Exp $ */ #include "utils.h" #include <ctype.h> @@ -27,7 +27,7 @@ * used in advertising or publicity pertaining to distribution of the * software without specific, written prior permission. \*/ -/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.6 2002/12/24 17:43:00 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/utils.h,v 3.5 2002/06/05 00:00:37 dawes Exp $ */ /***====================================================================***/ @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.4 2002/06/05 00:00:37 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/vmod.c,v 3.3 2001/01/17 23:45:45 dawes Exp $ */ #define DEBUG_VAR_NOT_LOCAL #define DEBUG_VAR debugFlags @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/vmod.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ +/* $XFree86$ */ #ifndef VMOD_H #define VMOD_H 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.21 2003/10/08 11:13:03 eich Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbcomp.c,v 3.20 2003/09/24 02:43:38 dawes Exp $ */ #include <stdio.h> #include <ctype.h> @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.9 2002/06/05 00:00:38 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbcomp.h,v 3.8 2001/12/19 21:30:30 dawes Exp $ */ #ifndef XKBCOMP_H #define XKBCOMP_H 1 diff --git a/xkbcomp.man b/xkbcomp.man index 55beef7..aa18d3e 100644 --- a/xkbcomp.man +++ b/xkbcomp.man @@ -3,7 +3,7 @@ .\" .\" .\" -.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.12 2004/01/12 21:43:20 herrb Exp $ +.\" $XFree86: xc/programs/xkbcomp/xkbcomp.man,v 1.11 2003/07/28 21:57:02 herrb Exp $ .\" .TH XKBCOMP 1 __xorgversion__ .SH NAME @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.12 2002/10/16 21:33:04 tsi Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbparse.y,v 3.11tsi Exp $ */ %token END_OF_FILE 0 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.8 2002/11/15 03:14:12 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbpath.c,v 3.7 2002/06/05 00:00:38 dawes Exp $ */ #include <X11/Xlib.h> #include <X11/XKBlib.h> @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.4 2002/11/15 03:14:12 dawes Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbpath.h,v 1.3 2002/07/01 02:26:01 tsi Exp $ */ #ifndef _XKBPATH_H_ #define _XKBPATH_H_ 1 @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.12 2003/08/06 14:04:05 eich Exp $ */ +/* $XFree86: xc/programs/xkbcomp/xkbscan.c,v 3.10 2001/01/17 23:45:45 dawes Exp $ */ #include <stdio.h> #include <ctype.h> |