Skip to content

Commit 272e572

Browse files
author
marha
committed
git update until 25 Mar 2011
xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
1 parent b39f063 commit 272e572

File tree

1,356 files changed

+70111
-408878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,356 files changed

+70111
-408878
lines changed

Diff for: X11/COPYING

+48-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
2020
DEALINGS IN THE SOFTWARE.
2121

2222

23-
Copyright 1987, 1998 The Open Group
23+
Copyright 1985, 1987, 1988, 1990, 1991, 1993-1996, 1998 The Open Group
2424

2525
Permission to use, copy, modify, distribute, and sell this software and its
2626
documentation for any purpose is hereby granted without fee, provided that
@@ -42,18 +42,20 @@ Except as contained in this notice, the name of The Open Group shall not be
4242
used in advertising or otherwise to promote the sale, use or other dealings
4343
in this Software without prior written authorization from The Open Group.
4444

45+
The X Window System is a Trademark of The Open Group.
46+
4547

4648
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
4749

4850
All Rights Reserved
4951

50-
Permission to use, copy, modify, and distribute this software and its
51-
documentation for any purpose and without fee is hereby granted,
52+
Permission to use, copy, modify, and distribute this software and its
53+
documentation for any purpose and without fee is hereby granted,
5254
provided that the above copyright notice appear in all copies and that
53-
both that copyright notice and this permission notice appear in
55+
both that copyright notice and this permission notice appear in
5456
supporting documentation, and that the name of Digital not be
5557
used in advertising or publicity pertaining to distribution of the
56-
software without specific, written prior permission.
58+
software without specific, written prior permission.
5759

5860
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
5961
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -63,3 +65,44 @@ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
6365
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
6466
SOFTWARE.
6567

68+
69+
Copyright 1987 by Apollo Computer Inc., Chelmsford, Massachusetts.
70+
Copyright 1989 by Hewlett-Packard Company.
71+
72+
All Rights Reserved
73+
74+
Permission to use, duplicate, change, and distribute this software and
75+
its documentation for any purpose and without fee is granted, provided
76+
that the above copyright notice appear in such copy and that this
77+
copyright notice appear in all supporting documentation, and that the
78+
names of Apollo Computer Inc., the Hewlett-Packard Company, or the X
79+
Consortium not be used in advertising or publicity pertaining to
80+
distribution of the software without written prior permission.
81+
82+
HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
83+
TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
84+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
85+
PURPOSE. Hewlett-Packard shall not be liable for errors
86+
contained herein or direct, indirect, special, incidental or
87+
consequential damages in connection with the furnishing,
88+
performance, or use of this material.
89+
90+
91+
Copyright (c) 1999 The XFree86 Project Inc.
92+
93+
All Rights Reserved.
94+
95+
The above copyright notice and this permission notice shall be included in
96+
all copies or substantial portions of the Software.
97+
98+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
99+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
100+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
101+
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
102+
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
103+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
104+
105+
Except as contained in this notice, the name of The XFree86 Project
106+
Inc. shall not be used in advertising or otherwise to promote the
107+
sale, use or other dealings in this Software without prior written
108+
authorization from The XFree86 Project Inc.

Diff for: X11/Xfuncproto.h.in

+30-9
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ in this Software without prior written authorization from The Open Group.
7777

7878
#if defined(__GNUC__) && (__GNUC__ >= 4)
7979
# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
80-
# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
8180
#else
8281
# define _X_SENTINEL(x)
83-
# define _X_ATTRIBUTE_PRINTF(x,y)
8482
#endif /* GNUC >= 4 */
8583

8684
#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
@@ -100,15 +98,9 @@ in this Software without prior written authorization from The Open Group.
10098
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
10199
# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
102100
# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
103-
# define _X_INLINE inline
104-
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
105-
# define _X_LIKELY(x) (x)
106-
# define _X_UNLIKELY(x) (x)
107-
# define _X_INLINE inline
108-
#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
101+
#else /* not gcc >= 3.3 */
109102
# define _X_LIKELY(x) (x)
110103
# define _X_UNLIKELY(x) (x)
111-
# define _X_INLINE
112104
#endif
113105

114106
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
@@ -124,4 +116,33 @@ in this Software without prior written authorization from The Open Group.
124116
# define _X_NORETURN
125117
#endif /* GNUC */
126118

