andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,888 Commits 86 Branches 473 Tags 48 MiB
a4069c94a6
Commit Graph

3888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Huddleston
a4069c94a6 1.4.0-apple1 2008-02-15 23:16:11 -08:00
Jeremy Huddleston
1b22192e50 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-02-13 23:48:02 -08:00
Jeremy Huddleston
b3eabf13af XQuartz: Fixed layout of Applications->Customize menu 
Now resizing it won't produce weir overlaps of the widgets.  Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d)
 2008-02-11 12:10:55 -08:00
Jeremy Huddleston
407f7fec88 XQuartz: Added option for setting quartz-wm click-through preference 
(cherry picked from commit bf54c267cb)
 2008-02-10 18:30:34 -08:00
Jeremy Huddleston
fb52ef7c86 XQuartz: Converted interface to nib 3.x format 
(cherry picked from commit 656aaab957)
 2008-02-10 18:30:28 -08:00
Peter Hutterer
bc72ef3a15 xkb: don't update LEDs if they don't exist. (Bug #13961) 
In some weird cases we call this function when there is no SrvLedInfo on the
device. And it turns out null-pointer dereferences are bad.

X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
(cherry picked from commit d954f9c803)
 2008-01-31 11:39:10 +11:00
Peter Hutterer
e98027c3ac dix: set the correct number of valuators in valuator events. 
(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
(cherry picked from commit 9f6ae61ad1)
 2008-01-29 14:46:30 +11:00
Jeremy Huddleston
b6aa41b56b Rootless: RootlessEnsureFrame: Added check for !IsRoot 
This was causing an issue with Apple-DRI and was reported here:
http://trac.macosforge.org/projects/xquartz/ticket/51
(cherry picked from commit 116800279d)
 2008-01-28 12:25:24 -08:00
Adam Jackson
b6d4cdf64f CVE-2007-6429: Don't spuriously reject <8bpp shm pixmaps. 
Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
protected from overflow by the width and height checks.
(cherry picked from commit e9fa7c1c88)
 2008-01-18 21:01:32 +01:00
Jeremy Huddleston
d6e234f96d Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-01-17 09:48:14 -08:00
Matthieu Herrb
19b95cdd1d Fix for CVE-2007-5958 - File existence disclosure. 2008-01-17 17:03:39 +01:00
Matthieu Herrb
f09b8007e7 Fix for CVE-2008-0006 - PCF Font parser buffer overflow. 2008-01-17 17:02:52 +01:00
Matthieu Herrb
8b14f7b742 Fix for CVE-2007-6429 - MIT-SHM and EVI extensions integer overflows. 2008-01-17 17:02:36 +01:00
Matthieu Herrb
d244c8272e Fix for CVE-2007-6427 - Xinput extension memory corruption. 2008-01-17 17:02:04 +01:00
Matthieu Herrb
4848d49d05 Fix for CVE-2007-6428 - TOG-cup extension memory corruption. 2008-01-17 17:00:22 +01:00
Matthieu Herrb
59a3b83922 Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index 2008-01-17 17:00:06 +01:00
Daniel Stone
636aa9e7be Xephyr: One-time keyboard leak fix 
Don't leak the originally-allocated keysym map.
(cherry picked from commit e85130c85f)
 2008-01-17 18:43:30 +11:00
Daniel Stone
8a3acd3ec4 XKB: XkbCopyKeymap: Don't leak all the sections 
Previously, we'd just keep num_sections at 0, which would break the
geometry and lead us to leak sections.  Don't do that.
(cherry picked from commit 0137b0394a)
 2008-01-17 18:43:27 +11:00
Daniel Stone
02e805f0ff OS: IO: Zero out client buffers 
For alignment reasons, we can write out uninitialised bytes, so allocate
the whole thing with xcalloc.
(cherry picked from commit b99a43dfe9)
 2008-01-17 18:43:24 +11:00
Jeremy Huddleston
7429379eb1 XQuartz: Moved SetFrontProcess haco to set_front_process 
So it is done by the other thread...
 2008-01-13 14:00:25 -08:00
Jeremy Huddleston
a459dde0b4 XQuartz: Fixed copy-paste error with login_shell commit 
(cherry picked from commit 6deec3acc6)
 2008-01-12 21:34:13 -08:00
Jeremy Huddleston
7899c5bebf XQuartz: Corrected copyright X.org Project -> X.org Foundation 
(cherry picked from commit f216314448)
 2008-01-12 12:01:22 -08:00
Jeremy Huddleston
95a103bc60 XQuartz: added 'login_shell' option to defaults 
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce)
 2008-01-12 12:01:10 -08:00
Jeremy Huddleston
627ed60ce5 XQuartz: Fixed switching into XQuartz via expose. 2008-01-06 18:29:54 -08:00
Jeremy Huddleston
4c5c30a4be XQuartz: Cleanup for strict-prototyping 
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
 2008-01-05 03:14:07 -08:00
Jeremy Huddleston
fab82c097c XQuartz: Fixed copyright in About box for 2008. Happy New Year! 2008-01-04 22:51:12 -08:00
Jeremy Huddleston
4790016cc2 XQuartz: Flush the debug log for easier debugging 
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42)
 2008-01-04 21:27:31 -08:00
Jeremy Huddleston
c9dff90ce8 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-01-03 13:26:22 -08:00
Jeremy Huddleston
8e4c28ec2a XQuartz: Cleaned up color map configuration. 
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27)
 2008-01-03 13:25:48 -08:00
Peter Hutterer
60144ac814 include: never overwrite realInputProc with enqueueInputProc. Bug #13511 
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.

This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.

This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
(cherry picked from commit eace88989c)
(cherry picked from commit 50e80c3987)
 2007-12-29 00:14:12 +02:00
Daniel Stone
102c012c20 Input: Don't reinit devices 
If a device is already initialised (i.e. the virtual core devices) during
IASD, don't init them again.  This fixes a leak.
(cherry picked from commit 1f6015c8fe62c28cfaa82cc855b5b9c28fd34607)
 2007-12-28 15:51:05 +02:00
Daniel Stone
a304fc1d4a KDrive: Xephyr: Don't leak screen damage structure 
(cherry picked from commit 0b03d97a244540824c922c300adbc3d3ae4855d5)
 2007-12-28 15:51:00 +02:00
Daniel Stone
38d8cfaaff OS: Don't leak connection translation table on regeneration 
(cherry picked from commit e868e0bc0d2318e62707d3ae68532b0029959154)
 2007-12-28 15:50:56 +02:00
Daniel Stone
30fc8053a5 Config: HAL: Don't leak options on failure to add device 
This showed up in Xephyr in particular, which denies new device requests.
(cherry picked from commit 2bb199056edf6c63cf978d1a8ad49a57ce1938f3)
 2007-12-28 15:50:52 +02:00
Daniel Stone
81c5950d0a Config: D-Bus: Don't leak timers 
TimerCancel doesn't free the timer: you need TimerFree for that.
(cherry picked from commit 25deaa7e6b29b3913b35efa39b9c8b25de5e6d95)
 2007-12-28 15:50:49 +02:00
Jeremy Huddleston
61cc57c510 XQuartz: *REALLY* use CFStringCreateWithCString 
I need sleep!  Why am I making these stupid mistakes... sorry for pointless commit spam.  ugg.
(cherry picked from commit b16351fc64)
 2007-12-21 02:09:43 -08:00
Jeremy Huddleston
6562b8d4f7 XQuartz: Use CFStringCreateWithCString 
(cherry picked from commit 79782b0e14)
 2007-12-21 02:07:03 -08:00
Jeremy Huddleston
628c9c708a XQuartz: Reduce code duplication in X11.app 
(cherry picked from commit b81809cd91)
 2007-12-21 01:57:59 -08:00
Jeremy Huddleston
b585e48cff XQuartz: Handle Pseudorami init in miinitext 
(cherry picked from commit a585c94fed)
 2007-12-21 01:24:31 -08:00
Jeremy Huddleston
60d28ff8df XQuartz: Added localization. 
(cherry picked from commit 7a5cc7bfbb)
 2007-12-20 19:38:42 -08:00
Jeremy Huddleston
9f5507a3c5 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2007-12-20 19:04:33 -08:00
Jeremy Huddleston
82c97a5475 XQuartz: Cleaned up command line arguments. 
(cherry picked from commit 603a8b73d4)
 2007-12-20 18:30:09 -08:00
Jeremy Huddleston
2a3f6ce7e8 XQuartz: Kill off server-main.c and launcher-main.c 
Now using xinit
(cherry picked from commit 5d6ae3d299)
 2007-12-20 18:09:19 -08:00
Jeremy Huddleston
ea716249c3 XQuartz: Don't fork to exec app_to_run. 
Plus other housecleaning...
(cherry picked from commit ae302db472)
 2007-12-20 17:35:51 -08:00
Jeremy Huddleston
47a5869ba3 Xquartz: Use X11ControllerMain() 
(cherry picked from commit a9ac932543)
 2007-12-20 15:46:54 -08:00
Jeremy Huddleston
be027ea7ea Xquartz: General Cleanup 
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4)
 2007-12-20 13:17:56 -08:00
Ben Byer
17c0ad3d95 adding default prefix to autogen script 2007-12-16 04:20:24 -08:00
Ben Byer
88f289dd1c adding AM_OBJCFLAGS 2007-12-16 04:20:24 -08:00
Jeremy Huddleston
39b20011b7 Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit. 
(cherry picked from commit 767b4c9d9d)
 2007-12-16 01:14:47 -08:00
Jeremy Huddleston
641227883c Xquartz: Fixed launchd detection 2007-12-15 14:00:56 -08:00