Commit Graph

3837 Commits

Author SHA1 Message Date
Jeremy Huddleston
1e642f22fb XQuartz: GLX: Drawable does not contain resize anymore. 2009-08-31 15:53:58 -07:00
Jeremy Huddleston
912642d6ae XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppc
See http://trac.macports.org/ticket/20638
(cherry picked from commit 0f3a89d306)
2009-08-31 07:45:46 -07:00
Jeremy Huddleston
0b0f66b66a XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in OpenGL.framework to prevent X11's glext.h from setting them to 1.
(cherry picked from commit 7fe37137d8)
2009-08-31 07:45:37 -07:00
Jeremy Huddleston
def28e7072 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-08-25 20:57:16 -07:00
Jeremy Huddleston
c232ee0e66 XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0e)
2009-08-25 20:26:28 -07:00
Jeremy Huddleston
697be460d0 XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330)
2009-08-25 20:26:14 -07:00
Jeremy Huddleston
369326c96d Update to xextproto 7.0.99.1.
xextproto had Xlib client headers moved into libXext.
Protocol header files are named fooproto.h, header files with constants
foo.h or fooconst.h where foo.h was already in use for client-side headers.
(cherry picked from commit d3f6b43a24)
2009-08-25 20:25:55 -07:00
Jeremy Huddleston
c46bfe10bf XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649)
2009-08-25 20:17:38 -07:00
Keith Packard
76a1839b0a Ensure that rotation updates happen frequently
The smart scheduler is designed to minimize scheduler overhead by
increasing the interval between WaitForSomething calls when a single
client is running. However, the software rotation code depends on
its BlockHandler being invoked for screen updates; the long delays
caused by the smart scheduler optimizations means that screen updates
can be delayed a long time as well.

The change is simple -- prevent the smart scheduler from increasing
the scheduling interval while any screen is using software rotation.
(cherry picked from commit e7dd1efef4)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 20:12:17 -07:00
Keith Packard
31dc4fe0be Perform rotation redisplay before calling driver block handler (which may flush rendering)
The rotation block handler uses regular driver rendering functions to
repaint the screen, if those functions queue commands in the driver,
it's important that the driver block handler be invoked after the
rotated image is drawn.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 1740cda7a3)
2009-08-25 20:12:17 -07:00
Keith Packard
cebc0a7aa7 xf86_reload_cursors: fix cursor position to eliminate jumping after mode set
xf86_reload_cursors restores the cursor to the correct position, but
that must adjust for cursor hot spot and frame before calling down to
the hardware function, otherwise the cursor jumps to the wrong
position until it is repositioned by the user.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 4aab05e3b3)
2009-08-25 20:12:17 -07:00
Jeremy Huddleston
f37a5f5479 XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in DoMakeCurrent
(cherry picked from commit 60a1d2c276)
2009-08-05 16:17:43 -07:00
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