fdo-mirrors/xorg-xorgproto
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/proto/xorgproto.git synced 2026-05-05 13:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into chase-multitouch

Browse source 
Conflicts:
	specs/XI2proto.txt

Fixed up (added) asciidoc for touch proto.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2011-03-17 14:51:52 +10:00
commit f9fa8f9a7d
6 changed files with 542 additions and 472 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -1,3 +1,6 @@
SUBDIRS = specs
inputdir = $(includedir)/X11/extensions
input_HEADERS = \
XI.h \
@ -8,9 +11,6 @@ input_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = inputproto.pc
dist_doc_DATA = XI2proto.txt XIproto.txt
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL

9
configure.ac
View file

@ -3,11 +3,14 @@ AC_INIT([InputProto], [2.0.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?pr
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
# Require xorg-macros: XORG_WITH_ASCIIDOC
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
[m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.10)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
XORG_WITH_ASCIIDOC(8.4.5)
AC_OUTPUT([Makefile
specs/Makefile
inputproto.pc])

1
specs/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
*.html

16
specs/Makefile.am Normal file
View file

@ -0,0 +1,16 @@
if ENABLE_SPECS
if HAVE_ASCIIDOC
doc_DATA = XI2proto.html
dist_doc_DATA = XI2proto.txt
%.html: %.txt
$(AM_V_GEN)$(ASCIIDOC) -o $@ $<
CLEANFILES = $(doc_DATA)
EXTRA_DIST = XIproto.txt
endif
endif

968
XI2proto.txt → specs/XI2proto.txt
View file

File diff suppressed because it is too large Load diff

14
XIproto.txt → specs/XIproto.txt
View file

@ -4,7 +4,7 @@
X Version 11, Release 6.8
Mark Patrick, Ardent Computer
George Sachs, Hewlett-Packard
Version 1.5
Peter Hutterer
@ -83,10 +83,10 @@
description of the new input events generated by the additional
input devices.
This document only describes the behaviour of servers supporting
up to the X Input Extension 1.5. For servers supporting the X
This document only describes the behaviour of servers supporting
up to the X Input Extension 1.5. For servers supporting the X
Input Extensions 2.0, see XI2proto.txt. New clients are discouraged
from using this protocol specification. Instead, the use of XI 2.x
from using this protocol specification. Instead, the use of XI 2.x
is recommended.
1.1 Design Approach
@ -115,8 +115,8 @@
In servers supporting XI 1.4 and above, the core pointer and
the core keyboard are virtual devices that do not represent a
physical device connected to the host computer.
In servers supporting XI 2.0 and above, there may be multiple
core pointers and keyboards. Refer to XI2proto.txt for more
In servers supporting XI 2.0 and above, there may be multiple
core pointers and keyboards. Refer to XI2proto.txt for more
information.
The X keyboard and X pointer are referred to in this document
@ -280,7 +280,7 @@
header file XI.h. Each version is a superset of the previous
versions.
The name must be the name of the Input Extension as defined
The name must be the name of the Input Extension as defined
in the header file XI.h.
2.2 Listing Available Devices