Commit graph

3825 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
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
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
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
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
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
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
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
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
Alan Coopersmith
396d3a7762 Fix build of drivers with 1.6.2 when not using --install-libxf86config
c859b736d1 removed duplicate entries for
these from the Makefile, but removed a different set than was done in
master branch, causing xf86Parser.h to not be installed, which in turn
breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h,
which includes xf86Parser.h

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-08 13:36:23 -07:00
Keith Packard
499f9f62e4 dri2: Preserve compatibility with 1.6 DRI2 API/ABI
The old DRI2 buffer allocation API wasn't great, but there's no reason to
make the server stop working with those drivers. This patch has the
X server adapting to the API provided by the driver, using the new API where
available and falling back to the old API as necessary. A warning will be
placed in the log file when the old API is in use.
(cherry picked from commit 2e2c5b216c)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06 13:28:09 -07:00
Arkadiusz Miskiewicz
c859b736d1 xfree86: remove duplicate header entries in Makefile.am
fixes https://bugs.freedesktop.org/show_bug.cgi?id=22547

This bug was fixed in a big clean-up commit in master, which cannot be
backported (see commit b1dac41fb3)

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06 13:23:29 -07:00
Jeremy Huddleston
9c2e42d012 XQuartz: ProcAppleWMAttachTransient to play nice with the new Dock in SL
(cherry picked from commit ddc0242d8f)
2009-07-03 19:45:46 -07:00
Jeremy Huddleston
37db9928e7 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-07-03 19:45:33 -07:00
Peter Hutterer
e97cabce4a xfree86: fix SWCursor check in xf86CursorSetCursor.
Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when
the pointer left the screen (in a Xinerama setup).
We must call the sprite rendering function if
- SW cursors are enabled, or
- The current device is not the VCP and not attached to the VCP.

Backported from commit 66089e9129 for
server-1.6-branch by Peter Hutterer

Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29 14:21:32 -07:00
Julien Cristau
17c5b2caf0 Change default for ExaOptimizeMigration to false
Quoting Michel Dänzer in <1234862541.4823.541.camel@thor>:

  Unfortunately, there are still bugs left in EXA which prevent it from
  working 100% correctly with the option enabled, see

  http://bugs.freedesktop.org/show_bug.cgi?id=16416

  http://bugs.freedesktop.org/show_bug.cgi?id=19940

So disable it for now to avoid corruption.

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29 14:21:00 -07:00
Peter Hutterer
f697b6c582 kdrive: set Activate/Deactivate grab for input devices (#21591)
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
(cherry picked from commit b1b5ec45c1)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29 14:17:13 -07:00
Jeremy Huddleston
597747c655 Fix a couple off-by-one array boundary checks.
Error: Write outside array bounds at Xext/geext.c:406
        in function 'GEWindowSetMask' [Symbolic analysis]
       In array dereference of cli->nextSib[extension] with index 'extension'
       Array size is 128 elements (of 4 bytes each), index <= 128

Error: Buffer overflow at dix/events.c:592
	in function 'SetMaskForEvent' [Symbolic analysis]
       In array dereference of filters[deviceid] with index 'deviceid'
       Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20

Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
	in function 'LoaderOpen' [Symbolic analysis]
       In array dereference of refCount[new_handle] with index 'new_handle'
       Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256

These bugs were found using the Parfait source code analysis tool.
For more information see http://research.sun.com/projects/parfait

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit b680bda34d)
(cherry picked from commit 04c9e80f08)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29 14:15:17 -07:00
Peter Hutterer
10c06ddeef xfree86: restore default off for DontZap
Zapping is triggered by xkb these days, so note in the man page that it's the
Terminate_Server action. Since it's XKB, personal preferences towards or
against zapping should be achieved through xkb rulesets.
If Terminate_Server is not in the xkb actions, then we can't zap anyway and we
don't need a default of DontZap "on".

This patch restores the old meaning of DontZap - disallow zapping altogether,
regardless of XKB's current keymap.
Ideally, this patch should be accompanied by b0f64bdab00db652e in
xkeyboard-config.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 737b49199a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29 14:14:52 -07:00
Adam Jackson
7cae08d219 EDID: Fix timing class names to match the spec
(cherry picked from commit 5c1afac5ee)
2009-06-29 11:41:15 -04:00
Jeremy Huddleston
1f43056578 XQuartz: Don't leave zombied processes at startup
(cherry picked from commit 40c1406830)
2009-06-27 18:26:07 -07:00
Jeremy Huddleston
ca6a2ad30b XQuartz: 64bit fix for screen origin in AppleWM
(cherry picked from commit 60a757d280)
2009-06-27 18:25:55 -07:00
Jeremy Huddleston
8df4f3de15 XQuartz: More localization updates
(cherry picked from commit 5925c1f48a)
2009-06-27 10:42:22 -07:00
Jeremy Huddleston
09354a4098 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-06-27 10:42:12 -07:00
Jeremy Huddleston
d42523cc77 XQuartz: More localization updates
(cherry picked from commit 7fbe974246)
2009-06-19 21:16:46 -07:00