summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-11Deprecate XK_approxeq and XK_notapproxeq.Pierre Le Marre
Fixes #20
2021-03-10gitlab CI: add a job to compare meson and autotools standard installsPeter Hutterer
Build and install with meson, build and install with autotools and then run diff to compare the two directory trees. They should be the same. This does not install the legacy protocols, they're behind a configure switch. The spec-build is disabled in autotools because we know meson doesn't do that yet, so no point in comparing those. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-10meson.build: install the protocol .txt files in docPeter Hutterer
This now matches the autotools installation Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-10meson.build: use built-in variable substitution handling instead of sedPeter Hutterer
Generated outputs are identical Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-10Integrate the keysym verifier into make checkPeter Hutterer
autotools can't pass arguments, so let's default to 'verify' in the script itself and for distcheck to succeed, we need to set an environment variable to search for the header (it's an out-of-tree build). And due to the very faint chance of there being no python during the xorgproto build, let's make that conditional too. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-10Makefile.am: move the man page rules to the topPeter Hutterer
More readable grouping this way Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-10Makefile.am: reorder the protocols to group by default and LEGACYPeter Hutterer
An alphabetically ordered list is nice, but it's harder to figure out based on a diff whether a commit affects the legacy protocols or not. Let's group those separately, first the normal protocol files, then all the legacy-only ones. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-03-01Corrected comments in keysymdef.h.Hannah Rittich
2021-02-25xorgproto-2021.3xorgproto-2021.3Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-24gitlab CI: add a job to build with meson from the autotools tarballPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-24autotools: add the keysym-generator script to EXTRA_DISTPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-24xorgproto 2021.2xorgproto-2021.2Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-24configure.ac: remove trailing whitespacesPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-24gitlab CI: add an autotools distcheck jobPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-17scripts: make sure all "Use: XK_Foo" comments point to existing symbolsPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-17scripts: use a named pattern for the hexcode check in commentsPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-17XF86keysym.h: fix a few references to invalid keysPeter Hutterer
No change to the header, comments only. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add some keycodes from kernels 2.6.11 and earlierPeter Hutterer
These keysyms were already present in 2.6.11 which is the first tag in git. A few notes on specific keys here: - KEY_EJECTCLOSECD is theoretically different to XF86XK_Eject (kernel KEY_EJECTCD) but the actual usage in the hwdb remappings seems to be random. Either way it's already mapped to XF86XK_Eject in symbols/inet so let's just add an entry for the sake of documenting it. - XF86XK_CycleAngle seems like the best match for KEY_ANGLE Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add comments for some keycodes from 2.6.1x kernelsPeter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add some keycodes from 2.6.2x kernelsPeter Hutterer
A few notes on specific keys here: - Some existing keysyms used some brand names. e.g. KEY_WORDPROCESSOR -> existing XF86XK_Word. This introduces some minor inconsistency with unbranded new keys like KEY_GRAPHICSEDITOR -> XF86XK_GraphicsEditor. - XF86XK_DisplayToggle is *not* XF86XK_Display (which represents KEY_SWITCHVIDEOMODE) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add some keycodes from 2.6.3x kernelsPeter Hutterer
A few notes on specific keys here: - There are exiting XF86XK_ZoomIn/Out keys, but they don't seem appropriate for KEY_CAMERA_ZOOMIN and friends. New symbols are introduced here. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add comment for new keycodes from kernel v3.1Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v3.10Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v3.13Peter Hutterer
ALSToggle has a terrible name, it's the Ambient Light Sensor. But it matches the kernel define so... Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v3.16Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v3.18Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v4.1Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v4.7Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v4.12Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v4.13Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add comment for new keycodes from kernel v4.16Peter Hutterer
This keysym is already available under a different name, see https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/commit/000ebed576aafb44caeea8b6a5de90fba2bdc389 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v5.1Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v5.2Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v5.5Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v5.6Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysyms.h: add new keycodes from kernel v5.10Peter Hutterer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-02-08XF86keysym.h: reserve a range for Linux kernel keysymsPeter Hutterer
The Linux kernel adds a few evdev keycodes roughly every other release. These aren't available as keysyms through XKB until they have been added as keycode in xkeyboard-config and mapped there to a newly defined keysym in the X11 proto headers. In the past, this was done manually, a suitable keysym was picked at random and the mapping updated accordingly. This doesn't scale very well and, given we have a large reserved range for XF86 keysyms anyway, can be done easier. Let's reserve the range 0x10081XXX range for a 1:1 mapping of Linux kernel codes. That's 4095 values, the kernel currently uses only 767 anyway. The lower 3 bytes of keysyms within that range have to match the kernel value to make them easy to add and search for. Nothing in X must care about the actual keysym value anyway. Since we expect this to be parsed by other scripts for automatic updating, the format of those #defines is quite strict. Add a script to generate keycodes as well as verify that the existing ones match the current expected format. The script is integrated into the CI and meson test, so we will fail if an update breaks the expectations. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-01-21gitlab CI: add a basic build testPeter Hutterer
Build an Arch image that tests a meson build with all build options we support (well, the single one so far). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2021-01-18Remove misleading comment about not adding syms to XF86keysym.hPeter Hutterer
We've been adding to those over the last few years. Not a huge amount but enough that we should stop pretending we don't touch that header. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2020-10-10XKB: Mark key name arrays as not NUL-terminated stringsAlan Coopersmith
They are fixed length (4 characters), and don't need NUL-terminators. This makes gcc stop warning when they're not NUL-terminated, and instead warn if they are passed to functions expecting NUL-terminated strings. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2020-10-10Xfuncproto: define _X_NONSTRING for __attribute__((nonstring))Alan Coopersmith
Bumps xproto version to 7.0.33 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2020-08-24meson: Use configure_file for pc files.orbea
Meson's pkg.generate() is not suitable for header only libraries and using configure_file() allows for more fine tuned control. This also makes the meson and autotools builds more in sync where they both use the same .pc.in files. v2: Drop exec_prefix.
2020-08-24pkgconfig: Drop exec_prefix from the .pc.in files.orbea
This is not used by xorg-devel which contains only headers.
2020-08-18specs: Make links between XI2 enum and event names explicitPovilas Kanapickas
2020-08-18specs: Improve description of detail field in XIPassiveGrabDevicePovilas Kanapickas
2020-08-18specs: Improve description of detail field in DeviceEventPovilas Kanapickas
2020-08-18specs: Fix example of touch event processingPovilas Kanapickas
2020-08-18specs: Use non-hyphenated spelling of nonzeroPovilas Kanapickas
2020-08-18specs: Improve consistency of grammar in a listPovilas Kanapickas
2020-08-18specs: Only key code can be grabbed, not key symbolPovilas Kanapickas