Commit graph

2602 commits

Author SHA1 Message Date
Keith Packard
702d2eaecd screensaver: Fix encoding of ScreenSaverSuspend 'suspend' element
Was using Bool, which is not a defined X protocol encoding type and
has presumably been a 32-bit type. Switch to a CARD32 to be compatible
while at least being well defined.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Mihai Moldovan <ionic@ionic.de>
2018-03-14 10:19:19 -07:00
Adam Jackson
bac7b0b421 xorgproto 2018.4
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-28 11:38:27 -05:00
Louis-Francis Ratté-Boulianne
751cf1e19e presentproto: PresentCompleteModeSuboptimalCopy flag
If the Complete event has this mode, the client is not using
the more optimal format/modifier for the buffer allocation. The
client must explicitely inform the server that it understands
this mode by adding the PresentOptionSuboptimal flag when calling
PresentPixmap.

Its main usage as of now is to allow clients to re-fetch DRI3
format modifiers as some modifiers might allow direct scanout.

Bump presentproto version to 1.2.

Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
2018-02-28 11:13:11 -05:00
Louis-Francis Ratté-Boulianne
0fca474cd6 dri3: Add modifier/multi-plane requests, bump to v1.2
DRI3 version 1.2 adds support for explicit format modifiers,
including multi-planar buffers.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
2018-02-28 11:13:11 -05:00
Giuseppe Bilotta
29c53a28fa Spelling and grammar fixes
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
2018-02-28 10:26:40 -05:00
Keith Packard
cd7b5a4bee xorgproto 2018.3
Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-20 15:43:19 -08:00
Keith Packard
6720940e1d Fix Makefile.am definition of XCalibrate headers
A missing backslash caused the XCalibrateinclude_HEADERS value to be
empty. Thanks. autotools, for not detecting this.

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-20 15:43:19 -08:00
Keith Packard
fd31dca922 Bump meson.build version to 2018.2
Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-15 12:58:24 -08:00
Keith Packard
c1418cffb5 Update RandR version in meson.build to 1.6
The RandR 1.6 patches were merged without the necessary meson changes.

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-15 12:51:12 -08:00
Adam Jackson
c1c8cf7360 glproto: Add compatibility #defines for the typos we corrected
Apparently there does exist code that uses the typoed names.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-14 15:58:46 -05:00
Keith Packard
e681f8de0c randr: Add non-desktop output property and behaviors [v3]
non-desktop devices are those to which the normal desktop environment
should not be extended. Examples are Head-mounted displays and the
Apple Touch Bar.

How an output device is set to non-desktop is not part of this
proposal; it is expected that the underlying operating system will
provide this information and have it reflected to X applications
through this extension.

v2: fix puncutation and duplicated 'the'.
v3: switch to 32-bit property named non-desktop to match Linux

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-12 13:54:19 -05:00
Keith Packard
14f68c7b00 randr: Add Leases. [v4]
A "lease" is a set of crtc and output resources granted to another
application for use outside of X. These will not be usable through the
X protocol until the lease terminates. Leased outputs will be seen as
disconnected, leased CRTCs will be seen as not usable with any output.

v2:
	Delete output grabs
	Add LeaseNotify events
	Add FreeLease with option to terminate

v3:
	Clarify a couple of lease behaviors:

	* You can lease an in-use object, it makes the X server stop
	  using it, you don't get an error back.

	* There's no explicit 'Disabled' state for a crtc, when a crtc
	  is disabled, it just has a set of reported values for
	  GetCrtcInfo.

v4:
	Integrate into merged xorgproto repo

Signed-off-by: Keith Packard <keithp@keithp.com>
2018-02-12 13:54:13 -05:00
Adam Jackson
0da777811b xorgproto 2018.2
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-12 11:16:45 -05:00
Adam Jackson
85f23a05a8 autotools: Distribute the meson build system
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-12 11:13:51 -05:00
Adam Jackson
9ce02998c8 xproto: Bump to 7.0.32
Since 7.0.31 we've added four new keysyms (XF86XK_Keyboard, _WWAN,
_RFKill, and _AudioPreset).

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-12 11:11:14 -05:00
Adam Jackson
b5bfeec4b8 kbproto: Fix version number (1.0.7 not 1.0.6)
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-12 11:01:44 -05:00
Adam Jackson
09d8185d9f presentproto: Fix version number (1.1 not 1.0)
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-12 11:00:51 -05:00
Adam Jackson
5c6e9a6e3a meson: Fix xf86driproto.pc
These headers are in X11/dri but are included without a relative path.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-06 18:21:51 -05:00
Giuseppe Bilotta
0e6b611a89 randr: MONITORINFO has outputs, not crtcs
Reviewed-by: Adam Jackson <ajax@redhat.com>
2018-02-06 14:13:19 -05:00
Adam Jackson
bd1c33db52 xorgproto 2018.1
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-05 14:10:29 -05:00
Adam Jackson
944edc7962 Update INSTALL
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-05 14:10:29 -05:00
Adam Jackson
866582439a Move the migration scripts and data to the attic
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-01 15:07:35 -05:00
Adam Jackson
193b75db8c meson: Spread the install rules into their subdirs
Mostly this is is so the generated Xpoll.h can be emitted into a usable
directory when we build as a subproject.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-01 15:01:56 -05:00
Adam Jackson
0d4330017c meson: Unbreak the dependency include path 2018-02-01 14:56:34 -05:00
Adam Jackson
7409bb6612 xproto: Stop generating Xfuncproto.h
This no longer varies at compile time, yay.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-01 14:55:30 -05:00
Adam Jackson
c9120fbdce xproto: Stop "computing" a value for FUNCPROTO
This macro is apparently an imake-ism for how much C89 you support.
Seeing as it's 2018 the answer is "all of it", and if that's not
actually true for your platform you need a better compiler.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-01 14:50:32 -05:00
Adam Jackson
05b1963945 xproto: Move NARROWPROTO logic out of configure time
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-02-01 14:47:38 -05:00
Adam Jackson
627f4f40ab Add a meson build system
Builds on the work Dylan Baker did for glproto. Note that this does
not produce _quite_ identical pc files as the autotools build, but it
only affects the name and description strings which are only informative
anyway.

