openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

Update to xkbevd 1.1.2. No functional change.

Browse Source 
ok matthieu@
This commit is contained in:
shadchin
2011-01-11 20:52:08 +00:00
parent a31c2ef17e
commit 8a4ef33aa7
20 changed files with 405 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/xkbevd/AUTHORS
View File

98
app/xkbevd/ChangeLog
View File

@@ -1,3 +1,101 @@
commit 95987d19b9802c235f2257eceff663a4a1e286fa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 8 21:51:11 2010 -0800
xkbevd 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 96ec51a0d91920c69d1cfb9e084cc84c4d86ff20
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:42:35 2010 -0800
Purge RCS/CVS version tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2a56e8dda4bac8621dedcb80b1f55c9a25c78d43
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:36:25 2010 -0800
Fix errors found by gcc's printf attribute check
xkbevd.c: In function `parseArgs':
xkbevd.c:120: warning: too few arguments for format
xkbevd.c:139: warning: too few arguments for format
xkbevd.c:158: warning: too few arguments for format
xkbevd.c:177: warning: too few arguments for format
xkbevd.c: In function `InterpretConfigs':
xkbevd.c:280: warning: format argument is not a pointer (arg 2)
xkbevd.c: In function `FindMatchingConfig':
xkbevd.c:374: warning: too few arguments for format
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 45d575da032967b8920cf57491b7bd3bcd2991af
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:32:08 2010 -0800
Add printf attributes to util.c functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit d304e315d8143b4fbcb99e8086a6fad0dd051384
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:21:37 2010 -0800
Constify arguments to utils.c functions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 517ad56361ff9545bfc9730523e713a2bf641943
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:10:25 2010 -0800
Remove trailing whitespace
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 04208bd63c1e81a2fada019bbf986c4cd93d0272
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:09:30 2010 -0800
Combine usage message into a single string
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit e56d87af20b96113dc40510811cadff028fe911f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Nov 20 18:02:46 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a5d49274162fbaad7dfcf5879e4e229bc7801fe0
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 1 13:35:06 2010 -0400
config: cfgparse.c is in the root dir and not in src dir
The test for the yacc generated file was done in the wrong directory.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit c9e521f4ab7d07ee9b4b0ce7779bc939e7051e95
Author: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon Nov 1 09:46:20 2010 +0100
config: replace AC_CHECK_FILE with test -f
* AC_CHECK_FILE doesn't work for cross compilation
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 14e12f714eead3f0185ab7996d6a1a38897c25cc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 10:06:46 2010 -0700

236
app/xkbevd/INSTALL
View File

@@ -289,239 +289,3 @@ operates.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:
/bin/bash ./configure CONFIG_SHELL=/bin/bash
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

4
app/xkbevd/Makefile.am
View File

@@ -1,5 +1,5 @@
# Copyright 2005 Red Hat, Inc.
#
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

9
app/xkbevd/Makefile.in
View File

@@ -15,7 +15,7 @@
@SET_MAKE@
# Copyright 2005 Red Hat, Inc.
#
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -25,7 +25,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -60,9 +60,8 @@ host_triplet = @host@
bin_PROGRAMS = xkbevd$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
cfgparse.c config.guess config.sub depcomp install-sh missing \
ylwrap
$(top_srcdir)/configure COPYING ChangeLog INSTALL cfgparse.c \
config.guess config.sub depcomp install-sh missing ylwrap
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac

0
app/xkbevd/NEWS
View File

12
app/xkbevd/aclocal.m4 vendored
View File

@@ -498,18 +498,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

26
app/xkbevd/cfgparse.y
View File

@@ -1,4 +1,3 @@
/* $Xorg: cfgparse.y,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/cfgparse.y,v 1.4tsi Exp $ */
%token
END_OF_FILE 0
@@ -90,7 +88,7 @@ CfgFile : CfgEntryList
;
CfgEntryList : CfgEntryList CfgEntry
{
{
CfgEntryPtr tmp;
if ($1!=NULL) {
for (tmp=$1;tmp->next!=NULL;tmp=tmp->next) {
@@ -155,14 +153,14 @@ EventType : BELL { $$= XkbBellNotify; }
;
ActionDef : ActionType OptString
{
{
ActDefPtr act;
act= uTypedCalloc(1,ActDefRec);
if (act) {
act->type= $1;
act->text= $2;
}
$$= act;
$$= act;
}
;

38
app/xkbevd/cfgscan.c
View File

@@ -1,4 +1,3 @@
/* $Xorg: cfgscan.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/cfgscan.c,v 3.6 2001/01/17 23:46:07 dawes Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -136,7 +134,7 @@ int ch;
else if ( ch == '0' ) {
int tmp,stop;
ch = stop = 0;
if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -144,7 +142,7 @@ int ch;
stop= 1;
ungetc(tmp,yyin);
}
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -152,7 +150,7 @@ int ch;
stop= 1;
ungetc(tmp,yyin);
}
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -165,7 +163,7 @@ int ch;
else return ERROR;
}
if ( nInBuf < BUFSIZE-1 )
if ( nInBuf < BUFSIZE-1 )
buf[nInBuf++] = ch;
}
if ( ch == '"' ) {
@@ -198,7 +196,7 @@ int ch;
else if ( ch == '0' ) {
int tmp,stop;
ch = stop = 0;
if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if (((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -206,7 +204,7 @@ int ch;
stop= 1;
ungetc(tmp,yyin);
}
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -214,7 +212,7 @@ int ch;
stop= 1;
ungetc(tmp,yyin);
}
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
if ((!stop) && ((tmp=getc(yyin))!=EOF) && (isdigit(tmp)) &&
(tmp!='8') && (tmp!='9')) {
ch= (ch*8)+(tmp-'0');
}
@@ -227,7 +225,7 @@ int ch;
else return ERROR;
}
if ( nInBuf < BUFSIZE-1 )
if ( nInBuf < BUFSIZE-1 )
buf[nInBuf++] = ch;
}
if (( ch == '>' )&&(nInBuf<5)) {
@@ -332,7 +330,7 @@ yylex(void)
{
int ch;
int rtrn;
do {
ch = getc(yyin);
if ( ch == '\n' ) {

254
app/xkbevd/configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62 for xkbevd 1.1.1.
# Generated by GNU Autoconf 2.62 for xkbevd 1.1.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -596,10 +596,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xkbevd'
PACKAGE_TARNAME='xkbevd'
PACKAGE_VERSION='1.1.1'
PACKAGE_STRING='xkbevd 1.1.1'
PACKAGE_VERSION='1.1.2'
PACKAGE_STRING='xkbevd 1.1.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -697,9 +698,6 @@ am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
YACC
YFLAGS
YACC_INST
CC
CFLAGS
LDFLAGS
@@ -747,6 +745,9 @@ ADMIN_MAN_DIR
XORG_MAN_PAGE
MAN_SUBSTS
AM_DEFAULT_VERBOSITY
YACC
YFLAGS
YACC_INST
XKBEVD_CFLAGS
XKBEVD_LIBS
LIBOBJS
@@ -761,8 +762,6 @@ enable_strict_compilation
ac_precious_vars='build_alias
host_alias
target_alias
YACC
YFLAGS
CC
CFLAGS
LDFLAGS
@@ -770,6 +769,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
YACC
YFLAGS
XKBEVD_CFLAGS
XKBEVD_LIBS'
@@ -1324,7 +1325,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 xkbevd 1.1.1 to adapt to many kinds of systems.
\`configure' configures xkbevd 1.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1395,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xkbevd 1.1.1:";;
short | recursive ) echo "Configuration of xkbevd 1.1.2:";;
esac
cat <<\_ACEOF
@@ -1411,11 +1412,6 @@ Optional Features:
errors (default: disabled)
Some influential environment variables:
YACC The `Yet Another C Compiler' implementation to use. Defaults to
the first program found out of: `bison -y', `byacc', `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
This script will default YFLAGS to the empty string to avoid a
default value of `-d' given by some make applications.
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1425,6 +1421,11 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
YACC The `Yet Another C Compiler' implementation to use. Defaults to
the first program found out of: `bison -y', `byacc', `yacc'.
YFLAGS The list of arguments that will be passed by default to $YACC.
This script will default YFLAGS to the empty string to avoid a
default value of `-d' given by some make applications.
XKBEVD_CFLAGS
C compiler flags for XKBEVD, overriding pkg-config
XKBEVD_LIBS linker flags for XKBEVD, overriding pkg-config
@@ -1495,7 +1496,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
xkbevd configure 1.1.1
xkbevd configure 1.1.2
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1509,7 +1510,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 xkbevd $as_me 1.1.1, which was
It was created by xkbevd $as_me 1.1.2, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -1875,6 +1876,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
# Initialize Automake
am__api_version="1.9"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2158,7 +2164,7 @@ fi
# Define the identity of the package.
PACKAGE='xkbevd'
VERSION='1.1.1'
VERSION='1.1.2'
cat >>confdefs.h <<_ACEOF
@@ -2341,123 +2347,6 @@ fi
ac_config_headers="$ac_config_headers config.h"
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_YACC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_YACC="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
YACC=$ac_cv_prog_YACC
if test -n "$YACC"; then
{ $as_echo "$as_me:$LINENO: result: $YACC" >&5
$as_echo "$YACC" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$YACC" && break
done
test -n "$YACC" || YACC="yacc"
# Extract the first word of "$YACC", so it can be a program name with args.
set dummy $YACC; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_YACC_INST+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $YACC_INST in
[\\/]* | ?:[\\/]*)
ac_cv_path_YACC_INST="$YACC_INST" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_YACC_INST="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
YACC_INST=$ac_cv_path_YACC_INST
if test -n "$YACC_INST"; then
{ $as_echo "$as_me:$LINENO: result: $YACC_INST" >&5
$as_echo "$YACC_INST" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
as_ac_File=`$as_echo "ac_cv_file_$srcdir/cfgparse.c" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $srcdir/cfgparse.c" >&5
$as_echo_n "checking for $srcdir/cfgparse.c... " >&6; }
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
{ { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
if test -r "$srcdir/cfgparse.c"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
ac_res=`eval 'as_val=${'$as_ac_File'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if test `eval 'as_val=${'$as_ac_File'}
$as_echo "$as_val"'` = yes; then
:
else
test -z "$YACC_INST" && { { $as_echo "$as_me:$LINENO: error: yacc not found - unable to compile cfgparse.y" >&5
$as_echo "$as_me: error: yacc not found - unable to compile cfgparse.y" >&2;}
{ (exit 1); exit 1; }; }
fi
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -5015,6 +4904,97 @@ AM_DEFAULT_VERBOSITY=1
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_YACC+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_YACC="$ac_prog"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
YACC=$ac_cv_prog_YACC
if test -n "$YACC"; then
{ $as_echo "$as_me:$LINENO: result: $YACC" >&5
$as_echo "$YACC" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$YACC" && break
done
test -n "$YACC" || YACC="yacc"
# Extract the first word of "$YACC", so it can be a program name with args.
set dummy $YACC; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_YACC_INST+set}" = set; then
$as_echo_n "(cached) " >&6
else
case $YACC_INST in
[\\/]* | ?:[\\/]*)
ac_cv_path_YACC_INST="$YACC_INST" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_YACC_INST="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
YACC_INST=$ac_cv_path_YACC_INST
if test -n "$YACC_INST"; then
{ $as_echo "$as_me:$LINENO: result: $YACC_INST" >&5
$as_echo "$YACC_INST" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test ! -f "cfgparse.c"; then
if test -z "$YACC_INST"; then
{ { $as_echo "$as_me:$LINENO: error: yacc not found - unable to compile cfgparse.y" >&5
$as_echo "$as_me: error: yacc not found - unable to compile cfgparse.y" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
# Checks for pkg-config packages
pkg_failed=no
@@ -5570,7 +5550,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by xkbevd $as_me 1.1.1, which was
This file was extended by xkbevd $as_me 1.1.2, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5623,7 +5603,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
xkbevd config.status 1.1.1
xkbevd config.status 1.1.2
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

23
app/xkbevd/configure.ac
View File

@@ -1,5 +1,5 @@
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@ dnl advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
dnl
dnl
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -20,9 +20,14 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xkbevd], [1.1.1],
AC_INIT([xkbevd], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xkbevd])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -30,15 +35,15 @@ AM_MAINTAINER_MODE
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
XORG_DEFAULT_OPTIONS
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
AC_CHECK_FILE([$srcdir/cfgparse.c], [],
[test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])])
XORG_DEFAULT_OPTIONS
if test ! -f "cfgparse.c"; then
if test -z "$YACC_INST"; then
AC_MSG_ERROR([yacc not found - unable to compile cfgparse.y])
fi
fi
# Checks for pkg-config packages
PKG_CHECK_MODULES(XKBEVD, xkbfile x11)

