qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to fixesproto 5.0

Browse Source
This commit is contained in:
matthieu 2011-04-17 15:15:09 +00:00
parent 95e3242529
commit 682c873c29
7 changed files with 159 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/fixesproto/COPYING
View File

@ -1,4 +1,5 @@
Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
Copyright 2010 Red Hat, Inc.
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

21
proto/fixesproto/ChangeLog
View File

@ -1,3 +1,24 @@
commit b8a682cc30499a751091c84efabb3012e02f47c5
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Feb 28 09:53:30 2011 -0500
fixesproto 5.0
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 9760b4bdd1f9fdd6a33b9f876c4a835ed969aa84
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Nov 15 17:09:31 2010 -0500
fixesproto v5: Pointer barriers
v3: Review fixes:
- INT16 not CARD16 for coordinates
- BadDevice not BadMatch
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 29324d36b3aa6697268c9b51522afcafc2244361 commit 29324d36b3aa6697268c9b51522afcafc2244361
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 21:01:26 2010 -0700 Date: Fri Oct 29 21:01:26 2010 -0700

291
proto/fixesproto/INSTALL
View File

@ -1,291 +0,0 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
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 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.
Running `configure' might take a while. 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.
6. Often, you can also type `make uninstall' to remove the installed
files again.
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=c99 CFLAGS=-g 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 can use 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 `..'.
With a non-GNU `make', it is safer 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.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
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.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
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).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--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.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

2
proto/fixesproto/configure.ac
View File

