Commit graph

7296 commits

Author SHA1 Message Date
Peter Hutterer
60f4fe18ca dix: add SetBit(arr, bit) and ClearBit(arr, bit) to include/inputstr.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 5e0967f5fc)
2009-10-01 13:14:15 -07:00
Jeremy Huddleston
c94aa87b93 XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
(cherry picked from commit 873467adad)
2009-10-01 12:49:15 -07:00
Jeremy Huddleston
0ef85c8ef3 XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88)
2009-09-28 23:51:22 -07:00
Jeremy Huddleston
9604e0925a XQuartz: Push kXquartzReloadKeymap into DarwinEventHandler 2009-09-28 23:20:03 -07:00
Jeremy Huddleston
e60fbd976c XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d8)
2009-09-28 23:13:12 -07:00
Jeremy Huddleston
30b5b18059 XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50)
2009-09-28 23:12:58 -07:00
Jeremy Huddleston
7c85430f74 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-09-27 23:40:24 -07:00
Jeremy Huddleston
16ec7a0914 Rootless: Correct border rendering on parent-relative windows
Resurected code from the punted RootlessPaintBackground/Border and added it conditionally to miPaintWindow
(cherry picked from commit cf2e3312cf)
2009-09-27 23:39:00 -07:00
Jeremy Huddleston
8127e86bd9 XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbc)
2009-09-27 23:29:46 -07:00
Jeremy Huddleston
76dbb2bf2f XQuartz: Nuke TSM
It's deprecated in SnowLeopard.  Ben and I both have no idea what it is for.  It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
(cherry picked from commit 29cb904e4d)
2009-09-27 23:26:06 -07:00
Jeremy Huddleston
9e19eb2de8 XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1)
2009-09-27 23:25:43 -07:00
Jeremy Huddleston
a02fad2547 XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779c)
2009-09-27 23:25:23 -07:00
Keith Packard
8cf659f3a5 Bump to version 1.6.4
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-27 19:21:45 -07:00
Peter Hutterer
a26fd1a6d6 Don't send events through the master if the device has SendCoreEvents off.
In server 1.6, all devices are attached to the master device (VCP or VCK).
Sending an event through the master device means the device is sending core
events. If a device is configured as SendCoreEvents, just send through the
device, not through the master.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-27 19:08:14 -07:00
Ben Byer
f751d72752 add doltlibtool to gitignore 2009-09-27 10:50:03 -07:00
Ben Byer
8428a57184 Add (ok, fix) support for DTrace under OS X 2009-09-27 10:50:03 -07:00
Jeremy Huddleston
9f5bdd8960 XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish 2009-09-26 23:41:45 -07:00
Jeremy Huddleston
5161a3d476 XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118)
2009-09-23 18:20:47 -07:00
Keith Packard
507e57381f xfree86/modes: Remove all framebuffer support from DGA
This removes all rendering and mapping code from xf86DiDGA, leaving
just mode setting and raw input device access. The mapping code didn't
have the offset within /dev/mem for the frame buffer and the pixmap
support assumed that the framebuffer was never reallocated.
(cherry picked from 0b7c6c728c)

Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-22 12:17:09 -07:00
Rémi Cardona
c3d182a479 dix: append "built-ins" to the font path in SetDefaultFontPath
49b93df8a3 made the hard dependency on
a "fixed" font go away but only Xorg could use the built-ins fonts by
default.

With this commit, all DDXs get "built-ins" appended to their FontPath, not
just Xorg.

Tested with Xorg, Xvfb and Xnest.
(cherry picked from commit f56cbe1ef2)