22
app/xkbevd/evargs.c
View File

@@ -1,4 +1,3 @@
/* $Xorg: evargs.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/evargs.c,v 1.3 1999/03/02 11:49:59 dawes Exp $ */
#define DEBUG_VAR evargsDebug
#include "xkbevd.h"
@@ -76,7 +74,7 @@ AppendActionMessageArg(char *sink, char *arg, XkbEvent *ev)
{
if (uStringEqual(arg,"device")||uStringEqual(arg,"D"))
sprintf(sink,"%d",ev->message.device);
else if (uStringEqual(arg,"message")||uStringEqual(arg,"m"))
else if (uStringEqual(arg,"message")||uStringEqual(arg,"m"))
sprintf(sink,"%s",ev->message.message);
else if (uStringEqual(arg,"keycode")||uStringEqual(arg,"key")||
uStringEqual(arg,"k"))

1
app/xkbevd/example.cf
View File

@@ -1,4 +1,3 @@
//$Xorg: example.cf,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
soundDirectory = "/space/erik/.xkb/sounds/"
Bell() "ss/08.ting.aifc"

26
app/xkbevd/printev.c
View File

@@ -1,4 +1,3 @@
/* $Xorg: printev.c,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/printev.c,v 3.3 1999/03/02 11:49:59 dawes Exp $ */
#define DEBUG_VAR printevDebug
#include "xkbevd.h"
@@ -153,7 +151,7 @@ static void
do_XkbIndicatorNotify(FILE *file, XkbEvent *xkbev)
{
XkbIndicatorNotifyEvent *leds = &xkbev->indicators;
if (leds->xkb_type==XkbIndicatorStateNotify)
if (leds->xkb_type==XkbIndicatorStateNotify)
fprintf(file," state changes= 0x%08x, new state= 0x%08x\n",
leds->changed,leds->state);
else fprintf(file," map changes= 0x%08x, state= 0x%08x\n",
@@ -391,7 +389,7 @@ do_ButtonPress(XkbEvent *eventp)
printf (" root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
printf (" state 0x%x, group= %d, button %u, same_screen %s\n",
e->state&0x1FFF, (e->state>>13)&0x7, e->button,
e->state&0x1FFF, (e->state>>13)&0x7, e->button,
ynText(e->same_screen));
return;
@@ -412,7 +410,7 @@ do_MotionNotify(XkbEvent *eventp)
printf (" root 0x%lx, subw 0x%lx, time %lu, (%d,%d), root:(%d,%d),\n",
e->root, e->subwindow, e->time, e->x, e->y, e->x_root, e->y_root);
printf (" state 0x%x, group= %d, is_hint %u, same_screen %s\n",
e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
e->state&0x1FFF, (e->state>>13)&0x7, e->is_hint,
ynText(e->same_screen));
return;

19
app/xkbevd/tokens.h
View File

@@ -1,4 +1,3 @@
/* $Xorg: tokens.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -7,19 +6,19 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.

40
app/xkbevd/utils.c
View File

@@ -1,6 +1,5 @@
/*\
* $XFree86: xc/programs/xkbevd/utils.c,v 3.5 2001/07/25 15:05:25 dawes Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
@@ -9,8 +8,8 @@
*
* THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
* SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
* DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
* FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
* FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* WARRANTY.
*
* IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -22,10 +21,9 @@
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Digital Equipment Corporation not be
* used in advertising or publicity pertaining to distribution of the
* used in advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
\*/
/* $Xorg: utils.c,v 1.5 2000/08/17 19:54:49 cpqbld Exp $ */
#define DEBUG_VAR_LOCAL
#include "utils.h"
@@ -96,7 +94,7 @@ static FILE *entryFile= NULL;
static int uEntryLevel;
Boolean
uSetEntryFile(char *name)
uSetEntryFile(const char *name)
{
if ((entryFile!=NULL)&&(entryFile!=stderr)) {
fprintf(entryFile,"switching to %s\n",name?name:"stderr");
@@ -112,7 +110,7 @@ uSetEntryFile(char *name)
}
void
uEntry(int l, char *s,...)
uEntry(int l, const char *s,...)
{
int i;
va_list ap;
@@ -128,7 +126,7 @@ va_list ap;
}
void
uExit(int l, char *rtVal)
uExit(int l, const char *rtVal)
{
int i;
@@ -150,7 +148,7 @@ int i;
int uDebugIndentSize= 4;
Boolean
uSetDebugFile(char *name)
uSetDebugFile(const char *name)
{
if ((uDebugFile!=NULL)&&(uDebugFile!=stderr)) {
fprintf(uDebugFile,"switching to %s\n",name?name:"stderr");
@@ -166,7 +164,7 @@ uSetDebugFile(char *name)
}
void
uDebug(char *s,...)
uDebug(const char *s,...)
{
int i;
va_list ap;
@@ -182,7 +180,7 @@ va_list ap;
}
void
uDebugNOI(char *s,...)
uDebugNOI(const char *s,...)
{
va_list ap;
@@ -198,7 +196,7 @@ va_list ap;
static FILE *errorFile= NULL;
Boolean
uSetErrorFile(char *name)
uSetErrorFile(const char *name)
{
if ((errorFile!=NULL)&&(errorFile!=stderr)) {
fprintf(errorFile,"switching to %s\n",name?name:"stderr");
@@ -214,7 +212,7 @@ uSetErrorFile(char *name)
}
void
uInformation(char *s,...)
uInformation(const char *s,...)
{
va_list ap;
@@ -228,7 +226,7 @@ uInformation(char *s,...)
/***====================================================================***/
void
uAction(char *s,...)
uAction(const char *s,...)
{
va_list ap;
@@ -243,7 +241,7 @@ uAction(char *s,...)
/***====================================================================***/
void
uWarning(char *s,...)
uWarning(const char *s,...)
{
va_list ap;
@@ -258,7 +256,7 @@ uWarning(char *s,...)
/***====================================================================***/
void
uError(char *s,...)
uError(const char *s,...)
{
va_list ap;
@@ -273,7 +271,7 @@ uError(char *s,...)
/***====================================================================***/
void
uFatalError(char *s,...)
uFatalError(const char *s,...)
{
va_list ap;
@@ -290,7 +288,7 @@ uFatalError(char *s,...)
/***====================================================================***/
void
uInternalError(char *s,...)
uInternalError(const char *s,...)
{
va_list ap;
@@ -306,7 +304,7 @@ uInternalError(char *s,...)
#ifndef HAVE_STRDUP
char *
uStringDup(char *str)
uStringDup(const char *str)
{
char *rtrn;
@@ -320,7 +318,7 @@ char *rtrn;
#ifndef HAVE_STRCASECMP
int
uStrCaseCmp(char *str1, char *str2)
uStrCaseCmp(const char *str1, const char *str2)
{
char buf1[512],buf2[512];
char c, *s;
@@ -346,7 +344,7 @@ uStrCaseCmp(char *str1, char *str2)
}
int
uStrCasePrefix(char *prefix, char *str)
uStrCasePrefix(const char *prefix, const char *str)
{
char c1;
char c2;

49
app/xkbevd/utils.h
View File

@@ -2,7 +2,6 @@
#define UTILS_H 1
/*\
* $Xorg: utils.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
*
* COPYRIGHT 1990
* DIGITAL EQUIPMENT CORPORATION
@@ -11,8 +10,8 @@
*
* THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
* SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
* DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
* FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
* FOR ANY PURPOSE. IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
* WARRANTY.
*
* IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -24,10 +23,9 @@
* that the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation, and that the name of Digital Equipment Corporation not be
* used in advertising or publicity pertaining to distribution of the
* used in advertising or publicity pertaining to distribution of the
* software without specific, written prior permission.
\*/
/* $XFree86: xc/programs/xkbevd/utils.h,v 1.6 2002/01/14 18:30:11 dawes Exp $ */
/***====================================================================***/
@@ -79,7 +77,7 @@ typedef union {
int i;
unsigned u;
void *p;
void *(*fp)();
void *(*fp)();
} Union;
#endif
@@ -120,13 +118,13 @@ extern void uFree(
/***====================================================================***/
extern Boolean uSetErrorFile ( char *name );
extern void uInformation ( char *s, ...);
extern void uAction ( char *s, ... );
extern void uWarning ( char *s, ... );
extern void uError ( char *s, ... );
extern void uFatalError(char *s,...);
extern void uInternalError ( char *s, ... );
extern Boolean uSetErrorFile ( const char *name );
extern void uInformation ( const char *s, ...) _X_ATTRIBUTE_PRINTF(1,2);
extern void uAction ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
extern void uWarning ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
extern void uError ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
extern void uFatalError( const char *s,...) _X_ATTRIBUTE_PRINTF(1,2);
extern void uInternalError ( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
/***====================================================================***/
@@ -142,19 +140,19 @@ extern void uInternalError ( char *s, ... );
#define uStrCasePrefix(p,s) (strncasecmp(p,s,strlen(p))==0)
#else
extern int uStrCaseCmp(
char * /* s1 */,
char * /* s2 */
const char * /* s1 */,
const char * /* s2 */
);
extern int uStrCasePrefix(
char * /* p */,
char * /* str */
const char * /* p */,
const char * /* str */
);
#endif
#ifdef HAVE_STRDUP
#define uStringDup(s1) (strdup(s1))
#else
extern char *uStringDup(
char * /* s1 */
const char * /* s1 */
);
#endif
@@ -176,10 +174,11 @@ extern char *uStringDup(
extern
unsigned int DEBUG_VAR;
extern void uDebug( char *s, ... );
extern void uDebugNOI( char *s, ... ); /* no indent */
extern void uDebug( const char *s, ... ) _X_ATTRIBUTE_PRINTF(1,2);
extern void uDebugNOI( const char *s, ... ) /* no indent */
_X_ATTRIBUTE_PRINTF(1,2);
extern Boolean uSetDebugFile(
char *name
const char *name
);
extern FILE *uDebugFile;
extern int uDebugIndentLevel;
@@ -215,11 +214,11 @@ extern int uDebugIndentSize;
#endif
extern Boolean uSetEntryFile(
char *name
const char *name
);
extern void uEntry(int l, char *s, ... );
extern void uEntry(int l, const char *s, ... ) _X_ATTRIBUTE_PRINTF(2,3);
extern void uExit(
int l,char *rtVal
int l, const char *rtVal
);
#ifdef ENTRY_TRACKING_ON
#define ENTRY_BIT 0x10
@@ -272,7 +271,7 @@ extern int uEntryLevel;
#define uFLAG_ENTRY7(f,s,a,b,c,d,e,g,h)
#define uFLAG_RETURN(v) { return(v);}
#define uFLAG_VOIDRETURN { return; }
#endif
#endif
_XFUNCPROTOEND

74
app/xkbevd/xkbevd.c
View File

@@ -1,4 +1,3 @@
/* $Xorg: xkbevd.c,v 1.4 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/xkbevd.c,v 3.8 2001/01/17 23:46:09 dawes Exp $ */
#define DEBUG_VAR xkbevdDebug
#include <X11/Xosdefs.h>
@@ -81,22 +79,19 @@ XkbDescPtr xkb= NULL;
/***====================================================================***/
#define M(m) fprintf(stderr,(m))
#define M1(m,a) fprintf(stderr,(m),(a))
static void
Usage(int argc, char *argv[])
{
M1("Usage: %s [options]...\n",argv[0]);
M("Legal options:\n");
M("-?,-help Print this message\n");
M("-cfg <file> Specify a config file\n");
M("-sc <cmd> Specify the command to play sounds\n");
M("-sd <dir> Specify the root directory for sound files\n");
M("-d[isplay] <dpy> Specify the display to watch\n");
M("-bg Run in background\n");
M("-synch Force synchronization\n");
M("-v Print verbose messages\n");
fprintf(stderr, "Usage: %s [options]...\n%s", argv[0],
"Legal options:\n"
"-?, -help Print this message\n"
"-cfg <file> Specify a config file\n"
"-sc <cmd> Specify the command to play sounds\n"
"-sd <dir> Specify the root directory for sound files\n"
"-d[isplay] <dpy> Specify the display to watch\n"
"-bg Run in background\n"
"-synch Force synchronization\n"
"-v Print verbose messages\n");
return;
}
@@ -119,8 +114,9 @@ register int i;
else {
char *name= argv[++i];
if (cfgFileName!=NULL) {
if (uStringEqual(cfgFileName,name))
uWarning("Config file \"%s\" specified twice!\n");
if (uStringEqual(cfgFileName,name))
uWarning("Config file \"%s\" specified twice!\n",
name);
else {
uWarning("Multiple config files on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -138,8 +134,9 @@ register int i;
else {
char *name= argv[++i];
if (dpyName!=NULL) {
if (uStringEqual(dpyName,name))
uWarning("Display \"%s\" specified twice!\n");
if (uStringEqual(dpyName,name))
uWarning("Display \"%s\" specified twice!\n",
name);
else {
uWarning("Multiple displays on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -157,8 +154,9 @@ register int i;
else {
char *name= argv[++i];
if (soundCmd!=NULL) {
if (uStringEqual(soundCmd,name))
uWarning("Sound command \"%s\" specified twice!\n");
if (uStringEqual(soundCmd,name))
uWarning("Sound command \"%s\" specified twice!\n",
name);
else {
uWarning("Multiple sound commands on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -176,8 +174,9 @@ register int i;
else {
char *name= argv[++i];
if (soundDir!=NULL) {
if (uStringEqual(soundDir,name))
uWarning("Sound directory \"%s\" specified twice!\n");
if (uStringEqual(soundDir,name))
uWarning("Sound directory \"%s\" specified twice!\n",
name);
else {
uWarning("Multiple sound dirs on command line\n");
uAction("Using \"%s\", ignoring \"%s\"\n",name,
@@ -280,7 +279,7 @@ unsigned priv= 0;
}
}
else {
uWarning("Assignment to unknown variable \"%s\"\n",cfg->name);
uWarning("Assignment to unknown variable \"%s\"\n", name);
uAction("Ignored\n");
}
}
@@ -292,9 +291,9 @@ unsigned priv= 0;
break;
case XkbAccessXNotify:
priv= 0;
if (name==NULL)
if (name==NULL)
priv= XkbAllNewKeyboardEventsMask;
else if (uStrCaseEqual(name,"skpress"))
else if (uStrCaseEqual(name,"skpress"))
priv= XkbAXN_SKPressMask;
else if (uStrCaseEqual(name,"skaccept"))
priv= XkbAXN_SKAcceptMask;
@@ -374,7 +373,8 @@ CfgEntryPtr cfg,dflt;
return cfg;
break;
default:
uInternalError("Can't handle type %d XKB events yet, Sorry.\n");
uInternalError("Can't handle type %d XKB events yet, Sorry.\n",
ev->any.xkb_type);
break;
}
}
@@ -501,7 +501,7 @@ Bool ok;
if (background) {
if (fork()!=0) {
if (verbose)
if (verbose)
uInformation("Running in the background\n");
exit(0);
}

20
app/xkbevd/xkbevd.h
View File

@@ -1,4 +1,3 @@
/* $Xorg: xkbevd.h,v 1.3 2000/08/17 19:54:49 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -7,24 +6,23 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
documentation, and that the name of Silicon Graphics not be
used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
Silicon Graphics makes no representation about the suitability
Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.4 2001/01/17 23:46:09 dawes Exp $ */
#ifndef XKBEVD_H
#define XKBEVD_H 1

44
app/xkbevd/xkbevd.man
View File

@@ -1,7 +1,3 @@
.\" $XdotOrg: $
.\" $Xorg: xkbevd.man,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
.\"
.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
.\"
.TH XKBEVD 1 __xorgversion__
.SH NAME
@@ -11,29 +7,29 @@ xkbevd \- XKB event daemon
[ options ]
.SH DESCRIPTION
.PP
This command is very raw and is therefore only partially implemented; we
present it here as a rough prototype for developers, not as a general purpose
This command is very raw and is therefore only partially implemented; we
present it here as a rough prototype for developers, not as a general purpose
tool for end users. Something like this might make a suitable replacement
for xev; I'm not signing up, mind you, but it's an interesting idea.
.PP
The
.I xkbevd
event daemon listens for specified XKB events and executes requested commands
if they occur. The configuration file consists of a list of event
specification/action pairs and/or variable definitions.
if they occur. The configuration file consists of a list of event
specification/action pairs and/or variable definitions.
.PP
An event specification consists of a short XKB event name followed by a
string or identifier which serves as a qualifier in parentheses; empty
parenthesis indicate no qualification and serve to specify the default
command which is applied to events which do not match any of the other
specifications. The interpretation of the qualifier depends on the type
of the event: Bell events match using the name of the bell, message events
match on the contents of the message string and slow key events accept
any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP. No
An event specification consists of a short XKB event name followed by a
string or identifier which serves as a qualifier in parentheses; empty
parenthesis indicate no qualification and serve to specify the default
command which is applied to events which do not match any of the other
specifications. The interpretation of the qualifier depends on the type
of the event: Bell events match using the name of the bell, message events
match on the contents of the message string and slow key events accept
any of \fIpress\fP, \fIrelease\fP, \fIaccept\fP, or \fIreject\fP. No
other events are currently recognized.
.PP
An action consists of an optional keyword followed by an optional string
argument. Currently, \fIxkbev\fP recognizes the actions: \fInone\fP,
An action consists of an optional keyword followed by an optional string
argument. Currently, \fIxkbev\fP recognizes the actions: \fInone\fP,
\fIignore\fP, \fIecho\fP, \fIprintEvent\fP, \fIsound\fP, and \fIshell\fP.
If the action is not specified, the string is taken as the name of a sound
file to be played unless it begins with an exclamation point, in which case
@@ -41,12 +37,12 @@ it is taken as a shell command.
.PP
Variable definitions in the argument string are expanded with fields from
the event in question before the argument string is passed to the action
processor. The general syntax for a variable is
processor. The general syntax for a variable is
either $\fIc\P or $(\fIstr\fP), where \fIc\fP is a single character and
\fIstr\fP is a string of arbitrary length. All parameters have both
single-character and long names.
\fIstr\fP is a string of arbitrary length. All parameters have both
single-character and long names.
.PP
The list of recognized parameters varies from event to event and is too long
The list of recognized parameters varies from event to event and is too long
to list here right now. This is a developer release anyway, so you can
be expected to look at the source code (evargs.c is of particular interest).
.PP
@@ -54,7 +50,7 @@ The \fIignore\fP, \fIecho\fP, \fIprintEvent\fP, \fIsound\fP,and \fIshell\fP
actions do what you would expect commands named \fIignore\fP, \fIecho\fP,
\fIprintEvent\fP, \fIsound\fP, and \fIshell\fP to do, except that the sound
command has only been implemented and tested for SGI machines. It launches
an external program right now, so it should be pretty easy to adapt,
an external program right now, so it should be pretty easy to adapt,
especially if you like audio cues that arrive about a half-second after you
expect them.
.PP
@@ -87,7 +83,7 @@ Tells \fIxkbevd\fP to fork itself (and run in the background).
Forces synchronization of all X requests. Slow.
.TP 8
.B \-v
Print more information, including debugging messages. Multiple
Print more information, including debugging messages. Multiple
specifications of \fI-v\fP cause more output, to a point.
.SH "SEE ALSO"
X(__miscmansuffix__)