author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Mon, 11 Apr 2011 11:04:15 -0700 | |
changeset 1112 | 4778e9ecf66e |
parent 1064 | 3395ca7a91bf |
child 1265 | 0b5cc5c013e4 |
permissions | -rw-r--r-- |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
############################################################################### |
1064
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
2 |
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
# |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
# Permission is hereby granted, free of charge, to any person obtaining a |
919
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
5 |
# copy of this software and associated documentation files (the "Software"), |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
6 |
# to deal in the Software without restriction, including without limitation |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
7 |
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
8 |
# and/or sell copies of the Software, and to permit persons to whom the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
9 |
# Software is furnished to do so, subject to the following conditions: |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
10 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
11 |
# The above copyright notice and this permission notice (including the next |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
12 |
# paragraph) shall be included in all copies or substantial portions of the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
13 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
14 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
15 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
16 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
17 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
18 |
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
19 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
20 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
688
diff
changeset
|
21 |
# DEALINGS IN THE SOFTWARE. |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
# |
1112
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
23 |
diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
24 |
--- src/Makefile.am 2011-04-06 13:52:16.515334675 -0700 |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
25 |
+++ src/Makefile.am 2011-04-06 13:52:17.726885350 -0700 |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
26 |
@@ -352,6 +352,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbin |
1064
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
27 |
libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined |
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
28 |
libX11_xcb_la_LIBADD = libX11.la |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
|
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
+# SolarisIA extension |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
+libX11_la_SOURCES += XInteractive.c |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
+ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
# |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
34 |
# Figure out which sub-libraries to link into Xlib |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
# |
1112
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
36 |
diff -Nurp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
37 |
--- src/OpenDis.c 2011-04-06 13:52:16.502368856 -0700 |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
38 |
+++ src/OpenDis.c 2011-04-06 13:52:17.727406866 -0700 |
1064
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
39 |
@@ -38,6 +38,12 @@ in this Software without prior written a |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
#include "XKBlib.h" |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
#endif /* XKB */ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
42 |
|
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
+/* begin SUNSOFT_INTERACTIVE */ |
1064
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
44 |
+#include <unistd.h> |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
+#include <X11/extensions/interactive.h> |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
+#include <X11/extensions/XInteractive.h> |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
+/* end SUNSOFT_INTERACTIVE */ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
+ |
1064
3395ca7a91bf
7012962 Update libX11 to 1.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
49 |
#if defined(XTHREADS) && defined(SUNSOFT) |
1112
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
50 |
struct _DisplayPtrLink { |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
51 |
Display *dpy; |
4778e9ecf66e
7035408 Upgrade libX11 to 1.4.3 for deadlock & static analysis fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1064
diff
changeset
|
52 |
@@ -605,6 +611,21 @@ fallback_success: |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
#ifdef XKB |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
XkbUseExtension(dpy,NULL,NULL); |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
#endif |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
+/* begin SUNSOFT_INTERACTIVE */ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
+ { |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
+ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
59 |
+ long pid = (long) getpid(); |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
60 |
+ int majorop, first_event, first_error; |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
61 |
+ int majorv, minorv; |
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
341
diff
changeset
|
62 |
+ |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
63 |
+ if ( (XQueryExtension(dpy, "SolarisIA", |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
64 |
+ &majorop, &first_event, &first_error)==True)) { |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
65 |
+ XSolarisIASetProcessInfo(dpy, (unsigned char *)&pid, |
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
341
diff
changeset
|
66 |
+ INTERACTIVE_INFO, 1); |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
67 |
+ } |
688
ec7ff53634c7
6828047 Update libX11 to version 1.2.1
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
341
diff
changeset
|
68 |
+ } |
341
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
69 |
+/* end SUNSOFT_INTERACTIVE */ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
70 |
+ |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
71 |
/* |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
72 |
* and return successfully |
0a1eb61fd56e
6668846 Upgrade libX11 to X11R7 version
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
73 |
*/ |