1
commit b65c5be170835db2282192381ef411997e61a6f1
2
Author: Peter Hutterer <peter.hutterer@who-t.net>
3
Date: Wed Jun 2 09:27:33 2010 +1000
7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
9
commit 1b71e0a8b9e915c806f6c3596b6ee5913d62fdc3
10
Author: Peter Hutterer <peter.hutterer@who-t.net>
11
Date: Mon May 24 12:25:15 2010 +1000
13
xfree86: fix multiple InputAttributes tag matching.
15
attr->tags is an array of strings (null-terminated). When matching, match
16
against each string instead of each [i,end] substring in the first tag.
18
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
19
Reviewed-by: Jamey Sharp <jamey@minilop.net>
20
Signed-off-by: Keith Packard <keithp@keithp.com>
21
(cherry picked from commit b5e0f6d8f45c5b24eb50b305c66fa80c783ef488)
23
commit f7a2da6df80044bf2d92b0bee94a13f7d76960ad
24
Merge: 2ab11e0 354e4ce
25
Author: Peter Hutterer <peter.hutterer@who-t.net>
26
Date: Tue May 25 15:52:53 2010 +1000
28
Merge branch 'server-1.8-branch' of git://people.freedesktop.org/~alanc/xserver into server-1.8-branch
30
commit 354e4ce3774d6b7f0c571f426bd2db1c8ab272ea
31
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
32
Date: Sat May 22 10:29:00 2010 -0700
34
Add RandR 1.2 README.modes doc to EXTRA_DIST
36
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
37
Reviewed-by: Julien Cristau <jcristau@debian.org>
38
(cherry picked from commit 1805c74d9b0ed46802481bcd6beea5feeb60212c)
40
commit 9a71d21cc27c7b0d35bae9d6dc4eed591dea99a4
41
Author: Aaron Zang <Aaron.Zang@Sun.COM>
42
Date: Thu May 20 17:56:28 2010 -0700
44
Solaris: Use VT_SET_CONSUSER ioctl to set Console User rights profile
46
When Xorg is started on display :0, this ioctl is called to grant the
47
user the rights traditionally associated with /dev/console (before VT
48
support was added), such as access to local peripheral devices.
50
Also adds a Solaris-specific -C flag to force starting on /dev/console
51
instead of /dev/vt*, allowing programs like xterm -C to access the
54
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
55
Reviewed-by: Adam Jackson <ajax@redhat.com>
56
Signed-off-by: Keith Packard <keithp@keithp.com>
57
(cherry picked from commit 989db930d739483759087b13b8d9a043299feafb)
59
commit a8d40f61bf42a55fbd4fcd6468c94cb595e490cc
60
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
61
Date: Thu May 20 17:56:26 2010 -0700
63
Xserver(1) man page updates
65
- Note that -br is now default.
66
- Move -bs after -br for alphabetical ordering.
67
- Remove -config option that's been hidden in "ignore" section,
68
since ajax removed the -config code a couple years back.
69
- Add -nocursor option.
70
- Add xinput & xrandr to list of runtime server control programs
71
- Replace XDarwin with Xquartz in list of Xservers
73
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
74
Reviewed-by: Adam Jackson <ajax@redhat.com>
75
Signed-off-by: Keith Packard <keithp@keithp.com>
76
(cherry picked from commit 7b09335a46f9428141811230c69eef7968531359)
78
commit 2ab11e09734dec4f119166fa6512eb25b4572e48
79
Author: Peter Hutterer <peter.hutterer@who-t.net>
80
Date: Fri May 21 13:30:25 2010 +1000
82
dix: remove obsolete comment.from EnableDevice.
84
The code this comment was referring to was removed in
85
8b5086250aa5dae8de8b763408ff480d7beac819 "Eliminate bogus event resizing."
87
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
88
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
89
Signed-off-by: Keith Packard <keithp@keithp.com>
90
(cherry picked from commit cf4f3d051858aadedd6e333bb317a1daa3987ad7)
92
commit 869d37721425d219c50962b694c3326407d1d2e6
93
Author: Jamey Sharp <jamey@minilop.net>
94
Date: Wed May 19 10:44:33 2010 -0700
96
Device init: Don't crash when CreateGC fails.
98
ActivateDevice was ignoring errors from DeviceCursorInitialize, so
99
cursor-related calls failed later. Jeremy Huddleston saw that crash in
100
miPointerConstrainCursor, while with Xvfb I saw it in
101
miSpriteRealizeCursor.
103
miDCDeviceCleanup frees any non-NULL GCs. miDCDeviceInitialize calls
104
Cleanup on any failure, but if it failed early then some of the pointers
105
in the miDCBufferPtr were garbage. Switch from malloc to calloc to
106
ensure everything's initialized safely first.
108
With these two fixes, if CreateGC fails then the server gracefully fails
109
in FatalError instead of segfaulting.
111
Signed-off-by: Jamey Sharp <jamey@minilop.net>
112
Cc: Peter Hutterer <peter.hutterer@who-t.net>
113
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
114
Signed-off-by: Keith Packard <keithp@keithp.com>
116
(cherry-picked from commit b9f48d60bc0c839bd323c582231e8e7e2b810af6)
118
commit a8de0866130df62c2b1e4653e028a0fe365e0e3a
119
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
120
Date: Tue Mar 23 09:47:08 2010 -0700
122
GLX/DRI2: expose swap control extensions if DDX support is present
124
Export DDX swap control status from the DRI2 module and check for it in
125
GLX when initializing extensions.
127
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
128
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
129
(cherry picked from commit 165a4a9c7de0fcc6ef6a6421736b412ccb35965e)
131
commit b24856626e1836657ebf35ad4c61984e0a407c5b
132
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
133
Date: Mon Mar 8 15:10:47 2010 -0800
135
DRI2: prevent swap wakes from waking MSC waiters
137
If a few swaps were queued leading to a throttle related block on the
138
client, and then the client submitted an MSC wait, one of the previous
139
swap wakeups could have caused the MSC wait to complete early. Add a
140
flag for this to prevent a swap wake from prematurely waking an MSC
143
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
144
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
145
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
146
(cherry picked from commit 5933b0abc6a76aaea84aa534df89900cd795c888)
148
commit 5c54e7fa004532d595160a815177dda467b3cc9c
149
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
150
Date: Mon Mar 8 12:41:25 2010 -0800
152
DRI2: handle swapsPending better
154
Avoid a potential swapsPending underflow by incrementing it before
155
ScheduleSwap, which may complete it immediately. And be sure to
156
decrement it again in case the schedule failed.
158
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
159
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
160
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
161
(cherry picked from commit b00d435ddf2e9817e33bfd5f7e9b905442dc23c7)
163
commit fcd76ddfc59de6a1d37ca2aa6e6e91cb8d814744
164
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
165
Date: Mon Mar 8 12:39:54 2010 -0800
167
DRI2: throttle swaps at submission time too
169
We need to throttle swaps here in addition to when the context is made
170
current to avoid causing problems with clients that just swap.
171
Throttling here also ensures our swaps get ordered as long as we block
172
the client occasionally.
174
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
175
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
176
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
177
(cherry picked from commit 0294ff2a5cadddc8fcc77ba9a851f979f0b91fc3)
179
commit c7e9e36fd3cdb889704d3b0e1333653d06ef9069
180
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
181
Date: Mon Mar 8 12:38:37 2010 -0800
183
DRI2: advertise lowest supported DRI2 protocol version
185
Update our supported DRI2 protocol version as each driver does
186
DRI2ScreenInit, since depending on available kernel features, each DDX
187
may support different callbacks and therefore protocol.
189
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
190
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
191
(cherry picked from commit db1c7cb604167baf49e61be4c09ccf7b592c4af3)
193
commit 20708781d43501f116b4161c1cc96b0eb39e96b1
194
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
195
Date: Fri Mar 5 09:49:03 2010 -0800
197
DRI2: handle swap_interval of 0 correctly
199
A 0 swap interval means that swaps shouldn't be sync'd to vblank, so
200
just complete the swap immediately in that case.
202
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
203
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
204
(cherry picked from commit 87ca6320f26eb3129e3c19056e1d8fa5c1784723)
206
commit 73fe4a0952b5c8aea90bce6f758546c13d0754b5
207
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
208
Date: Fri Mar 5 09:15:24 2010 -0800
210
DRI2: drawable lifetime fixes
212
Handle drawable destruction and lifetime correctly.
214
Check whether the drawable priv is valid in DRI2SwapInterval(),
215
DRI2WaitSBC() and DRI2WaitMSC(); it may have gone away, so be sure to
216
check it before using it.
218
If more than 1 outstanding swap is queued, we may complete several after
219
an app has exited. If we free it after the first one completes and the
220
refcount reaches 0, we'll crash the server on subsequent completions.
221
So delay freeing until all swaps complete and remove the error message
222
as this is a normal occurence. To do this properly, we must also avoid
223
destroying drawables in DRI2DestroyDrawable() if a swap or wait event is
226
And finally, make sure we free drawables in DRI2WaitMSCComplete() if
227
necessary (i.e. if the refcount has reached 0 and this MSC was the last
228
pending event on the object).
230
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
231
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
232
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
233
(cherry picked from commit 8476d99231cb725c090305d60f1c1c889d25c8dc)
235
commit 23d78005b06b15f7b68fc4eed7e325ad29d0880a
236
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
237
Date: Thu Mar 4 10:31:59 2010 -0800
239
DRI2: fix swapbuffers handling of SBC and target MSC
241
Returns expected SBC after completion of swap to caller, as required by
242
OML_sync_control spec, instead of the last_swap_target value.
244
Passes target_msc, divisor, remainder, correctly for
245
glXSwapBuffersMscOML() call, while retaining old behaviour for simple
246
glXSwapBuffers() call.
248
An OML swap can have a 0 target_msc, which just means it needs to
249
satisfy the divisor/remainder equation. Pass this down to the driver as
250
needed so we can support it.
252
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
253
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
254
(cherry picked from commit b180e43977710b56ccfd6780f204ddcc952987a1)
256
commit a56178402ede82ed3ffd81439b2efc4a39f2779e
257
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
258
Date: Sun Feb 21 05:26:00 2010 +0100
260
DRI2WaitSbc(): Fixes for correct semantic of glXWaitForSbcOML()
262
Added implementation for case target_sbc == 0. In that case, the
263
function shall schedule a wait until all pending swaps for the drawable
266
Fix for non-blocking case. Old implementation returned random,
267
uninitialized values for (ust,msc,sbc) if it returned immediately
268
without scheduling a wait due to sbc >= target_sbc.
270
Now if function doesn't schedule a wait, but returns immediately,
271
it returns the (ust,msc,sbc) of the most recently completed swap,
272
i.e., the UST and MSC corresponding to the time when the returned
273
current SBC was reached.
275
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
276
(cherry picked from commit 751e8c09d34df4b41e8d8384a3ec1bf5cb8ca028)
278
commit a9b70da1afe7361955a19d34bb5e9b94dc156889
279
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
280
Date: Sun Feb 21 05:25:59 2010 +0100
282
DRI2: Fix glitches in DRI2SwapComplete() and DRI2WakeupClient()
284
DRI2SwapComplete(): Increment pPriv->swap_count++; before calling
285
into callback for INTEL_swap_events extension, so the swap event
286
contains the current SBC after swap completion instead of the
289
DRI2WakeupClient: Check for pPriv->target_sbc <= pPriv->swap_count,
290
had wrong comparison pPriv->target_sbc >= pPriv->swap_count for
291
unblocking of clients of DRI2WaitSBC().
293
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
294
(cherry picked from commit 0de4974b90b10fa6a447cdf980b4a114c6c9e5a8)
296
commit 96a12314ae41a2edec67d388c1c4770bd099d9ec
297
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
298
Date: Thu Mar 4 09:54:15 2010 -0800
300
DRI2: make target_sbc signed
302
We need to track invalid targets as well as 0 targets, so just make it
303
signed so our comparisons work like they should.
305
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
306
Reported-by: Kristian Høgsberg <krh@bitplanet.net>
307
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
308
(cherry picked from commit 4c8ec49826a46eb3b36c69d2ad3f82320c179c38)
310
commit 18dc5d1f15fe0df7e836b057d34c4ca596e31e8f
311
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
312
Date: Thu Mar 4 09:19:13 2010 -0800
314
DRI2: fixup handling of last_swap_target
316
We need to initialize the swap target, which is passed to the driver to
317
schedule events. Rather than using -1 to indicate that the field is
318
uninitialized, just make sure we initialize it at drawable creation
321
Reviewed-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
322
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
323
(cherry picked from commit c4d54816f2ee4883d8f9bcf4595474fb58c95146)
325
commit 0d9d1e114322878fb50503f69b308b25a812dfb1
326
Merge: 4b7ff07 7be5527
327
Author: Peter Hutterer <peter.hutterer@who-t.net>
328
Date: Tue May 18 14:46:42 2010 +1000
330
Merge branch 'server-1.8-branch' of git://people.freedesktop.org/~jeremyhu/xserver into server-1.8-branch
332
commit 4b7ff07db28ea5302a1965496d1fd71a9d99780e
333
Author: Keith Packard <keithp@keithp.com>
334
Date: Mon May 10 11:46:25 2010 -0700
336
Check pixmap allocation return value when creating glyphs
338
The driver may decide that the pixmap is too large or something and
339
fail to allocate a pixmap; not checking would lead to a segfault.
341
Signed-off-by: Keith Packard <keithp@keithp.com>
342
Reviewed-by: Jamey Sharp <jamey@minilop.net>
343
(cherry picked from commit 87ea5760f86eb60840e6e2c10012915952df5377)
345
commit e789c860a682454fc86032e88b618f255409c33a
346
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
347
Date: Thu Apr 29 18:45:34 2010 -0700
349
Fix compiler issues with getifaddrs() call on OpenSolaris
351
OpenSolaris recently added support for the getifaddrs() API.
353
Building with that uncovered two compiler issues (one warning, one error)
354
in the code that was now being built for the first time in our builds:
356
"access.c", line 768: warning: argument #1 is incompatible with prototype:
357
prototype: pointer to struct sockaddr {unsigned short sa_family, array[14] of char sa_data} : "access.c", line 213
358
argument : pointer to struct sockaddr_storage {unsigned short ss_family, array[6] of char _ss_pad1, double _ss_align, array[240] of char _ss_pad2}
360
"access.c", line 838: assignment type mismatch:
361
struct sockaddr {unsigned short sa_family, array[14] of char sa_data} "=" struct sockaddr_storage {unsigned short ss_family, array[6] of char _ss_pad1, double _ss_align, array[240] of char _ss_pad2}
363
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
364
Reviewed-by: Jamey Sharp <jamey@minilop.net>
365
(cherry picked from commit e42a29d269fadc11e065c63ee369e3165196f2d7)
367
commit 3b6d2b0026f5c37eaeb50441eb2392b9cde962e8
368
Author: Jamey Sharp <jamey@minilop.net>
369
Date: Fri May 14 10:36:13 2010 -0700
371
test/xi2: Initialize predefined atoms before XInputExtensionInit.
373
XInputExtensionInit calls MakeAtom, which doesn't work without the atoms
376
Signed-off-by: Jamey Sharp <jamey@minilop.net>
377
Cc: Peter Hutterer <peter.hutterer@who-t.net>
378
Tested-by: Keith Packard <keithp@keithp.com>
379
Signed-off-by: Keith Packard <keithp@keithp.com>
380
(cherry picked from commit c6613cfc26e76b296e620640bf33e756eb4ae178)
382
commit 3a3edb2c3d63a3849a95c7911612b57c9af6a341
383
Author: Cyril Brulebois <kibi@debian.org>
384
Date: Mon Mar 1 02:11:36 2010 +0100
386
Fix null pointer dereference in xf86_reload_cursors().
388
Upon resume, X may try to dereference a null pointer, which has been
389
reported in Debian bug #507916 (http://bugs.debian.org/507916).
391
Jim Paris came up with a patch which solves the problem for him. Here's
392
a (hopefully) fixed version of his patch (without the typo).
394
Cc: Jim Paris <jim@jtan.com>
395
Signed-off-by: Cyril Brulebois <kibi@debian.org>
396
Reviewed-By: Matthias Hopf <mhopf@suse.de>
397
Signed-off-by: Keith Packard <keithp@keithp.com>
398
(cherry picked from commit fa6c7012572093a82c9389682977efff85590719)
400
commit 6bb86db2eb6e27e06bd2270429a76008af2dcd94
401
Author: Peter Hutterer <peter.hutterer@who-t.net>
402
Date: Fri Apr 16 16:35:22 2010 +1000
404
xfree86: dga needs to use the master keyboard state (#27573)
406
GetPairedDevice() may not always return the keyboard, resulting in a
407
null-pointer dereference when accessing the XKB state.
408
For floating devices, the GetMaster() returns the device itself.
410
X.Org Bug 27573 <http://bugs.freedesktop.org/show_bug.cgi?id=27573>
412
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
413
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
414
Tested-by: Ben Hutchings <ben@decadent.org.uk>
415
(cherry picked from commit 10de9e8ee37265a35ceeceb2007d711da70d4f2d)
417
commit fd562d11d6cbde2b227e524ae2a9ce4e347b944b
418
Author: David James <davidjames@google.com>
419
Date: Mon May 10 14:00:49 2010 -0700
421
Fix wrong bracket values when startOver = FALSE.
423
Currently, SyncComputeBracketValues reuses old values of bracket_greater
424
and bracket_less when startOver = FALSE. This can result in incorrect bracket
425
values. To fix this issue, the startOver parameter is removed, and we do not
426
reuse old values of bracket_greater and bracket_less.
428
X.Org Bug 27023 <http://bugs.freedesktop.org/show_bug.cgi?id=27023>
430
Signed-off-by: David James <davidjames@google.com>
431
Reviewed-by: Adam Jackson <ajax@redhat.com>
432
Signed-off-by: Keith Packard <keithp@keithp.com>
433
(cherry picked from commit 758b8614477b53dc3de2b884fec5ccaf8a736432)
435
commit 4bcc0448b42b06ec133886ccb4f029b57b6f2b3e
436
Author: Jamey Sharp <jamey@minilop.net>
437
Date: Sat May 8 09:41:46 2010 -0700
439
miPolyPoint bugfix: Check memory allocation before changing the GC.
441
miPolyPoint ought to leave the GC unchanged even if it fails. ajax says:
443
> We have a new winner for the oldest-bug competition! It's actually
444
> been like that since X11R1:
446
> -rw-r--r--. 1 ajax ajax 2817 1987-09-12 01:20 ddx/mi/mipolypnt.c
448
Signed-off-by: Jamey Sharp <jamey@minilop.net>
449
Reviewed-by: Adam Jackson <ajax@redhat.com>
450
(cherry picked from commit 4080cd42fde8b4c693eab7557581af2622479109)
452
commit c1e6e7ea968f86f61fd1bfdf4764c57be2a93605
453
Author: Keith Packard <keithp@keithp.com>
454
Date: Mon Apr 26 17:22:12 2010 -0700
456
dmxBERestoreRenderGlyph was passing wrong value to free
458
Signed-off-by: Keith Packard <keithp@keithp.com>
459
Reviewed-by: Jamey Sharp <jamey@minilop.net>
460
Reviewed-by: Matt Turner <mattst88@gmail.com>
461
(cherry picked from commit c0799779dffeef8cef228bdc57aa6c8b323e7485)
463
commit de3275537db09065510ca2a697cbbe184da9f207
464
Author: Matthias Hopf <mhopf@suse.de>
465
Date: Fri May 7 18:46:30 2010 +0200
467
Fix mod() definition.
469
Presumably no implications, especially security-wise.
471
Signed-off-by: Matthias Hopf <mhopf@suse.de>
472
Reviewed-by: Matt Turner <mattst88@gmail.com>
473
Signed-off-by: Keith Packard <keithp@keithp.com>
474
(cherry picked from commit e2e2747f40c4b9e23dba38ea656d4c082e83a794)
476
commit 80547b14a85e4c44631e8b2dc3cd67ccfda7fb43
477
Author: Chris Humbert <freedesktop@mahadri.com>
478
Date: Fri May 7 17:02:43 2010 +1000
480
dix: make DeviceEvent coordinates signed for Xinerama. #24986
482
With Xinerama enabled, event coordinates are relative to Screen 0, so
483
they can be negative. The new DeviceEvent's coordinates are of type
484
uint16_t, making screens above and to the left of Screen 0 unusable.
486
X.Org Bug 24986 <https://bugs.freedesktop.org/show_bug.cgi?id=24986>
488
Signed-off-by: Chris Humbert <freedesktop@mahadri.com>
489
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
490
Signed-off-by: Keith Packard <keithp@keithp.com>
491
(cherry picked from commit 21ed660f30a3f96c787ab00a16499e0fb034b2ad)
493
commit 331e9720b5c05e43b8343d5c71d821dee0463c3e
494
Author: Peter Hutterer <peter.hutterer@who-t.net>
495
Date: Fri May 7 16:22:12 2010 +1000
497
Xi: reset the known properties at the end of the server generation.
499
Properties allocated through XIGetKnownProperty() aren't reset on the second
500
server generation but keep the old value. As a result, wrong Atoms are
501
supplied to the driver, resulting in potential data corruption or weird
504
Reproducible by running "xlsatom | grep FLOAT" twice on a plain X server.
505
The second X server generation won't have the FLOAT atom defined anymore,
506
despite the users of this atom not noticing any errors.
508
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
509
Reviewed-by: Julien Cristau <jcristau@debian.org>
510
Signed-off-by: Keith Packard <keithp@keithp.com>
511
(cherry picked from commit 9802839d35aaf788790f1d0e8300db4693a70096)
513
commit dee99e6925c8e51263398bd2c8fb70289dae748c
514
Author: Keith Packard <keithp@keithp.com>
515
Date: Fri Apr 30 16:10:32 2010 -0700
517
Make sure XFixes invisible cursor gets freed on server reset
519
This uses the same hack that dix uses for the rootCursor -- allocate
520
a resource ID for the invisible cursor so that it gets freed at reset
521
time. This also allows us to unconditionally create it during
522
extension initialization; necessary as the privates layout may well be
523
different on subsequent generations.
525
Reviewed-by: Adam Jackson <ajax@redhat.com>
526
Signed-off-by: Keith Packard <keithp@keithp.com>
527
(cherry picked from commit a3f5d30ba61e70b3de8b48754dea32715ba93c40)
529
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
531
commit ede10681c4f9d835fa8af115e349e2fd9feeb697
532
Author: Keith Packard <keithp@keithp.com>
533
Date: Fri Apr 30 12:18:09 2010 -0700
535
Fix cursor ref counting mistakes with sprites and xf86Cursor.c
537
A few cursor value assignments weren't getting correctly ref counted,
538
causing leaks of cursor objects.
540
Reviewed-by: Adam Jackson <ajax@redhat.com>
541
Signed-off-by: Keith Packard <keithp@keithp.com>
542
(cherry picked from commit cdeb2c23f80ced961fe205125547e16905885534)
544
commit 7be55271d090d9c837ee7e1c43c09c76961a7173
545
Author: Jeremy Huddleston <jeremyhu@apple.com>
546
Date: Sun May 16 10:14:02 2010 -0700
548
XQuartz: Fix a build failure on Tiger
550
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
551
(cherry picked from commit 37f0b45dbe4ea52bc127720207c7157b2b803ac0)
553
commit d415f36b8e40d7df94da8910f370fb28004046cf
554
Author: Jeremy Huddleston <jeremyhu@apple.com>
555
Date: Sun May 16 10:03:13 2010 -0700
557
XQuartz: Don't use deltaXY for determining pointer location on scroll events
559
<rdar://problem/7989690>
561
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
562
Reviewed-by: Edward Moy <emoy@apple.com>
563
(cherry picked from commit ecfeabec8d0dcfe286fb893047f1fe1a7ea9f8f5)
565
commit aad87519b8bd6983a28d537eec4fb15570da73b5
566
Author: Jeremy Huddleston <jeremyhu@apple.com>
567
Date: Sat May 15 10:53:09 2010 -0700
569
XQuartz: Don't trust deltaXY for middle mouse clicks.
571
The middle mouse clicks return erroneous values after returning from
574
<rdar://problem/7979468>
575
http://xquartz.macosforge.org/trac/ticket/389
577
Signed-off-by: Martin Otte <otte@duke.edu>
578
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
579
Reviewed-by: Edward Moy <emoy@apple.com>
580
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
581
(cherry picked from commit a911292c85f7069d2caabcb677ed716a04227526)
1
583
commit afd730f57fa1cd3e10ac47666bd6739016d60d55
2
584
Author: Peter Hutterer <peter.hutterer@who-t.net>
3
585
Date: Tue May 11 13:55:55 2010 +1000