119+
#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
120+
# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
121+
#else /* not gcc >= 2.3 */
122+
# define _X_ATTRIBUTE_PRINTF(x,y)
123+
#endif
124+
125+
/* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */
126+
#if defined(inline) /* assume autoconf set it correctly */ || \
127+
(defined(__STDC__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \
128+
(defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))
129+
# define _X_INLINE inline
130+
#elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
131+
# define _X_INLINE __inline__
132+
#else
133+
# define _X_INLINE
134+
#endif
135+
136+
/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
137+
#ifndef _X_RESTRICT_KYWD
138+
# if defined(restrict) /* assume autoconf set it correctly */ || \
139+
(defined(__STDC__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */
140+
# define _X_RESTRICT_KYWD restrict
141+
# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
142+
# define _X_RESTRICT_KYWD __restrict__
143+
# else
144+
# define _X_RESTRICT_KYWD
145+
# endif
146+
#endif
147+
127148
#endif /* _XFUNCPROTO_H_ */

Diff for: X11/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.60])
2-
AC_INIT([Xproto], [7.0.20],
2+
AC_INIT([Xproto], [7.0.21],
33
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
44
AM_INIT_AUTOMAKE([foreign dist-bzip2])
55
AM_MAINTAINER_MODE

Diff for: X11/extensions/fixesproto.txt

+88-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The XFIXES Extension
2-
Version 4.0
3-
Document Revision 2
4-
2006-12-14
2+
Version 5.0
3+
Document Revision 1
4+
2010-11-15
55
Keith Packard
66
77

@@ -19,7 +19,7 @@ developers, in particular,
1919

2020
+ Owen Taylor for describing the issues raised with the XEMBED
2121
mechanisms and SaveSet processing and his initial extension
22-
to handle this issue.
22+
to handle this issue, and for pointer barriers
2323

2424
+ Bill Haneman for the design for cursor image tracking.
2525

@@ -566,6 +566,90 @@ ShowCursor
566566
Servers supporting the X Input Extension Version 2.0 or higher show
567567
all visible cursors in response to a ShowCursor request.
568568

569+
************* XFIXES VERSION 5 OR BETTER ***********
570+
571+
12. Pointer Barriers
572+
573+
Compositing managers and desktop environments may have UI elements in
574+
particular screen locations such that for a single-headed display they
575+
correspond to easy targets according to Fitt's Law, for example, the top
576+
left corner. For a multi-headed environment these corners should still be
577+
semi-impermeable. Pointer barriers allow the application to define
578+
additional constraint on cursor motion so that these areas behave as
579+
expected even in the face of multiple displays.
580+
581+
Absolute positioning devices like touchscreens do not obey pointer barriers.
582+
There's no advantage to target acquisition to do so, since on a touchscreen
583+
all points are in some sense equally large, whereas for a relative
584+
positioning device the edges and corners are infinitely large.
585+
586+
WarpPointer and similar requests do not obey pointer barriers, for
587+
essentially the same reason.
588+
589+
12.1 Types
590+
591+
BARRIER: XID
592+
593+
BarrierDirections
594+
595+
BarrierPositiveX: 1 << 0
596+
BarrierPositiveY: 1 << 1
597+
BarrierNegativeX: 1 << 2
598+
BarrierNegativeY: 1 << 3
599+
600+
12.2 Errors
601+
602+
Barrier
603+
604+
12.3 Requests
605+
606+
CreatePointerBarrier
607+
608+
barrier: BARRIER
609+
drawable: DRAWABLE
610+
x1, y2, x2, y2: INT16
611+
directions: CARD32
612+
devices: LISTofDEVICEID
613+
614+
Creates a pointer barrier along the line specified by the given
615+
coordinates on the screen associated with the given drawable. The
616+
barrier has no spatial extent; it is simply a line along the left
617+
or top edge of the specified pixels. Barrier coordinates are in
618+
screen space.
619+
620+
The coordinates must be axis aligned, either x1 == x2, or
621+
y1 == y2, but not both. The varying coordinates may be specified
622+
in any order. For x1 == x2, either y1 > y2 or y1 < y2 is valid.
623+
If the coordinates are not valid BadValue is generated.
624+
625+
Motion is allowed through the barrier in the directions specified:
626+
setting the BarrierPositiveX bit allows travel through the barrier
627+
in the positive X direction, etc. Nonsensical values (forbidding Y
628+
axis travel through a vertical barrier, for example) and excess set
629+
bits are ignored.
630+
631+
If the server supports the X Input Extension version 2 or higher,
632+
the devices element names a set of master device to apply the
633+
barrier to. If XIAllDevices or XIAllMasterDevices are given, the
634+
barrier applies to all master devices. If a slave device is named,
635+
BadDevice is generated; this does not apply to slave devices named
636+
implicitly by XIAllDevices. Naming a device multiple times is
637+
legal, and is treated as though it were named only once. If a
638+
device is removed, the barrier continues to apply to the remaining
639+
devices, but will not apply to any future device with the same ID
640+
as the removed device. Nothing special happens when all matching
641+
devices are removed; barriers must be explicitly destroyed.
642+
643+
Errors: IDChoice, Window, Value, Device
644+
645+
DestroyPointerBarrier
646+
647+
barrier: BARRIER
648+
649+
Destroys the named barrier.
650+
651+
Errors: Barrier
652+
569653
99. Future compatibility
570654

571655
This extension is not expected to remain fixed. Future changes will

Diff for: X11/extensions/xfixesproto.h

+33
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright 2010 Red Hat, Inc.
34
*
45
* Permission is hereby granted, free of charge, to any person obtaining a
56
* copy of this software and associated documentation files (the "Software"),
@@ -500,6 +501,38 @@ typedef struct {
500501

501502
#define sz_xXFixesShowCursorReq sizeof(xXFixesShowCursorReq)
502503

504+
/*************** Version 5.0 ******************/
505+
506+
#define Barrier CARD32
507+
508+
typedef struct {
509+
CARD8 reqType;
510+
CARD8 xfixesReqType;
511+
CARD16 length B16;
512+
Barrier barrier B32;
513+
Window window B32;
514+
INT16 x1 B16;
515+
INT16 y1 B16;
516+
INT16 x2 B16;
517+
INT16 y2 B16;
518+
CARD32 directions;
519+
CARD16 pad B16;
520+
CARD16 num_devices B16;
521+
/* array of CARD16 devices */
522+
} xXFixesCreatePointerBarrierReq;
523+
524+
#define sz_xXFixesCreatePointerBarrierReq 28
525+
526+
typedef struct {
527+
CARD8 reqType;
528+
CARD8 xfixesReqType;
529+
CARD16 length B16;
530+
Barrier barrier B32;
531+
} xXFixesDestroyPointerBarrierReq;
532+
533+
#define sz_xXFixesDestroyPointerBarrierReq 8
534+
535+
#undef Barrier
503536
#undef Region
504537
#undef Picture
505538
#undef Window

Diff for: X11/extensions/xfixeswire.h

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright 2010 Red Hat, Inc.
34
*
45
* Permission is hereby granted, free of charge, to any person obtaining a
56
* copy of this software and associated documentation files (the "Software"),
@@ -47,7 +48,7 @@
4748
#define _XFIXESWIRE_H_
4849

4950
#define XFIXES_NAME "XFIXES"
50-
#define XFIXES_MAJOR 4
51+
#define XFIXES_MAJOR 5
5152
#define XFIXES_MINOR 0
5253

5354
/*************** Version 1 ******************/
@@ -85,8 +86,11 @@
8586
/*************** Version 4 ******************/
8687
#define X_XFixesHideCursor 29
8788
#define X_XFixesShowCursor 30
89+
/*************** Version 5 ******************/
90+
#define X_XFixesCreatePointerBarrier 31
91+
#define X_XFixesDestroyPointerBarrier 32
8892

89-
#define XFixesNumberRequests (X_XFixesShowCursor+1)
93+
#define XFixesNumberRequests (X_XFixesDestroyPointerBarrier+1)
9094

9195
/* Selection events share one event number */
9296
#define XFixesSelectionNotify 0
@@ -111,7 +115,8 @@
111115

112116
/* errors */
113117
#define BadRegion 0
114-
#define XFixesNumberErrors (BadRegion+1)
118+
#define BadBarrier 1
119+
#define XFixesNumberErrors (BadBarrier+1)
115120

116121
#define SaveSetNearest 0
117122
#define SaveSetRoot 1
@@ -124,4 +129,11 @@
124129
#define WindowRegionBounding 0
125130
#define WindowRegionClip 1
126131

132+
/*************** Version 5 ******************/
133+
134+
#define BarrierPositiveX (1L << 0)
135+
#define BarrierPositiveY (1L << 1)
136+
#define BarrierNegativeX (1L << 2)
137+
#define BarrierNegativeY (1L << 3)
138+
127139
#endif /* _XFIXESWIRE_H_ */

Diff for: X11/keysym.h

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ SOFTWARE.
6868
#define XK_CURRENCY
6969
#define XK_MATHEMATICAL
7070
#define XK_BRAILLE
71+
#define XK_SINHALA
7172

7273
#include <X11/keysymdef.h>
7374

0 commit comments

Comments
 (0)