Just to be petty:

% time ( ./configure --prefix=/tmp/xorgproto && make install; ) >& /dev/null
2.42s user 1.67s system 107% cpu 3.804 total

% time ( meson setup build && meson configure build -Dprefix=/tmp/xorgproto && ninja -C build install ) >& /dev/null
0.55s user 0.11s system 100% cpu 0.658 total

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 16:46:29 -05:00
Adam Jackson
9d14a8fade Move the headers under include/X11/...
I kinda hate to do this, it was nice to have everything in one place.
However, the meson build wants to be able to wrap this module as a
dependency, and code that depends on these headers includes them in the
form:

    #include <X11/Xfuncproto.h>

As a result, any include path meson can construct needs to point to the
root of a hierarchy that has the same path layout as an installed copy,
hence this change.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:31:15 -05:00
Adam Jackson
dc2c6e8e2c git mv *proto/ attic/
Stash the old documentation build recipes somewhere less immediately
ugly.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:09:22 -05:00
Adam Jackson
d9f9efc70b git rm -f NEWS
This was from damageproto, and hadn't been touched in a decade. Not
exactly "news" anymore.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:07:11 -05:00
Adam Jackson
74a78da1df git rm duplicate-files
At this point all that's left in subdirs (besides include/) are the
automake rules for building the specs. Probably we should make those
build again at some point.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:04:46 -05:00
Adam Jackson
941696538d git rm -f */.gitignore
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:04:00 -05:00
Adam Jackson
a84a3e0ac0 git rm -f */Makefile.am
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:02:30 -05:00
Adam Jackson
30e7d98da2 Add an AUTHORS file
Mostly x11proto/AUTHORS, plus some merge commentary.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 12:01:49 -05:00
Adam Jackson
8111465b57 git rm -r -f CVS/
This seems to have been a thinko from the lg3d protocol, no idea why it
would have ever itself have been in cvs.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 11:54:43 -05:00
Adam Jackson
23dfde49cc git rm -f */configure.ac
Note that the AC_ARG_ENABLE bits from x11proto might still matter...

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 11:53:42 -05:00
Adam Jackson
f8d79a05e5 git rm */autogen.sh
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 11:50:13 -05:00
Adam Jackson
20edc983b0 Add a top-level README
Inspired mostly by x11proto/README, plus some commentary about the scope
of this project and a pointer to the xcb protocol xml.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-30 11:48:27 -05:00
Adam Jackson
88ae4ebf26 Fix module name in autogen.sh so patches get named right
Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 12:17:14 -05:00
Adam Jackson
3d12b8f348 Move COPYING files up to the top level
... and distribute them.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 11:13:08 -05:00
Adam Jackson
c649a2edc1 Install pc files in $datadir not $libdir
There's nothing arch-specific about any of this.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 11:13:00 -05:00
Adam Jackson
23fe271e30 build: Hide some ancient headers behind --enable-legacy
Use this if you need calibrate, evie, fontcache, lg3d, or print.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 11:13:00 -05:00
Adam Jackson
7519914301 Fix .pc module versions
Just stuff the versions in the .pc file directly, @PACKAGE_VERSION@ is
the version set in configure.ac which is now different.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 11:13:00 -05:00
Adam Jackson
5458e50a46 Set package name to xorgproto and use year-based versioning
Integers are cheap.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2018-01-16 11:13:00 -05:00
Keith Packard
80ceb11c62 Add files used to merge the repositories
Signed-off-by: Keith Packard <keithp@keithp.com>
2017-12-13 15:48:10 -08:00
Keith Packard
fa8997ab25 Add .gitignore
Signed-off-by: Keith Packard <keithp@keithp.com>
2017-12-13 15:46:24 -08:00
Keith Packard
b6e5422340 remove lg3d build files 2017-12-13 15:44:06 -08:00
Keith Packard
1276412bbd Create shared build infrastructure
Signed-off-by: Keith Packard <keithp@keithp.com>
2017-12-13 15:40:56 -08:00
Keith Packard
38303e02f8 Move common xineramaproto files out of the way 2017-12-13 15:12:27 -08:00