1
commit bc3c539e8a2b0b95a19e40258bcb18824d7700cd
2
Author: Jeremy Huddleston <jeremyhu@apple.com>
3
Date: Fri Jul 1 11:34:08 2011 -0700
5
configure.ac: Bump version to 1.10.2.902 (1.10.3 RC2)
7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
9
commit 79ef102c3adf7cae8982b05320109d0439e6587c
10
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
11
Date: Mon Jun 27 15:06:16 2011 +0100
13
Guard use of backtrace() with HAVE_BACKTRACE
15
Guard the use of backtrace() with HAVE_BACKTRACE, since we already
16
have the autoconf machinery for setting that.
18
For the moment, assume dladdr() is available when backtrace() is
20
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
21
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
22
(cherry picked from commit 38d55f06cfbf4b05fee0aef8f97f90e835beaacb)
24
commit f0ee98584c909b503691d72c01f76602d0a28ba2
25
Author: Jeremy Huddleston <jeremyhu@apple.com>
26
Date: Tue Jun 21 21:14:46 2011 -0700
28
XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
30
In addition, this change will not call into the X11 activation unless an X11
31
window was active when we deactivated. We can't rely on the event and current
32
key windows because the key window will be nil until activated, and the event
33
will only reference the window if the window was clicked (whereas it will be
34
nil if we activated via dock or cmd-tab).
36
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
37
(cherry picked from commit c8b80a82d97d92d445c1c0af6dba42c9de7c56cd)
39
commit 1834e82b42a876195d12dda28c80004d37c4fa0c
40
Author: Cyril Brulebois <kibi@debian.org>
41
Date: Tue May 24 18:33:11 2011 +0200
43
Xext: Fix buggy checks.
45
XvMCScreenKey is defined as XvMCScreenKeyRec's address, so will never be
46
NULL. Use the check proposed by Alan Coopersmith and Jeremy Huddleston
49
Those warnings go away accordingly:
51
| xvmc.c: In function 'ProcXvMCListSubpictureTypes':
52
| xvmc.c:490:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
53
| xvmc.c: In function 'XvMCExtensionInit':
54
| xvmc.c:671:21: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
55
| xvmc.c: In function 'XvMCFindXvImage':
56
| xvmc.c:749:22: warning: the comparison will always evaluate as 'false' for the address of 'XvMCScreenKeyRec' will never be NULL [-Waddress]
58
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
59
Signed-off-by: Cyril Brulebois <kibi@debian.org>
60
(cherry picked from commit 9da5aa09d70e26dd4d2ef878a21317dae7bf24de)
62
commit 9fab8b475de99848866c07bde962a5f6ed01b987
63
Author: Peter Hutterer <peter.hutterer@who-t.net>
64
Date: Fri Apr 15 14:06:20 2011 +1000
66
input: Only release SD buttons for explicit floating/reattachment (#36146)
68
Grabbing an SD device temporary floats the device but we must not release
69
the buttons. Introduced in
71
commit 9d23459415b84606ee4f38bb2d19054c432c8552
72
Author: Peter Hutterer <peter.hutterer@who-t.net>
73
Date: Fri Feb 25 11:08:19 2011 +1000
75
dix: release all buttons and keys before reattaching a device (#34182)
77
X.Org Bug 36146 <http://bugs.freedesktop.org/show_bug.cgi?id=36146>
79
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
80
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
81
(cherry picked from commit bf2059b07a97e5e579c13c2c9d49707093427dc2)
87
commit 160a412e36fd945119e4c10f5d22682fcd0cc637
88
Author: Peter Hutterer <peter.hutterer@who-t.net>
89
Date: Fri Feb 25 11:08:19 2011 +1000
91
dix: release all buttons and keys before reattaching a device (#34182)
94
xinput float <keyboard name>
96
results in the keyboard's enter key being repeated as the device is detached
97
while the key is still physically down. To avoid this, release all keys and
98
buttons before reattaching the device.
100
X.Org Bug 34182 <http://bugs.freedesktop.org/show_bug.cgi?id=34182>
102
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
103
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
104
(cherry picked from commit 9d23459415b84606ee4f38bb2d19054c432c8552)
105
(cherry picked from commit 81fbb96c54f78a7cd96433294ee003c7ef6a772a)
107
commit c9336d13a6b231edf16412706c52318947fcd000
108
Author: Jeremy Huddleston <jeremyhu@apple.com>
109
Date: Fri Jun 17 10:11:15 2011 -0700
111
configure.ac: Bump version to 1.10.2.901 (1.10.3 RC1)
113
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
115
commit 0abfba08a080747b1a6310c19f3bea74a6460363
116
Author: Jeremy Huddleston <jeremyhu@apple.com>
117
Date: Thu Jun 2 20:04:04 2011 -0700
119
XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch table
121
This will allow XQuartz built on older systems to pickup capabilities on
122
newer systems and prevent runtime failures when building on newer systems and
123
running on older ones.
125
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
127
This commit squashes three cherry-picks:
128
(cherry picked from commit 3fa5d27e46ea8af55dcaaad7a99973c38bd11967)
129
(cherry picked from commit feab04397de2684568dedaaaa8f299cac9f44f8b)
130
(cherry picked from commit 34e2598f0ad247071bd6a4312d9014d6e3b2305a)
132
commit 830239ae4271a264e3fd4f1151de271f59b4d9fa
133
Author: Jeremy Huddleston <jeremyhu@apple.com>
134
Date: Tue Jun 14 12:51:04 2011 -0700
136
glx: Add _glapi_create_table_from_handle
138
_glapi_create_table_from_handle was recently added to mesa to ease creation of
139
a _glapi_table. This commit brings this API over to xserver for use in
140
XQuartz (next commit).
142
The API was generated with scripts from current mesa followed by various
143
script-foo to remove entries that are not in the server and add those which
144
are still in the server but not in mesa (CullParameterdvEXT and
147
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
148
Reviewed-by: Adam Jackson <ajax@redhat.com>
149
(cherry picked from commit ecec578e35f91a2cbc5d07bc8d45241af7bb585f)
151
commit b9e5f94e3ca5f93f228393fd599ef35f8fc71fe1
152
Author: Jeremy Huddleston <jeremyhu@apple.com>
153
Date: Sun Jun 5 21:59:13 2011 -0400
155
XQuartz: Add missing include for <pthread.h>
157
BuildFix for Leopard and earlier.
159
https://trac.macports.org/ticket/29717
161
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
162
(cherry picked from commit c3df4df40761760b281a21f63336ca955670f7bc)
164
commit 9551f5041915fa00ca243a279efb55de2ff11a00
165
Author: Peter Hutterer <peter.hutterer@who-t.net>
166
Date: Tue May 31 14:48:33 2011 +1000
168
dix: fix an error message.
170
event type, not device type.
172
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
173
(cherry picked from commit f94898928dfaf8df648bc3eea7d304826b7ac1b8)
179
commit 75f75d12cf69ba9b7f14ddf04338ad2df7315550
180
Author: Peter Hutterer <peter.hutterer@who-t.net>
181
Date: Thu May 19 14:50:17 2011 +1000
183
test: don't test for double alignment on i386. (#36986)
185
i386 is one of the few architectures that doesn't need double alignment.
187
X.Org Bug 36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986>
189
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
190
(cherry picked from commit 8ef0974874f322e3ce2f3e6be4ab3c7e73a7b380)
196
commit 2647867c7c8e12fac29b4bd9805efb40d6d87c70
197
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
198
Date: Sun May 22 13:50:14 2011 -0700
200
fbbltone.c: Mark bitmasks as unsigned ints
202
Clears many Sun compiler warnings:
203
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
204
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
205
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
206
"fbbltone.c", line 491: warning: initializer will be sign-extended: -16777216
207
"fbbltone.c", line 491: warning: integer overflow detected: op "<<"
208
"fbbltone.c", line 491: warning: initializer will be sign-extended: -1
209
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
210
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
211
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
212
"fbbltone.c", line 495: warning: initializer will be sign-extended: -256
213
"fbbltone.c", line 495: warning: integer overflow detected: op "<<"
214
"fbbltone.c", line 495: warning: initializer will be sign-extended: -1
215
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
216
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
217
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
218
"fbbltone.c", line 499: warning: initializer will be sign-extended: -65536
219
"fbbltone.c", line 499: warning: integer overflow detected: op "<<"
220
"fbbltone.c", line 499: warning: initializer will be sign-extended: -1
222
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
223
Reviewed-by: Jamey Sharp <jamey@minilop.net>
224
Signed-off-by: Keith Packard <keithp@keithp.com>
225
(cherry picked from commit 1b2d17748f0154da142e9b421d4f6a46e4e5a18c)
227
commit caaf263b93b17367a96483dec73573415ead9b14
228
Author: Nicolas Kaiser <nikai@nikai.net>
229
Date: Mon Jun 6 16:53:41 2011 +0200
231
randr: void function cannot return value
233
Providing an argument to return in a function with void return type
234
is not allowed by the C standard, and makes the Sun compilers unhappy.
236
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
237
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
238
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
239
Signed-off-by: Keith Packard <keithp@keithp.com>
240
(cherry picked from commit 21eec367d0d9c142458f973062e17add4f693033)
242
commit fe4af41314a6537b3fcc66955ccb6895639738b1
243
Author: Peter Hutterer <peter.hutterer@who-t.net>
244
Date: Wed Jun 1 10:24:43 2011 +1000
246
test: fix memset size for WindowRec (#37801)
248
X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
250
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
251
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
252
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
253
Reviewed-by: Cyril Brulebois <kibi@debian.org>
254
Signed-off-by: Keith Packard <keithp@keithp.com>
255
(cherry picked from commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda)
257
commit a4725afa0e77e9fcf6570001dc0de23a7a9ee6cb
258
Author: Jeremy Huddleston <jeremyhu@apple.com>
259
Date: Tue May 31 13:01:05 2011 -0700
261
XQuartz: GLX: Create a new dispatch table rather than modifying the existing one
263
Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
265
0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
266
1 X11.bin 0x00000001001315b0 DoCreateContext + 163
267
2 X11.bin 0x000000010013509f __glXDispatch + 211
268
3 X11.bin 0x00000001000c7dad Dispatch + 785
269
4 X11.bin 0x00000001000b97e5 dix_main + 1022
270
5 X11.bin 0x00000001000122bc server_thread + 50
271
6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
272
7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
274
http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
276
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
277
Reviewed-by: Adam Jackson <ajax@redhat.com>
278
(cherry picked from commit 38df706c6b8a339c4267cae7be0881c4362f36da)
280
commit 6a16c4c268962fd09a52e4e78116aaa3bb1c47d5
281
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
282
Date: Wed Jun 1 21:42:07 2011 -0700
284
"privates.h", line 198: warning: void function cannot return value
286
Providing an argument to return in a function with void return type
287
is not allowed by the C standard, and makes the Sun compilers unhappy.
288
(They actually flag it as an error, unless using a new enough version
289
to be able to downgrade it to a warning with "-features=extensions".)
291
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
292
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
293
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
294
Reviewed-by: Cyril Brulebois <kibi@debian.org>
295
(cherry picked from commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf)
297
commit 5752cc473648bf73f9ca71b7ccffc03b23e9195b
298
Author: Marko Macek <Marko.Macek@gmx.net>
299
Date: Sat May 21 13:30:59 2011 +0100
301
DIX: Set backgroundState correctly for root window
303
When we change the root window's background to None, and we've run with
304
-wr or -br for a forced solid background, make sure we also change the
305
background state to BackgroundPixel, so we don't try to lookup either
306
pScreen->whitePixel or pScreen->blackPixel as a pixmap.
308
Signed-off-by: Marko Macek <Marko.Macek@gmx.net>
309
Reviewed-by: Walter Harms <wharms@bfs.de>
310
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
311
Signed-off-by: Keith Packard <keithp@keithp.com>
312
(cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a)
314
commit 4bfb22e7667c4cd55da5e7a31af29ce5769ecc65
315
Author: Aaron Plattner <aplattner@nvidia.com>
316
Date: Mon Apr 18 08:23:48 2011 -0700
318
linux: Retry VT ioctls while errno == EINTR
320
When the smart scheduler is enabled, the VT ioctls (particularly
321
VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs.
322
Previously, this caused the server to immediately continue on to
323
ScreenInit, almost certainly causing a crash or failure because the X
324
server that owned the VT hadn't finished cleaning up. As of commit
325
7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError
328
Retrying the ioctl as long as it fails with errno == EINTR fixes the
329
problem and allows server regenerations to trigger VT switches that
332
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
333
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
334
Reviewed-by: Cyril Brulebois <kibi@debian.org>
335
Signed-off-by: Keith Packard <keithp@keithp.com>
336
(cherry picked from commit 88c4622b594a1725d0cee86bc82ad640d241c520)
338
commit 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd
339
Author: Aaron Plattner <aplattner@nvidia.com>
340
Date: Tue May 24 16:02:42 2011 -0700
342
randr: check rotated virtual size limits correctly
344
Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
345
the RandR path that cause RRSetScreenConfig requests to fail if the
346
size is too large. Unfortunately, when RandR 1.1 rotation is enabled
347
it compares the rotated screen dimensions to the unrotated limits,
348
which causes 90- and 270-degree rotation to fail unless your screen
349
happens to be square:
351
X Error of failed request: BadValue (integer parameter out of range for operation)
352
Major opcode of failed request: 153 (RANDR)
353
Minor opcode of failed request: 2 (RRSetScreenConfig)
354
Value in failed request: 0x780
355
Serial number of failed request: 14
356
Current serial number in output stream: 14
358
Fix this by moving the check above the code that swaps the dimensions
359
based on the rotation.
361
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
362
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
363
Tested-by: Robert Hooker <robert.hooker@canonical.com>
364
Tested-by: Kent Baxley <kent.baxley@canonical.com>
365
Signed-off-by: Keith Packard <keithp@keithp.com>
366
(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3)
368
commit 613e0e9ef74c4542ed458200165adbcdfdf3cd17
369
Author: Jeremy Huddleston <jeremyhu@apple.com>
370
Date: Wed Apr 13 11:51:30 2011 -0700
372
Send events that were missing from RRSelectInput
374
The RANDR spec (randrproto.txt) specifies that RRSelectInput will send out
375
events corresponding to the event mask, if there have been changes to
376
CRTCs or outputs. Only screen events were being generated, however.
378
Fixes http://bugs.freedesktop.org/21760
380
Signed-off-by: Federico Mena Quintero <federico@novell.com>
381
Reviewd-by: Keith Packard <keithp@keithp.com>
382
Signed-off-by: Keith Packard <keithp@keithp.com>
383
(cherry picked from commit b2997431fd426ab318bc5dfd2cd43956d733ebec)
1
385
commit d784fd09dc277610d5f4e98d577c4fdcd9215f9c
2
386
Author: Jeremy Huddleston <jeremyhu@apple.com>
3
387
Date: Sat May 28 16:59:05 2011 -0700
added
removed
ChangeLog
