sync with OpenBSD -current
This commit is contained in:
parent
0c289f288c
commit
11caf8af74
GPG key ID:
F42C07F07E2E35B7
38 changed files with 1489 additions and 46294 deletions
6
3RDPARTY
6
3RDPARTY
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
# $OpenBSD: 3RDPARTY,v 1.425 2024/04/27 17:57:10 matthieu Exp $
|
# $OpenBSD: 3RDPARTY,v 1.426 2024/06/01 12:48:00 matthieu Exp $
|
||||||
#
|
#
|
||||||
Package: Freetype
|
Package: Freetype
|
||||||
Version: 2.13.0
|
Version: 2.13.0
|
||||||
|
|
@ -9,13 +9,13 @@ Archive Site: http://download.savannah.gnu.org/releases/freetype/
|
||||||
|
|
||||||
Package: xterm
|
Package: xterm
|
||||||
Version: 378
|
Version: 378
|
||||||
Current Vers: 390
|
Current Vers: 392
|
||||||
Maintainer: Thomas E. Dickey
|
Maintainer: Thomas E. Dickey
|
||||||
Archive Site: http://invisible-island.net/xterm/xterm.html
|
Archive Site: http://invisible-island.net/xterm/xterm.html
|
||||||
|
|
||||||
Package: Mesa
|
Package: Mesa
|
||||||
Version 23.3.6
|
Version 23.3.6
|
||||||
Current Vers: 24.0.6
|
Current Vers: 24.1.0
|
||||||
Maintainer: Brian Paul
|
Maintainer: Brian Paul
|
||||||
Archive Site: https://archive.mesa3d.org/
|
Archive Site: https://archive.mesa3d.org/
|
||||||
|
|
||||||
|
|
|
||||||
4
MODULES
4
MODULES
|
|
@ -1,4 +1,4 @@
|
||||||
# $OpenBSD: MODULES,v 1.521 2024/05/13 19:45:45 matthieu Exp $
|
# $OpenBSD: MODULES,v 1.522 2024/06/01 12:48:00 matthieu Exp $
|
||||||
#
|
#
|
||||||
# X.Org maintained modules
|
# X.Org maintained modules
|
||||||
#
|
#
|
||||||
|
|
@ -191,7 +191,7 @@ lib/xcb-util-renderutil 0.3.10
|
||||||
lib/xcb-util-wm 0.4.2
|
lib/xcb-util-wm 0.4.2
|
||||||
|
|
||||||
proto/xcb-proto 1.17.0 needs-update
|
proto/xcb-proto 1.17.0 needs-update
|
||||||
proto/xorgproto 2024.1 needs-update
|
proto/xorgproto 2024.1
|
||||||
|
|
||||||
util/cf 1.0.4
|
util/cf 1.0.4
|
||||||
util/gccmakedep 1.0.4
|
util/gccmakedep 1.0.4
|
||||||
|
|
|
||||||
|
|
@ -4005,7 +4005,6 @@
|
||||||
./usr/X11R6/share/doc/xorg-docs
|
./usr/X11R6/share/doc/xorg-docs
|
||||||
./usr/X11R6/share/doc/xorg-docs/MAINTAINERS
|
./usr/X11R6/share/doc/xorg-docs/MAINTAINERS
|
||||||
./usr/X11R6/share/doc/xorgproto
|
./usr/X11R6/share/doc/xorgproto
|
||||||
./usr/X11R6/share/doc/xorgproto/PM_spec
|
|
||||||
./usr/X11R6/share/doc/xorgproto/SIAddresses
|
./usr/X11R6/share/doc/xorgproto/SIAddresses
|
||||||
./usr/X11R6/share/doc/xorgproto/SIAddresses/IPv6.txt
|
./usr/X11R6/share/doc/xorgproto/SIAddresses/IPv6.txt
|
||||||
./usr/X11R6/share/doc/xorgproto/SIAddresses/README
|
./usr/X11R6/share/doc/xorgproto/SIAddresses/README
|
||||||
|
|
|
||||||
3244
lib/libpciaccess/aclocal.m4
vendored
3244
lib/libpciaccess/aclocal.m4
vendored
File diff suppressed because it is too large
Load diff
1541
lib/libpciaccess/config.guess
vendored
1541
lib/libpciaccess/config.guess
vendored
File diff suppressed because it is too large
Load diff
1793
lib/libpciaccess/config.sub
vendored
1793
lib/libpciaccess/config.sub
vendored
File diff suppressed because it is too large
Load diff
20777
lib/libpciaccess/configure
vendored
20777
lib/libpciaccess/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -1,145 +0,0 @@
|
||||||
# (C) Copyright IBM Corporation 2006
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
# copy of this software and associated documentation files (the "Software"),
|
|
||||||
# to deal in the Software without restriction, including without limitation
|
|
||||||
# on the rights to use, copy, modify, merge, publish, distribute, sub
|
|
||||||
# license, and/or sell copies of the Software, and to permit persons to whom
|
|
||||||
# the Software is furnished to do so, subject to the following conditions:
|
|
||||||
#
|
|
||||||
# The above copyright notice and this permission notice (including the next
|
|
||||||
# paragraph) shall be included in all copies or substantial portions of the
|
|
||||||
# Software.
|
|
||||||
#
|
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
||||||
# IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
||||||
# DEALINGS IN THE SOFTWARE.
|
|
||||||
#
|
|
||||||
|
|
||||||
# Initialize Autoconf
|
|
||||||
AC_PREREQ([2.60])
|
|
||||||
AC_INIT([libpciaccess],[0.17],
|
|
||||||
[https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/issues],
|
|
||||||
[libpciaccess])
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
|
||||||
AC_CONFIG_AUX_DIR([.])
|
|
||||||
|
|
||||||
# Initialize Automake
|
|
||||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
|
|
||||||
# Initialize libtool
|
|
||||||
AC_PROG_LIBTOOL
|
|
||||||
|
|
||||||
# Require X.Org macros 1.8 or later
|
|
||||||
m4_ifndef([XORG_MACROS_VERSION],
|
|
||||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
|
||||||
XORG_MACROS_VERSION(1.8)
|
|
||||||
XORG_DEFAULT_OPTIONS
|
|
||||||
PKG_PROG_PKG_CONFIG
|
|
||||||
|
|
||||||
pciids_path=/usr/share/hwdata
|
|
||||||
AC_ARG_WITH(pciids-path, AS_HELP_STRING([--with-pciids-path=PCIIDS_PATH],
|
|
||||||
[Path to pci.ids file]), [pciids_path="$withval"])
|
|
||||||
AX_DEFINE_DIR(PCIIDS_PATH, pciids_path, [Path to pci.ids])
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(linux-rom-fallback, AS_HELP_STRING([--enable-linux-rom-fallback],
|
|
||||||
[Enable support for falling back to /dev/mem for roms (default: disabled)]),
|
|
||||||
[LINUX_ROM=$enableval],[LINUX_ROM=no])
|
|
||||||
|
|
||||||
if test "x$LINUX_ROM" = xyes; then
|
|
||||||
AC_DEFINE(LINUX_ROM, 1, [Linux ROM read fallback])
|
|
||||||
fi
|
|
||||||
|
|
||||||
use_zlib=no
|
|
||||||
AC_ARG_WITH(zlib, AS_HELP_STRING([--with-zlib],
|
|
||||||
[Enable zlib support to read gzip compressed pci.ids]),
|
|
||||||
[use_zlib="$withval"])
|
|
||||||
if test "x$use_zlib" = xyes; then
|
|
||||||
PKG_CHECK_MODULES([ZLIB], [zlib])
|
|
||||||
PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS $ZLIB_CFLAGS"
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS $ZLIB_LIBS"
|
|
||||||
AC_DEFINE(HAVE_ZLIB, 1, [Use zlib to read gzip compressed pci.ids])
|
|
||||||
fi
|
|
||||||
|
|
||||||
case $host_os in
|
|
||||||
*freebsd* | *dragonfly*)
|
|
||||||
freebsd=yes
|
|
||||||
;;
|
|
||||||
*linux*)
|
|
||||||
linux=yes
|
|
||||||
;;
|
|
||||||
*netbsd*)
|
|
||||||
case $host in
|
|
||||||
*i[[3-9]]86*)
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS -li386"
|
|
||||||
;;
|
|
||||||
*x86_64*|*amd64*)
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS -lx86_64"
|
|
||||||
;;
|
|
||||||
*alpha*)
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS -lalpha"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS -lpci"
|
|
||||||
netbsd=yes
|
|
||||||
;;
|
|
||||||
*openbsd* | *secbsd*)
|
|
||||||
openbsd=yes
|
|
||||||
;;
|
|
||||||
*solaris*)
|
|
||||||
solaris=yes
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS -ldevinfo"
|
|
||||||
;;
|
|
||||||
gnu*)
|
|
||||||
gnu=yes
|
|
||||||
;;
|
|
||||||
*cygwin*)
|
|
||||||
cygwin=yes
|
|
||||||
PCIACCESS_LIBS="$PCIACCESS_LIBS"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
AM_CONDITIONAL(LINUX, [test "x$linux" = xyes])
|
|
||||||
AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
|
|
||||||
AM_CONDITIONAL(NETBSD, [test "x$netbsd" = xyes])
|
|
||||||
AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
|
|
||||||
AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
|
|
||||||
AM_CONDITIONAL(GNU, [test "x$gnu" = xyes])
|
|
||||||
AM_CONDITIONAL(CYGWIN, [test "x$cygwin" = xyes])
|
|
||||||
|
|
||||||
AC_SYS_LARGEFILE
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS([err.h])
|
|
||||||
|
|
||||||
if test "x$netbsd" = xyes; then
|
|
||||||
AC_CHECK_HEADERS([machine/sysarch.h])
|
|
||||||
AC_CHECK_HEADERS([machine/mtrr.h], [have_mtrr_h="yes"], [have_mtrr_h="no"],
|
|
||||||
[#ifdef HAVE_MACHINE_SYSARCH_H
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <machine/sysarch.h>
|
|
||||||
#endif
|
|
||||||
])
|
|
||||||
else
|
|
||||||
AC_CHECK_HEADER([asm/mtrr.h], [have_mtrr_h="yes"], [have_mtrr_h="no"])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$have_mtrr_h" = xyes; then
|
|
||||||
AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(PCIACCESS_CFLAGS)
|
|
||||||
AC_SUBST(PCIACCESS_LIBS)
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([Makefile
|
|
||||||
include/Makefile
|
|
||||||
man/Makefile
|
|
||||||
src/Makefile
|
|
||||||
scanpci/Makefile
|
|
||||||
pciaccess.pc])
|
|
||||||
AC_OUTPUT
|
|
||||||
File diff suppressed because it is too large
Load diff
7982
lib/libpciaccess/m4/libtool.m4
vendored
7982
lib/libpciaccess/m4/libtool.m4
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -53,47 +53,49 @@ build_triplet = @build@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h
|
@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h
|
||||||
@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
|
@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
|
||||||
|
@LEGACY_TRUE@am__append_3 = PM_spec
|
||||||
subdir = .
|
subdir = .
|
||||||
DIST_COMMON = $(am__XCalibrateinclude_HEADERS_DIST) \
|
DIST_COMMON = $(am__XCalibrateinclude_HEADERS_DIST) \
|
||||||
$(am__applewm_HEADERS_DIST) $(am__compat_HEADERS_DIST) \
|
$(am__applewm_HEADERS_DIST) $(am__compat_HEADERS_DIST) \
|
||||||
$(am__configure_deps) $(am__evie_HEADERS_DIST) \
|
$(am__configure_deps) $(am__dist_doc_DATA_DIST) \
|
||||||
$(am__fontcache_HEADERS_DIST) $(am__kb_HEADERS_DIST) \
|
$(am__evie_HEADERS_DIST) $(am__fontcache_HEADERS_DIST) \
|
||||||
$(am__lg3d_HEADERS_DIST) $(am__print_HEADERS_DIST) \
|
$(am__kb_HEADERS_DIST) $(am__lg3d_HEADERS_DIST) \
|
||||||
$(am__trap_HEADERS_DIST) $(am__video_HEADERS_DIST) \
|
$(am__print_HEADERS_DIST) $(am__trap_HEADERS_DIST) \
|
||||||
$(am__windowswm_HEADERS_DIST) $(am__xf86misc_HEADERS_DIST) \
|
$(am__video_HEADERS_DIST) $(am__windowswm_HEADERS_DIST) \
|
||||||
$(am__xf86rush_HEADERS_DIST) $(am__xproxymng_HEADERS_DIST) \
|
$(am__xf86misc_HEADERS_DIST) $(am__xf86rush_HEADERS_DIST) \
|
||||||
$(bigreqs_HEADERS) $(composite_HEADERS) $(damage_HEADERS) \
|
$(am__xproxymng_HEADERS_DIST) $(bigreqs_HEADERS) \
|
||||||
$(dist_doc_DATA) $(dmx_HEADERS) $(dri2_HEADERS) \
|
$(composite_HEADERS) $(damage_HEADERS) $(dmx_HEADERS) \
|
||||||
$(dri3_HEADERS) $(fixes_HEADERS) $(fonts_HEADERS) \
|
$(dri2_HEADERS) $(dri3_HEADERS) $(fixes_HEADERS) \
|
||||||
$(gl_HEADERS) $(glinternal_HEADERS) $(input_HEADERS) \
|
$(fonts_HEADERS) $(gl_HEADERS) $(glinternal_HEADERS) \
|
||||||
$(present_HEADERS) $(randr_HEADERS) $(record_HEADERS) \
|
$(input_HEADERS) $(present_HEADERS) $(randr_HEADERS) \
|
||||||
$(render_HEADERS) $(resource_HEADERS) $(scrnsaver_HEADERS) \
|
$(record_HEADERS) $(render_HEADERS) $(resource_HEADERS) \
|
||||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
$(scrnsaver_HEADERS) $(srcdir)/Makefile.am \
|
||||||
$(srcdir)/applewmproto.pc.in $(srcdir)/bigreqsproto.pc.in \
|
$(srcdir)/Makefile.in $(srcdir)/applewmproto.pc.in \
|
||||||
$(srcdir)/compositeproto.pc.in $(srcdir)/damageproto.pc.in \
|
$(srcdir)/bigreqsproto.pc.in $(srcdir)/compositeproto.pc.in \
|
||||||
$(srcdir)/dmxproto.pc.in $(srcdir)/dpmsproto.pc.in \
|
$(srcdir)/damageproto.pc.in $(srcdir)/dmxproto.pc.in \
|
||||||
$(srcdir)/dri2proto.pc.in $(srcdir)/dri3proto.pc.in \
|
$(srcdir)/dpmsproto.pc.in $(srcdir)/dri2proto.pc.in \
|
||||||
$(srcdir)/evieproto.pc.in $(srcdir)/fixesproto.pc.in \
|
$(srcdir)/dri3proto.pc.in $(srcdir)/evieproto.pc.in \
|
||||||
$(srcdir)/fontcacheproto.pc.in $(srcdir)/fontsproto.pc.in \
|
$(srcdir)/fixesproto.pc.in $(srcdir)/fontcacheproto.pc.in \
|
||||||
$(srcdir)/glproto.pc.in $(srcdir)/inputproto.pc.in \
|
$(srcdir)/fontsproto.pc.in $(srcdir)/glproto.pc.in \
|
||||||
$(srcdir)/kbproto.pc.in $(srcdir)/lg3dproto.pc.in \
|
$(srcdir)/inputproto.pc.in $(srcdir)/kbproto.pc.in \
|
||||||
$(srcdir)/presentproto.pc.in $(srcdir)/printproto.pc.in \
|
$(srcdir)/lg3dproto.pc.in $(srcdir)/presentproto.pc.in \
|
||||||
$(srcdir)/randrproto.pc.in $(srcdir)/recordproto.pc.in \
|
$(srcdir)/printproto.pc.in $(srcdir)/randrproto.pc.in \
|
||||||
$(srcdir)/renderproto.pc.in $(srcdir)/resourceproto.pc.in \
|
$(srcdir)/recordproto.pc.in $(srcdir)/renderproto.pc.in \
|
||||||
$(srcdir)/scrnsaverproto.pc.in $(srcdir)/trapproto.pc.in \
|
$(srcdir)/resourceproto.pc.in $(srcdir)/scrnsaverproto.pc.in \
|
||||||
$(srcdir)/videoproto.pc.in $(srcdir)/windowswmproto.pc.in \
|
$(srcdir)/trapproto.pc.in $(srcdir)/videoproto.pc.in \
|
||||||
$(srcdir)/xcalibrateproto.pc.in $(srcdir)/xcmiscproto.pc.in \
|
$(srcdir)/windowswmproto.pc.in $(srcdir)/xcalibrateproto.pc.in \
|
||||||
$(srcdir)/xextproto.pc.in $(srcdir)/xf86bigfontproto.pc.in \
|
$(srcdir)/xcmiscproto.pc.in $(srcdir)/xextproto.pc.in \
|
||||||
$(srcdir)/xf86dgaproto.pc.in $(srcdir)/xf86driproto.pc.in \
|
$(srcdir)/xf86bigfontproto.pc.in $(srcdir)/xf86dgaproto.pc.in \
|
||||||
$(srcdir)/xf86miscproto.pc.in $(srcdir)/xf86rushproto.pc.in \
|
$(srcdir)/xf86driproto.pc.in $(srcdir)/xf86miscproto.pc.in \
|
||||||
$(srcdir)/xf86vidmodeproto.pc.in $(srcdir)/xineramaproto.pc.in \
|
$(srcdir)/xf86rushproto.pc.in $(srcdir)/xf86vidmodeproto.pc.in \
|
||||||
$(srcdir)/xproto.pc.in $(srcdir)/xproxymngproto.pc.in \
|
$(srcdir)/xineramaproto.pc.in $(srcdir)/xproto.pc.in \
|
||||||
$(srcdir)/xwaylandproto.pc.in $(top_srcdir)/configure \
|
$(srcdir)/xproxymngproto.pc.in $(srcdir)/xwaylandproto.pc.in \
|
||||||
$(top_srcdir)/include/X11/Xpoll.h.in $(xcmisc_HEADERS) \
|
$(top_srcdir)/configure $(top_srcdir)/include/X11/Xpoll.h.in \
|
||||||
$(xext_HEADERS) $(xf86bigfont_HEADERS) $(xf86dga_HEADERS) \
|
$(xcmisc_HEADERS) $(xext_HEADERS) $(xf86bigfont_HEADERS) \
|
||||||
$(xf86dri_HEADERS) $(xf86vidmode_HEADERS) $(xinerama_HEADERS) \
|
$(xf86dga_HEADERS) $(xf86dri_HEADERS) $(xf86vidmode_HEADERS) \
|
||||||
$(xproto_HEADERS) $(xwaylandproto_HEADERS) AUTHORS INSTALL \
|
$(xinerama_HEADERS) $(xproto_HEADERS) $(xwaylandproto_HEADERS) \
|
||||||
compile config.guess config.sub install-sh missing
|
AUTHORS INSTALL compile config.guess config.sub install-sh \
|
||||||
|
missing
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
|
|
@ -219,6 +221,10 @@ am__installdirs = "$(DESTDIR)$(applewmprotopkgconfigdir)" \
|
||||||
"$(DESTDIR)$(xf86vidmodedir)" "$(DESTDIR)$(xineramadir)" \
|
"$(DESTDIR)$(xf86vidmodedir)" "$(DESTDIR)$(xineramadir)" \
|
||||||
"$(DESTDIR)$(xprotodir)" "$(DESTDIR)$(xproxymngdir)" \
|
"$(DESTDIR)$(xprotodir)" "$(DESTDIR)$(xproxymngdir)" \
|
||||||
"$(DESTDIR)$(xwaylandprotodir)"
|
"$(DESTDIR)$(xwaylandprotodir)"
|
||||||
|
am__dist_doc_DATA_DIST = compositeproto.txt damageproto.txt \
|
||||||
|
dri2proto.txt dri3proto.txt fixesproto.txt presentproto.txt \
|
||||||
|
randrproto.txt renderproto.txt resproto.txt xv-protocol-v2.txt \
|
||||||
|
xwaylandproto.txt PM_spec
|
||||||
DATA = $(applewmprotopkgconfig_DATA) $(bigreqsprotopkgconfig_DATA) \
|
DATA = $(applewmprotopkgconfig_DATA) $(bigreqsprotopkgconfig_DATA) \
|
||||||
$(calibrateprotopkgconfig_DATA) \
|
$(calibrateprotopkgconfig_DATA) \
|
||||||
$(compositeprotopkgconfig_DATA) $(damageprotopkgconfig_DATA) \
|
$(compositeprotopkgconfig_DATA) $(damageprotopkgconfig_DATA) \
|
||||||
|
|
@ -338,7 +344,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -349,12 +354,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
@ -369,17 +372,16 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
MAINT = @MAINT@
|
MAINT = @MAINT@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
@APPLEWM_TRUE@MAN_SUBSTS = \
|
MAN_SUBSTS = \
|
||||||
@APPLEWM_TRUE@ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||||
@APPLEWM_TRUE@ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
||||||
@APPLEWM_TRUE@ -e 's|__datadir__|$(datadir)|g' \
|
-e 's|__datadir__|$(datadir)|g' \
|
||||||
@APPLEWM_TRUE@ -e 's|__libdir__|$(libdir)|g' \
|
-e 's|__libdir__|$(libdir)|g' \
|
||||||
@APPLEWM_TRUE@ -e 's|__sysconfdir__|$(sysconfdir)|g' \
|
-e 's|__sysconfdir__|$(sysconfdir)|g' \
|
||||||
@APPLEWM_TRUE@ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
||||||
@APPLEWM_TRUE@ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
||||||
@APPLEWM_TRUE@ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
|
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g'
|
||||||
|
|
||||||
MAN_SUBSTS = @MAN_SUBSTS@
|
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
MKDIR_P = @MKDIR_P@
|
MKDIR_P = @MKDIR_P@
|
||||||
|
|
@ -400,8 +402,7 @@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
PYTHON_VERSION = @PYTHON_VERSION@
|
PYTHON_VERSION = @PYTHON_VERSION@
|
||||||
@APPLEWM_TRUE@SED = sed
|
SED = sed
|
||||||
SED = @SED@
|
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRICT_CFLAGS = @STRICT_CFLAGS@
|
STRICT_CFLAGS = @STRICT_CFLAGS@
|
||||||
|
|
@ -469,9 +470,13 @@ target_alias = @target_alias@
|
||||||
top_build_prefix = @top_build_prefix@
|
top_build_prefix = @top_build_prefix@
|
||||||
top_builddir = @top_builddir@
|
top_builddir = @top_builddir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
@APPLEWM_TRUE@XORGRELSTRING = @PACKAGE_STRING@
|
XORGRELSTRING = @PACKAGE_STRING@
|
||||||
@APPLEWM_TRUE@XORGMANNAME = X Version 11
|
XORGMANNAME = X Version 11
|
||||||
@APPLEWM_TRUE@SUFFIXES = .$(MISC_MAN_SUFFIX) .man
|
SUFFIXES = .$(MISC_MAN_SUFFIX) .man
|
||||||
|
dist_doc_DATA = compositeproto.txt damageproto.txt dri2proto.txt \
|
||||||
|
dri3proto.txt fixesproto.txt presentproto.txt randrproto.txt \
|
||||||
|
renderproto.txt resproto.txt xv-protocol-v2.txt \
|
||||||
|
xwaylandproto.txt $(am__append_3)
|
||||||
@APPLEWM_TRUE@applewmdir = $(includedir)/X11/extensions
|
@APPLEWM_TRUE@applewmdir = $(includedir)/X11/extensions
|
||||||
@APPLEWM_TRUE@applewm_HEADERS = \
|
@APPLEWM_TRUE@applewm_HEADERS = \
|
||||||
@APPLEWM_TRUE@ include/X11/extensions/applewmconst.h \
|
@APPLEWM_TRUE@ include/X11/extensions/applewmconst.h \
|
||||||
|
|
@ -827,20 +832,6 @@ xwaylandprotopkgconfig_DATA = xwaylandproto.pc
|
||||||
@LEGACY_TRUE@xf86rushprotopkgconfig_DATA = xf86rushproto.pc
|
@LEGACY_TRUE@xf86rushprotopkgconfig_DATA = xf86rushproto.pc
|
||||||
|
|
||||||
# SUBDIRS=specs
|
# SUBDIRS=specs
|
||||||
dist_doc_DATA = \
|
|
||||||
compositeproto.txt \
|
|
||||||
damageproto.txt \
|
|
||||||
dri2proto.txt \
|
|
||||||
dri3proto.txt \
|
|
||||||
fixesproto.txt \
|
|
||||||
PM_spec \
|
|
||||||
presentproto.txt \
|
|
||||||
randrproto.txt \
|
|
||||||
renderproto.txt \
|
|
||||||
resproto.txt \
|
|
||||||
xv-protocol-v2.txt \
|
|
||||||
xwaylandproto.txt
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
COPYING-applewmproto \
|
COPYING-applewmproto \
|
||||||
COPYING-bigreqsproto \
|
COPYING-bigreqsproto \
|
||||||
|
|
@ -3366,9 +3357,9 @@ uninstall-am: uninstall-XCalibrateincludeHEADERS \
|
||||||
uninstall-xwaylandprotopkgconfigDATA
|
uninstall-xwaylandprotopkgconfigDATA
|
||||||
|
|
||||||
|
|
||||||
@APPLEWM_TRUE@.man.$(MISC_MAN_SUFFIX): man
|
.man.$(MISC_MAN_SUFFIX): man
|
||||||
@APPLEWM_TRUE@ $(MKDIR_P) man
|
$(MKDIR_P) man
|
||||||
@APPLEWM_TRUE@ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
|
|
||||||
6
proto/xorgproto/aclocal.m4
vendored
6
proto/xorgproto/aclocal.m4
vendored
|
|
@ -1607,7 +1607,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||||
# See the "minimum version" comment for each macro you use to see what
|
# See the "minimum version" comment for each macro you use to see what
|
||||||
# version you require.
|
# version you require.
|
||||||
m4_defun([XORG_MACROS_VERSION],[
|
m4_defun([XORG_MACROS_VERSION],[
|
||||||
m4_define([vers_have], [1.20.0])
|
m4_define([vers_have], [1.20.1])
|
||||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||||
|
|
@ -1654,10 +1654,10 @@ rm -f conftest.$ac_ext
|
||||||
|
|
||||||
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
|
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
|
||||||
AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])])
|
AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])])
|
||||||
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
else
|
else
|
||||||
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then
|
||||||
TRADITIONALCPPFLAGS="-traditional"
|
TRADITIONALCPPFLAGS="-traditional"
|
||||||
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
|
|
|
||||||
20
proto/xorgproto/configure
vendored
20
proto/xorgproto/configure
vendored
|
|
@ -1,6 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.71 for xorgproto 2023.2.
|
# Generated by GNU Autoconf 2.71 for xorgproto 2024.1.
|
||||||
#
|
#
|
||||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues>.
|
# Report bugs to <https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues>.
|
||||||
#
|
#
|
||||||
|
|
@ -672,8 +672,8 @@ MAKEFLAGS=
|
||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='xorgproto'
|
PACKAGE_NAME='xorgproto'
|
||||||
PACKAGE_TARNAME='xorgproto'
|
PACKAGE_TARNAME='xorgproto'
|
||||||
PACKAGE_VERSION='2023.2'
|
PACKAGE_VERSION='2024.1'
|
||||||
PACKAGE_STRING='xorgproto 2023.2'
|
PACKAGE_STRING='xorgproto 2024.1'
|
||||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues'
|
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues'
|
||||||
PACKAGE_URL=''
|
PACKAGE_URL=''
|
||||||
|
|
||||||
|
|
@ -1442,7 +1442,7 @@ if test "$ac_init_help" = "long"; then
|
||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# 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.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures xorgproto 2023.2 to adapt to many kinds of systems.
|
\`configure' configures xorgproto 2024.1 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
|
|
@ -1513,7 +1513,7 @@ fi
|
||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of xorgproto 2023.2:";;
|
short | recursive ) echo "Configuration of xorgproto 2024.1:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
|
|
@ -1634,7 +1634,7 @@ fi
|
||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
xorgproto configure 2023.2
|
xorgproto configure 2024.1
|
||||||
generated by GNU Autoconf 2.71
|
generated by GNU Autoconf 2.71
|
||||||
|
|
||||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||||
|
|
@ -1902,7 +1902,7 @@ cat >config.log <<_ACEOF
|
||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by xorgproto $as_me 2023.2, which was
|
It was created by xorgproto $as_me 2024.1, which was
|
||||||
generated by GNU Autoconf 2.71. Invocation command line was
|
generated by GNU Autoconf 2.71. Invocation command line was
|
||||||
|
|
||||||
$ $0$ac_configure_args_raw
|
$ $0$ac_configure_args_raw
|
||||||
|
|
@ -3134,7 +3134,7 @@ fi
|
||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='xorgproto'
|
PACKAGE='xorgproto'
|
||||||
VERSION='2023.2'
|
VERSION='2024.1'
|
||||||
|
|
||||||
|
|
||||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||||
|
|
@ -12557,7 +12557,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by xorgproto $as_me 2023.2, which was
|
This file was extended by xorgproto $as_me 2024.1, which was
|
||||||
generated by GNU Autoconf 2.71. Invocation command line was
|
generated by GNU Autoconf 2.71. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
|
|
@ -12616,7 +12616,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_config='$ac_cs_config_escaped'
|
ac_cs_config='$ac_cs_config_escaped'
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
xorgproto config.status 2023.2
|
xorgproto config.status 2024.1
|
||||||
configured by $0, generated by GNU Autoconf 2.71,
|
configured by $0, generated by GNU Autoconf 2.71,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
|
||||||
|
|
||||||
AC_PREREQ([2.60])
|
AC_PREREQ([2.60])
|
||||||
# keep version in sync with meson.build
|
# keep version in sync with meson.build
|
||||||
AC_INIT([xorgproto], [2023.2],
|
AC_INIT([xorgproto], [2024.1],
|
||||||
[https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
|
[https://gitlab.freedesktop.org/xorg/proto/xorgproto/issues])
|
||||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,5 @@ includedir=@includedir@
|
||||||
|
|
||||||
Name: DRI3Proto
|
Name: DRI3Proto
|
||||||
Description: DRI3 extension headers
|
Description: DRI3 extension headers
|
||||||
Version: 1.3
|
Version: 1.4
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
The DRI3 Extension
|
The DRI3 Extension
|
||||||
Version 1.3
|
Version 1.4
|
||||||
2021-11-30
|
2021-11-30
|
||||||
|
|
||||||
Keith Packard
|
Keith Packard
|
||||||
|
|
@ -60,7 +60,7 @@ DRI3 defines no events.
|
||||||
|
|
||||||
6. Protocol Types
|
6. Protocol Types
|
||||||
|
|
||||||
DRI3 defines no new protocol types.
|
SYNCOBJ { XID }
|
||||||
|
|
||||||
❄ ❄ ❄ ❄ ❄ ❄ ❄
|
❄ ❄ ❄ ❄ ❄ ❄ ❄
|
||||||
|
|
||||||
|
|
@ -395,6 +395,36 @@ The name of this extension is "DRI3"
|
||||||
If the window specified was not found, a Window error will
|
If the window specified was not found, a Window error will
|
||||||
be returned.
|
be returned.
|
||||||
|
|
||||||
|
|
||||||
|
┌───
|
||||||
|
DRI3ImportSyncobj
|
||||||
|
syncobj: SYNCOBJ
|
||||||
|
drawable: DRAWABLE
|
||||||
|
fd: FD
|
||||||
|
└───
|
||||||
|
Errors: IDchoice, Drawable
|
||||||
|
|
||||||
|
Imports the DRM synchronization object bound to the given 'fd'. This
|
||||||
|
may then be used to enable explicit synchronization with the
|
||||||
|
server-side direct rendering device associated with 'drawable'.
|
||||||
|
|
||||||
|
The provided syncobj must be a timeline syncobj.
|
||||||
|
|
||||||
|
If 'drawable' is not found, a Drawable error will be returned.
|
||||||
|
|
||||||
|
|
||||||
|
┌───
|
||||||
|
DRI3FreeSyncobj
|
||||||
|
syncobj: SYNCOBJ
|
||||||
|
└───
|
||||||
|
Errors: Value
|
||||||
|
|
||||||
|
Indicates that any resources associated with the given 'syncobj' should
|
||||||
|
be released by the server. The actual release may be deferred until any
|
||||||
|
pending operations that depend on the object have completed.
|
||||||
|
|
||||||
|
If 'syncobj' is not found, a Value error will be returned.
|
||||||
|
|
||||||
❄ ❄ ❄ ❄ ❄ ❄ ❄
|
❄ ❄ ❄ ❄ ❄ ❄ ❄
|
||||||
|
|
||||||
9. Extension Events
|
9. Extension Events
|
||||||
|
|
@ -703,6 +733,24 @@ A.2 Protocol Requests
|
||||||
4 CARD32 drmMinor
|
4 CARD32 drmMinor
|
||||||
└───
|
└───
|
||||||
|
|
||||||
|
┌───
|
||||||
|
DRI3ImportSyncobj
|
||||||
|
1 CARD8 major opcode
|
||||||
|
1 11 DRI3 opcode
|
||||||
|
2 3 length
|
||||||
|
4 SYNCOBJ syncobj
|
||||||
|
4 Drawable drawable
|
||||||
|
0 FD syncobj fd
|
||||||
|
└───
|
||||||
|
|
||||||
|
┌───
|
||||||
|
DRI3FreeSyncobj
|
||||||
|
1 CARD8 major opcode
|
||||||
|
1 12 DRI3 opcode
|
||||||
|
2 2 length
|
||||||
|
4 SYNCOBJ syncobj
|
||||||
|
└───
|
||||||
|
|
||||||
A.3 Protocol Events
|
A.3 Protocol Events
|
||||||
|
|
||||||
The DRI3 extension defines no events.
|
The DRI3 extension defines no events.
|
||||||
|
|
|
||||||
|
|
@ -52,14 +52,14 @@ SOFTWARE.
|
||||||
|
|
||||||
/* two-key compose sequence initiators, chosen to map to Latin1 characters */
|
/* two-key compose sequence initiators, chosen to map to Latin1 characters */
|
||||||
|
|
||||||
#define DXK_ring_accent 0x1000FEB0
|
#define DXK_ring_accent 0x1000feb0
|
||||||
#define DXK_circumflex_accent 0x1000FE5E
|
#define DXK_circumflex_accent 0x1000fe5e
|
||||||
#define DXK_cedilla_accent 0x1000FE2C
|
#define DXK_cedilla_accent 0x1000fe2c
|
||||||
#define DXK_acute_accent 0x1000FE27
|
#define DXK_acute_accent 0x1000fe27
|
||||||
#define DXK_grave_accent 0x1000FE60
|
#define DXK_grave_accent 0x1000fe60
|
||||||
#define DXK_tilde 0x1000FE7E
|
#define DXK_tilde 0x1000fe7e
|
||||||
#define DXK_diaeresis 0x1000FE22
|
#define DXK_diaeresis 0x1000fe22
|
||||||
|
|
||||||
/* special keysym for LK2** "Remove" key on editing keypad */
|
/* special keysym for LK2** "Remove" key on editing keypad */
|
||||||
|
|
||||||
#define DXK_Remove 0x1000FF00 /* Remove */
|
#define DXK_Remove 0x1000ff00 /* Remove */
|
||||||
|
|
|
||||||
|
|
@ -59,74 +59,74 @@ performance, or use of this material.
|
||||||
|
|
||||||
#define _HPKEYSYM_H
|
#define _HPKEYSYM_H
|
||||||
|
|
||||||
#define hpXK_ClearLine 0x1000FF6F
|
#define hpXK_ClearLine 0x1000ff6f
|
||||||
#define hpXK_InsertLine 0x1000FF70
|
#define hpXK_InsertLine 0x1000ff70
|
||||||
#define hpXK_DeleteLine 0x1000FF71
|
#define hpXK_DeleteLine 0x1000ff71
|
||||||
#define hpXK_InsertChar 0x1000FF72
|
#define hpXK_InsertChar 0x1000ff72
|
||||||
#define hpXK_DeleteChar 0x1000FF73
|
#define hpXK_DeleteChar 0x1000ff73
|
||||||
#define hpXK_BackTab 0x1000FF74
|
#define hpXK_BackTab 0x1000ff74
|
||||||
#define hpXK_KP_BackTab 0x1000FF75
|
#define hpXK_KP_BackTab 0x1000ff75
|
||||||
#define hpXK_Modelock1 0x1000FF48
|
#define hpXK_Modelock1 0x1000ff48
|
||||||
#define hpXK_Modelock2 0x1000FF49
|
#define hpXK_Modelock2 0x1000ff49
|
||||||
#define hpXK_Reset 0x1000FF6C
|
#define hpXK_Reset 0x1000ff6c
|
||||||
#define hpXK_System 0x1000FF6D
|
#define hpXK_System 0x1000ff6d
|
||||||
#define hpXK_User 0x1000FF6E
|
#define hpXK_User 0x1000ff6e
|
||||||
#define hpXK_mute_acute 0x100000A8
|
#define hpXK_mute_acute 0x100000a8
|
||||||
#define hpXK_mute_grave 0x100000A9
|
#define hpXK_mute_grave 0x100000a9
|
||||||
#define hpXK_mute_asciicircum 0x100000AA
|
#define hpXK_mute_asciicircum 0x100000aa
|
||||||
#define hpXK_mute_diaeresis 0x100000AB
|
#define hpXK_mute_diaeresis 0x100000ab
|
||||||
#define hpXK_mute_asciitilde 0x100000AC
|
#define hpXK_mute_asciitilde 0x100000ac
|
||||||
#define hpXK_lira 0x100000AF
|
#define hpXK_lira 0x100000af
|
||||||
#define hpXK_guilder 0x100000BE
|
#define hpXK_guilder 0x100000be
|
||||||
#define hpXK_Ydiaeresis 0x100000EE
|
#define hpXK_Ydiaeresis 0x100000ee
|
||||||
#define hpXK_IO 0x100000EE
|
#define hpXK_IO 0x100000ee /* deprecated alias for hpYdiaeresis */
|
||||||
#define hpXK_longminus 0x100000F6
|
#define hpXK_longminus 0x100000f6
|
||||||
#define hpXK_block 0x100000FC
|
#define hpXK_block 0x100000fc
|
||||||
|
|
||||||
|
|
||||||
#ifndef _OSF_Keysyms
|
#ifndef _OSF_Keysyms
|
||||||
#define _OSF_Keysyms
|
#define _OSF_Keysyms
|
||||||
|
|
||||||
#define osfXK_Copy 0x1004FF02
|
#define osfXK_Copy 0x1004ff02
|
||||||
#define osfXK_Cut 0x1004FF03
|
#define osfXK_Cut 0x1004ff03
|
||||||
#define osfXK_Paste 0x1004FF04
|
#define osfXK_Paste 0x1004ff04
|
||||||
#define osfXK_BackTab 0x1004FF07
|
#define osfXK_BackTab 0x1004ff07
|
||||||
#define osfXK_BackSpace 0x1004FF08
|
#define osfXK_BackSpace 0x1004ff08
|
||||||
#define osfXK_Clear 0x1004FF0B
|
#define osfXK_Clear 0x1004ff0b
|
||||||
#define osfXK_Escape 0x1004FF1B
|
#define osfXK_Escape 0x1004ff1b
|
||||||
#define osfXK_AddMode 0x1004FF31
|
#define osfXK_AddMode 0x1004ff31
|
||||||
#define osfXK_PrimaryPaste 0x1004FF32
|
#define osfXK_PrimaryPaste 0x1004ff32
|
||||||
#define osfXK_QuickPaste 0x1004FF33
|
#define osfXK_QuickPaste 0x1004ff33
|
||||||
#define osfXK_PageLeft 0x1004FF40
|
#define osfXK_PageLeft 0x1004ff40
|
||||||
#define osfXK_PageUp 0x1004FF41
|
#define osfXK_PageUp 0x1004ff41
|
||||||
#define osfXK_PageDown 0x1004FF42
|
#define osfXK_PageDown 0x1004ff42
|
||||||
#define osfXK_PageRight 0x1004FF43
|
#define osfXK_PageRight 0x1004ff43
|
||||||
#define osfXK_Activate 0x1004FF44
|
#define osfXK_Activate 0x1004ff44
|
||||||
#define osfXK_MenuBar 0x1004FF45
|
#define osfXK_MenuBar 0x1004ff45
|
||||||
#define osfXK_Left 0x1004FF51
|
#define osfXK_Left 0x1004ff51
|
||||||
#define osfXK_Up 0x1004FF52
|
#define osfXK_Up 0x1004ff52
|
||||||
#define osfXK_Right 0x1004FF53
|
#define osfXK_Right 0x1004ff53
|
||||||
#define osfXK_Down 0x1004FF54
|
#define osfXK_Down 0x1004ff54
|
||||||
#define osfXK_EndLine 0x1004FF57
|
#define osfXK_EndLine 0x1004ff57
|
||||||
#define osfXK_BeginLine 0x1004FF58
|
#define osfXK_BeginLine 0x1004ff58
|
||||||
#define osfXK_EndData 0x1004FF59
|
#define osfXK_EndData 0x1004ff59
|
||||||
#define osfXK_BeginData 0x1004FF5A
|
#define osfXK_BeginData 0x1004ff5a
|
||||||
#define osfXK_PrevMenu 0x1004FF5B
|
#define osfXK_PrevMenu 0x1004ff5b
|
||||||
#define osfXK_NextMenu 0x1004FF5C
|
#define osfXK_NextMenu 0x1004ff5c
|
||||||
#define osfXK_PrevField 0x1004FF5D
|
#define osfXK_PrevField 0x1004ff5d
|
||||||
#define osfXK_NextField 0x1004FF5E
|
#define osfXK_NextField 0x1004ff5e
|
||||||
#define osfXK_Select 0x1004FF60
|
#define osfXK_Select 0x1004ff60
|
||||||
#define osfXK_Insert 0x1004FF63
|
#define osfXK_Insert 0x1004ff63
|
||||||
#define osfXK_Undo 0x1004FF65
|
#define osfXK_Undo 0x1004ff65
|
||||||
#define osfXK_Menu 0x1004FF67
|
#define osfXK_Menu 0x1004ff67
|
||||||
#define osfXK_Cancel 0x1004FF69
|
#define osfXK_Cancel 0x1004ff69
|
||||||
#define osfXK_Help 0x1004FF6A
|
#define osfXK_Help 0x1004ff6a
|
||||||
#define osfXK_SelectAll 0x1004FF71
|
#define osfXK_SelectAll 0x1004ff71
|
||||||
#define osfXK_DeselectAll 0x1004FF72
|
#define osfXK_DeselectAll 0x1004ff72
|
||||||
#define osfXK_Reselect 0x1004FF73
|
#define osfXK_Reselect 0x1004ff73
|
||||||
#define osfXK_Extend 0x1004FF74
|
#define osfXK_Extend 0x1004ff74
|
||||||
#define osfXK_Restore 0x1004FF78
|
#define osfXK_Restore 0x1004ff78
|
||||||
#define osfXK_Delete 0x1004FFFF
|
#define osfXK_Delete 0x1004ffff
|
||||||
|
|
||||||
#endif /* _OSF_Keysyms */
|
#endif /* _OSF_Keysyms */
|
||||||
|
|
||||||
|
|
@ -135,30 +135,30 @@ performance, or use of this material.
|
||||||
* The use of the following macros is deprecated.
|
* The use of the following macros is deprecated.
|
||||||
* They are listed below only for backwards compatibility.
|
* They are listed below only for backwards compatibility.
|
||||||
*/
|
*/
|
||||||
#define XK_Reset 0x1000FF6C
|
#define XK_Reset 0x1000ff6c /* deprecated alias for hpReset */
|
||||||
#define XK_System 0x1000FF6D
|
#define XK_System 0x1000ff6d /* deprecated alias for hpSystem */
|
||||||
#define XK_User 0x1000FF6E
|
#define XK_User 0x1000ff6e /* deprecated alias for hpUser */
|
||||||
#define XK_ClearLine 0x1000FF6F
|
#define XK_ClearLine 0x1000ff6f /* deprecated alias for hpClearLine */
|
||||||
#define XK_InsertLine 0x1000FF70
|
#define XK_InsertLine 0x1000ff70 /* deprecated alias for hpInsertLine */
|
||||||
#define XK_DeleteLine 0x1000FF71
|
#define XK_DeleteLine 0x1000ff71 /* deprecated alias for hpDeleteLine */
|
||||||
#define XK_InsertChar 0x1000FF72
|
#define XK_InsertChar 0x1000ff72 /* deprecated alias for hpInsertChar */
|
||||||
#define XK_DeleteChar 0x1000FF73
|
#define XK_DeleteChar 0x1000ff73 /* deprecated alias for hpDeleteChar */
|
||||||
#define XK_BackTab 0x1000FF74
|
#define XK_BackTab 0x1000ff74 /* deprecated alias for hpBackTab */
|
||||||
#define XK_KP_BackTab 0x1000FF75
|
#define XK_KP_BackTab 0x1000ff75 /* deprecated alias for hpKP_BackTab */
|
||||||
#define XK_Ext16bit_L 0x1000FF76
|
#define XK_Ext16bit_L 0x1000ff76 /* deprecated */
|
||||||
#define XK_Ext16bit_R 0x1000FF77
|
#define XK_Ext16bit_R 0x1000ff77 /* deprecated */
|
||||||
#define XK_mute_acute 0x100000a8
|
#define XK_mute_acute 0x100000a8 /* deprecated alias for hpmute_acute */
|
||||||
#define XK_mute_grave 0x100000a9
|
#define XK_mute_grave 0x100000a9 /* deprecated alias for hpmute_grave */
|
||||||
#define XK_mute_asciicircum 0x100000aa
|
#define XK_mute_asciicircum 0x100000aa /* deprecated alias for hpmute_asciicircum */
|
||||||
#define XK_mute_diaeresis 0x100000ab
|
#define XK_mute_diaeresis 0x100000ab /* deprecated alias for hpmute_diaeresis */
|
||||||
#define XK_mute_asciitilde 0x100000ac
|
#define XK_mute_asciitilde 0x100000ac /* deprecated alias for hpmute_asciitilde */
|
||||||
#define XK_lira 0x100000af
|
#define XK_lira 0x100000af /* deprecated alias for hplira */
|
||||||
#define XK_guilder 0x100000be
|
#define XK_guilder 0x100000be /* deprecated alias for hpguilder */
|
||||||
#ifndef XK_Ydiaeresis
|
#ifndef XK_Ydiaeresis
|
||||||
#define XK_Ydiaeresis 0x100000ee
|
#define XK_Ydiaeresis 0x100000ee /* deprecated */
|
||||||
#endif
|
#endif
|
||||||
#define XK_IO 0x100000ee
|
#define XK_IO 0x100000ee /* deprecated alias for hpYdiaeresis */
|
||||||
#define XK_longminus 0x100000f6
|
#define XK_longminus 0x100000f6 /* deprecated alias for hplongminus */
|
||||||
#define XK_block 0x100000fc
|
#define XK_block 0x100000fc /* deprecated alias for hpblock */
|
||||||
|
|
||||||
#endif /* _HPKEYSYM_H */
|
#endif /* _HPKEYSYM_H */
|
||||||
|
|
|
||||||
|
|
@ -50,57 +50,57 @@ in this Software without prior written authorization from The Open Group.
|
||||||
* Floating Accent
|
* Floating Accent
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SunXK_FA_Grave 0x1005FF00
|
#define SunXK_FA_Grave 0x1005ff00
|
||||||
#define SunXK_FA_Circum 0x1005FF01
|
#define SunXK_FA_Circum 0x1005ff01
|
||||||
#define SunXK_FA_Tilde 0x1005FF02
|
#define SunXK_FA_Tilde 0x1005ff02
|
||||||
#define SunXK_FA_Acute 0x1005FF03
|
#define SunXK_FA_Acute 0x1005ff03
|
||||||
#define SunXK_FA_Diaeresis 0x1005FF04
|
#define SunXK_FA_Diaeresis 0x1005ff04
|
||||||
#define SunXK_FA_Cedilla 0x1005FF05
|
#define SunXK_FA_Cedilla 0x1005ff05
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Miscellaneous Functions
|
* Miscellaneous Functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SunXK_F36 0x1005FF10 /* Labeled F11 */
|
#define SunXK_F36 0x1005ff10 /* Labeled F11 */
|
||||||
#define SunXK_F37 0x1005FF11 /* Labeled F12 */
|
#define SunXK_F37 0x1005ff11 /* Labeled F12 */
|
||||||
|
|
||||||
#define SunXK_Sys_Req 0x1005FF60
|
#define SunXK_Sys_Req 0x1005ff60
|
||||||
#define SunXK_Print_Screen 0x0000FF61 /* Same as XK_Print */
|
#define SunXK_Print_Screen 0x0000ff61 /* Same as XK_Print */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* International & Multi-Key Character Composition
|
* International & Multi-Key Character Composition
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SunXK_Compose 0x0000FF20 /* Same as XK_Multi_key */
|
#define SunXK_Compose 0x0000ff20 /* Same as XK_Multi_key */
|
||||||
#define SunXK_AltGraph 0x0000FF7E /* Same as XK_Mode_switch */
|
#define SunXK_AltGraph 0x0000ff7e /* Same as XK_Mode_switch */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cursor Control
|
* Cursor Control
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SunXK_PageUp 0x0000FF55 /* Same as XK_Prior */
|
#define SunXK_PageUp 0x0000ff55 /* Same as XK_Prior */
|
||||||
#define SunXK_PageDown 0x0000FF56 /* Same as XK_Next */
|
#define SunXK_PageDown 0x0000ff56 /* Same as XK_Next */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Open Look Functions
|
* Open Look Functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define SunXK_Undo 0x0000FF65 /* Same as XK_Undo */
|
#define SunXK_Undo 0x0000ff65 /* Same as XK_Undo */
|
||||||
#define SunXK_Again 0x0000FF66 /* Same as XK_Redo */
|
#define SunXK_Again 0x0000ff66 /* Same as XK_Redo */
|
||||||
#define SunXK_Find 0x0000FF68 /* Same as XK_Find */
|
#define SunXK_Find 0x0000ff68 /* Same as XK_Find */
|
||||||
#define SunXK_Stop 0x0000FF69 /* Same as XK_Cancel */
|
#define SunXK_Stop 0x0000ff69 /* Same as XK_Cancel */
|
||||||
#define SunXK_Props 0x1005FF70
|
#define SunXK_Props 0x1005ff70
|
||||||
#define SunXK_Front 0x1005FF71
|
#define SunXK_Front 0x1005ff71
|
||||||
#define SunXK_Copy 0x1005FF72
|
#define SunXK_Copy 0x1005ff72
|
||||||
#define SunXK_Open 0x1005FF73
|
#define SunXK_Open 0x1005ff73
|
||||||
#define SunXK_Paste 0x1005FF74
|
#define SunXK_Paste 0x1005ff74
|
||||||
#define SunXK_Cut 0x1005FF75
|
#define SunXK_Cut 0x1005ff75
|
||||||
|
|
||||||
#define SunXK_PowerSwitch 0x1005FF76
|
#define SunXK_PowerSwitch 0x1005ff76
|
||||||
#define SunXK_AudioLowerVolume 0x1005FF77
|
#define SunXK_AudioLowerVolume 0x1005ff77
|
||||||
#define SunXK_AudioMute 0x1005FF78
|
#define SunXK_AudioMute 0x1005ff78
|
||||||
#define SunXK_AudioRaiseVolume 0x1005FF79
|
#define SunXK_AudioRaiseVolume 0x1005ff79
|
||||||
#define SunXK_VideoDegauss 0x1005FF7A
|
#define SunXK_VideoDegauss 0x1005ff7a
|
||||||
#define SunXK_VideoLowerBrightness 0x1005FF7B
|
#define SunXK_VideoLowerBrightness 0x1005ff7b
|
||||||
#define SunXK_VideoRaiseBrightness 0x1005FF7C
|
#define SunXK_VideoRaiseBrightness 0x1005ff7c
|
||||||
#define SunXK_PowerSwitchShift 0x1005FF7D
|
#define SunXK_PowerSwitchShift 0x1005ff7d
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* XFree86 vendor specific keysyms.
|
* XFree86 vendor specific keysyms.
|
||||||
*
|
*
|
||||||
* The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
|
* The XFree86 keysym range is 0x10080001 - 0x1008ffff.
|
||||||
*
|
*
|
||||||
* The XF86 set of keysyms is a catch-all set of defines for keysyms found
|
* The XF86 set of keysyms is a catch-all set of defines for keysyms found
|
||||||
* on various multimedia keyboards. Originally specific to XFree86 they have
|
* on various multimedia keyboards. Originally specific to XFree86 they have
|
||||||
|
|
@ -22,216 +22,216 @@
|
||||||
* functionality.
|
* functionality.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define XF86XK_ModeLock 0x1008FF01 /* Mode Switch Lock */
|
#define XF86XK_ModeLock 0x1008ff01 /* Mode Switch Lock */
|
||||||
|
|
||||||
/* Backlight controls. */
|
/* Backlight controls. */
|
||||||
#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */
|
#define XF86XK_MonBrightnessUp 0x1008ff02 /* Monitor/panel brightness */
|
||||||
#define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */
|
#define XF86XK_MonBrightnessDown 0x1008ff03 /* Monitor/panel brightness */
|
||||||
#define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */
|
#define XF86XK_KbdLightOnOff 0x1008ff04 /* Keyboards may be lit */
|
||||||
#define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */
|
#define XF86XK_KbdBrightnessUp 0x1008ff05 /* Keyboards may be lit */
|
||||||
#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */
|
#define XF86XK_KbdBrightnessDown 0x1008ff06 /* Keyboards may be lit */
|
||||||
#define XF86XK_MonBrightnessCycle 0x1008FF07 /* Monitor/panel brightness */
|
#define XF86XK_MonBrightnessCycle 0x1008ff07 /* Monitor/panel brightness */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Keys found on some "Internet" keyboards.
|
* Keys found on some "Internet" keyboards.
|
||||||
*/
|
*/
|
||||||
#define XF86XK_Standby 0x1008FF10 /* System into standby mode */
|
#define XF86XK_Standby 0x1008ff10 /* System into standby mode */
|
||||||
#define XF86XK_AudioLowerVolume 0x1008FF11 /* Volume control down */
|
#define XF86XK_AudioLowerVolume 0x1008ff11 /* Volume control down */
|
||||||
#define XF86XK_AudioMute 0x1008FF12 /* Mute sound from the system */
|
#define XF86XK_AudioMute 0x1008ff12 /* Mute sound from the system */
|
||||||
#define XF86XK_AudioRaiseVolume 0x1008FF13 /* Volume control up */
|
#define XF86XK_AudioRaiseVolume 0x1008ff13 /* Volume control up */
|
||||||
#define XF86XK_AudioPlay 0x1008FF14 /* Start playing of audio > */
|
#define XF86XK_AudioPlay 0x1008ff14 /* Start playing of audio > */
|
||||||
#define XF86XK_AudioStop 0x1008FF15 /* Stop playing audio */
|
#define XF86XK_AudioStop 0x1008ff15 /* Stop playing audio */
|
||||||
#define XF86XK_AudioPrev 0x1008FF16 /* Previous track */
|
#define XF86XK_AudioPrev 0x1008ff16 /* Previous track */
|
||||||
#define XF86XK_AudioNext 0x1008FF17 /* Next track */
|
#define XF86XK_AudioNext 0x1008ff17 /* Next track */
|
||||||
#define XF86XK_HomePage 0x1008FF18 /* Display user's home page */
|
#define XF86XK_HomePage 0x1008ff18 /* Display user's home page */
|
||||||
#define XF86XK_Mail 0x1008FF19 /* Invoke user's mail program */
|
#define XF86XK_Mail 0x1008ff19 /* Invoke user's mail program */
|
||||||
#define XF86XK_Start 0x1008FF1A /* Start application */
|
#define XF86XK_Start 0x1008ff1a /* Start application */
|
||||||
#define XF86XK_Search 0x1008FF1B /* Search */
|
#define XF86XK_Search 0x1008ff1b /* Search */
|
||||||
#define XF86XK_AudioRecord 0x1008FF1C /* Record audio application */
|
#define XF86XK_AudioRecord 0x1008ff1c /* Record audio application */
|
||||||
|
|
||||||
/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
|
/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */
|
||||||
#define XF86XK_Calculator 0x1008FF1D /* Invoke calculator program */
|
#define XF86XK_Calculator 0x1008ff1d /* Invoke calculator program */
|
||||||
#define XF86XK_Memo 0x1008FF1E /* Invoke Memo taking program */
|
#define XF86XK_Memo 0x1008ff1e /* Invoke Memo taking program */
|
||||||
#define XF86XK_ToDoList 0x1008FF1F /* Invoke To Do List program */
|
#define XF86XK_ToDoList 0x1008ff1f /* Invoke To Do List program */
|
||||||
#define XF86XK_Calendar 0x1008FF20 /* Invoke Calendar program */
|
#define XF86XK_Calendar 0x1008ff20 /* Invoke Calendar program */
|
||||||
#define XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */
|
#define XF86XK_PowerDown 0x1008ff21 /* Deep sleep the system */
|
||||||
#define XF86XK_ContrastAdjust 0x1008FF22 /* Adjust screen contrast */
|
#define XF86XK_ContrastAdjust 0x1008ff22 /* Adjust screen contrast */
|
||||||
#define XF86XK_RockerUp 0x1008FF23 /* Rocker switches exist up */
|
#define XF86XK_RockerUp 0x1008ff23 /* Rocker switches exist up */
|
||||||
#define XF86XK_RockerDown 0x1008FF24 /* and down */
|
#define XF86XK_RockerDown 0x1008ff24 /* and down */
|
||||||
#define XF86XK_RockerEnter 0x1008FF25 /* and let you press them */
|
#define XF86XK_RockerEnter 0x1008ff25 /* and let you press them */
|
||||||
|
|
||||||
/* Some more "Internet" keyboard symbols */
|
/* Some more "Internet" keyboard symbols */
|
||||||
#define XF86XK_Back 0x1008FF26 /* Like back on a browser */
|
#define XF86XK_Back 0x1008ff26 /* Like back on a browser */
|
||||||
#define XF86XK_Forward 0x1008FF27 /* Like forward on a browser */
|
#define XF86XK_Forward 0x1008ff27 /* Like forward on a browser */
|
||||||
#define XF86XK_Stop 0x1008FF28 /* Stop current operation */
|
#define XF86XK_Stop 0x1008ff28 /* Stop current operation */
|
||||||
#define XF86XK_Refresh 0x1008FF29 /* Refresh the page */
|
#define XF86XK_Refresh 0x1008ff29 /* Refresh the page */
|
||||||
#define XF86XK_PowerOff 0x1008FF2A /* Power off system entirely */
|
#define XF86XK_PowerOff 0x1008ff2a /* Power off system entirely */
|
||||||
#define XF86XK_WakeUp 0x1008FF2B /* Wake up system from sleep */
|
#define XF86XK_WakeUp 0x1008ff2b /* Wake up system from sleep */
|
||||||
#define XF86XK_Eject 0x1008FF2C /* Eject device (e.g. DVD) */
|
#define XF86XK_Eject 0x1008ff2c /* Eject device (e.g. DVD) */
|
||||||
#define XF86XK_ScreenSaver 0x1008FF2D /* Invoke screensaver */
|
#define XF86XK_ScreenSaver 0x1008ff2d /* Invoke screensaver */
|
||||||
#define XF86XK_WWW 0x1008FF2E /* Invoke web browser */
|
#define XF86XK_WWW 0x1008ff2e /* Invoke web browser */
|
||||||
#define XF86XK_Sleep 0x1008FF2F /* Put system to sleep */
|
#define XF86XK_Sleep 0x1008ff2f /* Put system to sleep */
|
||||||
#define XF86XK_Favorites 0x1008FF30 /* Show favorite locations */
|
#define XF86XK_Favorites 0x1008ff30 /* Show favorite locations */
|
||||||
#define XF86XK_AudioPause 0x1008FF31 /* Pause audio playing */
|
#define XF86XK_AudioPause 0x1008ff31 /* Pause audio playing */
|
||||||
#define XF86XK_AudioMedia 0x1008FF32 /* Launch media collection app */
|
#define XF86XK_AudioMedia 0x1008ff32 /* Launch media collection app */
|
||||||
#define XF86XK_MyComputer 0x1008FF33 /* Display "My Computer" window */
|
#define XF86XK_MyComputer 0x1008ff33 /* Display "My Computer" window */
|
||||||
#define XF86XK_VendorHome 0x1008FF34 /* Display vendor home web site */
|
#define XF86XK_VendorHome 0x1008ff34 /* Display vendor home web site */
|
||||||
#define XF86XK_LightBulb 0x1008FF35 /* Light bulb keys exist */
|
#define XF86XK_LightBulb 0x1008ff35 /* Light bulb keys exist */
|
||||||
#define XF86XK_Shop 0x1008FF36 /* Display shopping web site */
|
#define XF86XK_Shop 0x1008ff36 /* Display shopping web site */
|
||||||
#define XF86XK_History 0x1008FF37 /* Show history of web surfing */
|
#define XF86XK_History 0x1008ff37 /* Show history of web surfing */
|
||||||
#define XF86XK_OpenURL 0x1008FF38 /* Open selected URL */
|
#define XF86XK_OpenURL 0x1008ff38 /* Open selected URL */
|
||||||
#define XF86XK_AddFavorite 0x1008FF39 /* Add URL to favorites list */
|
#define XF86XK_AddFavorite 0x1008ff39 /* Add URL to favorites list */
|
||||||
#define XF86XK_HotLinks 0x1008FF3A /* Show "hot" links */
|
#define XF86XK_HotLinks 0x1008ff3a /* Show "hot" links */
|
||||||
#define XF86XK_BrightnessAdjust 0x1008FF3B /* Invoke brightness adj. UI */
|
#define XF86XK_BrightnessAdjust 0x1008ff3b /* Invoke brightness adj. UI */
|
||||||
#define XF86XK_Finance 0x1008FF3C /* Display financial site */
|
#define XF86XK_Finance 0x1008ff3c /* Display financial site */
|
||||||
#define XF86XK_Community 0x1008FF3D /* Display user's community */
|
#define XF86XK_Community 0x1008ff3d /* Display user's community */
|
||||||
#define XF86XK_AudioRewind 0x1008FF3E /* "rewind" audio track */
|
#define XF86XK_AudioRewind 0x1008ff3e /* "rewind" audio track */
|
||||||
#define XF86XK_BackForward 0x1008FF3F /* ??? */
|
#define XF86XK_BackForward 0x1008ff3f /* ??? */
|
||||||
#define XF86XK_Launch0 0x1008FF40 /* Launch Application */
|
#define XF86XK_Launch0 0x1008ff40 /* Launch Application */
|
||||||
#define XF86XK_Launch1 0x1008FF41 /* Launch Application */
|
#define XF86XK_Launch1 0x1008ff41 /* Launch Application */
|
||||||
#define XF86XK_Launch2 0x1008FF42 /* Launch Application */
|
#define XF86XK_Launch2 0x1008ff42 /* Launch Application */
|
||||||
#define XF86XK_Launch3 0x1008FF43 /* Launch Application */
|
#define XF86XK_Launch3 0x1008ff43 /* Launch Application */
|
||||||
#define XF86XK_Launch4 0x1008FF44 /* Launch Application */
|
#define XF86XK_Launch4 0x1008ff44 /* Launch Application */
|
||||||
#define XF86XK_Launch5 0x1008FF45 /* Launch Application */
|
#define XF86XK_Launch5 0x1008ff45 /* Launch Application */
|
||||||
#define XF86XK_Launch6 0x1008FF46 /* Launch Application */
|
#define XF86XK_Launch6 0x1008ff46 /* Launch Application */
|
||||||
#define XF86XK_Launch7 0x1008FF47 /* Launch Application */
|
#define XF86XK_Launch7 0x1008ff47 /* Launch Application */
|
||||||
#define XF86XK_Launch8 0x1008FF48 /* Launch Application */
|
#define XF86XK_Launch8 0x1008ff48 /* Launch Application */
|
||||||
#define XF86XK_Launch9 0x1008FF49 /* Launch Application */
|
#define XF86XK_Launch9 0x1008ff49 /* Launch Application */
|
||||||
#define XF86XK_LaunchA 0x1008FF4A /* Launch Application */
|
#define XF86XK_LaunchA 0x1008ff4a /* Launch Application */
|
||||||
#define XF86XK_LaunchB 0x1008FF4B /* Launch Application */
|
#define XF86XK_LaunchB 0x1008ff4b /* Launch Application */
|
||||||
#define XF86XK_LaunchC 0x1008FF4C /* Launch Application */
|
#define XF86XK_LaunchC 0x1008ff4c /* Launch Application */
|
||||||
#define XF86XK_LaunchD 0x1008FF4D /* Launch Application */
|
#define XF86XK_LaunchD 0x1008ff4d /* Launch Application */
|
||||||
#define XF86XK_LaunchE 0x1008FF4E /* Launch Application */
|
#define XF86XK_LaunchE 0x1008ff4e /* Launch Application */
|
||||||
#define XF86XK_LaunchF 0x1008FF4F /* Launch Application */
|
#define XF86XK_LaunchF 0x1008ff4f /* Launch Application */
|
||||||
|
|
||||||
#define XF86XK_ApplicationLeft 0x1008FF50 /* switch to application, left */
|
#define XF86XK_ApplicationLeft 0x1008ff50 /* switch to application, left */
|
||||||
#define XF86XK_ApplicationRight 0x1008FF51 /* switch to application, right*/
|
#define XF86XK_ApplicationRight 0x1008ff51 /* switch to application, right*/
|
||||||
#define XF86XK_Book 0x1008FF52 /* Launch bookreader */
|
#define XF86XK_Book 0x1008ff52 /* Launch bookreader */
|
||||||
#define XF86XK_CD 0x1008FF53 /* Launch CD/DVD player */
|
#define XF86XK_CD 0x1008ff53 /* Launch CD/DVD player */
|
||||||
#define XF86XK_Calculater 0x1008FF54 /* Launch Calculater */
|
#define XF86XK_Calculater 0x1008ff54 /* Launch Calculater */
|
||||||
#define XF86XK_Clear 0x1008FF55 /* Clear window, screen */
|
#define XF86XK_Clear 0x1008ff55 /* Clear window, screen */
|
||||||
#define XF86XK_Close 0x1008FF56 /* Close window */
|
#define XF86XK_Close 0x1008ff56 /* Close window */
|
||||||
#define XF86XK_Copy 0x1008FF57 /* Copy selection */
|
#define XF86XK_Copy 0x1008ff57 /* Copy selection */
|
||||||
#define XF86XK_Cut 0x1008FF58 /* Cut selection */
|
#define XF86XK_Cut 0x1008ff58 /* Cut selection */
|
||||||
#define XF86XK_Display 0x1008FF59 /* Output switch key */
|
#define XF86XK_Display 0x1008ff59 /* Output switch key */
|
||||||
#define XF86XK_DOS 0x1008FF5A /* Launch DOS (emulation) */
|
#define XF86XK_DOS 0x1008ff5a /* Launch DOS (emulation) */
|
||||||
#define XF86XK_Documents 0x1008FF5B /* Open documents window */
|
#define XF86XK_Documents 0x1008ff5b /* Open documents window */
|
||||||
#define XF86XK_Excel 0x1008FF5C /* Launch spread sheet */
|
#define XF86XK_Excel 0x1008ff5c /* Launch spread sheet */
|
||||||
#define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */
|
#define XF86XK_Explorer 0x1008ff5d /* Launch file explorer */
|
||||||
#define XF86XK_Game 0x1008FF5E /* Launch game */
|
#define XF86XK_Game 0x1008ff5e /* Launch game */
|
||||||
#define XF86XK_Go 0x1008FF5F /* Go to URL */
|
#define XF86XK_Go 0x1008ff5f /* Go to URL */
|
||||||
#define XF86XK_iTouch 0x1008FF60 /* Logitech iTouch- don't use */
|
#define XF86XK_iTouch 0x1008ff60 /* Logitech iTouch- don't use */
|
||||||
#define XF86XK_LogOff 0x1008FF61 /* Log off system */
|
#define XF86XK_LogOff 0x1008ff61 /* Log off system */
|
||||||
#define XF86XK_Market 0x1008FF62 /* ?? */
|
#define XF86XK_Market 0x1008ff62 /* ?? */
|
||||||
#define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */
|
#define XF86XK_Meeting 0x1008ff63 /* enter meeting in calendar */
|
||||||
#define XF86XK_MenuKB 0x1008FF65 /* distinguish keyboard from PB */
|
#define XF86XK_MenuKB 0x1008ff65 /* distinguish keyboard from PB */
|
||||||
#define XF86XK_MenuPB 0x1008FF66 /* distinguish PB from keyboard */
|
#define XF86XK_MenuPB 0x1008ff66 /* distinguish PB from keyboard */
|
||||||
#define XF86XK_MySites 0x1008FF67 /* Favourites */
|
#define XF86XK_MySites 0x1008ff67 /* Favourites */
|
||||||
#define XF86XK_New 0x1008FF68 /* New (folder, document... */
|
#define XF86XK_New 0x1008ff68 /* New (folder, document... */
|
||||||
#define XF86XK_News 0x1008FF69 /* News */
|
#define XF86XK_News 0x1008ff69 /* News */
|
||||||
#define XF86XK_OfficeHome 0x1008FF6A /* Office home (old Staroffice)*/
|
#define XF86XK_OfficeHome 0x1008ff6a /* Office home (old Staroffice)*/
|
||||||
#define XF86XK_Open 0x1008FF6B /* Open */
|
#define XF86XK_Open 0x1008ff6b /* Open */
|
||||||
#define XF86XK_Option 0x1008FF6C /* ?? */
|
#define XF86XK_Option 0x1008ff6c /* ?? */
|
||||||
#define XF86XK_Paste 0x1008FF6D /* Paste */
|
#define XF86XK_Paste 0x1008ff6d /* Paste */
|
||||||
#define XF86XK_Phone 0x1008FF6E /* Launch phone; dial number */
|
#define XF86XK_Phone 0x1008ff6e /* Launch phone; dial number */
|
||||||
#define XF86XK_Q 0x1008FF70 /* Compaq's Q - don't use */
|
#define XF86XK_Q 0x1008ff70 /* Compaq's Q - don't use */
|
||||||
#define XF86XK_Reply 0x1008FF72 /* Reply e.g., mail */
|
#define XF86XK_Reply 0x1008ff72 /* Reply e.g., mail */
|
||||||
#define XF86XK_Reload 0x1008FF73 /* Reload web page, file, etc. */
|
#define XF86XK_Reload 0x1008ff73 /* Reload web page, file, etc. */
|
||||||
#define XF86XK_RotateWindows 0x1008FF74 /* Rotate windows e.g. xrandr */
|
#define XF86XK_RotateWindows 0x1008ff74 /* Rotate windows e.g. xrandr */
|
||||||
#define XF86XK_RotationPB 0x1008FF75 /* don't use */
|
#define XF86XK_RotationPB 0x1008ff75 /* don't use */
|
||||||
#define XF86XK_RotationKB 0x1008FF76 /* don't use */
|
#define XF86XK_RotationKB 0x1008ff76 /* don't use */
|
||||||
#define XF86XK_Save 0x1008FF77 /* Save (file, document, state */
|
#define XF86XK_Save 0x1008ff77 /* Save (file, document, state */
|
||||||
#define XF86XK_ScrollUp 0x1008FF78 /* Scroll window/contents up */
|
#define XF86XK_ScrollUp 0x1008ff78 /* Scroll window/contents up */
|
||||||
#define XF86XK_ScrollDown 0x1008FF79 /* Scrool window/contentd down */
|
#define XF86XK_ScrollDown 0x1008ff79 /* Scrool window/contentd down */
|
||||||
#define XF86XK_ScrollClick 0x1008FF7A /* Use XKB mousekeys instead */
|
#define XF86XK_ScrollClick 0x1008ff7a /* Use XKB mousekeys instead */
|
||||||
#define XF86XK_Send 0x1008FF7B /* Send mail, file, object */
|
#define XF86XK_Send 0x1008ff7b /* Send mail, file, object */
|
||||||
#define XF86XK_Spell 0x1008FF7C /* Spell checker */
|
#define XF86XK_Spell 0x1008ff7c /* Spell checker */
|
||||||
#define XF86XK_SplitScreen 0x1008FF7D /* Split window or screen */
|
#define XF86XK_SplitScreen 0x1008ff7d /* Split window or screen */
|
||||||
#define XF86XK_Support 0x1008FF7E /* Get support (??) */
|
#define XF86XK_Support 0x1008ff7e /* Get support (??) */
|
||||||
#define XF86XK_TaskPane 0x1008FF7F /* Show tasks */
|
#define XF86XK_TaskPane 0x1008ff7f /* Show tasks */
|
||||||
#define XF86XK_Terminal 0x1008FF80 /* Launch terminal emulator */
|
#define XF86XK_Terminal 0x1008ff80 /* Launch terminal emulator */
|
||||||
#define XF86XK_Tools 0x1008FF81 /* toolbox of desktop/app. */
|
#define XF86XK_Tools 0x1008ff81 /* toolbox of desktop/app. */
|
||||||
#define XF86XK_Travel 0x1008FF82 /* ?? */
|
#define XF86XK_Travel 0x1008ff82 /* ?? */
|
||||||
#define XF86XK_UserPB 0x1008FF84 /* ?? */
|
#define XF86XK_UserPB 0x1008ff84 /* ?? */
|
||||||
#define XF86XK_User1KB 0x1008FF85 /* ?? */
|
#define XF86XK_User1KB 0x1008ff85 /* ?? */
|
||||||
#define XF86XK_User2KB 0x1008FF86 /* ?? */
|
#define XF86XK_User2KB 0x1008ff86 /* ?? */
|
||||||
#define XF86XK_Video 0x1008FF87 /* Launch video player */
|
#define XF86XK_Video 0x1008ff87 /* Launch video player */
|
||||||
#define XF86XK_WheelButton 0x1008FF88 /* button from a mouse wheel */
|
#define XF86XK_WheelButton 0x1008ff88 /* button from a mouse wheel */
|
||||||
#define XF86XK_Word 0x1008FF89 /* Launch word processor */
|
#define XF86XK_Word 0x1008ff89 /* Launch word processor */
|
||||||
#define XF86XK_Xfer 0x1008FF8A
|
#define XF86XK_Xfer 0x1008ff8a
|
||||||
#define XF86XK_ZoomIn 0x1008FF8B /* zoom in view, map, etc. */
|
#define XF86XK_ZoomIn 0x1008ff8b /* zoom in view, map, etc. */
|
||||||
#define XF86XK_ZoomOut 0x1008FF8C /* zoom out view, map, etc. */
|
#define XF86XK_ZoomOut 0x1008ff8c /* zoom out view, map, etc. */
|
||||||
|
|
||||||
#define XF86XK_Away 0x1008FF8D /* mark yourself as away */
|
#define XF86XK_Away 0x1008ff8d /* mark yourself as away */
|
||||||
#define XF86XK_Messenger 0x1008FF8E /* as in instant messaging */
|
#define XF86XK_Messenger 0x1008ff8e /* as in instant messaging */
|
||||||
#define XF86XK_WebCam 0x1008FF8F /* Launch web camera app. */
|
#define XF86XK_WebCam 0x1008ff8f /* Launch web camera app. */
|
||||||
#define XF86XK_MailForward 0x1008FF90 /* Forward in mail */
|
#define XF86XK_MailForward 0x1008ff90 /* Forward in mail */
|
||||||
#define XF86XK_Pictures 0x1008FF91 /* Show pictures */
|
#define XF86XK_Pictures 0x1008ff91 /* Show pictures */
|
||||||
#define XF86XK_Music 0x1008FF92 /* Launch music application */
|
#define XF86XK_Music 0x1008ff92 /* Launch music application */
|
||||||
|
|
||||||
#define XF86XK_Battery 0x1008FF93 /* Display battery information */
|
#define XF86XK_Battery 0x1008ff93 /* Display battery information */
|
||||||
#define XF86XK_Bluetooth 0x1008FF94 /* Enable/disable Bluetooth */
|
#define XF86XK_Bluetooth 0x1008ff94 /* Enable/disable Bluetooth */
|
||||||
#define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */
|
#define XF86XK_WLAN 0x1008ff95 /* Enable/disable WLAN */
|
||||||
#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */
|
#define XF86XK_UWB 0x1008ff96 /* Enable/disable UWB */
|
||||||
|
|
||||||
#define XF86XK_AudioForward 0x1008FF97 /* fast-forward audio track */
|
#define XF86XK_AudioForward 0x1008ff97 /* fast-forward audio track */
|
||||||
#define XF86XK_AudioRepeat 0x1008FF98 /* toggle repeat mode */
|
#define XF86XK_AudioRepeat 0x1008ff98 /* toggle repeat mode */
|
||||||
#define XF86XK_AudioRandomPlay 0x1008FF99 /* toggle shuffle mode */
|
#define XF86XK_AudioRandomPlay 0x1008ff99 /* toggle shuffle mode */
|
||||||
#define XF86XK_Subtitle 0x1008FF9A /* cycle through subtitle */
|
#define XF86XK_Subtitle 0x1008ff9a /* cycle through subtitle */
|
||||||
#define XF86XK_AudioCycleTrack 0x1008FF9B /* cycle through audio tracks */
|
#define XF86XK_AudioCycleTrack 0x1008ff9b /* cycle through audio tracks */
|
||||||
#define XF86XK_CycleAngle 0x1008FF9C /* cycle through angles */
|
#define XF86XK_CycleAngle 0x1008ff9c /* cycle through angles */
|
||||||
#define XF86XK_FrameBack 0x1008FF9D /* video: go one frame back */
|
#define XF86XK_FrameBack 0x1008ff9d /* video: go one frame back */
|
||||||
#define XF86XK_FrameForward 0x1008FF9E /* video: go one frame forward */
|
#define XF86XK_FrameForward 0x1008ff9e /* video: go one frame forward */
|
||||||
#define XF86XK_Time 0x1008FF9F /* display, or shows an entry for time seeking */
|
#define XF86XK_Time 0x1008ff9f /* display, or shows an entry for time seeking */
|
||||||
#define XF86XK_Select 0x1008FFA0 /* Select button on joypads and remotes */
|
#define XF86XK_Select 0x1008ffa0 /* Select button on joypads and remotes */
|
||||||
#define XF86XK_View 0x1008FFA1 /* Show a view options/properties */
|
#define XF86XK_View 0x1008ffa1 /* Show a view options/properties */
|
||||||
#define XF86XK_TopMenu 0x1008FFA2 /* Go to a top-level menu in a video */
|
#define XF86XK_TopMenu 0x1008ffa2 /* Go to a top-level menu in a video */
|
||||||
|
|
||||||
#define XF86XK_Red 0x1008FFA3 /* Red button */
|
#define XF86XK_Red 0x1008ffa3 /* Red button */
|
||||||
#define XF86XK_Green 0x1008FFA4 /* Green button */
|
#define XF86XK_Green 0x1008ffa4 /* Green button */
|
||||||
#define XF86XK_Yellow 0x1008FFA5 /* Yellow button */
|
#define XF86XK_Yellow 0x1008ffa5 /* Yellow button */
|
||||||
#define XF86XK_Blue 0x1008FFA6 /* Blue button */
|
#define XF86XK_Blue 0x1008ffa6 /* Blue button */
|
||||||
|
|
||||||
#define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */
|
#define XF86XK_Suspend 0x1008ffa7 /* Sleep to RAM */
|
||||||
#define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */
|
#define XF86XK_Hibernate 0x1008ffa8 /* Sleep to disk */
|
||||||
#define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */
|
#define XF86XK_TouchpadToggle 0x1008ffa9 /* Toggle between touchpad/trackstick */
|
||||||
#define XF86XK_TouchpadOn 0x1008FFB0 /* The touchpad got switched on */
|
#define XF86XK_TouchpadOn 0x1008ffb0 /* The touchpad got switched on */
|
||||||
#define XF86XK_TouchpadOff 0x1008FFB1 /* The touchpad got switched off */
|
#define XF86XK_TouchpadOff 0x1008ffb1 /* The touchpad got switched off */
|
||||||
|
|
||||||
#define XF86XK_AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */
|
#define XF86XK_AudioMicMute 0x1008ffb2 /* Mute the Mic from the system */
|
||||||
|
|
||||||
#define XF86XK_Keyboard 0x1008FFB3 /* User defined keyboard related action */
|
#define XF86XK_Keyboard 0x1008ffb3 /* User defined keyboard related action */
|
||||||
|
|
||||||
#define XF86XK_WWAN 0x1008FFB4 /* Toggle WWAN (LTE, UMTS, etc.) radio */
|
#define XF86XK_WWAN 0x1008ffb4 /* Toggle WWAN (LTE, UMTS, etc.) radio */
|
||||||
#define XF86XK_RFKill 0x1008FFB5 /* Toggle radios on/off */
|
#define XF86XK_RFKill 0x1008ffb5 /* Toggle radios on/off */
|
||||||
|
|
||||||
#define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset, e.g. theatre-mode */
|
#define XF86XK_AudioPreset 0x1008ffb6 /* Select equalizer preset, e.g. theatre-mode */
|
||||||
|
|
||||||
#define XF86XK_RotationLockToggle 0x1008FFB7 /* Toggle screen rotation lock on/off */
|
#define XF86XK_RotationLockToggle 0x1008ffb7 /* Toggle screen rotation lock on/off */
|
||||||
|
|
||||||
#define XF86XK_FullScreen 0x1008FFB8 /* Toggle fullscreen */
|
#define XF86XK_FullScreen 0x1008ffb8 /* Toggle fullscreen */
|
||||||
|
|
||||||
/* Keys for special action keys (hot keys) */
|
/* Keys for special action keys (hot keys) */
|
||||||
/* Virtual terminals on some operating systems */
|
/* Virtual terminals on some operating systems */
|
||||||
#define XF86XK_Switch_VT_1 0x1008FE01
|
#define XF86XK_Switch_VT_1 0x1008fe01
|
||||||
#define XF86XK_Switch_VT_2 0x1008FE02
|
#define XF86XK_Switch_VT_2 0x1008fe02
|
||||||
#define XF86XK_Switch_VT_3 0x1008FE03
|
#define XF86XK_Switch_VT_3 0x1008fe03
|
||||||
#define XF86XK_Switch_VT_4 0x1008FE04
|
#define XF86XK_Switch_VT_4 0x1008fe04
|
||||||
#define XF86XK_Switch_VT_5 0x1008FE05
|
#define XF86XK_Switch_VT_5 0x1008fe05
|
||||||
#define XF86XK_Switch_VT_6 0x1008FE06
|
#define XF86XK_Switch_VT_6 0x1008fe06
|
||||||
#define XF86XK_Switch_VT_7 0x1008FE07
|
#define XF86XK_Switch_VT_7 0x1008fe07
|
||||||
#define XF86XK_Switch_VT_8 0x1008FE08
|
#define XF86XK_Switch_VT_8 0x1008fe08
|
||||||
#define XF86XK_Switch_VT_9 0x1008FE09
|
#define XF86XK_Switch_VT_9 0x1008fe09
|
||||||
#define XF86XK_Switch_VT_10 0x1008FE0A
|
#define XF86XK_Switch_VT_10 0x1008fe0a
|
||||||
#define XF86XK_Switch_VT_11 0x1008FE0B
|
#define XF86XK_Switch_VT_11 0x1008fe0b
|
||||||
#define XF86XK_Switch_VT_12 0x1008FE0C
|
#define XF86XK_Switch_VT_12 0x1008fe0c
|
||||||
|
|
||||||
#define XF86XK_Ungrab 0x1008FE20 /* force ungrab */
|
#define XF86XK_Ungrab 0x1008fe20 /* force ungrab */
|
||||||
#define XF86XK_ClearGrab 0x1008FE21 /* kill application with grab */
|
#define XF86XK_ClearGrab 0x1008fe21 /* kill application with grab */
|
||||||
#define XF86XK_Next_VMode 0x1008FE22 /* next video mode available */
|
#define XF86XK_Next_VMode 0x1008fe22 /* next video mode available */
|
||||||
#define XF86XK_Prev_VMode 0x1008FE23 /* prev. video mode available */
|
#define XF86XK_Prev_VMode 0x1008fe23 /* prev. video mode available */
|
||||||
#define XF86XK_LogWindowTree 0x1008FE24 /* print window tree to log */
|
#define XF86XK_LogWindowTree 0x1008fe24 /* print window tree to log */
|
||||||
#define XF86XK_LogGrabInfo 0x1008FE25 /* print all active grabs to log */
|
#define XF86XK_LogGrabInfo 0x1008fe25 /* print all active grabs to log */
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -271,32 +271,32 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#define _EVDEVK(_v) (0x10081000 + _v)
|
#define _EVDEVK(_v) (0x10081000 + _v)
|
||||||
/* Use: XF86XK_Eject _EVDEVK(0x0A2) KEY_EJECTCLOSECD */
|
/* Use: XF86XK_Eject _EVDEVK(0x0a2) KEY_EJECTCLOSECD */
|
||||||
/* Use: XF86XK_New _EVDEVK(0x0B5) v2.6.14 KEY_NEW */
|
/* Use: XF86XK_New _EVDEVK(0x0b5) v2.6.14 KEY_NEW */
|
||||||
/* Use: XK_Redo _EVDEVK(0x0B6) v2.6.14 KEY_REDO */
|
/* Use: XK_Redo _EVDEVK(0x0b6) v2.6.14 KEY_REDO */
|
||||||
/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */
|
/* KEY_DASHBOARD has been mapped to LaunchB in xkeyboard-config since 2011 */
|
||||||
/* Use: XF86XK_LaunchB _EVDEVK(0x0CC) v2.6.28 KEY_DASHBOARD */
|
/* Use: XF86XK_LaunchB _EVDEVK(0x0cc) v2.6.28 KEY_DASHBOARD */
|
||||||
/* Use: XF86XK_Display _EVDEVK(0x0E3) v2.6.12 KEY_SWITCHVIDEOMODE */
|
/* Use: XF86XK_Display _EVDEVK(0x0e3) v2.6.12 KEY_SWITCHVIDEOMODE */
|
||||||
/* Use: XF86XK_KbdLightOnOff _EVDEVK(0x0E4) v2.6.12 KEY_KBDILLUMTOGGLE */
|
/* Use: XF86XK_KbdLightOnOff _EVDEVK(0x0e4) v2.6.12 KEY_KBDILLUMTOGGLE */
|
||||||
/* Use: XF86XK_KbdBrightnessDown _EVDEVK(0x0E5) v2.6.12 KEY_KBDILLUMDOWN */
|
/* Use: XF86XK_KbdBrightnessDown _EVDEVK(0x0e5) v2.6.12 KEY_KBDILLUMDOWN */
|
||||||
/* Use: XF86XK_KbdBrightnessUp _EVDEVK(0x0E6) v2.6.12 KEY_KBDILLUMUP */
|
/* Use: XF86XK_KbdBrightnessUp _EVDEVK(0x0e6) v2.6.12 KEY_KBDILLUMUP */
|
||||||
/* Use: XF86XK_Send _EVDEVK(0x0E7) v2.6.14 KEY_SEND */
|
/* Use: XF86XK_Send _EVDEVK(0x0e7) v2.6.14 KEY_SEND */
|
||||||
/* Use: XF86XK_Reply _EVDEVK(0x0E8) v2.6.14 KEY_REPLY */
|
/* Use: XF86XK_Reply _EVDEVK(0x0e8) v2.6.14 KEY_REPLY */
|
||||||
/* Use: XF86XK_MailForward _EVDEVK(0x0E9) v2.6.14 KEY_FORWARDMAIL */
|
/* Use: XF86XK_MailForward _EVDEVK(0x0e9) v2.6.14 KEY_FORWARDMAIL */
|
||||||
/* Use: XF86XK_Save _EVDEVK(0x0EA) v2.6.14 KEY_SAVE */
|
/* Use: XF86XK_Save _EVDEVK(0x0ea) v2.6.14 KEY_SAVE */
|
||||||
/* Use: XF86XK_Documents _EVDEVK(0x0EB) v2.6.14 KEY_DOCUMENTS */
|
/* Use: XF86XK_Documents _EVDEVK(0x0eb) v2.6.14 KEY_DOCUMENTS */
|
||||||
/* Use: XF86XK_Battery _EVDEVK(0x0EC) v2.6.17 KEY_BATTERY */
|
/* Use: XF86XK_Battery _EVDEVK(0x0ec) v2.6.17 KEY_BATTERY */
|
||||||
/* Use: XF86XK_Bluetooth _EVDEVK(0x0ED) v2.6.19 KEY_BLUETOOTH */
|
/* Use: XF86XK_Bluetooth _EVDEVK(0x0ed) v2.6.19 KEY_BLUETOOTH */
|
||||||
/* Use: XF86XK_WLAN _EVDEVK(0x0EE) v2.6.19 KEY_WLAN */
|
/* Use: XF86XK_WLAN _EVDEVK(0x0ee) v2.6.19 KEY_WLAN */
|
||||||
/* Use: XF86XK_UWB _EVDEVK(0x0EF) v2.6.24 KEY_UWB */
|
/* Use: XF86XK_UWB _EVDEVK(0x0ef) v2.6.24 KEY_UWB */
|
||||||
/* Use: XF86XK_Next_VMode _EVDEVK(0x0F1) v2.6.23 KEY_VIDEO_NEXT */
|
/* Use: XF86XK_Next_VMode _EVDEVK(0x0f1) v2.6.23 KEY_VIDEO_NEXT */
|
||||||
/* Use: XF86XK_Prev_VMode _EVDEVK(0x0F2) v2.6.23 KEY_VIDEO_PREV */
|
/* Use: XF86XK_Prev_VMode _EVDEVK(0x0f2) v2.6.23 KEY_VIDEO_PREV */
|
||||||
/* Use: XF86XK_MonBrightnessCycle _EVDEVK(0x0F3) v2.6.23 KEY_BRIGHTNESS_CYCLE */
|
/* Use: XF86XK_MonBrightnessCycle _EVDEVK(0x0f3) v2.6.23 KEY_BRIGHTNESS_CYCLE */
|
||||||
#define XF86XK_BrightnessAuto _EVDEVK(0x0F4) /* v3.16 KEY_BRIGHTNESS_AUTO */
|
#define XF86XK_BrightnessAuto _EVDEVK(0x0f4) /* v3.16 KEY_BRIGHTNESS_AUTO */
|
||||||
#define XF86XK_DisplayOff _EVDEVK(0x0F5) /* v2.6.23 KEY_DISPLAY_OFF */
|
#define XF86XK_DisplayOff _EVDEVK(0x0f5) /* v2.6.23 KEY_DISPLAY_OFF */
|
||||||
/* Use: XF86XK_WWAN _EVDEVK(0x0F6) v3.13 KEY_WWAN */
|
/* Use: XF86XK_WWAN _EVDEVK(0x0f6) v3.13 KEY_WWAN */
|
||||||
/* Use: XF86XK_RFKill _EVDEVK(0x0F7) v2.6.33 KEY_RFKILL */
|
/* Use: XF86XK_RFKill _EVDEVK(0x0f7) v2.6.33 KEY_RFKILL */
|
||||||
/* Use: XF86XK_AudioMicMute _EVDEVK(0x0F8) v3.1 KEY_MICMUTE */
|
/* Use: XF86XK_AudioMicMute _EVDEVK(0x0f8) v3.1 KEY_MICMUTE */
|
||||||
#define XF86XK_Info _EVDEVK(0x166) /* KEY_INFO */
|
#define XF86XK_Info _EVDEVK(0x166) /* KEY_INFO */
|
||||||
/* Use: XF86XK_CycleAngle _EVDEVK(0x173) KEY_ANGLE */
|
/* Use: XF86XK_CycleAngle _EVDEVK(0x173) KEY_ANGLE */
|
||||||
/* Use: XF86XK_FullScreen _EVDEVK(0x174) v5.1 KEY_FULL_SCREEN */
|
/* Use: XF86XK_FullScreen _EVDEVK(0x174) v5.1 KEY_FULL_SCREEN */
|
||||||
|
|
@ -304,54 +304,54 @@
|
||||||
#define XF86XK_DVD _EVDEVK(0x185) /* KEY_DVD */
|
#define XF86XK_DVD _EVDEVK(0x185) /* KEY_DVD */
|
||||||
#define XF86XK_Audio _EVDEVK(0x188) /* KEY_AUDIO */
|
#define XF86XK_Audio _EVDEVK(0x188) /* KEY_AUDIO */
|
||||||
/* Use: XF86XK_Video _EVDEVK(0x189) KEY_VIDEO */
|
/* Use: XF86XK_Video _EVDEVK(0x189) KEY_VIDEO */
|
||||||
/* Use: XF86XK_Calendar _EVDEVK(0x18D) KEY_CALENDAR */
|
/* Use: XF86XK_Calendar _EVDEVK(0x18d) KEY_CALENDAR */
|
||||||
#define XF86XK_ChannelUp _EVDEVK(0x192) /* KEY_CHANNELUP */
|
#define XF86XK_ChannelUp _EVDEVK(0x192) /* KEY_CHANNELUP */
|
||||||
#define XF86XK_ChannelDown _EVDEVK(0x193) /* KEY_CHANNELDOWN */
|
#define XF86XK_ChannelDown _EVDEVK(0x193) /* KEY_CHANNELDOWN */
|
||||||
/* Use: XF86XK_AudioRandomPlay _EVDEVK(0x19A) KEY_SHUFFLE */
|
/* Use: XF86XK_AudioRandomPlay _EVDEVK(0x19a) KEY_SHUFFLE */
|
||||||
#define XF86XK_Break _EVDEVK(0x19B) /* KEY_BREAK */
|
#define XF86XK_Break _EVDEVK(0x19b) /* KEY_BREAK */
|
||||||
#define XF86XK_VideoPhone _EVDEVK(0x1A0) /* v2.6.20 KEY_VIDEOPHONE */
|
#define XF86XK_VideoPhone _EVDEVK(0x1a0) /* v2.6.20 KEY_VIDEOPHONE */
|
||||||
/* Use: XF86XK_Game _EVDEVK(0x1A1) v2.6.20 KEY_GAMES */
|
/* Use: XF86XK_Game _EVDEVK(0x1a1) v2.6.20 KEY_GAMES */
|
||||||
/* Use: XF86XK_ZoomIn _EVDEVK(0x1A2) v2.6.20 KEY_ZOOMIN */
|
/* Use: XF86XK_ZoomIn _EVDEVK(0x1a2) v2.6.20 KEY_ZOOMIN */
|
||||||
/* Use: XF86XK_ZoomOut _EVDEVK(0x1A3) v2.6.20 KEY_ZOOMOUT */
|
/* Use: XF86XK_ZoomOut _EVDEVK(0x1a3) v2.6.20 KEY_ZOOMOUT */
|
||||||
#define XF86XK_ZoomReset _EVDEVK(0x1A4) /* v2.6.20 KEY_ZOOMRESET */
|
#define XF86XK_ZoomReset _EVDEVK(0x1a4) /* v2.6.20 KEY_ZOOMRESET */
|
||||||
/* Use: XF86XK_Word _EVDEVK(0x1A5) v2.6.20 KEY_WORDPROCESSOR */
|
/* Use: XF86XK_Word _EVDEVK(0x1a5) v2.6.20 KEY_WORDPROCESSOR */
|
||||||
#define XF86XK_Editor _EVDEVK(0x1A6) /* v2.6.20 KEY_EDITOR */
|
#define XF86XK_Editor _EVDEVK(0x1a6) /* v2.6.20 KEY_EDITOR */
|
||||||
/* Use: XF86XK_Excel _EVDEVK(0x1A7) v2.6.20 KEY_SPREADSHEET */
|
/* Use: XF86XK_Excel _EVDEVK(0x1a7) v2.6.20 KEY_SPREADSHEET */
|
||||||
#define XF86XK_GraphicsEditor _EVDEVK(0x1A8) /* v2.6.20 KEY_GRAPHICSEDITOR */
|
#define XF86XK_GraphicsEditor _EVDEVK(0x1a8) /* v2.6.20 KEY_GRAPHICSEDITOR */
|
||||||
#define XF86XK_Presentation _EVDEVK(0x1A9) /* v2.6.20 KEY_PRESENTATION */
|
#define XF86XK_Presentation _EVDEVK(0x1a9) /* v2.6.20 KEY_PRESENTATION */
|
||||||
#define XF86XK_Database _EVDEVK(0x1AA) /* v2.6.20 KEY_DATABASE */
|
#define XF86XK_Database _EVDEVK(0x1aa) /* v2.6.20 KEY_DATABASE */
|
||||||
/* Use: XF86XK_News _EVDEVK(0x1AB) v2.6.20 KEY_NEWS */
|
/* Use: XF86XK_News _EVDEVK(0x1ab) v2.6.20 KEY_NEWS */
|
||||||
#define XF86XK_Voicemail _EVDEVK(0x1AC) /* v2.6.20 KEY_VOICEMAIL */
|
#define XF86XK_Voicemail _EVDEVK(0x1ac) /* v2.6.20 KEY_VOICEMAIL */
|
||||||
#define XF86XK_Addressbook _EVDEVK(0x1AD) /* v2.6.20 KEY_ADDRESSBOOK */
|
#define XF86XK_Addressbook _EVDEVK(0x1ad) /* v2.6.20 KEY_ADDRESSBOOK */
|
||||||
/* Use: XF86XK_Messenger _EVDEVK(0x1AE) v2.6.20 KEY_MESSENGER */
|
/* Use: XF86XK_Messenger _EVDEVK(0x1ae) v2.6.20 KEY_MESSENGER */
|
||||||
#define XF86XK_DisplayToggle _EVDEVK(0x1AF) /* v2.6.20 KEY_DISPLAYTOGGLE */
|
#define XF86XK_DisplayToggle _EVDEVK(0x1af) /* v2.6.20 KEY_DISPLAYTOGGLE */
|
||||||
#define XF86XK_SpellCheck _EVDEVK(0x1B0) /* v2.6.24 KEY_SPELLCHECK */
|
#define XF86XK_SpellCheck _EVDEVK(0x1b0) /* v2.6.24 KEY_SPELLCHECK */
|
||||||
/* Use: XF86XK_LogOff _EVDEVK(0x1B1) v2.6.24 KEY_LOGOFF */
|
/* Use: XF86XK_LogOff _EVDEVK(0x1b1) v2.6.24 KEY_LOGOFF */
|
||||||
/* Use: XK_dollar _EVDEVK(0x1B2) v2.6.24 KEY_DOLLAR */
|
/* Use: XK_dollar _EVDEVK(0x1b2) v2.6.24 KEY_DOLLAR */
|
||||||
/* Use: XK_EuroSign _EVDEVK(0x1B3) v2.6.24 KEY_EURO */
|
/* Use: XK_EuroSign _EVDEVK(0x1b3) v2.6.24 KEY_EURO */
|
||||||
/* Use: XF86XK_FrameBack _EVDEVK(0x1B4) v2.6.24 KEY_FRAMEBACK */
|
/* Use: XF86XK_FrameBack _EVDEVK(0x1b4) v2.6.24 KEY_FRAMEBACK */
|
||||||
/* Use: XF86XK_FrameForward _EVDEVK(0x1B5) v2.6.24 KEY_FRAMEFORWARD */
|
/* Use: XF86XK_FrameForward _EVDEVK(0x1b5) v2.6.24 KEY_FRAMEFORWARD */
|
||||||
#define XF86XK_ContextMenu _EVDEVK(0x1B6) /* v2.6.24 KEY_CONTEXT_MENU */
|
#define XF86XK_ContextMenu _EVDEVK(0x1b6) /* v2.6.24 KEY_CONTEXT_MENU */
|
||||||
#define XF86XK_MediaRepeat _EVDEVK(0x1B7) /* v2.6.26 KEY_MEDIA_REPEAT */
|
#define XF86XK_MediaRepeat _EVDEVK(0x1b7) /* v2.6.26 KEY_MEDIA_REPEAT */
|
||||||
#define XF86XK_10ChannelsUp _EVDEVK(0x1B8) /* v2.6.38 KEY_10CHANNELSUP */
|
#define XF86XK_10ChannelsUp _EVDEVK(0x1b8) /* v2.6.38 KEY_10CHANNELSUP */
|
||||||
#define XF86XK_10ChannelsDown _EVDEVK(0x1B9) /* v2.6.38 KEY_10CHANNELSDOWN */
|
#define XF86XK_10ChannelsDown _EVDEVK(0x1b9) /* v2.6.38 KEY_10CHANNELSDOWN */
|
||||||
#define XF86XK_Images _EVDEVK(0x1BA) /* v2.6.39 KEY_IMAGES */
|
#define XF86XK_Images _EVDEVK(0x1ba) /* v2.6.39 KEY_IMAGES */
|
||||||
#define XF86XK_NotificationCenter _EVDEVK(0x1BC) /* v5.10 KEY_NOTIFICATION_CENTER */
|
#define XF86XK_NotificationCenter _EVDEVK(0x1bc) /* v5.10 KEY_NOTIFICATION_CENTER */
|
||||||
#define XF86XK_PickupPhone _EVDEVK(0x1BD) /* v5.10 KEY_PICKUP_PHONE */
|
#define XF86XK_PickupPhone _EVDEVK(0x1bd) /* v5.10 KEY_PICKUP_PHONE */
|
||||||
#define XF86XK_HangupPhone _EVDEVK(0x1BE) /* v5.10 KEY_HANGUP_PHONE */
|
#define XF86XK_HangupPhone _EVDEVK(0x1be) /* v5.10 KEY_HANGUP_PHONE */
|
||||||
#define XF86XK_Fn _EVDEVK(0x1D0) /* KEY_FN */
|
#define XF86XK_Fn _EVDEVK(0x1d0) /* KEY_FN */
|
||||||
#define XF86XK_Fn_Esc _EVDEVK(0x1D1) /* KEY_FN_ESC */
|
#define XF86XK_Fn_Esc _EVDEVK(0x1d1) /* KEY_FN_ESC */
|
||||||
#define XF86XK_FnRightShift _EVDEVK(0x1E5) /* v5.10 KEY_FN_RIGHT_SHIFT */
|
#define XF86XK_FnRightShift _EVDEVK(0x1e5) /* v5.10 KEY_FN_RIGHT_SHIFT */
|
||||||
/* Use: XK_braille_dot_1 _EVDEVK(0x1F1) v2.6.17 KEY_BRL_DOT1 */
|
/* Use: XK_braille_dot_1 _EVDEVK(0x1f1) v2.6.17 KEY_BRL_DOT1 */
|
||||||
/* Use: XK_braille_dot_2 _EVDEVK(0x1F2) v2.6.17 KEY_BRL_DOT2 */
|
/* Use: XK_braille_dot_2 _EVDEVK(0x1f2) v2.6.17 KEY_BRL_DOT2 */
|
||||||
/* Use: XK_braille_dot_3 _EVDEVK(0x1F3) v2.6.17 KEY_BRL_DOT3 */
|
/* Use: XK_braille_dot_3 _EVDEVK(0x1f3) v2.6.17 KEY_BRL_DOT3 */
|
||||||
/* Use: XK_braille_dot_4 _EVDEVK(0x1F4) v2.6.17 KEY_BRL_DOT4 */
|
/* Use: XK_braille_dot_4 _EVDEVK(0x1f4) v2.6.17 KEY_BRL_DOT4 */
|
||||||
/* Use: XK_braille_dot_5 _EVDEVK(0x1F5) v2.6.17 KEY_BRL_DOT5 */
|
/* Use: XK_braille_dot_5 _EVDEVK(0x1f5) v2.6.17 KEY_BRL_DOT5 */
|
||||||
/* Use: XK_braille_dot_6 _EVDEVK(0x1F6) v2.6.17 KEY_BRL_DOT6 */
|
/* Use: XK_braille_dot_6 _EVDEVK(0x1f6) v2.6.17 KEY_BRL_DOT6 */
|
||||||
/* Use: XK_braille_dot_7 _EVDEVK(0x1F7) v2.6.17 KEY_BRL_DOT7 */
|
/* Use: XK_braille_dot_7 _EVDEVK(0x1f7) v2.6.17 KEY_BRL_DOT7 */
|
||||||
/* Use: XK_braille_dot_8 _EVDEVK(0x1F8) v2.6.17 KEY_BRL_DOT8 */
|
/* Use: XK_braille_dot_8 _EVDEVK(0x1f8) v2.6.17 KEY_BRL_DOT8 */
|
||||||
/* Use: XK_braille_dot_9 _EVDEVK(0x1F9) v2.6.23 KEY_BRL_DOT9 */
|
/* Use: XK_braille_dot_9 _EVDEVK(0x1f9) v2.6.23 KEY_BRL_DOT9 */
|
||||||
/* Use: XK_braille_dot_1 _EVDEVK(0x1FA) v2.6.23 KEY_BRL_DOT10 */
|
/* Use: XK_braille_dot_1 _EVDEVK(0x1fa) v2.6.23 KEY_BRL_DOT10 */
|
||||||
#define XF86XK_Numeric0 _EVDEVK(0x200) /* v2.6.28 KEY_NUMERIC_0 */
|
#define XF86XK_Numeric0 _EVDEVK(0x200) /* v2.6.28 KEY_NUMERIC_0 */
|
||||||
#define XF86XK_Numeric1 _EVDEVK(0x201) /* v2.6.28 KEY_NUMERIC_1 */
|
#define XF86XK_Numeric1 _EVDEVK(0x201) /* v2.6.28 KEY_NUMERIC_1 */
|
||||||
#define XF86XK_Numeric2 _EVDEVK(0x202) /* v2.6.28 KEY_NUMERIC_2 */
|
#define XF86XK_Numeric2 _EVDEVK(0x202) /* v2.6.28 KEY_NUMERIC_2 */
|
||||||
|
|
@ -362,12 +362,12 @@
|
||||||
#define XF86XK_Numeric7 _EVDEVK(0x207) /* v2.6.28 KEY_NUMERIC_7 */
|
#define XF86XK_Numeric7 _EVDEVK(0x207) /* v2.6.28 KEY_NUMERIC_7 */
|
||||||
#define XF86XK_Numeric8 _EVDEVK(0x208) /* v2.6.28 KEY_NUMERIC_8 */
|
#define XF86XK_Numeric8 _EVDEVK(0x208) /* v2.6.28 KEY_NUMERIC_8 */
|
||||||
#define XF86XK_Numeric9 _EVDEVK(0x209) /* v2.6.28 KEY_NUMERIC_9 */
|
#define XF86XK_Numeric9 _EVDEVK(0x209) /* v2.6.28 KEY_NUMERIC_9 */
|
||||||
#define XF86XK_NumericStar _EVDEVK(0x20A) /* v2.6.28 KEY_NUMERIC_STAR */
|
#define XF86XK_NumericStar _EVDEVK(0x20a) /* v2.6.28 KEY_NUMERIC_STAR */
|
||||||
#define XF86XK_NumericPound _EVDEVK(0x20B) /* v2.6.28 KEY_NUMERIC_POUND */
|
#define XF86XK_NumericPound _EVDEVK(0x20b) /* v2.6.28 KEY_NUMERIC_POUND */
|
||||||
#define XF86XK_NumericA _EVDEVK(0x20C) /* v4.1 KEY_NUMERIC_A */
|
#define XF86XK_NumericA _EVDEVK(0x20c) /* v4.1 KEY_NUMERIC_A */
|
||||||
#define XF86XK_NumericB _EVDEVK(0x20D) /* v4.1 KEY_NUMERIC_B */
|
#define XF86XK_NumericB _EVDEVK(0x20d) /* v4.1 KEY_NUMERIC_B */
|
||||||
#define XF86XK_NumericC _EVDEVK(0x20E) /* v4.1 KEY_NUMERIC_C */
|
#define XF86XK_NumericC _EVDEVK(0x20e) /* v4.1 KEY_NUMERIC_C */
|
||||||
#define XF86XK_NumericD _EVDEVK(0x20F) /* v4.1 KEY_NUMERIC_D */
|
#define XF86XK_NumericD _EVDEVK(0x20f) /* v4.1 KEY_NUMERIC_D */
|
||||||
#define XF86XK_CameraFocus _EVDEVK(0x210) /* v2.6.33 KEY_CAMERA_FOCUS */
|
#define XF86XK_CameraFocus _EVDEVK(0x210) /* v2.6.33 KEY_CAMERA_FOCUS */
|
||||||
#define XF86XK_WPSButton _EVDEVK(0x211) /* v2.6.34 KEY_WPS_BUTTON */
|
#define XF86XK_WPSButton _EVDEVK(0x211) /* v2.6.34 KEY_WPS_BUTTON */
|
||||||
/* Use: XF86XK_TouchpadToggle _EVDEVK(0x212) v2.6.37 KEY_TOUCHPAD_TOGGLE */
|
/* Use: XF86XK_TouchpadToggle _EVDEVK(0x212) v2.6.37 KEY_TOUCHPAD_TOGGLE */
|
||||||
|
|
@ -378,11 +378,11 @@
|
||||||
#define XF86XK_CameraUp _EVDEVK(0x217) /* v2.6.39 KEY_CAMERA_UP */
|
#define XF86XK_CameraUp _EVDEVK(0x217) /* v2.6.39 KEY_CAMERA_UP */
|
||||||
#define XF86XK_CameraDown _EVDEVK(0x218) /* v2.6.39 KEY_CAMERA_DOWN */
|
#define XF86XK_CameraDown _EVDEVK(0x218) /* v2.6.39 KEY_CAMERA_DOWN */
|
||||||
#define XF86XK_CameraLeft _EVDEVK(0x219) /* v2.6.39 KEY_CAMERA_LEFT */
|
#define XF86XK_CameraLeft _EVDEVK(0x219) /* v2.6.39 KEY_CAMERA_LEFT */
|
||||||
#define XF86XK_CameraRight _EVDEVK(0x21A) /* v2.6.39 KEY_CAMERA_RIGHT */
|
#define XF86XK_CameraRight _EVDEVK(0x21a) /* v2.6.39 KEY_CAMERA_RIGHT */
|
||||||
#define XF86XK_AttendantOn _EVDEVK(0x21B) /* v3.10 KEY_ATTENDANT_ON */
|
#define XF86XK_AttendantOn _EVDEVK(0x21b) /* v3.10 KEY_ATTENDANT_ON */
|
||||||
#define XF86XK_AttendantOff _EVDEVK(0x21C) /* v3.10 KEY_ATTENDANT_OFF */
|
#define XF86XK_AttendantOff _EVDEVK(0x21c) /* v3.10 KEY_ATTENDANT_OFF */
|
||||||
#define XF86XK_AttendantToggle _EVDEVK(0x21D) /* v3.10 KEY_ATTENDANT_TOGGLE */
|
#define XF86XK_AttendantToggle _EVDEVK(0x21d) /* v3.10 KEY_ATTENDANT_TOGGLE */
|
||||||
#define XF86XK_LightsToggle _EVDEVK(0x21E) /* v3.10 KEY_LIGHTS_TOGGLE */
|
#define XF86XK_LightsToggle _EVDEVK(0x21e) /* v3.10 KEY_LIGHTS_TOGGLE */
|
||||||
#define XF86XK_ALSToggle _EVDEVK(0x230) /* v3.13 KEY_ALS_TOGGLE */
|
#define XF86XK_ALSToggle _EVDEVK(0x230) /* v3.13 KEY_ALS_TOGGLE */
|
||||||
/* Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE */
|
/* Use: XF86XK_RotationLockToggle _EVDEVK(0x231) v4.16 KEY_ROTATE_LOCK_TOGGLE */
|
||||||
#define XF86XK_Buttonconfig _EVDEVK(0x240) /* v3.16 KEY_BUTTONCONFIG */
|
#define XF86XK_Buttonconfig _EVDEVK(0x240) /* v3.16 KEY_BUTTONCONFIG */
|
||||||
|
|
@ -395,7 +395,10 @@
|
||||||
#define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */
|
#define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */
|
||||||
/* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */
|
/* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */
|
||||||
#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */
|
#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */
|
||||||
#define XF86XK_Dictate _EVDEVK(0x24A) /* v5.17 KEY_DICTATE */
|
#define XF86XK_Dictate _EVDEVK(0x24a) /* v5.17 KEY_DICTATE */
|
||||||
|
#define XF86XK_CameraAccessEnable _EVDEVK(0x24b) /* v6.2 KEY_CAMERA_ACCESS_ENABLE */
|
||||||
|
#define XF86XK_CameraAccessDisable _EVDEVK(0x24c) /* v6.2 KEY_CAMERA_ACCESS_DISABLE */
|
||||||
|
#define XF86XK_CameraAccessToggle _EVDEVK(0x24d) /* v6.2 KEY_CAMERA_ACCESS_TOGGLE */
|
||||||
#define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */
|
#define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */
|
||||||
#define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */
|
#define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */
|
||||||
#define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */
|
#define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */
|
||||||
|
|
@ -408,12 +411,12 @@
|
||||||
#define XF86XK_RightDown _EVDEVK(0x267) /* v4.7 KEY_RIGHT_DOWN */
|
#define XF86XK_RightDown _EVDEVK(0x267) /* v4.7 KEY_RIGHT_DOWN */
|
||||||
#define XF86XK_LeftUp _EVDEVK(0x268) /* v4.7 KEY_LEFT_UP */
|
#define XF86XK_LeftUp _EVDEVK(0x268) /* v4.7 KEY_LEFT_UP */
|
||||||
#define XF86XK_LeftDown _EVDEVK(0x269) /* v4.7 KEY_LEFT_DOWN */
|
#define XF86XK_LeftDown _EVDEVK(0x269) /* v4.7 KEY_LEFT_DOWN */
|
||||||
#define XF86XK_RootMenu _EVDEVK(0x26A) /* v4.7 KEY_ROOT_MENU */
|
#define XF86XK_RootMenu _EVDEVK(0x26a) /* v4.7 KEY_ROOT_MENU */
|
||||||
#define XF86XK_MediaTopMenu _EVDEVK(0x26B) /* v4.7 KEY_MEDIA_TOP_MENU */
|
#define XF86XK_MediaTopMenu _EVDEVK(0x26b) /* v4.7 KEY_MEDIA_TOP_MENU */
|
||||||
#define XF86XK_Numeric11 _EVDEVK(0x26C) /* v4.7 KEY_NUMERIC_11 */
|
#define XF86XK_Numeric11 _EVDEVK(0x26c) /* v4.7 KEY_NUMERIC_11 */
|
||||||
#define XF86XK_Numeric12 _EVDEVK(0x26D) /* v4.7 KEY_NUMERIC_12 */
|
#define XF86XK_Numeric12 _EVDEVK(0x26d) /* v4.7 KEY_NUMERIC_12 */
|
||||||
#define XF86XK_AudioDesc _EVDEVK(0x26E) /* v4.7 KEY_AUDIO_DESC */
|
#define XF86XK_AudioDesc _EVDEVK(0x26e) /* v4.7 KEY_AUDIO_DESC */
|
||||||
#define XF86XK_3DMode _EVDEVK(0x26F) /* v4.7 KEY_3D_MODE */
|
#define XF86XK_3DMode _EVDEVK(0x26f) /* v4.7 KEY_3D_MODE */
|
||||||
#define XF86XK_NextFavorite _EVDEVK(0x270) /* v4.7 KEY_NEXT_FAVORITE */
|
#define XF86XK_NextFavorite _EVDEVK(0x270) /* v4.7 KEY_NEXT_FAVORITE */
|
||||||
#define XF86XK_StopRecord _EVDEVK(0x271) /* v4.7 KEY_STOP_RECORD */
|
#define XF86XK_StopRecord _EVDEVK(0x271) /* v4.7 KEY_STOP_RECORD */
|
||||||
#define XF86XK_PauseRecord _EVDEVK(0x272) /* v4.7 KEY_PAUSE_RECORD */
|
#define XF86XK_PauseRecord _EVDEVK(0x272) /* v4.7 KEY_PAUSE_RECORD */
|
||||||
|
|
@ -424,7 +427,22 @@
|
||||||
#define XF86XK_Data _EVDEVK(0x277) /* v4.7 KEY_DATA */
|
#define XF86XK_Data _EVDEVK(0x277) /* v4.7 KEY_DATA */
|
||||||
#define XF86XK_OnScreenKeyboard _EVDEVK(0x278) /* v4.12 KEY_ONSCREEN_KEYBOARD */
|
#define XF86XK_OnScreenKeyboard _EVDEVK(0x278) /* v4.12 KEY_ONSCREEN_KEYBOARD */
|
||||||
#define XF86XK_PrivacyScreenToggle _EVDEVK(0x279) /* v5.5 KEY_PRIVACY_SCREEN_TOGGLE */
|
#define XF86XK_PrivacyScreenToggle _EVDEVK(0x279) /* v5.5 KEY_PRIVACY_SCREEN_TOGGLE */
|
||||||
#define XF86XK_SelectiveScreenshot _EVDEVK(0x27A) /* v5.6 KEY_SELECTIVE_SCREENSHOT */
|
#define XF86XK_SelectiveScreenshot _EVDEVK(0x27a) /* v5.6 KEY_SELECTIVE_SCREENSHOT */
|
||||||
|
#define XF86XK_NextElement _EVDEVK(0x27b) /* v5.18 KEY_NEXT_ELEMENT */
|
||||||
|
#define XF86XK_PreviousElement _EVDEVK(0x27c) /* v5.18 KEY_PREVIOUS_ELEMENT */
|
||||||
|
#define XF86XK_AutopilotEngageToggle _EVDEVK(0x27d) /* v5.18 KEY_AUTOPILOT_ENGAGE_TOGGLE */
|
||||||
|
#define XF86XK_MarkWaypoint _EVDEVK(0x27e) /* v5.18 KEY_MARK_WAYPOINT */
|
||||||
|
#define XF86XK_Sos _EVDEVK(0x27f) /* v5.18 KEY_SOS */
|
||||||
|
#define XF86XK_NavChart _EVDEVK(0x280) /* v5.18 KEY_NAV_CHART */
|
||||||
|
#define XF86XK_FishingChart _EVDEVK(0x281) /* v5.18 KEY_FISHING_CHART */
|
||||||
|
#define XF86XK_SingleRangeRadar _EVDEVK(0x282) /* v5.18 KEY_SINGLE_RANGE_RADAR */
|
||||||
|
#define XF86XK_DualRangeRadar _EVDEVK(0x283) /* v5.18 KEY_DUAL_RANGE_RADAR */
|
||||||
|
#define XF86XK_RadarOverlay _EVDEVK(0x284) /* v5.18 KEY_RADAR_OVERLAY */
|
||||||
|
#define XF86XK_TraditionalSonar _EVDEVK(0x285) /* v5.18 KEY_TRADITIONAL_SONAR */
|
||||||
|
#define XF86XK_ClearvuSonar _EVDEVK(0x286) /* v5.18 KEY_CLEARVU_SONAR */
|
||||||
|
#define XF86XK_SidevuSonar _EVDEVK(0x287) /* v5.18 KEY_SIDEVU_SONAR */
|
||||||
|
#define XF86XK_NavInfo _EVDEVK(0x288) /* v5.18 KEY_NAV_INFO */
|
||||||
|
/* Use: XF86XK_BrightnessAdjust _EVDEVK(0x289) v5.18 KEY_BRIGHTNESS_MENU */
|
||||||
#define XF86XK_Macro1 _EVDEVK(0x290) /* v5.5 KEY_MACRO1 */
|
#define XF86XK_Macro1 _EVDEVK(0x290) /* v5.5 KEY_MACRO1 */
|
||||||
#define XF86XK_Macro2 _EVDEVK(0x291) /* v5.5 KEY_MACRO2 */
|
#define XF86XK_Macro2 _EVDEVK(0x291) /* v5.5 KEY_MACRO2 */
|
||||||
#define XF86XK_Macro3 _EVDEVK(0x292) /* v5.5 KEY_MACRO3 */
|
#define XF86XK_Macro3 _EVDEVK(0x292) /* v5.5 KEY_MACRO3 */
|
||||||
|
|
@ -435,35 +453,35 @@
|
||||||
#define XF86XK_Macro8 _EVDEVK(0x297) /* v5.5 KEY_MACRO8 */
|
#define XF86XK_Macro8 _EVDEVK(0x297) /* v5.5 KEY_MACRO8 */
|
||||||
#define XF86XK_Macro9 _EVDEVK(0x298) /* v5.5 KEY_MACRO9 */
|
#define XF86XK_Macro9 _EVDEVK(0x298) /* v5.5 KEY_MACRO9 */
|
||||||
#define XF86XK_Macro10 _EVDEVK(0x299) /* v5.5 KEY_MACRO10 */
|
#define XF86XK_Macro10 _EVDEVK(0x299) /* v5.5 KEY_MACRO10 */
|
||||||
#define XF86XK_Macro11 _EVDEVK(0x29A) /* v5.5 KEY_MACRO11 */
|
#define XF86XK_Macro11 _EVDEVK(0x29a) /* v5.5 KEY_MACRO11 */
|
||||||
#define XF86XK_Macro12 _EVDEVK(0x29B) /* v5.5 KEY_MACRO12 */
|
#define XF86XK_Macro12 _EVDEVK(0x29b) /* v5.5 KEY_MACRO12 */
|
||||||
#define XF86XK_Macro13 _EVDEVK(0x29C) /* v5.5 KEY_MACRO13 */
|
#define XF86XK_Macro13 _EVDEVK(0x29c) /* v5.5 KEY_MACRO13 */
|
||||||
#define XF86XK_Macro14 _EVDEVK(0x29D) /* v5.5 KEY_MACRO14 */
|
#define XF86XK_Macro14 _EVDEVK(0x29d) /* v5.5 KEY_MACRO14 */
|
||||||
#define XF86XK_Macro15 _EVDEVK(0x29E) /* v5.5 KEY_MACRO15 */
|
#define XF86XK_Macro15 _EVDEVK(0x29e) /* v5.5 KEY_MACRO15 */
|
||||||
#define XF86XK_Macro16 _EVDEVK(0x29F) /* v5.5 KEY_MACRO16 */
|
#define XF86XK_Macro16 _EVDEVK(0x29f) /* v5.5 KEY_MACRO16 */
|
||||||
#define XF86XK_Macro17 _EVDEVK(0x2A0) /* v5.5 KEY_MACRO17 */
|
#define XF86XK_Macro17 _EVDEVK(0x2a0) /* v5.5 KEY_MACRO17 */
|
||||||
#define XF86XK_Macro18 _EVDEVK(0x2A1) /* v5.5 KEY_MACRO18 */
|
#define XF86XK_Macro18 _EVDEVK(0x2a1) /* v5.5 KEY_MACRO18 */
|
||||||
#define XF86XK_Macro19 _EVDEVK(0x2A2) /* v5.5 KEY_MACRO19 */
|
#define XF86XK_Macro19 _EVDEVK(0x2a2) /* v5.5 KEY_MACRO19 */
|
||||||
#define XF86XK_Macro20 _EVDEVK(0x2A3) /* v5.5 KEY_MACRO20 */
|
#define XF86XK_Macro20 _EVDEVK(0x2a3) /* v5.5 KEY_MACRO20 */
|
||||||
#define XF86XK_Macro21 _EVDEVK(0x2A4) /* v5.5 KEY_MACRO21 */
|
#define XF86XK_Macro21 _EVDEVK(0x2a4) /* v5.5 KEY_MACRO21 */
|
||||||
#define XF86XK_Macro22 _EVDEVK(0x2A5) /* v5.5 KEY_MACRO22 */
|
#define XF86XK_Macro22 _EVDEVK(0x2a5) /* v5.5 KEY_MACRO22 */
|
||||||
#define XF86XK_Macro23 _EVDEVK(0x2A6) /* v5.5 KEY_MACRO23 */
|
#define XF86XK_Macro23 _EVDEVK(0x2a6) /* v5.5 KEY_MACRO23 */
|
||||||
#define XF86XK_Macro24 _EVDEVK(0x2A7) /* v5.5 KEY_MACRO24 */
|
#define XF86XK_Macro24 _EVDEVK(0x2a7) /* v5.5 KEY_MACRO24 */
|
||||||
#define XF86XK_Macro25 _EVDEVK(0x2A8) /* v5.5 KEY_MACRO25 */
|
#define XF86XK_Macro25 _EVDEVK(0x2a8) /* v5.5 KEY_MACRO25 */
|
||||||
#define XF86XK_Macro26 _EVDEVK(0x2A9) /* v5.5 KEY_MACRO26 */
|
#define XF86XK_Macro26 _EVDEVK(0x2a9) /* v5.5 KEY_MACRO26 */
|
||||||
#define XF86XK_Macro27 _EVDEVK(0x2AA) /* v5.5 KEY_MACRO27 */
|
#define XF86XK_Macro27 _EVDEVK(0x2aa) /* v5.5 KEY_MACRO27 */
|
||||||
#define XF86XK_Macro28 _EVDEVK(0x2AB) /* v5.5 KEY_MACRO28 */
|
#define XF86XK_Macro28 _EVDEVK(0x2ab) /* v5.5 KEY_MACRO28 */
|
||||||
#define XF86XK_Macro29 _EVDEVK(0x2AC) /* v5.5 KEY_MACRO29 */
|
#define XF86XK_Macro29 _EVDEVK(0x2ac) /* v5.5 KEY_MACRO29 */
|
||||||
#define XF86XK_Macro30 _EVDEVK(0x2AD) /* v5.5 KEY_MACRO30 */
|
#define XF86XK_Macro30 _EVDEVK(0x2ad) /* v5.5 KEY_MACRO30 */
|
||||||
#define XF86XK_MacroRecordStart _EVDEVK(0x2B0) /* v5.5 KEY_MACRO_RECORD_START */
|
#define XF86XK_MacroRecordStart _EVDEVK(0x2b0) /* v5.5 KEY_MACRO_RECORD_START */
|
||||||
#define XF86XK_MacroRecordStop _EVDEVK(0x2B1) /* v5.5 KEY_MACRO_RECORD_STOP */
|
#define XF86XK_MacroRecordStop _EVDEVK(0x2b1) /* v5.5 KEY_MACRO_RECORD_STOP */
|
||||||
#define XF86XK_MacroPresetCycle _EVDEVK(0x2B2) /* v5.5 KEY_MACRO_PRESET_CYCLE */
|
#define XF86XK_MacroPresetCycle _EVDEVK(0x2b2) /* v5.5 KEY_MACRO_PRESET_CYCLE */
|
||||||
#define XF86XK_MacroPreset1 _EVDEVK(0x2B3) /* v5.5 KEY_MACRO_PRESET1 */
|
#define XF86XK_MacroPreset1 _EVDEVK(0x2b3) /* v5.5 KEY_MACRO_PRESET1 */
|
||||||
#define XF86XK_MacroPreset2 _EVDEVK(0x2B4) /* v5.5 KEY_MACRO_PRESET2 */
|
#define XF86XK_MacroPreset2 _EVDEVK(0x2b4) /* v5.5 KEY_MACRO_PRESET2 */
|
||||||
#define XF86XK_MacroPreset3 _EVDEVK(0x2B5) /* v5.5 KEY_MACRO_PRESET3 */
|
#define XF86XK_MacroPreset3 _EVDEVK(0x2b5) /* v5.5 KEY_MACRO_PRESET3 */
|
||||||
#define XF86XK_KbdLcdMenu1 _EVDEVK(0x2B8) /* v5.5 KEY_KBD_LCD_MENU1 */
|
#define XF86XK_KbdLcdMenu1 _EVDEVK(0x2b8) /* v5.5 KEY_KBD_LCD_MENU1 */
|
||||||
#define XF86XK_KbdLcdMenu2 _EVDEVK(0x2B9) /* v5.5 KEY_KBD_LCD_MENU2 */
|
#define XF86XK_KbdLcdMenu2 _EVDEVK(0x2b9) /* v5.5 KEY_KBD_LCD_MENU2 */
|
||||||
#define XF86XK_KbdLcdMenu3 _EVDEVK(0x2BA) /* v5.5 KEY_KBD_LCD_MENU3 */
|
#define XF86XK_KbdLcdMenu3 _EVDEVK(0x2ba) /* v5.5 KEY_KBD_LCD_MENU3 */
|
||||||
#define XF86XK_KbdLcdMenu4 _EVDEVK(0x2BB) /* v5.5 KEY_KBD_LCD_MENU4 */
|
#define XF86XK_KbdLcdMenu4 _EVDEVK(0x2bb) /* v5.5 KEY_KBD_LCD_MENU4 */
|
||||||
#define XF86XK_KbdLcdMenu5 _EVDEVK(0x2BC) /* v5.5 KEY_KBD_LCD_MENU5 */
|
#define XF86XK_KbdLcdMenu5 _EVDEVK(0x2bc) /* v5.5 KEY_KBD_LCD_MENU5 */
|
||||||
#undef _EVDEVK
|
#undef _EVDEVK
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#define DRI3_NAME "DRI3"
|
#define DRI3_NAME "DRI3"
|
||||||
#define DRI3_MAJOR 1
|
#define DRI3_MAJOR 1
|
||||||
#define DRI3_MINOR 3
|
#define DRI3_MINOR 4
|
||||||
|
|
||||||
#define DRI3NumberErrors 0
|
#define DRI3NumberErrors 0
|
||||||
#define DRI3NumberEvents 0
|
#define DRI3NumberEvents 0
|
||||||
|
|
@ -45,7 +45,13 @@
|
||||||
/* v1.3 */
|
/* v1.3 */
|
||||||
#define xDRI3SetDRMDeviceInUse 9
|
#define xDRI3SetDRMDeviceInUse 9
|
||||||
|
|
||||||
#define DRI3NumberRequests 10
|
/* v1.4 */
|
||||||
|
#define xDRI3ImportSyncobj 10
|
||||||
|
#define xDRI3FreeSyncobj 11
|
||||||
|
|
||||||
|
#define DRI3NumberRequests 12
|
||||||
|
|
||||||
|
#define DRI3Syncobj CARD32
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
CARD8 reqType;
|
CARD8 reqType;
|
||||||
|
|
@ -261,4 +267,22 @@ typedef struct {
|
||||||
} xDRI3SetDRMDeviceInUseReq;
|
} xDRI3SetDRMDeviceInUseReq;
|
||||||
#define sz_xDRI3SetDRMDeviceInUseReq 16
|
#define sz_xDRI3SetDRMDeviceInUseReq 16
|
||||||
|
|
||||||
|
/* v1.4 */
|
||||||
|
typedef struct {
|
||||||
|
CARD8 reqType;
|
||||||
|
CARD8 dri3ReqType;
|
||||||
|
CARD16 length;
|
||||||
|
DRI3Syncobj syncobj;
|
||||||
|
CARD32 drawable;
|
||||||
|
} xDRI3ImportSyncobjReq;
|
||||||
|
#define sz_xDRI3ImportSyncobjReq 12
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
CARD8 reqType;
|
||||||
|
CARD8 dri3ReqType;
|
||||||
|
CARD16 length;
|
||||||
|
DRI3Syncobj syncobj;
|
||||||
|
} xDRI3FreeSyncobjReq;
|
||||||
|
#define sz_xDRI3FreeSyncobjReq 8
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
#define _PRESENT_PROTO_H_
|
#define _PRESENT_PROTO_H_
|
||||||
|
|
||||||
#include <X11/extensions/presenttokens.h>
|
#include <X11/extensions/presenttokens.h>
|
||||||
|
#include <X11/extensions/dri3proto.h>
|
||||||
|
|
||||||
#define Window CARD32
|
#define Window CARD32
|
||||||
#define Pixmap CARD32
|
#define Pixmap CARD32
|
||||||
|
|
@ -136,6 +137,37 @@ typedef struct {
|
||||||
} xPresentQueryCapabilitiesReply;
|
} xPresentQueryCapabilitiesReply;
|
||||||
#define sz_xPresentQueryCapabilitiesReply 32
|
#define sz_xPresentQueryCapabilitiesReply 32
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
CARD8 reqType;
|
||||||
|
CARD8 presentReqType;
|
||||||
|
CARD16 length;
|
||||||
|
Window window;
|
||||||
|
|
||||||
|
Pixmap pixmap;
|
||||||
|
CARD32 serial;
|
||||||
|
|
||||||
|
Region valid;
|
||||||
|
Region update;
|
||||||
|
|
||||||
|
INT16 x_off;
|
||||||
|
INT16 y_off;
|
||||||
|
CARD32 target_crtc;
|
||||||
|
|
||||||
|
DRI3Syncobj acquire_syncobj;
|
||||||
|
DRI3Syncobj release_syncobj;
|
||||||
|
CARD64 acquire_point;
|
||||||
|
CARD64 release_point;
|
||||||
|
|
||||||
|
CARD32 options;
|
||||||
|
CARD32 pad1;
|
||||||
|
|
||||||
|
CARD64 target_msc;
|
||||||
|
CARD64 divisor;
|
||||||
|
CARD64 remainder;
|
||||||
|
/* followed by a LISTofPRESENTNOTIFY */
|
||||||
|
} xPresentPixmapSyncedReq;
|
||||||
|
#define sz_xPresentPixmapSyncedReq 88
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Events
|
* Events
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#define PRESENT_NAME "Present"
|
#define PRESENT_NAME "Present"
|
||||||
#define PRESENT_MAJOR 1
|
#define PRESENT_MAJOR 1
|
||||||
#define PRESENT_MINOR 3
|
#define PRESENT_MINOR 4
|
||||||
|
|
||||||
#define PresentNumberErrors 0
|
#define PresentNumberErrors 0
|
||||||
#define PresentNumberEvents 0
|
#define PresentNumberEvents 0
|
||||||
|
|
@ -36,8 +36,9 @@
|
||||||
#define X_PresentNotifyMSC 2
|
#define X_PresentNotifyMSC 2
|
||||||
#define X_PresentSelectInput 3
|
#define X_PresentSelectInput 3
|
||||||
#define X_PresentQueryCapabilities 4
|
#define X_PresentQueryCapabilities 4
|
||||||
|
#define X_PresentPixmapSynced 5
|
||||||
|
|
||||||
#define PresentNumberRequests 5
|
#define PresentNumberRequests 6
|
||||||
|
|
||||||
/* Present operation options */
|
/* Present operation options */
|
||||||
#define PresentOptionNone 0
|
#define PresentOptionNone 0
|
||||||
|
|
@ -62,11 +63,13 @@
|
||||||
#define PresentCapabilityFence 2
|
#define PresentCapabilityFence 2
|
||||||
#define PresentCapabilityUST 4
|
#define PresentCapabilityUST 4
|
||||||
#define PresentCapabilityAsyncMayTear 8
|
#define PresentCapabilityAsyncMayTear 8
|
||||||
|
#define PresentCapabilitySyncobj 16
|
||||||
|
|
||||||
#define PresentAllCapabilities (PresentCapabilityAsync | \
|
#define PresentAllCapabilities (PresentCapabilityAsync | \
|
||||||
PresentCapabilityFence | \
|
PresentCapabilityFence | \
|
||||||
PresentCapabilityUST | \
|
PresentCapabilityUST | \
|
||||||
PresentCapabilityAsyncMayTear)
|
PresentCapabilityAsyncMayTear | \
|
||||||
|
PresentCapabilitySyncobj)
|
||||||
|
|
||||||
#define PresentAllAsyncCapabilities (PresentCapabilityAsync | PresentCapabilityAsyncMayTear)
|
#define PresentAllAsyncCapabilities (PresentCapabilityAsync | PresentCapabilityAsyncMayTear)
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# install - install a program, script, or datafile
|
# install - install a program, script, or datafile
|
||||||
|
|
||||||
scriptversion=2011-11-20.07; # UTC
|
scriptversion=2020-11-14.01; # UTC
|
||||||
|
|
||||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||||
|
|
@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
|
||||||
# This script is compatible with the BSD install script, but was written
|
# This script is compatible with the BSD install script, but was written
|
||||||
# from scratch.
|
# from scratch.
|
||||||
|
|
||||||
|
tab=' '
|
||||||
nl='
|
nl='
|
||||||
'
|
'
|
||||||
IFS=" "" $nl"
|
IFS=" $tab$nl"
|
||||||
|
|
||||||
# set DOITPROG to echo to test this script
|
# Set DOITPROG to "echo" to test this script.
|
||||||
|
|
||||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
|
||||||
doit=${DOITPROG-}
|
doit=${DOITPROG-}
|
||||||
if test -z "$doit"; then
|
doit_exec=${doit:-exec}
|
||||||
doit_exec=exec
|
|
||||||
else
|
|
||||||
doit_exec=$doit
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Put in absolute file names if you don't have them in your path;
|
# Put in absolute file names if you don't have them in your path;
|
||||||
# or use environment vars.
|
# or use environment vars.
|
||||||
|
|
@ -68,22 +64,16 @@ mvprog=${MVPROG-mv}
|
||||||
rmprog=${RMPROG-rm}
|
rmprog=${RMPROG-rm}
|
||||||
stripprog=${STRIPPROG-strip}
|
stripprog=${STRIPPROG-strip}
|
||||||
|
|
||||||
posix_glob='?'
|
|
||||||
initialize_posix_glob='
|
|
||||||
test "$posix_glob" != "?" || {
|
|
||||||
if (set -f) 2>/dev/null; then
|
|
||||||
posix_glob=
|
|
||||||
else
|
|
||||||
posix_glob=:
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
'
|
|
||||||
|
|
||||||
posix_mkdir=
|
posix_mkdir=
|
||||||
|
|
||||||
# Desired mode of installed file.
|
# Desired mode of installed file.
|
||||||
mode=0755
|
mode=0755
|
||||||
|
|
||||||
|
# Create dirs (including intermediate dirs) using mode 755.
|
||||||
|
# This is like GNU 'install' as of coreutils 8.32 (2020).
|
||||||
|
mkdir_umask=22
|
||||||
|
|
||||||
|
backupsuffix=
|
||||||
chgrpcmd=
|
chgrpcmd=
|
||||||
chmodcmd=$chmodprog
|
chmodcmd=$chmodprog
|
||||||
chowncmd=
|
chowncmd=
|
||||||
|
|
@ -97,7 +87,7 @@ dir_arg=
|
||||||
dst_arg=
|
dst_arg=
|
||||||
|
|
||||||
copy_on_change=false
|
copy_on_change=false
|
||||||
no_target_directory=
|
is_target_a_directory=possibly
|
||||||
|
|
||||||
usage="\
|
usage="\
|
||||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||||
|
|
@ -114,18 +104,28 @@ Options:
|
||||||
--version display version info and exit.
|
--version display version info and exit.
|
||||||
|
|
||||||
-c (ignored)
|
-c (ignored)
|
||||||
-C install only if different (preserve the last data modification time)
|
-C install only if different (preserve data modification time)
|
||||||
-d create directories instead of installing files.
|
-d create directories instead of installing files.
|
||||||
-g GROUP $chgrpprog installed files to GROUP.
|
-g GROUP $chgrpprog installed files to GROUP.
|
||||||
-m MODE $chmodprog installed files to MODE.
|
-m MODE $chmodprog installed files to MODE.
|
||||||
-o USER $chownprog installed files to USER.
|
-o USER $chownprog installed files to USER.
|
||||||
|
-p pass -p to $cpprog.
|
||||||
-s $stripprog installed files.
|
-s $stripprog installed files.
|
||||||
|
-S SUFFIX attempt to back up existing files, with suffix SUFFIX.
|
||||||
-t DIRECTORY install into DIRECTORY.
|
-t DIRECTORY install into DIRECTORY.
|
||||||
-T report an error if DSTFILE is a directory.
|
-T report an error if DSTFILE is a directory.
|
||||||
|
|
||||||
Environment variables override the default commands:
|
Environment variables override the default commands:
|
||||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||||
RMPROG STRIPPROG
|
RMPROG STRIPPROG
|
||||||
|
|
||||||
|
By default, rm is invoked with -f; when overridden with RMPROG,
|
||||||
|
it's up to you to specify -f if you want it.
|
||||||
|
|
||||||
|
If -S is not specified, no backups are attempted.
|
||||||
|
|
||||||
|
Email bug reports to bug-automake@gnu.org.
|
||||||
|
Automake home page: https://www.gnu.org/software/automake/
|
||||||
"
|
"
|
||||||
|
|
||||||
while test $# -ne 0; do
|
while test $# -ne 0; do
|
||||||
|
|
@ -143,8 +143,7 @@ while test $# -ne 0; do
|
||||||
|
|
||||||
-m) mode=$2
|
-m) mode=$2
|
||||||
case $mode in
|
case $mode in
|
||||||
*' '* | *' '* | *'
|
*' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
|
||||||
'* | *'*'* | *'?'* | *'['*)
|
|
||||||
echo "$0: invalid mode: $mode" >&2
|
echo "$0: invalid mode: $mode" >&2
|
||||||
exit 1;;
|
exit 1;;
|
||||||
esac
|
esac
|
||||||
|
|
@ -153,16 +152,23 @@ while test $# -ne 0; do
|
||||||
-o) chowncmd="$chownprog $2"
|
-o) chowncmd="$chownprog $2"
|
||||||
shift;;
|
shift;;
|
||||||
|
|
||||||
|
-p) cpprog="$cpprog -p";;
|
||||||
|
|
||||||
-s) stripcmd=$stripprog;;
|
-s) stripcmd=$stripprog;;
|
||||||
|
|
||||||
-t) dst_arg=$2
|
-S) backupsuffix="$2"
|
||||||
|
shift;;
|
||||||
|
|
||||||
|
-t)
|
||||||
|
is_target_a_directory=always
|
||||||
|
dst_arg=$2
|
||||||
# Protect names problematic for 'test' and other utilities.
|
# Protect names problematic for 'test' and other utilities.
|
||||||
case $dst_arg in
|
case $dst_arg in
|
||||||
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
-* | [=\(\)!]) dst_arg=./$dst_arg;;
|
||||||
esac
|
esac
|
||||||
shift;;
|
shift;;
|
||||||
|
|
||||||
-T) no_target_directory=true;;
|
-T) is_target_a_directory=never;;
|
||||||
|
|
||||||
--version) echo "$0 $scriptversion"; exit $?;;
|
--version) echo "$0 $scriptversion"; exit $?;;
|
||||||
|
|
||||||
|
|
@ -177,6 +183,16 @@ while test $# -ne 0; do
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# We allow the use of options -d and -T together, by making -d
|
||||||
|
# take the precedence; this is for compatibility with GNU install.
|
||||||
|
|
||||||
|
if test -n "$dir_arg"; then
|
||||||
|
if test -n "$dst_arg"; then
|
||||||
|
echo "$0: target directory not allowed when installing a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||||
# When -d is used, all remaining arguments are directories to create.
|
# When -d is used, all remaining arguments are directories to create.
|
||||||
# When -t is used, the destination is already specified.
|
# When -t is used, the destination is already specified.
|
||||||
|
|
@ -207,6 +223,15 @@ if test $# -eq 0; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test -z "$dir_arg"; then
|
||||||
|
if test $# -gt 1 || test "$is_target_a_directory" = always; then
|
||||||
|
if test ! -d "$dst_arg"; then
|
||||||
|
echo "$0: $dst_arg: Is not a directory." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if test -z "$dir_arg"; then
|
if test -z "$dir_arg"; then
|
||||||
do_exit='(exit $ret); exit $ret'
|
do_exit='(exit $ret); exit $ret'
|
||||||
trap "ret=129; $do_exit" 1
|
trap "ret=129; $do_exit" 1
|
||||||
|
|
@ -250,6 +275,10 @@ do
|
||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
test -d "$dstdir"
|
test -d "$dstdir"
|
||||||
dstdir_status=$?
|
dstdir_status=$?
|
||||||
|
# Don't chown directories that already exist.
|
||||||
|
if test $dstdir_status = 0; then
|
||||||
|
chowncmd=""
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
|
|
||||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
||||||
|
|
@ -266,70 +295,36 @@ do
|
||||||
fi
|
fi
|
||||||
dst=$dst_arg
|
dst=$dst_arg
|
||||||
|
|
||||||
# If destination is a directory, append the input filename; won't work
|
# If destination is a directory, append the input filename.
|
||||||
# if double slashes aren't ignored.
|
|
||||||
if test -d "$dst"; then
|
if test -d "$dst"; then
|
||||||
if test -n "$no_target_directory"; then
|
if test "$is_target_a_directory" = never; then
|
||||||
echo "$0: $dst_arg: Is a directory" >&2
|
echo "$0: $dst_arg: Is a directory" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
dstdir=$dst
|
dstdir=$dst
|
||||||
dst=$dstdir/`basename "$src"`
|
dstbase=`basename "$src"`
|
||||||
|
case $dst in
|
||||||
|
*/) dst=$dst$dstbase;;
|
||||||
|
*) dst=$dst/$dstbase;;
|
||||||
|
esac
|
||||||
dstdir_status=0
|
dstdir_status=0
|
||||||
else
|
else
|
||||||
# Prefer dirname, but fall back on a substitute if dirname fails.
|
dstdir=`dirname "$dst"`
|
||||||
dstdir=`
|
|
||||||
(dirname "$dst") 2>/dev/null ||
|
|
||||||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
|
||||||
X"$dst" : 'X\(//\)[^/]' \| \
|
|
||||||
X"$dst" : 'X\(//\)$' \| \
|
|
||||||
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
|
|
||||||
echo X"$dst" |
|
|
||||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)[^/].*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\/\)$/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
/^X\(\/\).*/{
|
|
||||||
s//\1/
|
|
||||||
q
|
|
||||||
}
|
|
||||||
s/.*/./; q'
|
|
||||||
`
|
|
||||||
|
|
||||||
test -d "$dstdir"
|
test -d "$dstdir"
|
||||||
dstdir_status=$?
|
dstdir_status=$?
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case $dstdir in
|
||||||
|
*/) dstdirslash=$dstdir;;
|
||||||
|
*) dstdirslash=$dstdir/;;
|
||||||
|
esac
|
||||||
|
|
||||||
obsolete_mkdir_used=false
|
obsolete_mkdir_used=false
|
||||||
|
|
||||||
if test $dstdir_status != 0; then
|
if test $dstdir_status != 0; then
|
||||||
case $posix_mkdir in
|
case $posix_mkdir in
|
||||||
'')
|
'')
|
||||||
# Create intermediate dirs using mode 755 as modified by the umask.
|
|
||||||
# This is like FreeBSD 'install' as of 1997-10-28.
|
|
||||||
umask=`umask`
|
|
||||||
case $stripcmd.$umask in
|
|
||||||
# Optimize common cases.
|
|
||||||
*[2367][2367]) mkdir_umask=$umask;;
|
|
||||||
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
|
|
||||||
|
|
||||||
*[0-7])
|
|
||||||
mkdir_umask=`expr $umask + 22 \
|
|
||||||
- $umask % 100 % 40 + $umask % 20 \
|
|
||||||
- $umask % 10 % 4 + $umask % 2
|
|
||||||
`;;
|
|
||||||
*) mkdir_umask=$umask,go-w;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# With -d, create the new directory with the user-specified mode.
|
# With -d, create the new directory with the user-specified mode.
|
||||||
# Otherwise, rely on $mkdir_umask.
|
# Otherwise, rely on $mkdir_umask.
|
||||||
if test -n "$dir_arg"; then
|
if test -n "$dir_arg"; then
|
||||||
|
|
@ -339,43 +334,49 @@ do
|
||||||
fi
|
fi
|
||||||
|
|
||||||
posix_mkdir=false
|
posix_mkdir=false
|
||||||
case $umask in
|
# The $RANDOM variable is not portable (e.g., dash). Use it
|
||||||
*[123567][0-7][0-7])
|
# here however when possible just to lower collision chance.
|
||||||
# POSIX mkdir -p sets u+wx bits regardless of umask, which
|
|
||||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
|
||||||
|
|
||||||
|
trap '
|
||||||
|
ret=$?
|
||||||
|
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
|
||||||
|
exit $ret
|
||||||
|
' 0
|
||||||
|
|
||||||
|
# Because "mkdir -p" follows existing symlinks and we likely work
|
||||||
|
# directly in world-writeable /tmp, make sure that the '$tmpdir'
|
||||||
|
# directory is successfully created first before we actually test
|
||||||
|
# 'mkdir -p'.
|
||||||
if (umask $mkdir_umask &&
|
if (umask $mkdir_umask &&
|
||||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
$mkdirprog $mkdir_mode "$tmpdir" &&
|
||||||
|
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
if test -z "$dir_arg" || {
|
if test -z "$dir_arg" || {
|
||||||
# Check for POSIX incompatibilities with -m.
|
# Check for POSIX incompatibilities with -m.
|
||||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||||
# other-writable bit of parent directory when it shouldn't.
|
# other-writable bit of parent directory when it shouldn't.
|
||||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
test_tmpdir="$tmpdir/a"
|
||||||
|
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
|
||||||
case $ls_ld_tmpdir in
|
case $ls_ld_tmpdir in
|
||||||
d????-?r-*) different_mode=700;;
|
d????-?r-*) different_mode=700;;
|
||||||
d????-?--*) different_mode=755;;
|
d????-?--*) different_mode=755;;
|
||||||
*) false;;
|
*) false;;
|
||||||
esac &&
|
esac &&
|
||||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
|
||||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
|
||||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
then posix_mkdir=:
|
then posix_mkdir=:
|
||||||
fi
|
fi
|
||||||
rmdir "$tmpdir/d" "$tmpdir"
|
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
|
||||||
else
|
else
|
||||||
# Remove any dirs left behind by ancient mkdir implementations.
|
# Remove any dirs left behind by ancient mkdir implementations.
|
||||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
|
||||||
fi
|
fi
|
||||||
trap '' 0;;
|
trap '' 0;;
|
||||||
esac;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if
|
if
|
||||||
|
|
@ -386,7 +387,7 @@ do
|
||||||
then :
|
then :
|
||||||
else
|
else
|
||||||
|
|
||||||
# The umask is ridiculous, or mkdir does not conform to POSIX,
|
# mkdir does not conform to POSIX,
|
||||||
# or it failed possibly due to a race condition. Create the
|
# or it failed possibly due to a race condition. Create the
|
||||||
# directory the slow way, step by step, checking for races as we go.
|
# directory the slow way, step by step, checking for races as we go.
|
||||||
|
|
||||||
|
|
@ -396,14 +397,12 @@ do
|
||||||
*) prefix='';;
|
*) prefix='';;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
eval "$initialize_posix_glob"
|
|
||||||
|
|
||||||
oIFS=$IFS
|
oIFS=$IFS
|
||||||
IFS=/
|
IFS=/
|
||||||
$posix_glob set -f
|
set -f
|
||||||
set fnord $dstdir
|
set fnord $dstdir
|
||||||
shift
|
shift
|
||||||
$posix_glob set +f
|
set +f
|
||||||
IFS=$oIFS
|
IFS=$oIFS
|
||||||
|
|
||||||
prefixes=
|
prefixes=
|
||||||
|
|
@ -417,7 +416,7 @@ do
|
||||||
prefixes=
|
prefixes=
|
||||||
else
|
else
|
||||||
if $posix_mkdir; then
|
if $posix_mkdir; then
|
||||||
(umask=$mkdir_umask &&
|
(umask $mkdir_umask &&
|
||||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
||||||
# Don't fail if two instances are running concurrently.
|
# Don't fail if two instances are running concurrently.
|
||||||
test -d "$prefix" || exit 1
|
test -d "$prefix" || exit 1
|
||||||
|
|
@ -450,14 +449,25 @@ do
|
||||||
else
|
else
|
||||||
|
|
||||||
# Make a couple of temp file names in the proper directory.
|
# Make a couple of temp file names in the proper directory.
|
||||||
dsttmp=$dstdir/_inst.$$_
|
dsttmp=${dstdirslash}_inst.$$_
|
||||||
rmtmp=$dstdir/_rm.$$_
|
rmtmp=${dstdirslash}_rm.$$_
|
||||||
|
|
||||||
# Trap to clean up those temp files at exit.
|
# Trap to clean up those temp files at exit.
|
||||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||||
|
|
||||||
# Copy the file name to the temp name.
|
# Copy the file name to the temp name.
|
||||||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
|
(umask $cp_umask &&
|
||||||
|
{ test -z "$stripcmd" || {
|
||||||
|
# Create $dsttmp read-write so that cp doesn't create it read-only,
|
||||||
|
# which would cause strip to fail.
|
||||||
|
if test -z "$doit"; then
|
||||||
|
: >"$dsttmp" # No need to fork-exec 'touch'.
|
||||||
|
else
|
||||||
|
$doit touch "$dsttmp"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
} &&
|
||||||
|
$doit_exec $cpprog "$src" "$dsttmp") &&
|
||||||
|
|
||||||
# and set any options; do chmod last to preserve setuid bits.
|
# and set any options; do chmod last to preserve setuid bits.
|
||||||
#
|
#
|
||||||
|
|
@ -474,18 +484,22 @@ do
|
||||||
if $copy_on_change &&
|
if $copy_on_change &&
|
||||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||||
|
set -f &&
|
||||||
eval "$initialize_posix_glob" &&
|
|
||||||
$posix_glob set -f &&
|
|
||||||
set X $old && old=:$2:$4:$5:$6 &&
|
set X $old && old=:$2:$4:$5:$6 &&
|
||||||
set X $new && new=:$2:$4:$5:$6 &&
|
set X $new && new=:$2:$4:$5:$6 &&
|
||||||
$posix_glob set +f &&
|
set +f &&
|
||||||
|
|
||||||
test "$old" = "$new" &&
|
test "$old" = "$new" &&
|
||||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||||
then
|
then
|
||||||
rm -f "$dsttmp"
|
rm -f "$dsttmp"
|
||||||
else
|
else
|
||||||
|
# If $backupsuffix is set, and the file being installed
|
||||||
|
# already exists, attempt a backup. Don't worry if it fails,
|
||||||
|
# e.g., if mv doesn't support -f.
|
||||||
|
if test -n "$backupsuffix" && test -f "$dst"; then
|
||||||
|
$doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
# Rename the file to the real destination.
|
# Rename the file to the real destination.
|
||||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||||
|
|
||||||
|
|
@ -500,9 +514,9 @@ do
|
||||||
# file should still install successfully.
|
# file should still install successfully.
|
||||||
{
|
{
|
||||||
test ! -f "$dst" ||
|
test ! -f "$dst" ||
|
||||||
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
$doit $rmcmd "$dst" 2>/dev/null ||
|
||||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
{ $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
|
||||||
} ||
|
} ||
|
||||||
{ echo "$0: cannot unlink or rename $dst" >&2
|
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||||
(exit 1); exit 1
|
(exit 1); exit 1
|
||||||
|
|
@ -519,9 +533,9 @@ do
|
||||||
done
|
done
|
||||||
|
|
||||||
# Local variables:
|
# Local variables:
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||||
# time-stamp-start: "scriptversion="
|
# time-stamp-start: "scriptversion="
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||||
# time-stamp-time-zone: "UTC"
|
# time-stamp-time-zone: "UTC0"
|
||||||
# time-stamp-end: "; # UTC"
|
# time-stamp-end: "; # UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
# SOFTWARE.
|
# SOFTWARE.
|
||||||
|
|
||||||
# keep version in sync with configure.ac
|
# keep version in sync with configure.ac
|
||||||
project('xorgproto', 'c', license : 'MIT', version : '2023.2',
|
project('xorgproto', 'c', license : 'MIT', version : '2024.1',
|
||||||
meson_version : '>=0.56.0')
|
meson_version : '>=0.56.0')
|
||||||
cc = meson.get_compiler('c')
|
cc = meson.get_compiler('c')
|
||||||
|
|
||||||
|
|
@ -112,7 +112,16 @@ if get_option('legacy') == true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ext_xorgproto = declare_dependency(
|
ext_xorgproto = declare_dependency(
|
||||||
include_directories : include_directories('include')
|
include_directories : [
|
||||||
|
include_directories('include'),
|
||||||
|
include_directories('include' / 'GL'),
|
||||||
|
include_directories('include' / 'GL' / 'internal'),
|
||||||
|
include_directories('include' / 'X11'),
|
||||||
|
include_directories('include' / 'X11' / 'dri'),
|
||||||
|
include_directories('include' / 'X11' / 'extensions'),
|
||||||
|
include_directories('include' / 'X11' / 'fonts'),
|
||||||
|
include_directories('include' / 'X11' / 'PM'),
|
||||||
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('include')
|
subdir('include')
|
||||||
|
|
|
||||||
|
|
@ -3,5 +3,5 @@ includedir=@includedir@
|
||||||
|
|
||||||
Name: PresentProto
|
Name: PresentProto
|
||||||
Description: Present extension headers
|
Description: Present extension headers
|
||||||
Version: 1.3
|
Version: 1.4
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
The Present Extension
|
The Present Extension
|
||||||
Version 1.3
|
Version 1.4
|
||||||
2023-06-13
|
2023-06-13
|
||||||
|
|
||||||
Keith Packard
|
Keith Packard
|
||||||
|
|
@ -63,7 +63,8 @@ PRESENTOPTION { PresentOptionAsync,
|
||||||
PRESENTCAPABILITY { PresentCapabilityAsync,
|
PRESENTCAPABILITY { PresentCapabilityAsync,
|
||||||
PresentCapabilityFence,
|
PresentCapabilityFence,
|
||||||
PresentCapabilityUST,
|
PresentCapabilityUST,
|
||||||
PresentCapabilityAsyncMayTear }
|
PresentCapabilityAsyncMayTear,
|
||||||
|
PresentCapabilitySyncobj }
|
||||||
|
|
||||||
PRESENTCOMPLETEKIND { PresentCompleteKindPixmap,
|
PRESENTCOMPLETEKIND { PresentCompleteKindPixmap,
|
||||||
PresentCompleteKindMSCNotify }
|
PresentCompleteKindMSCNotify }
|
||||||
|
|
@ -359,6 +360,85 @@ The name of this extension is "Present"
|
||||||
defined by the extension, but is expected to be on the order
|
defined by the extension, but is expected to be on the order
|
||||||
of milliseconds or less.
|
of milliseconds or less.
|
||||||
|
|
||||||
|
PresentCapabilitySyncobj means that the target device supports
|
||||||
|
explicit synchronization using timeline DRM synchronization
|
||||||
|
objects. See the PresentPixmapSynced request for details.
|
||||||
|
|
||||||
|
┌───
|
||||||
|
PresentPixmapSynced
|
||||||
|
window: WINDOW
|
||||||
|
pixmap: PIXMAP
|
||||||
|
serial: CARD32
|
||||||
|
valid-area: REGION or None
|
||||||
|
update-area: REGION or None
|
||||||
|
x-off, y-off: INT16
|
||||||
|
target-crtc: CRTC or None
|
||||||
|
acquire-syncobj: SYNCOBJ or None
|
||||||
|
release-syncobj: SYNCOBJ or None
|
||||||
|
acquire-point: CARD64
|
||||||
|
release-point: CARD64
|
||||||
|
options: SETofPRESENTOPTION
|
||||||
|
target-msc: CARD64
|
||||||
|
divisor: CARD64
|
||||||
|
remainder: CARD64
|
||||||
|
notifies: LISTofPRESENTNOTIFY
|
||||||
|
└───
|
||||||
|
Errors: Window, Pixmap, Match, Value
|
||||||
|
|
||||||
|
Identical to the PresentPixmap request, except that instead of the
|
||||||
|
'wait-fence' and 'idle-fence' arguments it accepts mandatory
|
||||||
|
'acquire-syncobj' and 'release-syncobj' arguments, along with
|
||||||
|
corresponding acquire and release points, to be used for explicit
|
||||||
|
timeline-based GPU synchronization. The 'acquire-point' and
|
||||||
|
'release-point' are assumed to correspond to timeline points on the
|
||||||
|
respective DRM syncobjs.
|
||||||
|
|
||||||
|
The contents of the Pixmap will not be accessed by the server until the
|
||||||
|
'acquire-point' on the acquire timeline has been signaled by the
|
||||||
|
client. The fence need not be submitted at the time the
|
||||||
|
PresentPixmapSynced request is issued.
|
||||||
|
|
||||||
|
Once the 'release-point' on the release timeline has been signaled, the
|
||||||
|
client may assume that no further GPU or CPU access to the Pixmap by
|
||||||
|
the server will occur as part of the originating PresentPixmapSynced
|
||||||
|
request. Note that this is a stronger guarantee than what is provided
|
||||||
|
by the 'idle-fence' argument of the PresentPixmap request or the
|
||||||
|
delivery of a PresentIdleNotify event, as those do not necessarily
|
||||||
|
imply that the Pixmap is idle on the GPU.
|
||||||
|
|
||||||
|
The server may wait for the acquire point and signal the release point
|
||||||
|
itself, as will typically happen if the request is executed by copying
|
||||||
|
the Pixmap's contents. Alternatively, it may forward the timelines,
|
||||||
|
acquire, and release points to an output sink directly, provided that
|
||||||
|
sink also supports explicit synchronization using DRM syncobjs.
|
||||||
|
|
||||||
|
The server may signal the release point without waiting for the acquire
|
||||||
|
point if the Pixmap's contents are never accessed while servicing the
|
||||||
|
request. This may happen, for example, if a request is discarded due to
|
||||||
|
it being fully occluded by a later request.
|
||||||
|
|
||||||
|
Beware that, if multiple Pixmaps are presented using the same release
|
||||||
|
timeline, the server makes no guarantees on the order in which the
|
||||||
|
release points will be signaled. Of particular concern is that, if the
|
||||||
|
later of the two release points is signaled before the earlier one, it
|
||||||
|
may appear to the client as though the Pixmap with the earlier release
|
||||||
|
point has been released before the server has finished its access to
|
||||||
|
it. Therefore, in general, clients are strongly advised to avoid using
|
||||||
|
the same release timeline with different Pixmaps.
|
||||||
|
|
||||||
|
If the server does not support PresentCapabilitySyncobj, a Value error
|
||||||
|
is generated.
|
||||||
|
|
||||||
|
If either 'acquire-syncobj' or 'release-syncobj' are None or do not
|
||||||
|
refer to previously imported syncobjs, a Value error is generated.
|
||||||
|
|
||||||
|
If 'acquire-point' or 'release-point' is zero, a Value error is
|
||||||
|
generated.
|
||||||
|
|
||||||
|
If 'acquire-syncobj' is equal to 'release-syncobj' and 'acquire-point'
|
||||||
|
is greater than or equal to 'release-point', a Value error is
|
||||||
|
generated.
|
||||||
|
|
||||||
|
|
||||||
7.1 Requests proposed for a later Present extension version
|
7.1 Requests proposed for a later Present extension version
|
||||||
|
|
||||||
|
|
@ -729,6 +809,31 @@ A.2 Protocol Requests
|
||||||
4 SETofPRESENTCAPABILITY capabilities
|
4 SETofPRESENTCAPABILITY capabilities
|
||||||
└───
|
└───
|
||||||
|
|
||||||
|
┌───
|
||||||
|
PresentPixmapSynced
|
||||||
|
1 CARD8 major opcode
|
||||||
|
1 5 Present opcode
|
||||||
|
2 22+2n length
|
||||||
|
4 Window window
|
||||||
|
4 Pixmap pixmap
|
||||||
|
4 CARD32 serial
|
||||||
|
4 Region valid-area
|
||||||
|
4 Region update-area
|
||||||
|
2 INT16 x-off
|
||||||
|
2 INT16 y-off
|
||||||
|
4 CRTC target-crtc
|
||||||
|
4 SYNCOBJ acquire-syncobj
|
||||||
|
4 SYNCOBJ release-syncobj
|
||||||
|
8 CARD64 acquire-point
|
||||||
|
8 CARD64 release-point
|
||||||
|
4 CARD32 options
|
||||||
|
4 unused
|
||||||
|
8 CARD64 target-msc
|
||||||
|
8 CARD64 divisor
|
||||||
|
8 CARD64 remainder
|
||||||
|
8n LISTofPresentNotify notifies
|
||||||
|
└───
|
||||||
|
|
||||||
A.3 Protocol Events
|
A.3 Protocol Events
|
||||||
|
|
||||||
┌───
|
┌───
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,12 @@ class Kernel(object):
|
||||||
return version if version != self.versions[0] else None
|
return version if version != self.versions[0] else None
|
||||||
|
|
||||||
|
|
||||||
|
TARGET_KEYSYM_COLUMN = 54
|
||||||
|
"""Column in the file we want the keysym codes to end"""
|
||||||
|
KEYSYM_NAME_MAX_LENGTH = TARGET_KEYSYM_COLUMN - len("#define ") - len("_EVDEVK(0xNNN)")
|
||||||
|
KERNEL_VERSION_PADDING = 7
|
||||||
|
|
||||||
|
|
||||||
def generate_keysym_line(code, kernel, kver_list=[]):
|
def generate_keysym_line(code, kernel, kver_list=[]):
|
||||||
"""
|
"""
|
||||||
Generate the line to append to the keysym file.
|
Generate the line to append to the keysym file.
|
||||||
|
|
@ -153,7 +159,9 @@ def generate_keysym_line(code, kernel, kver_list=[]):
|
||||||
|
|
||||||
name = "".join([s.capitalize() for s in evcode.name[4:].lower().split("_")])
|
name = "".join([s.capitalize() for s in evcode.name[4:].lower().split("_")])
|
||||||
keysym = f"XF86XK_{name}"
|
keysym = f"XF86XK_{name}"
|
||||||
tabs = 4 - len(keysym) // 8
|
spaces = KEYSYM_NAME_MAX_LENGTH - len(keysym)
|
||||||
|
if not spaces:
|
||||||
|
raise ValueError(f"Insufficient padding for keysym “{keysym}”.")
|
||||||
kver = kernel.introduced_in_version(evcode.name) or " "
|
kver = kernel.introduced_in_version(evcode.name) or " "
|
||||||
if kver_list:
|
if kver_list:
|
||||||
from fnmatch import fnmatch
|
from fnmatch import fnmatch
|
||||||
|
|
@ -165,7 +173,7 @@ def generate_keysym_line(code, kernel, kver_list=[]):
|
||||||
else: # no match
|
else: # no match
|
||||||
return None
|
return None
|
||||||
|
|
||||||
return f"#define {keysym}{' ' * tabs}_EVDEVK(0x{code:03X}) /* {kver:5s} {evcode.name} */"
|
return f"#define {keysym}{' ' * spaces}_EVDEVK(0x{code:03x}) /* {kver: <{KERNEL_VERSION_PADDING}s} {evcode.name} */"
|
||||||
|
|
||||||
|
|
||||||
def verify(ns):
|
def verify(ns):
|
||||||
|
|
@ -181,17 +189,17 @@ def verify(ns):
|
||||||
|
|
||||||
# This is the full pattern we expect.
|
# This is the full pattern we expect.
|
||||||
expected_pattern = re.compile(
|
expected_pattern = re.compile(
|
||||||
r"#define XF86XK_\w+\t+_EVDEVK\(0x([0-9A-F]{3})\)\t+/\* (v[2-6]\.[0-9]+(\.[0-9]+)?)? +KEY_\w+ \*/"
|
r"#define XF86XK_\w+ +_EVDEVK\(0x([0-9A-Fa-f]{3})\) +/\* (v[2-6]\.[0-9]+(\.[0-9]+)?)? +KEY_\w+ \*/"
|
||||||
)
|
)
|
||||||
# This is the comment pattern we expect
|
# This is the comment pattern we expect
|
||||||
expected_comment_pattern = re.compile(
|
expected_comment_pattern = re.compile(
|
||||||
r"/\* Use: (?P<name>\w+)\t+_EVDEVK\(0x(?P<value>[0-9A-F]{3})\)\t+ (v[2-6]\.[0-9]+(\.[0-9]+)?)? +KEY_\w+ \*/"
|
r"/\* Use: (?P<name>\w+) +_EVDEVK\(0x(?P<value>[0-9A-Fa-f]{3})\) + (v[2-6]\.[0-9]+(\.[0-9]+)?)? +KEY_\w+ \*/"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Some patterns to spot specific errors, just so we can print useful errors
|
# Some patterns to spot specific errors, just so we can print useful errors
|
||||||
define = re.compile(r"^#define .*")
|
define = re.compile(r"^#define .*")
|
||||||
name_pattern = re.compile(r"#define (XF86XK_[^\s]*)")
|
name_pattern = re.compile(r"#define (XF86XK_[^\s]*)")
|
||||||
tab_check = re.compile(r"#define \w+(\s+)[^\s]+(\s+)")
|
space_check = re.compile(r"#define \w+(\s+)[^\s]+(\s+)")
|
||||||
hex_pattern = re.compile(r".*0x([a-f0-9]+).*", re.I)
|
hex_pattern = re.compile(r".*0x([a-f0-9]+).*", re.I)
|
||||||
comment_format = re.compile(r".*/\* ([^\s]+)?\s+(\w+)")
|
comment_format = re.compile(r".*/\* ([^\s]+)?\s+(\w+)")
|
||||||
kver_format = re.compile(r"v[2-6]\.[0-9]+(\.[0-9]+)?")
|
kver_format = re.compile(r"v[2-6]\.[0-9]+(\.[0-9]+)?")
|
||||||
|
|
@ -231,13 +239,13 @@ def verify(ns):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Comments we only search for a hex pattern and where there is one present
|
# Comments we only search for a hex pattern and where there is one present
|
||||||
# we only check for uppercase format, ordering and update our last_keycode.
|
# we only check for lower case format, ordering and update our last_keycode.
|
||||||
if not re.match(define, line):
|
if not re.match(define, line):
|
||||||
match = re.match(expected_comment_pattern, line)
|
match = re.match(expected_comment_pattern, line)
|
||||||
if match:
|
if match:
|
||||||
hexcode = match.group("value")
|
hexcode = match.group("value")
|
||||||
if hexcode != hexcode.upper():
|
if hexcode != hexcode.lower():
|
||||||
error(f"Hex code 0x{hexcode} must be uppercase", line)
|
error(f"Hex code 0x{hexcode} must be lower case", line)
|
||||||
if hexcode:
|
if hexcode:
|
||||||
keycode = int(hexcode, 16)
|
keycode = int(hexcode, 16)
|
||||||
if keycode < last_keycode:
|
if keycode < last_keycode:
|
||||||
|
|
@ -269,14 +277,14 @@ def verify(ns):
|
||||||
match = re.match(hex_pattern, line)
|
match = re.match(hex_pattern, line)
|
||||||
if not match:
|
if not match:
|
||||||
error("No hex code", line)
|
error("No hex code", line)
|
||||||
if match.group(1) != match.group(1).upper():
|
if match.group(1) != match.group(1).lower():
|
||||||
error(f"Hex code 0x{match.group(1)} must be uppercase", line)
|
error(f"Hex code 0x{match.group(1)} must be lowercase", line)
|
||||||
|
|
||||||
tabs = re.match(tab_check, line)
|
spaces = re.match(space_check, line)
|
||||||
if not tabs: # bug
|
if not spaces: # bug
|
||||||
error("Matching error", line)
|
error("Matching error", line)
|
||||||
if " " in tabs.group(1) or " " in tabs.group(2):
|
if "\t" in spaces.group(1) or "\t" in spaces.group(2):
|
||||||
error("Use tabs, not spaces", line)
|
error("Use spaces, not tabs", line)
|
||||||
|
|
||||||
comment = re.match(comment_format, line)
|
comment = re.match(comment_format, line)
|
||||||
if not comment:
|
if not comment:
|
||||||
|
|
@ -337,7 +345,7 @@ def add_keysyms(ns):
|
||||||
# If verification succeeds, we can be a bit more lenient here because we already know
|
# If verification succeeds, we can be a bit more lenient here because we already know
|
||||||
# what the format of the field is. Specifically, we're searching for
|
# what the format of the field is. Specifically, we're searching for
|
||||||
# 3-digit hexcode in brackets and use that as keycode.
|
# 3-digit hexcode in brackets and use that as keycode.
|
||||||
pattern = re.compile(r".*_EVDEVK\((0x[a-fA-F0-9]{3})\).*")
|
pattern = re.compile(r".*_EVDEVK\((0x[0-9A-Fa-f]{3})\).*")
|
||||||
max_code = max(
|
max_code = max(
|
||||||
[
|
[
|
||||||
c.value
|
c.value
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -145,12 +144,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -159,12 +158,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -159,12 +158,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -165,12 +164,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -159,12 +158,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -159,12 +158,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -148,7 +148,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -159,12 +158,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -161,12 +160,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,6 @@ CC = @CC@
|
||||||
CCDEPMODE = @CCDEPMODE@
|
CCDEPMODE = @CCDEPMODE@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||||
CPP = @CPP@
|
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
CWARNFLAGS = @CWARNFLAGS@
|
CWARNFLAGS = @CWARNFLAGS@
|
||||||
CYGPATH_W = @CYGPATH_W@
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
|
@ -160,12 +159,10 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
ECHO_C = @ECHO_C@
|
ECHO_C = @ECHO_C@
|
||||||
ECHO_N = @ECHO_N@
|
ECHO_N = @ECHO_N@
|
||||||
ECHO_T = @ECHO_T@
|
ECHO_T = @ECHO_T@
|
||||||
EGREP = @EGREP@
|
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
FOP = @FOP@
|
FOP = @FOP@
|
||||||
GREP = @GREP@
|
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
INSTALL_CMD = @INSTALL_CMD@
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue