Commit graph

7234 commits

Author SHA1 Message Date
Jeremy Huddleston
a7b1c99aca XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5)
2009-08-05 16:17:32 -07:00
Jeremy Huddleston
cf5d382563 XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine.  It *should* be better the other way, but somehow it's not.

I guess this will go in my list of puzzles to unravel.
(cherry picked from commit 65ae2d00e1)
2009-08-05 16:17:21 -07:00
Jeremy Huddleston
c9cc8f2e3f XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7)
2009-08-05 16:16:26 -07:00
Jeremy Huddleston
b88623502b XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20)
2009-08-05 16:16:12 -07:00
Jeremy Huddleston
1bec11c732 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-08-05 16:15:58 -07:00
Keith Packard
f274e595ed Bump release number to 1.6.3
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-31 23:37:53 -07:00
Jeremy Huddleston
869e60d2ce XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27)
2009-07-31 15:33:46 -07:00
Jeremy Huddleston
1c983175f6 XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87)
2009-07-31 15:33:40 -07:00
Jeremy Huddleston
ec16bf8ee5 XQuartz: Cleanup the bitmask setting for GLX visuals.
(cherry picked from commit d32c3df258)
2009-07-31 15:33:34 -07:00
Jeremy Huddleston
536acc25ee XQuartz: no DirectColor
(cherry picked from commit df2fbc410f)
2009-07-31 15:33:28 -07:00
Jeremy Huddleston
01a1b79e98 XQuartz: Define DDXRingBell
(cherry picked from commit 1133473812)
2009-07-31 15:33:21 -07:00
Alan Coopersmith
55dcfdbbd6 Remove hardcoded gcc -Wall option from configure.ac
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 442967c90d)
2009-07-29 15:51:08 -07:00
Adam Jackson
4d349b6c33 selinux: Only activate if policy says to be an object manager
(cherry picked from commit 283a081572)
2009-07-29 15:50:06 -07:00
Ben Skeggs
d0875154f4 quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 048697ccfa)
2009-07-29 15:49:52 -07:00
Rémi Cardona
c941479ecc config: add HAL error checks
This patch simplifies error handling in the HAL code and fixes a
segfault if libhal_find_device_by_capability() failed.

Fixes http://bugs.gentoo.org/278760

Based on a patch by Martin von Gagern <Martin.vGagern@gmx.net>

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b1c3dc6ae2)
2009-07-29 15:49:36 -07:00
Alan Coopersmith
546f913ff5 Don't printf NULL pointers on HAL connection error
Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running
http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 1e816065e5)
2009-07-29 15:49:23 -07:00
Jeremy Huddleston
1439f9f967 XQuartz: Avoid a possible spinlock in applicationWillTerminate
(cherry picked from commit f430cda0fd)
2009-07-28 22:53:34 -07:00
Jeremy Huddleston
05897fe663 XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a6)
2009-07-28 22:53:33 -07:00
Keith Packard
155cb2f9a3 Bump to version 1.6.2.901 (1.6.3 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 14:22:35 -07:00
Dave Airlie
87900645c2 xfree86: move didLock assignment down to where the function pointer is valid.
crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so
it's actually defined before we use it.

Introduced with 6f59a81600.

Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 0de58c88ab)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Benjamin Defnet
72c9bc64ff randr: fix operation order so that rotation+transform works
The matrix multiply to combine rotation and projective transforms was being
done in the wrong order.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit b2bf67b61c)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Benjamin Defnet
7f95d18397 hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_major
This moves code out of each implementation of set_mode_major and back into
the X server. The real feature here is that the transform is now available
in the crtc for use by either xf86CrtcRotate or whatever the driver wants to
do. Without this change, the transform was lost for drivers providing the
set_mode_major interface.

Note that users of this API will want to stop smashing the transformPresent
field, and could also stop setting mode/x/y/rotation for new enough X servers,
but there's no reason to make that change as it will break things when
running against older X servers.

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 6f59a81600)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Matthias Hopf
abc89e2c48 randr: Nuke broken set_origin shortcut
Shortcut is impossible to implement this way, because we don't know for sure
whether the crtc of an output has changed or not.
(cherry picked from commit cadf65a6e1)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Julien Cristau
b1eed8970f randr: fix server crash in RRGetScreenInfo
We don't return rates to randr < 1.1 clients, so don't allocate space
for them.  This fixes a FatalError due to not all allocated space being
used.

X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861>

Reported-by: Guillaume Quintin <coincoin169g@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 12e725d08b)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Keith Packard
1addf6fe23 Replace dixLookupResource by dixLookupResourceBy{Type,Class}
dixLookupResource attempted to automatically detect whether the caller
wanted a lookup by-type or by-class, unfortunately, it guessed wrong for
RT_NONE. Instead of trying to make the guess better, this patch just reverts
the unification and creates separate functions for each operation.
(cherry picked from commit f8dd80d13b)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Robert Noland
c838a03e89 One = is more than adequate here. Make is sh safe.
(cherry picked from commit b3e3154cce)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:57 -07:00
Rémi Cardona
68cb38bed6 configure: libXinerama isn't needed anymore
since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
server no longer needs libXinerama.

Signed-off-by: Rémi Cardona <remi@gentoo.org>
(cherry picked from commit 2c69deb92e)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:56 -07:00
Michel Dänzer
ec60f4ca65 EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 .
(cherry picked from commit 3575854481)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26 13:56:56 -07:00
Kim Woelders
b10c4fe343 Fix key repeat problem.
Signed-off-by: Kim Woelders <kim@woelders.dk>
2009-07-26 13:56:56 -07:00
Jeremy Huddleston
7351db5c87 XQuartz: Overhaul setting up visuals
The main change is cleanup of the visualConfigs and setting up alpha correctly there to match the visuals being added earlier (so the default visual has a corresponding GLX visual)
2009-07-26 02:32:17 -07:00
Jeremy Huddleston
5ec7d0fee8 1.6.2-apple1 2009-07-25 20:19:57 -07:00
Jeremy Huddleston
9a801d1716 XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard. 2009-07-25 20:06:29 -07:00
Jeremy Huddleston
bcfa6cb2ee Revert "XQuartz: Copy the keyboard map to the core keyboard"
This reverts commit 427e1aab41.
2009-07-25 19:43:29 -07:00
Jeremy Huddleston
bfe0b9cfa7 XQuartz: Use pDev=NULL for DarwinSendDDXEvent
These events aren't really related to physical input devices anyways, so it doesn't make sense to use the pointer.
2009-07-25 19:34:17 -07:00
Jeremy Huddleston
bf60ffb497 mieq: Protect from pDev=NULL in mieqEnqueue and mieqProcessInputEvents 2009-07-25 19:33:06 -07:00
Jeremy Huddleston
23cdc2429e XQuartz: Bump the reported version to X11R7.4
(cherry picked from commit c83f701aa7)
2009-07-25 15:22:43 -07:00
Jeremy Huddleston
a6d056afac XQuartz: xpr: Added missing include for RootlessHideAllWindows
(cherry picked from commit 75e1047308)
2009-07-25 15:22:39 -07:00
Jeremy Huddleston
6fa62192af XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events. 2009-07-25 15:22:01 -07:00
Jeremy Huddleston
427e1aab41 XQuartz: Copy the keyboard map to the core keyboard
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
2009-07-25 14:59:42 -07:00
Jeremy Huddleston
0c504436c6 XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior).  Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bb)
2009-07-24 09:42:16 -07:00
Jeremy Huddleston
210180790a XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac513526)
2009-07-24 09:41:58 -07:00
Jeremy Huddleston
1f011818e8 XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
(cherry picked from commit b2e9a77111)
2009-07-24 09:41:44 -07:00
Jeremy Huddleston
590c0f4050 XQuartz: Added a "Check for X11 Updates..." menu item.
(cherry picked from commit 305144bfa4)
2009-07-24 09:41:27 -07:00
Jeremy Huddleston
3de4574e9d XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be364)
2009-07-20 22:04:13 -07:00
Jeremy Huddleston
c986e70db8 XQuartz: Localization updates
(cherry picked from commit 4b797fc1ed)
2009-07-16 17:30:39 -07:00
Jeremy Huddleston
b589a5cdc2 XQuartz: Cleanup getGlCapabilities to avoid hardcoding the number of displays
(cherry picked from commit 12f7365f1f)
2009-07-16 17:30:34 -07:00
Jeremy Huddleston
c1468ad91a XQuartz: Allow more than 3 OSX displays
(cherry picked from commit 45045eb396)
2009-07-16 17:30:29 -07:00
Jeremy Huddleston
d473561901 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-07-15 23:19:03 -07:00
Jeremy Huddleston
581e526309 XQuartz: Cleanup keymap locking, fix a possible synchro bug
(cherry picked from commit 33e7437a49)
(cherry picked from commit 044bd7f605)
2009-07-15 23:15:20 -07:00
Adam Jackson
606f6dba16 xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)
You could be more clever than this, but the wire protocol says this
really is an array of not more than 255 ARRAY8, so it's not just a
matter of changing the types.

(cherry picked from commit 0eb19f9437)
2009-07-09 12:05:31 -04:00