Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libxfixes
Commits:
-
65845c5f
by Peter Hutterer at 2017-01-26T11:59:25+10:00
-
6f950642
by Emil Velikov at 2017-01-26T11:59:25+10:00
-
b9b75d74
by Mihail Konev at 2017-01-26T13:52:49+10:00
-
1e238b40
by Alan Coopersmith at 2018-11-19T21:58:32-08:00
-
174a9497
by Alan Coopersmith at 2019-03-16T12:39:31-07:00
-
883f89dd
by Olivier Fourdan at 2021-05-10T15:58:53+02:00
-
6fe3bd64
by Peter Hutterer at 2021-05-12T09:34:39+10:00
8 changed files:
- Makefile.am
- − README
- + README.md
- autogen.sh
- configure.ac
- include/X11/extensions/Xfixes.h
- + src/Disconnect.c
- src/Makefile.am
Changes:
... | ... | @@ -35,3 +35,5 @@ ChangeLog: |
35 | 35 |
$(CHANGELOG_CMD)
|
36 | 36 |
|
37 | 37 |
dist-hook: ChangeLog INSTALL
|
38 |
+ |
|
39 |
+EXTRA_DIST = README.md
|
1 |
- Xfixes
|
|
2 |
- XFIXES Extension
|
|
3 |
- Version 2.0.1
|
|
4 |
- 2002-10-4
|
|
5 |
- |
|
6 |
-This package contains header files and documentation for the XFIXES
|
|
7 |
-extension. Library and server implementations are separate.
|
|
8 |
- |
|
9 |
-Keith Packard
|
|
10 |
-keithp@keithp.com
|
|
11 |
- |
|
12 |
-All questions regarding this software should be directed at the
|
|
13 |
-Xorg mailing list:
|
|
14 |
- |
|
15 |
- http://lists.freedesktop.org/mailman/listinfo/xorg
|
|
16 |
- |
|
17 |
-Please submit bug reports to the Xorg bugzilla:
|
|
18 |
- |
|
19 |
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
|
20 |
- |
|
21 |
-The master development code repository can be found at:
|
|
22 |
- |
|
23 |
- git://anongit.freedesktop.org/git/xorg/lib/libXfixes
|
|
24 |
- |
|
25 |
- http://cgit.freedesktop.org/xorg/lib/libXfixes
|
|
26 |
- |
|
27 |
-For patch submission instructions, see:
|
|
28 |
- |
|
29 |
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
|
30 |
- |
|
31 |
-For more information on the git code manager, see:
|
|
32 |
- |
|
33 |
- http://wiki.x.org/wiki/GitPage
|
|
34 |
- |
1 |
+libXfixes - XFIXES Extension library
|
|
2 |
+------------------------------------
|
|
3 |
+ |
|
4 |
+All questions regarding this software should be directed at the
|
|
5 |
+Xorg mailing list:
|
|
6 |
+ |
|
7 |
+ https://lists.x.org/mailman/listinfo/xorg
|
|
8 |
+ |
|
9 |
+The master development code repository can be found at:
|
|
10 |
+ |
|
11 |
+ https://gitlab.freedesktop.org/xorg/lib/libXfixes
|
|
12 |
+ |
|
13 |
+Please submit bug reports and requests to merge patches there.
|
|
14 |
+ |
|
15 |
+For patch submission instructions, see:
|
|
16 |
+ |
|
17 |
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
|
18 |
+ |
1 | 1 |
#! /bin/sh
|
2 | 2 |
|
3 |
-srcdir=`dirname $0`
|
|
3 |
+srcdir=`dirname "$0"`
|
|
4 | 4 |
test -z "$srcdir" && srcdir=.
|
5 | 5 |
|
6 | 6 |
ORIGDIR=`pwd`
|
7 |
-cd $srcdir
|
|
7 |
+cd "$srcdir"
|
|
8 | 8 |
|
9 | 9 |
autoreconf -v --install || exit 1
|
10 |
-cd $ORIGDIR || exit $?
|
|
10 |
+cd "$ORIGDIR" || exit $?
|
|
11 |
+ |
|
12 |
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
|
|
13 |
+ git config --local format.subjectPrefix "PATCH libXfixes"
|
|
11 | 14 |
|
12 | 15 |
if test -z "$NOCONFIGURE"; then
|
13 |
- $srcdir/configure "$@"
|
|
16 |
+ exec "$srcdir"/configure "$@"
|
|
14 | 17 |
fi
|
... | ... | @@ -32,8 +32,8 @@ AC_PREREQ([2.60]) |
32 | 32 |
# that 'revision' number appears in Xfixes.h and has to be manually
|
33 | 33 |
# synchronized.
|
34 | 34 |
#
|
35 |
-AC_INIT(libXfixes, [5.0.3],
|
|
36 |
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfixes])
|
|
35 |
+AC_INIT(libXfixes, [6.0.0],
|
|
36 |
+ [https://gitlab.freedesktop.org/xorg/lib/libXfixes/issues], [libXfixes])
|
|
37 | 37 |
AC_CONFIG_SRCDIR([Makefile.am])
|
38 | 38 |
AC_CONFIG_HEADERS([config.h])
|
39 | 39 |
|
1 | 1 |
/*
|
2 | 2 |
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
|
3 |
- * Copyright 2011 Red Hat, Inc.
|
|
3 |
+ * Copyright 2011, 2021 Red Hat, Inc.
|
|
4 | 4 |
*
|
5 | 5 |
* Permission is hereby granted, free of charge, to any person obtaining a
|
6 | 6 |
* copy of this software and associated documentation files (the "Software"),
|
... | ... | @@ -264,6 +264,16 @@ XFixesDestroyPointerBarrier(Display *dpy, PointerBarrier b); |
264 | 264 |
|
265 | 265 |
#endif /* XFIXES_MAJOR >= 5 */
|
266 | 266 |
|
267 |
+#if XFIXES_MAJOR >= 6
|
|
268 |
+ |
|
269 |
+void
|
|
270 |
+XFixesSetClientDisconnectMode(Display *dpy, int disconnect_mode);
|
|
271 |
+ |
|
272 |
+int
|
|
273 |
+XFixesGetClientDisconnectMode(Display *dpy);
|
|
274 |
+ |
|
275 |
+#endif /* XFIXES_MAJOR >= 6 */
|
|
276 |
+ |
|
267 | 277 |
_XFUNCPROTOEND
|
268 | 278 |
|
269 | 279 |
#endif /* _XFIXES_H_ */
|
1 |
+/*
|
|
2 |
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
|
|
3 |
+ * Copyright 2021 Red Hat, Inc.
|
|
4 |
+ *
|
|
5 |
+ * Permission is hereby granted, free of charge, to any person obtaining a
|
|
6 |
+ * copy of this software and associated documentation files (the "Software"),
|
|
7 |
+ * to deal in the Software without restriction, including without limitation
|
|
8 |
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
9 |
+ * and/or sell copies of the Software, and to permit persons to whom the
|
|
10 |
+ * Software is furnished to do so, subject to the following conditions:
|
|
11 |
+ *
|
|
12 |
+ * The above copyright notice and this permission notice (including the next
|
|
13 |
+ * paragraph) shall be included in all copies or substantial portions of the
|
|
14 |
+ * Software.
|
|
15 |
+ *
|
|
16 |
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17 |
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18 |
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
19 |
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20 |
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
21 |
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
22 |
+ * DEALINGS IN THE SOFTWARE.
|
|
23 |
+ */
|
|
24 |
+/*
|
|
25 |
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
|
|
26 |
+ *
|
|
27 |
+ * Permission to use, copy, modify, distribute, and sell this software and its
|
|
28 |
+ * documentation for any purpose is hereby granted without fee, provided that
|
|
29 |
+ * the above copyright notice appear in all copies and that both that
|
|
30 |
+ * copyright notice and this permission notice appear in supporting
|
|
31 |
+ * documentation, and that the name of Keith Packard not be used in
|
|
32 |
+ * advertising or publicity pertaining to distribution of the software without
|
|
33 |
+ * specific, written prior permission. Keith Packard makes no
|
|
34 |
+ * representations about the suitability of this software for any purpose. It
|
|
35 |
+ * is provided "as is" without express or implied warranty.
|
|
36 |
+ *
|
|
37 |
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
38 |
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
39 |
+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
40 |
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
41 |
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
42 |
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
43 |
+ * PERFORMANCE OF THIS SOFTWARE.
|
|
44 |
+ */
|
|
45 |
+ |
|
46 |
+#ifdef HAVE_CONFIG_H
|
|
47 |
+#include <config.h>
|
|
48 |
+#endif
|
|
49 |
+#include "Xfixesint.h"
|
|
50 |
+#include <limits.h>
|
|
51 |
+ |
|
52 |
+void
|
|
53 |
+XFixesSetClientDisconnectMode(Display *dpy, int disconnect_mode)
|
|
54 |
+{
|
|
55 |
+ XFixesExtDisplayInfo *info = XFixesFindDisplay(dpy);
|
|
56 |
+ xXFixesSetClientDisconnectModeReq *req;
|
|
57 |
+ |
|
58 |
+ XFixesSimpleCheckExtension(dpy, info);
|
|
59 |
+ if (info->major_version < 6)
|
|
60 |
+ return;
|
|
61 |
+ |
|
62 |
+ LockDisplay(dpy);
|
|
63 |
+ GetReq(XFixesSetClientDisconnectMode, req);
|
|
64 |
+ req->reqType = info->codes->major_opcode;
|
|
65 |
+ req->xfixesReqType = X_XFixesSetClientDisconnectMode;
|
|
66 |
+ req->disconnect_mode = disconnect_mode;
|
|
67 |
+ UnlockDisplay(dpy);
|
|
68 |
+ SyncHandle();
|
|
69 |
+}
|
|
70 |
+ |
|
71 |
+int
|
|
72 |
+XFixesGetClientDisconnectMode(Display *dpy)
|
|
73 |
+{
|
|
74 |
+ XFixesExtDisplayInfo *info = XFixesFindDisplay(dpy);
|
|
75 |
+ xXFixesGetClientDisconnectModeReq *req;
|
|
76 |
+ xXFixesGetClientDisconnectModeReply rep;
|
|
77 |
+ int disconnect_mode;
|
|
78 |
+ |
|
79 |
+ XFixesCheckExtension(dpy, info, 0);
|
|
80 |
+ if (info->major_version < 6)
|
|
81 |
+ return XFixesClientDisconnectFlagDefault;
|
|
82 |
+ |
|
83 |
+ LockDisplay(dpy);
|
|
84 |
+ GetReq(XFixesGetClientDisconnectMode, req);
|
|
85 |
+ req->reqType = info->codes->major_opcode;
|
|
86 |
+ req->xfixesReqType = X_XFixesGetClientDisconnectMode;
|
|
87 |
+ |
|
88 |
+ if (!_XReply(dpy, (xReply *) &rep, 0, xFalse))
|
|
89 |
+ {
|
|
90 |
+ UnlockDisplay(dpy);
|
|
91 |
+ SyncHandle();
|
|
92 |
+ return XFixesClientDisconnectFlagDefault;
|
|
93 |
+ }
|
|
94 |
+ |
|
95 |
+ disconnect_mode = rep.disconnect_mode;
|
|
96 |
+ UnlockDisplay(dpy);
|
|
97 |
+ SyncHandle();
|
|
98 |
+ |
|
99 |
+ return disconnect_mode;
|
|
100 |
+}
|
... | ... | @@ -2,6 +2,7 @@ lib_LTLIBRARIES = libXfixes.la |
2 | 2 |
|
3 | 3 |
libXfixes_la_SOURCES = \
|
4 | 4 |
Cursor.c \
|
5 |
+ Disconnect.c \
|
|
5 | 6 |
Region.c \
|
6 | 7 |
SaveSet.c \
|
7 | 8 |
Selection.c \
|