Signed-off-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22 12:14:56 -07:00
Daniel Stone
9bc4a69040 fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
Apparently the kernel can't decide on an API to expose to userspace, so
let's just try both in the hope that one will work.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Michel Dänzer <michel@daenzer.net>
(cherry picked from commit f4350c66b4)
2009-09-22 12:10:41 -07:00
Keith Packard
d78669c92d render: return the supported version rather than just passing the proto's version
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22 12:09:48 -07:00
Michel Dänzer
f5d1da499c dri2: Don't crash if pPriv is NULL.
(cherry picked from commit df597709d7)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22 12:04:27 -07:00
Richard Hughes
468787bdd2 Don't reset the lastDeviceEventTime when doing DPMS actions
When we change the DPMS mode, don't play games with the last event time as
this breaks applications using IDLETIME to turn the backlight off after a
preset time.

This patch fixes gnome-power-manager and xfce-power-manager

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

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-09-22 12:03:33 -07:00
Jeremy Huddleston
555a620ac5 XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd47)
2009-09-14 14:29:10 -07:00
Jeremy Huddleston
f0511c4878 XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9)
2009-09-06 14:06:26 -07:00
Jeremy Huddleston
18134d8a5a XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a97)
2009-09-06 14:06:14 -07:00
Jeremy Huddleston
821a39d7d5 XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1a)
2009-09-06 14:06:04 -07:00
Jeremy Huddleston
75463b865f XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3e)
2009-09-05 02:53:29 -07:00
Jeremy Huddleston
dfc00effd3 XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce3)
2009-09-04 00:42:40 -07:00
Jeremy Huddleston
5be60933b7 XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab00)
2009-09-04 00:42:10 -07:00
Jerome Glisse
ffd0cffd27 Xext: fix a typo for bigreqsproto.h header file
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
(cherry picked from commit 0e46066efe)
2009-09-01 09:29:24 -07:00
Jeremy Huddleston
22e5bd377c Xext: Require newer versions of xcmiscproto, bigreqsproto, and xf86bigfontproto for new *proto.h header file names
bigreqsproto >= 1.1.0
xcmiscproto >= 1.2.0
xf86bigfontproto >= 1.2.0
2009-08-31 18:11:46 -07:00
Jeremy Huddleston
28bb411360 1.6.3-apple1 2009-08-31 17:25:27 -07:00
Jeremy Huddleston
da64006eb5 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-08-31 17:14:04 -07:00
Jeremy Huddleston
7dcb9b1bac mi: fix build error caused by missing xtest.h
xtest.h was renamed to xtestconst.h in xextproto.
Requires xextproto 7.0.99.3

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 20daa145c4)
2009-08-31 15:58:08 -07:00
Jeremy Huddleston
1e642f22fb XQuartz: GLX: Drawable does not contain resize anymore. 2009-08-31 15:53:58 -07:00
Peter Hutterer
9466e30e45 Xext: include securproto.h instead of securstr.h
Reported-by: Byeong-ryeol Kim
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 4db8950b1d)
2009-08-31 11:21:57 -07:00
Benjamin Close
f6b0dd98e6 xext: Use proto header rather than the Xext include file, this prevents userspace being pulled in causing issues
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit a38ca0063c)
2009-08-31 11:19:32 -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
Keith Packard
3044711412 Bump version to 1.6.3.901 (1.6.4 RC1)
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 22:37:16 -07:00
Keith Packard
d8e48deb21 Block signals while delivering XTest events (fixes bug 23100)
XTest uses the same event list as all input devices, and input devices
use it at SIGIO time. This causes mass confusion when a SIGIO event
occurs in the middle of XTest event processing.

The master branch has a much different fix, using a separate input
queue which reduces latency that may be caused by XTest event queuing;
it's a 'nicer' fix in some ways, but this simple fix should solve the
problem.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-08-25 22:29:25 -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
Adam Jackson
4fc1b920af dbe: Adapt to new headers
(cherry picked from commit bb6fa39eb3)
2009-08-25 20:26:05 -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
Adam Jackson
3af4b6fe23 xsync: Use a local header for server API definitions
(cherry picked from commit e0d8f6a808)
2009-08-25 20:22:08 -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