@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([FixesProto], [4.1.2], AC_INIT([FixesProto], [5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

92
proto/fixesproto/fixesproto.txt
View File

@ -1,7 +1,7 @@
The XFIXES Extension The XFIXES Extension
Version 4.0 Version 5.0
Document Revision 2 Document Revision 1
2006-12-14 2010-11-15
Keith Packard Keith Packard
keithp@keithp.com keithp@keithp.com
@ -19,7 +19,7 @@ developers, in particular,
+ Owen Taylor for describing the issues raised with the XEMBED + Owen Taylor for describing the issues raised with the XEMBED
mechanisms and SaveSet processing and his initial extension mechanisms and SaveSet processing and his initial extension
to handle this issue. to handle this issue, and for pointer barriers
+ Bill Haneman for the design for cursor image tracking. + Bill Haneman for the design for cursor image tracking.
@ -566,6 +566,90 @@ ShowCursor
Servers supporting the X Input Extension Version 2.0 or higher show Servers supporting the X Input Extension Version 2.0 or higher show
all visible cursors in response to a ShowCursor request. all visible cursors in response to a ShowCursor request.
************* XFIXES VERSION 5 OR BETTER ***********
12. Pointer Barriers
Compositing managers and desktop environments may have UI elements in
particular screen locations such that for a single-headed display they
correspond to easy targets according to Fitt's Law, for example, the top
left corner. For a multi-headed environment these corners should still be
semi-impermeable. Pointer barriers allow the application to define
additional constraint on cursor motion so that these areas behave as
expected even in the face of multiple displays.
Absolute positioning devices like touchscreens do not obey pointer barriers.
There's no advantage to target acquisition to do so, since on a touchscreen
all points are in some sense equally large, whereas for a relative
positioning device the edges and corners are infinitely large.
WarpPointer and similar requests do not obey pointer barriers, for
essentially the same reason.
12.1 Types
BARRIER: XID
BarrierDirections
BarrierPositiveX: 1 << 0
BarrierPositiveY: 1 << 1
BarrierNegativeX: 1 << 2
BarrierNegativeY: 1 << 3
12.2 Errors
Barrier
12.3 Requests
CreatePointerBarrier
barrier: BARRIER
drawable: DRAWABLE
x1, y2, x2, y2: INT16
directions: CARD32
devices: LISTofDEVICEID
Creates a pointer barrier along the line specified by the given
coordinates on the screen associated with the given drawable. The
barrier has no spatial extent; it is simply a line along the left
or top edge of the specified pixels. Barrier coordinates are in
screen space.
The coordinates must be axis aligned, either x1 == x2, or
y1 == y2, but not both. The varying coordinates may be specified
in any order. For x1 == x2, either y1 > y2 or y1 < y2 is valid.
If the coordinates are not valid BadValue is generated.
Motion is allowed through the barrier in the directions specified:
setting the BarrierPositiveX bit allows travel through the barrier
in the positive X direction, etc. Nonsensical values (forbidding Y
axis travel through a vertical barrier, for example) and excess set
bits are ignored.
If the server supports the X Input Extension version 2 or higher,
the devices element names a set of master device to apply the
barrier to. If XIAllDevices or XIAllMasterDevices are given, the
barrier applies to all master devices. If a slave device is named,
BadDevice is generated; this does not apply to slave devices named
implicitly by XIAllDevices. Naming a device multiple times is
legal, and is treated as though it were named only once. If a
device is removed, the barrier continues to apply to the remaining
devices, but will not apply to any future device with the same ID
as the removed device. Nothing special happens when all matching
devices are removed; barriers must be explicitly destroyed.
Errors: IDChoice, Window, Value, Device
DestroyPointerBarrier
barrier: BARRIER
Destroys the named barrier.
Errors: Barrier
99. Future compatibility 99. Future compatibility
This extension is not expected to remain fixed. Future changes will This extension is not expected to remain fixed. Future changes will

33
proto/fixesproto/xfixesproto.h
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Red Hat, Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -500,6 +501,38 @@ typedef struct {
#define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq) #define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq)
/*************** Version 5.0 ******************/
#define Barrier CARD32
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
CARD16 length B16;
Barrier barrier B32;
Window window B32;
INT16 x1 B16;
INT16 y1 B16;
INT16 x2 B16;
INT16 y2 B16;
CARD32 directions;
CARD16 pad B16;
CARD16 num_devices B16;
/* array of CARD16 devices */
} xXFixesCreatePointerBarrierReq;
#define sz_xXFixesCreatePointerBarrierReq 28
typedef struct {
CARD8 reqType;
CARD8 xfixesReqType;
CARD16 length B16;
Barrier barrier B32;
} xXFixesDestroyPointerBarrierReq;
#define sz_xXFixesDestroyPointerBarrierReq 8
#undef Barrier
#undef Region #undef Region
#undef Picture #undef Picture
#undef Window #undef Window

18
proto/fixesproto/xfixeswire.h
View File

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Red Hat, Inc.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -47,7 +48,7 @@
#define _XFIXESWIRE_H_ #define _XFIXESWIRE_H_
#define XFIXES_NAME "XFIXES" #define XFIXES_NAME "XFIXES"
#define XFIXES_MAJOR 4 #define XFIXES_MAJOR 5
#define XFIXES_MINOR 0 #define XFIXES_MINOR 0
/*************** Version 1 ******************/ /*************** Version 1 ******************/
@ -85,8 +86,11 @@
/*************** Version 4 ******************/ /*************** Version 4 ******************/
#define X_XFixesHideCursor 29 #define X_XFixesHideCursor 29
#define X_XFixesShowCursor 30 #define X_XFixesShowCursor 30
/*************** Version 5 ******************/
#define X_XFixesCreatePointerBarrier 31
#define X_XFixesDestroyPointerBarrier 32
#define XFixesNumberRequests (X_XFixesShowCursor+1) #define XFixesNumberRequests (X_XFixesDestroyPointerBarrier+1)
/* Selection events share one event number */ /* Selection events share one event number */
#define XFixesSelectionNotify 0 #define XFixesSelectionNotify 0
@ -111,7 +115,8 @@
/* errors */ /* errors */
#define BadRegion 0 #define BadRegion 0
#define XFixesNumberErrors (BadRegion+1) #define BadBarrier 1
#define XFixesNumberErrors (BadBarrier+1)
#define SaveSetNearest 0 #define SaveSetNearest 0
#define SaveSetRoot 1 #define SaveSetRoot 1
@ -124,4 +129,11 @@
#define WindowRegionBounding 0 #define WindowRegionBounding 0
#define WindowRegionClip 1 #define WindowRegionClip 1
/*************** Version 5 ******************/
#define BarrierPositiveX (1L << 0)
#define BarrierPositiveY (1L << 1)
#define BarrierNegativeX (1L << 2)
#define BarrierNegativeY (1L << 3)
#endif /* _XFIXESWIRE_H_ */ #endif /* _XFIXESWIRE_H_ */